condenser 0.2 → 0.3

data/lib/condenser/processors/node_modules/regenerator-transform/src/emit.js

@@ -995,13 +995,13 @@ Ep.explodeExpression = function(path, ignoreResult) {
     let argsPath = path.get("arguments");
 
     let newCallee;
-    let newArgs = [];
+    let newArgs;
 
-    let hasLeapingArgs = false;
-    argsPath.forEach(function(argPath) {
-      hasLeapingArgs = hasLeapingArgs ||
-        meta.containsLeap(argPath.node);
-    });
+    let hasLeapingArgs = argsPath.some(
+      argPath => meta.containsLeap(argPath.node)
+    );
+
+    let injectFirstArg = null;
 
     if (t.isMemberExpression(calleePath.node)) {
       if (hasLeapingArgs) {
@@ -1022,7 +1022,7 @@ Ep.explodeExpression = function(path, ignoreResult) {
           ? explodeViaTempVar(null, calleePath.get("property"))
           : calleePath.node.property;
 
-        newArgs.unshift(newObject);
+        injectFirstArg = newObject;
 
         newCallee = t.memberExpression(
           t.memberExpression(
@@ -1057,14 +1057,16 @@ Ep.explodeExpression = function(path, ignoreResult) {
       }
     }
 
-    argsPath.forEach(function(argPath) {
-      newArgs.push(explodeViaTempVar(null, argPath));
-    });
+    if (hasLeapingArgs) {
+      newArgs = argsPath.map(argPath => explodeViaTempVar(null, argPath));
+      if (injectFirstArg) newArgs.unshift(injectFirstArg);
 
-    return finish(t.callExpression(
-      newCallee,
-      newArgs.map(arg => t.cloneDeep(arg))
-    ));
+      newArgs = newArgs.map(arg => t.cloneDeep(arg));
+    } else {
+      newArgs = path.node.arguments;
+    }
+
+    return finish(t.callExpression(newCallee, newArgs));
 
   case "NewExpression":
     return finish(t.newExpression(
@@ -1092,7 +1094,13 @@ Ep.explodeExpression = function(path, ignoreResult) {
   case "ArrayExpression":
     return finish(t.arrayExpression(
       path.get("elements").map(function(elemPath) {
-        return explodeViaTempVar(null, elemPath);
+        if (elemPath.isSpreadElement()) {
+          return t.spreadElement(
+            explodeViaTempVar(null, elemPath.get("argument"))
+          );
+        } else {
+          return explodeViaTempVar(null, elemPath);
+        }
       })
     ));
 

data/lib/condenser/processors/node_modules/regenerator-transform/src/visit.js

@@ -114,11 +114,9 @@ exports.getVisitor = ({ types: t }) => ({
 
       if (context.usesArguments) {
         vars = vars || t.variableDeclaration("var", []);
-        const argumentIdentifier = t.identifier("arguments");
-        // we need to do this as otherwise arguments in arrow functions gets hoisted
-        argumentIdentifier._shadowedFunctionLiteral = path;
         vars.declarations.push(t.variableDeclarator(
-          t.clone(argsId), argumentIdentifier
+          t.clone(argsId),
+          t.identifier("arguments"),
         ));
       }
 
@@ -134,7 +132,7 @@ exports.getVisitor = ({ types: t }) => ({
 
       if (node.generator) {
         wrapArgs.push(outerFnExpr);
-      } else if (context.usesThis || tryLocsList) {
+      } else if (context.usesThis || tryLocsList || node.async) {
         // Async functions that are not generators don't care about the
         // outer function because they don't need it to be marked and don't
         // inherit from its .prototype.
@@ -142,11 +140,24 @@ exports.getVisitor = ({ types: t }) => ({
       }
       if (context.usesThis) {
         wrapArgs.push(t.thisExpression());
-      } else if (tryLocsList) {
+      } else if (tryLocsList || node.async) {
         wrapArgs.push(t.nullLiteral());
       }
       if (tryLocsList) {
         wrapArgs.push(tryLocsList);
+      } else if (node.async) {
+        wrapArgs.push(t.nullLiteral());
+      }
+
+      if (node.async) {
+        // Rename any locally declared "Promise" variable,
+        // to use the global one.
+        let currentScope = path.scope;
+        do {
+          if (currentScope.hasOwnBinding("Promise")) currentScope.rename("Promise");
+        } while (currentScope = currentScope.parent);
+
+        wrapArgs.push(t.identifier("Promise"));
       }
 
       let wrapCall = t.callExpression(

data/lib/condenser/processors/node_modules/regexpu-core/README.md

@@ -1,8 +1,8 @@
 # regexpu-core [![Build status](https://travis-ci.org/mathiasbynens/regexpu-core.svg?branch=master)](https://travis-ci.org/mathiasbynens/regexpu-core) [![Code coverage status](https://img.shields.io/codecov/c/github/mathiasbynens/regexpu-core.svg)](https://codecov.io/gh/mathiasbynens/regexpu-core)
 
-_regexpu_ is a source code transpiler that enables the use of ES6 Unicode regular expressions in JavaScript-of-today (ES5).
+_regexpu_ is a source code transpiler that enables the use of ES2015 Unicode regular expressions in JavaScript-of-today (ES5).
 
-_regexpu-core_ contains _regexpu_’s core functionality, i.e. `rewritePattern(pattern, flag)`, which enables rewriting regular expressions that make use of [the ES6 `u` flag](https://mathiasbynens.be/notes/es6-unicode-regex) into equivalent ES5-compatible regular expression patterns.
+_regexpu-core_ contains _regexpu_’s core functionality, i.e. `rewritePattern(pattern, flag)`, which enables rewriting regular expressions that make use of [the ES2015 `u` flag](https://mathiasbynens.be/notes/es6-unicode-regex) into equivalent ES5-compatible regular expression patterns.
 
 ## Installation
 
@@ -44,7 +44,7 @@ _regexpu-core_ can rewrite non-ES6 regular expressions too, which is useful to d
 rewritePattern('foo.bar');
 // → 'foo(?:[\\0-\\t\\x0B\\f\\x0E-\\u2027\\u202A-\\uFFFF])bar'
 
-// But with the ES6 `u` flag, it matches astral symbols too:
+// But with the ES2015 `u` flag, it matches astral symbols too:
 rewritePattern('foo.bar', 'u');
 // → 'foo(?:[\\0-\\t\\x0B\\f\\x0E-\\u2027\\u202A-\\uD7FF\\uDC00-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF])bar'
 ```
@@ -125,7 +125,7 @@ rewritePattern('(?<name>.)\k<name>', '', {
 
 #### `useUnicodeFlag` (default: `false`)
 
-Setting this option to `true` enables the use of Unicode code point escapes of the form `\u{…}`. Note that in regular expressions, such escape sequences only work correctly when the ES6 `u` flag is set. Enabling this setting often results in more compact output, although there are cases (such as `\p{Lu}`) where it actually _increases_ the output size.
+Setting this option to `true` enables the use of Unicode code point escapes of the form `\u{…}`. Note that in regular expressions, such escape sequences only work correctly when the ES2015 `u` flag is set. Enabling this setting often results in more compact output, although there are cases (such as `\p{Lu}`) where it actually _increases_ the output size.
 
 ```js
 rewritePattern('\\p{Script_Extensions=Anatolian_Hieroglyphs}', 'u', {

data/lib/condenser/processors/node_modules/regexpu-core/package.json

@@ -1,26 +1,26 @@
 {
-  "_from": "regexpu-core@^4.6.0",
-  "_id": "regexpu-core@4.6.0",
+  "_from": "regexpu-core@^4.7.0",
+  "_id": "regexpu-core@4.7.0",
   "_inBundle": false,
-  "_integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+  "_integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
   "_location": "/regexpu-core",
   "_phantomChildren": {},
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "regexpu-core@^4.6.0",
+    "raw": "regexpu-core@^4.7.0",
     "name": "regexpu-core",
     "escapedName": "regexpu-core",
-    "rawSpec": "^4.6.0",
+    "rawSpec": "^4.7.0",
     "saveSpec": null,
-    "fetchSpec": "^4.6.0"
+    "fetchSpec": "^4.7.0"
   },
   "_requiredBy": [
     "/@babel/helper-create-regexp-features-plugin"
   ],
-  "_resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
-  "_shasum": "2037c18b327cfce8a6fea2a4ec441f2432afb8b6",
-  "_spec": "regexpu-core@^4.6.0",
+  "_resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
+  "_shasum": "fcbf458c50431b0bb7b45d6967b8192d91f3d938",
+  "_spec": "regexpu-core@^4.7.0",
   "_where": "/Users/malomalo/Code/condenser/lib/condenser/processors/node_modules/@babel/helper-create-regexp-features-plugin",
   "author": {
     "name": "Mathias Bynens",
@@ -32,22 +32,22 @@
   "bundleDependencies": false,
   "dependencies": {
     "regenerate": "^1.4.0",
-    "regenerate-unicode-properties": "^8.1.0",
-    "regjsgen": "^0.5.0",
-    "regjsparser": "^0.6.0",
+    "regenerate-unicode-properties": "^8.2.0",
+    "regjsgen": "^0.5.1",
+    "regjsparser": "^0.6.4",
     "unicode-match-property-ecmascript": "^1.0.4",
-    "unicode-match-property-value-ecmascript": "^1.1.0"
+    "unicode-match-property-value-ecmascript": "^1.2.0"
   },
   "deprecated": false,
   "description": "regexpu’s core functionality (i.e. `rewritePattern(pattern, flag)`), capable of translating ES6 Unicode regular expressions to ES5.",
   "devDependencies": {
-    "codecov": "^3.5.0",
+    "codecov": "^3.6.5",
     "istanbul": "^0.4.5",
     "jsesc": "^2.5.2",
     "lodash": "^4.17.15",
-    "mocha": "^6.2.0",
+    "mocha": "^7.1.0",
     "regexpu-fixtures": "^2.1.3",
-    "unicode-12.1.0": "^0.8.0"
+    "unicode-13.0.0": "^0.8.0"
   },
   "engines": {
     "node": ">=4"
@@ -90,5 +90,5 @@
     "cover": "istanbul cover --report html node_modules/.bin/_mocha tests -- -u exports -R spec",
     "test": "mocha tests"
   },
-  "version": "4.6.0"
+  "version": "4.7.0"
 }

data/lib/condenser/processors/node_modules/regexpu-core/rewrite-pattern.js

@@ -202,11 +202,13 @@ const processTerm = (item, regenerateOptions, groups) => {
 			item = processCharacterClass(item, regenerateOptions);
 			break;
 		case 'unicodePropertyEscape':
-			update(
-				item,
-				getUnicodePropertyEscapeSet(item.value, item.negative)
-					.toString(regenerateOptions)
-			);
+			if (config.unicodePropertyEscape) {
+				update(
+					item,
+					getUnicodePropertyEscapeSet(item.value, item.negative)
+						.toString(regenerateOptions)
+				);
+			}
 			break;
 		case 'characterClassEscape':
 			update(
@@ -222,7 +224,7 @@ const processTerm = (item, regenerateOptions, groups) => {
 			if (item.behavior == 'normal') {
 				groups.lastIndex++;
 			}
-			if (item.name) {
+			if (item.name && config.namedGroup) {
 				const name = item.name.value;
 
 				if (groups.names[name]) {
@@ -299,19 +301,23 @@ const config = {
 	'ignoreCase': false,
 	'unicode': false,
 	'dotAll': false,
-	'useUnicodeFlag': false
+	'useUnicodeFlag': false,
+	'unicodePropertyEscape': false,
+	'namedGroup': false
 };
 const rewritePattern = (pattern, flags, options) => {
+	config.unicode = flags && flags.includes('u');
 	const regjsparserFeatures = {
-		'unicodePropertyEscape': options && options.unicodePropertyEscape,
-		'namedGroups': options && options.namedGroup,
+		'unicodePropertyEscape': config.unicode,
+		'namedGroups': true,
 		'lookbehind': options && options.lookbehind
 	};
 	config.ignoreCase = flags && flags.includes('i');
-	config.unicode = flags && flags.includes('u');
 	const supportDotAllFlag = options && options.dotAllFlag;
 	config.dotAll = supportDotAllFlag && flags && flags.includes('s');
+	config.namedGroup = options && options.namedGroup;
 	config.useUnicodeFlag = options && options.useUnicodeFlag;
+	config.unicodePropertyEscape = options && options.unicodePropertyEscape;
 	const regenerateOptions = {
 		'hasUnicodeFlag': config.useUnicodeFlag,
 		'bmpOnly': !config.unicode

data/lib/condenser/processors/node_modules/regjsgen/package.json

@@ -1,5 +1,5 @@
 {
-  "_from": "regjsgen@^0.5.0",
+  "_from": "regjsgen@^0.5.1",
   "_id": "regjsgen@0.5.1",
   "_inBundle": false,
   "_integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
@@ -8,19 +8,19 @@
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "regjsgen@^0.5.0",
+    "raw": "regjsgen@^0.5.1",
     "name": "regjsgen",
     "escapedName": "regjsgen",
-    "rawSpec": "^0.5.0",
+    "rawSpec": "^0.5.1",
     "saveSpec": null,
-    "fetchSpec": "^0.5.0"
+    "fetchSpec": "^0.5.1"
   },
   "_requiredBy": [
     "/regexpu-core"
   ],
   "_resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
   "_shasum": "48f0bf1a5ea205196929c0d9798b42d1ed98443c",
-  "_spec": "regjsgen@^0.5.0",
+  "_spec": "regjsgen@^0.5.1",
   "_where": "/Users/malomalo/Code/condenser/lib/condenser/processors/node_modules/regexpu-core",
   "author": {
     "name": "Benjamin Tan",

data/lib/condenser/processors/node_modules/regjsparser/package.json

@@ -1,26 +1,26 @@
 {
-  "_from": "regjsparser@^0.6.0",
-  "_id": "regjsparser@0.6.2",
+  "_from": "regjsparser@^0.6.4",
+  "_id": "regjsparser@0.6.4",
   "_inBundle": false,
-  "_integrity": "sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q==",
+  "_integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
   "_location": "/regjsparser",
   "_phantomChildren": {},
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "regjsparser@^0.6.0",
+    "raw": "regjsparser@^0.6.4",
     "name": "regjsparser",
     "escapedName": "regjsparser",
-    "rawSpec": "^0.6.0",
+    "rawSpec": "^0.6.4",
     "saveSpec": null,
-    "fetchSpec": "^0.6.0"
+    "fetchSpec": "^0.6.4"
   },
   "_requiredBy": [
     "/regexpu-core"
   ],
-  "_resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz",
-  "_shasum": "fd62c753991467d9d1ffe0a9f67f27a529024b96",
-  "_spec": "regjsparser@^0.6.0",
+  "_resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+  "_shasum": "a769f8684308401a66e9b529d2436ff4d0666272",
+  "_spec": "regjsparser@^0.6.4",
   "_where": "/Users/malomalo/Code/condenser/lib/condenser/processors/node_modules/regexpu-core",
   "author": {
     "name": "'Julian Viereck'",
@@ -59,5 +59,5 @@
   "scripts": {
     "test": "node test/index.js"
   },
-  "version": "0.6.2"
+  "version": "0.6.4"
 }

data/lib/condenser/processors/node_modules/regjsparser/parser.js

@@ -481,7 +481,7 @@
         return anchor;
       }
 
-      var atom = parseAtom();
+      var atom = parseAtomAndExtendedAtom();
       if (!atom) {
         bail('Expected atom');
       }
@@ -605,7 +605,12 @@
       return quantifier;
     }
 
-    function parseAtom() {
+    function parseAtomAndExtendedAtom() {
+      // Parsing Atom and ExtendedAtom together due to redundancy.
+      // ExtendedAtom is defined in Apendix B of the ECMA-262 standard.
+      //
+      // SEE: https://www.ecma-international.org/ecma-262/10.0/index.html#prod-annexB-ExtendedPatternCharacter
+      //
       // Atom ::
       //      PatternCharacter
       //      .
@@ -613,16 +618,23 @@
       //      CharacterClass
       //      ( GroupSpecifier Disjunction )
       //      ( ? : Disjunction )
+      // ExtendedAtom ::
+      //      ExtendedPatternCharacter
+      // ExtendedPatternCharacter ::
+      //      SourceCharacter but not one of ^$\.*+?()[|
 
       var res;
 
       // jviereck: allow ']', '}' here as well to be compatible with browser's
       //   implementations: ']'.match(/]/);
-      // if (res = matchReg(/^[^^$\\.*+?()[\]{}|]/)) {
-      if (res = matchReg(/^[^^$\\.*+?(){[|]/)) {
+      if (res = matchReg(/^[^^$\\.*+?()[\]{}|]/)) {
         //      PatternCharacter
         return createCharacter(res);
       }
+      else if (!hasUnicodeFlag && (res = matchReg(/^(?:]|})/))) {
+        //      ExtendedPatternCharacter
+        return createCharacter(res);
+      }
       else if (match('.')) {
         //      .
         return createDot();

data/lib/condenser/processors/node_modules/resolve/.editorconfig

@@ -0,0 +1,20 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 150
+
+[CHANGELOG.md]
+indent_style = space
+indent_size = 2
+
+[*.json]
+max_line_length = off
+
+[Makefile]
+max_line_length = off

data/lib/condenser/processors/node_modules/resolve/appveyor.yml

@@ -23,6 +23,7 @@ environment:
 matrix:
   # fast_finish: true
   allow_failures:
+    - nodejs_version: "5" # due to windows npm bug, registry-side
     - nodejs_version: "0.8"
     - nodejs_version: "0.6"
 

data/lib/condenser/processors/node_modules/resolve/index.js

@@ -3,5 +3,4 @@ async.core = require('./lib/core');
 async.isCore = require('./lib/is-core');
 async.sync = require('./lib/sync');
 
-exports = async;
 module.exports = async;

data/lib/condenser/processors/node_modules/resolve/lib/async.js

@@ -5,6 +5,8 @@ var nodeModulesPaths = require('./node-modules-paths.js');
 var normalizeOptions = require('./normalize-options.js');
 var isCore = require('./is-core');
 
+var realpath = fs.realpath && typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath;
+
 var defaultIsFile = function isFile(file, cb) {
     fs.stat(file, function (err, stat) {
         if (!err) {
@@ -27,7 +29,7 @@ var defaultIsDir = function isDirectory(dir, cb) {
 
 var maybeUnwrapSymlink = function maybeUnwrapSymlink(x, opts, cb) {
     if (opts && opts.preserveSymlinks === false) {
-        fs.realpath(x, function (realPathErr, realPath) {
+        realpath(x, function (realPathErr, realPath) {
             if (realPathErr && realPathErr.code !== 'ENOENT') cb(realPathErr);
             else cb(null, realPathErr ? x : realPath);
         });
@@ -36,6 +38,14 @@ var maybeUnwrapSymlink = function maybeUnwrapSymlink(x, opts, cb) {
     }
 };
 
+var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+    var dirs = nodeModulesPaths(start, opts, x);
+    for (var i = 0; i < dirs.length; i++) {
+        dirs[i] = path.join(dirs[i], x);
+    }
+    return dirs;
+};
+
 module.exports = function resolve(x, options, callback) {
     var cb = callback;
     var opts = options;
@@ -55,6 +65,7 @@ module.exports = function resolve(x, options, callback) {
     var isFile = opts.isFile || defaultIsFile;
     var isDirectory = opts.isDirectory || defaultIsDir;
     var readFile = opts.readFile || fs.readFile;
+    var packageIterator = opts.packageIterator;
 
     var extensions = opts.extensions || ['.js'];
     var basedir = opts.basedir || path.dirname(caller());
@@ -78,7 +89,7 @@ module.exports = function resolve(x, options, callback) {
     function init(basedir) {
         if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
             res = path.resolve(basedir, x);
-            if (x === '..' || x.slice(-1) === '/') res += '/';
+            if (x === '.' || x === '..' || x.slice(-1) === '/') res += '/';
             if ((/\/$/).test(x) && res === basedir) {
                 loadAsDirectory(res, opts.package, onfile);
             } else loadAsFile(res, opts.package, onfile);
@@ -251,19 +262,18 @@ module.exports = function resolve(x, options, callback) {
         if (dirs.length === 0) return cb(null, undefined);
         var dir = dirs[0];
 
-        isDirectory(dir, isdir);
+        isDirectory(path.dirname(dir), isdir);
 
         function isdir(err, isdir) {
             if (err) return cb(err);
             if (!isdir) return processDirs(cb, dirs.slice(1));
-            var file = path.join(dir, x);
-            loadAsFile(file, opts.package, onfile);
+            loadAsFile(dir, opts.package, onfile);
         }
 
         function onfile(err, m, pkg) {
             if (err) return cb(err);
             if (m) return cb(null, m, pkg);
-            loadAsDirectory(path.join(dir, x), opts.package, ondir);
+            loadAsDirectory(dir, opts.package, ondir);
         }
 
         function ondir(err, n, pkg) {
@@ -273,6 +283,10 @@ module.exports = function resolve(x, options, callback) {
         }
     }
     function loadNodeModules(x, start, cb) {
-        processDirs(cb, nodeModulesPaths(start, opts, x));
+        var thunk = function () { return getPackageCandidates(x, start, opts); };
+        processDirs(
+            cb,
+            packageIterator ? packageIterator(x, start, thunk, opts) : thunk()
+        );
     }
 };