oxc-parser 0.69.0 → 0.71.0

package/generated/deserialize/ts.js

@@ -35,8 +35,8 @@ function deserialize(buffer, sourceTextInput, sourceLenInput) {
 }
 
 function deserializeProgram(pos) {
-  const body = deserializeVecDirective(pos + 88);
-  body.push(...deserializeVecStatement(pos + 120));
+  const body = deserializeVecDirective(pos + 72);
+  body.push(...deserializeVecStatement(pos + 96));
 
   const end = deserializeU32(pos + 4);
 
@@ -62,8 +62,8 @@ function deserializeProgram(pos) {
     start,
     end,
     body,
-    sourceType: deserializeModuleKind(pos + 9),
-    hashbang: deserializeOptionHashbang(pos + 64),
+    sourceType: deserializeModuleKind(pos + 125),
+    hashbang: deserializeOptionHashbang(pos + 48),
   };
   return program;
 }
@@ -151,12 +151,12 @@ function deserializeObjectProperty(pos) {
     type: 'Property',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    method: deserializeBool(pos + 48),
-    shorthand: deserializeBool(pos + 49),
-    computed: deserializeBool(pos + 50),
-    key: deserializePropertyKey(pos + 16),
-    value: deserializeExpression(pos + 32),
-    kind: deserializePropertyKind(pos + 8),
+    method: deserializeBool(pos + 41),
+    shorthand: deserializeBool(pos + 42),
+    computed: deserializeBool(pos + 43),
+    key: deserializePropertyKey(pos + 8),
+    value: deserializeExpression(pos + 24),
+    kind: deserializePropertyKind(pos + 40),
     optional: false,
   };
 }
@@ -166,7 +166,7 @@ function deserializeTemplateLiteral(pos) {
     type: 'TemplateLiteral',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    expressions: deserializeVecExpression(pos + 40),
+    expressions: deserializeVecExpression(pos + 32),
     quasis: deserializeVecTemplateElement(pos + 8),
   };
 }
@@ -244,7 +244,7 @@ function deserializeCallExpression(pos) {
     end: deserializeU32(pos + 4),
     callee: deserializeExpression(pos + 8),
     arguments: deserializeVecArgument(pos + 32),
-    optional: deserializeBool(pos + 64),
+    optional: deserializeBool(pos + 56),
     typeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 24),
   };
 }
@@ -284,9 +284,9 @@ function deserializeUpdateExpression(pos) {
     type: 'UpdateExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    operator: deserializeUpdateOperator(pos + 8),
-    prefix: deserializeBool(pos + 9),
-    argument: deserializeSimpleAssignmentTarget(pos + 16),
+    operator: deserializeUpdateOperator(pos + 24),
+    prefix: deserializeBool(pos + 25),
+    argument: deserializeSimpleAssignmentTarget(pos + 8),
   };
 }
 
@@ -295,9 +295,9 @@ function deserializeUnaryExpression(pos) {
     type: 'UnaryExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    operator: deserializeUnaryOperator(pos + 8),
+    operator: deserializeUnaryOperator(pos + 24),
     prefix: true,
-    argument: deserializeExpression(pos + 16),
+    argument: deserializeExpression(pos + 8),
   };
 }
 
@@ -307,8 +307,8 @@ function deserializeBinaryExpression(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     left: deserializeExpression(pos + 8),
-    operator: deserializeBinaryOperator(pos + 24),
-    right: deserializeExpression(pos + 32),
+    operator: deserializeBinaryOperator(pos + 40),
+    right: deserializeExpression(pos + 24),
   };
 }
 
@@ -329,8 +329,8 @@ function deserializeLogicalExpression(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     left: deserializeExpression(pos + 8),
-    operator: deserializeLogicalOperator(pos + 24),
-    right: deserializeExpression(pos + 32),
+    operator: deserializeLogicalOperator(pos + 40),
+    right: deserializeExpression(pos + 24),
   };
 }
 
