Skip to content

Replace split(/\s+/) to allow for spaces in file names & paths when using datafile #91

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

Replace split(/\s+/) to allow for spaces in file names & paths when using datafile #91

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
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@ async function render(data, done) {
var input = entry.src || entry.input;
var outputs = entry.dest || entry.output;

// TODO: Use /('[^']*'|"[^"]*"|[^"'\s])/ instead of split(/\s+/)
var splitParams = ( value => value.match(/\w+|"[^"]+"|'[^']+'/g).map(v=>v.replace(/"([^"]+)"|'([^']+)'/g,"$1$2")) ); //Split on non-word characters unless wrapped in single or double quotes, then remove wrapping single and double quotes

if (!Array.isArray(input)) {
input = input.split(/\s+/);
input = splitParams(input);
}

if (!Array.isArray(outputs)) {
// one string
outputs = [ outputs.split(/\s+/) ];
outputs = [ splitParams(outputs) ];

} else if (!outputs.some(function(output) {
return Array.isArray(output);
})) {
// array, but not 2d array
outputs = outputs.map(function(output) {
return output.split(/\s+/);
return splitParams(output);
});
}

Expand Down