oxc-parser 0.67.0 → 0.68.1

package/{deserialize-js.js → generated/deserialize/js.js}

@@ -1853,12 +1853,22 @@ function deserializeTSTypeQuery(pos) {
 }
 
 function deserializeTSImportType(pos) {
+  let options = deserializeOptionBoxObjectExpression(pos + 24);
+  if (options !== null && options.properties.length === 1) {
+    const prop = options.properties[0];
+    if (
+      !prop.method && !prop.shorthand && !prop.computed &&
+      prop.key.type === 'Identifier' && prop.key.name === 'assert'
+    ) {
+      prop.key.name = 'with';
+    }
+  }
   return {
     type: 'TSImportType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     argument: deserializeTSType(pos + 8),
-    options: deserializeOptionBoxObjectExpression(pos + 24),
+    options,
     qualifier: deserializeOptionTSTypeName(pos + 32),
     typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
   };
@@ -1898,8 +1908,8 @@ function deserializeTSMappedType(pos) {
     end: deserializeU32(pos + 4),
     nameType: deserializeOptionTSType(pos + 16),
     typeAnnotation: deserializeOptionTSType(pos + 32),
-    optional: deserializeTSMappedTypeModifierOperator(pos + 48),
-    readonly: deserializeTSMappedTypeModifierOperator(pos + 49),
+    optional: deserializeOptionTSMappedTypeModifierOperator(pos + 48),
+    readonly: deserializeOptionTSMappedTypeModifierOperator(pos + 49),
     key: typeParameter.name,
     constraint: typeParameter.constraint,
   };
@@ -3821,7 +3831,7 @@ function deserializeTSTupleElement(pos) {
 function deserializeTSTypeName(pos) {
   switch (uint8[pos]) {
     case 0:
-      let id = deserializeIdentifierReference(pos + 8);
+      let id = deserializeBoxIdentifierReference(pos + 8);
       if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
       return id;
     case 1:
@@ -3923,7 +3933,7 @@ function deserializeTSModuleDeclarationBody(pos) {
 function deserializeTSTypeQueryExprName(pos) {
   switch (uint8[pos]) {
     case 0:
-      let id = deserializeIdentifierReference(pos + 8);
+      let id = deserializeBoxIdentifierReference(pos + 8);
       if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
       return id;
     case 1:
@@ -3936,14 +3946,22 @@ function deserializeTSTypeQueryExprName(pos) {
 }
 
 function deserializeTSMappedTypeModifierOperator(pos) {
-  const operator = deserializeU8(pos);
-  return [true, '+', '-', null][operator];
+  switch (uint8[pos]) {
+    case 0:
+      return true;
+    case 1:
+      return '+';
+    case 2:
+      return '-';
+    default:
+      throw new Error(`Unexpected discriminant ${uint8[pos]} for TSMappedTypeModifierOperator`);
+  }
 }
 
 function deserializeTSModuleReference(pos) {
   switch (uint8[pos]) {
     case 0:
-      let id = deserializeIdentifierReference(pos + 8);
+      let id = deserializeBoxIdentifierReference(pos + 8);
       if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
       return id;
     case 1:
@@ -5560,6 +5578,11 @@ function deserializeOptionTSTypeName(pos) {
   return deserializeTSTypeName(pos);
 }
 
+function deserializeOptionTSMappedTypeModifierOperator(pos) {
+  if (uint8[pos] === 3) return null;
+  return deserializeTSMappedTypeModifierOperator(pos);
+}
+
 function deserializeBoxTSExternalModuleReference(pos) {
   return deserializeTSExternalModuleReference(uint32[pos >> 2]);
 }

package/{deserialize-ts.js → generated/deserialize/ts.js}

@@ -2005,12 +2005,22 @@ function deserializeTSTypeQuery(pos) {
 }
 
 function deserializeTSImportType(pos) {
+  let options = deserializeOptionBoxObjectExpression(pos + 24);
+  if (options !== null && options.properties.length === 1) {
+    const prop = options.properties[0];
+    if (
+      !prop.method && !prop.shorthand && !prop.computed &&
+      prop.key.type === 'Identifier' && prop.key.name === 'assert'
+    ) {
+      prop.key.name = 'with';
+    }
+  }
   return {
     type: 'TSImportType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     argument: deserializeTSType(pos + 8),
-    options: deserializeOptionBoxObjectExpression(pos + 24),
+    options,
     qualifier: deserializeOptionTSTypeName(pos + 32),
     typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
   };
@@ -2050,8 +2060,8 @@ function deserializeTSMappedType(pos) {
     end: deserializeU32(pos + 4),
     nameType: deserializeOptionTSType(pos + 16),
     typeAnnotation: deserializeOptionTSType(pos + 32),
-    optional: deserializeTSMappedTypeModifierOperator(pos + 48),
-    readonly: deserializeTSMappedTypeModifierOperator(pos + 49),
+    optional: deserializeOptionTSMappedTypeModifierOperator(pos + 48),
+    readonly: deserializeOptionTSMappedTypeModifierOperator(pos + 49),
     key: typeParameter.name,
     constraint: typeParameter.constraint,
   };
@@ -3973,7 +3983,7 @@ function deserializeTSTupleElement(pos) {
 function deserializeTSTypeName(pos) {
   switch (uint8[pos]) {
     case 0:
-      let id = deserializeIdentifierReference(pos + 8);
+      let id = deserializeBoxIdentifierReference(pos + 8);
       if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
       return id;
     case 1:
@@ -4075,7 +4085,7 @@ function deserializeTSModuleDeclarationBody(pos) {
 function deserializeTSTypeQueryExprName(pos) {
   switch (uint8[pos]) {
     case 0:
-      let id = deserializeIdentifierReference(pos + 8);
+      let id = deserializeBoxIdentifierReference(pos + 8);
       if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
       return id;
     case 1:
@@ -4088,14 +4098,22 @@ function deserializeTSTypeQueryExprName(pos) {
 }
 
 function deserializeTSMappedTypeModifierOperator(pos) {
-  const operator = deserializeU8(pos);
-  return [true, '+', '-', null][operator];
+  switch (uint8[pos]) {
+    case 0:
+      return true;
+    case 1:
+      return '+';
+    case 2:
+      return '-';
+    default:
+      throw new Error(`Unexpected discriminant ${uint8[pos]} for TSMappedTypeModifierOperator`);
+  }
 }
 
 function deserializeTSModuleReference(pos) {
   switch (uint8[pos]) {
     case 0:
-      let id = deserializeIdentifierReference(pos + 8);
+      let id = deserializeBoxIdentifierReference(pos + 8);
       if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
       return id;
     case 1:
@@ -5712,6 +5730,11 @@ function deserializeOptionTSTypeName(pos) {
   return deserializeTSTypeName(pos);
 }
 
+function deserializeOptionTSMappedTypeModifierOperator(pos) {
+  if (uint8[pos] === 3) return null;
+  return deserializeTSMappedTypeModifierOperator(pos);
+}
+
 function deserializeBoxTSExternalModuleReference(pos) {
   return deserializeTSExternalModuleReference(uint32[pos >> 2]);
 }

package/index.js

@@ -1,6 +1,4 @@
 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;
@@ -22,7 +20,7 @@ module.exports.parseSync = function parseSync(filename, sourceText, options) {
   return wrap(bindings.parseSync(filename, sourceText, options));
 };
 
-let buffer, encoder;
+let buffer, encoder, deserializeJS, deserializeTS;
 
 function parseSyncRaw(filename, sourceText, options) {
   if (!rawTransferSupported()) {
@@ -62,9 +60,23 @@ function parseSyncRaw(filename, sourceText, options) {
   const astTypeFlagPos = 2147483636;
   let isJsAst = buffer[astTypeFlagPos] === 0;
 
-  const data = isJsAst
-    ? deserializeJS(buffer, sourceText, sourceByteLen)
-    : deserializeTS(buffer, sourceText, sourceByteLen);
+  // Lazy load deserializer, and deserialize buffer to JS objects
+  let data;
+  if (isJsAst) {
+    if (!deserializeJS) deserializeJS = require('./generated/deserialize/js.js');
+    data = deserializeJS(buffer, sourceText, sourceByteLen);
+
+    // Add a line comment for hashbang
+    const { hashbang } = data.program;
+    if (hashbang !== null) {
+      data.comments.unshift({ type: 'Line', value: hashbang.value, start: hashbang.start, end: hashbang.end });
+    }
+  } else {
+    if (!deserializeTS) deserializeTS = require('./generated/deserialize/ts.js');
+    data = deserializeTS(buffer, sourceText, sourceByteLen);
+    // Note: Do not add line comment for hashbang, to match `@typescript-eslint/parser`.
+    // See https://github.com/oxc-project/oxc/blob/ea784f5f082e4c53c98afde9bf983afd0b95e44e/napi/parser/src/lib.rs#L106-L130
+  }
 
   return {
     get program() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxc-parser",
-  "version": "0.67.0",
+  "version": "0.68.1",
   "main": "index.js",
   "browser": "wasm.mjs",
   "engines": {
@@ -31,15 +31,15 @@
     "wasm.mjs",
     "bindings.js",
     "webcontainer-fallback.js",
-    "deserialize-js.js",
-    "deserialize-ts.js"
+    "generated/deserialize/js.js",
+    "generated/deserialize/ts.js"
   ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "dependencies": {
-    "@oxc-project/types": "^0.67.0"
+    "@oxc-project/types": "^0.68.1"
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^4.0.0",
@@ -72,16 +72,16 @@
     "dtsHeaderFile": "header.js"
   },
   "optionalDependencies": {
-    "@oxc-parser/binding-win32-x64-msvc": "0.67.0",
-    "@oxc-parser/binding-win32-arm64-msvc": "0.67.0",
-    "@oxc-parser/binding-linux-x64-gnu": "0.67.0",
-    "@oxc-parser/binding-linux-x64-musl": "0.67.0",
-    "@oxc-parser/binding-linux-arm64-gnu": "0.67.0",
-    "@oxc-parser/binding-linux-arm64-musl": "0.67.0",
-    "@oxc-parser/binding-linux-arm-gnueabihf": "0.67.0",
-    "@oxc-parser/binding-darwin-x64": "0.67.0",
-    "@oxc-parser/binding-darwin-arm64": "0.67.0",
-    "@oxc-parser/binding-wasm32-wasi": "0.67.0"
+    "@oxc-parser/binding-win32-x64-msvc": "0.68.1",
+    "@oxc-parser/binding-win32-arm64-msvc": "0.68.1",
+    "@oxc-parser/binding-linux-x64-gnu": "0.68.1",
+    "@oxc-parser/binding-linux-x64-musl": "0.68.1",
+    "@oxc-parser/binding-linux-arm64-gnu": "0.68.1",
+    "@oxc-parser/binding-linux-arm64-musl": "0.68.1",
+    "@oxc-parser/binding-linux-arm-gnueabihf": "0.68.1",
+    "@oxc-parser/binding-darwin-x64": "0.68.1",
+    "@oxc-parser/binding-darwin-arm64": "0.68.1",
+    "@oxc-parser/binding-wasm32-wasi": "0.68.1"
   },
   "scripts": {
     "build-dev": "napi build --no-dts-cache --platform --js bindings.js",