fix: Import-attributes support

Note: should be bumped to upstream once
davidbonnet/astring#713 is merged.

- Upgrades Meriah to v5 to support import-attributes.
- Replaces assert keword of old import-assertions with
  "with" keyword of import-attributes for json before
  parsing code with Meriah because Meriah does not support
  import-assertions.
- Replaces Astring library with the forked version
  modifed to support import-attributes.
- Adds a test which passes with the fix and fails with
  "Unexpected token: 'identifier'" error message which
  is encountered while running CyberChef project tests
  with appmap-node.

Author: edisigci

.yarn/cache/astring-https-e2fd4032c8-c1c976da8a.zip

@@ -87,10 +87,10 @@
   "dependencies": {
     "@types/stack-utils": "^2.0.3",
     "acorn-walk": "^8.2.0",
-    "astring": "^1.8.6",
+    "astring": "https://github.com/getappmap/astring.git#v1.8.6-import-attributes",
     "chalk": "<5",
     "json5": "^2.2.3",
-    "meriyah": "^4.3.7",
+    "meriyah": "^5.0.0",
     "source-map-js": "^1.0.2",
     "stack-utils": "^2.0.6",
     "yaml": "^2.3.4"

.yarn/cache/astring-npm-1.8.6-f6cb013b92-6f034d2ace.zip

@@ -143,6 +143,9 @@ export class Config {
     };
   }
 
+  // For easily toggling features/fixes for testing.
+  readonly fixJsonImportAssertions = true;
+
   migrate() {
     if (!this.migrationPending) return;
 

.yarn/cache/meriyah-npm-4.3.7-18d2504ccb-537fed1981.zip

@@ -14,6 +14,7 @@ import * as mocha from "./hooks/mocha";
 import * as next from "./hooks/next";
 import * as vitest from "./hooks/vitest";
 import { warn } from "./message";
+import config from "./config";
 
 const debug = debuglog("appmap");
 const treeDebug = debuglog("appmap-tree");
@@ -67,6 +68,14 @@ export default function transform(code: string, url: URL, hooks = defaultHooks):
 
   if (hooks.some((h) => h.shouldIgnore?.(url))) return code;
 
+  if (config().fixJsonImportAssertions) {
+    // Meriyah does not support old import-assertions.
+    // Replace import-assertions with the import-attributes syntax
+    // for json imports.
+    const regex = /assert\s*\{/g;
+    code = code.replace(regex, "with {");
+  }
+
   try {
     const comments: ESTree.Comment[] = [];
     const tree = parse(code, {

.yarn/cache/meriyah-npm-5.0.0-2cc74cfe0a-bdd628ab95.zip

@@ -764,6 +764,70 @@ exports[`mapping a script using async tracking timeout 3000 1`] = `
 }
 `;
 
+exports[`mapping a script with import attributes/assertions 1`] = `
+{
+  "classMap": [
+    {
+      "children": [
+        {
+          "children": [
+            {
+              "location": "importAttributes.mjs:3",
+              "name": "helloWorld",
+              "static": true,
+              "type": "function",
+            },
+          ],
+          "name": "importAttributes",
+          "type": "class",
+        },
+      ],
+      "name": "simple",
+      "type": "package",
+    },
+  ],
+  "events": [
+    {
+      "defined_class": "importAttributes",
+      "event": "call",
+      "id": 1,
+      "lineno": 3,
+      "method_id": "helloWorld",
+      "parameters": [],
+      "path": "importAttributes.mjs",
+      "static": true,
+      "thread_id": 0,
+    },
+    {
+      "elapsed": 31.337,
+      "event": "return",
+      "id": 2,
+      "parent_id": 1,
+      "thread_id": 0,
+    },
+  ],
+  "metadata": {
+    "app": "simple",
+    "client": {
+      "name": "appmap-node",
+      "url": "https://github.com/getappmap/appmap-node",
+      "version": "test node-appmap version",
+    },
+    "language": {
+      "engine": "Node.js",
+      "name": "javascript",
+      "version": "test node version",
+    },
+    "name": "test process recording",
+    "recorder": {
+      "name": "process",
+      "type": "process",
+    },
+  },
+  "version": "1.12",
+}
+`;
+
 exports[`mapping a script with tangled async functions 1`] = `
 {
   "classMap": [

package.json

@@ -28,6 +28,11 @@ integrationTest("mapping an mjs script", () => {
   expect(readAppmap()).toMatchSnapshot();
 });
 
+integrationTest("mapping a script with import attributes/assertions", () => {
+  expect(runAppmapNode("importAttributes.mjs").status).toBe(0);
+  expect(readAppmap()).toMatchSnapshot();
+});
+
 integrationTest("mapping js class methods and constructors containing super keyword", () => {
   expect(runAppmapNode("class.js").status).toBe(0);
   expect(readAppmap()).toMatchSnapshot();

src/config.ts

@@ -0,0 +1,3 @@
+{
+    "content": "This is for the import attributes test"
+}