oxc-parser 0.60.0 → 0.61.2

package/README.md

@@ -2,6 +2,10 @@
 
 ## Features
 
+### Supports WASM
+
+See https://stackblitz.com/edit/oxc-parser for usage example.
+
 ### ESTree
 
 When parsing `.js` or `.jsx` files, the AST returned is fully conformant with the

package/deserialize-js.js

@@ -361,25 +361,28 @@ function deserializeAssignmentTargetWithDefault(pos) {
 }
 
 function deserializeAssignmentTargetPropertyIdentifier(pos) {
+  const start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
+    key = deserializeIdentifierReference(pos + 8);
   const init = deserializeOptionExpression(pos + 40),
-    binding = deserializeIdentifierReference(pos + 8),
+    keyCopy = { ...key },
     value = init === null
-      ? binding
+      ? keyCopy
       : {
         type: 'AssignmentPattern',
-        start: deserializeU32(pos),
-        end: deserializeU32(pos + 4),
-        left: binding,
+        start: start,
+        end: end,
+        left: keyCopy,
         right: init,
       };
   return {
     type: 'Property',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
+    start,
+    end,
     method: false,
     shorthand: true,
     computed: false,
-    key: deserializeIdentifierReference(pos + 8),
+    key,
     value,
     kind: 'init',
   };
@@ -449,7 +452,7 @@ function deserializeDirective(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeStringLiteral(pos + 8),
-    directive: deserializeStr(pos + 48),
+    directive: deserializeStr(pos + 56),
   };
 }
 
@@ -749,6 +752,7 @@ function deserializeBindingRestElement(pos) {
 }
 
 function deserializeFunction(pos) {
+  const params = deserializeBoxFormalParameters(pos + 72);
   return {
     type: deserializeFunctionType(pos + 8),
     start: deserializeU32(pos),
@@ -757,7 +761,7 @@ function deserializeFunction(pos) {
     expression: false,
     generator: deserializeBool(pos + 48),
     async: deserializeBool(pos + 49),
-    params: deserializeBoxFormalParameters(pos + 72),
+    params,
     body: deserializeOptionBoxFunctionBody(pos + 88),
   };
 }
@@ -794,17 +798,18 @@ function deserializeFunctionBody(pos) {
 }
 
 function deserializeArrowFunctionExpression(pos) {
+  const expression = deserializeBool(pos + 8);
   let body = deserializeBoxFunctionBody(pos + 40);
   return {
     type: 'ArrowFunctionExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     id: null,
-    expression: deserializeBool(pos + 8),
+    expression,
     generator: false,
     async: deserializeBool(pos + 9),
     params: deserializeBoxFormalParameters(pos + 24),
-    body: deserializeBool(pos + 8) ? body.body[0].expression : body,
+    body: expression ? body.body[0].expression : body,
   };
 }
 
@@ -907,7 +912,7 @@ function deserializeImportExpression(pos) {
 function deserializeImportDeclaration(pos) {
   let specifiers = deserializeOptionVecImportDeclarationSpecifier(pos + 8);
   if (specifiers === null) specifiers = [];
-  const withClause = deserializeOptionBoxWithClause(pos + 88);
+  const withClause = deserializeOptionBoxWithClause(pos + 96);
   return {
     type: 'ImportDeclaration',
     start: deserializeU32(pos),
@@ -924,7 +929,7 @@ function deserializeImportSpecifier(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     imported: deserializeModuleExportName(pos + 8),
-    local: deserializeBindingIdentifier(pos + 56),
+    local: deserializeBindingIdentifier(pos + 64),
   };
 }
 
@@ -962,12 +967,12 @@ function deserializeImportAttribute(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     key: deserializeImportAttributeKey(pos + 8),
-    value: deserializeStringLiteral(pos + 56),
+    value: deserializeStringLiteral(pos + 64),
   };
 }
 
 function deserializeExportNamedDeclaration(pos) {
-  const withClause = deserializeOptionBoxWithClause(pos + 104);
+  const withClause = deserializeOptionBoxWithClause(pos + 112);
   return {
     type: 'ExportNamedDeclaration',
     start: deserializeU32(pos),
@@ -984,18 +989,18 @@ function deserializeExportDefaultDeclaration(pos) {
     type: 'ExportDefaultDeclaration',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    declaration: deserializeExportDefaultDeclarationKind(pos + 56),
+    declaration: deserializeExportDefaultDeclarationKind(pos + 64),
   };
 }
 
 function deserializeExportAllDeclaration(pos) {
-  const withClause = deserializeOptionBoxWithClause(pos + 96);
+  const withClause = deserializeOptionBoxWithClause(pos + 112);
   return {
     type: 'ExportAllDeclaration',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     exported: deserializeOptionModuleExportName(pos + 8),
-    source: deserializeStringLiteral(pos + 56),
+    source: deserializeStringLiteral(pos + 64),
     attributes: withClause === null ? [] : withClause.withEntries,
   };
 }
@@ -1006,7 +1011,7 @@ function deserializeExportSpecifier(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     local: deserializeModuleExportName(pos + 8),
-    exported: deserializeModuleExportName(pos + 56),
+    exported: deserializeModuleExportName(pos + 64),
   };
 }
 
@@ -1262,10 +1267,13 @@ function deserializeJSXText(pos) {
 
 function deserializeTSThisParameter(pos) {
   return {
-    type: 'TSThisParameter',
+    type: 'Identifier',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
+    name: 'this',
     typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 16),
+    decorators: [],
+    optional: false,
   };
 }
 
@@ -1654,7 +1662,6 @@ function deserializeTSCallSignatureDeclaration(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 48),
     returnType: deserializeOptionBoxTSTypeAnnotation(pos + 56),
   };
@@ -1719,14 +1726,16 @@ 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 + 56),
-    kind: deserializeTSModuleDeclarationKind(pos + 72),
-    declare: deserializeBool(pos + 73),
+    body: deserializeOptionTSModuleDeclarationBody(pos + 64),
+    kind,
+    declare: deserializeBool(pos + 81),
+    global: kind === 'global',
   };
 }
 
