add test and fix commonjs with allowAwaitOutsideFunction

Author: ota-meshi

acorn/src/state.js

@@ -5,7 +5,8 @@ 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
+  SCOPE_ARROW, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH,
+  functionFlags
 } from "./scopeflags.js"
 
 export class Parser {
@@ -85,7 +86,8 @@ export class Parser {
     this.scopeStack = []
     this.enterScope(
       this.options.sourceType === "commonjs"
-        ? SCOPE_FUNCTION // In commonjs, the top-level scope behaves like a function scope
+        // In commonjs, the top-level scope behaves like a function scope
+        ? functionFlags(this.options.allowAwaitOutsideFunction, false)
         : SCOPE_TOP
     )
 

test/run.js

@@ -85,6 +85,28 @@
           return opts.loose !== false;
         }
       }
+    },
+
+    // Test whether the test for `sourceType: 'script'` produces the same result for `'commonjs'`.
+    'Normal with sourceType: commonjs': {
+      config: {
+        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');
+        }
+      }
+    },
+    'Loose with sourceType: commonjs': {
+      config: {
+        parse: (code, option) => acorn_loose.parse(code, Object.assign({}, option, { sourceType: 'commonjs' })),
+        loose: true,
+        filter: function (test) {
+          var opts = test.options || {};
+          if (opts.loose === false) return false;
+          return opts.commonjs !== false && (!opts.sourceType || opts.sourceType === 'script');
+        }
+      }
     }
   };
 

test/tests-await-top-level.js

@@ -30,7 +30,7 @@ test("await 1", {
       }
     }
   ]
-}, {allowAwaitOutsideFunction: true, ecmaVersion: 8})
+}, {allowAwaitOutsideFunction: true, ecmaVersion: 8, commonjs: false})
 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

@@ -87,3 +87,6 @@ test("return {} / 2", {
 
 // Illegal return statement with commonjs
 testFail(`class X { static { return; } }`, "'return' outside of function (1:19)", {ecmaVersion: 13, sourceType: "commonjs"});
+
+// 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"});

test/tests-harmony.js

@@ -14873,9 +14873,9 @@ test("function foo() { new.target; }", {
 }, {ecmaVersion: 6});
 
 testFail("new.prop", "The only valid meta property for new is 'new.target' (1:4)", {ecmaVersion: 6});
-testFail("new.target", "'new.target' can only be used in functions and class static block (1:0)", {ecmaVersion: 6});
+testFail("new.target", "'new.target' can only be used in functions and class static block (1:0)", {ecmaVersion: 6, commonjs: false});
 test("function x() { return () => new.target }", {}, {ecmaVersion: 6});
-testFail("let y = () => new.target", "'new.target' can only be used in functions and class static block (1:14)", {ecmaVersion: 6});
+testFail("let y = () => new.target", "'new.target' can only be used in functions and class static block (1:14)", {ecmaVersion: 6, commonjs: false});
 
 test("export default function foo() {} false", {
   body: [

test/tests-using.js

@@ -1102,14 +1102,14 @@ testFail("let await using x = resource;", "Cannot use keyword 'await' outside an
 // let using is not allowed
 testFail("let using x = resource;", "Unexpected token (1:10)", {ecmaVersion: 17, sourceType: "module"});
 // top level using is not allowed
-testFail("using x = resource;", "Using declaration cannot appear in the top level when source type is `script` or in the bare case statement (1:0)", {ecmaVersion: 17, sourceType: "script"});
+testFail("using x = resource;", "Using declaration cannot appear in the top level when source type is `script` or in the bare case statement (1:0)", {ecmaVersion: 17, sourceType: "script", commonjs: false});
 
 // BoundNames contains "let"  
 testFail("async function test() { await using let = resource; }", "The keyword 'let' is reserved (1:36)", {ecmaVersion: 17, sourceType: "module"});
 // BoundNames contains duplicate entries
 testFail("async function test() { await using x = resource1, x = resource2; }", "Identifier 'x' has already been declared (1:51)", {ecmaVersion: 17, sourceType: "module"});
 // top level await using is not allowed
-testFail("await using x = resource;", "Using declaration cannot appear in the top level when source type is `script` or in the bare case statement (1:0)", {ecmaVersion: 17, sourceType: "script"});
+testFail("await using x = resource;", "Using declaration cannot appear in the top level when source type is `script` or in the bare case statement (1:0)", {ecmaVersion: 17, sourceType: "script", commonjs: false});
 
 // Basic missing initializer
 testFail("{ using x; }", "Missing initializer in using declaration (1:9)", {ecmaVersion: 17, sourceType: "module"});

test/tests.js

@@ -27458,7 +27458,7 @@ testFail("\"\\u",
          "Bad character escape sequence (1:3)");
 
 testFail("return",
-         "'return' outside of function (1:0)");
+         "'return' outside of function (1:0)", { commonjs: false });
 
 testFail("break",
          "Unsyntactic break (1:0)");