Merge pull request #12 from micromatch/snap-11

Update snapdragon to 0.12

Author: danez

.travis.yml

@@ -4,12 +4,7 @@ os:
   - osx
 language: node_js
 node_js:
-  - node
-  - '9'
+  - '10'
   - '8'
-  - '7'
   - '6'
-  - '5'
   - '4'
-  - '0.12'
-  - '0.10'

appveyor.yml

@@ -2,12 +2,10 @@
 environment:
   matrix:
     # node.js
+    - nodejs_version: "10.0"
     - nodejs_version: "8.0"
-    - nodejs_version: "7.0"
     - nodejs_version: "6.0"
-    - nodejs_version: "5.0"
-    - nodejs_version: "0.12"
-    - nodejs_version: "0.10"
+    - nodejs_version: "4.0"
 
 # Install scripts. (runs after repo cloning)
 install:

gulpfile.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var gulp = require('gulp');
-var mocha = require('gulp-mocha');
-var unused = require('gulp-unused');
-var istanbul = require('gulp-istanbul');
-var eslint = require('gulp-eslint');
+const gulp = require('gulp');
+const mocha = require('gulp-mocha');
+const unused = require('gulp-unused');
+const istanbul = require('gulp-istanbul');
+const eslint = require('gulp-eslint');
 
 gulp.task('coverage', function() {
   return gulp.src(['index.js', 'lib/*.js'])

index.js

@@ -4,26 +4,25 @@
  * Module dependencies
  */
 
-var extend = require('extend-shallow');
-var unique = require('array-unique');
-var toRegex = require('to-regex');
+const unique = require('array-unique');
+const toRegex = require('to-regex');
 
 /**
  * Local dependencies
  */
 
-var compilers = require('./lib/compilers');
-var parsers = require('./lib/parsers');
-var Extglob = require('./lib/extglob');
-var utils = require('./lib/utils');
-var MAX_LENGTH = 1024 * 64;
+const compilers = require('./lib/compilers');
+const parsers = require('./lib/parsers');
+const Extglob = require('./lib/extglob');
+const utils = require('./lib/utils');
+const MAX_LENGTH = 1024 * 64;
 
 /**
  * Convert the given `extglob` pattern into a regex-compatible string. Returns
  * an object with the compiled result and the parsed AST.
  *
  * ```js
- * var extglob = require('extglob');
+ * const extglob = require('extglob');
  * console.log(extglob('*.!(*a)'));
  * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
  * ```
@@ -42,7 +41,7 @@ function extglob(pattern, options) {
  * array that contains only the strings that match the pattern.
  *
  * ```js
- * var extglob = require('extglob');
+ * const extglob = require('extglob');
  * console.log(extglob.match(['a.a', 'a.b', 'a.c'], '*.!(*a)'));
  * //=> ['a.b', 'a.c']
  * ```
@@ -59,13 +58,13 @@ extglob.match = function(list, pattern, options) {
   }
 
   list = utils.arrayify(list);
-  var isMatch = extglob.matcher(pattern, options);
-  var len = list.length;
-  var idx = -1;
-  var matches = [];
+  const isMatch = extglob.matcher(pattern, options);
+  const len = list.length;
+  let idx = -1;
+  const matches = [];
 
   while (++idx < len) {
-    var ele = list[idx];
+    const ele = list[idx];
 
     if (isMatch(ele)) {
       matches.push(ele);
@@ -94,7 +93,7 @@ extglob.match = function(list, pattern, options) {
  * extglob `pattern`.
  *
  * ```js
- * var extglob = require('extglob');
+ * const extglob = require('extglob');
  *
  * console.log(extglob.isMatch('a.a', '*.!(*a)'));
  * //=> false
@@ -125,7 +124,7 @@ extglob.isMatch = function(str, pattern, options) {
     return pattern === str;
   }
 
-  var isMatch = utils.memoize('isMatch', pattern, options, extglob.matcher);
+  const isMatch = utils.memoize('isMatch', pattern, options, extglob.matcher);
   return isMatch(str);
 };
 
@@ -134,7 +133,7 @@ extglob.isMatch = function(str, pattern, options) {
  * the pattern can match any part of the string.
  *
  * ```js
- * var extglob = require('extglob');
+ * const extglob = require('extglob');
  * console.log(extglob.contains('aa/bb/cc', '*b'));
  * //=> true
  * console.log(extglob.contains('aa/bb/cc', '*d'));
@@ -156,7 +155,7 @@ extglob.contains = function(str, pattern, options) {
     return pattern === str;
   }
 
-  var opts = extend({}, options, {contains: true});
+  const opts = Object.assign({}, options, {contains: true});
   opts.strictClose = false;
   opts.strictOpen = false;
   return extglob.isMatch(str, pattern, opts);
@@ -167,8 +166,8 @@ extglob.contains = function(str, pattern, options) {
  * function takes the string to match as its only argument.
  *
  * ```js
- * var extglob = require('extglob');
- * var isMatch = extglob.matcher('*.!(*a)');
+ * const extglob = require('extglob');
+ * const isMatch = extglob.matcher('*.!(*a)');
  *
  * console.log(isMatch('a.a'));
  * //=> false
@@ -187,7 +186,7 @@ extglob.matcher = function(pattern, options) {
   }
 
   function matcher() {
-    var re = extglob.makeRe(pattern, options);
+    const re = extglob.makeRe(pattern, options);
     return function(str) {
       return re.test(str);
     };
@@ -201,7 +200,7 @@ extglob.matcher = function(pattern, options) {
  * an object with the compiled result and the parsed AST.
  *
  * ```js
- * var extglob = require('extglob');
+ * const extglob = require('extglob');
  * console.log(extglob.create('*.!(*a)').output);
  * //=> '(?!\\.)[^/]*?\\.(?!(?!\\.)[^/]*?a\\b).*?'
  * ```
@@ -217,8 +216,8 @@ extglob.create = function(pattern, options) {
   }
 
   function create() {
-    var ext = new Extglob(options);
-    var ast = ext.parse(pattern, options);
+    const ext = new Extglob(options);
+    const ast = ext.parse(pattern, options);
     return ext.compile(ast, options);
   }
 
@@ -230,7 +229,7 @@ extglob.create = function(pattern, options) {
  * if the pattern did not match.
  *
  * ```js
- * var extglob = require('extglob');
+ * const extglob = require('extglob');
  * extglob.capture(pattern, string[, options]);
  *
  * console.log(extglob.capture('test/*.js', 'test/foo.js'));
@@ -246,11 +245,11 @@ extglob.create = function(pattern, options) {
  */
 
 extglob.capture = function(pattern, str, options) {
-  var re = extglob.makeRe(pattern, extend({capture: true}, options));
+  const re = extglob.makeRe(pattern, Object.assign({capture: true}, options));
 
   function match() {
     return function(string) {
-      var match = re.exec(string);
+      const match = re.exec(string);
       if (!match) {
         return null;
       }
@@ -259,16 +258,16 @@ extglob.capture = function(pattern, str, options) {
     };
   }
 
-  var capture = utils.memoize('capture', pattern, options, match);
+  const capture = utils.memoize('capture', pattern, options, match);
   return capture(str);
 };
 
 /**
  * Create a regular expression from the given `pattern` and `options`.
  *
  * ```js
- * var extglob = require('extglob');
- * var re = extglob.makeRe('*.!(*a)');
+ * const extglob = require('extglob');
+ * const re = extglob.makeRe('*.!(*a)');
  * console.log(re);
  * //=> /^[^\/]*?\.(?![^\/]*?a)[^\/]*?$/
  * ```
@@ -292,13 +291,13 @@ extglob.makeRe = function(pattern, options) {
   }
 
   function makeRe() {
-    var opts = extend({strictErrors: false}, options);
+    const opts = Object.assign({strictErrors: false}, options);
     if (opts.strictErrors === true) opts.strict = true;
-    var res = extglob.create(pattern, opts);
+    const res = extglob.create(pattern, opts);
     return toRegex(res.output, opts);
   }
 
-  var regex = utils.memoize('makeRe', pattern, options, makeRe);
+  const regex = utils.memoize('makeRe', pattern, options, makeRe);
   if (regex.source.length > MAX_LENGTH) {
     throw new SyntaxError('potentially malicious regex detected');
   }

lib/compilers.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var brackets = require('expand-brackets');
+const brackets = require('expand-brackets');
 
 /**
  * Extglob compilers
@@ -45,11 +45,11 @@ module.exports = function(extglob) {
      */
 
     .set('qmark', function(node) {
-      var val = '[^\\\\/.]';
-      var prev = this.prev();
+      let val = '[^\\\\/.]';
+      const prev = node.prev;
 
       if (node.parsed.slice(-1) === '(') {
-        var ch = node.rest.charAt(0);
+        const ch = node.rest.charAt(0);
         if (ch !== '!' && ch !== '=' && ch !== ':') {
           return this.emit(val, node);
         }
@@ -71,11 +71,11 @@ module.exports = function(extglob) {
      */
 
     .set('plus', function(node) {
-      var prev = node.parsed.slice(-1);
+      const prev = node.parsed.slice(-1);
       if (prev === ']' || prev === ')') {
         return this.emit(node.val, node);
       }
-      var ch = this.output.slice(-1);
+      const ch = this.output.slice(-1);
       if (!this.output || (/[?*+]/.test(ch) && node.parent.type !== 'bracket')) {
         return this.emit('\\+', node);
       }
@@ -90,8 +90,8 @@ module.exports = function(extglob) {
      */
 
     .set('star', function(node) {
-      var prev = this.prev();
-      var prefix = prev.type !== 'text' && prev.type !== 'escape'
+      const prev = node.prev;
+      const prefix = prev.type !== 'text' && prev.type !== 'escape'
         ? '(?!\\.)'
         : '';
 
@@ -103,10 +103,10 @@ module.exports = function(extglob) {
      */
 
     .set('paren', function(node) {
-      return this.mapVisit(node.nodes);
+      this.mapVisit(node);
     })
     .set('paren.open', function(node) {
-      var capture = this.options.capture ? '(' : '';
+      const capture = this.options.capture ? '(' : '';
 
       switch (node.parent.prefix) {
         case '!':
@@ -118,7 +118,7 @@ module.exports = function(extglob) {
         case '@':
           return this.emit(capture + '(?:', node);
         default: {
-          var val = node.val;
+          let val = node.val;
           if (this.options.bash === true) {
             val = '\\' + val;
           } else if (!this.options.capture && val === '(' && node.parent.rest[0] !== '?') {
@@ -130,13 +130,13 @@ module.exports = function(extglob) {
       }
     })
     .set('paren.close', function(node) {
-      var capture = this.options.capture ? ')' : '';
+      const capture = this.options.capture ? ')' : '';
 
       switch (node.prefix) {
         case '!':
         case '^':
-          var prefix = /^(\)|$)/.test(node.rest) ? '$' : '';
-          var str = star.call(this, node);
+          const prefix = /^(\)|$)/.test(node.rest) ? '$' : '';
+          let str = star.call(this, node);
 
           // if the extglob has a slash explicitly defined, we know the user wants
           // to match slashes, so we need to ensure the "star" regex allows for it
@@ -152,7 +152,7 @@ module.exports = function(extglob) {
         case '@':
           return this.emit(')' + capture, node);
         default: {
-          var val = (this.options.bash === true ? '\\' : '') + ')';
+          const val = (this.options.bash === true ? '\\' : '') + ')';
           return this.emit(val, node);
         }
       }
@@ -163,7 +163,7 @@ module.exports = function(extglob) {
      */
 
     .set('text', function(node) {
-      var val = node.val.replace(/[\[\]]/g, '\\$&');
+      const val = node.val.replace(/[\[\]]/g, '\\$&');
       return this.emit(val, node);
     });
 };

lib/extglob.js

@@ -4,24 +4,25 @@
  * Module dependencies
  */
 
-var Snapdragon = require('snapdragon');
-var define = require('define-property');
-var extend = require('extend-shallow');
+const Snapdragon = require('snapdragon');
+const capture = require('snapdragon-capture');
+const define = require('define-property');
 
 /**
  * Local dependencies
  */
 
-var compilers = require('./compilers');
-var parsers = require('./parsers');
+const compilers = require('./compilers');
+const parsers = require('./parsers');
 
 /**
  * Customize Snapdragon parser and renderer
  */
 
 function Extglob(options) {
-  this.options = extend({source: 'extglob'}, options);
+  this.options = Object.assign({source: 'extglob'}, options);
   this.snapdragon = this.options.snapdragon || new Snapdragon(this.options);
+  this.snapdragon.use(capture());
   this.snapdragon.patterns = this.snapdragon.patterns || {};
   this.compiler = this.snapdragon.compiler;
   this.parser = this.snapdragon.parser;
@@ -34,15 +35,15 @@ function Extglob(options) {
    */
 
   define(this.snapdragon, 'parse', function(str, options) {
-    var parsed = Snapdragon.prototype.parse.apply(this, arguments);
+    const parsed = Snapdragon.prototype.parse.apply(this, arguments);
     parsed.input = str;
 
     // escape unmatched brace/bracket/parens
-    var last = this.parser.stack.pop();
+    const last = this.parser.stack.pop();
     if (last && this.options.strict !== true) {
-      var node = last.nodes[0];
+      const node = last.nodes[0];
       node.val = '\\' + node.val;
-      var sibling = node.parent.nodes[1];
+      const sibling = node.parent.nodes[1];
       if (sibling.type === 'star') {
         sibling.loose = true;
       }

lib/parsers.js

@@ -1,16 +1,15 @@
 'use strict';
 
-var brackets = require('expand-brackets');
-var define = require('define-property');
-var utils = require('./utils');
+const brackets = require('expand-brackets');
+const utils = require('./utils');
 
 /**
  * Characters to use in text regex (we want to "not" match
  * characters that are matched by other parsers)
  */
 
-var TEXT_REGEX = '([!@*?+]?\\(|\\)|[*?.+\\\\]|\\[:?(?=.*\\])|:?\\])+';
-var not = utils.createRegex(TEXT_REGEX);
+const TEXT_REGEX = '([!@*?+]?\\(|\\)|[*?.+\\\\]|\\[:?(?=.*\\])|:?\\])+';
+const not = utils.createRegex(TEXT_REGEX);
 
 /**
  * Extglob parsers
@@ -31,26 +30,24 @@ function parsers(extglob) {
      * Extglob open: "*("
      */
 
-    .capture('paren.open', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^([!@*?+])?\(/);
+    .set('paren.open', function() {
+      const pos = this.position();
+      const m = this.match(/^([!@*?+])?\(/);
       if (!m) return;
 
-      var prev = this.prev();
-      var prefix = m[1];
-      var val = m[0];
+      const prev = this.prev();
+      const prefix = m[1];
+      const val = m[0];
 
-      var open = pos({
+      const open = pos({
         type: 'paren.open',
-        parsed: parsed,
-        val: val
+        val
       });
 
-      var node = pos({
+      const node = pos({
         type: 'paren',
-        prefix: prefix,
-        nodes: [open]
+        prefix,
+        nodes: []
       });
 
       // if nested negation extglobs, just cancel them out to simplify
@@ -59,30 +56,26 @@ function parsers(extglob) {
         node.prefix = '@';
       }
 
-      define(node, 'rest', this.input);
-      define(node, 'parsed', parsed);
-      define(node, 'parent', prev);
-      define(open, 'parent', node);
-
+      this.pushNode(node, prev);
+      this.pushNode(open, node);
       this.push('paren', node);
-      prev.nodes.push(node);
     })
 
     /**
      * Extglob close: ")"
      */
 
-    .capture('paren.close', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\)/);
+    .set('paren.close', function() {
+      const parsed = this.parsed;
+      const pos = this.position();
+      const m = this.match(/^\)/);
       if (!m) return;
 
-      var parent = this.pop('paren');
-      var node = pos({
+      const parent = this.pop('paren');
+      const node = pos({
         type: 'paren.close',
         rest: this.input,
-        parsed: parsed,
+        parsed,
         val: m[0]
       });
 
@@ -95,17 +88,16 @@ function parsers(extglob) {
       }
 
       node.prefix = parent.prefix;
-      parent.nodes.push(node);
-      define(node, 'parent', parent);
+      this.pushNode(node, parent);
     })
 
     /**
      * Escape: "\\."
      */
 
-    .capture('escape', function() {
-      var pos = this.position();
-      var m = this.match(/^\\(.)/);
+    .set('escape', function() {
+      const pos = this.position();
+      const m = this.match(/^\\(.)/);
       if (!m) return;
 
       return pos({
@@ -119,16 +111,16 @@ function parsers(extglob) {
      * Question marks: "?"
      */
 
-    .capture('qmark', function() {
-      var parsed = this.parsed;
-      var pos = this.position();
-      var m = this.match(/^\?+(?!\()/);
+    .set('qmark', function() {
+      const parsed = this.parsed;
+      const pos = this.position();
+      const m = this.match(/^\?+(?!\()/);
       if (!m) return;
       extglob.state.metachar = true;
       return pos({
         type: 'qmark',
         rest: this.input,
-        parsed: parsed,
+        parsed,
         val: m[0]
       });
     })

lib/utils.js

@@ -1,14 +1,14 @@
 'use strict';
 
-var regex = require('regex-not');
-var Cache = require('fragment-cache');
+const regex = require('regex-not');
+const Cache = require('fragment-cache');
 
 /**
  * Utils
  */
 
-var utils = module.exports;
-var cache = utils.cache = new Cache();
+const utils = module.exports;
+const cache = utils.cache = new Cache();
 
 /**
  * Cast `val` to an array
@@ -27,13 +27,13 @@ utils.arrayify = function(val) {
  */
 
 utils.memoize = function(type, pattern, options, fn) {
-  var key = utils.createKey(type + pattern, options);
+  const key = utils.createKey(type + pattern, options);
 
   if (cache.has(type, key)) {
     return cache.get(type, key);
   }
 
-  var val = fn(pattern, options);
+  const val = fn(pattern, options);
   if (options && options.cache === false) {
     return val;
   }
@@ -49,11 +49,11 @@ utils.memoize = function(type, pattern, options, fn) {
  */
 
 utils.createKey = function(pattern, options) {
-  var key = pattern;
+  let key = pattern;
   if (typeof options === 'undefined') {
     return key;
   }
-  for (var prop in options) {
+  for (const prop in options) {
     key += ';' + prop + '=' + String(options[prop]);
   }
   return key;
@@ -64,6 +64,6 @@ utils.createKey = function(pattern, options) {
  */
 
 utils.createRegex = function(str) {
-  var opts = {contains: true, strictClose: false};
+  const opts = {contains: true, strictClose: false};
   return regex(str, opts);
 };

package.json

@@ -10,7 +10,8 @@
     "Isiah Meadows (https://www.isiahmeadows.com)",
     "Jon Schlinkert (http://twitter.com/jonschlinkert)",
     "Matt Bierner (http://mattbierner.com)",
-    "Shinnosuke Watanabe (https://shinnn.github.io)"
+    "Shinnosuke Watanabe (https://shinnn.github.io)",
+    "Daniel Tschinder (https://github.com/danez)"
   ],
   "repository": "micromatch/extglob",
   "bugs": {
@@ -23,19 +24,19 @@
   ],
   "main": "index.js",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4.0.0"
   },
   "scripts": {
     "test": "mocha"
   },
   "dependencies": {
     "array-unique": "^0.3.2",
-    "define-property": "^1.0.0",
-    "expand-brackets": "^2.1.4",
-    "extend-shallow": "^2.0.1",
+    "define-property": "^2.0.2",
+    "expand-brackets": "^4.0.0",
     "fragment-cache": "^0.2.1",
     "regex-not": "^1.0.0",
-    "snapdragon": "^0.8.1",
+    "snapdragon": "^0.12.0",
+    "snapdragon-capture": "^0.2.0",
     "to-regex": "^3.0.1"
   },
   "devDependencies": {

test/_negations.js

@@ -52,7 +52,7 @@ module.exports = {
   'asd.jss.xyz': {
     '*.!(js)*.!(xy)': false,
     '*.!(js)*.!(xy)*': false,
-    '*.!(js).!(xy)': false,
+    '*.!(js).!(xy)': false
   },
 
   'asd.jss.xy': {
@@ -102,8 +102,8 @@ module.exports = {
     '*.!(js)+': false,
     '!(*(.js.js))': true,
     '*.!(js)': true,
-    '*.!(js)*': false,     // Bash 4.3 disagrees!
-    '*.!(js)*.js': false   // Bash 4.3 disagrees!
+    '*.!(js)*': false, // Bash 4.3 disagrees!
+    '*.!(js)*.js': false // Bash 4.3 disagrees!
   },
 
   'a/foo.js.js': {

test/bash.extglob2.js

@@ -58,7 +58,7 @@ describe('bash extglob2 tests', function() {
     [ 'foo', '!(foo)*', false ], // Bash 4.3 disagrees!
     [ 'foobar', '!(foo)', true ],
     [ 'foobar', '!(foo)*', false ], // Bash 4.3 disagrees!
-    [ 'moo.cow', '!(*.*).!(*.*)', false ],  // Bash 4.3 disagrees!
+    [ 'moo.cow', '!(*.*).!(*.*)', false ], // Bash 4.3 disagrees!
     [ 'mad.moo.cow', '!(*.*).!(*.*)', false ],
     [ 'mucca.pazza', 'mu!(*(c))?.pa!(*(z))?', false ],
     [ 'fff', '!(f)', true ],

test/reference.js

@@ -8,7 +8,7 @@ var negations = require('./_negations');
 
 describe('running extglob against minimatch tests', function() {
   forOwn(negations, function(val, fixture) {
-    if (fixture !== 'asd.jss.xyz') return
+    if (fixture !== 'asd.jss.xyz') return;
     describe('"' + fixture + '"', function() {
       forOwn(val, function(expected, pattern) {
         var exp = expected === false ? ' not' : '';