@@ -1775,40 +1784,19 @@ function deserializeTSImportType(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     argument: deserializeTSType(pos + 8),
-    options: deserializeOptionBoxTSImportAttributes(pos + 24),
+    options: deserializeOptionBoxObjectExpression(pos + 24),
     qualifier: deserializeOptionTSTypeName(pos + 32),
     typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
     isTypeOf: deserializeBool(pos + 56),
   };
 }
 
-function deserializeTSImportAttributes(pos) {
-  return {
-    type: 'TSImportAttributes',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    attributesKeyword: deserializeIdentifierName(pos + 8),
-    elements: deserializeVecTSImportAttribute(pos + 32),
-  };
-}
-
-function deserializeTSImportAttribute(pos) {
-  return {
-    type: 'TSImportAttribute',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    name: deserializeTSImportAttributeName(pos + 8),
-    value: deserializeExpression(pos + 56),
-  };
-}
-
 function deserializeTSFunctionType(pos) {
   return {
     type: 'TSFunctionType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionBoxTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 24),
     returnType: deserializeBoxTSTypeAnnotation(pos + 32),
   };
@@ -3361,8 +3349,7 @@ function deserializeJSXElementName(pos) {
       return deserializeBoxJSXIdentifier(pos + 8);
     case 1:
       const ident = deserializeBoxIdentifierReference(pos + 8);
-      ident.type = 'JSXIdentifier';
-      return ident;
+      return { type: 'JSXIdentifier', start: ident.start, end: ident.end, name: ident.name };
     case 2:
       return deserializeBoxJSXNamespacedName(pos + 8);
     case 3:
@@ -3379,8 +3366,7 @@ function deserializeJSXMemberExpressionObject(pos) {
   switch (uint8[pos]) {
     case 0:
       const ident = deserializeBoxIdentifierReference(pos + 8);
-      ident.type = 'JSXIdentifier';
-      return ident;
+      return { type: 'JSXIdentifier', start: ident.start, end: ident.end, name: ident.name };
     case 1:
       return deserializeBoxJSXMemberExpression(pos + 8);
     case 2:
@@ -3862,17 +3848,6 @@ function deserializeTSTypeQueryExprName(pos) {
   }
 }
 
-function deserializeTSImportAttributeName(pos) {
-  switch (uint8[pos]) {
-    case 0:
-      return deserializeIdentifierName(pos + 8);
-    case 1:
-      return deserializeStringLiteral(pos + 8);
-    default:
-      throw new Error(`Unexpected discriminant ${uint8[pos]} for TSImportAttributeName`);
-  }
-}
-
 function deserializeTSMappedTypeModifierOperator(pos) {
   switch (uint8[pos]) {
     case 0:
@@ -4337,7 +4312,7 @@ function deserializeVecDirective(pos) {
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeDirective(pos));
-    pos += 64;
+    pos += 72;
   }
   return arr;
 }
@@ -5108,7 +5083,7 @@ function deserializeVecImportAttribute(pos) {
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeImportAttribute(pos));
-    pos += 96;
+    pos += 112;
   }
   return arr;
 }
@@ -5125,13 +5100,13 @@ function deserializeVecExportSpecifier(pos) {
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeExportSpecifier(pos));
-    pos += 112;
+    pos += 128;
   }
   return arr;
 }
 
 function deserializeOptionStringLiteral(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
+  if (uint8[pos + 40] === 2) return null;
   return deserializeStringLiteral(pos);
 }
 
