oxc-parser 0.121.0 → 0.124.0

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

@@ -1,31 +1,46 @@
 // Auto-generated code, DO NOT EDIT DIRECTLY!
 // To edit this generated file you have to edit `tasks/ast_tools/src/generators/raw_transfer.rs`.
 
-let uint8, uint32, float64, sourceText, sourceIsAscii, sourceEndPos;
-
-const textDecoder = new TextDecoder("utf-8", { ignoreBOM: true }),
-  decodeStr = textDecoder.decode.bind(textDecoder),
-  { fromCodePoint } = String;
+let uint8,
+  uint32,
+  float64,
+  sourceText,
+  sourceTextLatin,
+  sourceEndPos = 0,
+  firstNonAsciiPos = 0;
+
+const { fromCharCode } = String,
+  { utf8Slice, latin1Slice } = Buffer.prototype,
+  stringDecodeArrays = Array(65).fill(null);
+for (let i = 0; i <= 64; i++) stringDecodeArrays[i] = Array(i).fill(0);
 
 export function deserialize(buffer, sourceText, sourceByteLen) {
   sourceEndPos = sourceByteLen;
-  let data = deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData);
-  resetBuffer();
-  return data;
+  return deserializeWith(buffer, sourceText, sourceByteLen, deserializeRawTransferData);
 }
 
-function deserializeWith(buffer, sourceTextInput, sourceByteLen, getLocInput, deserialize) {
+function deserializeWith(buffer, sourceTextInput, sourceByteLen, deserialize) {
   uint8 = buffer;
   uint32 = buffer.uint32;
   float64 = buffer.float64;
   sourceText = sourceTextInput;
-  sourceIsAscii = sourceText.length === sourceByteLen;
-  return deserialize(uint32[536870900]);
+  if (sourceText.length === sourceByteLen) {
+    firstNonAsciiPos = sourceByteLen;
+    sourceTextLatin = sourceText;
+  } else {
+    let i = 0;
+    for (; i < sourceByteLen && uint8[i] < 128; i++);
+    firstNonAsciiPos = i;
+    sourceTextLatin = latin1Slice.call(uint8, 0, sourceByteLen);
+  }
+  let data = deserialize(uint32[536870900]);
+  resetBuffer();
+  return data;
 }
 
 export function resetBuffer() {
-  // Clear buffer and source text string to allow them to be garbage collected
-  uint8 = uint32 = float64 = sourceText = void 0;
+  // Clear buffer and source text strings to allow them to be garbage collected
+  uint8 = uint32 = float64 = sourceText = sourceTextLatin = void 0;
 }
 
 function deserializeProgram(pos) {
@@ -39,9 +54,9 @@ function deserializeProgram(pos) {
       end,
       range: [0, end],
     };
-  program.hashbang = deserializeOptionHashbang(pos + 48);
-  let body = (program.body = deserializeVecDirective(pos + 80));
-  body.push(...deserializeVecStatement(pos + 104));
+  program.hashbang = deserializeOptionHashbang(pos + 56);
+  let body = (program.body = deserializeVecDirective(pos + 88));
+  body.push(...deserializeVecStatement(pos + 112));
   {
     let start;
     if (body.length > 0) {
@@ -163,7 +178,7 @@ function deserializeIdentifierName(pos) {
     node = {
       type: "Identifier",
       decorators: null,
-      name: deserializeStr(pos + 8),
+      name: deserializeStr(pos + 16),
       optional: null,
       typeAnnotation: null,
       start: (start = deserializeU32(pos)),
@@ -181,7 +196,7 @@ function deserializeIdentifierReference(pos) {
     node = {
       type: "Identifier",
       decorators: null,
-      name: deserializeStr(pos + 8),
+      name: deserializeStr(pos + 16),
       optional: null,
       typeAnnotation: null,
       start: (start = deserializeU32(pos)),
@@ -199,7 +214,7 @@ function deserializeBindingIdentifier(pos) {
     node = {
       type: "Identifier",
       decorators: null,
-      name: deserializeStr(pos + 8),
+      name: deserializeStr(pos + 16),
       optional: null,
       typeAnnotation: null,
       start: (start = deserializeU32(pos)),
@@ -217,7 +232,7 @@ function deserializeLabelIdentifier(pos) {
     node = {
       type: "Identifier",
       decorators: null,
-      name: deserializeStr(pos + 8),
+      name: deserializeStr(pos + 16),
       optional: null,
       typeAnnotation: null,
       start: (start = deserializeU32(pos)),
@@ -249,7 +264,7 @@ function deserializeArrayExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.elements = deserializeVecArrayExpressionElement(pos + 8);
+  node.elements = deserializeVecArrayExpressionElement(pos + 16);
   return node;
 }
 
@@ -364,7 +379,7 @@ function deserializeObjectExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.properties = deserializeVecObjectPropertyKind(pos + 8);
+  node.properties = deserializeVecObjectPropertyKind(pos + 16);
   return node;
 }
 
@@ -384,19 +399,19 @@ 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),
       optional: null,
       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);
   node.optional = false;
   return node;
 }
@@ -522,8 +537,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;
 }
 
@@ -539,19 +554,19 @@ function deserializeTaggedTemplateExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.tag = deserializeExpression(pos + 8);
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
-  node.quasi = deserializeTemplateLiteral(pos + 32);
+  node.tag = deserializeExpression(pos + 16);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
+  node.quasi = deserializeTemplateLiteral(pos + 40);
   return node;
 }
 
 function deserializeTemplateElement(pos) {
-  let tail = deserializeBool(pos + 44),
+  let tail = deserializeBool(pos + 12),
     start = deserializeU32(pos) - 1,
     end = deserializeU32(pos + 4) + 2 - tail,
-    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)),
     ));
@@ -579,14 +594,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;
 }
@@ -598,14 +613,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;
 }
@@ -617,14 +632,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;
 }
@@ -637,14 +652,14 @@ function deserializeCallExpression(pos) {
       callee: null,
       typeArguments: 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.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
-  node.arguments = deserializeVecArgument(pos + 32);
+  node.callee = deserializeExpression(pos + 16);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
+  node.arguments = deserializeVecArgument(pos + 40);
   return node;
 }
 
@@ -660,9 +675,9 @@ function deserializeNewExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.callee = deserializeExpression(pos + 8);
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
-  node.arguments = deserializeVecArgument(pos + 32);
+  node.callee = deserializeExpression(pos + 16);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
+  node.arguments = deserializeVecArgument(pos + 40);
   return node;
 }
 
