Skip to content

Variable substitution in include paths #17

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

Open
MaxMotovilov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Variable substitution in include paths #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d30579
Fix: correctly parsing echo with default=""
MaxMotovilov Nov 18, 2017
1192315
Implemented a limited form of variable substitution in 'include'
MaxMotovilov Nov 18, 2017
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
19 changes: 13 additions & 6 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var async = require('async');
var syntaxReg = /<!--#([^\r\n]+?)-->/mg;
var includeFileReg = /<!--#\s*include\s+(file|virtual)=(['"])([^\r\n\s]+?)\2\s*(.*?)-->/;
var setVarReg = /<!--#\s*set\s+var=(['"])([^\r\n]+?)\1\s+value=(['"])([^\r\n]*?)\3\s*-->/;
var echoReg = /<!--#\s*echo\s+var=(['"])([^\r\n]+?)\1(\s+default=(['"])([^\r\n]+?)\4)?\s*-->/;
var echoReg = /<!--#\s*echo\s+var=(['"])([^\r\n]+?)\1(\s+default=(['"])([^\r\n]*?)\4)?\s*-->/;
var ifReg = /<!--#\s*if\s+expr=(['"])([^\r\n]+?)\1\s*-->/;
var elifReg = /<!--#\s*elif\s+expr=(['"])([^\r\n]+?)\1\s*-->/;
var elseReg = /<!--#\s*else\s*-->/;
Expand Down Expand Up @@ -111,7 +111,7 @@ function resolve(tpl) {

fnStr += '};\nreturn _r;';

return new Function('__data', fnStr);
return new Function('__data', fnStr);
}

/**
Expand Down Expand Up @@ -197,15 +197,22 @@ SSI.prototype = {
* @param callback
*/
resolveIncludes: function(content, options, callback) {
var matches, seg, isVirtual, basePath, tpath, subOptions, ssi = this;
var matches, seg, isVirtual, basePath, tpath, subOptions, target, ssi = this;

async.whilst( // https://www.npmjs.org/package/async#whilst-test-fn-callback-
function test() {return !!(matches = includeFileReg.exec(content)); },
function insertInclude(next) {
seg = matches[0];
isVirtual = RegExp.$1 == 'virtual';
basePath = (isVirtual && options.dirname && RegExp.$3.charAt(0) !== '/')? options.dirname : options.baseDir;
tpath = path.join(basePath, RegExp.$3);
target = RegExp.$3.replace(
/\$(?:\{([^}]+)\}|(\w+))/g,
function( _, m1, m2 ) {
return options.payload[m1||m2] || ""
}
);

seg = matches[0];
basePath = (isVirtual && options.dirname && target.charAt(0) !== '/')? options.dirname : options.baseDir;
tpath = path.join(basePath, target);
fs.lstat(tpath,
function(err, stats) {
if (err) {
Expand Down