@@ -5518,13 +5493,9 @@ function deserializeBoxTSTypeParameter(pos) {
   return deserializeTSTypeParameter(uint32[pos >> 2]);
 }
 
-function deserializeBoxTSImportAttributes(pos) {
-  return deserializeTSImportAttributes(uint32[pos >> 2]);
-}
-
-function deserializeOptionBoxTSImportAttributes(pos) {
+function deserializeOptionBoxObjectExpression(pos) {
   if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxTSImportAttributes(pos);
+  return deserializeBoxObjectExpression(pos);
 }
 
 function deserializeOptionTSTypeName(pos) {
@@ -5532,18 +5503,6 @@ function deserializeOptionTSTypeName(pos) {
   return deserializeTSTypeName(pos);
 }
 
-function deserializeVecTSImportAttribute(pos) {
-  const arr = [],
-    pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
-  pos = uint32[pos32];
-  for (let i = 0; i < len; i++) {
-    arr.push(deserializeTSImportAttribute(pos));
-    pos += 72;
-  }
-  return arr;
-}
-
 function deserializeBoxTSExternalModuleReference(pos) {
   return deserializeTSExternalModuleReference(uint32[pos >> 2]);
 }

package/deserialize-ts.js

@@ -53,6 +53,9 @@ function deserializeIdentifierName(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     name: deserializeStr(pos + 8),
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
   };
 }
 
@@ -62,6 +65,9 @@ function deserializeIdentifierReference(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     name: deserializeStr(pos + 8),
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
   };
 }
 
@@ -71,6 +77,9 @@ function deserializeBindingIdentifier(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     name: deserializeStr(pos + 8),
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
   };
 }
 
@@ -364,25 +373,28 @@ function deserializeAssignmentTargetWithDefault(pos) {
 }
 
 function deserializeAssignmentTargetPropertyIdentifier(pos) {
+  const start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
+    key = deserializeIdentifierReference(pos + 8);
   const init = deserializeOptionExpression(pos + 40),
-    binding = deserializeIdentifierReference(pos + 8),
+    keyCopy = { ...key },
     value = init === null
-      ? binding
+      ? keyCopy
       : {
         type: 'AssignmentPattern',
-        start: deserializeU32(pos),
-        end: deserializeU32(pos + 4),
-        left: binding,
+        start: start,
+        end: end,
+        left: keyCopy,
         right: init,
       };
   return {
     type: 'Property',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
+    start,
+    end,
     method: false,
     shorthand: true,
     computed: false,
-    key: deserializeIdentifierReference(pos + 8),
+    key,
     value,
     kind: 'init',
   };
@@ -452,7 +464,7 @@ function deserializeDirective(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     expression: deserializeStringLiteral(pos + 8),
-    directive: deserializeStr(pos + 48),
+    directive: deserializeStr(pos + 56),
   };
 }
 