@@ -350,15 +350,15 @@ function deserializeAssignmentExpression(pos) {
     type: 'AssignmentExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    operator: deserializeAssignmentOperator(pos + 8),
-    left: deserializeAssignmentTarget(pos + 16),
-    right: deserializeExpression(pos + 32),
+    operator: deserializeAssignmentOperator(pos + 40),
+    left: deserializeAssignmentTarget(pos + 8),
+    right: deserializeExpression(pos + 24),
   };
 }
 
 function deserializeArrayAssignmentTarget(pos) {
   const elements = deserializeVecOptionAssignmentTargetMaybeDefault(pos + 8);
-  const rest = deserializeOptionAssignmentTargetRest(pos + 40);
+  const rest = deserializeOptionAssignmentTargetRest(pos + 32);
   if (rest !== null) elements.push(rest);
   return {
     type: 'ArrayPattern',
@@ -373,7 +373,7 @@ function deserializeArrayAssignmentTarget(pos) {
 
 function deserializeObjectAssignmentTarget(pos) {
   const properties = deserializeVecAssignmentTargetProperty(pos + 8);
-  const rest = deserializeOptionAssignmentTargetRest(pos + 40);
+  const rest = deserializeOptionAssignmentTargetRest(pos + 32);
   if (rest !== null) properties.push(rest);
   return {
     type: 'ObjectPattern',
@@ -426,9 +426,9 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
         end: end,
         left: keyCopy,
         right: init,
-        typeAnnotation: null,
-        optional: false,
         decorators: [],
+        optional: false,
+        typeAnnotation: null,
       };
   return {
     type: 'Property',
@@ -536,9 +536,9 @@ function deserializeVariableDeclaration(pos) {
     type: 'VariableDeclaration',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    declarations: deserializeVecVariableDeclarator(pos + 16),
-    kind: deserializeVariableDeclarationKind(pos + 8),
-    declare: deserializeBool(pos + 48),
+    declarations: deserializeVecVariableDeclarator(pos + 8),
+    kind: deserializeVariableDeclarationKind(pos + 32),
+    declare: deserializeBool(pos + 33),
   };
 }
 
@@ -547,9 +547,9 @@ function deserializeVariableDeclarator(pos) {
     type: 'VariableDeclarator',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    id: deserializeBindingPattern(pos + 16),
-    init: deserializeOptionExpression(pos + 48),
-    definite: deserializeBool(pos + 64),
+    id: deserializeBindingPattern(pos + 8),
+    init: deserializeOptionExpression(pos + 40),
+    definite: deserializeBool(pos + 57),
   };
 }
 
@@ -630,10 +630,10 @@ function deserializeForOfStatement(pos) {
     type: 'ForOfStatement',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    await: deserializeBool(pos + 8),
-    left: deserializeForStatementLeft(pos + 16),
-    right: deserializeExpression(pos + 32),
-    body: deserializeStatement(pos + 48),
+    await: deserializeBool(pos + 60),
+    left: deserializeForStatementLeft(pos + 8),
+    right: deserializeExpression(pos + 24),
+    body: deserializeStatement(pos + 40),
   };
 }
 
@@ -773,7 +773,7 @@ function deserializeAssignmentPattern(pos) {
 
 function deserializeObjectPattern(pos) {
   const properties = deserializeVecBindingProperty(pos + 8);
-  const rest = deserializeOptionBoxBindingRestElement(pos + 40);
+  const rest = deserializeOptionBoxBindingRestElement(pos + 32);
   if (rest !== null) properties.push(rest);
   return {
     type: 'ObjectPattern',
@@ -803,7 +803,7 @@ function deserializeBindingProperty(pos) {
 
 function deserializeArrayPattern(pos) {
   const elements = deserializeVecOptionBindingPattern(pos + 8);
-  const rest = deserializeOptionBoxBindingRestElement(pos + 40);
+  const rest = deserializeOptionBoxBindingRestElement(pos + 32);
   if (rest !== null) elements.push(rest);
   return {
     type: 'ArrayPattern',
@@ -830,39 +830,39 @@ function deserializeBindingRestElement(pos) {
 }
 
 function deserializeFunction(pos) {
-  const params = deserializeBoxFormalParameters(pos + 72);
-  const thisParam = deserializeOptionBoxTSThisParameter(pos + 64);
+  const params = deserializeBoxFormalParameters(pos + 56);
+  const thisParam = deserializeOptionBoxTSThisParameter(pos + 48);
   if (thisParam !== null) params.unshift(thisParam);
   return {
-    type: deserializeFunctionType(pos + 8),
+    type: deserializeFunctionType(pos + 84),
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    id: deserializeOptionBindingIdentifier(pos + 16),
+    id: deserializeOptionBindingIdentifier(pos + 8),
     expression: false,
-    generator: deserializeBool(pos + 48),
-    async: deserializeBool(pos + 49),
+    generator: deserializeBool(pos + 85),
+    async: deserializeBool(pos + 86),
     params,
-    body: deserializeOptionBoxFunctionBody(pos + 88),
-    declare: deserializeBool(pos + 50),
-    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 56),
-    returnType: deserializeOptionBoxTSTypeAnnotation(pos + 80),
+    body: deserializeOptionBoxFunctionBody(pos + 72),
+    declare: deserializeBool(pos + 87),
+    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 40),
+    returnType: deserializeOptionBoxTSTypeAnnotation(pos + 64),
   };
 }
 
 function deserializeFormalParameters(pos) {
-  const params = deserializeVecFormalParameter(pos + 16);
-  if (uint32[(pos + 48) >> 2] !== 0 && uint32[(pos + 52) >> 2] !== 0) {
-    pos = uint32[(pos + 48) >> 2];
+  const params = deserializeVecFormalParameter(pos + 8);
+  if (uint32[(pos + 32) >> 2] !== 0 && uint32[(pos + 36) >> 2] !== 0) {
+    pos = uint32[(pos + 32) >> 2];
     params.push({
       type: 'RestElement',
       start: deserializeU32(pos),
       end: deserializeU32(pos + 4),
       argument: deserializeBindingPatternKind(pos + 8),
+      decorators: [],
+      optional: deserializeBool(pos + 32),
       typeAnnotation: deserializeOptionBoxTSTypeAnnotation(
         pos + 24,
       ),
-      optional: deserializeBool(pos + 32),
-      decorators: [],
       value: null,
     });
   }
@@ -870,16 +870,16 @@ function deserializeFormalParameters(pos) {
 }
 
 function deserializeFormalParameter(pos) {
-  const accessibility = deserializeOptionTSAccessibility(pos + 72),
-    readonly = deserializeBool(pos + 73),
-    override = deserializeBool(pos + 74);
+  const accessibility = deserializeOptionTSAccessibility(pos + 64),
+    readonly = deserializeBool(pos + 65),
+    override = deserializeBool(pos + 66);
   let param;
   if (accessibility === null && !readonly && !override) {
     param = {
-      ...deserializeBindingPatternKind(pos + 40),
-      typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 56),
-      optional: deserializeBool(pos + 64),
+      ...deserializeBindingPatternKind(pos + 32),
       decorators: deserializeVecDecorator(pos + 8),
+      optional: deserializeBool(pos + 56),
+      typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 48),
     };
   } else {
     param = {
@@ -889,7 +889,7 @@ function deserializeFormalParameter(pos) {
       accessibility,
       decorators: deserializeVecDecorator(pos + 8),
       override,
-      parameter: deserializeBindingPattern(pos + 40),
+      parameter: deserializeBindingPattern(pos + 32),
       readonly,
       static: false,
     };
@@ -899,7 +899,7 @@ function deserializeFormalParameter(pos) {
 
 function deserializeFunctionBody(pos) {
   const body = deserializeVecDirective(pos + 8);
-  body.push(...deserializeVecStatement(pos + 40));
+  body.push(...deserializeVecStatement(pos + 32));
   return {
     type: 'BlockStatement',
     start: deserializeU32(pos),
@@ -909,8 +909,8 @@ function deserializeFunctionBody(pos) {
 }
 
 function deserializeArrowFunctionExpression(pos) {
-  const expression = deserializeBool(pos + 8);
-  let body = deserializeBoxFunctionBody(pos + 40);
+  const expression = deserializeBool(pos + 44);
+  let body = deserializeBoxFunctionBody(pos + 32);
   return {
     type: 'ArrowFunctionExpression',
     start: deserializeU32(pos),
@@ -918,11 +918,11 @@ function deserializeArrowFunctionExpression(pos) {
     id: null,
     expression,
     generator: false,
-    async: deserializeBool(pos + 9),
-    params: deserializeBoxFormalParameters(pos + 24),
+    async: deserializeBool(pos + 45),
+    params: deserializeBoxFormalParameters(pos + 16),
     body: expression ? body.body[0].expression : body,
-    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 16),
-    returnType: deserializeOptionBoxTSTypeAnnotation(pos + 32),
+    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
+    returnType: deserializeOptionBoxTSTypeAnnotation(pos + 24),
   };
 }
 
@@ -931,25 +931,25 @@ function deserializeYieldExpression(pos) {
     type: 'YieldExpression',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    delegate: deserializeBool(pos + 8),
-    argument: deserializeOptionExpression(pos + 16),
+    delegate: deserializeBool(pos + 24),
+    argument: deserializeOptionExpression(pos + 8),
   };
 }
 
 function deserializeClass(pos) {
   return {
-    type: deserializeClassType(pos + 8),
+    type: deserializeClassType(pos + 132),
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    id: deserializeOptionBindingIdentifier(pos + 48),
-    superClass: deserializeOptionExpression(pos + 88),
-    body: deserializeBoxClassBody(pos + 144),
-    decorators: deserializeVecDecorator(pos + 16),
-    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 80),
-    superTypeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 104),
-    implements: deserializeVecTSClassImplements(pos + 112),
-    abstract: deserializeBool(pos + 152),
-    declare: deserializeBool(pos + 153),
+    id: deserializeOptionBindingIdentifier(pos + 32),
+    superClass: deserializeOptionExpression(pos + 72),
+    body: deserializeBoxClassBody(pos + 120),
+    decorators: deserializeVecDecorator(pos + 8),
+    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 64),
+    superTypeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 88),
+    implements: deserializeVecTSClassImplements(pos + 96),
+    abstract: deserializeBool(pos + 133),
+    declare: deserializeBool(pos + 134),
   };
 }
 
@@ -963,8 +963,8 @@ function deserializeClassBody(pos) {
 }
 
 function deserializeMethodDefinition(pos) {
-  const kind = deserializeMethodDefinitionKind(pos + 72);
-  let key = deserializePropertyKey(pos + 48);
+  const kind = deserializeMethodDefinitionKind(pos + 57);
+  let key = deserializePropertyKey(pos + 32);
   if (kind === 'constructor') {
     key = {
       type: 'Identifier',
@@ -977,38 +977,38 @@ function deserializeMethodDefinition(pos) {
     };
   }
   return {
-    type: deserializeMethodDefinitionType(pos + 8),
+    type: deserializeMethodDefinitionType(pos + 56),
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    static: deserializeBool(pos + 74),
-    computed: deserializeBool(pos + 73),
+    static: deserializeBool(pos + 59),
+    computed: deserializeBool(pos + 58),
     key,
     kind,
-    value: deserializeBoxFunction(pos + 64),
-    decorators: deserializeVecDecorator(pos + 16),
-    override: deserializeBool(pos + 75),
-    optional: deserializeBool(pos + 76),
-    accessibility: deserializeOptionTSAccessibility(pos + 77),
+    value: deserializeBoxFunction(pos + 48),
+    decorators: deserializeVecDecorator(pos + 8),
+    override: deserializeBool(pos + 60),
+    optional: deserializeBool(pos + 61),
+    accessibility: deserializeOptionTSAccessibility(pos + 62),
   };
 }
 
 function deserializePropertyDefinition(pos) {
   return {
-    type: deserializePropertyDefinitionType(pos + 8),
+    type: deserializePropertyDefinitionType(pos + 72),
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    static: deserializeBool(pos + 89),
-    computed: deserializeBool(pos + 88),
-    key: deserializePropertyKey(pos + 48),
-    value: deserializeOptionExpression(pos + 72),
-    decorators: deserializeVecDecorator(pos + 16),
-    declare: deserializeBool(pos + 90),
-    override: deserializeBool(pos + 91),
-    optional: deserializeBool(pos + 92),
-    definite: deserializeBool(pos + 93),
-    readonly: deserializeBool(pos + 94),
-    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 64),
-    accessibility: deserializeOptionTSAccessibility(pos + 95),
+    static: deserializeBool(pos + 74),
+    computed: deserializeBool(pos + 73),
+    key: deserializePropertyKey(pos + 32),
+    value: deserializeOptionExpression(pos + 56),
+    decorators: deserializeVecDecorator(pos + 8),
+    declare: deserializeBool(pos + 75),
+    override: deserializeBool(pos + 76),
+    optional: deserializeBool(pos + 77),
+    definite: deserializeBool(pos + 78),
+    readonly: deserializeBool(pos + 79),
+    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 48),
+    accessibility: deserializeOptionTSAccessibility(pos + 80),
   };
 }
 
@@ -1032,19 +1032,19 @@ function deserializeStaticBlock(pos) {
 
 function deserializeAccessorProperty(pos) {
   return {
-    type: deserializeAccessorPropertyType(pos + 8),
+    type: deserializeAccessorPropertyType(pos + 72),
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    key: deserializePropertyKey(pos + 48),
-    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 64),
-    value: deserializeOptionExpression(pos + 72),
-    computed: deserializeBool(pos + 88),
-    static: deserializeBool(pos + 89),
-    decorators: deserializeVecDecorator(pos + 16),
-    definite: deserializeBool(pos + 91),
-    accessibility: deserializeOptionTSAccessibility(pos + 92),
+    key: deserializePropertyKey(pos + 32),
+    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 48),
+    value: deserializeOptionExpression(pos + 56),
+    computed: deserializeBool(pos + 73),
+    static: deserializeBool(pos + 74),
+    decorators: deserializeVecDecorator(pos + 8),
+    definite: deserializeBool(pos + 76),
+    accessibility: deserializeOptionTSAccessibility(pos + 77),
     optional: false,
-    override: deserializeBool(pos + 90),
+    override: deserializeBool(pos + 75),
     readonly: false,
     declare: false,
   };
@@ -1063,15 +1063,16 @@ function deserializeImportExpression(pos) {
 function deserializeImportDeclaration(pos) {
   let specifiers = deserializeOptionVecImportDeclarationSpecifier(pos + 8);
   if (specifiers === null) specifiers = [];
-  const withClause = deserializeOptionBoxWithClause(pos + 96);
+  const withClause = deserializeOptionBoxWithClause(pos + 80);
   return {
     type: 'ImportDeclaration',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     specifiers,
-    source: deserializeStringLiteral(pos + 40),
-    attributes: withClause === null ? [] : withClause.withEntries,
-    importKind: deserializeImportOrExportKind(pos + 104),
+    source: deserializeStringLiteral(pos + 32),
+    attributes: withClause === null ? [] : withClause.attributes,
+    phase: deserializeOptionImportPhase(pos + 88),
+    importKind: deserializeImportOrExportKind(pos + 89),
   };
 }
 
@@ -1106,11 +1107,7 @@ function deserializeImportNamespaceSpecifier(pos) {
 
 function deserializeWithClause(pos) {
   return {
-    type: 'WithClause',
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    attributesKeyword: deserializeIdentifierName(pos + 8),
-    withEntries: deserializeVecImportAttribute(pos + 32),
+    attributes: deserializeVecImportAttribute(pos + 32),
   };
 }
 
@@ -1125,15 +1122,15 @@ function deserializeImportAttribute(pos) {
 }
 
 function deserializeExportNamedDeclaration(pos) {
-  const withClause = deserializeOptionBoxWithClause(pos + 112);
+  const withClause = deserializeOptionBoxWithClause(pos + 96);
   return {
     type: 'ExportNamedDeclaration',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     declaration: deserializeOptionDeclaration(pos + 8),
     specifiers: deserializeVecExportSpecifier(pos + 24),
-    source: deserializeOptionStringLiteral(pos + 56),
-    attributes: withClause === null ? [] : withClause.withEntries,
+    source: deserializeOptionStringLiteral(pos + 48),
+    attributes: withClause === null ? [] : withClause.attributes,
     exportKind: deserializeImportOrExportKind(pos + 104),
   };
 }
@@ -1156,7 +1153,7 @@ function deserializeExportAllDeclaration(pos) {
     end: deserializeU32(pos + 4),
     exported: deserializeOptionModuleExportName(pos + 8),
     source: deserializeStringLiteral(pos + 64),
-    attributes: withClause === null ? [] : withClause.withEntries,
+    attributes: withClause === null ? [] : withClause.attributes,
     exportKind: deserializeImportOrExportKind(pos + 120),
   };
 }
@@ -1289,7 +1286,7 @@ function deserializeRegExpFlags(pos) {
 }
 
 function deserializeJSXElement(pos) {
-  const closingElement = deserializeOptionBoxJSXClosingElement(pos + 48);
+  const closingElement = deserializeOptionBoxJSXClosingElement(pos + 40);
   const openingElement = deserializeBoxJSXOpeningElement(pos + 8);
   if (closingElement === null) openingElement.selfClosing = true;
   return {
@@ -1329,18 +1326,17 @@ function deserializeJSXFragment(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     openingFragment: deserializeJSXOpeningFragment(pos + 8),
-    closingFragment: deserializeJSXClosingFragment(pos + 48),
+    closingFragment: deserializeJSXClosingFragment(pos + 40),
     children: deserializeVecJSXChild(pos + 16),
   };
 }
 
 function deserializeJSXOpeningFragment(pos) {
-  const node = {
+  return {
     type: 'JSXOpeningFragment',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
   };
-  return node;
 }
 
 function deserializeJSXClosingFragment(pos) {
@@ -1454,8 +1450,8 @@ function deserializeTSEnumDeclaration(pos) {
     end: deserializeU32(pos + 4),
     id: deserializeBindingIdentifier(pos + 8),
     body: deserializeTSEnumBody(pos + 40),
-    const: deserializeBool(pos + 80),
-    declare: deserializeBool(pos + 81),
+    const: deserializeBool(pos + 76),
+    declare: deserializeBool(pos + 77),
   };
 }
 
@@ -1541,8 +1537,8 @@ function deserializeTSTypeOperator(pos) {
     type: 'TSTypeOperator',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    operator: deserializeTSTypeOperatorOperator(pos + 8),
-    typeAnnotation: deserializeTSType(pos + 16),
+    operator: deserializeTSTypeOperatorOperator(pos + 24),
+    typeAnnotation: deserializeTSType(pos + 8),
   };
 }
 
@@ -1775,7 +1771,7 @@ function deserializeTSTypeAliasDeclaration(pos) {
     id: deserializeBindingIdentifier(pos + 8),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 40),
     typeAnnotation: deserializeTSType(pos + 48),
-    declare: deserializeBool(pos + 64),
+    declare: deserializeBool(pos + 68),
   };
 }
 
@@ -1822,8 +1818,8 @@ function deserializeTSInterfaceDeclaration(pos) {
     id: deserializeBindingIdentifier(pos + 8),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 40),
     extends: deserializeVecTSInterfaceHeritage(pos + 48),
-    body: deserializeBoxTSInterfaceBody(pos + 80),
-    declare: deserializeBool(pos + 88),
+    body: deserializeBoxTSInterfaceBody(pos + 72),
+    declare: deserializeBool(pos + 84),
   };
 }
 
@@ -1841,11 +1837,11 @@ function deserializeTSPropertySignature(pos) {
     type: 'TSPropertySignature',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    computed: deserializeBool(pos + 8),
-    optional: deserializeBool(pos + 9),
-    readonly: deserializeBool(pos + 10),
-    key: deserializePropertyKey(pos + 16),
-    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 32),
+    computed: deserializeBool(pos + 32),
+    optional: deserializeBool(pos + 33),
+    readonly: deserializeBool(pos + 34),
+    key: deserializePropertyKey(pos + 8),
+    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 24),
     accessibility: null,
     static: false,
   };
@@ -1857,9 +1853,9 @@ function deserializeTSIndexSignature(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     parameters: deserializeVecTSIndexSignatureName(pos + 8),
-    typeAnnotation: deserializeBoxTSTypeAnnotation(pos + 40),
-    readonly: deserializeBool(pos + 48),
-    static: deserializeBool(pos + 49),
+    typeAnnotation: deserializeBoxTSTypeAnnotation(pos + 32),
+    readonly: deserializeBool(pos + 40),
+    static: deserializeBool(pos + 41),
     accessibility: null,
   };
 }
@@ -1879,20 +1875,20 @@ function deserializeTSCallSignatureDeclaration(pos) {
 }
 
 function deserializeTSMethodSignature(pos) {
-  const params = deserializeBoxFormalParameters(pos + 48);
-  const thisParam = deserializeOptionBoxTSThisParameter(pos + 40);
+  const params = deserializeBoxFormalParameters(pos + 40);
+  const thisParam = deserializeOptionBoxTSThisParameter(pos + 32);
   if (thisParam !== null) params.unshift(thisParam);
   return {
     type: 'TSMethodSignature',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     key: deserializePropertyKey(pos + 8),
-    computed: deserializeBool(pos + 24),
-    optional: deserializeBool(pos + 25),
-    kind: deserializeTSMethodSignatureKind(pos + 26),
-    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 32),
+    computed: deserializeBool(pos + 60),
+    optional: deserializeBool(pos + 61),
+    kind: deserializeTSMethodSignatureKind(pos + 62),
+    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 24),
     params,
-    returnType: deserializeOptionBoxTSTypeAnnotation(pos + 56),
+    returnType: deserializeOptionBoxTSTypeAnnotation(pos + 48),
     accessibility: null,
     readonly: false,
     static: false,
@@ -1938,29 +1934,48 @@ function deserializeTSTypePredicate(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     parameterName: deserializeTSTypePredicateName(pos + 8),
-    asserts: deserializeBool(pos + 24),
-    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 32),
+    asserts: deserializeBool(pos + 32),
+    typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 24),
   };
 }
 
 function deserializeTSModuleDeclaration(pos) {
-  const kind = deserializeTSModuleDeclarationKind(pos + 80),
+  const kind = deserializeTSModuleDeclarationKind(pos + 84),
     global = kind === 'global',
     start = deserializeU32(pos),
     end = deserializeU32(pos + 4),
-    declare = deserializeBool(pos + 81);
+    declare = deserializeBool(pos + 85);
   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,
-    };
+    let innerId = body.id;
+    if (innerId.type === 'Identifier') {
+      id = {
+        type: 'TSQualifiedName',
+        start: id.start,
+        end: innerId.end,
+        left: id,
+        right: innerId,
+      };
+    } else {
+      // Replace `left` of innermost `TSQualifiedName` with a nested `TSQualifiedName` with `id` of
+      // this module on left, and previous `left` of innermost `TSQualifiedName` on right
+      while (true) {
+        innerId.start = id.start;
+        if (innerId.left.type === 'Identifier') break;
+        innerId = innerId.left;
+      }
+      innerId.left = {
+        type: 'TSQualifiedName',
+        start: id.start,
+        end: innerId.left.end,
+        left: id,
+        right: innerId.left,
+      };
+      id = body.id;
+    }
     body = Object.hasOwn(body, 'body') ? body.body : null;
   }
 
