Skip to content

Rebase reference for static includes that target a div#115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gisonrg merged 2 commits into from
Jan 19, 2018
Merged

Rebase reference for static includes that target a div #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
727ba2d
Rebase reference for static includes that target a div
acjh Jan 18, 2018
22cab7e
Swap parameters for `config` and `cb` (deprecated)
acjh Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions lib/parser.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ Parser.prototype.getDynamicIncludeSrc = function () {
return _.clone(this.dynamicIncludeSrc);
};

Parser.prototype._preprocess = function (element, context) {
Parser.prototype._preprocess = function (element, context, config) {
let self = this;
element.attribs = element.attribs || {};
element.attribs[ATTRIB_CWF] = path.resolve(context.cwf);
Expand DownExpand Up@@ -98,6 +98,7 @@ Parser.prototype._preprocess = function (element, context) {
let actualContent = context.mode === 'include' ?
(isInline ? utils.wrapContent(htmlContent) : utils.wrapContent(htmlContent, '\n\n', '\n'))
: md.render(htmlContent);
actualContent = self._rebaseReferenceForStaticIncludes(actualContent, element, config);
if (!isIncludeSrcMd) {
// Include HTML. Just let it be.
actualContent = htmlContent;
Expand All@@ -121,7 +122,7 @@ Parser.prototype._preprocess = function (element, context) {
childContext.source = isIncludeSrcMd ? 'md' : 'html';
if (element.children && element.children.length > 0) {
element.children = element.children.map((e) => {
return self._preprocess(e, childContext);
return self._preprocess(e, childContext, config);
});
}
} else if (element.name === 'dynamic-panel') {
Expand DownExpand Up@@ -159,7 +160,7 @@ Parser.prototype._preprocess = function (element, context) {
} else {
if (element.children && element.children.length > 0) {
element.children = element.children.map((e) => {
return self._preprocess(e, context);
return self._preprocess(e, context, config);
});
}
}
Expand DownExpand Up@@ -275,7 +276,7 @@ Parser.prototype._trimNodes = function (node) {
}
};

Parser.prototype.includeFile = function (file, cb) {
Parser.prototype.includeFile = function (file, config, cb) {
cb = cb || function () {}; // create empty callback

let context = {};
Expand All@@ -290,7 +291,7 @@ Parser.prototype.includeFile = function (file, cb) {
return;
}
let nodes = dom.map(d => {
return this._preprocess(d, context);
return this._preprocess(d, context, config);
});
resolve(cheerio.html(nodes));
cb(null, cheerio.html(nodes));
Expand DownExpand Up@@ -466,6 +467,31 @@ Parser.prototype._rebaseReference = function(node, foundBase) {
}
};

Parser.prototype._rebaseReferenceForStaticIncludes = function (pageData, element, config) {
if (!config) {
return pageData;
}

if (!pageData.includes('{{baseUrl}}')) {
return pageData;
}

let filePath = element.attribs[ATTRIB_INCLUDE_PATH];
let fileBase = calculateNewBaseUrl(filePath, config.rootPath, config.baseUrlMap);
if (!fileBase.relative) {
return pageData;
}

let currentPath = element.attribs[ATTRIB_CWF];
let currentBase = calculateNewBaseUrl(currentPath, config.rootPath, config.baseUrlMap);
if (currentBase.relative === fileBase.relative) {
return pageData;
}

let newBase = fileBase.relative;
return nunjucks.renderString(pageData, { baseUrl: `{{hostBaseUrl}}/${newBase}` });
};

function calculateNewBaseUrl(filePath, root, lookUp) {
function calculate(file, result) {
if (file === root) {
Expand Down