@@ -708,6 +720,7 @@ function deserializeAssignmentPattern(pos) {
     end: deserializeU32(pos + 4),
     left: deserializeBindingPattern(pos + 8),
     right: deserializeExpression(pos + 40),
+    decorators: [],
   };
 }
 
@@ -746,6 +759,9 @@ function deserializeArrayPattern(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     elements,
+    decorators: [],
+    optional: false,
+    typeAnnotation: null,
   };
 }
 
@@ -759,6 +775,9 @@ function deserializeBindingRestElement(pos) {
 }
 
 function deserializeFunction(pos) {
+  const params = deserializeBoxFormalParameters(pos + 72);
+  const thisParam = deserializeOptionBoxTSThisParameter(pos + 64);
+  if (thisParam !== null) params.unshift(thisParam);
   return {
     type: deserializeFunctionType(pos + 8),
     start: deserializeU32(pos),
@@ -767,11 +786,10 @@ function deserializeFunction(pos) {
     expression: false,
     generator: deserializeBool(pos + 48),
     async: deserializeBool(pos + 49),
-    params: deserializeBoxFormalParameters(pos + 72),
+    params,
     body: deserializeOptionBoxFunctionBody(pos + 88),
     declare: deserializeBool(pos + 50),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 56),
-    thisParam: deserializeOptionBoxTSThisParameter(pos + 64),
     returnType: deserializeOptionBoxTSTypeAnnotation(pos + 80),
   };
 }
@@ -800,9 +818,6 @@ function deserializeFormalParameter(pos) {
     typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 56),
     optional: deserializeBool(pos + 64),
     decorators: deserializeVecDecorator(pos + 8),
-    accessibility: deserializeOptionTSAccessibility(pos + 72),
-    readonly: deserializeBool(pos + 73),
-    override: deserializeBool(pos + 74),
   };
 }
 
@@ -818,17 +833,18 @@ function deserializeFunctionBody(pos) {
 }
 
 function deserializeArrowFunctionExpression(pos) {
+  const expression = deserializeBool(pos + 8);
   let body = deserializeBoxFunctionBody(pos + 40);
   return {
     type: 'ArrowFunctionExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     id: null,
-    expression: deserializeBool(pos + 8),
+    expression,
     generator: false,
     async: deserializeBool(pos + 9),
     params: deserializeBoxFormalParameters(pos + 24),
-    body: deserializeBool(pos + 8) ? body.body[0].expression : body,
+    body: expression ? body.body[0].expression : body,
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 16),
     returnType: deserializeOptionBoxTSTypeAnnotation(pos + 32),
   };
