oxc-parser 0.68.0 → 0.69.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxc-parser",
-  "version": "0.68.0",
+  "version": "0.69.0",
   "main": "index.js",
   "browser": "wasm.mjs",
   "engines": {
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@oxc-project/types": "^0.68.0"
+    "@oxc-project/types": "^0.69.0"
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^4.0.0",
@@ -57,9 +57,12 @@
       "aarch64-pc-windows-msvc",
       "x86_64-unknown-linux-gnu",
       "x86_64-unknown-linux-musl",
+      "x86_64-unknown-freebsd",
       "aarch64-unknown-linux-gnu",
       "aarch64-unknown-linux-musl",
       "armv7-unknown-linux-gnueabihf",
+      "s390x-unknown-linux-gnu",
+      "riscv64gc-unknown-linux-gnu",
       "x86_64-apple-darwin",
       "aarch64-apple-darwin",
       "wasm32-wasip1-threads"
@@ -72,16 +75,19 @@
     "dtsHeaderFile": "header.js"
   },
   "optionalDependencies": {
-    "@oxc-parser/binding-win32-x64-msvc": "0.68.0",
-    "@oxc-parser/binding-win32-arm64-msvc": "0.68.0",
-    "@oxc-parser/binding-linux-x64-gnu": "0.68.0",
-    "@oxc-parser/binding-linux-x64-musl": "0.68.0",
-    "@oxc-parser/binding-linux-arm64-gnu": "0.68.0",
-    "@oxc-parser/binding-linux-arm64-musl": "0.68.0",
-    "@oxc-parser/binding-linux-arm-gnueabihf": "0.68.0",
-    "@oxc-parser/binding-darwin-x64": "0.68.0",
-    "@oxc-parser/binding-darwin-arm64": "0.68.0",
-    "@oxc-parser/binding-wasm32-wasi": "0.68.0"
+    "@oxc-parser/binding-win32-x64-msvc": "0.69.0",
+    "@oxc-parser/binding-win32-arm64-msvc": "0.69.0",
+    "@oxc-parser/binding-linux-x64-gnu": "0.69.0",
+    "@oxc-parser/binding-linux-x64-musl": "0.69.0",
+    "@oxc-parser/binding-freebsd-x64": "0.69.0",
+    "@oxc-parser/binding-linux-arm64-gnu": "0.69.0",
+    "@oxc-parser/binding-linux-arm64-musl": "0.69.0",
+    "@oxc-parser/binding-linux-arm-gnueabihf": "0.69.0",
+    "@oxc-parser/binding-linux-s390x-gnu": "0.69.0",
+    "@oxc-parser/binding-linux-riscv64-gnu": "0.69.0",
+    "@oxc-parser/binding-darwin-x64": "0.69.0",
+    "@oxc-parser/binding-darwin-arm64": "0.69.0",
+    "@oxc-parser/binding-wasm32-wasi": "0.69.0"
   },
   "scripts": {
     "build-dev": "napi build --no-dts-cache --platform --js bindings.js",

package/wrap.cjs

@@ -23,25 +23,36 @@ module.exports.wrap = function wrap(result) {
   };
 };
 
-function jsonParseAst(program) {
-  return JSON.parse(program, transform);
+// Set `value` field of `Literal`s which are `BigInt`s or `RegExp`s.
+//
+// Returned JSON contains an array `fixes` with paths to these nodes
+// e.g. for `123n; foo(/xyz/)`, `fixes` will be
+// `[["body", 0, "expression"], ["body", 1, "expression", "arguments", 2]]`.
+//
+// Walk down the AST to these nodes and alter them.
+// Compiling the list of fixes on Rust side avoids having to do a full AST traversal on JS side
+// to locate the likely very few `Literal`s which need fixing.
+function jsonParseAst(programJson) {
+  const { node: program, fixes } = JSON.parse(programJson);
+  for (const fixPath of fixes) {
+    applyFix(program, fixPath);
+  }
+  return program;
 }
 
-function transform(key, value) {
-  // Set `value` field of `Literal`s for `BigInt`s and `RegExp`s.
-  // This is not possible to do on Rust side, as neither can be represented correctly in JSON.
-  if (value === null && key === 'value' && Object.hasOwn(this, 'type') && this.type === 'Literal') {
-    if (Object.hasOwn(this, 'bigint')) {
-      return BigInt(this.bigint);
-    }
-    if (Object.hasOwn(this, 'regex')) {
-      const { regex } = this;
-      try {
-        return RegExp(regex.pattern, regex.flags);
-      } catch (_err) {
-        // Invalid regexp, or valid regexp using syntax not supported by this version of NodeJS
-      }
+function applyFix(program, fixPath) {
+  let node = program;
+  for (const key of fixPath) {
+    node = node[key];
+  }
+
+  if (node.bigint) {
+    node.value = BigInt(node.bigint);
+  } else {
+    try {
+      node.value = RegExp(node.regex.pattern, node.regex.flags);
+    } catch (_err) {
+      // Invalid regexp, or valid regexp using syntax not supported by this version of NodeJS
     }
   }
-  return value;
 }

package/wrap.mjs

@@ -23,26 +23,38 @@ export function wrap(result) {
   };
 }
 
-// Used by napi/playground/patch.mjs
-export function jsonParseAst(program) {
-  return JSON.parse(program, transform);
+// Used by `napi/playground/patch.mjs`.
+//
+// Set `value` field of `Literal`s which are `BigInt`s or `RegExp`s.
+//
+// Returned JSON contains an array `fixes` with paths to these nodes
+// e.g. for `123n; foo(/xyz/)`, `fixes` will be
+// `[["body", 0, "expression"], ["body", 1, "expression", "arguments", 2]]`.
+//
+// Walk down the AST to these nodes and alter them.
+// Compiling the list of fixes on Rust side avoids having to do a full AST traversal on JS side
+// to locate the likely very few `Literal`s which need fixing.
+export function jsonParseAst(programJson) {
+  const { node: program, fixes } = JSON.parse(programJson);
+  for (const fixPath of fixes) {
+    applyFix(program, fixPath);
+  }
+  return program;
 }
 
-function transform(key, value) {
-  // Set `value` field of `Literal`s for `BigInt`s and `RegExp`s.
-  // This is not possible to do on Rust side, as neither can be represented correctly in JSON.
-  if (value === null && key === 'value' && Object.hasOwn(this, 'type') && this.type === 'Literal') {
-    if (Object.hasOwn(this, 'bigint')) {
-      return BigInt(this.bigint);
-    }
-    if (Object.hasOwn(this, 'regex')) {
-      const { regex } = this;
-      try {
-        return RegExp(regex.pattern, regex.flags);
-      } catch (_err) {
-        // Invalid regexp, or valid regexp using syntax not supported by this version of NodeJS
-      }
+function applyFix(program, fixPath) {
+  let node = program;
+  for (const key of fixPath) {
+    node = node[key];
+  }
+
+  if (node.bigint) {
+    node.value = BigInt(node.bigint);
+  } else {
+    try {
+      node.value = RegExp(node.regex.pattern, node.regex.flags);
+    } catch (_err) {
+      // Invalid regexp, or valid regexp using syntax not supported by this version of NodeJS
     }
   }
-  return value;
 }