Merge pull request #1 from browserify/acorn-6

Acorn 6

Author: goto-bus-stop

LICENSE.md

@@ -14,26 +14,82 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-## acorn5-object-spread
+## acorn-bigint
 
-The code in the `lib/object-spread` folder is compiled from code licensed as MIT:
-
-> Copyright (C) 2016 by UXtemple
+The code in the `lib/bigint` folder is compiled from code licensed as MIT:
 
+> Copyright (C) 2017-2018 by Adrian Heine
+>
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal
 > in the Software without restriction, including without limitation the rights
 > to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 > copies of the Software, and to permit persons to whom the Software is
 > furnished to do so, subject to the following conditions:
-
+>
 > The above copyright notice and this permission notice shall be included in
 > all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
 
+Find the source code at https://github.com/acornjs/acorn-bigint.
+
+## acorn-import-meta
+
+The code in the `lib/import-meta` folder is compiled from code licensed as MIT:
+
+> Copyright (C) 2017-2018 by Adrian Heine
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+>
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 > IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 > FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 > AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 > LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 > THE SOFTWARE.
+
+Find the source code at https://github.com/acornjs/acorn-import-meta.
+
+## acorn-dynamic-import
+
+The code in the `lib/dynamic-import` folder is licensed as MIT:
+
+> MIT License
+>
+> Copyright (c) 2016 Jordan Gensler
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.
+
+Find the source code at https://github.com/kesne/acorn-dynamic-import.

README.md

