Skip to content

@exec parameters are not parsed correctly #78

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
anseki wants to merge 1 commit into
base: master
Choose a base branch
from
Open

@exec parameters are not parsed correctly #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 9 additions & 12 deletions lib/preprocess.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,17 @@ function preprocessor(src, context, opts, noRestoreEol) {
});

rv = replace(rv, opts.type.exec, function (match, name, value) {
name = (name || '').trim();
value = value || '';
var reToken = new RegExp(/^\s*(?:("|')(.*?)(?:\1\s*,?|$)|([^,]*?)\s*(?:,|$))/),
params = [];

var params = value.split(',');
var stringRegex = /^['"](.*)['"]$/;
function token2param(s, q, str, prop) {
params.push(typeof str !== 'undefined' ? str : getDeepPropFromObj(context, prop));
return '';
}

params = params.map(function(param){
param = param.trim();
if (stringRegex.test(param)) { // handle string parameter
return param.replace(stringRegex, '$1');
} else { // handle variable parameter
return getDeepPropFromObj(context, param);
}
});
name = (name || '').trim();
value = value == null ? ' ' : value + ' '; // space for end of comma
while (value.length) { value = value.replace(reToken, token2param); }

var fn = getDeepPropFromObj(context, name);
if (!fn || typeof fn !== 'function') return '';
Expand Down