@@ -677,8 +692,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;
 }
 
@@ -692,7 +707,7 @@ function deserializeSpreadElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -796,14 +811,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;
 }
 
@@ -812,14 +827,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;
 }
@@ -830,14 +845,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;
 }
 
@@ -853,9 +868,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;
 }
 
@@ -865,14 +880,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;
 }
 
@@ -888,9 +903,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;
 }
 
@@ -899,15 +914,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;
 }
 
@@ -974,8 +989,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.decorators = [];
   node.elements = elements;
@@ -996,8 +1011,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.decorators = [];
   node.properties = properties;
@@ -1020,7 +1035,7 @@ function deserializeAssignmentTargetRest(pos) {
       range: [start, end],
     };
   node.decorators = [];
-  node.argument = deserializeAssignmentTarget(pos + 8);
+  node.argument = deserializeAssignmentTarget(pos + 16);
   node.optional = false;
   return node;
 }
@@ -1069,8 +1084,8 @@ function deserializeAssignmentTargetWithDefault(pos) {
       range: [start, end],
     };
   node.decorators = [];
-  node.left = deserializeAssignmentTarget(pos + 8);
-  node.right = deserializeExpression(pos + 24);
+  node.left = deserializeAssignmentTarget(pos + 16);
+  node.right = deserializeExpression(pos + 32);
   node.optional = false;
   return node;
 }
@@ -1102,7 +1117,7 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
       end,
       range: [start, end],
     },
-    key = deserializeIdentifierReference(pos + 8),
+    key = deserializeIdentifierReference(pos + 16),
     keyStart,
     keyEnd,
     value = {
@@ -1115,7 +1130,7 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
       end: (keyEnd = key.end),
       range: [keyStart, keyEnd],
     },
-    init = deserializeOptionExpression(pos + 40);
+    init = deserializeOptionExpression(pos + 48);
   init !== null &&
     (value = {
       type: "AssignmentPattern",
@@ -1148,15 +1163,15 @@ function deserializeAssignmentTargetPropertyProperty(pos) {
       value: null,
       method: null,
       shorthand: null,
-      computed: deserializeBool(pos + 44),
+      computed: deserializeBool(pos + 12),
       optional: null,
       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;
   node.optional = false;
@@ -1173,7 +1188,7 @@ function deserializeSequenceExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expressions = deserializeVecExpression(pos + 8);
+  node.expressions = deserializeVecExpression(pos + 16);
   return node;
 }
 
@@ -1197,7 +1212,7 @@ function deserializeAwaitExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -1211,7 +1226,7 @@ function deserializeChainExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeChainElement(pos + 8);
+  node.expression = deserializeChainElement(pos + 16);
   return node;
 }
 
@@ -1243,7 +1258,7 @@ function deserializeParenthesizedExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-    node.expression = deserializeExpression(pos + 8);
+    node.expression = deserializeExpression(pos + 16);
   }
   return node;
 }
@@ -1327,12 +1342,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;
 }
 
@@ -1340,7 +1355,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],
@@ -1357,7 +1372,7 @@ function deserializeBlockStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecStatement(pos + 8);
+  node.body = deserializeVecStatement(pos + 16);
   return node;
 }
 
@@ -1391,14 +1406,14 @@ function deserializeVariableDeclaration(pos) {
     end,
     node = {
       type: "VariableDeclaration",
-      kind: deserializeVariableDeclarationKind(pos + 36),
+      kind: deserializeVariableDeclarationKind(pos + 12),
       declarations: null,
-      declare: deserializeBool(pos + 37),
+      declare: deserializeBool(pos + 13),
       start: (start = deserializeU32(pos)),
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.declarations = deserializeVecVariableDeclarator(pos + 8);
+  node.declarations = deserializeVecVariableDeclarator(pos + 16);
   return node;
 }
 
@@ -1420,27 +1435,28 @@ function deserializeVariableDeclarationKind(pos) {
 }
 
 function deserializeVariableDeclarator(pos) {
-  let variableDeclarator = {
-    type: "VariableDeclarator",
-    id: null,
-    init: null,
-    definite: false,
-    start: deserializeU32(pos),
-    end: deserializeU32(pos + 4),
-    range: [deserializeU32(pos), deserializeU32(pos + 4)],
-  };
-  variableDeclarator.id = deserializeBindingPattern(pos + 8);
+  let start,
+    end,
+    node = {
+      type: "VariableDeclarator",
+      id: null,
+      init: null,
+      definite: deserializeBool(pos + 13),
+      start: (start = deserializeU32(pos)),
+      end: (end = deserializeU32(pos + 4)),
+      range: [start, end],
+    },
+    pattern = deserializeBindingPattern(pos + 16);
   {
-    let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
-    variableDeclarator.id.typeAnnotation = typeAnnotation;
+    let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32);
     if (typeAnnotation !== null) {
-      variableDeclarator.id.end = typeAnnotation.end;
-      variableDeclarator.id.range[1] = typeAnnotation.end;
+      pattern.typeAnnotation = typeAnnotation;
+      pattern.range[1] = pattern.end = typeAnnotation.end;
     }
-    variableDeclarator.definite = deserializeBool(pos + 53);
   }
-  variableDeclarator.init = deserializeOptionExpression(pos + 32);
-  return variableDeclarator;
+  node.id = pattern;
+  node.init = deserializeOptionExpression(pos + 40);
+  return node;
 }
 
 function deserializeEmptyStatement(pos) {
@@ -1464,7 +1480,7 @@ function deserializeExpressionStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -1480,9 +1496,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;
 }
 
@@ -1497,8 +1513,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;
 }
 
@@ -1513,8 +1529,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;
 }
 
@@ -1531,10 +1547,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;
 }
 
@@ -1645,9 +1661,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;
 }
 
@@ -1693,9 +1709,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;
 }
 
@@ -1709,7 +1725,7 @@ function deserializeContinueStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.label = deserializeOptionLabelIdentifier(pos + 8);
+  node.label = deserializeOptionLabelIdentifier(pos + 16);
   return node;
 }
 
@@ -1723,7 +1739,7 @@ function deserializeBreakStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.label = deserializeOptionLabelIdentifier(pos + 8);
+  node.label = deserializeOptionLabelIdentifier(pos + 16);
   return node;
 }
 
@@ -1737,7 +1753,7 @@ function deserializeReturnStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeOptionExpression(pos + 8);
+  node.argument = deserializeOptionExpression(pos + 16);
   return node;
 }
 
@@ -1752,8 +1768,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;
 }
 
