oxc-parser 0.121.0 → 0.123.0

package/src-js/generated/deserialize/js_range.js

@@ -40,8 +40,8 @@ function deserializeProgram(pos) {
       end,
       range: [start, end],
     };
-  program.hashbang = deserializeOptionHashbang(pos + 48);
-  (program.body = deserializeVecDirective(pos + 80)).push(...deserializeVecStatement(pos + 104));
+  program.hashbang = deserializeOptionHashbang(pos + 56);
+  (program.body = deserializeVecDirective(pos + 88)).push(...deserializeVecStatement(pos + 112));
   return program;
 }
 
@@ -142,7 +142,7 @@ function deserializeIdentifierName(pos) {
   let start, end;
   return {
     type: "Identifier",
-    name: deserializeStr(pos + 8),
+    name: deserializeStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -153,7 +153,7 @@ function deserializeIdentifierReference(pos) {
   let start, end;
   return {
     type: "Identifier",
-    name: deserializeStr(pos + 8),
+    name: deserializeStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -164,7 +164,7 @@ function deserializeBindingIdentifier(pos) {
   let start, end;
   return {
     type: "Identifier",
-    name: deserializeStr(pos + 8),
+    name: deserializeStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -175,7 +175,7 @@ function deserializeLabelIdentifier(pos) {
   let start, end;
   return {
     type: "Identifier",
-    name: deserializeStr(pos + 8),
+    name: deserializeStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -202,7 +202,7 @@ function deserializeArrayExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.elements = deserializeVecArrayExpressionElement(pos + 8);
+  node.elements = deserializeVecArrayExpressionElement(pos + 16);
   return node;
 }
 
@@ -317,7 +317,7 @@ function deserializeObjectExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.properties = deserializeVecObjectPropertyKind(pos + 8);
+  node.properties = deserializeVecObjectPropertyKind(pos + 16);
   return node;
 }
 
@@ -337,18 +337,18 @@ function deserializeObjectProperty(pos) {
     end,
     node = {
       type: "Property",
-      kind: deserializePropertyKind(pos + 44),
+      kind: deserializePropertyKind(pos + 12),
       key: null,
       value: null,
-      method: deserializeBool(pos + 45),
-      shorthand: deserializeBool(pos + 46),
-      computed: deserializeBool(pos + 47),
+      method: deserializeBool(pos + 13),
+      shorthand: deserializeBool(pos + 14),
+      computed: deserializeBool(pos + 15),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.key = deserializePropertyKey(pos + 8);
-  node.value = deserializeExpression(pos + 24);
+  node.key = deserializePropertyKey(pos + 16);
+  node.value = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -473,8 +473,8 @@ function deserializeTemplateLiteral(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.quasis = deserializeVecTemplateElement(pos + 8);
-  node.expressions = deserializeVecExpression(pos + 32);
+  node.quasis = deserializeVecTemplateElement(pos + 16);
+  node.expressions = deserializeVecExpression(pos + 40);
   return node;
 }
 
@@ -489,18 +489,18 @@ function deserializeTaggedTemplateExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.tag = deserializeExpression(pos + 8);
-  node.quasi = deserializeTemplateLiteral(pos + 32);
+  node.tag = deserializeExpression(pos + 16);
+  node.quasi = deserializeTemplateLiteral(pos + 40);
   return node;
 }
 
 function deserializeTemplateElement(pos) {
-  let tail = deserializeBool(pos + 44),
+  let tail = deserializeBool(pos + 12),
     start = deserializeU32(pos),
     end = deserializeU32(pos + 4),
-    value = deserializeTemplateElementValue(pos + 8);
+    value = deserializeTemplateElementValue(pos + 16);
   value.cooked !== null &&
-    deserializeBool(pos + 45) &&
+    deserializeBool(pos + 13) &&
     (value.cooked = value.cooked.replace(/\uFFFD(.{4})/g, (_, hex) =>
       String.fromCodePoint(parseInt(hex, 16)),
     ));
@@ -528,14 +528,14 @@ function deserializeComputedMemberExpression(pos) {
       type: "MemberExpression",
       object: null,
       property: null,
-      optional: deserializeBool(pos + 44),
+      optional: deserializeBool(pos + 12),
       computed: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.object = deserializeExpression(pos + 8);
-  node.property = deserializeExpression(pos + 24);
+  node.object = deserializeExpression(pos + 16);
+  node.property = deserializeExpression(pos + 32);
   node.computed = true;
   return node;
 }
@@ -547,14 +547,14 @@ function deserializeStaticMemberExpression(pos) {
       type: "MemberExpression",
       object: null,
       property: null,
-      optional: deserializeBool(pos + 60),
+      optional: deserializeBool(pos + 12),
       computed: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.object = deserializeExpression(pos + 8);
-  node.property = deserializeIdentifierName(pos + 24);
+  node.object = deserializeExpression(pos + 16);
+  node.property = deserializeIdentifierName(pos + 32);
   node.computed = false;
   return node;
 }
@@ -566,14 +566,14 @@ function deserializePrivateFieldExpression(pos) {
       type: "MemberExpression",
       object: null,
       property: null,
-      optional: deserializeBool(pos + 60),
+      optional: deserializeBool(pos + 12),
       computed: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.object = deserializeExpression(pos + 8);
-  node.property = deserializePrivateIdentifier(pos + 24);
+  node.object = deserializeExpression(pos + 16);
+  node.property = deserializePrivateIdentifier(pos + 32);
   node.computed = false;
   return node;
 }
@@ -585,13 +585,13 @@ function deserializeCallExpression(pos) {
       type: "CallExpression",
       callee: null,
       arguments: null,
-      optional: deserializeBool(pos + 60),
+      optional: deserializeBool(pos + 12),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.callee = deserializeExpression(pos + 8);
-  node.arguments = deserializeVecArgument(pos + 32);
+  node.callee = deserializeExpression(pos + 16);
+  node.arguments = deserializeVecArgument(pos + 40);
   return node;
 }
 
@@ -606,8 +606,8 @@ function deserializeNewExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.callee = deserializeExpression(pos + 8);
-  node.arguments = deserializeVecArgument(pos + 32);
+  node.callee = deserializeExpression(pos + 16);
+  node.arguments = deserializeVecArgument(pos + 40);
   return node;
 }
 
@@ -622,8 +622,8 @@ function deserializeMetaProperty(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.meta = deserializeIdentifierName(pos + 8);
-  node.property = deserializeIdentifierName(pos + 40);
+  node.meta = deserializeIdentifierName(pos + 16);
+  node.property = deserializeIdentifierName(pos + 48);
   return node;
 }
 
@@ -637,7 +637,7 @@ function deserializeSpreadElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -741,14 +741,14 @@ function deserializeUpdateExpression(pos) {
     end,
     node = {
       type: "UpdateExpression",
-      operator: deserializeUpdateOperator(pos + 28),
-      prefix: deserializeBool(pos + 29),
+      operator: deserializeUpdateOperator(pos + 12),
+      prefix: deserializeBool(pos + 13),
       argument: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeSimpleAssignmentTarget(pos + 8);
+  node.argument = deserializeSimpleAssignmentTarget(pos + 16);
   return node;
 }
 
@@ -757,14 +757,14 @@ function deserializeUnaryExpression(pos) {
     end,
     node = {
       type: "UnaryExpression",
-      operator: deserializeUnaryOperator(pos + 28),
+      operator: deserializeUnaryOperator(pos + 12),
       argument: null,
       prefix: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   node.prefix = true;
   return node;
 }
@@ -775,14 +775,14 @@ function deserializeBinaryExpression(pos) {
     node = {
       type: "BinaryExpression",
       left: null,
-      operator: deserializeBinaryOperator(pos + 44),
+      operator: deserializeBinaryOperator(pos + 12),
       right: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeExpression(pos + 8);
-  node.right = deserializeExpression(pos + 24);
+  node.left = deserializeExpression(pos + 16);
+  node.right = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -798,9 +798,9 @@ function deserializePrivateInExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializePrivateIdentifier(pos + 8);
+  node.left = deserializePrivateIdentifier(pos + 16);
   node.operator = "in";
-  node.right = deserializeExpression(pos + 40);
+  node.right = deserializeExpression(pos + 48);
   return node;
 }
 
@@ -810,14 +810,14 @@ function deserializeLogicalExpression(pos) {
     node = {
       type: "LogicalExpression",
       left: null,
-      operator: deserializeLogicalOperator(pos + 44),
+      operator: deserializeLogicalOperator(pos + 12),
       right: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeExpression(pos + 8);
-  node.right = deserializeExpression(pos + 24);
+  node.left = deserializeExpression(pos + 16);
+  node.right = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -833,9 +833,9 @@ function deserializeConditionalExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.test = deserializeExpression(pos + 8);
-  node.consequent = deserializeExpression(pos + 24);
-  node.alternate = deserializeExpression(pos + 40);
+  node.test = deserializeExpression(pos + 16);
+  node.consequent = deserializeExpression(pos + 32);
+  node.alternate = deserializeExpression(pos + 48);
   return node;
 }
 
@@ -844,15 +844,15 @@ function deserializeAssignmentExpression(pos) {
     end,
     node = {
       type: "AssignmentExpression",
-      operator: deserializeAssignmentOperator(pos + 44),
+      operator: deserializeAssignmentOperator(pos + 12),
       left: null,
       right: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeAssignmentTarget(pos + 8);
-  node.right = deserializeExpression(pos + 24);
+  node.left = deserializeAssignmentTarget(pos + 16);
+  node.right = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -916,8 +916,8 @@ function deserializeArrayAssignmentTarget(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    elements = deserializeVecOptionAssignmentTargetMaybeDefault(pos + 8),
-    rest = deserializeOptionBoxAssignmentTargetRest(pos + 32);
+    elements = deserializeVecOptionAssignmentTargetMaybeDefault(pos + 16),
+    rest = deserializeOptionBoxAssignmentTargetRest(pos + 40);
   rest !== null && elements.push(rest);
   node.elements = elements;
   return node;
@@ -933,8 +933,8 @@ function deserializeObjectAssignmentTarget(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    properties = deserializeVecAssignmentTargetProperty(pos + 8),
-    rest = deserializeOptionBoxAssignmentTargetRest(pos + 32);
+    properties = deserializeVecAssignmentTargetProperty(pos + 16),
+    rest = deserializeOptionBoxAssignmentTargetRest(pos + 40);
   rest !== null && properties.push(rest);
   node.properties = properties;
   return node;
@@ -950,7 +950,7 @@ function deserializeAssignmentTargetRest(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeAssignmentTarget(pos + 8);
+  node.argument = deserializeAssignmentTarget(pos + 16);
   return node;
 }
 
@@ -994,8 +994,8 @@ function deserializeAssignmentTargetWithDefault(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeAssignmentTarget(pos + 8);
-  node.right = deserializeExpression(pos + 24);
+  node.left = deserializeAssignmentTarget(pos + 16);
+  node.right = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -1025,7 +1025,7 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
       end,
       range: [start, end],
     },
-    key = deserializeIdentifierReference(pos + 8),
+    key = deserializeIdentifierReference(pos + 16),
     keyStart,
     keyEnd,
     value = {
@@ -1035,7 +1035,7 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
       end: (keyEnd = key.end),
       range: [keyStart, keyEnd],
     },
-    init = deserializeOptionExpression(pos + 40);
+    init = deserializeOptionExpression(pos + 48);
   init !== null &&
     (value = {
       type: "AssignmentPattern",
@@ -1064,14 +1064,14 @@ function deserializeAssignmentTargetPropertyProperty(pos) {
       value: null,
       method: null,
       shorthand: null,
-      computed: deserializeBool(pos + 44),
+      computed: deserializeBool(pos + 12),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
   node.kind = "init";
-  node.key = deserializePropertyKey(pos + 8);
-  node.value = deserializeAssignmentTargetMaybeDefault(pos + 24);
+  node.key = deserializePropertyKey(pos + 16);
+  node.value = deserializeAssignmentTargetMaybeDefault(pos + 32);
   node.method = false;
   node.shorthand = false;
   return node;
@@ -1087,7 +1087,7 @@ function deserializeSequenceExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expressions = deserializeVecExpression(pos + 8);
+  node.expressions = deserializeVecExpression(pos + 16);
   return node;
 }
 
@@ -1111,7 +1111,7 @@ function deserializeAwaitExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -1125,7 +1125,7 @@ function deserializeChainExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeChainElement(pos + 8);
+  node.expression = deserializeChainElement(pos + 16);
   return node;
 }
 
@@ -1157,7 +1157,7 @@ function deserializeParenthesizedExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-    node.expression = deserializeExpression(pos + 8);
+    node.expression = deserializeExpression(pos + 16);
   }
   return node;
 }
@@ -1241,12 +1241,12 @@ function deserializeDirective(pos) {
     node = {
       type: "ExpressionStatement",
       expression: null,
-      directive: deserializeStr(pos + 56),
+      directive: deserializeStr(pos + 64),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeStringLiteral(pos + 8);
+  node.expression = deserializeStringLiteral(pos + 16);
   return node;
 }
 
@@ -1254,7 +1254,7 @@ function deserializeHashbang(pos) {
   let start, end;
   return {
     type: "Hashbang",
-    value: deserializeStr(pos + 8),
+    value: deserializeStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -1271,7 +1271,7 @@ function deserializeBlockStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecStatement(pos + 8);
+  node.body = deserializeVecStatement(pos + 16);
   return node;
 }
 
@@ -1305,13 +1305,13 @@ function deserializeVariableDeclaration(pos) {
     end,
     node = {
       type: "VariableDeclaration",
-      kind: deserializeVariableDeclarationKind(pos + 36),
+      kind: deserializeVariableDeclarationKind(pos + 12),
       declarations: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.declarations = deserializeVecVariableDeclarator(pos + 8);
+  node.declarations = deserializeVecVariableDeclarator(pos + 16);
   return node;
 }
 
@@ -1333,17 +1333,19 @@ function deserializeVariableDeclarationKind(pos) {
 }
 
 function deserializeVariableDeclarator(pos) {
-  let variableDeclarator = {
-    type: "VariableDeclarator",
-    id: null,
-    init: null,
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    range: [deserializeU32(pos), deserializeU32(pos + 4)],
-  };
-  variableDeclarator.id = deserializeBindingPattern(pos + 8);
-  variableDeclarator.init = deserializeOptionExpression(pos + 32);
-  return variableDeclarator;
+  let start,
+    end,
+    node = {
+      type: "VariableDeclarator",
+      id: null,
+      init: null,
+      start: (start = deserializeU32(pos)),
+      end: (end = deserializeU32(pos + 4)),
+      range: [start, end],
+    };
+  node.id = deserializeBindingPattern(pos + 16);
+  node.init = deserializeOptionExpression(pos + 40);
+  return node;
 }
 
 function deserializeEmptyStatement(pos) {
@@ -1366,7 +1368,7 @@ function deserializeExpressionStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -1382,9 +1384,9 @@ function deserializeIfStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.test = deserializeExpression(pos + 8);
-  node.consequent = deserializeStatement(pos + 24);
-  node.alternate = deserializeOptionStatement(pos + 40);
+  node.test = deserializeExpression(pos + 16);
+  node.consequent = deserializeStatement(pos + 32);
+  node.alternate = deserializeOptionStatement(pos + 48);
   return node;
 }
 
@@ -1399,8 +1401,8 @@ function deserializeDoWhileStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeStatement(pos + 8);
-  node.test = deserializeExpression(pos + 24);
+  node.body = deserializeStatement(pos + 16);
+  node.test = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -1415,8 +1417,8 @@ function deserializeWhileStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.test = deserializeExpression(pos + 8);
-  node.body = deserializeStatement(pos + 24);
+  node.test = deserializeExpression(pos + 16);
+  node.body = deserializeStatement(pos + 32);
   return node;
 }
 
@@ -1433,10 +1435,10 @@ function deserializeForStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.init = deserializeOptionForStatementInit(pos + 8);
-  node.test = deserializeOptionExpression(pos + 24);
-  node.update = deserializeOptionExpression(pos + 40);
-  node.body = deserializeStatement(pos + 56);
+  node.init = deserializeOptionForStatementInit(pos + 16);
+  node.test = deserializeOptionExpression(pos + 32);
+  node.update = deserializeOptionExpression(pos + 48);
+  node.body = deserializeStatement(pos + 64);
   return node;
 }
 
@@ -1547,9 +1549,9 @@ function deserializeForInStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeForStatementLeft(pos + 8);
-  node.right = deserializeExpression(pos + 24);
-  node.body = deserializeStatement(pos + 40);
+  node.left = deserializeForStatementLeft(pos + 16);
+  node.right = deserializeExpression(pos + 32);
+  node.body = deserializeStatement(pos + 48);
   return node;
 }
 
@@ -1595,9 +1597,9 @@ function deserializeForOfStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeForStatementLeft(pos + 8);
-  node.right = deserializeExpression(pos + 24);
-  node.body = deserializeStatement(pos + 40);
+  node.left = deserializeForStatementLeft(pos + 16);
+  node.right = deserializeExpression(pos + 32);
+  node.body = deserializeStatement(pos + 48);
   return node;
 }
 
@@ -1611,7 +1613,7 @@ function deserializeContinueStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.label = deserializeOptionLabelIdentifier(pos + 8);
+  node.label = deserializeOptionLabelIdentifier(pos + 16);
   return node;
 }
 
@@ -1625,7 +1627,7 @@ function deserializeBreakStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.label = deserializeOptionLabelIdentifier(pos + 8);
+  node.label = deserializeOptionLabelIdentifier(pos + 16);
   return node;
 }
 
@@ -1639,7 +1641,7 @@ function deserializeReturnStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeOptionExpression(pos + 8);
+  node.argument = deserializeOptionExpression(pos + 16);
   return node;
 }
 
@@ -1654,8 +1656,8 @@ function deserializeWithStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.object = deserializeExpression(pos + 8);
-  node.body = deserializeStatement(pos + 24);
+  node.object = deserializeExpression(pos + 16);
+  node.body = deserializeStatement(pos + 32);
   return node;
 }
 
@@ -1670,8 +1672,8 @@ function deserializeSwitchStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.discriminant = deserializeExpression(pos + 8);
-  node.cases = deserializeVecSwitchCase(pos + 24);
+  node.discriminant = deserializeExpression(pos + 16);
+  node.cases = deserializeVecSwitchCase(pos + 32);
   return node;
 }
 
@@ -1686,8 +1688,8 @@ function deserializeSwitchCase(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.test = deserializeOptionExpression(pos + 8);
-  node.consequent = deserializeVecStatement(pos + 24);
+  node.test = deserializeOptionExpression(pos + 16);
+  node.consequent = deserializeVecStatement(pos + 32);
   return node;
 }
 
@@ -1702,8 +1704,8 @@ function deserializeLabeledStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.label = deserializeLabelIdentifier(pos + 8);
-  node.body = deserializeStatement(pos + 40);
+  node.label = deserializeLabelIdentifier(pos + 16);
+  node.body = deserializeStatement(pos + 48);
   return node;
 }
 
@@ -1717,7 +1719,7 @@ function deserializeThrowStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -1733,9 +1735,9 @@ function deserializeTryStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.block = deserializeBoxBlockStatement(pos + 8);
-  node.handler = deserializeOptionBoxCatchClause(pos + 16);
-  node.finalizer = deserializeOptionBoxBlockStatement(pos + 24);
+  node.block = deserializeBoxBlockStatement(pos + 16);
+  node.handler = deserializeOptionBoxCatchClause(pos + 24);
+  node.finalizer = deserializeOptionBoxBlockStatement(pos + 32);
   return node;
 }
 
@@ -1750,13 +1752,13 @@ function deserializeCatchClause(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.param = deserializeOptionCatchParameter(pos + 8);
-  node.body = deserializeBoxBlockStatement(pos + 48);
+  node.param = deserializeOptionCatchParameter(pos + 16);
+  node.body = deserializeBoxBlockStatement(pos + 56);
   return node;
 }
 
 function deserializeCatchParameter(pos) {
-  return deserializeBindingPattern(pos + 8);
+  return deserializeBindingPattern(pos + 16);
 }
 
 function deserializeDebuggerStatement(pos) {
@@ -1795,8 +1797,8 @@ function deserializeAssignmentPattern(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeBindingPattern(pos + 8);
-  node.right = deserializeExpression(pos + 24);
+  node.left = deserializeBindingPattern(pos + 16);
+  node.right = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -1810,8 +1812,8 @@ function deserializeObjectPattern(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    properties = deserializeVecBindingProperty(pos + 8),
-    rest = deserializeOptionBoxBindingRestElement(pos + 32);
+    properties = deserializeVecBindingProperty(pos + 16),
+    rest = deserializeOptionBoxBindingRestElement(pos + 40);
   rest !== null && properties.push(rest);
   node.properties = properties;
   return node;
@@ -1826,15 +1828,15 @@ function deserializeBindingProperty(pos) {
       key: null,
       value: null,
       method: null,
-      shorthand: deserializeBool(pos + 44),
-      computed: deserializeBool(pos + 45),
+      shorthand: deserializeBool(pos + 12),
+      computed: deserializeBool(pos + 13),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
   node.kind = "init";
-  node.key = deserializePropertyKey(pos + 8);
-  node.value = deserializeBindingPattern(pos + 24);
+  node.key = deserializePropertyKey(pos + 16);
+  node.value = deserializeBindingPattern(pos + 32);
   node.method = false;
   return node;
 }
@@ -1849,8 +1851,8 @@ function deserializeArrayPattern(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    elements = deserializeVecOptionBindingPattern(pos + 8),
-    rest = deserializeOptionBoxBindingRestElement(pos + 32);
+    elements = deserializeVecOptionBindingPattern(pos + 16),
+    rest = deserializeOptionBoxBindingRestElement(pos + 40);
   rest !== null && elements.push(rest);
   node.elements = elements;
   return node;
@@ -1866,7 +1868,7 @@ function deserializeBindingRestElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeBindingPattern(pos + 8);
+  node.argument = deserializeBindingPattern(pos + 16);
   return node;
 }
 
@@ -1885,10 +1887,10 @@ function deserializeFunction(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    params = deserializeBoxFormalParameters(pos + 56);
-  node.id = deserializeOptionBindingIdentifier(pos + 8);
+    params = deserializeBoxFormalParameters(pos + 64);
+  node.id = deserializeOptionBindingIdentifier(pos + 16);
   node.params = params;
-  node.body = deserializeOptionBoxFunctionBody(pos + 72);
+  node.body = deserializeOptionBoxFunctionBody(pos + 80);
   node.expression = false;
   return node;
 }
@@ -1909,19 +1911,19 @@ function deserializeFunctionType(pos) {
 }
 
 function deserializeFormalParameters(pos) {
-  let params = deserializeVecFormalParameter(pos + 8);
-  if (uint32[(pos + 32) >> 2] !== 0 && uint32[(pos + 36) >> 2] !== 0) {
-    pos = uint32[(pos + 32) >> 2];
+  let params = deserializeVecFormalParameter(pos + 16);
+  if (uint32[(pos + 40) >> 2] !== 0 && uint32[(pos + 44) >> 2] !== 0) {
+    pos = uint32[(pos + 40) >> 2];
     let start,
       end,
       rest = {
         type: "RestElement",
         argument: null,
-        start: (start = deserializeU32(pos + 32)),
-        end: (end = deserializeU32(pos + 36)),
+        start: (start = deserializeU32(pos + 40)),
+        end: (end = deserializeU32(pos + 44)),
         range: [start, end],
       };
-    rest.argument = deserializeBindingPattern(pos + 40);
+    rest.argument = deserializeBindingPattern(pos + 56);
     params.push(rest);
   }
   return params;
@@ -1929,7 +1931,7 @@ function deserializeFormalParameters(pos) {
 
 function deserializeFormalParameter(pos) {
   let param;
-  if (uint32[(pos + 56) >> 2] !== 0 && uint32[(pos + 60) >> 2] !== 0) {
+  if (uint32[(pos + 64) >> 2] !== 0 && uint32[(pos + 68) >> 2] !== 0) {
     let start, end;
     param = {
       type: "AssignmentPattern",
@@ -1939,9 +1941,9 @@ function deserializeFormalParameter(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-    param.left = deserializeBindingPattern(pos + 32);
-    param.right = deserializeOptionBoxExpression(pos + 56);
-  } else param = deserializeBindingPattern(pos + 32);
+    param.left = deserializeBindingPattern(pos + 40);
+    param.right = deserializeOptionBoxExpression(pos + 64);
+  } else param = deserializeBindingPattern(pos + 40);
   return param;
 }
 
@@ -1955,8 +1957,8 @@ function deserializeFunctionBody(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    body = deserializeVecDirective(pos + 8);
-  body.push(...deserializeVecStatement(pos + 32));
+    body = deserializeVecDirective(pos + 16);
+  body.push(...deserializeVecStatement(pos + 40));
   node.body = body;
   return node;
 }
@@ -1977,9 +1979,9 @@ function deserializeArrowFunctionExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    body = deserializeBoxFunctionBody(pos + 32);
+    body = deserializeBoxFunctionBody(pos + 40);
   expression === true && (body = body.body[0].expression);
-  node.params = deserializeBoxFormalParameters(pos + 16);
+  node.params = deserializeBoxFormalParameters(pos + 24);
   node.body = body;
   node.generator = false;
   return node;
@@ -1990,13 +1992,13 @@ function deserializeYieldExpression(pos) {
     end,
     node = {
       type: "YieldExpression",
-      delegate: deserializeBool(pos + 28),
+      delegate: deserializeBool(pos + 12),
       argument: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeOptionExpression(pos + 8);
+  node.argument = deserializeOptionExpression(pos + 16);
   return node;
 }
 
@@ -2013,10 +2015,10 @@ function deserializeClass(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.decorators = deserializeVecDecorator(pos + 8);
-  node.id = deserializeOptionBindingIdentifier(pos + 32);
-  node.superClass = deserializeOptionExpression(pos + 72);
-  node.body = deserializeBoxClassBody(pos + 120);
+  node.decorators = deserializeVecDecorator(pos + 16);
+  node.id = deserializeOptionBindingIdentifier(pos + 40);
+  node.superClass = deserializeOptionExpression(pos + 80);
+  node.body = deserializeBoxClassBody(pos + 128);
   return node;
 }
 
@@ -2041,7 +2043,7 @@ function deserializeClassBody(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecClassElement(pos + 8);
+  node.body = deserializeVecClassElement(pos + 16);
   return node;
 }
 
@@ -2066,20 +2068,20 @@ function deserializeMethodDefinition(pos) {
   let start,
     end,
     node = {
-      type: deserializeMethodDefinitionType(pos + 60),
+      type: deserializeMethodDefinitionType(pos + 12),
       decorators: null,
       key: null,
       value: null,
-      kind: deserializeMethodDefinitionKind(pos + 61),
-      computed: deserializeBool(pos + 62),
-      static: deserializeBool(pos + 63),
+      kind: deserializeMethodDefinitionKind(pos + 13),
+      computed: deserializeBool(pos + 14),
+      static: deserializeBool(pos + 15),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.decorators = deserializeVecDecorator(pos + 8);
-  node.key = deserializePropertyKey(pos + 32);
-  node.value = deserializeBoxFunction(pos + 48);
+  node.decorators = deserializeVecDecorator(pos + 16);
+  node.key = deserializePropertyKey(pos + 40);
+  node.value = deserializeBoxFunction(pos + 56);
   return node;
 }
 
@@ -2098,19 +2100,19 @@ function deserializePropertyDefinition(pos) {
   let start,
     end,
     node = {
-      type: deserializePropertyDefinitionType(pos + 76),
+      type: deserializePropertyDefinitionType(pos + 12),
       decorators: null,
       key: null,
       value: null,
-      computed: deserializeBool(pos + 77),
-      static: deserializeBool(pos + 78),
+      computed: deserializeBool(pos + 13),
+      static: deserializeBool(pos + 14),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.decorators = deserializeVecDecorator(pos + 8);
-  node.key = deserializePropertyKey(pos + 32);
-  node.value = deserializeOptionExpression(pos + 56);
+  node.decorators = deserializeVecDecorator(pos + 16);
+  node.key = deserializePropertyKey(pos + 40);
+  node.value = deserializeOptionExpression(pos + 64);
   return node;
 }
 
@@ -2144,7 +2146,7 @@ function deserializePrivateIdentifier(pos) {
   let start, end;
   return {
     type: "PrivateIdentifier",
-    name: deserializeStr(pos + 8),
+    name: deserializeStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -2161,7 +2163,7 @@ function deserializeStaticBlock(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecStatement(pos + 8);
+  node.body = deserializeVecStatement(pos + 16);
   return node;
 }
 
@@ -2180,19 +2182,19 @@ function deserializeAccessorProperty(pos) {
   let start,
     end,
     node = {
-      type: deserializeAccessorPropertyType(pos + 76),
+      type: deserializeAccessorPropertyType(pos + 12),
       decorators: null,
       key: null,
       value: null,
-      computed: deserializeBool(pos + 77),
-      static: deserializeBool(pos + 78),
+      computed: deserializeBool(pos + 13),
+      static: deserializeBool(pos + 14),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.decorators = deserializeVecDecorator(pos + 8);
-  node.key = deserializePropertyKey(pos + 32);
-  node.value = deserializeOptionExpression(pos + 56);
+  node.decorators = deserializeVecDecorator(pos + 16);
+  node.key = deserializePropertyKey(pos + 40);
+  node.value = deserializeOptionExpression(pos + 64);
   return node;
 }
 
@@ -2203,13 +2205,13 @@ function deserializeImportExpression(pos) {
       type: "ImportExpression",
       source: null,
       options: null,
-      phase: deserializeOptionImportPhase(pos + 44),
+      phase: deserializeOptionImportPhase(pos + 12),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.source = deserializeExpression(pos + 8);
-  node.options = deserializeOptionExpression(pos + 24);
+  node.source = deserializeExpression(pos + 16);
+  node.options = deserializeOptionExpression(pos + 32);
   return node;
 }
 
@@ -2220,17 +2222,17 @@ function deserializeImportDeclaration(pos) {
       type: "ImportDeclaration",
       specifiers: null,
       source: null,
-      phase: deserializeOptionImportPhase(pos + 92),
+      phase: deserializeOptionImportPhase(pos + 12),
       attributes: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    specifiers = deserializeOptionVecImportDeclarationSpecifier(pos + 8);
+    specifiers = deserializeOptionVecImportDeclarationSpecifier(pos + 16);
   specifiers === null && (specifiers = []);
-  let withClause = deserializeOptionBoxWithClause(pos + 80);
+  let withClause = deserializeOptionBoxWithClause(pos + 88);
   node.specifiers = specifiers;
-  node.source = deserializeStringLiteral(pos + 32);
+  node.source = deserializeStringLiteral(pos + 40);
   node.attributes = withClause === null ? [] : withClause.attributes;
   return node;
 }
@@ -2270,8 +2272,8 @@ function deserializeImportSpecifier(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.imported = deserializeModuleExportName(pos + 8);
-  node.local = deserializeBindingIdentifier(pos + 64);
+  node.imported = deserializeModuleExportName(pos + 16);
+  node.local = deserializeBindingIdentifier(pos + 72);
   return node;
 }
 
@@ -2285,7 +2287,7 @@ function deserializeImportDefaultSpecifier(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.local = deserializeBindingIdentifier(pos + 8);
+  node.local = deserializeBindingIdentifier(pos + 16);
   return node;
 }
 
@@ -2299,18 +2301,12 @@ function deserializeImportNamespaceSpecifier(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.local = deserializeBindingIdentifier(pos + 8);
+  node.local = deserializeBindingIdentifier(pos + 16);
   return node;
 }
 
 function deserializeWithClause(pos) {
-  let start, end;
-  return {
-    attributes: deserializeVecImportAttribute(pos + 8),
-    start: (start = deserializeU32(pos)),
-    end: (end = deserializeU32(pos + 4)),
-    range: [start, end],
-  };
+  return { attributes: deserializeVecImportAttribute(pos + 16) };
 }
 
 function deserializeImportAttribute(pos) {
@@ -2324,8 +2320,8 @@ function deserializeImportAttribute(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.key = deserializeImportAttributeKey(pos + 8);
-  node.value = deserializeStringLiteral(pos + 64);
+  node.key = deserializeImportAttributeKey(pos + 16);
+  node.value = deserializeStringLiteral(pos + 72);
   return node;
 }
 
@@ -2353,10 +2349,10 @@ function deserializeExportNamedDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    withClause = deserializeOptionBoxWithClause(pos + 96);
-  node.declaration = deserializeOptionDeclaration(pos + 8);
-  node.specifiers = deserializeVecExportSpecifier(pos + 24);
-  node.source = deserializeOptionStringLiteral(pos + 48);
+    withClause = deserializeOptionBoxWithClause(pos + 104);
+  node.declaration = deserializeOptionDeclaration(pos + 16);
+  node.specifiers = deserializeVecExportSpecifier(pos + 32);
+  node.source = deserializeOptionStringLiteral(pos + 56);
   node.attributes = withClause === null ? [] : withClause.attributes;
   return node;
 }
@@ -2371,7 +2367,7 @@ function deserializeExportDefaultDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.declaration = deserializeExportDefaultDeclarationKind(pos + 8);
+  node.declaration = deserializeExportDefaultDeclarationKind(pos + 16);
   return node;
 }
 
@@ -2387,9 +2383,9 @@ function deserializeExportAllDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    withClause = deserializeOptionBoxWithClause(pos + 112);
-  node.exported = deserializeOptionModuleExportName(pos + 8);
-  node.source = deserializeStringLiteral(pos + 64);
+    withClause = deserializeOptionBoxWithClause(pos + 120);
+  node.exported = deserializeOptionModuleExportName(pos + 16);
+  node.source = deserializeStringLiteral(pos + 72);
   node.attributes = withClause === null ? [] : withClause.attributes;
   return node;
 }
@@ -2405,8 +2401,8 @@ function deserializeExportSpecifier(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.local = deserializeModuleExportName(pos + 8);
-  node.exported = deserializeModuleExportName(pos + 64);
+  node.local = deserializeModuleExportName(pos + 16);
+  node.exported = deserializeModuleExportName(pos + 72);
   return node;
 }
 
@@ -2533,8 +2529,8 @@ function deserializeV8IntrinsicExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.name = deserializeIdentifierName(pos + 8);
-  node.arguments = deserializeVecArgument(pos + 40);
+  node.name = deserializeIdentifierName(pos + 16);
+  node.arguments = deserializeVecArgument(pos + 48);
   return node;
 }
 
@@ -2573,7 +2569,7 @@ function deserializeNumericLiteral(pos) {
   let start, end;
   return {
     type: "Literal",
-    value: deserializeF64(pos + 8),
+    value: deserializeF64(pos + 32),
     raw: deserializeOptionStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
@@ -2587,13 +2583,13 @@ function deserializeStringLiteral(pos) {
     node = {
       type: "Literal",
       value: null,
-      raw: deserializeOptionStr(pos + 24),
+      raw: deserializeOptionStr(pos + 32),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    value = deserializeStr(pos + 8);
-  deserializeBool(pos + 44) &&
+    value = deserializeStr(pos + 16);
+  deserializeBool(pos + 12) &&
     (value = value.replace(/\uFFFD(.{4})/g, (_, hex) => String.fromCodePoint(parseInt(hex, 16))));
   node.value = value;
   return node;
@@ -2605,13 +2601,13 @@ function deserializeBigIntLiteral(pos) {
     node = {
       type: "Literal",
       value: null,
-      raw: deserializeOptionStr(pos + 24),
+      raw: deserializeOptionStr(pos + 32),
       bigint: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    bigint = deserializeStr(pos + 8);
+    bigint = deserializeStr(pos + 16);
   node.value = BigInt(bigint);
   node.bigint = bigint;
   return node;
@@ -2623,13 +2619,13 @@ function deserializeRegExpLiteral(pos) {
     node = {
       type: "Literal",
       value: null,
-      raw: deserializeOptionStr(pos + 40),
+      raw: deserializeOptionStr(pos + 48),
       regex: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    regex = deserializeRegExp(pos + 8),
+    regex = deserializeRegExp(pos + 16),
     value = null;
   try {
     value = new RegExp(regex.pattern, regex.flags);
@@ -2673,11 +2669,11 @@ function deserializeJSXElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    closingElement = deserializeOptionBoxJSXClosingElement(pos + 40),
-    openingElement = deserializeBoxJSXOpeningElement(pos + 8);
+    closingElement = deserializeOptionBoxJSXClosingElement(pos + 48),
+    openingElement = deserializeBoxJSXOpeningElement(pos + 16);
   closingElement === null && (openingElement.selfClosing = true);
   node.openingElement = openingElement;
-  node.children = deserializeVecJSXChild(pos + 16);
+  node.children = deserializeVecJSXChild(pos + 24);
   node.closingElement = closingElement;
   return node;
 }
@@ -2694,8 +2690,8 @@ function deserializeJSXOpeningElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.name = deserializeJSXElementName(pos + 8);
-  node.attributes = deserializeVecJSXAttributeItem(pos + 32);
+  node.name = deserializeJSXElementName(pos + 16);
+  node.attributes = deserializeVecJSXAttributeItem(pos + 40);
   node.selfClosing = false;
   return node;
 }
@@ -2710,7 +2706,7 @@ function deserializeJSXClosingElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.name = deserializeJSXElementName(pos + 8);
+  node.name = deserializeJSXElementName(pos + 16);
   return node;
 }
 
@@ -2726,9 +2722,9 @@ function deserializeJSXFragment(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.openingFragment = deserializeJSXOpeningFragment(pos + 8);
-  node.children = deserializeVecJSXChild(pos + 24);
-  node.closingFragment = deserializeJSXClosingFragment(pos + 48);
+  node.openingFragment = deserializeJSXOpeningFragment(pos + 16);
+  node.children = deserializeVecJSXChild(pos + 32);
+  node.closingFragment = deserializeJSXClosingFragment(pos + 56);
   return node;
 }
 
@@ -2800,8 +2796,8 @@ function deserializeJSXNamespacedName(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.namespace = deserializeJSXIdentifier(pos + 8);
-  node.name = deserializeJSXIdentifier(pos + 40);
+  node.namespace = deserializeJSXIdentifier(pos + 16);
+  node.name = deserializeJSXIdentifier(pos + 48);
   return node;
 }
 
@@ -2816,8 +2812,8 @@ function deserializeJSXMemberExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.object = deserializeJSXMemberExpressionObject(pos + 8);
-  node.property = deserializeJSXIdentifier(pos + 24);
+  node.object = deserializeJSXMemberExpressionObject(pos + 16);
+  node.property = deserializeJSXIdentifier(pos + 32);
   return node;
 }
 
@@ -2858,7 +2854,7 @@ function deserializeJSXExpressionContainer(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeJSXExpression(pos + 8);
+  node.expression = deserializeJSXExpression(pos + 16);
   return node;
 }
 
@@ -2989,8 +2985,8 @@ function deserializeJSXAttribute(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.name = deserializeJSXAttributeName(pos + 8);
-  node.value = deserializeOptionJSXAttributeValue(pos + 24);
+  node.name = deserializeJSXAttributeName(pos + 16);
+  node.value = deserializeOptionJSXAttributeValue(pos + 32);
   return node;
 }
 
@@ -3004,7 +3000,7 @@ function deserializeJSXSpreadAttribute(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -3038,7 +3034,7 @@ function deserializeJSXIdentifier(pos) {
   let start, end;
   return {
     type: "JSXIdentifier",
-    name: deserializeStr(pos + 8),
+    name: deserializeStr(pos + 16),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -3072,7 +3068,7 @@ function deserializeJSXSpreadChild(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -3080,8 +3076,8 @@ function deserializeJSXText(pos) {
   let start, end;
   return {
     type: "JSXText",
-    value: deserializeStr(pos + 8),
-    raw: deserializeOptionStr(pos + 24),
+    value: deserializeStr(pos + 16),
+    raw: deserializeOptionStr(pos + 32),
     start: (start = deserializeU32(pos)),
     end: (end = deserializeU32(pos + 4)),
     range: [start, end],
@@ -3104,7 +3100,7 @@ function deserializeTSThisParameter(pos) {
   node.decorators = [];
   node.name = "this";
   node.optional = false;
-  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 16);
+  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
   return node;
 }
 
@@ -3115,14 +3111,14 @@ function deserializeTSEnumDeclaration(pos) {
       type: "TSEnumDeclaration",
       id: null,
       body: null,
-      const: deserializeBool(pos + 84),
-      declare: deserializeBool(pos + 85),
+      const: deserializeBool(pos + 12),
+      declare: deserializeBool(pos + 13),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.id = deserializeBindingIdentifier(pos + 8);
-  node.body = deserializeTSEnumBody(pos + 40);
+  node.id = deserializeBindingIdentifier(pos + 16);
+  node.body = deserializeTSEnumBody(pos + 48);
   return node;
 }
 
@@ -3136,7 +3132,7 @@ function deserializeTSEnumBody(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.members = deserializeVecTSEnumMember(pos + 8);
+  node.members = deserializeVecTSEnumMember(pos + 16);
   return node;
 }
 
@@ -3152,9 +3148,9 @@ function deserializeTSEnumMember(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.id = deserializeTSEnumMemberName(pos + 8);
-  node.initializer = deserializeOptionExpression(pos + 24);
-  node.computed = deserializeU8(pos + 8) > 1;
+  node.id = deserializeTSEnumMemberName(pos + 16);
+  node.initializer = deserializeOptionExpression(pos + 32);
+  node.computed = deserializeU8(pos + 16) > 1;
   return node;
 }
 
@@ -3183,7 +3179,7 @@ function deserializeTSTypeAnnotation(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3197,7 +3193,7 @@ function deserializeTSLiteralType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.literal = deserializeTSLiteral(pos + 8);
+  node.literal = deserializeTSLiteral(pos + 16);
   return node;
 }
 
@@ -3314,10 +3310,10 @@ function deserializeTSConditionalType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.checkType = deserializeTSType(pos + 8);
-  node.extendsType = deserializeTSType(pos + 24);
-  node.trueType = deserializeTSType(pos + 40);
-  node.falseType = deserializeTSType(pos + 56);
+  node.checkType = deserializeTSType(pos + 16);
+  node.extendsType = deserializeTSType(pos + 32);
+  node.trueType = deserializeTSType(pos + 48);
+  node.falseType = deserializeTSType(pos + 64);
   return node;
 }
 
@@ -3331,7 +3327,7 @@ function deserializeTSUnionType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.types = deserializeVecTSType(pos + 8);
+  node.types = deserializeVecTSType(pos + 16);
   return node;
 }
 
@@ -3345,7 +3341,7 @@ function deserializeTSIntersectionType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.types = deserializeVecTSType(pos + 8);
+  node.types = deserializeVecTSType(pos + 16);
   return node;
 }
 
@@ -3360,7 +3356,7 @@ function deserializeTSParenthesizedType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-    node.typeAnnotation = deserializeTSType(pos + 8);
+    node.typeAnnotation = deserializeTSType(pos + 16);
   }
   return node;
 }
@@ -3370,13 +3366,13 @@ function deserializeTSTypeOperator(pos) {
     end,
     node = {
       type: "TSTypeOperator",
-      operator: deserializeTSTypeOperatorOperator(pos + 28),
+      operator: deserializeTSTypeOperatorOperator(pos + 12),
       typeAnnotation: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3403,7 +3399,7 @@ function deserializeTSArrayType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.elementType = deserializeTSType(pos + 8);
+  node.elementType = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3418,8 +3414,8 @@ function deserializeTSIndexedAccessType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.objectType = deserializeTSType(pos + 8);
-  node.indexType = deserializeTSType(pos + 24);
+  node.objectType = deserializeTSType(pos + 16);
+  node.indexType = deserializeTSType(pos + 32);
   return node;
 }
 
@@ -3433,7 +3429,7 @@ function deserializeTSTupleType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.elementTypes = deserializeVecTSTupleElement(pos + 8);
+  node.elementTypes = deserializeVecTSTupleElement(pos + 16);
   return node;
 }
 
@@ -3444,13 +3440,13 @@ function deserializeTSNamedTupleMember(pos) {
       type: "TSNamedTupleMember",
       label: null,
       elementType: null,
-      optional: deserializeBool(pos + 60),
+      optional: deserializeBool(pos + 12),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.label = deserializeIdentifierName(pos + 8);
-  node.elementType = deserializeTSTupleElement(pos + 40);
+  node.label = deserializeIdentifierName(pos + 16);
+  node.elementType = deserializeTSTupleElement(pos + 48);
   return node;
 }
 
@@ -3464,7 +3460,7 @@ function deserializeTSOptionalType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3478,7 +3474,7 @@ function deserializeTSRestType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3718,8 +3714,8 @@ function deserializeTSTypeReference(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeName = deserializeTSTypeName(pos + 8);
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
+  node.typeName = deserializeTSTypeName(pos + 16);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
   return node;
 }
 
@@ -3747,8 +3743,8 @@ function deserializeTSQualifiedName(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeTSTypeName(pos + 8);
-  node.right = deserializeIdentifierName(pos + 24);
+  node.left = deserializeTSTypeName(pos + 16);
+  node.right = deserializeIdentifierName(pos + 32);
   return node;
 }
 
@@ -3762,7 +3758,7 @@ function deserializeTSTypeParameterInstantiation(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.params = deserializeVecTSType(pos + 8);
+  node.params = deserializeVecTSType(pos + 16);
   return node;
 }
 
@@ -3774,16 +3770,16 @@ function deserializeTSTypeParameter(pos) {
       name: null,
       constraint: null,
       default: null,
-      in: deserializeBool(pos + 76),
-      out: deserializeBool(pos + 77),
-      const: deserializeBool(pos + 78),
+      in: deserializeBool(pos + 12),
+      out: deserializeBool(pos + 13),
+      const: deserializeBool(pos + 14),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.name = deserializeBindingIdentifier(pos + 8);
-  node.constraint = deserializeOptionTSType(pos + 40);
-  node.default = deserializeOptionTSType(pos + 56);
+  node.name = deserializeBindingIdentifier(pos + 16);
+  node.constraint = deserializeOptionTSType(pos + 48);
+  node.default = deserializeOptionTSType(pos + 64);
   return node;
 }
 
@@ -3797,7 +3793,7 @@ function deserializeTSTypeParameterDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.params = deserializeVecTSTypeParameter(pos + 8);
+  node.params = deserializeVecTSTypeParameter(pos + 16);
   return node;
 }
 
@@ -3814,9 +3810,9 @@ function deserializeTSTypeAliasDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.id = deserializeBindingIdentifier(pos + 8);
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 40);
-  node.typeAnnotation = deserializeTSType(pos + 48);
+  node.id = deserializeBindingIdentifier(pos + 16);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 48);
+  node.typeAnnotation = deserializeTSType(pos + 56);
   return node;
 }
 
@@ -3834,10 +3830,10 @@ function deserializeTSInterfaceDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.id = deserializeBindingIdentifier(pos + 8);
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 40);
-  node.extends = deserializeVecTSInterfaceHeritage(pos + 48);
-  node.body = deserializeBoxTSInterfaceBody(pos + 72);
+  node.id = deserializeBindingIdentifier(pos + 16);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 48);
+  node.extends = deserializeVecTSInterfaceHeritage(pos + 56);
+  node.body = deserializeBoxTSInterfaceBody(pos + 80);
   return node;
 }
 
@@ -3851,7 +3847,7 @@ function deserializeTSInterfaceBody(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecTSSignature(pos + 8);
+  node.body = deserializeVecTSSignature(pos + 16);
   return node;
 }
 
@@ -3860,9 +3856,9 @@ function deserializeTSPropertySignature(pos) {
     end,
     node = {
       type: "TSPropertySignature",
-      computed: deserializeBool(pos + 36),
-      optional: deserializeBool(pos + 37),
-      readonly: deserializeBool(pos + 38),
+      computed: deserializeBool(pos + 12),
+      optional: deserializeBool(pos + 13),
+      readonly: deserializeBool(pos + 14),
       key: null,
       typeAnnotation: null,
       accessibility: null,
@@ -3871,8 +3867,8 @@ function deserializeTSPropertySignature(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.key = deserializePropertyKey(pos + 8);
-  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
+  node.key = deserializePropertyKey(pos + 16);
+  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32);
   node.static = false;
   return node;
 }
@@ -3901,15 +3897,15 @@ function deserializeTSIndexSignature(pos) {
       type: "TSIndexSignature",
       parameters: null,
       typeAnnotation: null,
-      readonly: deserializeBool(pos + 44),
-      static: deserializeBool(pos + 45),
+      readonly: deserializeBool(pos + 12),
+      static: deserializeBool(pos + 13),
       accessibility: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.parameters = deserializeVecTSIndexSignatureName(pos + 8);
-  node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 32);
+  node.parameters = deserializeVecTSIndexSignatureName(pos + 16);
+  node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 40);
   return node;
 }
 
@@ -3925,12 +3921,12 @@ function deserializeTSCallSignatureDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    params = deserializeBoxFormalParameters(pos + 24),
-    thisParam = deserializeOptionBoxTSThisParameter(pos + 16);
+    params = deserializeBoxFormalParameters(pos + 32),
+    thisParam = deserializeOptionBoxTSThisParameter(pos + 24);
   thisParam !== null && params.unshift(thisParam);
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16);
   node.params = params;
-  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 32);
+  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 40);
   return node;
 }
 
@@ -3966,13 +3962,13 @@ function deserializeTSMethodSignature(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    params = deserializeBoxFormalParameters(pos + 40),
-    thisParam = deserializeOptionBoxTSThisParameter(pos + 32);
+    params = deserializeBoxFormalParameters(pos + 48),
+    thisParam = deserializeOptionBoxTSThisParameter(pos + 40);
   thisParam !== null && params.unshift(thisParam);
-  node.key = deserializePropertyKey(pos + 8);
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 24);
+  node.key = deserializePropertyKey(pos + 16);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 32);
   node.params = params;
-  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 56);
   node.readonly = false;
   node.static = false;
   return node;
@@ -3990,9 +3986,9 @@ function deserializeTSConstructSignatureDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8);
-  node.params = deserializeBoxFormalParameters(pos + 16);
-  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 24);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16);
+  node.params = deserializeBoxFormalParameters(pos + 24);
+  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 32);
   return node;
 }
 
@@ -4002,7 +3998,7 @@ function deserializeTSIndexSignatureName(pos) {
     node = {
       type: "Identifier",
       decorators: null,
-      name: deserializeStr(pos + 8),
+      name: deserializeStr(pos + 16),
       optional: null,
       typeAnnotation: null,
       start: (start = deserializeU32(pos)),
@@ -4011,7 +4007,7 @@ function deserializeTSIndexSignatureName(pos) {
     };
   node.decorators = [];
   node.optional = false;
-  node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 24);
+  node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 32);
   return node;
 }
 
@@ -4026,8 +4022,8 @@ function deserializeTSInterfaceHeritage(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
+  node.expression = deserializeExpression(pos + 16);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
   return node;
 }
 
@@ -4037,14 +4033,14 @@ function deserializeTSTypePredicate(pos) {
     node = {
       type: "TSTypePredicate",
       parameterName: null,
-      asserts: deserializeBool(pos + 44),
+      asserts: deserializeBool(pos + 12),
       typeAnnotation: null,
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.parameterName = deserializeTSTypePredicateName(pos + 8);
-  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32);
+  node.parameterName = deserializeTSTypePredicateName(pos + 16);
+  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 40);
   return node;
 }
 
@@ -4065,7 +4061,7 @@ function deserializeTSModuleDeclaration(pos) {
     end = deserializeU32(pos + 4),
     declare = deserializeBool(pos + 89),
     node,
-    body = deserializeOptionTSModuleDeclarationBody(pos + 64);
+    body = deserializeOptionTSModuleDeclarationBody(pos + 72);
   if (body === null) {
     node = {
       type: "TSModuleDeclaration",
@@ -4077,7 +4073,7 @@ function deserializeTSModuleDeclaration(pos) {
       end,
       range: [start, end],
     };
-    node.id = deserializeTSModuleDeclarationName(pos + 8);
+    node.id = deserializeTSModuleDeclarationName(pos + 16);
   } else {
     node = {
       type: "TSModuleDeclaration",
@@ -4090,7 +4086,7 @@ function deserializeTSModuleDeclaration(pos) {
       end,
       range: [start, end],
     };
-    let id = deserializeTSModuleDeclarationName(pos + 8);
+    let id = deserializeTSModuleDeclarationName(pos + 16);
     if (body.type === "TSModuleBlock") node.id = id;
     else {
       let innerId = body.id;
@@ -4186,11 +4182,11 @@ function deserializeTSGlobalDeclaration(pos) {
   node.id = {
     type: "Identifier",
     name: "global",
-    start: (keywordStart = deserializeU32(pos + 8)),
-    end: (keywordEnd = deserializeU32(pos + 12)),
+    start: (keywordStart = deserializeU32(pos + 16)),
+    end: (keywordEnd = deserializeU32(pos + 20)),
     range: [keywordStart, keywordEnd],
   };
-  node.body = deserializeTSModuleBlock(pos + 16);
+  node.body = deserializeTSModuleBlock(pos + 24);
   node.kind = "global";
   node.global = true;
   return node;
@@ -4206,8 +4202,8 @@ function deserializeTSModuleBlock(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    body = deserializeVecDirective(pos + 8);
-  body.push(...deserializeVecStatement(pos + 32));
+    body = deserializeVecDirective(pos + 16);
+  body.push(...deserializeVecStatement(pos + 40));
   node.body = body;
   return node;
 }
@@ -4222,7 +4218,7 @@ function deserializeTSTypeLiteral(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.members = deserializeVecTSSignature(pos + 8);
+  node.members = deserializeVecTSSignature(pos + 16);
   return node;
 }
 
@@ -4236,7 +4232,7 @@ function deserializeTSInferType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeParameter = deserializeBoxTSTypeParameter(pos + 8);
+  node.typeParameter = deserializeBoxTSTypeParameter(pos + 16);
   return node;
 }
 
@@ -4251,8 +4247,8 @@ function deserializeTSTypeQuery(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.exprName = deserializeTSTypeQueryExprName(pos + 8);
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
+  node.exprName = deserializeTSTypeQueryExprName(pos + 16);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
   return node;
 }
 
@@ -4284,10 +4280,10 @@ function deserializeTSImportType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.source = deserializeStringLiteral(pos + 8);
-  node.options = deserializeOptionBoxObjectExpression(pos + 56);
-  node.qualifier = deserializeOptionTSImportTypeQualifier(pos + 64);
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 80);
+  node.source = deserializeStringLiteral(pos + 16);
+  node.options = deserializeOptionBoxObjectExpression(pos + 64);
+  node.qualifier = deserializeOptionTSImportTypeQualifier(pos + 72);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 88);
   return node;
 }
 
@@ -4313,8 +4309,8 @@ function deserializeTSImportTypeQualifiedName(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.left = deserializeTSImportTypeQualifier(pos + 8);
-  node.right = deserializeIdentifierName(pos + 24);
+  node.left = deserializeTSImportTypeQualifier(pos + 16);
+  node.right = deserializeIdentifierName(pos + 32);
   return node;
 }
 
@@ -4330,12 +4326,12 @@ function deserializeTSFunctionType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    params = deserializeBoxFormalParameters(pos + 24),
-    thisParam = deserializeOptionBoxTSThisParameter(pos + 16);
+    params = deserializeBoxFormalParameters(pos + 32),
+    thisParam = deserializeOptionBoxTSThisParameter(pos + 24);
   thisParam !== null && params.unshift(thisParam);
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16);
   node.params = params;
-  node.returnType = deserializeBoxTSTypeAnnotation(pos + 32);
+  node.returnType = deserializeBoxTSTypeAnnotation(pos + 40);
   return node;
 }
 
@@ -4352,9 +4348,9 @@ function deserializeTSConstructorType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8);
-  node.params = deserializeBoxFormalParameters(pos + 16);
-  node.returnType = deserializeBoxTSTypeAnnotation(pos + 24);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16);
+  node.params = deserializeBoxFormalParameters(pos + 24);
+  node.returnType = deserializeBoxTSTypeAnnotation(pos + 32);
   return node;
 }
 
