deps: update Acorn to v8.5.0

PR-URL: #40015
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: targos

deps/acorn/acorn-walk/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 8.2.0 (2021-09-06)
+
+### New features
+
+Add support for walking ES2022 class static blocks.
+
+## 8.1.1 (2021-06-29)
+
+### Bug fixes
+
+Include `base` in the type declarations.
+
 ## 8.1.0 (2021-04-24)
 
 ### New features

deps/acorn/acorn-walk/dist/walk.d.ts

@@ -109,4 +109,6 @@ declare module "acorn-walk" {
   ): Found<TState> | undefined;
 
   export const findNodeAfter: typeof findNodeAround;
+
+  export const base: RecursiveVisitors<any>;
 }

deps/acorn/acorn-walk/dist/walk.js

@@ -190,7 +190,7 @@
 
   var base = {};
 
-  base.Program = base.BlockStatement = function (node, st, c) {
+  base.Program = base.BlockStatement = base.StaticBlock = function (node, st, c) {
     for (var i = 0, list = node.body; i < list.length; i += 1)
       {
       var stmt = list[i];

deps/acorn/acorn-walk/dist/walk.mjs

@@ -184,7 +184,7 @@ function ignore(_node, _st, _c) {}
 
 var base = {};
 
-base.Program = base.BlockStatement = function (node, st, c) {
+base.Program = base.BlockStatement = base.StaticBlock = function (node, st, c) {
   for (var i = 0, list = node.body; i < list.length; i += 1)
     {
     var stmt = list[i];

deps/acorn/acorn-walk/package.json

@@ -16,7 +16,7 @@
     ],
     "./package.json": "./package.json"
   },
-  "version": "8.1.0",
+  "version": "8.2.0",
   "engines": {"node": ">=0.4.0"},
   "maintainers": [
     {

deps/acorn/acorn/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 8.5.0 (2021-09-06)
+
+### Bug fixes
+
+Improve context-dependent tokenization in a number of corner cases.
+
+Fix location tracking after a 0x2028 or 0x2029 character in a string literal (which before did not increase the line number).
+
+Fix an issue where arrow function bodies in for loop context would inappropriately consume `in` operators.
+
+Fix wrong end locations stored on SequenceExpression nodes.
+
+Implement restriction that `for`/`of` loop LHS can't start with `let`.
+
+### New features
+
+Add support for ES2022 class static blocks.
+
+Allow multiple input files to be passed to the CLI tool.
+
 ## 8.4.1 (2021-06-24)
 
 ### Bug fixes

deps/acorn/acorn/README.md

@@ -54,7 +54,7 @@ required):
 
 - **ecmaVersion**: Indicates the ECMAScript version to parse. Must be
   either 3, 5, 6 (or 2015), 7 (2016), 8 (2017), 9 (2018), 10 (2019),
-  11 (2020), 12 (2021, partial support), 13 (2022, partial support)
+  11 (2020), 12 (2021), 13 (2022, partial support)
   or `"latest"` (the latest the library supports). This influences
   support for strict mode, the set of reserved words, and support
   for new syntax features.

deps/acorn/acorn/dist/acorn.d.ts

@@ -173,6 +173,9 @@ declare namespace acorn {
     p_expr: TokContext
     q_tmpl: TokContext
     f_expr: TokContext
+    f_stat: TokContext
+    f_expr_gen: TokContext
+    f_gen: TokContext
   }
 
   function isIdentifierStart(code: number, astral?: boolean): boolean

deps/acorn/acorn/dist/acorn.js

@@ -4,21 +4,24 @@ var path = require('path');
 var fs = require('fs');
 var acorn = require('./acorn.js');
 
-var infile, forceFile, silent = false, compact = false, tokenize = false;
+var inputFilePaths = [], forceFileName = false, fileMode = false, silent = false, compact = false, tokenize = false;
 var options = {};
 
 function help(status) {
   var print = (status === 0) ? console.log : console.error;
   print("usage: " + path.basename(process.argv[1]) + " [--ecma3|--ecma5|--ecma6|--ecma7|--ecma8|--ecma9|...|--ecma2015|--ecma2016|--ecma2017|--ecma2018|...]");
-  print("        [--tokenize] [--locations] [---allow-hash-bang] [--allow-await-outside-function] [--compact] [--silent] [--module] [--help] [--] [infile]");
+  print("        [--tokenize] [--locations] [---allow-hash-bang] [--allow-await-outside-function] [--compact] [--silent] [--module] [--help] [--] [<infile>...]");
   process.exit(status);
 }
 
 for (var i = 2; i < process.argv.length; ++i) {
   var arg = process.argv[i];
-  if ((arg === "-" || arg[0] !== "-") && !infile) { infile = arg; }
-  else if (arg === "--" && !infile && i + 2 === process.argv.length) { forceFile = infile = process.argv[++i]; }
-  else if (arg === "--locations") { options.locations = true; }
+  if (arg[0] !== "-" || arg === "-") { inputFilePaths.push(arg); }
+  else if (arg === "--") {
+    inputFilePaths.push.apply(inputFilePaths, process.argv.slice(i + 1));
+    forceFileName = true;
+    break
+  } else if (arg === "--locations") { options.locations = true; }
   else if (arg === "--allow-hash-bang") { options.allowHashBang = true; }
   else if (arg === "--allow-await-outside-function") { options.allowAwaitOutsideFunction = true; }
   else if (arg === "--silent") { silent = true; }
@@ -35,31 +38,34 @@ for (var i = 2; i < process.argv.length; ++i) {
   }
 }
 
-function run(code) {
-  var result;
+function run(codeList) {
+  var result = [], fileIdx = 0;
   try {
-    if (!tokenize) {
-      result = acorn.parse(code, options);
-    } else {
-      result = [];
-      var tokenizer = acorn.tokenizer(code, options), token;
-      do {
-        token = tokenizer.getToken();
-        result.push(token);
-      } while (token.type !== acorn.tokTypes.eof)
-    }
+    codeList.forEach(function (code, idx) {
+      fileIdx = idx;
+      if (!tokenize) {
+        result = acorn.parse(code, options);
+        options.program = result;
+      } else {
+        var tokenizer = acorn.tokenizer(code, options), token;
+        do {
+          token = tokenizer.getToken();
+          result.push(token);
+        } while (token.type !== acorn.tokTypes.eof)
+      }
+    });
   } catch (e) {
-    console.error(infile && infile !== "-" ? e.message.replace(/\(\d+:\d+\)$/, function (m) { return m.slice(0, 1) + infile + " " + m.slice(1); }) : e.message);
+    console.error(fileMode ? e.message.replace(/\(\d+:\d+\)$/, function (m) { return m.slice(0, 1) + inputFilePaths[fileIdx] + " " + m.slice(1); }) : e.message);
     process.exit(1);
   }
   if (!silent) { console.log(JSON.stringify(result, null, compact ? null : 2)); }
 }
 
-if (forceFile || infile && infile !== "-") {
-  run(fs.readFileSync(infile, "utf8"));
+if (fileMode = inputFilePaths.length && (forceFileName || !inputFilePaths.includes("-") || inputFilePaths.length !== 1)) {
+  run(inputFilePaths.map(function (path) { return fs.readFileSync(path, "utf8"); }));
 } else {
   var code = "";
   process.stdin.resume();
   process.stdin.on("data", function (chunk) { return code += chunk; });
-  process.stdin.on("end", function () { return run(code); });
+  process.stdin.on("end", function () { return run([code]); });
 }

deps/acorn/acorn/dist/acorn.mjs

@@ -16,7 +16,7 @@
     ],
     "./package.json": "./package.json"
   },
-  "version": "8.4.1",
+  "version": "8.5.0",
   "engines": {"node": ">=0.4.0"},
   "maintainers": [
     {