@@ -1768,8 +1784,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;
 }
 
@@ -1784,8 +1800,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;
 }
 
@@ -1800,8 +1816,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;
 }
 
@@ -1815,7 +1831,7 @@ function deserializeThrowStatement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -1831,9 +1847,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;
 }
 
@@ -1848,15 +1864,15 @@ 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) {
-  let pattern = deserializeBindingPattern(pos + 8);
+  let pattern = deserializeBindingPattern(pos + 16);
   {
-    let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
+    let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32);
     pattern.typeAnnotation = typeAnnotation;
     if (typeAnnotation !== null) {
       pattern.end = typeAnnotation.end;
@@ -1906,8 +1922,8 @@ function deserializeAssignmentPattern(pos) {
       range: [start, end],
     };
   node.decorators = [];
-  node.left = deserializeBindingPattern(pos + 8);
-  node.right = deserializeExpression(pos + 24);
+  node.left = deserializeBindingPattern(pos + 16);
+  node.right = deserializeExpression(pos + 32);
   node.optional = false;
   return node;
 }
@@ -1925,8 +1941,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.decorators = [];
   node.properties = properties;
@@ -1943,16 +1959,16 @@ 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),
       optional: null,
       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;
   node.optional = false;
   return node;
@@ -1971,8 +1987,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.decorators = [];
   node.elements = elements;
@@ -1995,7 +2011,7 @@ function deserializeBindingRestElement(pos) {
       range: [start, end],
     };
   node.decorators = [];
-  node.argument = deserializeBindingPattern(pos + 8);
+  node.argument = deserializeBindingPattern(pos + 16);
   node.optional = false;
   return node;
 }
@@ -2018,16 +2034,16 @@ function deserializeFunction(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    params = deserializeBoxFormalParameters(pos + 56);
+    params = deserializeBoxFormalParameters(pos + 64);
   {
-    let thisParam = deserializeOptionBoxTSThisParameter(pos + 48);
+    let thisParam = deserializeOptionBoxTSThisParameter(pos + 56);
     thisParam !== null && params.unshift(thisParam);
   }
-  node.id = deserializeOptionBindingIdentifier(pos + 8);
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 40);
+  node.id = deserializeOptionBindingIdentifier(pos + 16);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 48);
   node.params = params;
-  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 64);
-  node.body = deserializeOptionBoxFunctionBody(pos + 72);
+  node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 72);
+  node.body = deserializeOptionBoxFunctionBody(pos + 80);
   node.expression = false;
   return node;
 }
