oxc-parser 0.63.0 → 0.64.0

package/deserialize-js.js

@@ -37,11 +37,14 @@ function deserialize(buffer, sourceTextInput, sourceLenInput) {
 function deserializeProgram(pos) {
   const body = deserializeVecDirective(pos + 88);
   body.push(...deserializeVecStatement(pos + 120));
-  let start = deserializeU32(pos);
+
+  const start = deserializeU32(pos);
+  const end = deserializeU32(pos + 4);
+
   const program = {
     type: 'Program',
     start,
-    end: deserializeU32(pos + 4),
+    end,
     body,
     sourceType: deserializeModuleKind(pos + 9),
     hashbang: deserializeOptionHashbang(pos + 64),
@@ -150,18 +153,15 @@ function deserializeTaggedTemplateExpression(pos) {
 }
 
 function deserializeTemplateElement(pos) {
-  let value = deserializeTemplateElementValue(pos + 8);
+  const tail = deserializeBool(pos + 40),
+    start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
+    value = deserializeTemplateElementValue(pos + 8);
   if (value.cooked !== null && deserializeBool(pos + 41)) {
     value.cooked = value.cooked
       .replace(/\uFFFD(.{4})/g, (_, hex) => String.fromCodePoint(parseInt(hex, 16)));
   }
-  return {
-    type: 'TemplateElement',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    value,
-    tail: deserializeBool(pos + 40),
-  };
+  return { type: 'TemplateElement', start, end, value, tail };
 }
 
 function deserializeTemplateElementValue(pos) {
@@ -906,13 +906,12 @@ function deserializeAccessorProperty(pos) {
 }
 
 function deserializeImportExpression(pos) {
-  const options = deserializeVecExpression(pos + 24);
   return {
     type: 'ImportExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     source: deserializeExpression(pos + 8),
-    options: options.length === 0 ? null : options[0],
+    options: deserializeOptionExpression(pos + 24),
   };
 }
 
@@ -1178,13 +1177,14 @@ function deserializeJSXFragment(pos) {
 }
 
 function deserializeJSXOpeningFragment(pos) {
-  return {
+  const node = {
     type: 'JSXOpeningFragment',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     attributes: [],
     selfClosing: false,
   };
+  return node;
 }
 
 function deserializeJSXClosingFragment(pos) {
@@ -1292,18 +1292,23 @@ function deserializeTSThisParameter(pos) {
 }
 
 function deserializeTSEnumDeclaration(pos) {
-  const end = deserializeU32(pos + 4),
-    id = deserializeBindingIdentifier(pos + 8);
-  const tsEnumDeclMembers = deserializeVecTSEnumMember(pos + 40);
-  const bodyStart = id.end + 1;
   return {
     type: 'TSEnumDeclaration',
     start: deserializeU32(pos),
-    end,
-    id,
-    body: { type: 'TSEnumBody', start: bodyStart, end: end, members: tsEnumDeclMembers },
-    const: deserializeBool(pos + 72),
-    declare: deserializeBool(pos + 73),
+    end: deserializeU32(pos + 4),
+    id: deserializeBindingIdentifier(pos + 8),
+    body: deserializeTSEnumBody(pos + 40),
+    const: deserializeBool(pos + 80),
+    declare: deserializeBool(pos + 81),
+  };
+}
+
+function deserializeTSEnumBody(pos) {
+  return {
+    type: 'TSEnumBody',
+    start: deserializeU32(pos),
+    end: deserializeU32(pos + 4),
+    members: deserializeVecTSEnumMember(pos + 8),
   };
 }
 
@@ -1313,6 +1318,7 @@ function deserializeTSEnumMember(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     id: deserializeTSEnumMemberName(pos + 8),
+    computed: deserializeU8(pos + 8) > 1,
     initializer: deserializeOptionExpression(pos + 24),
   };
 }
@@ -1840,15 +1846,17 @@ function deserializeTSConstructorType(pos) {
 }
 
 function deserializeTSMappedType(pos) {
+  const typeParameter = deserializeBoxTSTypeParameter(pos + 8);
   return {
     type: 'TSMappedType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    typeParameter: deserializeBoxTSTypeParameter(pos + 8),
     nameType: deserializeOptionTSType(pos + 16),
     typeAnnotation: deserializeOptionTSType(pos + 32),
     optional: deserializeTSMappedTypeModifierOperator(pos + 48),
     readonly: deserializeTSMappedTypeModifierOperator(pos + 49),
+    key: typeParameter.name,
+    constraint: typeParameter.constraint,
   };
 }
 
@@ -1954,13 +1962,13 @@ function deserializeTSInstantiationExpression(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeExpression(pos + 8),
-    typeParameters: deserializeBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
 function deserializeJSDocNullableType(pos) {
   return {
-    type: 'JSDocNullableType',
+    type: 'TSJSDocNullableType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeAnnotation: deserializeTSType(pos + 8),
@@ -1970,7 +1978,7 @@ function deserializeJSDocNullableType(pos) {
 
 function deserializeJSDocNonNullableType(pos) {
   return {
-    type: 'JSDocNonNullableType',
+    type: 'TSJSDocNonNullableType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeAnnotation: deserializeTSType(pos + 8),
@@ -1980,7 +1988,7 @@ function deserializeJSDocNonNullableType(pos) {
 
 function deserializeJSDocUnknownType(pos) {
   return {
-    type: 'JSDocUnknownType',
+    type: 'TSJSDocUnknownType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
   };
@@ -3557,6 +3565,10 @@ function deserializeTSEnumMemberName(pos) {
       return deserializeBoxIdentifierName(pos + 8);
     case 1:
       return deserializeBoxStringLiteral(pos + 8);
+    case 2:
+      return deserializeBoxStringLiteral(pos + 8);
+    case 3:
+      return deserializeBoxTemplateLiteral(pos + 8);
     default:
       throw new Error(`Unexpected discriminant ${uint8[pos]} for TSEnumMemberName`);
   }
@@ -3874,18 +3886,8 @@ function deserializeTSTypeQueryExprName(pos) {
 }
 
 function deserializeTSMappedTypeModifierOperator(pos) {
-  switch (uint8[pos]) {
-    case 0:
-      return 'true';
-    case 1:
-      return '+';
-    case 2:
-      return '-';
-    case 3:
-      return 'none';
-    default:
-      throw new Error(`Unexpected discriminant ${uint8[pos]} for TSMappedTypeModifierOperator`);
-  }
+  const operator = deserializeU8(pos);
+  return [true, '+', '-', null][operator];
 }
 
 function deserializeTSModuleReference(pos) {
@@ -4539,11 +4541,6 @@ function deserializeVecArrayExpressionElement(pos) {
   return arr;
 }
 
-function deserializeOptionSpan(pos) {
-  if (uint8[pos] === 0) return null;
-  return deserializeSpan(pos + 8);
-}
-
 function deserializeBoxSpreadElement(pos) {
   return deserializeSpreadElement(uint32[pos >> 2]);
 }
@@ -4991,11 +4988,6 @@ function deserializeVecTSClassImplements(pos) {
   return arr;
 }
 
-function deserializeOptionVecTSClassImplements(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeVecTSClassImplements(pos);
-}
-
 function deserializeBoxClassBody(pos) {
   return deserializeClassBody(uint32[pos >> 2]);
 }

package/deserialize-ts.js

@@ -37,12 +37,30 @@ function deserialize(buffer, sourceTextInput, sourceLenInput) {
 function deserializeProgram(pos) {
   const body = deserializeVecDirective(pos + 88);
   body.push(...deserializeVecStatement(pos + 120));
-  let start = deserializeU32(pos);
-  if (body.length > 0) start = body[0].start;
+
+  const end = deserializeU32(pos + 4);
+
+  let start;
+  if (body.length > 0) {
+    const first = body[0];
+    start = first.start;
+    if (first.type === 'ExportNamedDeclaration' || first.type === 'ExportDefaultDeclaration') {
+      const { declaration } = first;
+      if (
+        declaration !== null && declaration.type === 'ClassDeclaration' &&
+        declaration.decorators.length > 0
+      ) {
+        const decoratorStart = declaration.decorators[0].start;
+        if (decoratorStart < start) start = decoratorStart;
+      }
+    }
+  } else {
+    start = end;
+  }
   const program = {
     type: 'Program',
     start,
-    end: deserializeU32(pos + 4),
+    end,
     body,
     sourceType: deserializeModuleKind(pos + 9),
     hashbang: deserializeOptionHashbang(pos + 64),
@@ -165,18 +183,15 @@ function deserializeTaggedTemplateExpression(pos) {
 }
 
 function deserializeTemplateElement(pos) {
-  let value = deserializeTemplateElementValue(pos + 8);
+  const tail = deserializeBool(pos + 40),
+    start = deserializeU32(pos) - 1,
+    end = deserializeU32(pos + 4) + 2 - tail,
+    value = deserializeTemplateElementValue(pos + 8);
   if (value.cooked !== null && deserializeBool(pos + 41)) {
     value.cooked = value.cooked
       .replace(/\uFFFD(.{4})/g, (_, hex) => String.fromCodePoint(parseInt(hex, 16)));
   }
-  return {
-    type: 'TemplateElement',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    value,
-    tail: deserializeBool(pos + 40),
-  };
+  return { type: 'TemplateElement', start, end, value, tail };
 }
 
 function deserializeTemplateElementValue(pos) {
@@ -350,6 +365,9 @@ function deserializeArrayAssignmentTarget(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     elements,
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
   };
 }
 
@@ -362,6 +380,9 @@ function deserializeObjectAssignmentTarget(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     properties,
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
   };
 }
 
@@ -371,6 +392,10 @@ function deserializeAssignmentTargetRest(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     argument: deserializeAssignmentTarget(pos + 8),
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
+    value: null,
   };
 }
 
@@ -409,6 +434,7 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
     key,
     value,
     kind: 'init',
+    optional: false,
   };
 }
 
@@ -423,6 +449,7 @@ function deserializeAssignmentTargetPropertyProperty(pos) {
     key: deserializePropertyKey(pos + 8),
     value: deserializeAssignmentTargetMaybeDefault(pos + 24),
     kind: 'init',
+    optional: false,
   };
 }
 
@@ -785,6 +812,10 @@ function deserializeBindingRestElement(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     argument: deserializeBindingPattern(pos + 8),
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
+    value: null,
   };
 }
 
@@ -875,7 +906,6 @@ function deserializeYieldExpression(pos) {
 }
 
 function deserializeClass(pos) {
-  const classImplements = deserializeOptionVecTSClassImplements(pos + 112);
   return {
     type: deserializeClassType(pos + 8),
     start: deserializeU32(pos),
@@ -886,7 +916,7 @@ function deserializeClass(pos) {
     decorators: deserializeVecDecorator(pos + 16),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 80),
     superTypeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 104),
-    implements: classImplements === null ? [] : classImplements,
+    implements: deserializeVecTSClassImplements(pos + 112),
     abstract: deserializeBool(pos + 152),
     declare: deserializeBool(pos + 153),
   };
@@ -966,24 +996,23 @@ function deserializeAccessorProperty(pos) {
     computed: deserializeBool(pos + 80),
     static: deserializeBool(pos + 81),
     decorators: deserializeVecDecorator(pos + 16),
-    definite: deserializeBool(pos + 82),
+    definite: deserializeBool(pos + 83),
     typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 88),
     accessibility: deserializeOptionTSAccessibility(pos + 96),
     optional: false,
-    override: false,
+    override: deserializeBool(pos + 82),
     readonly: false,
     declare: false,
   };
 }
 
 function deserializeImportExpression(pos) {
-  const options = deserializeVecExpression(pos + 24);
   return {
     type: 'ImportExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     source: deserializeExpression(pos + 8),
-    options: options.length === 0 ? null : options[0],
+    options: deserializeOptionExpression(pos + 24),
   };
 }
 
@@ -1256,13 +1285,12 @@ function deserializeJSXFragment(pos) {
 }
 
 function deserializeJSXOpeningFragment(pos) {
-  return {
+  const node = {
     type: 'JSXOpeningFragment',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    attributes: [],
-    selfClosing: false,
   };
+  return node;
 }
 
 function deserializeJSXClosingFragment(pos) {
@@ -1370,18 +1398,23 @@ function deserializeTSThisParameter(pos) {
 }
 
 function deserializeTSEnumDeclaration(pos) {
-  const end = deserializeU32(pos + 4),
-    id = deserializeBindingIdentifier(pos + 8);
-  const tsEnumDeclMembers = deserializeVecTSEnumMember(pos + 40);
-  const bodyStart = id.end + 1;
   return {
     type: 'TSEnumDeclaration',
     start: deserializeU32(pos),
-    end,
-    id,
-    body: { type: 'TSEnumBody', start: bodyStart, end: end, members: tsEnumDeclMembers },
-    const: deserializeBool(pos + 72),
-    declare: deserializeBool(pos + 73),
+    end: deserializeU32(pos + 4),
+    id: deserializeBindingIdentifier(pos + 8),
+    body: deserializeTSEnumBody(pos + 40),
+    const: deserializeBool(pos + 80),
+    declare: deserializeBool(pos + 81),
+  };
+}
+
+function deserializeTSEnumBody(pos) {
+  return {
+    type: 'TSEnumBody',
+    start: deserializeU32(pos),
+    end: deserializeU32(pos + 4),
+    members: deserializeVecTSEnumMember(pos + 8),
   };
 }
 
@@ -1391,6 +1424,7 @@ function deserializeTSEnumMember(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     id: deserializeTSEnumMemberName(pos + 8),
+    computed: deserializeU8(pos + 8) > 1,
     initializer: deserializeOptionExpression(pos + 24),
   };
 }
@@ -1918,15 +1952,17 @@ function deserializeTSConstructorType(pos) {
 }
 
 function deserializeTSMappedType(pos) {
+  const typeParameter = deserializeBoxTSTypeParameter(pos + 8);
   return {
     type: 'TSMappedType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    typeParameter: deserializeBoxTSTypeParameter(pos + 8),
     nameType: deserializeOptionTSType(pos + 16),
     typeAnnotation: deserializeOptionTSType(pos + 32),
     optional: deserializeTSMappedTypeModifierOperator(pos + 48),
     readonly: deserializeTSMappedTypeModifierOperator(pos + 49),
+    key: typeParameter.name,
+    constraint: typeParameter.constraint,
   };
 }
 
@@ -2032,13 +2068,13 @@ function deserializeTSInstantiationExpression(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeExpression(pos + 8),
-    typeParameters: deserializeBoxTSTypeParameterInstantiation(pos + 24),
+    typeArguments: deserializeBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
 
 function deserializeJSDocNullableType(pos) {
   return {
-    type: 'JSDocNullableType',
+    type: 'TSJSDocNullableType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeAnnotation: deserializeTSType(pos + 8),
@@ -2048,7 +2084,7 @@ function deserializeJSDocNullableType(pos) {
 
 function deserializeJSDocNonNullableType(pos) {
   return {
-    type: 'JSDocNonNullableType',
+    type: 'TSJSDocNonNullableType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeAnnotation: deserializeTSType(pos + 8),
@@ -2058,7 +2094,7 @@ function deserializeJSDocNonNullableType(pos) {
 
 function deserializeJSDocUnknownType(pos) {
   return {
-    type: 'JSDocUnknownType',
+    type: 'TSJSDocUnknownType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
   };
@@ -3635,6 +3671,10 @@ function deserializeTSEnumMemberName(pos) {
       return deserializeBoxIdentifierName(pos + 8);
     case 1:
       return deserializeBoxStringLiteral(pos + 8);
+    case 2:
+      return deserializeBoxStringLiteral(pos + 8);
+    case 3:
+      return deserializeBoxTemplateLiteral(pos + 8);
     default:
       throw new Error(`Unexpected discriminant ${uint8[pos]} for TSEnumMemberName`);
   }
@@ -3952,18 +3992,8 @@ function deserializeTSTypeQueryExprName(pos) {
 }
 
 function deserializeTSMappedTypeModifierOperator(pos) {
-  switch (uint8[pos]) {
-    case 0:
-      return 'true';
-    case 1:
-      return '+';
-    case 2:
-      return '-';
-    case 3:
-      return 'none';
-    default:
-      throw new Error(`Unexpected discriminant ${uint8[pos]} for TSMappedTypeModifierOperator`);
-  }
+  const operator = deserializeU8(pos);
+  return [true, '+', '-', null][operator];
 }
 
 function deserializeTSModuleReference(pos) {
@@ -4617,11 +4647,6 @@ function deserializeVecArrayExpressionElement(pos) {
   return arr;
 }
 
-function deserializeOptionSpan(pos) {
-  if (uint8[pos] === 0) return null;
-  return deserializeSpan(pos + 8);
-}
-
 function deserializeBoxSpreadElement(pos) {
   return deserializeSpreadElement(uint32[pos >> 2]);
 }
@@ -5069,11 +5094,6 @@ function deserializeVecTSClassImplements(pos) {
   return arr;
 }
 
-function deserializeOptionVecTSClassImplements(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeVecTSClassImplements(pos);
-}
-
 function deserializeBoxClassBody(pos) {
   return deserializeClassBody(uint32[pos >> 2]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxc-parser",
-  "version": "0.63.0",
+  "version": "0.64.0",
   "main": "index.js",
   "browser": "wasm.mjs",
   "engines": {
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@oxc-project/types": "^0.63.0"
+    "@oxc-project/types": "^0.64.0"
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^4.0.0",
@@ -72,16 +72,16 @@
     "dtsHeaderFile": "header.js"
   },
   "optionalDependencies": {
-    "@oxc-parser/binding-win32-x64-msvc": "0.63.0",
-    "@oxc-parser/binding-win32-arm64-msvc": "0.63.0",
-    "@oxc-parser/binding-linux-x64-gnu": "0.63.0",
-    "@oxc-parser/binding-linux-x64-musl": "0.63.0",
-    "@oxc-parser/binding-linux-arm64-gnu": "0.63.0",
-    "@oxc-parser/binding-linux-arm64-musl": "0.63.0",
-    "@oxc-parser/binding-linux-arm-gnueabihf": "0.63.0",
-    "@oxc-parser/binding-darwin-x64": "0.63.0",
-    "@oxc-parser/binding-darwin-arm64": "0.63.0",
-    "@oxc-parser/binding-wasm32-wasi": "0.63.0"
+    "@oxc-parser/binding-win32-x64-msvc": "0.64.0",
+    "@oxc-parser/binding-win32-arm64-msvc": "0.64.0",
+    "@oxc-parser/binding-linux-x64-gnu": "0.64.0",
+    "@oxc-parser/binding-linux-x64-musl": "0.64.0",
+    "@oxc-parser/binding-linux-arm64-gnu": "0.64.0",
+    "@oxc-parser/binding-linux-arm64-musl": "0.64.0",
+    "@oxc-parser/binding-linux-arm-gnueabihf": "0.64.0",
+    "@oxc-parser/binding-darwin-x64": "0.64.0",
+    "@oxc-parser/binding-darwin-arm64": "0.64.0",
+    "@oxc-parser/binding-wasm32-wasi": "0.64.0"
   },
   "scripts": {
     "build-dev": "napi build --no-dts-cache --platform --js bindings.js",