@@ -4375,10 +4371,10 @@ function deserializeTSMappedType(pos) {
     },
     optional = deserializeOptionTSMappedTypeModifierOperator(pos + 96);
   optional === null && (optional = false);
-  node.key = deserializeBindingIdentifier(pos + 8);
-  node.constraint = deserializeTSType(pos + 40);
-  node.nameType = deserializeOptionTSType(pos + 56);
-  node.typeAnnotation = deserializeOptionTSType(pos + 72);
+  node.key = deserializeBindingIdentifier(pos + 16);
+  node.constraint = deserializeTSType(pos + 48);
+  node.nameType = deserializeOptionTSType(pos + 64);
+  node.typeAnnotation = deserializeOptionTSType(pos + 80);
   node.optional = optional;
   return node;
 }
@@ -4407,8 +4403,8 @@ function deserializeTSTemplateLiteralType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.quasis = deserializeVecTemplateElement(pos + 8);
-  node.types = deserializeVecTSType(pos + 32);
+  node.quasis = deserializeVecTemplateElement(pos + 16);
+  node.types = deserializeVecTSType(pos + 40);
   return node;
 }
 
@@ -4423,8 +4419,8 @@ function deserializeTSAsExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
-  node.typeAnnotation = deserializeTSType(pos + 24);
+  node.expression = deserializeExpression(pos + 16);
+  node.typeAnnotation = deserializeTSType(pos + 32);
   return node;
 }
 