@@ -29,6 +29,7 @@ var acorn = require('acorn-node')
 
 The API is the same as [acorn](https://github.com/acornjs/acorn), but the following syntax features are enabled by default:
 
+ - Bigint syntax (via [acorn-bigint](https://github.com/acornjs/acorn-bigint]))
  - Dynamic `import()` (via [acorn-dynamic-import](https://github.com/kesne/acorn-dynamic-import))
  - The `import.meta` property (via [acorn-import-meta](https://github.com/acornjs/acorn-import-meta))
 

build.js

@@ -17,4 +17,6 @@ function compile (name, output) { // eslint-disable-line no-unused-vars
   fs.writeFileSync(path.join(__dirname, output), HEADER + result.code, 'utf8')
 }
 
-compile('acorn-import-meta/inject', './lib/import-meta/index.js')
+compile('acorn-bigint', './lib/bigint/index.js')
+compile('acorn-import-meta', './lib/import-meta/index.js')
+compile('./lib/dynamic-import/source', './lib/dynamic-import/index.js')

index.js

@@ -1,32 +1,34 @@
 var acorn = require('acorn')
 var xtend = require('xtend')
 
+var CJSParser = acorn.Parser
+  .extend(require('./lib/bigint'))
+var ESModulesParser = CJSParser
+  .extend(require('./lib/dynamic-import'))
+  .extend(require('./lib/import-meta'))
+
 function mapOptions (opts) {
   if (!opts) opts = {}
-  opts = xtend({
+  return xtend({
     ecmaVersion: 2019,
     allowHashBang: true,
-    allowReturnOutsideFunction: true,
-    plugins: {
-      dynamicImport: opts.sourceType === 'module',
-      importMeta: opts.sourceType === 'module'
-    }
+    allowReturnOutsideFunction: true
   }, opts)
-  opts.plugins = xtend(opts.plugins, {})
-  return opts
+}
+
+function getParser (opts) {
+  if (!opts) opts = {}
+  return opts.sourceType === 'module' ? ESModulesParser : CJSParser
 }
 
 module.exports = exports = xtend(acorn, {
   parse: function parse (src, opts) {
-    return acorn.parse(src, mapOptions(opts))
+    return getParser(opts).parse(src, mapOptions(opts))
   },
   parseExpressionAt: function parseExpressionAt (src, offset, opts) {
-    return acorn.parseExpressionAt(src, offset, mapOptions(opts))
+    return getParser(opts).parseExpressionAt(src, offset, mapOptions(opts))
   },
   tokenizer: function tokenizer (src, opts) {
-    return acorn.tokenizer(src, mapOptions(opts))
+    return getParser(opts).tokenizer(src, mapOptions(opts))
   }
 })
-
-require('acorn-dynamic-import/lib/inject').default(exports)
-require('./lib/import-meta')(exports)

lib/bigint/index.js

@@ -0,0 +1,65 @@
+/* Generated by `npm run build`, do not edit! */
+
+"use strict"
+
+var acorn = require("acorn")
+var tt = acorn.tokTypes
+var isIdentifierStart = acorn.isIdentifierStart
+
+module.exports = function(Parser) {
+  return (function (Parser) {
+    function anonymous () {
+      Parser.apply(this, arguments);
+    }
+
+    if ( Parser ) anonymous.__proto__ = Parser;
+    anonymous.prototype = Object.create( Parser && Parser.prototype );
+    anonymous.prototype.constructor = anonymous;
+
+    anonymous.prototype.parseLiteral = function parseLiteral (value) {
+      var node = Parser.prototype.parseLiteral.call(this, value)
+      if (node.raw.charCodeAt(node.raw.length - 1) == 110) { node.bigint = node.raw }
+      return node
+    };
+
+    anonymous.prototype.readRadixNumber = function readRadixNumber (radix) {
+      var start = this.pos
+      this.pos += 2 // 0x
+      var val = this.readInt(radix)
+      if (val === null) { this.raise(this.start + 2, ("Expected number in radix " + radix)) }
+      if (this.input.charCodeAt(this.pos) == 110) {
+        var str = this.input.slice(start, this.pos)
+        val = typeof BigInt !== "undefined" ? BigInt(str) : null
+        ++this.pos
+      } else if (isIdentifierStart(this.fullCharCodeAtPos())) { this.raise(this.pos, "Identifier directly after number") }
+      return this.finishToken(tt.num, val)
+    };
+
+    anonymous.prototype.readNumber = function readNumber (startsWithDot) {
+      var start = this.pos
+
+      // Not an int
+      if (startsWithDot) { return Parser.prototype.readNumber.call(this, startsWithDot) }
+
+      // Legacy octal
+      if (this.input.charCodeAt(start) === 48 && this.input.charCodeAt(start + 1) !== 110) {
+        return Parser.prototype.readNumber.call(this, startsWithDot)
+      }
+
+      if (this.readInt(10) === null) { this.raise(start, "Invalid number") }
+
+      // Not a BigInt, reset and parse again
+      if (this.input.charCodeAt(this.pos) != 110) {
+        this.pos = start
+        return Parser.prototype.readNumber.call(this, startsWithDot)
+      }
+
+      var str = this.input.slice(start, this.pos)
+      var val = typeof BigInt !== "undefined" && BigInt.parseInt ? BigInt.parseInt(str) : null
+      ++this.pos
+      return this.finishToken(tt.num, val)
+    };
+
+    return anonymous;
+  }(Parser))
+}

lib/dynamic-import/index.js

@@ -0,0 +1,55 @@
+/* Generated by `npm run build`, do not edit! */
+
+/* eslint-disable no-underscore-dangle */
+
+var DynamicImportKey = 'Import';
+
+var ref = require('acorn');
+var tt = ref.tokTypes;
+
+// NOTE: This allows `yield import()` to parse correctly.
+tt._import.startsExpr = true;
+
+function parseDynamicImport() {
+  var node = this.startNode();
+  this.next();
+  if (this.type !== tt.parenL) {
+    this.unexpected();
+  }
+  return this.finishNode(node, DynamicImportKey);
+}
+
+function parenAfter() {
+  return /^(\s|\/\/.*|\/\*[^]*?\*\/)*\(/.test(this.input.slice(this.pos));
+}
+
+function dynamicImport(Parser) {
+  return (function (Parser) {
+    function anonymous () {
+      Parser.apply(this, arguments);
+    }
+
+    if ( Parser ) anonymous.__proto__ = Parser;
+    anonymous.prototype = Object.create( Parser && Parser.prototype );
+    anonymous.prototype.constructor = anonymous;
+
+    anonymous.prototype.parseStatement = function parseStatement (context, topLevel, exports) {
+      if (this.type === tt._import && parenAfter.call(this)) {
+        return this.parseExpressionStatement(this.startNode(), this.parseExpression());
+      }
+      return Parser.prototype.parseStatement.call(this, context, topLevel, exports)
+    };
+
+    anonymous.prototype.parseExprAtom = function parseExprAtom (refDestructuringErrors) {
+      if (this.type === tt._import) {
+        return parseDynamicImport.call(this);
+      }
+      return Parser.prototype.parseExprAtom.call(this, refDestructuringErrors);
+    };
+
+    return anonymous;
+  }(Parser));
+};
+
+module.exports = dynamicImport
+dynamicImport.DynamicImportKey = DynamicImportKey

lib/dynamic-import/source.js

@@ -0,0 +1,42 @@
+/* eslint-disable no-underscore-dangle */
+
+const DynamicImportKey = 'Import';
+
+const { tokTypes: tt } = require('acorn')
+
+// NOTE: This allows `yield import()` to parse correctly.
+tt._import.startsExpr = true;
+
+function parseDynamicImport() {
+  const node = this.startNode();
+  this.next();
+  if (this.type !== tt.parenL) {
+    this.unexpected();
+  }
+  return this.finishNode(node, DynamicImportKey);
+}
+
+function parenAfter() {
+  return /^(\s|\/\/.*|\/\*[^]*?\*\/)*\(/.test(this.input.slice(this.pos));
+}
+
+function dynamicImport(Parser) {
+  return class extends Parser {
+    parseStatement(context, topLevel, exports) {
+      if (this.type === tt._import && parenAfter.call(this)) {
+        return this.parseExpressionStatement(this.startNode(), this.parseExpression());
+      }
+      return super.parseStatement(context, topLevel, exports)
+    }
+
+    parseExprAtom(refDestructuringErrors) {
+      if (this.type === tt._import) {
+        return parseDynamicImport.call(this);
+      }
+      return super.parseExprAtom(refDestructuringErrors);
+    }
+  };
+};
+
+module.exports = dynamicImport
+dynamicImport.DynamicImportKey = DynamicImportKey