@@ -956,7 +972,7 @@ function deserializeImportExpression(pos) {
 function deserializeImportDeclaration(pos) {
   let specifiers = deserializeOptionVecImportDeclarationSpecifier(pos + 8);
   if (specifiers === null) specifiers = [];
-  const withClause = deserializeOptionBoxWithClause(pos + 88);
+  const withClause = deserializeOptionBoxWithClause(pos + 96);
   return {
     type: 'ImportDeclaration',
     start: deserializeU32(pos),
@@ -964,7 +980,7 @@ function deserializeImportDeclaration(pos) {
     specifiers,
     source: deserializeStringLiteral(pos + 40),
     attributes: withClause === null ? [] : withClause.withEntries,
-    importKind: deserializeImportOrExportKind(pos + 96),
+    importKind: deserializeImportOrExportKind(pos + 104),
   };
 }
 
@@ -974,8 +990,8 @@ function deserializeImportSpecifier(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     imported: deserializeModuleExportName(pos + 8),
-    local: deserializeBindingIdentifier(pos + 56),
-    importKind: deserializeImportOrExportKind(pos + 88),
+    local: deserializeBindingIdentifier(pos + 64),
+    importKind: deserializeImportOrExportKind(pos + 96),
   };
 }
 
@@ -1013,12 +1029,12 @@ function deserializeImportAttribute(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     key: deserializeImportAttributeKey(pos + 8),
-    value: deserializeStringLiteral(pos + 56),
+    value: deserializeStringLiteral(pos + 64),
   };
 }
 
 function deserializeExportNamedDeclaration(pos) {
-  const withClause = deserializeOptionBoxWithClause(pos + 104);
+  const withClause = deserializeOptionBoxWithClause(pos + 112);
   return {
     type: 'ExportNamedDeclaration',
     start: deserializeU32(pos),
@@ -1027,7 +1043,7 @@ function deserializeExportNamedDeclaration(pos) {
     specifiers: deserializeVecExportSpecifier(pos + 24),
     source: deserializeOptionStringLiteral(pos + 56),
     attributes: withClause === null ? [] : withClause.withEntries,
-    exportKind: deserializeImportOrExportKind(pos + 96),
+    exportKind: deserializeImportOrExportKind(pos + 104),
   };
 }
 
@@ -1036,20 +1052,20 @@ function deserializeExportDefaultDeclaration(pos) {
     type: 'ExportDefaultDeclaration',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    declaration: deserializeExportDefaultDeclarationKind(pos + 56),
+    declaration: deserializeExportDefaultDeclarationKind(pos + 64),
   };
 }
 
 function deserializeExportAllDeclaration(pos) {
-  const withClause = deserializeOptionBoxWithClause(pos + 96);
+  const withClause = deserializeOptionBoxWithClause(pos + 112);
   return {
     type: 'ExportAllDeclaration',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     exported: deserializeOptionModuleExportName(pos + 8),
-    source: deserializeStringLiteral(pos + 56),
+    source: deserializeStringLiteral(pos + 64),
     attributes: withClause === null ? [] : withClause.withEntries,
-    exportKind: deserializeImportOrExportKind(pos + 104),
+    exportKind: deserializeImportOrExportKind(pos + 120),
   };
 }
 
@@ -1059,8 +1075,8 @@ function deserializeExportSpecifier(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     local: deserializeModuleExportName(pos + 8),
-    exported: deserializeModuleExportName(pos + 56),
-    exportKind: deserializeImportOrExportKind(pos + 104),
+    exported: deserializeModuleExportName(pos + 64),
+    exportKind: deserializeImportOrExportKind(pos + 120),
   };
 }
 
@@ -1317,10 +1333,13 @@ function deserializeJSXText(pos) {
 
 function deserializeTSThisParameter(pos) {
   return {
-    type: 'TSThisParameter',
+    type: 'Identifier',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
+    name: 'this',
     typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 16),
+    decorators: [],
+    optional: false,
   };
 }
 
@@ -1700,6 +1719,7 @@ function deserializeTSIndexSignature(pos) {
     typeAnnotation: deserializeBoxTSTypeAnnotation(pos + 40),
     readonly: deserializeBool(pos + 48),
     static: deserializeBool(pos + 49),
+    accessibility: null,
   };
 }
 
@@ -1709,7 +1729,6 @@ function deserializeTSCallSignatureDeclaration(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 48),
     returnType: deserializeOptionBoxTSTypeAnnotation(pos + 56),
   };
@@ -1749,6 +1768,8 @@ function deserializeTSIndexSignatureName(pos) {
     end: deserializeU32(pos + 4),
     name: deserializeStr(pos + 8),
     typeAnnotation: deserializeBoxTSTypeAnnotation(pos + 24),
+    decorators: [],
+    optional: false,
   };
 }
 
