Skip to content

fix(dollar): consider \$ expression #58

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
roggervalf wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(dollar): consider \$ expression #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78b9239
fix(dollar): consider \$ expression
roggervalf Feb 7, 2022
5800ff2
refactor: delete only \$
roggervalf Feb 9, 2022
5b6f0b6
test(dollar): add more test cases
roggervalf Feb 15, 2022
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
12 changes: 8 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,25 +130,29 @@ function expand(str, isTop) {
if (!m) return [str];

// no need to expand pre, since it is guaranteed to be free of brace-sets
const pre = m.pre;
let pre = m.pre;
const post = m.post.length
? expand(m.post, false)
: [''];

if (/\$$/.test(m.pre)) {
if (/\$$/.test(pre) && !/\\\$$/.test(pre)) {
for (let k = 0; k < post.length; k++) {
const expansion = pre+ '{' + m.body + '}' + post[k];
expansions.push(expansion);
}
} else {
if(/\\\$$/.test(pre)){
pre = pre.substring(0,pre.length - 2) + '$';
}
const isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
const isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
const isSequence = isNumericSequence || isAlphaSequence;
const isOptions = m.body.indexOf(',') >= 0;

if (!isSequence && !isOptions) {
// {a},b}
if (m.post.match(/,.*\}/)) {
str = m.pre + '{' + m.body + escClose + m.post;
str = pre + '{' + m.body + escClose + m.post;
return expand(str);
}
return [str];
Expand All @@ -164,7 +168,7 @@ function expand(str, isTop) {
n = expand(n[0], false).map(embrace);
if (n.length === 1) {
return post.map(function(p) {
return m.pre + n[0] + p;
return pre + n[0] + p;
});
}
}
Expand Down
4 changes: 4 additions & 0 deletions test/dollar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ test('ignores ${', function(t) {
t.deepEqual(expand('${a,b}${c,d}'), ['${a,b}${c,d}']);
t.deepEqual(expand('${a,b}${c,d}{e,f}'), ['${a,b}${c,d}e','${a,b}${c,d}f']);
t.deepEqual(expand('{a,b}${c,d}${e,f}'), ['a${c,d}${e,f}','b${c,d}${e,f}']);
t.deepEqual(expand('${x,y}'), ['${x,y}']);
t.deepEqual(expand('\\${x,y}'), ['$x','$y']);
t.deepEqual(expand('{a,b}\\${c,d}\\${e,f}'), ['a$c$e','a$c$f', 'a$d$e', 'a$d$f', 'b$c$e', 'b$c$f', 'b$d$e', 'b$d$f']);
t.deepEqual(expand('{a,b}c\\${d,e}'), ['ac$d','ac$e', 'bc$d', 'bc$e']);
t.deepEqual(expand('${a,b}${c,d}{1..3}'), ['${a,b}${c,d}1','${a,b}${c,d}2','${a,b}${c,d}3']);
t.deepEqual(expand('x${a,b}x${c,d}x'), ['x${a,b}x${c,d}x']);
t.end();
Expand Down