oxc-parser 0.58.0 → 0.60.0

package/deserialize-js.js

@@ -152,8 +152,8 @@ function deserializeTemplateElement(pos) {
     type: 'TemplateElement',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    value: deserializeTemplateElementValue(pos + 16),
-    tail: deserializeBool(pos + 8),
+    value: deserializeTemplateElementValue(pos + 8),
+    tail: deserializeBool(pos + 40),
   };
 }
 
@@ -1132,9 +1132,9 @@ function deserializeJSXOpeningElement(pos) {
     type: 'JSXOpeningElement',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    selfClosing: deserializeBool(pos + 8),
-    name: deserializeJSXElementName(pos + 16),
     attributes: deserializeVecJSXAttributeItem(pos + 32),
+    name: deserializeJSXElementName(pos + 16),
+    selfClosing: deserializeBool(pos + 8),
   };
 }
 
@@ -1163,6 +1163,8 @@ function deserializeJSXOpeningFragment(pos) {
     type: 'JSXOpeningFragment',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
+    attributes: [],
+    selfClosing: false,
   };
 }
 
@@ -1531,7 +1533,7 @@ function deserializeTSTypeReference(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeName: deserializeTSTypeName(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -1595,7 +1597,7 @@ function deserializeTSClassImplements(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeTSTypeName(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -1701,7 +1703,7 @@ function deserializeTSInterfaceHeritage(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeExpression(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -1763,7 +1765,7 @@ function deserializeTSTypeQuery(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     exprName: deserializeTSTypeQueryExprName(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -2917,9 +2919,9 @@ function deserializeVariableDeclarationKind(pos) {
     case 0:
       return 'var';
     case 1:
-      return 'const';
-    case 2:
       return 'let';
+    case 2:
+      return 'const';
     case 3:
       return 'using';
     case 4:

package/deserialize-ts.js

@@ -144,7 +144,7 @@ function deserializeTaggedTemplateExpression(pos) {
     end: deserializeU32(pos + 4),
     tag: deserializeExpression(pos + 8),
     quasi: deserializeTemplateLiteral(pos + 24),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 96),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 96),
   };
 }
 
@@ -153,8 +153,8 @@ function deserializeTemplateElement(pos) {
     type: 'TemplateElement',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    value: deserializeTemplateElementValue(pos + 16),
-    tail: deserializeBool(pos + 8),
+    value: deserializeTemplateElementValue(pos + 8),
+    tail: deserializeBool(pos + 40),
   };
 }
 
@@ -207,9 +207,9 @@ function deserializeCallExpression(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     callee: deserializeExpression(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
     arguments: deserializeVecArgument(pos + 32),
     optional: deserializeBool(pos + 64),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -220,7 +220,7 @@ function deserializeNewExpression(pos) {
     end: deserializeU32(pos + 4),
     callee: deserializeExpression(pos + 8),
     arguments: deserializeVecArgument(pos + 24),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 56),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 56),
   };
 }
 
@@ -510,6 +510,7 @@ function deserializeExpressionStatement(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeExpression(pos + 8),
+    directive: null,
   };
 }
 
@@ -844,6 +845,7 @@ function deserializeYieldExpression(pos) {
 }
 
 function deserializeClass(pos) {
+  const classImplements = deserializeOptionVecTSClassImplements(pos + 112);
   return {
     type: deserializeClassType(pos + 8),
     start: deserializeU32(pos),
@@ -853,8 +855,8 @@ function deserializeClass(pos) {
     body: deserializeBoxClassBody(pos + 144),
     decorators: deserializeVecDecorator(pos + 16),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 80),
-    superTypeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 104),
-    implements: deserializeOptionVecTSClassImplements(pos + 112),
+    superTypeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 104),
+    implements: classImplements === null ? [] : classImplements,
     abstract: deserializeBool(pos + 152),
     declare: deserializeBool(pos + 153),
   };
@@ -1024,8 +1026,8 @@ function deserializeExportNamedDeclaration(pos) {
     declaration: deserializeOptionDeclaration(pos + 8),
     specifiers: deserializeVecExportSpecifier(pos + 24),
     source: deserializeOptionStringLiteral(pos + 56),
-    exportKind: deserializeImportOrExportKind(pos + 96),
     attributes: withClause === null ? [] : withClause.withEntries,
+    exportKind: deserializeImportOrExportKind(pos + 96),
   };
 }
 
@@ -1184,10 +1186,10 @@ function deserializeJSXOpeningElement(pos) {
     type: 'JSXOpeningElement',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    selfClosing: deserializeBool(pos + 8),
-    name: deserializeJSXElementName(pos + 16),
     attributes: deserializeVecJSXAttributeItem(pos + 32),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 64),
+    name: deserializeJSXElementName(pos + 16),
+    selfClosing: deserializeBool(pos + 8),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 64),
   };
 }
 