@@ -1774,14 +1795,16 @@ 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 + 56),
-    kind: deserializeTSModuleDeclarationKind(pos + 72),
-    declare: deserializeBool(pos + 73),
+    body: deserializeOptionTSModuleDeclarationBody(pos + 64),
+    kind,
+    declare: deserializeBool(pos + 81),
+    global: kind === 'global',
   };
 }
 
@@ -1830,40 +1853,19 @@ function deserializeTSImportType(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     argument: deserializeTSType(pos + 8),
-    options: deserializeOptionBoxTSImportAttributes(pos + 24),
+    options: deserializeOptionBoxObjectExpression(pos + 24),
     qualifier: deserializeOptionTSTypeName(pos + 32),
     typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 48),
     isTypeOf: deserializeBool(pos + 56),
   };
 }
 
-function deserializeTSImportAttributes(pos) {
-  return {
-    type: 'TSImportAttributes',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    attributesKeyword: deserializeIdentifierName(pos + 8),
-    elements: deserializeVecTSImportAttribute(pos + 32),
-  };
-}
-
-function deserializeTSImportAttribute(pos) {
-  return {
-    type: 'TSImportAttribute',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    name: deserializeTSImportAttributeName(pos + 8),
-    value: deserializeExpression(pos + 56),
-  };
-}
-
 function deserializeTSFunctionType(pos) {
   return {
     type: 'TSFunctionType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionBoxTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 24),
     returnType: deserializeBoxTSTypeAnnotation(pos + 32),
   };
@@ -3416,8 +3418,7 @@ function deserializeJSXElementName(pos) {
       return deserializeBoxJSXIdentifier(pos + 8);
     case 1:
       const ident = deserializeBoxIdentifierReference(pos + 8);
-      ident.type = 'JSXIdentifier';
-      return ident;
+      return { type: 'JSXIdentifier', start: ident.start, end: ident.end, name: ident.name };
     case 2:
       return deserializeBoxJSXNamespacedName(pos + 8);
     case 3:
@@ -3434,8 +3435,7 @@ function deserializeJSXMemberExpressionObject(pos) {
   switch (uint8[pos]) {
     case 0:
       const ident = deserializeBoxIdentifierReference(pos + 8);
-      ident.type = 'JSXIdentifier';
-      return ident;
+      return { type: 'JSXIdentifier', start: ident.start, end: ident.end, name: ident.name };
     case 1:
       return deserializeBoxJSXMemberExpression(pos + 8);
     case 2:
@@ -3917,17 +3917,6 @@ function deserializeTSTypeQueryExprName(pos) {
   }
 }
 
-function deserializeTSImportAttributeName(pos) {
-  switch (uint8[pos]) {
-    case 0:
-      return deserializeIdentifierName(pos + 8);
-    case 1:
-      return deserializeStringLiteral(pos + 8);
-    default:
-      throw new Error(`Unexpected discriminant ${uint8[pos]} for TSImportAttributeName`);
-  }
-}
-
 function deserializeTSMappedTypeModifierOperator(pos) {
   switch (uint8[pos]) {
     case 0:
@@ -4392,7 +4381,7 @@ function deserializeVecDirective(pos) {
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeDirective(pos));
-    pos += 64;
+    pos += 72;
   }
   return arr;
 }
@@ -5163,7 +5152,7 @@ function deserializeVecImportAttribute(pos) {
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeImportAttribute(pos));
-    pos += 96;
+    pos += 112;
   }
   return arr;
 }
@@ -5180,13 +5169,13 @@ function deserializeVecExportSpecifier(pos) {
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeExportSpecifier(pos));
-    pos += 112;
+    pos += 128;
   }
   return arr;
 }
 
 function deserializeOptionStringLiteral(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
+  if (uint8[pos + 40] === 2) return null;
   return deserializeStringLiteral(pos);
 }
 
@@ -5573,13 +5562,9 @@ function deserializeBoxTSTypeParameter(pos) {
   return deserializeTSTypeParameter(uint32[pos >> 2]);
 }
 
