oxc-parser 0.66.0 → 0.68.0

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

@@ -1622,11 +1622,36 @@ function deserializeTSTypeAliasDeclaration(pos) {
 }
 
 function deserializeTSClassImplements(pos) {
+  let expression = deserializeTSTypeName(pos + 8);
+  if (expression.type === 'TSQualifiedName') {
+    let parent = expression = {
+      type: 'MemberExpression',
+      start: expression.start,
+      end: expression.end,
+      object: expression.left,
+      property: expression.right,
+      computed: false,
+      optional: false,
+    };
+
+    while (parent.object.type === 'TSQualifiedName') {
+      const object = parent.object;
+      parent = parent.object = {
+        type: 'MemberExpression',
+        start: object.start,
+        end: object.end,
+        object: object.left,
+        property: object.right,
+        computed: false,
+        optional: false,
+      };
+    }
+  }
   return {
     type: 'TSClassImplements',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    expression: deserializeTSTypeName(pos + 8),
+    expression,
     typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
@@ -1761,17 +1786,31 @@ function deserializeTSTypePredicate(pos) {
 }
 
 function deserializeTSModuleDeclaration(pos) {
-  const kind = deserializeTSModuleDeclarationKind(pos + 80);
-  return {
-    type: 'TSModuleDeclaration',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    id: deserializeTSModuleDeclarationName(pos + 8),
-    body: deserializeOptionTSModuleDeclarationBody(pos + 64),
-    kind,
-    declare: deserializeBool(pos + 81),
-    global: kind === 'global',
-  };
+  const kind = deserializeTSModuleDeclarationKind(pos + 80),
+    global = kind === 'global',
+    start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
+    declare = deserializeBool(pos + 81);
+  let id = deserializeTSModuleDeclarationName(pos + 8),
+    body = deserializeOptionTSModuleDeclarationBody(pos + 64);
+
+  // Flatten `body`, and nest `id`
+  if (body !== null && body.type === 'TSModuleDeclaration') {
+    id = {
+      type: 'TSQualifiedName',
+      start: body.id.start,
+      end: id.end,
+      left: body.id,
+      right: id,
+    };
+    body = Object.hasOwn(body, 'body') ? body.body : null;
+  }
+
+  // Skip `body` field if `null`
+  const node = body === null
+    ? { type: 'TSModuleDeclaration', start, end, id, kind, declare, global }
+    : { type: 'TSModuleDeclaration', start, end, id, body, kind, declare, global };
+  return node;
 }
 
 function deserializeTSModuleBlock(pos) {
@@ -1814,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),
   };
@@ -1859,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,
   };
