Merge pull request #49 from jakub-ekkosense/master

Fixed set expansion when starting with a range operator

Author: mrmlnc

lib/parse.js

@@ -246,6 +246,7 @@ const parse = (input, options = {}) => {
         const open = block.nodes.shift();
         block.nodes = [open, { type: 'text', value: stringify(block) }];
       }
+      block.invalid = false;
 
       push({ type: 'comma', value });
       block.commas++;

test/bash-expanded-sets.js

@@ -222,7 +222,94 @@ describe('bash - expanded brace sets', () => {
     ['f{x,y{{g}}h', {}, ['f{x,y{{g}}h']],
     ['a{b{c{d,e}f{x,y{}g}h', {}, ['a{b{cdfxh', 'a{b{cdfy{}gh', 'a{b{cefxh', 'a{b{cefy{}gh']],
     ['f{x,y{}g}h', {}, ['fxh', 'fy{}gh']],
-    ['z{a,b{,c}d', {}, ['z{a,bd', 'z{a,bcd']]
+    ['z{a,b{,c}d', {}, ['z{a,bd', 'z{a,bcd']],
+
+    'should expand sets containing the range operator',
+
+    ['{..a,b}', {}, ['..a', 'b']],
+    ['{b,..a}', {}, ['b', '..a']],
+    ['{a..,b}', {}, ['a..', 'b']],
+    ['{...,b}', {}, ['...', 'b']],
+    ['{a,..,b}', {}, ['a', '..', 'b']],
+    ['..{a,b}', {}, ['..a', '..b']],
+    ['{{..,..},a,b}', {}, ['..', '..', 'a', 'b']],
+    ['{{{..,..}a,b}c,d}', {}, ['..ac', '..ac', 'bc', 'd']],
+    ['..{..,{..,{..,..}a,b}c,d}', {}, ['....', '....c', '....ac', '....ac', '..bc', '..d']],
+    ['..', {}, ['..']],
+    ['{,..}', {}, ['', '..']],
+    ['{..,}', {}, ['..', '']],
+    ['{..,..,..}', {}, ['..', '..', '..']],
+    ['{...,..,..}', {}, ['...', '..', '..']],
+    ['{..,...,..}', {}, ['..', '...', '..']],
+    ['{./../.,../../}', {}, ['./../.', '../../']],
+    ['{../../../,../../}', {}, ['../../../', '../../']],
+    ['{...,...,...}', {}, ['...', '...', '...']],
+    ['{.,..,.}', {}, ['.', '..', '.']],
+    [',{..,..,.},', {}, [',..,', ',..,', ',.,']],
+    ['{1..2,3..4}', {}, ['1..2', '3..4']],
+    ['{..2,3..4}', {}, ['..2', '3..4']],
+    ['{1..,2}', {}, ['1..', '2']],
+    ['{1..,..2..,..3}', {}, ['1..', '..2..', '..3']],
+    ['..{1..3}', {}, ['..1', '..2', '..3']],
+    ['..{1..3}{..,..}', {}, ['..1..', '..1..', '..2..', '..2..', '..3..', '..3..']],
+
+    'should not expand invalid sets containing the range operator',
+
+    ['{..a,b', {}, ['{..a,b']],
+    ['{b,..a', {}, ['{b,..a']],
+    ['{a..,b', {}, ['{a..,b']],
+    ['{...,b', {}, ['{...,b']],
+    ['{a,..,b', {}, ['{a,..,b']],
+    ['..{a,b', {}, ['..{a,b']],
+    ['{{..,..},a,b', {}, ['{..,a,b', '{..,a,b']],
+    ['{{{..,..}a,b}c,d', {}, ['{..ac,d', '{..ac,d', '{bc,d']],
+    ['{{{..,..}a,bc,d}', {}, ['{..a', '{..a', '{bc', '{d']],
+    ['..{..,{..,{..,..}a,b}c,d', {}, ['..{..,..c,d', '..{..,..ac,d', '..{..,..ac,d', '..{..,bc,d']],
+    ['..', {}, ['..']],
+    ['{,..', {}, ['{,..']],
+    ['{..,', {}, ['{..,']],
+    ['{..,..,..', {}, ['{..,..,..']],
+    ['{...,..,..', {}, ['{...,..,..']],
+    ['{..,...,..', {}, ['{..,...,..']],
+    ['{./../.,../../', {}, ['{./../.,../../']],
+    ['{../../../,../../', {}, ['{../../../,../../']],
+    ['{...,...,...', {}, ['{...,...,...']],
+    ['{.,..,.', {}, ['{.,..,.']],
+    [',{..,..,.},', {}, [',..,', ',..,', ',.,']],
+    ['{1..2,3..4', {}, ['{1..2,3..4']],
+    ['{..2,3..4', {}, ['{..2,3..4']],
+    ['{1..,2', {}, ['{1..,2']],
+    ['{1..,..2..,..3', {}, ['{1..,..2..,..3']],
+    ['..{1..3', {}, ['..{1..3']],
+    ['..{1..3}{..,..', {}, ['..1{..,..', '..2{..,..', '..3{..,..']],
+
+    ['..a,b}', {}, ['..a,b}']],
+    ['b,..a}', {}, ['b,..a}']],
+    ['a..,b}', {}, ['a..,b}']],
+    ['...,b}', {}, ['...,b}']],
+    ['a,..,b}', {}, ['a,..,b}']],
+    ['..a,b}', {}, ['..a,b}']],
+    ['{..,..},a,b}', {}, ['..,a,b}', '..,a,b}']],
+    ['{{..,..}a,b}c,d}', {}, ['..ac,d}', '..ac,d}', 'bc,d}']],
+    ['....,{..,{..,..}a,b}c,d}', {}, ['....,..c,d}', '....,..ac,d}', '....,..ac,d}', '....,bc,d}']],
+    ['..', {}, ['..']],
+    [',..}', {}, [',..}']],
+    ['..,}', {}, ['..,}']],
+    ['..,..,..}', {}, ['..,..,..}']],
+    ['...,..,..}', {}, ['...,..,..}']],
+    ['..,...,..}', {}, ['..,...,..}']],
+    ['./../.,../../}', {}, ['./../.,../../}']],
+    ['../../../,../../}', {}, ['../../../,../../}']],
+    ['...,...,...}', {}, ['...,...,...}']],
+    ['.,..,.}', {}, ['.,..,.}']],
+    [',..,..,.},', {}, [',..,..,.},']],
+    ['1..2,3..4}', {}, ['1..2,3..4}']],
+    ['..2,3..4}', {}, ['..2,3..4}']],
+    ['1..,2}', {}, ['1..,2}']],
+    ['1..,..2..,..3}', {}, ['1..,..2..,..3}']],
+    ['..1..3}', {}, ['..1..3}']],
+    ['..1..3}{..,..}', {}, ['..1..3}..', '..1..3}..']],
+
   ];
 
   fixtures.forEach(arr => {