@@ -4439,8 +4435,8 @@ function deserializeTSSatisfiesExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
-  node.typeAnnotation = deserializeTSType(pos + 24);
+  node.expression = deserializeExpression(pos + 16);
+  node.typeAnnotation = deserializeTSType(pos + 32);
   return node;
 }
 
@@ -4455,8 +4451,8 @@ function deserializeTSTypeAssertion(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
-  node.expression = deserializeExpression(pos + 24);
+  node.typeAnnotation = deserializeTSType(pos + 16);
+  node.expression = deserializeExpression(pos + 32);
   return node;
 }
 
@@ -4467,13 +4463,13 @@ function deserializeTSImportEqualsDeclaration(pos) {
       type: "TSImportEqualsDeclaration",
       id: null,
       moduleReference: null,
-      importKind: deserializeImportOrExportKind(pos + 60),
+      importKind: deserializeImportOrExportKind(pos + 12),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.id = deserializeBindingIdentifier(pos + 8);
-  node.moduleReference = deserializeTSModuleReference(pos + 40);
+  node.id = deserializeBindingIdentifier(pos + 16);
+  node.moduleReference = deserializeTSModuleReference(pos + 48);
   return node;
 }
 
@@ -4500,7 +4496,7 @@ function deserializeTSExternalModuleReference(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeStringLiteral(pos + 8);
+  node.expression = deserializeStringLiteral(pos + 16);
   return node;
 }
 