@@ -1973,7 +1988,7 @@ function deserializeTSModuleDeclaration(pos) {
 
 function deserializeTSModuleBlock(pos) {
   const body = deserializeVecDirective(pos + 8);
-  body.push(...deserializeVecStatement(pos + 40));
+  body.push(...deserializeVecStatement(pos + 32));
   return {
     type: 'TSModuleBlock',
     start: deserializeU32(pos),
@@ -2041,15 +2056,15 @@ function deserializeTSConstructorType(pos) {
     type: 'TSConstructorType',
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
-    abstract: deserializeBool(pos + 8),
-    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 16),
-    params: deserializeBoxFormalParameters(pos + 24),
-    returnType: deserializeBoxTSTypeAnnotation(pos + 32),
+    abstract: deserializeBool(pos + 32),
+    typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
+    params: deserializeBoxFormalParameters(pos + 16),
+    returnType: deserializeBoxTSTypeAnnotation(pos + 24),
   };
 }
 
 function deserializeTSMappedType(pos) {
-  let optional = deserializeOptionTSMappedTypeModifierOperator(pos + 48) || false;
+  let optional = deserializeOptionTSMappedTypeModifierOperator(pos + 52);
   if (optional === null) optional = false;
   const typeParameter = deserializeBoxTSTypeParameter(pos + 8);
   return {
@@ -2059,7 +2074,7 @@ function deserializeTSMappedType(pos) {
     nameType: deserializeOptionTSType(pos + 16),
     typeAnnotation: deserializeOptionTSType(pos + 32),
     optional,
-    readonly: deserializeOptionTSMappedTypeModifierOperator(pos + 49),
+    readonly: deserializeOptionTSMappedTypeModifierOperator(pos + 53),
     key: typeParameter.name,
     constraint: typeParameter.constraint,
   };
@@ -2071,7 +2086,7 @@ function deserializeTSTemplateLiteralType(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     quasis: deserializeVecTemplateElement(pos + 8),
-    types: deserializeVecTSType(pos + 40),
+    types: deserializeVecTSType(pos + 32),
   };
 }
 
@@ -2214,9 +2229,9 @@ function deserializeComment(pos) {
 
 function deserializeNameSpan(pos) {
   return {
-    value: deserializeStr(pos),
-    start: deserializeU32(pos + 16),
-    end: deserializeU32(pos + 20),
+    value: deserializeStr(pos + 8),
+    start: deserializeU32(pos),
+    end: deserializeU32(pos + 4),
   };
 }
 
@@ -2230,8 +2245,8 @@ function deserializeImportEntry(pos) {
 
 function deserializeExportEntry(pos) {
   return {
-    start: deserializeU32(pos + 8),
-    end: deserializeU32(pos + 12),
+    start: deserializeU32(pos),
+    end: deserializeU32(pos + 4),
     moduleRequest: deserializeOptionNameSpan(pos + 16),
     importName: deserializeExportImportName(pos + 40),
     exportName: deserializeExportExportName(pos + 72),
@@ -2264,36 +2279,36 @@ function deserializeSourceType(pos) {
 function deserializeRawTransferData(pos) {
   return {
     program: deserializeProgram(pos),
-    comments: deserializeVecComment(pos + 160),
-    module: deserializeEcmaScriptModule(pos + 192),
-    errors: deserializeVecError(pos + 328),
+    comments: deserializeVecComment(pos + 128),
+    module: deserializeEcmaScriptModule(pos + 152),
+    errors: deserializeVecError(pos + 256),
   };
 }
 
 function deserializeError(pos) {
   return {
-    severity: deserializeErrorSeverity(pos),
-    message: deserializeStr(pos + 8),
-    labels: deserializeVecErrorLabel(pos + 24),
-    helpMessage: deserializeOptionStr(pos + 56),
+    severity: deserializeErrorSeverity(pos + 56),
+    message: deserializeStr(pos),
+    labels: deserializeVecErrorLabel(pos + 16),
+    helpMessage: deserializeOptionStr(pos + 40),
   };
 }
 
 function deserializeErrorLabel(pos) {
   return {
-    message: deserializeOptionStr(pos),
-    start: deserializeU32(pos + 16),
-    end: deserializeU32(pos + 20),
+    message: deserializeOptionStr(pos + 8),
+    start: deserializeU32(pos),
+    end: deserializeU32(pos + 4),
   };
 }
 
 function deserializeEcmaScriptModule(pos) {
   return {
-    hasModuleSyntax: deserializeBool(pos),
-    staticImports: deserializeVecStaticImport(pos + 8),
-    staticExports: deserializeVecStaticExport(pos + 40),
-    dynamicImports: deserializeVecDynamicImport(pos + 72),
-    importMetas: deserializeVecSpan(pos + 104),
+    hasModuleSyntax: deserializeBool(pos + 96),
+    staticImports: deserializeVecStaticImport(pos),
+    staticExports: deserializeVecStaticExport(pos + 24),
+    dynamicImports: deserializeVecDynamicImport(pos + 48),
+    importMetas: deserializeVecSpan(pos + 72),
   };
 }
 
@@ -4188,11 +4203,11 @@ function deserializeStr(pos) {
 function deserializeVecComment(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeComment(pos));
-    pos += 24;
+    pos += 16;
   }
   return arr;
 }
@@ -4205,7 +4220,7 @@ function deserializeOptionHashbang(pos) {
 function deserializeVecDirective(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeDirective(pos));
@@ -4217,7 +4232,7 @@ function deserializeVecDirective(pos) {
 function deserializeVecStatement(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeStatement(pos));
@@ -4404,7 +4419,7 @@ function deserializeOptionSymbolId(pos) {
 function deserializeVecArrayExpressionElement(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeArrayExpressionElement(pos));
@@ -4420,7 +4435,7 @@ function deserializeBoxSpreadElement(pos) {
 function deserializeVecObjectPropertyKind(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeObjectPropertyKind(pos));
@@ -4448,7 +4463,7 @@ function deserializeBoxPrivateIdentifier(pos) {
 function deserializeVecTemplateElement(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTemplateElement(pos));
@@ -4460,7 +4475,7 @@ function deserializeVecTemplateElement(pos) {
 function deserializeVecExpression(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeExpression(pos));
@@ -4498,7 +4513,7 @@ function deserializeBoxPrivateFieldExpression(pos) {
 function deserializeVecArgument(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeArgument(pos));
@@ -4523,7 +4538,7 @@ function deserializeOptionAssignmentTargetMaybeDefault(pos) {
 function deserializeVecOptionAssignmentTargetMaybeDefault(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeOptionAssignmentTargetMaybeDefault(pos));
@@ -4540,7 +4555,7 @@ function deserializeOptionAssignmentTargetRest(pos) {
 function deserializeVecAssignmentTargetProperty(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeAssignmentTargetProperty(pos));
@@ -4665,11 +4680,11 @@ function deserializeBoxTSImportEqualsDeclaration(pos) {
 function deserializeVecVariableDeclarator(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeVariableDeclarator(pos));
-    pos += 72;
+    pos += 64;
   }
   return arr;
 }
@@ -4692,11 +4707,11 @@ function deserializeOptionLabelIdentifier(pos) {
 function deserializeVecSwitchCase(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeSwitchCase(pos));
-    pos += 56;
+    pos += 48;
   }
   return arr;
 }
@@ -4748,7 +4763,7 @@ function deserializeBoxAssignmentPattern(pos) {
 function deserializeVecBindingProperty(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeBindingProperty(pos));
@@ -4774,7 +4789,7 @@ function deserializeOptionBindingPattern(pos) {
 function deserializeVecOptionBindingPattern(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeOptionBindingPattern(pos));
@@ -4822,11 +4837,11 @@ function deserializeOptionBoxFunctionBody(pos) {
 function deserializeVecFormalParameter(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeFormalParameter(pos));
-    pos += 80;
+    pos += 72;
   }
   return arr;
 }
@@ -4834,7 +4849,7 @@ function deserializeVecFormalParameter(pos) {
 function deserializeVecDecorator(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeDecorator(pos));
@@ -4851,7 +4866,7 @@ function deserializeOptionTSAccessibility(pos) {
 function deserializeVecTSClassImplements(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSClassImplements(pos));
@@ -4867,7 +4882,7 @@ function deserializeBoxClassBody(pos) {
 function deserializeVecClassElement(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeClassElement(pos));
@@ -4928,7 +4943,7 @@ function deserializeOptionImportPhase(pos) {
 function deserializeVecImportDeclarationSpecifier(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeImportDeclarationSpecifier(pos));
@@ -4966,7 +4981,7 @@ function deserializeBoxImportNamespaceSpecifier(pos) {
 function deserializeVecImportAttribute(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeImportAttribute(pos));
@@ -4983,7 +4998,7 @@ function deserializeOptionDeclaration(pos) {
 function deserializeVecExportSpecifier(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeExportSpecifier(pos));
@@ -5026,7 +5041,7 @@ function deserializeBoxJSXOpeningElement(pos) {
 function deserializeVecJSXChild(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeJSXChild(pos));
@@ -5047,7 +5062,7 @@ function deserializeOptionBoxJSXClosingElement(pos) {
 function deserializeVecJSXAttributeItem(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeJSXAttributeItem(pos));
@@ -5096,7 +5111,7 @@ function deserializeBoxJSXSpreadChild(pos) {
 function deserializeVecTSEnumMember(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSEnumMember(pos));
@@ -5256,7 +5271,7 @@ function deserializeBoxJSDocUnknownType(pos) {
 function deserializeVecTSType(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSType(pos));
@@ -5268,7 +5283,7 @@ function deserializeVecTSType(pos) {
 function deserializeVecTSTupleElement(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSTupleElement(pos));
@@ -5297,7 +5312,7 @@ function deserializeOptionTSType(pos) {
 function deserializeVecTSTypeParameter(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSTypeParameter(pos));
@@ -5309,7 +5324,7 @@ function deserializeVecTSTypeParameter(pos) {
 function deserializeVecTSInterfaceHeritage(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSInterfaceHeritage(pos));
@@ -5325,7 +5340,7 @@ function deserializeBoxTSInterfaceBody(pos) {
 function deserializeVecTSSignature(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSSignature(pos));
@@ -5353,7 +5368,7 @@ function deserializeBoxTSMethodSignature(pos) {
 function deserializeVecTSIndexSignatureName(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTSIndexSignatureName(pos));
@@ -5399,18 +5414,18 @@ function deserializeU32(pos) {
 }
 
 function deserializeOptionNameSpan(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
+  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
   return deserializeNameSpan(pos);
 }
 
 function deserializeVecAlternative(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeAlternative(pos));
-    pos += 40;
+    pos += 32;
   }
   return arr;
 }
@@ -5418,7 +5433,7 @@ function deserializeVecAlternative(pos) {
 function deserializeVecTerm(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeTerm(pos));
@@ -5484,7 +5499,7 @@ function deserializeOptionU64(pos) {
 function deserializeVecCharacterClassContents(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeCharacterClassContents(pos));
@@ -5504,11 +5519,11 @@ function deserializeBoxClassStringDisjunction(pos) {
 function deserializeVecClassString(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeClassString(pos));
-    pos += 48;
+    pos += 40;
   }
   return arr;
 }
@@ -5516,7 +5531,7 @@ function deserializeVecClassString(pos) {
 function deserializeVecCharacter(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeCharacter(pos));
@@ -5526,23 +5541,18 @@ function deserializeVecCharacter(pos) {
 }
 
 function deserializeOptionModifiers(pos) {
-  if (uint8[pos + 8] === 3) return null;
-  return deserializeModifiers(pos);
-}
-
-function deserializeOptionModifier(pos) {
-  if (uint8[pos] === 2) return null;
-  return deserializeModifier(pos);
+  if (uint8[pos] === 0) return null;
+  return deserializeModifiers(pos + 8);
 }
 
 function deserializeVecError(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeError(pos));
-    pos += 72;
+    pos += 64;
   }
   return arr;
 }
@@ -5550,7 +5560,7 @@ function deserializeVecError(pos) {
 function deserializeVecErrorLabel(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeErrorLabel(pos));
@@ -5562,11 +5572,11 @@ function deserializeVecErrorLabel(pos) {
 function deserializeVecStaticImport(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeStaticImport(pos));
-    pos += 64;
+    pos += 56;
   }
   return arr;
 }
@@ -5574,11 +5584,11 @@ function deserializeVecStaticImport(pos) {
 function deserializeVecStaticExport(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeStaticExport(pos));
-    pos += 40;
+    pos += 32;
   }
   return arr;
 }
@@ -5586,7 +5596,7 @@ function deserializeVecStaticExport(pos) {
 function deserializeVecDynamicImport(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeDynamicImport(pos));
@@ -5598,7 +5608,7 @@ function deserializeVecDynamicImport(pos) {
 function deserializeVecSpan(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeSpan(pos));
@@ -5610,7 +5620,7 @@ function deserializeVecSpan(pos) {
 function deserializeVecImportEntry(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeImportEntry(pos));
@@ -5622,7 +5632,7 @@ function deserializeVecImportEntry(pos) {
 function deserializeVecExportEntry(pos) {
   const arr = [],
     pos32 = pos >> 2,
-    len = uint32[pos32 + 6];
+    len = uint32[pos32 + 2];
   pos = uint32[pos32];
   for (let i = 0; i < len; i++) {
     arr.push(deserializeExportEntry(pos));