@@ -1216,6 +1218,8 @@ function deserializeJSXOpeningFragment(pos) {
     type: 'JSXOpeningFragment',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
+    attributes: [],
+    selfClosing: false,
   };
 }
 
@@ -1584,7 +1588,7 @@ function deserializeTSTypeReference(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeName: deserializeTSTypeName(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -1648,7 +1652,7 @@ function deserializeTSClassImplements(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeTSTypeName(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -1754,7 +1758,7 @@ function deserializeTSInterfaceHeritage(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeExpression(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -1816,7 +1820,7 @@ function deserializeTSTypeQuery(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     exprName: deserializeTSTypeQueryExprName(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
@@ -2970,9 +2974,9 @@ function deserializeVariableDeclarationKind(pos) {
     case 0:
       return 'var';
     case 1:
-      return 'const';
-    case 2:
       return 'let';
+    case 2:
+      return 'const';
     case 3:
       return 'using';
     case 4:

package/index.js

@@ -1,6 +1,7 @@
 const bindings = require('./bindings.js');
 const deserializeJS = require('./deserialize-js.js');
 const deserializeTS = require('./deserialize-ts.js');
+const { wrap } = require('./wrap.cjs');
 
 module.exports.ParseResult = bindings.ParseResult;
 module.exports.ExportExportNameKind = bindings.ExportExportNameKind;
@@ -10,49 +11,6 @@ module.exports.ImportNameKind = bindings.ImportNameKind;
 module.exports.parseWithoutReturn = bindings.parseWithoutReturn;
 module.exports.Severity = bindings.Severity;
 
-function wrap(result) {
-  let program, module, comments, errors;
-  return {
-    get program() {
-      if (!program) {
-        // Note: This code is repeated in `wasm/parser/update-bindings.mjs` and `crates/oxc-wasm/update-bindings.mjs`.
-        // Any changes should be applied in those 2 scripts too.
-        program = JSON.parse(result.program, function(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
-              }
-            }
-          }
-          return value;
-        });
-      }
-      return program;
-    },
-    get module() {
-      if (!module) module = result.module;
-      return module;
-    },
-    get comments() {
-      if (!comments) comments = result.comments;
-      return comments;
-    },
-    get errors() {
-      if (!errors) errors = result.errors;
-      return errors;
-    },
-  };
-}
-
 module.exports.parseAsync = async function parseAsync(...args) {
   return wrap(await bindings.parseAsync(...args));
 };
@@ -61,7 +19,6 @@ module.exports.parseSync = function parseSync(filename, sourceText, options) {
   if (options?.experimentalRawTransfer) {
     return parseSyncRaw(filename, sourceText, options);
   }
-
   return wrap(bindings.parseSync(filename, sourceText, options));
 };
 

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "oxc-parser",
-  "version": "0.58.0",
+  "version": "0.60.0",
   "main": "index.js",
-  "browser": "browser.js",
+  "browser": "wasm.mjs",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -26,7 +26,9 @@
   "files": [
     "index.d.ts",
     "index.js",
-    "browser.js",
+    "wrap.cjs",
+    "wrap.mjs",
+    "wasm.mjs",
     "bindings.js",
     "deserialize-js.js",
     "deserialize-ts.js"
@@ -36,11 +38,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@oxc-project/types": "^0.58.0"
+    "@oxc-project/types": "^0.60.0"
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^4.0.0",
-    "vitest": "3.0.7"
+    "@napi-rs/wasm-runtime": "^0.2.7",
+    "@vitest/browser": "3.0.7",
+    "playwright": "^1.51.0",
+    "vitest": "3.0.8"
   },
   "napi": {
     "binaryName": "parser",
@@ -59,27 +64,30 @@
     ],
     "wasm": {
       "browser": {
-        "fs": true
+        "fs": false
       }
     },
     "dtsHeaderFile": "header.js"
   },
   "optionalDependencies": {
-    "@oxc-parser/binding-win32-x64-msvc": "0.58.0",
-    "@oxc-parser/binding-win32-arm64-msvc": "0.58.0",
-    "@oxc-parser/binding-linux-x64-gnu": "0.58.0",
-    "@oxc-parser/binding-linux-x64-musl": "0.58.0",
-    "@oxc-parser/binding-linux-arm64-gnu": "0.58.0",
-    "@oxc-parser/binding-linux-arm64-musl": "0.58.0",
-    "@oxc-parser/binding-linux-arm-gnueabihf": "0.58.0",
-    "@oxc-parser/binding-darwin-x64": "0.58.0",
-    "@oxc-parser/binding-darwin-arm64": "0.58.0",
-    "@oxc-parser/binding-wasm32-wasi": "0.58.0"
+    "@oxc-parser/binding-win32-x64-msvc": "0.60.0",
+    "@oxc-parser/binding-win32-arm64-msvc": "0.60.0",
+    "@oxc-parser/binding-linux-x64-gnu": "0.60.0",
+    "@oxc-parser/binding-linux-x64-musl": "0.60.0",
+    "@oxc-parser/binding-linux-arm64-gnu": "0.60.0",
+    "@oxc-parser/binding-linux-arm64-musl": "0.60.0",
+    "@oxc-parser/binding-linux-arm-gnueabihf": "0.60.0",
+    "@oxc-parser/binding-darwin-x64": "0.60.0",
+    "@oxc-parser/binding-darwin-arm64": "0.60.0",
+    "@oxc-parser/binding-wasm32-wasi": "0.60.0"
   },
   "scripts": {
     "build-dev": "napi build --no-dts-cache --platform --js bindings.js",
     "build": "pnpm run build-dev --release",
-    "test": "vitest --typecheck run ./test && tsc",
+    "build-wasi": "pnpm run build-dev --release --target wasm32-wasip1-threads",
+    "build-npm-dir": "rm -rf npm-dir && napi create-npm-dirs --npm-dir npm-dir && pnpm napi artifacts --npm-dir npm-dir --output-dir .",
+    "test": "vitest --typecheck run ./test/ && tsc",
+    "test-browser": "vitest -c vitest.config.browser.mts",
     "bench": "vitest bench --run ./bench.bench.mjs"
   }
 }

package/wasm.mjs

@@ -0,0 +1,11 @@
+export * from '@oxc-parser/binding-wasm32-wasi';
+import * as bindings from '@oxc-parser/binding-wasm32-wasi';
+import { wrap } from './wrap.mjs';
+
+export async function parseAsync(...args) {
+  return wrap(await bindings.parseAsync(...args));
+}
+
+export function parseSync(filename, sourceText, options) {
+  return wrap(bindings.parseSync(filename, sourceText, options));
+}

package/wrap.cjs

@@ -0,0 +1,42 @@
+module.exports.wrap = function wrap(result) {
+  let program, module, comments, errors;
+  return {
+    get program() {
+      if (!program) {
+        // Note: This code is repeated in `wasm/parser/update-bindings.mjs` and `crates/oxc-wasm/update-bindings.mjs`.
+        // Any changes should be applied in those 2 scripts too.
+        program = JSON.parse(result.program, function(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
+              }
+            }
+          }
+          return value;
+        });
+      }
+      return program;
+    },
+    get module() {
+      if (!module) module = result.module;
+      return module;
+    },
+    get comments() {
+      if (!comments) comments = result.comments;
+      return comments;
+    },
+    get errors() {
+      if (!errors) errors = result.errors;
+      return errors;
+    },
+  };
+};

package/wrap.mjs

@@ -0,0 +1,42 @@
+export function wrap(result) {
+  let program, module, comments, errors;
+  return {
+    get program() {
+      if (!program) {
+        // Note: This code is repeated in `wasm/parser/update-bindings.mjs` and `crates/oxc-wasm/update-bindings.mjs`.
+        // Any changes should be applied in those 2 scripts too.
+        program = JSON.parse(result.program, function(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
+              }
+            }
+          }
+          return value;
+        });
+      }
+      return program;
+    },
+    get module() {
+      if (!module) module = result.module;
+      return module;
+    },
+    get comments() {
+      if (!comments) comments = result.comments;
+      return comments;
+    },
+    get errors() {
+      if (!errors) errors = result.errors;
+      return errors;
+    },
+  };
+}

package/browser.js

@@ -1 +0,0 @@
-export * from '@oxc-parser/binding-wasm32-wasi'