@@ -2048,9 +2064,9 @@ 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 = {
@@ -2060,12 +2076,12 @@ function deserializeFormalParameters(pos) {
         optional: false,
         typeAnnotation: null,
         value: 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.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 64);
+    rest.argument = deserializeBindingPattern(pos + 56);
+    rest.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 72);
     if (rest.typeAnnotation !== null) {
       end = rest.typeAnnotation.end;
       rest.end = end;
@@ -2078,13 +2094,13 @@ function deserializeFormalParameters(pos) {
 
 function deserializeFormalParameter(pos) {
   let param,
-    hasInitializer = uint32[(pos + 56) >> 2] !== 0 && uint32[(pos + 60) >> 2] !== 0;
+    hasInitializer = uint32[(pos + 64) >> 2] !== 0 && uint32[(pos + 68) >> 2] !== 0;
   {
-    let accessibility = deserializeOptionTSAccessibility(pos + 69),
-      readonly = deserializeBool(pos + 70),
-      override = deserializeBool(pos + 71);
+    let accessibility = deserializeOptionTSAccessibility(pos + 13),
+      readonly = deserializeBool(pos + 14),
+      override = deserializeBool(pos + 15);
     if (accessibility === null && !readonly && !override) {
-      let optional = deserializeBool(pos + 68);
+      let optional = deserializeBool(pos + 12);
       if (hasInitializer) {
         let start, end;
         param = {
@@ -2098,22 +2114,22 @@ function deserializeFormalParameter(pos) {
           end: (end = deserializeU32(pos + 4)),
           range: [start, end],
         };
-        param.decorators = deserializeVecDecorator(pos + 8);
-        param.left = deserializeBindingPattern(pos + 32);
+        param.decorators = deserializeVecDecorator(pos + 16);
+        param.left = deserializeBindingPattern(pos + 40);
         param.left.decorators = [];
         param.left.optional = false;
-        let leftTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+        let leftTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
         param.left.typeAnnotation = leftTypeAnnotation;
         if (leftTypeAnnotation !== null) {
           param.left.end = leftTypeAnnotation.end;
           param.left.range[1] = leftTypeAnnotation.end;
         }
-        param.right = deserializeOptionBoxExpression(pos + 56);
+        param.right = deserializeOptionBoxExpression(pos + 64);
       } else {
-        param = deserializeBindingPattern(pos + 32);
-        param.decorators = deserializeVecDecorator(pos + 8);
+        param = deserializeBindingPattern(pos + 40);
+        param.decorators = deserializeVecDecorator(pos + 16);
         param.optional = optional;
-        let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+        let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
         param.typeAnnotation = typeAnnotation;
         if (typeAnnotation !== null) {
           param.end = typeAnnotation.end;
@@ -2137,10 +2153,10 @@ function deserializeFormalParameter(pos) {
         end: (end = deserializeU32(pos + 4)),
         range: [start, end],
       };
-      param.decorators = deserializeVecDecorator(pos + 8);
+      param.decorators = deserializeVecDecorator(pos + 16);
       if (hasInitializer) {
-        let pattern = deserializeBindingPattern(pos + 32),
-          initializer = deserializeOptionBoxExpression(pos + 56),
+        let pattern = deserializeBindingPattern(pos + 40),
+          initializer = deserializeOptionBoxExpression(pos + 64),
           assignStart,
           assignEnd,
           assignParam = {
@@ -2157,7 +2173,7 @@ function deserializeFormalParameter(pos) {
         assignParam.left = pattern;
         pattern.decorators = [];
         pattern.optional = false;
-        let patternTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+        let patternTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
         pattern.typeAnnotation = patternTypeAnnotation;
         if (patternTypeAnnotation !== null) {
           pattern.end = patternTypeAnnotation.end;
@@ -2166,11 +2182,11 @@ function deserializeFormalParameter(pos) {
         assignParam.right = initializer;
         param.parameter = assignParam;
       } else {
-        param.parameter = deserializeBindingPattern(pos + 32);
+        param.parameter = deserializeBindingPattern(pos + 40);
         param.parameter.decorators = [];
-        let paramOptional = deserializeBool(pos + 68);
+        let paramOptional = deserializeBool(pos + 12);
         param.parameter.optional = paramOptional;
-        let paramTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+        let paramTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
         param.parameter.typeAnnotation = paramTypeAnnotation;
         if (paramTypeAnnotation !== null) {
           param.parameter.end = paramTypeAnnotation.end;
@@ -2196,8 +2212,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;
 }
@@ -2220,11 +2236,11 @@ 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.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);
   node.body = body;
   node.generator = false;
   return node;
@@ -2235,13 +2251,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;
 }
 
@@ -2263,13 +2279,13 @@ function deserializeClass(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.decorators = deserializeVecDecorator(pos + 8);
-  node.id = deserializeOptionBindingIdentifier(pos + 32);
-  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 64);
-  node.superClass = deserializeOptionExpression(pos + 72);
-  node.superTypeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 88);
-  node.implements = deserializeVecTSClassImplements(pos + 96);
-  node.body = deserializeBoxClassBody(pos + 120);
+  node.decorators = deserializeVecDecorator(pos + 16);
+  node.id = deserializeOptionBindingIdentifier(pos + 40);
+  node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 72);
+  node.superClass = deserializeOptionExpression(pos + 80);
+  node.superTypeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 96);
+  node.implements = deserializeVecTSClassImplements(pos + 104);
+  node.body = deserializeBoxClassBody(pos + 128);
   return node;
 }
 
@@ -2294,7 +2310,7 @@ function deserializeClassBody(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecClassElement(pos + 8);
+  node.body = deserializeVecClassElement(pos + 16);
   return node;
 }
 
@@ -2319,13 +2335,13 @@ 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),
       override: deserializeBool(pos + 64),
       optional: deserializeBool(pos + 65),
       accessibility: deserializeOptionTSAccessibility(pos + 66),
@@ -2333,9 +2349,9 @@ function deserializeMethodDefinition(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;
 }
 
@@ -2354,14 +2370,14 @@ function deserializePropertyDefinition(pos) {
   let start,
     end,
     node = {
-      type: deserializePropertyDefinitionType(pos + 76),
+      type: deserializePropertyDefinitionType(pos + 12),
       decorators: null,
       key: null,
       typeAnnotation: null,
       value: null,
-      computed: deserializeBool(pos + 77),
-      static: deserializeBool(pos + 78),
-      declare: deserializeBool(pos + 79),
+      computed: deserializeBool(pos + 13),
+      static: deserializeBool(pos + 14),
+      declare: deserializeBool(pos + 15),
       override: deserializeBool(pos + 80),
       optional: deserializeBool(pos + 81),
       definite: deserializeBool(pos + 82),
@@ -2371,10 +2387,10 @@ function deserializePropertyDefinition(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.decorators = deserializeVecDecorator(pos + 8);
-  node.key = deserializePropertyKey(pos + 32);
-  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
-  node.value = deserializeOptionExpression(pos + 56);
+  node.decorators = deserializeVecDecorator(pos + 16);
+  node.key = deserializePropertyKey(pos + 40);
+  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
+  node.value = deserializeOptionExpression(pos + 64);
   return node;
 }
 
@@ -2408,7 +2424,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],
@@ -2425,7 +2441,7 @@ function deserializeStaticBlock(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecStatement(pos + 8);
+  node.body = deserializeVecStatement(pos + 16);
   return node;
 }
 
@@ -2444,14 +2460,14 @@ function deserializeAccessorProperty(pos) {
   let start,
     end,
     node = {
-      type: deserializeAccessorPropertyType(pos + 76),
+      type: deserializeAccessorPropertyType(pos + 12),
       decorators: null,
       key: null,
       typeAnnotation: null,
       value: null,
-      computed: deserializeBool(pos + 77),
-      static: deserializeBool(pos + 78),
-      override: deserializeBool(pos + 79),
+      computed: deserializeBool(pos + 13),
+      static: deserializeBool(pos + 14),
+      override: deserializeBool(pos + 15),
       definite: deserializeBool(pos + 80),
       accessibility: deserializeOptionTSAccessibility(pos + 81),
       declare: null,
@@ -2461,10 +2477,10 @@ function deserializeAccessorProperty(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.decorators = deserializeVecDecorator(pos + 8);
-  node.key = deserializePropertyKey(pos + 32);
-  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
-  node.value = deserializeOptionExpression(pos + 56);
+  node.decorators = deserializeVecDecorator(pos + 16);
+  node.key = deserializePropertyKey(pos + 40);
+  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
+  node.value = deserializeOptionExpression(pos + 64);
   node.declare = false;
   node.optional = false;
   node.readonly = false;
@@ -2478,13 +2494,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;
 }
 
@@ -2495,18 +2511,18 @@ function deserializeImportDeclaration(pos) {
       type: "ImportDeclaration",
       specifiers: null,
       source: null,
-      phase: deserializeOptionImportPhase(pos + 92),
+      phase: deserializeOptionImportPhase(pos + 12),
       attributes: null,
-      importKind: deserializeImportOrExportKind(pos + 93),
+      importKind: deserializeImportOrExportKind(pos + 13),
       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;
 }
@@ -2542,13 +2558,13 @@ function deserializeImportSpecifier(pos) {
       type: "ImportSpecifier",
       imported: null,
       local: null,
-      importKind: deserializeImportOrExportKind(pos + 100),
+      importKind: deserializeImportOrExportKind(pos + 12),
       start: (start = deserializeU32(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;
 }
 
@@ -2562,7 +2578,7 @@ function deserializeImportDefaultSpecifier(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.local = deserializeBindingIdentifier(pos + 8);
+  node.local = deserializeBindingIdentifier(pos + 16);
   return node;
 }
 
@@ -2576,18 +2592,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) {
@@ -2601,8 +2611,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;
 }
 
@@ -2625,16 +2635,16 @@ function deserializeExportNamedDeclaration(pos) {
       declaration: null,
       specifiers: null,
       source: null,
-      exportKind: deserializeImportOrExportKind(pos + 108),
+      exportKind: deserializeImportOrExportKind(pos + 12),
       attributes: null,
       start: (start = deserializeU32(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;
 }
@@ -2650,7 +2660,7 @@ function deserializeExportDefaultDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.declaration = deserializeExportDefaultDeclarationKind(pos + 8);
+  node.declaration = deserializeExportDefaultDeclarationKind(pos + 16);
   node.exportKind = "value";
   return node;
 }
@@ -2663,14 +2673,14 @@ function deserializeExportAllDeclaration(pos) {
       exported: null,
       source: null,
       attributes: null,
-      exportKind: deserializeImportOrExportKind(pos + 124),
+      exportKind: deserializeImportOrExportKind(pos + 12),
       start: (start = deserializeU32(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;
 }
@@ -2682,13 +2692,13 @@ function deserializeExportSpecifier(pos) {
       type: "ExportSpecifier",
       local: null,
       exported: null,
-      exportKind: deserializeImportOrExportKind(pos + 124),
+      exportKind: deserializeImportOrExportKind(pos + 12),
       start: (start = deserializeU32(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;
 }
 
@@ -2815,8 +2825,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;
 }
 
@@ -2852,66 +2862,79 @@ function deserializeNullLiteral(pos) {
 }
 
 function deserializeNumericLiteral(pos) {
-  let start, end;
+  let start = deserializeU32(pos),
+    end = deserializeU32(pos + 4);
   return {
     type: "Literal",
-    value: deserializeF64(pos + 8),
-    raw: deserializeOptionStr(pos + 16),
-    start: (start = deserializeU32(pos)),
-    end: (end = deserializeU32(pos + 4)),
+    value: deserializeF64(pos + 32),
+    raw:
+      uint32[(pos + 16) >> 2] === 0 && uint32[(pos + 20) >> 2] === 0
+        ? null
+        : sourceText.slice(start, end),
+    start,
+    end,
     range: [start, end],
   };
 }
 
 function deserializeStringLiteral(pos) {
-  let start,
-    end,
+  let start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
     node = {
       type: "Literal",
       value: null,
-      raw: deserializeOptionStr(pos + 24),
-      start: (start = deserializeU32(pos)),
-      end: (end = deserializeU32(pos + 4)),
+      raw:
+        uint32[(pos + 32) >> 2] === 0 && uint32[(pos + 36) >> 2] === 0
+          ? null
+          : sourceText.slice(start, end),
+      start,
+      end,
       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;
 }
 
 function deserializeBigIntLiteral(pos) {
-  let start,
-    end,
+  let start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
     node = {
       type: "Literal",
       value: null,
-      raw: deserializeOptionStr(pos + 24),
+      raw:
+        uint32[(pos + 32) >> 2] === 0 && uint32[(pos + 36) >> 2] === 0
+          ? null
+          : sourceText.slice(start, end),
       bigint: null,
-      start: (start = deserializeU32(pos)),
-      end: (end = deserializeU32(pos + 4)),
+      start,
+      end,
       range: [start, end],
     },
-    bigint = deserializeStr(pos + 8);
+    bigint = deserializeStr(pos + 16);
   node.value = BigInt(bigint);
   node.bigint = bigint;
   return node;
 }
 
 function deserializeRegExpLiteral(pos) {
-  let start,
-    end,
+  let start = deserializeU32(pos),
+    end = deserializeU32(pos + 4),
     node = {
       type: "Literal",
       value: null,
-      raw: deserializeOptionStr(pos + 40),
+      raw:
+        uint32[(pos + 48) >> 2] === 0 && uint32[(pos + 52) >> 2] === 0
+          ? null
+          : sourceText.slice(start, end),
       regex: null,
-      start: (start = deserializeU32(pos)),
-      end: (end = deserializeU32(pos + 4)),
+      start,
+      end,
       range: [start, end],
     },
-    regex = deserializeRegExp(pos + 8),
+    regex = deserializeRegExp(pos + 16),
     value = null;
   try {
     value = new RegExp(regex.pattern, regex.flags);
@@ -2955,11 +2978,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;
 }
@@ -2977,9 +3000,9 @@ function deserializeJSXOpeningElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.name = deserializeJSXElementName(pos + 8);
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
-  node.attributes = deserializeVecJSXAttributeItem(pos + 32);
+  node.name = deserializeJSXElementName(pos + 16);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
+  node.attributes = deserializeVecJSXAttributeItem(pos + 40);
   node.selfClosing = false;
   return node;
 }
@@ -2994,7 +3017,7 @@ function deserializeJSXClosingElement(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.name = deserializeJSXElementName(pos + 8);
+  node.name = deserializeJSXElementName(pos + 16);
   return node;
 }
 
@@ -3010,9 +3033,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;
 }
 
@@ -3078,8 +3101,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;
 }
 
@@ -3094,8 +3117,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;
 }
 
@@ -3136,7 +3159,7 @@ function deserializeJSXExpressionContainer(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeJSXExpression(pos + 8);
+  node.expression = deserializeJSXExpression(pos + 16);
   return node;
 }
 
@@ -3267,8 +3290,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;
 }
 
@@ -3282,7 +3305,7 @@ function deserializeJSXSpreadAttribute(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.argument = deserializeExpression(pos + 8);
+  node.argument = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -3316,7 +3339,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],
@@ -3350,18 +3373,22 @@ function deserializeJSXSpreadChild(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
 function deserializeJSXText(pos) {
-  let start, end;
+  let start = deserializeU32(pos),
+    end = deserializeU32(pos + 4);
   return {
     type: "JSXText",
-    value: deserializeStr(pos + 8),
-    raw: deserializeOptionStr(pos + 24),
-    start: (start = deserializeU32(pos)),
-    end: (end = deserializeU32(pos + 4)),
+    value: deserializeStr(pos + 16),
+    raw:
+      uint32[(pos + 32) >> 2] === 0 && uint32[(pos + 36) >> 2] === 0
+        ? null
+        : sourceText.slice(start, end),
+    start,
+    end,
     range: [start, end],
   };
 }
@@ -3382,7 +3409,7 @@ function deserializeTSThisParameter(pos) {
   node.decorators = [];
   node.name = "this";
   node.optional = false;
-  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 16);
+  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
   return node;
 }
 
@@ -3393,14 +3420,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;
 }
 
@@ -3414,7 +3441,7 @@ function deserializeTSEnumBody(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.members = deserializeVecTSEnumMember(pos + 8);
+  node.members = deserializeVecTSEnumMember(pos + 16);
   return node;
 }
 
@@ -3430,9 +3457,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;
 }
 
@@ -3461,7 +3488,7 @@ function deserializeTSTypeAnnotation(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3475,7 +3502,7 @@ function deserializeTSLiteralType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.literal = deserializeTSLiteral(pos + 8);
+  node.literal = deserializeTSLiteral(pos + 16);
   return node;
 }
 
@@ -3592,10 +3619,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;
 }
 
@@ -3609,7 +3636,7 @@ function deserializeTSUnionType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.types = deserializeVecTSType(pos + 8);
+  node.types = deserializeVecTSType(pos + 16);
   return node;
 }
 
@@ -3623,7 +3650,7 @@ function deserializeTSIntersectionType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.types = deserializeVecTSType(pos + 8);
+  node.types = deserializeVecTSType(pos + 16);
   return node;
 }
 
@@ -3638,7 +3665,7 @@ function deserializeTSParenthesizedType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-    node.typeAnnotation = deserializeTSType(pos + 8);
+    node.typeAnnotation = deserializeTSType(pos + 16);
   }
   return node;
 }
@@ -3648,13 +3675,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;
 }
 
@@ -3681,7 +3708,7 @@ function deserializeTSArrayType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.elementType = deserializeTSType(pos + 8);
+  node.elementType = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3696,8 +3723,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;
 }
 
@@ -3711,7 +3738,7 @@ function deserializeTSTupleType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.elementTypes = deserializeVecTSTupleElement(pos + 8);
+  node.elementTypes = deserializeVecTSTupleElement(pos + 16);
   return node;
 }
 
@@ -3722,13 +3749,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;
 }
 