@@ -3782,7 +3831,9 @@ function deserializeTSTupleElement(pos) {
 function deserializeTSTypeName(pos) {
   switch (uint8[pos]) {
     case 0:
-      return deserializeBoxIdentifierReference(pos + 8);
+      let id = deserializeIdentifierReference(pos + 8);
+      if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
+      return id;
     case 1:
       return deserializeBoxTSQualifiedName(pos + 8);
     default:
@@ -3882,7 +3933,9 @@ function deserializeTSModuleDeclarationBody(pos) {
 function deserializeTSTypeQueryExprName(pos) {
   switch (uint8[pos]) {
     case 0:
-      return deserializeBoxIdentifierReference(pos + 8);
+      let id = deserializeIdentifierReference(pos + 8);
+      if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
+      return id;
     case 1:
       return deserializeBoxTSQualifiedName(pos + 8);
     case 2:
@@ -3893,14 +3946,24 @@ 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:
-      return deserializeBoxIdentifierReference(pos + 8);
+      let id = deserializeIdentifierReference(pos + 8);
+      if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
+      return id;
     case 1:
       return deserializeBoxTSQualifiedName(pos + 8);
     case 2:
@@ -5515,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}

@@ -781,6 +781,8 @@ function deserializeObjectPattern(pos) {
     end: deserializeU32(pos + 4),
     properties,
     decorators: [],
+    optional: false,
+    typeAnnotation: null,
   };
 }
 
@@ -1772,11 +1774,36 @@ function deserializeTSTypeAliasDeclaration(pos) {
 }
 
 function deserializeTSClassImplements(pos) {
+  let expression = deserializeTSTypeName(pos + 8);
+  if (expression.type === 'TSQualifiedName') {
+    let parent = expression = {
+      type: 'MemberExpression',
+      start: expression.start,
+      end: expression.end,
+      object: expression.left,
+      property: expression.right,
+      computed: false,
+      optional: false,
+    };
+
+    while (parent.object.type === 'TSQualifiedName') {
+      const object = parent.object;
+      parent = parent.object = {
+        type: 'MemberExpression',
+        start: object.start,
+        end: object.end,
+        object: object.left,
+        property: object.right,
+        computed: false,
+        optional: false,
+      };
+    }
+  }
   return {
     type: 'TSClassImplements',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    expression: deserializeTSTypeName(pos + 8),
+    expression,
     typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
@@ -1911,17 +1938,31 @@ function deserializeTSTypePredicate(pos) {
 }
 
 function deserializeTSModuleDeclaration(pos) {
-  const kind = deserializeTSModuleDeclarationKind(pos + 80);
-  return {
-    type: 'TSModuleDeclaration',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    id: deserializeTSModuleDeclarationName(pos + 8),
-    body: deserializeOptionTSModuleDeclarationBody(pos + 64),
-    kind,
-    declare: deserializeBool(pos + 81),
-    global: kind === 'global',
-  };
+  const kind = deserializeTSModuleDeclarationKind(pos + 80),
+    global = kind === 'global',
+    start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
+    declare = deserializeBool(pos + 81);
+  let id = deserializeTSModuleDeclarationName(pos + 8),
+    body = deserializeOptionTSModuleDeclarationBody(pos + 64);
+
+  // Flatten `body`, and nest `id`
+  if (body !== null && body.type === 'TSModuleDeclaration') {
+    id = {
+      type: 'TSQualifiedName',
+      start: body.id.start,
+      end: id.end,
+      left: body.id,
+      right: id,
+    };
+    body = Object.hasOwn(body, 'body') ? body.body : null;
+  }
+
+  // Skip `body` field if `null`
+  const node = body === null
+    ? { type: 'TSModuleDeclaration', start, end, id, kind, declare, global }
+    : { type: 'TSModuleDeclaration', start, end, id, body, kind, declare, global };
+  return node;
 }
 
 function deserializeTSModuleBlock(pos) {
@@ -1964,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),
   };
@@ -2009,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,
   };
@@ -3932,7 +3983,9 @@ function deserializeTSTupleElement(pos) {
 function deserializeTSTypeName(pos) {
   switch (uint8[pos]) {
     case 0:
-      return deserializeBoxIdentifierReference(pos + 8);
+      let id = deserializeIdentifierReference(pos + 8);
+      if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
+      return id;
     case 1:
       return deserializeBoxTSQualifiedName(pos + 8);
     default:
@@ -4032,7 +4085,9 @@ function deserializeTSModuleDeclarationBody(pos) {
 function deserializeTSTypeQueryExprName(pos) {
   switch (uint8[pos]) {
     case 0:
-      return deserializeBoxIdentifierReference(pos + 8);
+      let id = deserializeIdentifierReference(pos + 8);
+      if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
+      return id;
     case 1:
       return deserializeBoxTSQualifiedName(pos + 8);
     case 2:
@@ -4043,14 +4098,24 @@ 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:
-      return deserializeBoxIdentifierReference(pos + 8);
+      let id = deserializeIdentifierReference(pos + 8);
+      if (id.name === 'this') id = { type: 'ThisExpression', start: id.start, end: id.end };
+      return id;
     case 1:
       return deserializeBoxTSQualifiedName(pos + 8);
     case 2:
@@ -5665,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.66.0",
+  "version": "0.68.0",
   "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.66.0"
+    "@oxc-project/types": "^0.68.0"
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^4.0.0",
@@ -72,16 +72,16 @@
     "dtsHeaderFile": "header.js"
   },
   "optionalDependencies": {
-    "@oxc-parser/binding-win32-x64-msvc": "0.66.0",
-    "@oxc-parser/binding-win32-arm64-msvc": "0.66.0",
-    "@oxc-parser/binding-linux-x64-gnu": "0.66.0",
-    "@oxc-parser/binding-linux-x64-musl": "0.66.0",
-    "@oxc-parser/binding-linux-arm64-gnu": "0.66.0",
-    "@oxc-parser/binding-linux-arm64-musl": "0.66.0",
-    "@oxc-parser/binding-linux-arm-gnueabihf": "0.66.0",
-    "@oxc-parser/binding-darwin-x64": "0.66.0",
-    "@oxc-parser/binding-darwin-arm64": "0.66.0",
-    "@oxc-parser/binding-wasm32-wasi": "0.66.0"
+    "@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"
   },
   "scripts": {
     "build-dev": "napi build --no-dts-cache --platform --js bindings.js",

package/wrap.cjs

@@ -1,29 +1,11 @@
+// Note: This code is repeated in `wrap.mjs`.
+// Any changes should be applied in that file too.
+
 module.exports.wrap = function wrap(result) {
   let program, module, comments, errors;
   return {
     get program() {
-      if (!program) {
-        // Note: This code is repeated in `crates/oxc-wasm/update-bindings.mjs` and `napi/parser/wrap.cjs`.
-        // 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;
-        });
-      }
+      if (!program) program = jsonParseAst(result.program);
       return program;
     },
     get module() {
@@ -40,3 +22,26 @@ module.exports.wrap = function wrap(result) {
     },
   };
 };
+
+function jsonParseAst(program) {
+  return JSON.parse(program, transform);
+}
+
+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
+      }
+    }
+  }
+  return value;
+}

package/wrap.mjs

@@ -1,10 +1,11 @@
+// Note: This code is repeated in `wrap.cjs`.
+// Any changes should be applied in that file too.
+
 export function wrap(result) {
   let program, module, comments, errors;
   return {
     get program() {
-      if (!program) {
-        program = jsonParseAst(result.program);
-      }
+      if (!program) program = jsonParseAst(result.program);
       return program;
     },
     get module() {
@@ -23,23 +24,25 @@ export function wrap(result) {
 }
 
 // Used by napi/playground/patch.mjs
-export function jsonParseAst(ast) {
-  return JSON.parse(ast, 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
-        }
+export function jsonParseAst(program) {
+  return JSON.parse(program, transform);
+}
+
+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
       }
     }
-    return value;
-  });
+  }
+  return value;
 }