@@ -4514,7 +4510,7 @@ function deserializeTSNonNullExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -4528,7 +4524,7 @@ function deserializeDecorator(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -4542,7 +4538,7 @@ function deserializeTSExportAssignment(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -4556,7 +4552,7 @@ function deserializeTSNamespaceExportDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.id = deserializeIdentifierName(pos + 8);
+  node.id = deserializeIdentifierName(pos + 16);
   return node;
 }
 
@@ -4571,8 +4567,8 @@ function deserializeTSInstantiationExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
-  node.typeArguments = deserializeBoxTSTypeParameterInstantiation(pos + 24);
+  node.expression = deserializeExpression(pos + 16);
+  node.typeArguments = deserializeBoxTSTypeParameterInstantiation(pos + 32);
   return node;
 }
 
@@ -4593,12 +4589,12 @@ function deserializeJSDocNullableType(pos) {
     node = {
       type: "TSJSDocNullableType",
       typeAnnotation: null,
-      postfix: deserializeBool(pos + 28),
+      postfix: deserializeBool(pos + 12),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -4608,12 +4604,12 @@ function deserializeJSDocNonNullableType(pos) {
     node = {
       type: "TSJSDocNonNullableType",
       typeAnnotation: null,
-      postfix: deserializeBool(pos + 28),
+      postfix: deserializeBool(pos + 12),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -4653,6 +4649,26 @@ function deserializeComment(pos) {
   };
 }
 
+function deserializeModuleKind(pos) {
+  switch (uint8[pos]) {
+    case 0:
+      return "script";
+    case 1:
+      return "module";
+    case 3:
+      return "commonjs";
+    default:
+      throw Error(`Unexpected discriminant ${uint8[pos]} for ModuleKind`);
+  }
+}
+
+function deserializeSpan(pos) {
+  return {
+    start: deserializeU32(pos),
+    end: deserializeU32(pos + 4),
+  };
+}
+
 function deserializeNameSpan(pos) {
   let start, end;
   return {
@@ -4969,26 +4985,6 @@ function deserializeUpdateOperator(pos) {
   }
 }
 
-function deserializeSpan(pos) {
-  return {
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-  };
-}
-
-function deserializeModuleKind(pos) {
-  switch (uint8[pos]) {
-    case 0:
-      return "script";
-    case 1:
-      return "module";
-    case 3:
-      return "commonjs";
-    default:
-      throw Error(`Unexpected discriminant ${uint8[pos]} for ModuleKind`);
-  }
-}
-
 function deserializeRawTransferData(pos) {
   return {
     program: deserializeProgram(pos),
@@ -5062,14 +5058,6 @@ function deserializeStaticExport(pos) {
   };
 }
 
-function deserializeU32(pos) {
-  return uint32[pos >> 2];
-}
-
-function deserializeU8(pos) {
-  return uint8[pos];
-}
-
 function deserializeStr(pos) {
   let pos32 = pos >> 2,
     len = uint32[pos32 + 2];
@@ -5107,7 +5095,7 @@ function deserializeVecComment(pos) {
 }
 
 function deserializeOptionHashbang(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
+  if (uint32[(pos + 16) >> 2] === 0 && uint32[(pos + 20) >> 2] === 0) return null;
   return deserializeHashbang(pos);
 }
 
@@ -5596,7 +5584,7 @@ function deserializeOptionForStatementInit(pos) {
 }
 
 function deserializeOptionLabelIdentifier(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
+  if (uint32[(pos + 16) >> 2] === 0 && uint32[(pos + 20) >> 2] === 0) return null;
   return deserializeLabelIdentifier(pos);
 }
 
@@ -5627,7 +5615,7 @@ function deserializeOptionBoxBlockStatement(pos) {
 }
 
 function deserializeOptionCatchParameter(pos) {
-  if (uint8[pos + 8] === 4) return null;
+  if (uint8[pos + 16] === 4) return null;
   return deserializeCatchParameter(pos);
 }
 
@@ -5686,7 +5674,7 @@ function deserializeVecOptionBindingPattern(pos) {
 }
 
 function deserializeOptionBindingIdentifier(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
+  if (uint32[(pos + 16) >> 2] === 0 && uint32[(pos + 20) >> 2] === 0) return null;
   return deserializeBindingIdentifier(pos);
 }
 
@@ -5887,7 +5875,7 @@ function deserializeVecExportSpecifier(pos) {
 }
 
 function deserializeOptionStringLiteral(pos) {
-  if (uint8[pos + 44] === 2) return null;
+  if (uint8[pos + 12] === 2) return null;
   return deserializeStringLiteral(pos);
 }
 
@@ -5900,6 +5888,10 @@ function deserializeF64(pos) {
   return float64[pos >> 3];
 }
 
+function deserializeU8(pos) {
+  return uint8[pos];
+}
+
 function deserializeBoxJSXOpeningElement(pos) {
   return deserializeJSXOpeningElement(uint32[pos >> 2]);
 }
@@ -6279,6 +6271,10 @@ function deserializeBoxTSExternalModuleReference(pos) {
   return deserializeTSExternalModuleReference(uint32[pos >> 2]);
 }
 
+function deserializeU32(pos) {
+  return uint32[pos >> 2];
+}
+
 function deserializeOptionNameSpan(pos) {
   if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
   return deserializeNameSpan(pos);