feat: follow Fred's advice, replace esprima with cherow

Author: 3cp

package.json

@@ -42,10 +42,10 @@
     "@babel/core": "^7.2.0",
     "@babel/plugin-transform-modules-amd": "^7.2.0",
     "ast-matcher": "^1.0.1",
+    "cherow": "^1.6.8",
     "del": "^3.0.0",
     "dumber-module-loader": "^0.14.0",
     "escope": "^3.6.0",
-    "esprima": "^4.0.1",
     "mkdirp": "^0.5.1",
     "node-fetch": "^2.3.0",
     "node-libs-browser": "^2.1.0"

src/ensure-parser-set.js

@@ -1,14 +1,14 @@
-import {parseModule} from 'esprima';
+import {parse} from 'cherow';
 import astMatcher from 'ast-matcher';
 
-function parser (contents) {
+function _parser (contents) {
   // Turn on range to get position info in scope analysis.
   // Do not need to turn on JSX, dumber is designed to be
   // small, supposes to be used after transpiling.
-  return parseModule(contents, {range: true});
+  return parse(contents, {ranges: true, loc: true, module: true});
 }
 
 if (!astMatcher.__amd_parser_set) {
-  astMatcher.setParser(parser);
+  astMatcher.setParser(_parser);
   astMatcher.__amd_parser_set = true;
 }

src/transformers/defines.js

@@ -149,7 +149,7 @@ function ensureNamedDefine (moduleId, amdContents) {
 
   let namedDefine;
   let needsScanDeps = true;
-  let firstArgLoc = args[0].range[0];
+  let firstArgLoc = args[0].start; // .start for cherow, .range[0] for esprima
 
   if (args[0].type === 'Literal') {
     // already has named define
@@ -223,9 +223,9 @@ function ensureNamedDefine (moduleId, amdContents) {
     }
 
     if (cjsDeps.length) {
-      amdContents = amdContents.substring(0, factory.range[0]) +
+      amdContents = amdContents.substring(0, factory.start) + // .start for cherow, .range[0], for esprima
                     depsString(cjsDeps) + ',' +
-                    amdContents.substring(factory.range[0]);
+                    amdContents.substring(factory.start); // .start for cherow, .range[0], for esprima
     }
   }
 

src/transformers/replace.js

@@ -39,8 +39,8 @@ export default function(contents, replacement) {
 
     if (node.value !== dep) {
       toReplace.push({
-        start: node.range[0],
-        end: node.range[1],
+        start: node.start, // .start for cherow, .range[0] for esprima
+        end: node.end, // .end cherow, .range[1] for esprima
         text: `'${dep}'`
       });
     }