@@ -3742,7 +3769,7 @@ function deserializeTSOptionalType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3756,7 +3783,7 @@ function deserializeTSRestType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeAnnotation = deserializeTSType(pos + 8);
+  node.typeAnnotation = deserializeTSType(pos + 16);
   return node;
 }
 
@@ -3996,8 +4023,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;
 }
 
@@ -4025,8 +4052,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;
 }
 
@@ -4040,7 +4067,7 @@ function deserializeTSTypeParameterInstantiation(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.params = deserializeVecTSType(pos + 8);
+  node.params = deserializeVecTSType(pos + 16);
   return node;
 }
 
@@ -4052,16 +4079,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;
 }
 
@@ -4075,7 +4102,7 @@ function deserializeTSTypeParameterDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.params = deserializeVecTSTypeParameter(pos + 8);
+  node.params = deserializeVecTSTypeParameter(pos + 16);
   return node;
 }
 
@@ -4092,9 +4119,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;
 }
 
@@ -4122,7 +4149,7 @@ function deserializeTSClassImplements(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     },
-    expression = deserializeTSTypeName(pos + 8);
+    expression = deserializeTSTypeName(pos + 16);
   if (expression.type === "TSQualifiedName") {
     let object = expression.left,
       { right } = expression,
@@ -4154,7 +4181,7 @@ function deserializeTSClassImplements(pos) {
     }
   }
   node.expression = expression;
