chang to reject the combination of allowAwaitOutsideFunction and commonjs

Author: ota-meshi

acorn/README.md

@@ -65,7 +65,8 @@ required):
   and parsing of `import` and `export` declarations.
 
   **NOTE**: If set to `"module"`, then static `import` / `export` syntax
-  will be valid, even if `ecmaVersion` is less than 6. If set to `"commonjs"`, it is the same as `"script"` except that the top-level scope behaves like a function.
+  will be valid, even if `ecmaVersion` is less than 6. If set to `"commonjs"`,
+  it is the same as `"script"` except that the top-level scope behaves like a function.
 
 - **onInsertedSemicolon**: If given a callback, that callback will be
   called whenever a missing semicolon is inserted by the parser. The
@@ -97,7 +98,7 @@ required):
   for `ecmaVersion` 2022 and later, `false` for lower versions.
   Setting this option to `true` allows to have top-level `await`
   expressions. They are still not allowed in non-`async` functions,
-  though.
+  though. Setting this option to `true` is not allowed when `sourceType: "commonjs"`.
 
 - **allowSuperOutsideMethod**: By default, `super` outside a method
   raises an error. Set this to `true` to accept such code.

acorn/src/options.js

@@ -137,6 +137,9 @@ export function getOptions(opts) {
   if (isArray(options.onComment))
     options.onComment = pushComment(options, options.onComment)
 
+  if (options.sourceType === "commonjs" && options.allowAwaitOutsideFunction)
+    throw new Error("Cannot use allowAwaitOutsideFunction with sourceType: commonjs")
+
   return options
 }
 

acorn/src/state.js

@@ -5,8 +5,7 @@ import {getOptions} from "./options.js"
 import {wordsRegexp} from "./util.js"
 import {
   SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_SUPER, SCOPE_DIRECT_SUPER,
-  SCOPE_ARROW, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH,
-  functionFlags
+  SCOPE_ARROW, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH
 } from "./scopeflags.js"
 
 export class Parser {
@@ -87,7 +86,7 @@ export class Parser {
     this.enterScope(
       this.options.sourceType === "commonjs"
         // In commonjs, the top-level scope behaves like a function scope
-        ? functionFlags(this.options.allowAwaitOutsideFunction, false)
+        ? SCOPE_FUNCTION
         : SCOPE_TOP
     )
 

test/driver.js

@@ -27,13 +27,13 @@ exports.runTests = function(config, callback) {
     try {
       var ast = parse(test.code, testOpts);
     } catch(e) {
-      if (!(e instanceof SyntaxError)) { console.log(e.stack); throw e; }
       if (test.error) {
         if (test.error.charAt(0) === "~" ? e.message.indexOf(test.error.slice(1)) > -1 : e.message === test.error)
           callback("ok", test.code);
         else
           callback("fail", test.code, "Expected error message: " + test.error + "\nGot error message: " + e.message);
       } else {
+        if (!(e instanceof SyntaxError)) { console.log(e.stack); throw e; }
         callback("error", test.code, e.message || e.toString());
       }
       continue

test/run.js

@@ -93,7 +93,7 @@
         parse: (code, option) => acorn.parse(code, Object.assign({}, option, { sourceType: 'commonjs' })),
         filter: function (test) {
           var opts = test.options || {};
-          return opts.commonjs !== false && (!opts.sourceType || opts.sourceType === 'script');
+          return opts.commonjs !== false && !opts.allowAwaitOutsideFunction && (!opts.sourceType || opts.sourceType === 'script');
         }
       }
     },
@@ -104,7 +104,7 @@
         filter: function (test) {
           var opts = test.options || {};
           if (opts.loose === false) return false;
-          return opts.commonjs !== false && (!opts.sourceType || opts.sourceType === 'script');
+          return opts.commonjs !== false && !opts.allowAwaitOutsideFunction && (!opts.sourceType || opts.sourceType === 'script');
         }
       }
     }

test/tests-await-top-level.js

@@ -30,7 +30,7 @@ test("await 1", {
       }
     }
   ]
-}, {allowAwaitOutsideFunction: true, ecmaVersion: 8, commonjs: false})
+}, {allowAwaitOutsideFunction: true, ecmaVersion: 8})
 testFail("function foo() {return await 1}", "Unexpected token (1:29)", {ecmaVersion: 8})
 testFail("function foo() {return await 1}", "Unexpected token (1:29)", {
   allowAwaitOutsideFunction: true,

test/tests-commonjs.js

@@ -90,3 +90,8 @@ testFail(`class X { static { return; } }`, "'return' outside of function (1:19)"
 
 // Top-level await using declaration with commonjs
 testFail("await using x = resource;", "Await using cannot appear outside of async function (1:0)", {ecmaVersion: 17, sourceType: "commonjs"});
+
+// Disallowing allowAwaitOutsideFunction with commonjs
+testFail("await 1", "Cannot use allowAwaitOutsideFunction with sourceType: commonjs", {allowAwaitOutsideFunction: true, sourceType: "commonjs"});
+testFail("x", "Cannot use allowAwaitOutsideFunction with sourceType: commonjs", {allowAwaitOutsideFunction: true, sourceType: "commonjs"});
+test("x", {}, {allowAwaitOutsideFunction: false, sourceType: "commonjs"});