-function deserializeBoxTSImportAttributes(pos) {
-  return deserializeTSImportAttributes(uint32[pos >> 2]);
-}
-
-function deserializeOptionBoxTSImportAttributes(pos) {
+function deserializeOptionBoxObjectExpression(pos) {
   if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxTSImportAttributes(pos);
+  return deserializeBoxObjectExpression(pos);
 }
 
 function deserializeOptionTSTypeName(pos) {
@@ -5587,18 +5572,6 @@ function deserializeOptionTSTypeName(pos) {
   return deserializeTSTypeName(pos);
 }
 
-function deserializeVecTSImportAttribute(pos) {
-  const arr = [],
-    pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
-  pos = uint32[pos32];
-  for (let i = 0; i < len; i++) {
-    arr.push(deserializeTSImportAttribute(pos));
-    pos += 72;
-  }
-  return arr;
-}
-
 function deserializeBoxTSExternalModuleReference(pos) {
   return deserializeTSExternalModuleReference(uint32[pos >> 2]);
 }

package/index.d.ts

@@ -129,6 +129,7 @@ export interface OxcError {
   message: string
   labels: Array<ErrorLabel>
   helpMessage?: string
+  codeframe?: string
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxc-parser",
-  "version": "0.60.0",
+  "version": "0.61.2",
   "main": "index.js",
   "browser": "wasm.mjs",
   "engines": {
@@ -38,12 +38,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@oxc-project/types": "^0.60.0"
+    "@oxc-project/types": "^0.61.2"
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^4.0.0",
     "@napi-rs/wasm-runtime": "^0.2.7",
-    "@vitest/browser": "3.0.7",
+    "@vitest/browser": "3.0.8",
+    "esbuild": "^0.25.0",
     "playwright": "^1.51.0",
     "vitest": "3.0.8"
   },
@@ -70,23 +71,25 @@
     "dtsHeaderFile": "header.js"
   },
   "optionalDependencies": {
-    "@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"
+    "@oxc-parser/binding-win32-x64-msvc": "0.61.2",
+    "@oxc-parser/binding-win32-arm64-msvc": "0.61.2",
+    "@oxc-parser/binding-linux-x64-gnu": "0.61.2",
+    "@oxc-parser/binding-linux-x64-musl": "0.61.2",
+    "@oxc-parser/binding-linux-arm64-gnu": "0.61.2",
+    "@oxc-parser/binding-linux-arm64-musl": "0.61.2",
+    "@oxc-parser/binding-linux-arm-gnueabihf": "0.61.2",
+    "@oxc-parser/binding-darwin-x64": "0.61.2",
+    "@oxc-parser/binding-darwin-arm64": "0.61.2",
+    "@oxc-parser/binding-wasm32-wasi": "0.61.2"
   },
   "scripts": {
     "build-dev": "napi build --no-dts-cache --platform --js bindings.js",
-    "build": "pnpm run build-dev --release",
+    "build": "pnpm run build-dev --features allocator --release",
     "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",
+    "build-browser-bundle": "node build-browser-bundle.mjs",
+    "test": "pnpm run test-node run && tsc",
+    "test-node": "vitest --dir ./test",
     "test-browser": "vitest -c vitest.config.browser.mts",
     "bench": "vitest bench --run ./bench.bench.mjs"
   }

package/wrap.cjs

@@ -3,7 +3,7 @@ module.exports.wrap = function wrap(result) {
   return {
     get program() {
       if (!program) {
-        // Note: This code is repeated in `wasm/parser/update-bindings.mjs` and `crates/oxc-wasm/update-bindings.mjs`.
+        // 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.

package/wrap.mjs

@@ -3,26 +3,7 @@ export function wrap(result) {
   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;
-        });
+        program = jsonParseAst(result.program);
       }
       return program;
     },
@@ -40,3 +21,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
+        }
+      }
+    }
+    return value;
+  });
+}