-  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24);
+  node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32);
   return node;
 }
 
@@ -4172,10 +4199,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;
 }
 
@@ -4189,7 +4216,7 @@ function deserializeTSInterfaceBody(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.body = deserializeVecTSSignature(pos + 8);
+  node.body = deserializeVecTSSignature(pos + 16);
   return node;
 }
 
@@ -4198,9 +4225,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,
@@ -4209,8 +4236,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;
 }
@@ -4239,15 +4266,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;
 }
 
@@ -4263,12 +4290,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;
 }
 
@@ -4304,13 +4331,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;
@@ -4328,9 +4355,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;
 }
 
@@ -4340,7 +4367,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)),
@@ -4349,7 +4376,7 @@ function deserializeTSIndexSignatureName(pos) {
     };
   node.decorators = [];
   node.optional = false;
-  node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 24);
+  node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 32);
   return node;
 }
 
@@ -4364,8 +4391,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;
 }
 
@@ -4375,14 +4402,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;
 }
 
@@ -4403,7 +4430,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",
@@ -4415,7 +4442,7 @@ function deserializeTSModuleDeclaration(pos) {
       end,
       range: [start, end],
     };
-    node.id = deserializeTSModuleDeclarationName(pos + 8);
+    node.id = deserializeTSModuleDeclarationName(pos + 16);
   } else {
     node = {
       type: "TSModuleDeclaration",
@@ -4428,7 +4455,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;
@@ -4527,11 +4554,11 @@ function deserializeTSGlobalDeclaration(pos) {
     name: "global",
     optional: false,
     typeAnnotation: null,
-    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;
@@ -4547,8 +4574,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;
 }
@@ -4563,7 +4590,7 @@ function deserializeTSTypeLiteral(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.members = deserializeVecTSSignature(pos + 8);
+  node.members = deserializeVecTSSignature(pos + 16);
   return node;
 }
 
@@ -4577,7 +4604,7 @@ function deserializeTSInferType(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.typeParameter = deserializeBoxTSTypeParameter(pos + 8);
+  node.typeParameter = deserializeBoxTSTypeParameter(pos + 16);
   return node;
 }
 
@@ -4592,8 +4619,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;
 }
 
@@ -4625,10 +4652,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;
 }
 
@@ -4654,8 +4681,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;
 }
 
@@ -4671,12 +4698,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;
 }
 
@@ -4693,9 +4720,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;
 }
 
@@ -4716,10 +4743,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;
 }
@@ -4748,8 +4775,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;
 }
 
@@ -4764,8 +4791,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;
 }
 
@@ -4780,8 +4807,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;
 }
 
@@ -4796,8 +4823,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;
 }
 
@@ -4808,13 +4835,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;
 }
 
@@ -4841,7 +4868,7 @@ function deserializeTSExternalModuleReference(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeStringLiteral(pos + 8);
+  node.expression = deserializeStringLiteral(pos + 16);
   return node;
 }
 
@@ -4855,7 +4882,7 @@ function deserializeTSNonNullExpression(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -4869,7 +4896,7 @@ function deserializeDecorator(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -4883,7 +4910,7 @@ function deserializeTSExportAssignment(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.expression = deserializeExpression(pos + 8);
+  node.expression = deserializeExpression(pos + 16);
   return node;
 }
 
@@ -4897,7 +4924,7 @@ function deserializeTSNamespaceExportDeclaration(pos) {
       end: (end = deserializeU32(pos + 4)),
       range: [start, end],
     };
-  node.id = deserializeIdentifierName(pos + 8);
+  node.id = deserializeIdentifierName(pos + 16);
   return node;
 }
 
@@ -4912,8 +4939,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;
 }
 
@@ -4934,12 +4961,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;
 }
 
@@ -4949,12 +4976,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;
 }
 
@@ -4994,6 +5021,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 {
@@ -5310,26 +5357,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),
@@ -5403,36 +5430,32 @@ 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];
   if (len === 0) return "";
   pos = uint32[pos32];
