Improved support for numeric brace ranges

index.js

@@ -41,7 +41,7 @@ const micromatch = (list, patterns, options) => {
  };
 
  for (let i = 0; i < patterns.length; i++) {
- let isMatch = picomatch(String(patterns[i]), { ...options, onResult }, true);
+ let isMatch = picomatch(String(patterns[i]), { ...options, onResult, expandRange }, true);
  let negated = isMatch.state.negated || isMatch.state.negatedExtglob;
  if (negated) negatives++;
 
@@ -120,7 +120,9 @@ micromatch.matcher = (pattern, options) => picomatch(pattern, options);
  * @api public
  */
 
-micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+micromatch.isMatch = (str, patterns, options) => {
+ return picomatch(patterns, { ...options, expandRange })(str);
+}
 
 /**
  * Backwards compatibility
@@ -360,7 +362,7 @@ micromatch.all = (str, patterns, options) => {
 
 micromatch.capture = (glob, input, options) => {
  let posix = utils.isWindows(options);
- let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
+ let regex = micromatch.makeRe(String(glob), { ...options, capture: true });
  let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
 
  if (match) {
@@ -384,7 +386,10 @@ micromatch.capture = (glob, input, options) => {
  * @api public
  */
 
-micromatch.makeRe = (...args) => picomatch.makeRe(...args);
+micromatch.makeRe = ( pattern, options ) => {
+ let result = picomatch.makeRe( pattern, { ...options, expandRange } );
+ return result
+}
 
 /**
  * Scan a glob pattern to separate the pattern into segments. Used
@@ -460,6 +465,27 @@ micromatch.braceExpand = (pattern, options) => {
  return micromatch.braces(pattern, { ...options, expand: true });
 };
 
+/**
+ * Helpers
+ */
+
+// Replacement for picomatch.parse.expandRange
+function expandRange( start, end, incr, options ) {
+ if ( arguments.length == 3 ) {
+ options = incr;
+ incr = '';
+ } else {
+ incr = '..'+incr;
+ }
+ let source = braces.compile( `{${start}..${end}${incr}}`, options );
+
+ // Convert to non-capturing group, since capture groups are added downstream.
+ source = '(?:' + source.substr( 1 );
+
+ return source;
+}
+
+
 /**
  * Expose micromatch
  */

package.json

@@ -1,7 +1,7 @@
 {
  "name": "micromatch",
  "description": "Glob matching for javascript/node.js. A replacement and faster alternative to minimatch and multimatch.",
- "version": "4.0.2",
+ "version": "4.0.3",
  "homepage": "https://github.com/micromatch/micromatch",
  "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
  "contributors": [

test/api.capture.js

@@ -67,4 +67,12 @@ describe('.capture()', () => {
  assert.deepEqual(capture('test/!(a|b)/x.js', 'test/x/x.js'), ['x']);
  assert.deepEqual(capture('test/!(a|b)/x.js', 'test/y/x.js'), ['y']);
  });
+
+ it('should capture brace range expressions', () => {
+ assert.deepEqual(capture('test/{10..90}/x.js', 'test/25/x.js'), ['25']);
+ });
+
+ it('should capture multiple brace ranges', () => {
+ assert.deepEqual(capture('test/{10..90}/x/{100..200}/x.js', 'test/20/x/150/x.js'), ['20','150']);
+ });
 });

test/api.makeRe.js

@@ -11,4 +11,15 @@ describe('.makeRe()', () => {
  it('should create a regex for a glob pattern', () => {
  assert(mm.makeRe('*') instanceof RegExp);
  });
+
+ describe('differences from picomatch', () => {
+ it('should produce good regex for braces', () => {
+ let regex = mm.makeRe('{2..10..3}', { capture: false });
+ assert(regex instanceof RegExp);
+ assert.equal( regex.source, '^(?:(?:2|5|8))$');
+
+ regex = mm.makeRe('{2..10..3}', { capture: true });
+ assert.equal( regex.source, '^(?:(?:(2|5|8)))$');
+ });
+ });
 });

test/braces.js

@@ -43,10 +43,35 @@ describe('braces', () => {
  assert(isMatch('a/c', 'a/{a,b,c}'));
  });
 
- it('should match with brace ranges', () => {
+ it('should match with alphabetic brace ranges', () => {
  assert(isMatch('a/a', 'a/{a..c}'));
  assert(isMatch('a/b', 'a/{a..c}'));
  assert(isMatch('a/c', 'a/{a..c}'));
+ assert(!isMatch('a/d', 'a/{a..c}'));
+ assert(!isMatch('a/0', 'a/{a..c}'));
+ });
+
+ it('should match with single-digit numeric brace ranges', () => {
+ assert(isMatch('a/1', 'a/{0..8}'));
+ assert(!isMatch('a/9', 'a/{0..8}'));
+ });
+
+ it('should match with multi-digit numeric brace ranges', () => {
+ assert(!isMatch('a/4', 'a/{5..250}'));
+ assert(isMatch('a/5', 'a/{5..250}'));
+ assert(isMatch('a/250', 'a/{5..250}'));
+ assert(!isMatch('a/251', 'a/{5..250}'));
+ });
+
+ xit('should match with zero-padded numeric brace ranges', () => {
+ assert(!isMatch('a/', 'a/{000..600}'));
+ assert(isMatch('a/001', 'a/{000..600}'));
+ assert(!isMatch('a/50', 'a/{000..600}'));
+ assert(isMatch('a/050', 'a/{000..600}'));
+ assert(isMatch('a/500', 'a/{000..600}'));
+ assert(!isMatch('a/700', 'a/{000..600}'));
+ assert(!isMatch('a/5000', 'a/{000..600}'));
+ assert(!isMatch('a/251', 'a/{000..600}'));
  });
 
  it('should not convert braces inside brackets', () => {
@@ -61,7 +86,7 @@ describe('braces', () => {
  assert(isMatch('a.txt', 'a{,b}.txt'));
  assert(isMatch('a.txt', 'a{b,}.txt'));
  assert(isMatch('aa.txt', 'a{a,b,}.txt'));
- assert(isMatch('aa.txt', 'a{a,b,}.txt'));
+ assert(!isMatch('ac.txt', 'a{a,b,}.txt'));
  assert(isMatch('ab.txt', 'a{,b}.txt'));
  assert(isMatch('ab.txt', 'a{b,}.txt'));
  });

test/micromatch.js

@@ -85,6 +85,14 @@ describe('micromatch', () => {
  assert.deepEqual(mm(['a [bc]'], 'a \\[bc\\]*'), ['a [bc]']);
  assert.deepEqual(mm(['a [b]', 'a [b].js'], 'a \\[b\\].*'), ['a [b].js']);
  });
+
+ it('should match numeric brace expressions', () => {
+ let fixtures = ['0', '1', '10', '100','110','010'];
+ // assert.deepEqual(mm(fixtures, ['{000..999}']), ['100','010']);
+ assert.deepEqual(mm(fixtures, ['{0..9}']), ['0','1']);
+ assert.deepEqual(mm(fixtures, ['{11..120}']), ['100','110']);
+ });
+
  });
 
  describe('windows paths', () => {