-  if (sourceIsAscii && pos < sourceEndPos) return sourceText.substr(pos, len);
-  // Longer strings use `TextDecoder`
-  // TODO: Find best switch-over point
   let end = pos + len;
-  if (len > 50) return decodeStr(uint8.subarray(pos, end));
-  // Shorter strings decode by hand to avoid native call
-  let out = "",
-    c;
-  do {
-    c = uint8[pos++];
-    if (c < 128) out += fromCodePoint(c);
-    else {
-      out += decodeStr(uint8.subarray(pos - 1, end));
-      break;
-    }
-  } while (pos < end);
-  return out;
+  if (end <= firstNonAsciiPos) return sourceTextLatin.substr(pos, len);
+  // Use `utf8Slice` for strings longer than 64 bytes
+  if (len > 64) return utf8Slice.call(uint8, pos, end);
+  if (pos < sourceEndPos) {
+    // Check if all bytes are ASCII, use `utf8Slice` if not
+    for (let i = pos; i < end; i++) if (uint8[i] >= 128) return utf8Slice.call(uint8, pos, end);
+    // String is all ASCII, so slice from `sourceTextLatin`
+    return sourceTextLatin.substr(pos, len);
+  }
+  // String is not in source region - use `fromCharCode.apply` with a temp array of correct length.
+  // Copy bytes into temp array.
+  // If any byte is non-ASCII, use `utf8Slice`.
+  let arr = stringDecodeArrays[len];
+  for (let i = 0; i < len; i++) {
+    let b = uint8[pos + i];
+    if (b >= 128) return utf8Slice.call(uint8, pos, end);
+    arr[i] = b;
+  }
+  // Call `fromCharCode` with temp array
+  return fromCharCode.apply(null, arr);
 }
 
 function deserializeVecComment(pos) {
@@ -5448,8 +5471,9 @@ function deserializeVecComment(pos) {
 }
 
 function deserializeOptionHashbang(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
-  return deserializeHashbang(pos);
+  return uint32[(pos + 16) >> 2] === 0 && uint32[(pos + 20) >> 2] === 0
+    ? null
+    : deserializeHashbang(pos);
 }
 
 function deserializeVecDirective(pos) {
@@ -5709,13 +5733,13 @@ function deserializeBoxTSTypeParameterInstantiation(pos) {
 }
 
 function deserializeOptionBoxTSTypeParameterInstantiation(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxTSTypeParameterInstantiation(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxTSTypeParameterInstantiation(pos);
 }
 
 function deserializeOptionStr(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeStr(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0 ? null : deserializeStr(pos);
 }
 
 function deserializeBoxComputedMemberExpression(pos) {
@@ -5751,8 +5775,7 @@ function deserializeBoxObjectAssignmentTarget(pos) {
 }
 
 function deserializeOptionAssignmentTargetMaybeDefault(pos) {
-  if (uint8[pos] === 51) return null;
-  return deserializeAssignmentTargetMaybeDefault(pos);
+  return uint8[pos] === 51 ? null : deserializeAssignmentTargetMaybeDefault(pos);
 }
 
 function deserializeVecOptionAssignmentTargetMaybeDefault(pos) {
@@ -5772,8 +5795,9 @@ function deserializeBoxAssignmentTargetRest(pos) {
 }
 
 function deserializeOptionBoxAssignmentTargetRest(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxAssignmentTargetRest(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxAssignmentTargetRest(pos);
 }
 
 function deserializeVecAssignmentTargetProperty(pos) {
@@ -5801,8 +5825,7 @@ function deserializeBoxAssignmentTargetPropertyProperty(pos) {
 }
 
 function deserializeOptionExpression(pos) {
-  if (uint8[pos] === 51) return null;
-  return deserializeExpression(pos);
+  return uint8[pos] === 51 ? null : deserializeExpression(pos);
 }
 
 function deserializeBoxBlockStatement(pos) {
@@ -5922,23 +5945,23 @@ function deserializeBoxTSTypeAnnotation(pos) {
 }
 
 function deserializeOptionBoxTSTypeAnnotation(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxTSTypeAnnotation(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxTSTypeAnnotation(pos);
 }
 
 function deserializeOptionStatement(pos) {
-  if (uint8[pos] === 70) return null;
-  return deserializeStatement(pos);
+  return uint8[pos] === 70 ? null : deserializeStatement(pos);
 }
 
 function deserializeOptionForStatementInit(pos) {
-  if (uint8[pos] === 65) return null;
-  return deserializeForStatementInit(pos);
+  return uint8[pos] === 65 ? null : deserializeForStatementInit(pos);
 }
 
 function deserializeOptionLabelIdentifier(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
-  return deserializeLabelIdentifier(pos);
+  return uint32[(pos + 16) >> 2] === 0 && uint32[(pos + 20) >> 2] === 0
+    ? null
+    : deserializeLabelIdentifier(pos);
 }
 
 function deserializeVecSwitchCase(pos) {
@@ -5958,18 +5981,19 @@ function deserializeBoxCatchClause(pos) {
 }
 
 function deserializeOptionBoxCatchClause(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxCatchClause(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxCatchClause(pos);
 }
 
 function deserializeOptionBoxBlockStatement(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxBlockStatement(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxBlockStatement(pos);
 }
 
 function deserializeOptionCatchParameter(pos) {
-  if (uint8[pos + 8] === 4) return null;
-  return deserializeCatchParameter(pos);
+  return uint8[pos + 16] === 4 ? null : deserializeCatchParameter(pos);
 }
 
 function deserializeBoxBindingIdentifier(pos) {
@@ -6005,13 +6029,13 @@ function deserializeBoxBindingRestElement(pos) {
 }
 
 function deserializeOptionBoxBindingRestElement(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxBindingRestElement(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxBindingRestElement(pos);
 }
 
 function deserializeOptionBindingPattern(pos) {
-  if (uint8[pos] === 4) return null;
-  return deserializeBindingPattern(pos);
+  return uint8[pos] === 4 ? null : deserializeBindingPattern(pos);
 }
 
 function deserializeVecOptionBindingPattern(pos) {
@@ -6027,8 +6051,9 @@ function deserializeVecOptionBindingPattern(pos) {
 }
 
 function deserializeOptionBindingIdentifier(pos) {
-  if (uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0) return null;
-  return deserializeBindingIdentifier(pos);
+  return uint32[(pos + 16) >> 2] === 0 && uint32[(pos + 20) >> 2] === 0
+    ? null
+    : deserializeBindingIdentifier(pos);
 }
 
 function deserializeBoxTSTypeParameterDeclaration(pos) {
@@ -6036,8 +6061,9 @@ function deserializeBoxTSTypeParameterDeclaration(pos) {
 }
 
 function deserializeOptionBoxTSTypeParameterDeclaration(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxTSTypeParameterDeclaration(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxTSTypeParameterDeclaration(pos);
 }
 
 function deserializeBoxTSThisParameter(pos) {
@@ -6045,8 +6071,9 @@ function deserializeBoxTSThisParameter(pos) {
 }
 
 function deserializeOptionBoxTSThisParameter(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxTSThisParameter(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxTSThisParameter(pos);
 }
 
 function deserializeBoxFormalParameters(pos) {
@@ -6058,8 +6085,9 @@ function deserializeBoxFunctionBody(pos) {
 }
 
 function deserializeOptionBoxFunctionBody(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxFunctionBody(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxFunctionBody(pos);
 }
 
 function deserializeVecFormalParameter(pos) {
@@ -6091,13 +6119,13 @@ function deserializeBoxExpression(pos) {
 }
 
 function deserializeOptionBoxExpression(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxExpression(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxExpression(pos);
 }
 
 function deserializeOptionTSAccessibility(pos) {
-  if (uint8[pos] === 3) return null;
-  return deserializeTSAccessibility(pos);
+  return uint8[pos] === 3 ? null : deserializeTSAccessibility(pos);
 }
 
 function deserializeVecTSClassImplements(pos) {
@@ -6173,8 +6201,7 @@ function deserializeBoxTSNamespaceExportDeclaration(pos) {
 }
 
 function deserializeOptionImportPhase(pos) {
-  if (uint8[pos] === 2) return null;
-  return deserializeImportPhase(pos);
+  return uint8[pos] === 2 ? null : deserializeImportPhase(pos);
 }
 
 function deserializeVecImportDeclarationSpecifier(pos) {
@@ -6190,8 +6217,9 @@ function deserializeVecImportDeclarationSpecifier(pos) {
 }
 
 function deserializeOptionVecImportDeclarationSpecifier(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeVecImportDeclarationSpecifier(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeVecImportDeclarationSpecifier(pos);
 }
 
 function deserializeBoxWithClause(pos) {
@@ -6199,8 +6227,9 @@ function deserializeBoxWithClause(pos) {
 }
 
 function deserializeOptionBoxWithClause(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxWithClause(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxWithClause(pos);
 }
 
 function deserializeBoxImportSpecifier(pos) {
@@ -6228,8 +6257,7 @@ function deserializeVecImportAttribute(pos) {
 }
 
 function deserializeOptionDeclaration(pos) {
-  if (uint8[pos] === 31) return null;
-  return deserializeDeclaration(pos);
+  return uint8[pos] === 31 ? null : deserializeDeclaration(pos);
 }
 
 function deserializeVecExportSpecifier(pos) {
@@ -6245,19 +6273,21 @@ function deserializeVecExportSpecifier(pos) {
 }
 
 function deserializeOptionStringLiteral(pos) {
-  if (uint8[pos + 44] === 2) return null;
-  return deserializeStringLiteral(pos);
+  return uint8[pos + 12] === 2 ? null : deserializeStringLiteral(pos);
 }
 
 function deserializeOptionModuleExportName(pos) {
-  if (uint8[pos] === 3) return null;
-  return deserializeModuleExportName(pos);
+  return uint8[pos] === 3 ? null : deserializeModuleExportName(pos);
 }
 
 function deserializeF64(pos) {
   return float64[pos >> 3];
 }
 
+function deserializeU8(pos) {
+  return uint8[pos];
+}
+
 function deserializeBoxJSXOpeningElement(pos) {
   return deserializeJSXOpeningElement(uint32[pos >> 2]);
 }
@@ -6279,8 +6309,9 @@ function deserializeBoxJSXClosingElement(pos) {
 }
 
 function deserializeOptionBoxJSXClosingElement(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxJSXClosingElement(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxJSXClosingElement(pos);
 }
 
 function deserializeVecJSXAttributeItem(pos) {
@@ -6316,8 +6347,7 @@ function deserializeBoxJSXSpreadAttribute(pos) {
 }
 
 function deserializeOptionJSXAttributeValue(pos) {
-  if (uint8[pos] === 4) return null;
-  return deserializeJSXAttributeValue(pos);
+  return uint8[pos] === 4 ? null : deserializeJSXAttributeValue(pos);
 }
 
 function deserializeBoxJSXExpressionContainer(pos) {
@@ -6529,8 +6559,7 @@ function deserializeBoxTSQualifiedName(pos) {
 }
 
 function deserializeOptionTSType(pos) {
-  if (uint8[pos] === 38) return null;
-  return deserializeTSType(pos);
+  return uint8[pos] === 38 ? null : deserializeTSType(pos);
 }
 
 function deserializeVecTSTypeParameter(pos) {
@@ -6602,8 +6631,7 @@ function deserializeVecTSIndexSignatureName(pos) {
 }
 
 function deserializeOptionTSModuleDeclarationBody(pos) {
-  if (uint8[pos] === 2) return null;
-  return deserializeTSModuleDeclarationBody(pos);
+  return uint8[pos] === 2 ? null : deserializeTSModuleDeclarationBody(pos);
 }
 
 function deserializeBoxTSModuleBlock(pos) {
@@ -6615,13 +6643,13 @@ function deserializeBoxTSTypeParameter(pos) {
 }
 
 function deserializeOptionBoxObjectExpression(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxObjectExpression(pos);
+  return uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0
+    ? null
+    : deserializeBoxObjectExpression(pos);
 }
 
 function deserializeOptionTSImportTypeQualifier(pos) {
-  if (uint8[pos] === 2) return null;
-  return deserializeTSImportTypeQualifier(pos);
+  return uint8[pos] === 2 ? null : deserializeTSImportTypeQualifier(pos);
 }
 
 function deserializeBoxTSImportTypeQualifiedName(pos) {
@@ -6629,17 +6657,21 @@ function deserializeBoxTSImportTypeQualifiedName(pos) {
 }
 
 function deserializeOptionTSMappedTypeModifierOperator(pos) {
-  if (uint8[pos] === 3) return null;
-  return deserializeTSMappedTypeModifierOperator(pos);
+  return uint8[pos] === 3 ? null : deserializeTSMappedTypeModifierOperator(pos);
 }
 
 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);
+  return uint32[(pos + 8) >> 2] === 0 && uint32[(pos + 12) >> 2] === 0
+    ? null
+    : deserializeNameSpan(pos);
 }
 
 function deserializeVecError(pos) {