oxlint 1.56.0 → 1.57.0

package/dist/lint.js

@@ -330,7 +330,8 @@ var keys_default = freeze({
 });
 //#endregion
 //#region src-js/plugins/location.ts
-const LINE_BREAK_PATTERN = /\r\n|[\r\n\u2028\u2029]/gu, lines = [], lineStartIndices = [0];
+const LINE_BREAK_PATTERN = /\r\n|[\r\n\u2028\u2029]/gu, lines = [], lineStartIndices = [0], cachedLocations = [];
+let activeLocationsCount = 0;
 /**
 * Split source text into lines.
 */
@@ -342,9 +343,10 @@ function initLines() {
 }
 /**
 * Reset lines after file has been linted, to free memory.
+* Reset `Location` object pool.
 */
-function resetLines() {
-	lines.length = 0, lineStartIndices.length = 1;
+function resetLinesAndLocs() {
+	lines.length = 0, lineStartIndices.length = 1, activeLocationsCount = 0;
 }
 /**
 * Convert a source text index into a (line, column) pair.
@@ -355,20 +357,9 @@ function resetLines() {
 function getLineColumnFromOffset(offset) {
 	if (typeof offset != "number" || offset < 0 || (offset | 0) !== offset) throw TypeError("Expected `offset` to be a non-negative integer.");
 	if (lines.length === 0 && initLines(), offset > sourceText.length) throw RangeError(`Index out of range (requested index ${offset}, but source text has length ${sourceText.length}).`);
-	return getLineColumnFromOffsetUnchecked(offset);
-}
-/**
-* Convert a source text index into a (line, column) pair without:
-* 1. Checking type of `offset`, or that it's in range.
-* 2. Initializing `lineStartIndices`. Caller must do that before calling this method.
-*
-* @param offset - The index of a character in a file.
-* @returns `{line, column}` location object with 1-indexed line and 0-indexed column.
-*/
-function getLineColumnFromOffsetUnchecked(offset) {
 	let low = 0, high = lineStartIndices.length, mid;
 	do
-		mid = (low + high) / 2 | 0, offset < lineStartIndices[mid] ? high = mid : low = mid + 1;
+		mid = low + high >>> 1, offset < lineStartIndices[mid] ? high = mid : low = mid + 1;
 	while (low < high);
 	return {
 		line: low,
@@ -431,15 +422,18 @@ function getLoc$1(nodeOrToken) {
 */
 function getNodeLoc(node) {
 	let loc = computeLoc(node.start, node.end);
-	return ObjectDefineProperty(node, "loc", {
-		value: loc,
-		writable: !0
-	}), loc;
+	return LOC_DESCRIPTOR.value = loc, ObjectDefineProperty(node, "loc", LOC_DESCRIPTOR), loc;
 }
+const LOC_DESCRIPTOR = {
+	value: null,
+	writable: !0,
+	enumerable: !1,
+	configurable: !1
+};
 /**
 * Compute a `Location` from `start` and `end` source offsets.
 *
-* Pure computation - does not cache the result.
+* Returns a recycled `Location` object from the pool when possible, allocating only during warmup.
 * Initializes `lines` and `lineStartIndices` tables if they haven't been already.
 *
 * @param start - Start offset
@@ -447,10 +441,31 @@ function getNodeLoc(node) {
 * @returns Location
 */
 function computeLoc(start, end) {
-	return lines.length === 0 && initLines(), {
-		start: getLineColumnFromOffsetUnchecked(start),
-		end: getLineColumnFromOffsetUnchecked(end)
-	};
+	lines.length === 0 && initLines();
+	let loc;
+	activeLocationsCount < cachedLocations.length ? loc = cachedLocations[activeLocationsCount] : cachedLocations.push(loc = {
+		start: {
+			line: 0,
+			column: 0
+		},
+		end: {
+			line: 0,
+			column: 0
+		}
+	}), activeLocationsCount++;
+	let linesLen = lineStartIndices.length, line = 0, high = linesLen, mid;
+	do
+		mid = line + high >>> 1, start < lineStartIndices[mid] ? high = mid : line = mid + 1;
+	while (line < high);
+	let lineStart = lineStartIndices[line - 1], locStart = loc.start;
+	locStart.line = line, locStart.column = start - lineStart;
+	let locEnd = loc.end;
+	if (line === linesLen || end < lineStartIndices[line]) locEnd.line = line, locEnd.column = end - lineStart;
+	else {
+		for (line++, high = linesLen; line < high;) mid = line + high >>> 1, end < lineStartIndices[mid] ? high = mid : line = mid + 1;
+		locEnd.line = line, locEnd.column = end - lineStartIndices[line - 1];
+	}
+	return loc;
 }
 /**
 * Get the deepest node containing a range index.
@@ -487,75 +502,17 @@ function traverse(node) {
 	return node;
 }
 //#endregion
-//#region src-js/plugins/comments.ts
-let comments = null;
-const cachedComments = [];
-let previousComments = [];
-const commentsWithLoc = [], emptyComments = ObjectFreeze([]);
-let resetCommentLoc;
-/**
-* Comment class.
-*
-* Creates `loc` lazily and caches it in a private field.
-* Using a class with a private `#loc` field avoids hidden class transitions that would occur
-* with `Object.defineProperty` / `delete` on plain objects.
-* All `Comment` instances always have the same V8 hidden class, keeping property access monomorphic.
-*/
-var Comment = class {
-	type = null;
-	value = null;
-	start = 0;
-	end = 0;
-	range = [0, 0];
-	#loc = null;
-	get loc() {
-		let loc = this.#loc;
-		return loc === null ? (commentsWithLoc.push(this), this.#loc = computeLoc(this.start, this.end)) : loc;
-	}
-	static {
-		resetCommentLoc = (comment) => {
-			comment.#loc = null;
-		};
-	}
-};
-ObjectDefineProperty(Comment.prototype, "loc", { enumerable: !0 });
-/**
-* Initialize comments for current file.
-*
-* Deserializes comments from the buffer using object pooling.
-* If the program has a hashbang, sets first comment to a `Shebang` comment.
-*/
-function initComments() {
-	sourceText === null && initSourceText();
-	let { uint32 } = buffer, programPos32 = uint32[DATA_POINTER_POS_32] >> 2, commentsPos = uint32[programPos32 + 6], commentsLen = uint32[programPos32 + 8];
-	if (commentsLen === 0) {
-		comments = emptyComments;
-		return;
-	}
-	for (; cachedComments.length < commentsLen;) cachedComments.push(new Comment());
-	for (let i = 0; i < commentsLen; i++) {
-		let comment = cachedComments[i], pos = commentsPos + i * 16, pos32 = pos >> 2, start = uint32[pos32], end = uint32[pos32 + 1], isBlock = buffer[pos + 12] !== 0;
-		comment.type = isBlock ? "Block" : "Line", comment.value = sourceText.slice(start + 2, end - (isBlock << 1)), comment.range[0] = comment.start = start, comment.range[1] = comment.end = end;
-	}
-	uint32[commentsPos >> 2] === 0 && sourceText.startsWith("#!") && (cachedComments[0].type = "Shebang"), previousComments.length >= commentsLen ? (previousComments.length = commentsLen, comments = previousComments) : comments = previousComments = cachedComments.slice(0, commentsLen);
-}
-/**
-* Reset comments after file has been linted.
-*
-* Clears cached `loc` on comments that had it accessed, so the getter
-* will recalculate it when the comment is reused for a different file.
-*/
-function resetComments() {
-	for (let i = 0, len = commentsWithLoc.length; i < len; i++) resetCommentLoc(commentsWithLoc[i]);
-	commentsWithLoc.length = 0, comments = null;
-}
+//#region src-js/utils/typed_arrays.ts
+const EMPTY_UINT8_ARRAY = new Uint8Array(), EMPTY_UINT32_ARRAY = new Uint32Array();
 //#endregion
 //#region src-js/plugins/tokens.ts
-let tokens = null, tokensAndComments = null;
+let tokens = null, tokensUint8 = null, tokensUint32 = null, tokensLen = 0, allTokensDeserialized = !1;
 const cachedTokens = [];
 let previousTokens = [];
-const tokensWithLoc = [], regexObjects = [], tokensWithRegex = [];
-let resetLoc;
+const tokensWithLoc = [];
+let activeTokensWithLocCount = 0;
+const regexObjects = [];
+let tokensWithRegexIndexes = EMPTY_UINT32_ARRAY, activeTokensWithRegexCount = 0, deserializedTokenIndexes = EMPTY_UINT32_ARRAY, deserializedTokensLen = 0, resetLoc;
 /**
 * Token implementation with lazy `loc` caching via private field.
 *
@@ -573,7 +530,13 @@ var Token = class {
 	#loc = null;
 	get loc() {
 		let loc = this.#loc;
-		return loc === null ? (tokensWithLoc.push(this), this.#loc = computeLoc(this.start, this.end)) : loc;
+		return loc === null ? (activeTokensWithLocCount < tokensWithLoc.length ? tokensWithLoc[activeTokensWithLocCount] = this : tokensWithLoc.push(this), activeTokensWithLocCount++, this.#loc = computeLoc(this.start, this.end)) : loc;
+	}
+	toJSON() {
+		return {
+			...this,
+			loc: this.loc
+		};
 	}
 	static {
 		resetLoc = (token) => {
@@ -582,7 +545,6 @@ var Token = class {
 	}
 };
 ObjectDefineProperty(Token.prototype, "loc", { enumerable: !0 });
-let tokensUint8 = null, tokensUint32 = null;
 const TOKEN_TYPES = [
 	"Identifier",
 	"Keyword",
@@ -598,33 +560,88 @@ const TOKEN_TYPES = [
 	"JSXIdentifier"
 ];
 /**
-* Initialize tokens for current file.
+* Deserialize all tokens and build the `tokens` array.
+* Called by `ast.tokens` getter.
 */
 function initTokens() {
+	allTokensDeserialized || deserializeTokens(), previousTokens.length >= tokensLen ? (previousTokens.length = tokensLen, tokens = previousTokens) : tokens = previousTokens = cachedTokens.slice(0, tokensLen);
+}
+/**
+* Deserialize all tokens into `cachedTokens`.
+* Does NOT build the `tokens` array - use `initTokens` for that.
+*/
+function deserializeTokens() {
+	tokensUint32 === null && initTokensBuffer();
+	for (let i = 0; i < tokensLen; i++) deserializeTokenIfNeeded(i);
+	allTokensDeserialized = !0, deserializedTokensLen = 0;
+}
+/**
+* Initialize typed array views over the tokens region of the buffer.
+*
+* Populates `tokensUint8`, `tokensUint32`, and `tokensLen`, and grows `cachedTokens` if needed.
+* Does NOT deserialize tokens - they are deserialized lazily via `deserializeTokenIfNeeded`.
+*/
+function initTokensBuffer() {
 	sourceText === null && initSourceText();
-	let { uint32 } = buffer, tokensPos = uint32[536870901], tokensLen = uint32[536870902], arrayBuffer = buffer.buffer, absolutePos = buffer.byteOffset + tokensPos;
-	for (tokensUint8 = new Uint8Array(arrayBuffer, absolutePos, tokensLen << 4), tokensUint32 = new Uint32Array(arrayBuffer, absolutePos, tokensLen << 2); cachedTokens.length < tokensLen;) cachedTokens.push(new Token());
-	for (let i = 0; i < tokensLen; i++) deserializeTokenInto(cachedTokens[i], i);
-	tokensUint8 = null, tokensUint32 = null, previousTokens.length >= tokensLen ? (previousTokens.length = tokensLen, tokens = previousTokens) : tokens = previousTokens = cachedTokens.slice(0, tokensLen);
+	let { uint32 } = buffer, tokensPos = uint32[536870901];
+	tokensLen = uint32[536870902];
+	let arrayBuffer = buffer.buffer, absolutePos = buffer.byteOffset + tokensPos;
+	if (tokensUint8 = new Uint8Array(arrayBuffer, absolutePos, tokensLen << 4), tokensUint32 = new Uint32Array(arrayBuffer, absolutePos, tokensLen << 2), cachedTokens.length < tokensLen) {
+		do
+			cachedTokens.push(new Token());
+		while (cachedTokens.length < tokensLen);
+		let indexesLen = deserializedTokenIndexes.length;
+		indexesLen < tokensLen && (deserializedTokenIndexes = new Uint32Array(MathMax(tokensLen, indexesLen === 0 ? 16 : indexesLen << 1)));
+	}
 }
 /**
-* Deserialize token `i` from buffer into an existing token object.
-* @param token - Token object to mutate
-* @param index - Token index
+* Get token at `index`, deserializing if needed.
+*
+* Caller must ensure `initTokensBuffer()` has been called before calling this function.
+*
+* @param index - Token index in the tokens buffer
+* @returns Deserialized token
 */
-function deserializeTokenInto(token, index) {
-	let pos32 = index << 2, start = tokensUint32[pos32], end = tokensUint32[pos32 + 1], pos = pos32 << 2, kind = tokensUint8[pos + 8], value = sourceText.slice(start + +(kind === 2), end);
+function getToken(index) {
+	if (!allTokensDeserialized) {
+		let token = deserializeTokenIfNeeded(index);
+		if (token !== null) return deserializedTokenIndexes[deserializedTokensLen++] = index, token;
+	}
+	return cachedTokens[index];
+}
+/**
+* Deserialize token at `index` if not already deserialized.
+*
+* Caller must ensure `initTokensBuffer()` has been called before calling this function.
+*
+* @param index - Token index in the tokens buffer
+* @returns `Token` object if newly deserialized, or `null` if already deserialized
+*/
+function deserializeTokenIfNeeded(index) {
+	let pos = index << 4, flagPos = pos + 15;
+	if (tokensUint8[flagPos] !== 0) return null;
+	tokensUint8[flagPos] = 1;
+	let token = cachedTokens[index], kind = tokensUint8[pos + 8], pos32 = pos >> 2, start = tokensUint32[pos32], end = tokensUint32[pos32 + 1], value = sourceText.slice(start + +(kind === 2), end);
 	if (kind <= 2) tokensUint8[pos + 10] === 1 && (value = unescapeIdentifier(value));
 	else if (kind === 8) {
-		let regex, regexIndex = tokensWithRegex.length;
-		regexObjects.length > regexIndex ? regex = regexObjects[regexIndex] : regexObjects.push(regex = {
-			pattern: "",
-			flags: ""
-		}), token.regex = regex;
+		let regex;
+		if (activeTokensWithRegexCount < regexObjects.length) regex = regexObjects[activeTokensWithRegexCount];
+		else {
+			regexObjects.push(regex = {
+				pattern: null,
+				flags: null
+			});
+			let indexesLen = tokensWithRegexIndexes.length;
+			if (indexesLen === activeTokensWithRegexCount) {
+				let newArr = new Uint32Array(indexesLen === 0 ? 16 : indexesLen << 1);
+				newArr.set(tokensWithRegexIndexes, 0), tokensWithRegexIndexes = newArr;
+			}
+		}
+		token.regex = regex, tokensWithRegexIndexes[activeTokensWithRegexCount++] = index;
 		let patternEnd = value.lastIndexOf("/");
-		regex.pattern = value.slice(1, patternEnd), regex.flags = value.slice(patternEnd + 1), tokensWithRegex.push(token);
+		regex.pattern = value.slice(1, patternEnd), regex.flags = value.slice(patternEnd + 1);
 	}
-	token.type = TOKEN_TYPES[kind], token.value = value, token.range[0] = token.start = start, token.range[1] = token.end = end;
+	return token.type = TOKEN_TYPES[kind], token.value = value, token.range[0] = token.start = start, token.range[1] = token.end = end, token;
 }
 /**
 * Unescape an identifier.
@@ -639,60 +656,159 @@ function unescapeIdentifier(name) {
 	return name.replace(/\\u(?:\{([0-9a-fA-F]+)\}|([0-9a-fA-F]{4}))/g, (_, hex1, hex2) => StringFromCodePoint(parseInt(hex1 ?? hex2, 16)));
 }
 /**
-* Initialize `tokensAndComments`.
+* Reset tokens after file has been linted.
 *
-* Caller must ensure `tokens` is initialized before calling this function,
-* by calling `initTokens()` if `tokens === null`.
+* Clears cached `loc` on tokens that had it accessed, so the getter
+* will recalculate it when the token is reused for a different file.
 */
-function initTokensAndComments() {
-	comments === null && initComments();
-	let commentsLength = comments.length;
-	if (commentsLength === 0) {
-		tokensAndComments = tokens;
-		return;
+function resetTokens() {
+	if (tokensUint32 !== null) {
+		if (allTokensDeserialized === !1) {
+			for (let i = 0; i < deserializedTokensLen; i++) cachedTokens[deserializedTokenIndexes[i]].value = null;
+			deserializedTokensLen = 0;
+		} else {
+			for (let i = 0; i < tokensLen; i++) cachedTokens[i].value = null;
+			allTokensDeserialized = !1;
+		}
+		for (let i = 0; i < activeTokensWithLocCount; i++) resetLoc(tokensWithLoc[i]);
+		activeTokensWithLocCount = 0;
+		for (let i = 0; i < activeTokensWithRegexCount; i++) {
+			let token = cachedTokens[tokensWithRegexIndexes[i]], regex = token.regex;
+			regex.pattern = null, regex.flags = null, token.regex = void 0;
+		}
+		activeTokensWithRegexCount = 0, tokens = null, tokensUint8 = null, tokensUint32 = null, tokensLen = 0;
+	}
+}
+//#endregion
+//#region src-js/plugins/comments.ts
+let comments = null, commentsUint8 = null, commentsUint32 = null, commentsLen = 0, allCommentsDeserialized = !1;
+const cachedComments = [];
+let previousComments = [];
+const commentsWithLoc = [];
+let activeCommentsWithLocCount = 0, deserializedCommentIndexes = EMPTY_UINT32_ARRAY, deserializedCommentsLen = 0;
+const EMPTY_COMMENTS = ObjectFreeze([]);
+let resetCommentLoc;
+/**
+* Comment class.
+*
+* Creates `loc` lazily and caches it in a private field.
+* Using a class with a private `#loc` field avoids hidden class transitions that would occur
+* with `Object.defineProperty` / `delete` on plain objects.
+* All `Comment` instances always have the same V8 hidden class, keeping property access monomorphic.
+*/
+var Comment = class {
+	type = null;
+	value = null;
+	start = 0;
+	end = 0;
+	range = [0, 0];
+	#loc = null;
+	get loc() {
+		let loc = this.#loc;
+		return loc === null ? (activeCommentsWithLocCount < commentsWithLoc.length ? commentsWithLoc[activeCommentsWithLocCount] = this : commentsWithLoc.push(this), activeCommentsWithLocCount++, this.#loc = computeLoc(this.start, this.end)) : loc;
+	}
+	toJSON() {
+		return {
+			...this,
+			loc: this.loc
+		};
+	}
+	static {
+		resetCommentLoc = (comment) => {
+			comment.#loc = null;
+		};
 	}
-	let tokensLength = tokens.length;
-	if (tokensLength === 0) {
-		tokensAndComments = comments;
+};
+ObjectDefineProperty(Comment.prototype, "loc", { enumerable: !0 });
+/**
+* Deserialize all comments and build the `comments` array.
+* Called by `ast.comments` getter.
+*/
+function initComments() {
+	allCommentsDeserialized || deserializeComments(), comments === null && (previousComments.length >= commentsLen ? (previousComments.length = commentsLen, comments = previousComments) : comments = previousComments = cachedComments.slice(0, commentsLen));
+}
+/**
+* Deserialize all comments into `cachedComments`.
+* Does NOT build the `comments` array - use `initComments` for that.
+*/
+function deserializeComments() {
+	commentsUint32 === null && initCommentsBuffer();
+	for (let i = 0; i < commentsLen; i++) deserializeCommentIfNeeded(i);
+	allCommentsDeserialized = !0, deserializedCommentsLen = 0;
+}
+/**
+* Initialize typed array views over the comments region of the buffer.
+*
+* Populates `commentsUint8`, `commentsUint32`, and `commentsLen`, and grows `cachedComments` if needed.
+* Does NOT deserialize comments - they are deserialized lazily via `deserializeCommentIfNeeded`.
+*
+* Exception: If the file has a hashbang, eagerly deserializes the first comment and sets its type to `Shebang`.
+*/
+function initCommentsBuffer() {
+	sourceText === null && initSourceText();
+	let { uint32 } = buffer, programPos32 = uint32[DATA_POINTER_POS_32] >> 2, commentsPos = uint32[programPos32 + 8];
+	if (commentsLen = uint32[programPos32 + 10], commentsLen === 0) {
+		comments = EMPTY_COMMENTS, commentsUint8 = EMPTY_UINT8_ARRAY, commentsUint32 = EMPTY_UINT32_ARRAY, allCommentsDeserialized = !0;
 		return;
 	}
-	tokensAndComments = [];
-	let tokenIndex = 0, commentIndex = 0, token = tokens[0], comment = comments[0], tokenStart = token.start, commentStart = comment.start;
-	for (; commentStart < tokenStart;) {
-		if (tokensAndComments.push(comment), ++commentIndex === commentsLength) {
-			tokensAndComments.push(...tokens.slice(tokenIndex));
-			return;
-		}
-		comment = comments[commentIndex], commentStart = comment.start;
+	let arrayBuffer = buffer.buffer, absolutePos = buffer.byteOffset + commentsPos;
+	if (commentsUint8 = new Uint8Array(arrayBuffer, absolutePos, commentsLen * 16), commentsUint32 = new Uint32Array(arrayBuffer, absolutePos, commentsLen * 4), cachedComments.length < commentsLen) {
+		do
+			cachedComments.push(new Comment());
+		while (cachedComments.length < commentsLen);
+		let indexesLen = deserializedCommentIndexes.length;
+		indexesLen < commentsLen && (deserializedCommentIndexes = new Uint32Array(MathMax(commentsLen, indexesLen === 0 ? 16 : indexesLen << 1)));
 	}
-	for (;;) {
-		do {
-			if (tokensAndComments.push(token), ++tokenIndex === tokensLength) {
-				tokensAndComments.push(...comments.slice(commentIndex));
-				return;
-			}
-			token = tokens[tokenIndex], tokenStart = token.start;
-		} while (tokenStart < commentStart);
-		do {
-			if (tokensAndComments.push(comment), ++commentIndex === commentsLength) {
-				tokensAndComments.push(...tokens.slice(tokenIndex));
-				return;
-			}
-			comment = comments[commentIndex], commentStart = comment.start;
-		} while (commentStart < tokenStart);
+	commentsUint32[0] === 0 && sourceText.startsWith("#!") && (getComment(0).type = "Shebang");
+}
+/**
+* Get comment at `index`, deserializing if needed.
+*
+* Caller must ensure `initCommentsBuffer()` has been called before calling this function.
+*
+* @param index - Comment index in the comments buffer
+* @returns Deserialized comment
+*/
+function getComment(index) {
+	if (!allCommentsDeserialized) {
+		let comment = deserializeCommentIfNeeded(index);
+		if (comment !== null) return deserializedCommentIndexes[deserializedCommentsLen++] = index, comment;
 	}
+	return cachedComments[index];
 }
 /**
-* Reset tokens after file has been linted.
+* Deserialize comment at `index` if not already deserialized.
 *
-* Clears cached `loc` on tokens that had it accessed, so the getter
-* will recalculate it when the token is reused for a different file.
+* Caller must ensure `initCommentsBuffer()` has been called before calling this function.
+*
+* @param index - Comment index in the comments buffer
+* @returns `Comment` object if newly deserialized, or `null` if already deserialized
 */
-function resetTokens() {
-	for (let i = 0, len = tokensWithLoc.length; i < len; i++) resetLoc(tokensWithLoc[i]);
-	tokensWithLoc.length = 0;
-	for (let i = 0, len = tokensWithRegex.length; i < len; i++) tokensWithRegex[i].regex = void 0;
-	tokensWithRegex.length = 0, tokens = null, tokensAndComments = null;
+function deserializeCommentIfNeeded(index) {
+	let pos = index << 4, flagPos = pos + 15;
+	if (commentsUint8[flagPos] !== 0) return null;
+	commentsUint8[flagPos] = 1;
+	let comment = cachedComments[index], isBlock = commentsUint8[pos + 12] !== 0, pos32 = pos >> 2, start = commentsUint32[pos32], end = commentsUint32[pos32 + 1];
+	return comment.type = isBlock ? "Block" : "Line", comment.value = sourceText.slice(start + 2, end - (isBlock << 1)), comment.range[0] = comment.start = start, comment.range[1] = comment.end = end, comment;
+}
+/**
+* Reset comments after file has been linted.
+*
+* Clears cached `loc` on comments that had it accessed, so the getter
+* will recalculate it when the comment is reused for a different file.
+*/
+function resetComments() {
+	if (commentsUint32 !== null) {
+		if (allCommentsDeserialized === !1) {
+			for (let i = 0; i < deserializedCommentsLen; i++) cachedComments[deserializedCommentIndexes[i]].value = null;
+			deserializedCommentsLen = 0;
+		} else {
+			for (let i = 0; i < commentsLen; i++) cachedComments[i].value = null;
+			allCommentsDeserialized = !1;
+		}
+		for (let i = 0; i < activeCommentsWithLocCount; i++) resetCommentLoc(commentsWithLoc[i]);
+		activeCommentsWithLocCount = 0, comments = null, commentsUint8 = null, commentsUint32 = null, commentsLen = 0;
+	}
 }
 //#endregion
 //#region src-js/generated/deserialize.js
@@ -728,8 +844,8 @@ function deserializeProgram(pos) {
 		end,
 		range: [0, end],
 		parent: null
-	}, body = program.body = deserializeVecDirective(pos + 80);
-	body.push(...deserializeVecStatement(pos + 104));
+	}, body = program.body = deserializeVecDirective(pos + 88);
+	body.push(...deserializeVecStatement(pos + 112));
 	{
 		let start;
 		if (body.length > 0) {
@@ -799,7 +915,7 @@ function deserializeIdentifierName(pos) {
 		__proto__: NodeProto,
 		type: "Identifier",
 		decorators: null,
-		name: deserializeStr(pos + 8),
+		name: deserializeStr(pos + 16),
 		optional: null,
 		typeAnnotation: null,
 		start: start = deserializeU32(pos),
@@ -814,7 +930,7 @@ function deserializeIdentifierReference(pos) {
 		__proto__: NodeProto,
 		type: "Identifier",
 		decorators: null,
-		name: deserializeStr(pos + 8),
+		name: deserializeStr(pos + 16),
 		optional: null,
 		typeAnnotation: null,
 		start: start = deserializeU32(pos),
@@ -829,7 +945,7 @@ function deserializeBindingIdentifier(pos) {
 		__proto__: NodeProto,
 		type: "Identifier",
 		decorators: null,
-		name: deserializeStr(pos + 8),
+		name: deserializeStr(pos + 16),
 		optional: null,
 		typeAnnotation: null,
 		start: start = deserializeU32(pos),
@@ -844,7 +960,7 @@ function deserializeLabelIdentifier(pos) {
 		__proto__: NodeProto,
 		type: "Identifier",
 		decorators: null,
-		name: deserializeStr(pos + 8),
+		name: deserializeStr(pos + 16),
 		optional: null,
 		typeAnnotation: null,
 		start: start = deserializeU32(pos),
@@ -875,7 +991,7 @@ function deserializeArrayExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.elements = deserializeVecArrayExpressionElement(pos + 8), parent = previousParent, node;
+	return node.elements = deserializeVecArrayExpressionElement(pos + 16), parent = previousParent, node;
 }
 function deserializeArrayExpressionElement(pos) {
 	switch (uint8[pos]) {
@@ -940,7 +1056,7 @@ function deserializeObjectExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.properties = deserializeVecObjectPropertyKind(pos + 8), parent = previousParent, node;
+	return node.properties = deserializeVecObjectPropertyKind(pos + 16), parent = previousParent, node;
 }
 function deserializeObjectPropertyKind(pos) {
 	switch (uint8[pos]) {
@@ -953,19 +1069,19 @@ function deserializeObjectProperty(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		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],
 		parent
 	};
-	return node.key = deserializePropertyKey(pos + 8), node.value = deserializeExpression(pos + 24), node.optional = !1, parent = previousParent, node;
+	return node.key = deserializePropertyKey(pos + 16), node.value = deserializeExpression(pos + 32), node.optional = !1, parent = previousParent, node;
 }
 function deserializePropertyKey(pos) {
 	switch (uint8[pos]) {
@@ -1036,7 +1152,7 @@ function deserializeTemplateLiteral(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.quasis = deserializeVecTemplateElement(pos + 8), node.expressions = deserializeVecExpression(pos + 32), parent = previousParent, node;
+	return node.quasis = deserializeVecTemplateElement(pos + 16), node.expressions = deserializeVecExpression(pos + 40), parent = previousParent, node;
 }
 function deserializeTaggedTemplateExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1050,11 +1166,11 @@ function deserializeTaggedTemplateExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.tag = deserializeExpression(pos + 8), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), node.quasi = deserializeTemplateLiteral(pos + 32), parent = previousParent, node;
+	return node.tag = deserializeExpression(pos + 16), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), node.quasi = deserializeTemplateLiteral(pos + 40), parent = previousParent, node;
 }
 function deserializeTemplateElement(pos) {
-	let tail = deserializeBool(pos + 44), start = deserializeU32(pos) - 1, end = deserializeU32(pos + 4) + 2 - tail, value = deserializeTemplateElementValue(pos + 8);
-	return value.cooked !== null && deserializeBool(pos + 45) && (value.cooked = value.cooked.replace(/\uFFFD(.{4})/g, (_, hex) => StringFromCodePoint(parseInt(hex, 16)))), {
+	let tail = deserializeBool(pos + 12), start = deserializeU32(pos) - 1, end = deserializeU32(pos + 4) + 2 - tail, value = deserializeTemplateElementValue(pos + 16);
+	return value.cooked !== null && deserializeBool(pos + 13) && (value.cooked = value.cooked.replace(/\uFFFD(.{4})/g, (_, hex) => StringFromCodePoint(parseInt(hex, 16)))), {
 		__proto__: NodeProto,
 		type: "TemplateElement",
 		value,
@@ -1077,14 +1193,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],
 		parent
 	};
-	return node.object = deserializeExpression(pos + 8), node.property = deserializeExpression(pos + 24), node.computed = !0, parent = previousParent, node;
+	return node.object = deserializeExpression(pos + 16), node.property = deserializeExpression(pos + 32), node.computed = !0, parent = previousParent, node;
 }
 function deserializeStaticMemberExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1092,14 +1208,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],
 		parent
 	};
-	return node.object = deserializeExpression(pos + 8), node.property = deserializeIdentifierName(pos + 24), node.computed = !1, parent = previousParent, node;
+	return node.object = deserializeExpression(pos + 16), node.property = deserializeIdentifierName(pos + 32), node.computed = !1, parent = previousParent, node;
 }
 function deserializePrivateFieldExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1107,14 +1223,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],
 		parent
 	};
-	return node.object = deserializeExpression(pos + 8), node.property = deserializePrivateIdentifier(pos + 24), node.computed = !1, parent = previousParent, node;
+	return node.object = deserializeExpression(pos + 16), node.property = deserializePrivateIdentifier(pos + 32), node.computed = !1, parent = previousParent, node;
 }
 function deserializeCallExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1123,13 +1239,13 @@ 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],
 		parent
 	};
-	return node.callee = deserializeExpression(pos + 8), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), node.arguments = deserializeVecArgument(pos + 32), parent = previousParent, node;
+	return node.callee = deserializeExpression(pos + 16), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), node.arguments = deserializeVecArgument(pos + 40), parent = previousParent, node;
 }
 function deserializeNewExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1143,7 +1259,7 @@ function deserializeNewExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.callee = deserializeExpression(pos + 8), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), node.arguments = deserializeVecArgument(pos + 32), parent = previousParent, node;
+	return node.callee = deserializeExpression(pos + 16), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), node.arguments = deserializeVecArgument(pos + 40), parent = previousParent, node;
 }
 function deserializeMetaProperty(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1156,7 +1272,7 @@ function deserializeMetaProperty(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.meta = deserializeIdentifierName(pos + 8), node.property = deserializeIdentifierName(pos + 40), parent = previousParent, node;
+	return node.meta = deserializeIdentifierName(pos + 16), node.property = deserializeIdentifierName(pos + 48), parent = previousParent, node;
 }
 function deserializeSpreadElement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1168,7 +1284,7 @@ function deserializeSpreadElement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.argument = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.argument = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeArgument(pos) {
 	switch (uint8[pos]) {
@@ -1223,21 +1339,21 @@ function deserializeUpdateExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		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],
 		parent
 	};
-	return node.argument = deserializeSimpleAssignmentTarget(pos + 8), parent = previousParent, node;
+	return node.argument = deserializeSimpleAssignmentTarget(pos + 16), parent = previousParent, node;
 }
 function deserializeUnaryExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "UnaryExpression",
-		operator: deserializeUnaryOperator(pos + 28),
+		operator: deserializeUnaryOperator(pos + 12),
 		argument: null,
 		prefix: null,
 		start: start = deserializeU32(pos),
@@ -1245,21 +1361,21 @@ function deserializeUnaryExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.argument = deserializeExpression(pos + 8), node.prefix = !0, parent = previousParent, node;
+	return node.argument = deserializeExpression(pos + 16), node.prefix = !0, parent = previousParent, node;
 }
 function deserializeBinaryExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		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],
 		parent
 	};
-	return node.left = deserializeExpression(pos + 8), node.right = deserializeExpression(pos + 24), parent = previousParent, node;
+	return node.left = deserializeExpression(pos + 16), node.right = deserializeExpression(pos + 32), parent = previousParent, node;
 }
 function deserializePrivateInExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1273,21 +1389,21 @@ function deserializePrivateInExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.left = deserializePrivateIdentifier(pos + 8), node.operator = "in", node.right = deserializeExpression(pos + 40), parent = previousParent, node;
+	return node.left = deserializePrivateIdentifier(pos + 16), node.operator = "in", node.right = deserializeExpression(pos + 48), parent = previousParent, node;
 }
 function deserializeLogicalExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		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],
 		parent
 	};
-	return node.left = deserializeExpression(pos + 8), node.right = deserializeExpression(pos + 24), parent = previousParent, node;
+	return node.left = deserializeExpression(pos + 16), node.right = deserializeExpression(pos + 32), parent = previousParent, node;
 }
 function deserializeConditionalExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1301,13 +1417,13 @@ function deserializeConditionalExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.test = deserializeExpression(pos + 8), node.consequent = deserializeExpression(pos + 24), node.alternate = deserializeExpression(pos + 40), parent = previousParent, node;
+	return node.test = deserializeExpression(pos + 16), node.consequent = deserializeExpression(pos + 32), node.alternate = deserializeExpression(pos + 48), parent = previousParent, node;
 }
 function deserializeAssignmentExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "AssignmentExpression",
-		operator: deserializeAssignmentOperator(pos + 44),
+		operator: deserializeAssignmentOperator(pos + 12),
 		left: null,
 		right: null,
 		start: start = deserializeU32(pos),
@@ -1315,7 +1431,7 @@ function deserializeAssignmentExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.left = deserializeAssignmentTarget(pos + 8), node.right = deserializeExpression(pos + 24), parent = previousParent, node;
+	return node.left = deserializeAssignmentTarget(pos + 16), node.right = deserializeExpression(pos + 32), parent = previousParent, node;
 }
 function deserializeAssignmentTarget(pos) {
 	switch (uint8[pos]) {
@@ -1357,7 +1473,7 @@ function deserializeArrayAssignmentTarget(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, elements = deserializeVecOptionAssignmentTargetMaybeDefault(pos + 8), rest = deserializeOptionBoxAssignmentTargetRest(pos + 32);
+	}, elements = deserializeVecOptionAssignmentTargetMaybeDefault(pos + 16), rest = deserializeOptionBoxAssignmentTargetRest(pos + 40);
 	return rest !== null && elements.push(rest), node.decorators = [], node.elements = elements, node.optional = !1, parent = previousParent, node;
 }
 function deserializeObjectAssignmentTarget(pos) {
@@ -1372,7 +1488,7 @@ function deserializeObjectAssignmentTarget(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, properties = deserializeVecAssignmentTargetProperty(pos + 8), rest = deserializeOptionBoxAssignmentTargetRest(pos + 32);
+	}, properties = deserializeVecAssignmentTargetProperty(pos + 16), rest = deserializeOptionBoxAssignmentTargetRest(pos + 40);
 	return rest !== null && properties.push(rest), node.decorators = [], node.properties = properties, node.optional = !1, parent = previousParent, node;
 }
 function deserializeAssignmentTargetRest(pos) {
@@ -1389,7 +1505,7 @@ function deserializeAssignmentTargetRest(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = [], node.argument = deserializeAssignmentTarget(pos + 8), node.optional = !1, parent = previousParent, node;
+	return node.decorators = [], node.argument = deserializeAssignmentTarget(pos + 16), node.optional = !1, parent = previousParent, node;
 }
 function deserializeAssignmentTargetMaybeDefault(pos) {
 	switch (uint8[pos]) {
@@ -1421,7 +1537,7 @@ function deserializeAssignmentTargetWithDefault(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = [], node.left = deserializeAssignmentTarget(pos + 8), node.right = deserializeExpression(pos + 24), node.optional = !1, parent = previousParent, node;
+	return node.decorators = [], node.left = deserializeAssignmentTarget(pos + 16), node.right = deserializeExpression(pos + 32), node.optional = !1, parent = previousParent, node;
 }
 function deserializeAssignmentTargetProperty(pos) {
 	switch (uint8[pos]) {
@@ -1445,7 +1561,7 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
 		end,
 		range: [start, end],
 		parent
-	}, key = deserializeIdentifierReference(pos + 8), keyStart, keyEnd, value = {
+	}, key = deserializeIdentifierReference(pos + 16), keyStart, keyEnd, value = {
 		__proto__: NodeProto,
 		type: "Identifier",
 		decorators: [],
@@ -1456,7 +1572,7 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
 		end: keyEnd = key.end,
 		range: [keyStart, keyEnd],
 		parent
-	}, init = deserializeOptionExpression(pos + 40);
+	}, init = deserializeOptionExpression(pos + 48);
 	if (init !== null) {
 		let left = value;
 		value = {
@@ -1484,14 +1600,14 @@ 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],
 		parent
 	};
-	return node.kind = "init", node.key = deserializePropertyKey(pos + 8), node.value = deserializeAssignmentTargetMaybeDefault(pos + 24), node.method = !1, node.shorthand = !1, node.optional = !1, parent = previousParent, node;
+	return node.kind = "init", node.key = deserializePropertyKey(pos + 16), node.value = deserializeAssignmentTargetMaybeDefault(pos + 32), node.method = !1, node.shorthand = !1, node.optional = !1, parent = previousParent, node;
 }
 function deserializeSequenceExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1503,7 +1619,7 @@ function deserializeSequenceExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expressions = deserializeVecExpression(pos + 8), parent = previousParent, node;
+	return node.expressions = deserializeVecExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeSuper(pos) {
 	let start, end;
@@ -1526,7 +1642,7 @@ function deserializeAwaitExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.argument = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.argument = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeChainExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1538,7 +1654,7 @@ function deserializeChainExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeChainElement(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeChainElement(pos + 16), parent = previousParent, node;
 }
 function deserializeChainElement(pos) {
 	switch (uint8[pos]) {
@@ -1552,7 +1668,7 @@ function deserializeChainElement(pos) {
 }
 function deserializeParenthesizedExpression(pos) {
 	let node;
-	return node = deserializeExpression(pos + 8), node;
+	return node = deserializeExpression(pos + 16), node;
 }
 function deserializeStatement(pos) {
 	switch (uint8[pos]) {
@@ -1597,13 +1713,13 @@ function deserializeDirective(pos) {
 		__proto__: NodeProto,
 		type: "ExpressionStatement",
 		expression: null,
-		directive: deserializeStr(pos + 56),
+		directive: deserializeStr(pos + 64),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeStringLiteral(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeStringLiteral(pos + 16), parent = previousParent, node;
 }
 function deserializeBlockStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1615,7 +1731,7 @@ function deserializeBlockStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.body = deserializeVecStatement(pos + 8), parent = previousParent, node;
+	return node.body = deserializeVecStatement(pos + 16), parent = previousParent, node;
 }
 function deserializeDeclaration(pos) {
 	switch (uint8[pos]) {
@@ -1635,15 +1751,15 @@ function deserializeVariableDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		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],
 		parent
 	};
-	return node.declarations = deserializeVecVariableDeclarator(pos + 8), parent = previousParent, node;
+	return node.declarations = deserializeVecVariableDeclarator(pos + 16), parent = previousParent, node;
 }
 function deserializeVariableDeclarationKind(pos) {
 	switch (uint8[pos]) {
@@ -1656,24 +1772,24 @@ function deserializeVariableDeclarationKind(pos) {
 	}
 }
 function deserializeVariableDeclarator(pos) {
-	let previousParent = parent, variableDeclarator = parent = {
+	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "VariableDeclarator",
 		id: null,
 		init: null,
-		definite: !1,
-		start: deserializeU32(pos),
-		end: deserializeU32(pos + 4),
-		range: [deserializeU32(pos), deserializeU32(pos + 4)],
-		parent: previousParent
-	};
-	variableDeclarator.id = deserializeBindingPattern(pos + 8);
+		definite: deserializeBool(pos + 13),
+		start: start = deserializeU32(pos),
+		end: end = deserializeU32(pos + 4),
+		range: [start, end],
+		parent
+	}, pattern = deserializeBindingPattern(pos + 16);
 	{
-		parent = variableDeclarator.id;
-		let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
-		variableDeclarator.id.typeAnnotation = typeAnnotation, typeAnnotation !== null && (variableDeclarator.id.end = typeAnnotation.end, variableDeclarator.id.range[1] = typeAnnotation.end), parent = variableDeclarator, variableDeclarator.definite = deserializeBool(pos + 53);
+		let previousParent = parent;
+		parent = pattern;
+		let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32);
+		typeAnnotation !== null && (pattern.typeAnnotation = typeAnnotation, pattern.range[1] = pattern.end = typeAnnotation.end), parent = previousParent;
 	}
-	return variableDeclarator.init = deserializeOptionExpression(pos + 32), parent = previousParent, variableDeclarator;
+	return node.id = pattern, node.init = deserializeOptionExpression(pos + 40), parent = previousParent, node;
 }
 function deserializeEmptyStatement(pos) {
 	let start, end;
@@ -1697,7 +1813,7 @@ function deserializeExpressionStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeIfStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1711,7 +1827,7 @@ function deserializeIfStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.test = deserializeExpression(pos + 8), node.consequent = deserializeStatement(pos + 24), node.alternate = deserializeOptionStatement(pos + 40), parent = previousParent, node;
+	return node.test = deserializeExpression(pos + 16), node.consequent = deserializeStatement(pos + 32), node.alternate = deserializeOptionStatement(pos + 48), parent = previousParent, node;
 }
 function deserializeDoWhileStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1724,7 +1840,7 @@ function deserializeDoWhileStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.body = deserializeStatement(pos + 8), node.test = deserializeExpression(pos + 24), parent = previousParent, node;
+	return node.body = deserializeStatement(pos + 16), node.test = deserializeExpression(pos + 32), parent = previousParent, node;
 }
 function deserializeWhileStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1737,7 +1853,7 @@ function deserializeWhileStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.test = deserializeExpression(pos + 8), node.body = deserializeStatement(pos + 24), parent = previousParent, node;
+	return node.test = deserializeExpression(pos + 16), node.body = deserializeStatement(pos + 32), parent = previousParent, node;
 }
 function deserializeForStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1752,7 +1868,7 @@ function deserializeForStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.init = deserializeOptionForStatementInit(pos + 8), node.test = deserializeOptionExpression(pos + 24), node.update = deserializeOptionExpression(pos + 40), node.body = deserializeStatement(pos + 56), parent = previousParent, node;
+	return node.init = deserializeOptionForStatementInit(pos + 16), node.test = deserializeOptionExpression(pos + 32), node.update = deserializeOptionExpression(pos + 48), node.body = deserializeStatement(pos + 64), parent = previousParent, node;
 }
 function deserializeForStatementInit(pos) {
 	switch (uint8[pos]) {
@@ -1815,7 +1931,7 @@ function deserializeForInStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.left = deserializeForStatementLeft(pos + 8), node.right = deserializeExpression(pos + 24), node.body = deserializeStatement(pos + 40), parent = previousParent, node;
+	return node.left = deserializeForStatementLeft(pos + 16), node.right = deserializeExpression(pos + 32), node.body = deserializeStatement(pos + 48), parent = previousParent, node;
 }
 function deserializeForStatementLeft(pos) {
 	switch (uint8[pos]) {
@@ -1846,7 +1962,7 @@ function deserializeForOfStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.left = deserializeForStatementLeft(pos + 8), node.right = deserializeExpression(pos + 24), node.body = deserializeStatement(pos + 40), parent = previousParent, node;
+	return node.left = deserializeForStatementLeft(pos + 16), node.right = deserializeExpression(pos + 32), node.body = deserializeStatement(pos + 48), parent = previousParent, node;
 }
 function deserializeContinueStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1858,7 +1974,7 @@ function deserializeContinueStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.label = deserializeOptionLabelIdentifier(pos + 8), parent = previousParent, node;
+	return node.label = deserializeOptionLabelIdentifier(pos + 16), parent = previousParent, node;
 }
 function deserializeBreakStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1870,7 +1986,7 @@ function deserializeBreakStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.label = deserializeOptionLabelIdentifier(pos + 8), parent = previousParent, node;
+	return node.label = deserializeOptionLabelIdentifier(pos + 16), parent = previousParent, node;
 }
 function deserializeReturnStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1882,7 +1998,7 @@ function deserializeReturnStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.argument = deserializeOptionExpression(pos + 8), parent = previousParent, node;
+	return node.argument = deserializeOptionExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeWithStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1895,7 +2011,7 @@ function deserializeWithStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.object = deserializeExpression(pos + 8), node.body = deserializeStatement(pos + 24), parent = previousParent, node;
+	return node.object = deserializeExpression(pos + 16), node.body = deserializeStatement(pos + 32), parent = previousParent, node;
 }
 function deserializeSwitchStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1908,7 +2024,7 @@ function deserializeSwitchStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.discriminant = deserializeExpression(pos + 8), node.cases = deserializeVecSwitchCase(pos + 24), parent = previousParent, node;
+	return node.discriminant = deserializeExpression(pos + 16), node.cases = deserializeVecSwitchCase(pos + 32), parent = previousParent, node;
 }
 function deserializeSwitchCase(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1921,7 +2037,7 @@ function deserializeSwitchCase(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.test = deserializeOptionExpression(pos + 8), node.consequent = deserializeVecStatement(pos + 24), parent = previousParent, node;
+	return node.test = deserializeOptionExpression(pos + 16), node.consequent = deserializeVecStatement(pos + 32), parent = previousParent, node;
 }
 function deserializeLabeledStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1934,7 +2050,7 @@ function deserializeLabeledStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.label = deserializeLabelIdentifier(pos + 8), node.body = deserializeStatement(pos + 40), parent = previousParent, node;
+	return node.label = deserializeLabelIdentifier(pos + 16), node.body = deserializeStatement(pos + 48), parent = previousParent, node;
 }
 function deserializeThrowStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1946,7 +2062,7 @@ function deserializeThrowStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.argument = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.argument = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeTryStatement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1960,7 +2076,7 @@ function deserializeTryStatement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.block = deserializeBoxBlockStatement(pos + 8), node.handler = deserializeOptionBoxCatchClause(pos + 16), node.finalizer = deserializeOptionBoxBlockStatement(pos + 24), parent = previousParent, node;
+	return node.block = deserializeBoxBlockStatement(pos + 16), node.handler = deserializeOptionBoxCatchClause(pos + 24), node.finalizer = deserializeOptionBoxBlockStatement(pos + 32), parent = previousParent, node;
 }
 function deserializeCatchClause(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -1973,13 +2089,13 @@ function deserializeCatchClause(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.param = deserializeOptionCatchParameter(pos + 8), node.body = deserializeBoxBlockStatement(pos + 48), parent = previousParent, node;
+	return node.param = deserializeOptionCatchParameter(pos + 16), node.body = deserializeBoxBlockStatement(pos + 56), parent = previousParent, node;
 }
 function deserializeCatchParameter(pos) {
-	let previousParent = parent, pattern = deserializeBindingPattern(pos + 8);
+	let previousParent = parent, pattern = deserializeBindingPattern(pos + 16);
 	{
 		parent = pattern;
-		let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
+		let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32);
 		pattern.typeAnnotation = typeAnnotation, typeAnnotation !== null && (pattern.end = typeAnnotation.end, pattern.range[1] = typeAnnotation.end), parent = previousParent;
 	}
 	return pattern;
@@ -2018,7 +2134,7 @@ function deserializeAssignmentPattern(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = [], node.left = deserializeBindingPattern(pos + 8), node.right = deserializeExpression(pos + 24), node.optional = !1, parent = previousParent, node;
+	return node.decorators = [], node.left = deserializeBindingPattern(pos + 16), node.right = deserializeExpression(pos + 32), node.optional = !1, parent = previousParent, node;
 }
 function deserializeObjectPattern(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2032,7 +2148,7 @@ function deserializeObjectPattern(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, properties = deserializeVecBindingProperty(pos + 8), rest = deserializeOptionBoxBindingRestElement(pos + 32);
+	}, properties = deserializeVecBindingProperty(pos + 16), rest = deserializeOptionBoxBindingRestElement(pos + 40);
 	return rest !== null && properties.push(rest), node.decorators = [], node.properties = properties, node.optional = !1, parent = previousParent, node;
 }
 function deserializeBindingProperty(pos) {
@@ -2043,15 +2159,15 @@ function deserializeBindingProperty(pos) {
 		key: null,
 		value: null,
 		method: null,
-		shorthand: deserializeBool(pos + 44),
-		computed: deserializeBool(pos + 45),
+		shorthand: deserializeBool(pos + 12),
+		computed: deserializeBool(pos + 13),
 		optional: null,
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
 	};
-	return node.kind = "init", node.key = deserializePropertyKey(pos + 8), node.value = deserializeBindingPattern(pos + 24), node.method = !1, node.optional = !1, parent = previousParent, node;
+	return node.kind = "init", node.key = deserializePropertyKey(pos + 16), node.value = deserializeBindingPattern(pos + 32), node.method = !1, node.optional = !1, parent = previousParent, node;
 }
 function deserializeArrayPattern(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2065,7 +2181,7 @@ function deserializeArrayPattern(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, elements = deserializeVecOptionBindingPattern(pos + 8), rest = deserializeOptionBoxBindingRestElement(pos + 32);
+	}, elements = deserializeVecOptionBindingPattern(pos + 16), rest = deserializeOptionBoxBindingRestElement(pos + 40);
 	return rest !== null && elements.push(rest), node.decorators = [], node.elements = elements, node.optional = !1, parent = previousParent, node;
 }
 function deserializeBindingRestElement(pos) {
@@ -2082,7 +2198,7 @@ function deserializeBindingRestElement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = [], node.argument = deserializeBindingPattern(pos + 8), node.optional = !1, parent = previousParent, node;
+	return node.decorators = [], node.argument = deserializeBindingPattern(pos + 16), node.optional = !1, parent = previousParent, node;
 }
 function deserializeFunction(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2101,12 +2217,12 @@ function deserializeFunction(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, params = deserializeBoxFormalParameters(pos + 56);
+	}, params = deserializeBoxFormalParameters(pos + 64);
 	{
-		let thisParam = deserializeOptionBoxTSThisParameter(pos + 48);
+		let thisParam = deserializeOptionBoxTSThisParameter(pos + 56);
 		thisParam !== null && params.unshift(thisParam);
 	}
-	return node.id = deserializeOptionBindingIdentifier(pos + 8), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 40), node.params = params, node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 64), node.body = deserializeOptionBoxFunctionBody(pos + 72), node.expression = !1, parent = previousParent, node;
+	return node.id = deserializeOptionBindingIdentifier(pos + 16), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 48), node.params = params, node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 72), node.body = deserializeOptionBoxFunctionBody(pos + 80), node.expression = !1, parent = previousParent, node;
 }
 function deserializeFunctionType(pos) {
 	switch (uint8[pos]) {
@@ -2118,9 +2234,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, previousParent = parent, rest = parent = {
 			__proto__: NodeProto,
 			type: "RestElement",
@@ -2129,21 +2245,21 @@ function deserializeFormalParameters(pos) {
 			optional: !1,
 			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],
 			parent: previousParent
 		};
-		rest.argument = deserializeBindingPattern(pos + 40), rest.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 64), rest.typeAnnotation !== null && (end = rest.typeAnnotation.end, rest.end = end, rest.range[1] = end), params.push(rest), parent = previousParent;
+		rest.argument = deserializeBindingPattern(pos + 56), rest.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 72), rest.typeAnnotation !== null && (end = rest.typeAnnotation.end, rest.end = end, rest.range[1] = end), params.push(rest), parent = previousParent;
 	}
 	return params;
 }
 function deserializeFormalParameter(pos) {
-	let param, previousParent = parent, hasInitializer = uint32[pos + 56 >> 2] !== 0 && uint32[pos + 60 >> 2] !== 0;
+	let param, previousParent = parent, 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 = parent = {
@@ -2158,12 +2274,12 @@ function deserializeFormalParameter(pos) {
 					end: end = deserializeU32(pos + 4),
 					range: [start, end],
 					parent: previousParent
-				}, param.decorators = deserializeVecDecorator(pos + 8), param.left = deserializeBindingPattern(pos + 32), param.left.decorators = [], param.left.optional = !1, parent = param.left;
-				let leftTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
-				param.left.typeAnnotation = leftTypeAnnotation, leftTypeAnnotation !== null && (param.left.end = leftTypeAnnotation.end, param.left.range[1] = leftTypeAnnotation.end), parent = param, param.right = deserializeOptionBoxExpression(pos + 56);
+				}, param.decorators = deserializeVecDecorator(pos + 16), param.left = deserializeBindingPattern(pos + 40), param.left.decorators = [], param.left.optional = !1, parent = param.left;
+				let leftTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
+				param.left.typeAnnotation = leftTypeAnnotation, leftTypeAnnotation !== null && (param.left.end = leftTypeAnnotation.end, param.left.range[1] = leftTypeAnnotation.end), parent = param, param.right = deserializeOptionBoxExpression(pos + 64);
 			} else {
-				param = deserializeBindingPattern(pos + 32), param.parent = previousParent, parent = param, param.decorators = deserializeVecDecorator(pos + 8), param.optional = optional;
-				let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+				param = deserializeBindingPattern(pos + 40), param.parent = previousParent, parent = param, param.decorators = deserializeVecDecorator(pos + 16), param.optional = optional;
+				let typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
 				param.typeAnnotation = typeAnnotation, typeAnnotation === null ? optional && (param.end = deserializeU32(pos + 4), param.range[1] = deserializeU32(pos + 4)) : (param.end = typeAnnotation.end, param.range[1] = typeAnnotation.end), parent = previousParent;
 			}
 		} else {
@@ -2181,8 +2297,8 @@ function deserializeFormalParameter(pos) {
 				end: end = deserializeU32(pos + 4),
 				range: [start, end],
 				parent: previousParent
-			}, param.decorators = deserializeVecDecorator(pos + 8), hasInitializer) {
-				let pattern = deserializeBindingPattern(pos + 32), initializer = deserializeOptionBoxExpression(pos + 56), assignStart, assignEnd, assignParam = parent = {
+			}, param.decorators = deserializeVecDecorator(pos + 16), hasInitializer) {
+				let pattern = deserializeBindingPattern(pos + 40), initializer = deserializeOptionBoxExpression(pos + 64), assignStart, assignEnd, assignParam = parent = {
 					__proto__: NodeProto,
 					type: "AssignmentPattern",
 					decorators: [],
@@ -2196,13 +2312,13 @@ function deserializeFormalParameter(pos) {
 					parent: param
 				};
 				assignParam.left = pattern, pattern.parent = assignParam, pattern.decorators = [], pattern.optional = !1, parent = pattern;
-				let patternTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+				let patternTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
 				pattern.typeAnnotation = patternTypeAnnotation, patternTypeAnnotation !== null && (pattern.end = patternTypeAnnotation.end, pattern.range[1] = patternTypeAnnotation.end), parent = assignParam, assignParam.right = initializer, initializer !== null && (initializer.parent = assignParam), param.parameter = assignParam;
 			} else {
-				param.parameter = deserializeBindingPattern(pos + 32), param.parameter.decorators = [];
-				let paramOptional = deserializeBool(pos + 68);
+				param.parameter = deserializeBindingPattern(pos + 40), param.parameter.decorators = [];
+				let paramOptional = deserializeBool(pos + 12);
 				param.parameter.optional = paramOptional, parent = param.parameter;
-				let paramTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
+				let paramTypeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56);
 				if (param.parameter.typeAnnotation = paramTypeAnnotation, paramTypeAnnotation !== null) param.parameter.end = paramTypeAnnotation.end, param.parameter.range[1] = paramTypeAnnotation.end;
 				else if (paramOptional) {
 					let paramEnd = deserializeU32(pos + 4);
@@ -2223,8 +2339,8 @@ function deserializeFunctionBody(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, body = deserializeVecDirective(pos + 8);
-	return body.push(...deserializeVecStatement(pos + 32)), node.body = body, parent = previousParent, node;
+	}, body = deserializeVecDirective(pos + 16);
+	return body.push(...deserializeVecStatement(pos + 40)), node.body = body, parent = previousParent, node;
 }
 function deserializeArrowFunctionExpression(pos) {
 	let expression = deserializeBool(pos + 48), start, end, previousParent = parent, node = parent = {
@@ -2242,21 +2358,21 @@ function deserializeArrowFunctionExpression(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, body = deserializeBoxFunctionBody(pos + 32);
-	return expression === !0 && (body = body.body[0].expression, body.parent = parent), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8), node.params = deserializeBoxFormalParameters(pos + 16), node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 24), node.body = body, node.generator = !1, parent = previousParent, node;
+	}, body = deserializeBoxFunctionBody(pos + 40);
+	return expression === !0 && (body = body.body[0].expression, body.parent = parent), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16), node.params = deserializeBoxFormalParameters(pos + 24), node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 32), node.body = body, node.generator = !1, parent = previousParent, node;
 }
 function deserializeYieldExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "YieldExpression",
-		delegate: deserializeBool(pos + 28),
+		delegate: deserializeBool(pos + 12),
 		argument: null,
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
 	};
-	return node.argument = deserializeOptionExpression(pos + 8), parent = previousParent, node;
+	return node.argument = deserializeOptionExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeClass(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2276,7 +2392,7 @@ function deserializeClass(pos) {
 		range: [start, end],
 		parent
 	};
-	return 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), parent = previousParent, node;
+	return 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), parent = previousParent, node;
 }
 function deserializeClassType(pos) {
 	switch (uint8[pos]) {
@@ -2295,7 +2411,7 @@ function deserializeClassBody(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.body = deserializeVecClassElement(pos + 8), parent = previousParent, node;
+	return node.body = deserializeVecClassElement(pos + 16), parent = previousParent, node;
 }
 function deserializeClassElement(pos) {
 	switch (uint8[pos]) {
@@ -2310,13 +2426,13 @@ function deserializeClassElement(pos) {
 function deserializeMethodDefinition(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
-		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),
@@ -2325,7 +2441,7 @@ function deserializeMethodDefinition(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = deserializeVecDecorator(pos + 8), node.key = deserializePropertyKey(pos + 32), node.value = deserializeBoxFunction(pos + 48), parent = previousParent, node;
+	return node.decorators = deserializeVecDecorator(pos + 16), node.key = deserializePropertyKey(pos + 40), node.value = deserializeBoxFunction(pos + 56), parent = previousParent, node;
 }
 function deserializeMethodDefinitionType(pos) {
 	switch (uint8[pos]) {
@@ -2337,14 +2453,14 @@ function deserializeMethodDefinitionType(pos) {
 function deserializePropertyDefinition(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
-		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),
@@ -2355,7 +2471,7 @@ function deserializePropertyDefinition(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = deserializeVecDecorator(pos + 8), node.key = deserializePropertyKey(pos + 32), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48), node.value = deserializeOptionExpression(pos + 56), parent = previousParent, node;
+	return node.decorators = deserializeVecDecorator(pos + 16), node.key = deserializePropertyKey(pos + 40), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56), node.value = deserializeOptionExpression(pos + 64), parent = previousParent, node;
 }
 function deserializePropertyDefinitionType(pos) {
 	switch (uint8[pos]) {
@@ -2378,7 +2494,7 @@ function deserializePrivateIdentifier(pos) {
 	return {
 		__proto__: NodeProto,
 		type: "PrivateIdentifier",
-		name: deserializeStr(pos + 8),
+		name: deserializeStr(pos + 16),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
@@ -2395,7 +2511,7 @@ function deserializeStaticBlock(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.body = deserializeVecStatement(pos + 8), parent = previousParent, node;
+	return node.body = deserializeVecStatement(pos + 16), parent = previousParent, node;
 }
 function deserializeAccessorPropertyType(pos) {
 	switch (uint8[pos]) {
@@ -2407,14 +2523,14 @@ function deserializeAccessorPropertyType(pos) {
 function deserializeAccessorProperty(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
-		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,
@@ -2425,7 +2541,7 @@ function deserializeAccessorProperty(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = deserializeVecDecorator(pos + 8), node.key = deserializePropertyKey(pos + 32), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48), node.value = deserializeOptionExpression(pos + 56), node.declare = !1, node.optional = !1, node.readonly = !1, parent = previousParent, node;
+	return node.decorators = deserializeVecDecorator(pos + 16), node.key = deserializePropertyKey(pos + 40), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 56), node.value = deserializeOptionExpression(pos + 64), node.declare = !1, node.optional = !1, node.readonly = !1, parent = previousParent, node;
 }
 function deserializeImportExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2433,13 +2549,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],
 		parent
 	};
-	return node.source = deserializeExpression(pos + 8), node.options = deserializeOptionExpression(pos + 24), parent = previousParent, node;
+	return node.source = deserializeExpression(pos + 16), node.options = deserializeOptionExpression(pos + 32), parent = previousParent, node;
 }
 function deserializeImportDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2447,17 +2563,17 @@ 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],
 		parent
-	}, specifiers = deserializeOptionVecImportDeclarationSpecifier(pos + 8);
+	}, specifiers = deserializeOptionVecImportDeclarationSpecifier(pos + 16);
 	specifiers === null && (specifiers = []);
-	let withClause = deserializeOptionBoxWithClause(pos + 80);
-	return node.specifiers = specifiers, node.source = deserializeStringLiteral(pos + 32), node.attributes = withClause === null ? [] : withClause.attributes, parent = previousParent, node;
+	let withClause = deserializeOptionBoxWithClause(pos + 88);
+	return node.specifiers = specifiers, node.source = deserializeStringLiteral(pos + 40), node.attributes = withClause === null ? [] : withClause.attributes, parent = previousParent, node;
 }
 function deserializeImportPhase(pos) {
 	switch (uint8[pos]) {
@@ -2480,13 +2596,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],
 		parent
 	};
-	return node.imported = deserializeModuleExportName(pos + 8), node.local = deserializeBindingIdentifier(pos + 64), parent = previousParent, node;
+	return node.imported = deserializeModuleExportName(pos + 16), node.local = deserializeBindingIdentifier(pos + 72), parent = previousParent, node;
 }
 function deserializeImportDefaultSpecifier(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2498,7 +2614,7 @@ function deserializeImportDefaultSpecifier(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.local = deserializeBindingIdentifier(pos + 8), parent = previousParent, node;
+	return node.local = deserializeBindingIdentifier(pos + 16), parent = previousParent, node;
 }
 function deserializeImportNamespaceSpecifier(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2510,17 +2626,10 @@ function deserializeImportNamespaceSpecifier(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.local = deserializeBindingIdentifier(pos + 8), parent = previousParent, node;
+	return node.local = deserializeBindingIdentifier(pos + 16), parent = previousParent, node;
 }
 function deserializeWithClause(pos) {
-	let start, end;
-	return {
-		__proto__: NodeProto,
-		attributes: deserializeVecImportAttribute(pos + 8),
-		start: start = deserializeU32(pos),
-		end: end = deserializeU32(pos + 4),
-		range: [start, end]
-	};
+	return { attributes: deserializeVecImportAttribute(pos + 16) };
 }
 function deserializeImportAttribute(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2533,7 +2642,7 @@ function deserializeImportAttribute(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.key = deserializeImportAttributeKey(pos + 8), node.value = deserializeStringLiteral(pos + 64), parent = previousParent, node;
+	return node.key = deserializeImportAttributeKey(pos + 16), node.value = deserializeStringLiteral(pos + 72), parent = previousParent, node;
 }
 function deserializeImportAttributeKey(pos) {
 	switch (uint8[pos]) {
@@ -2549,14 +2658,14 @@ 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],
 		parent
-	}, withClause = deserializeOptionBoxWithClause(pos + 96);
-	return node.declaration = deserializeOptionDeclaration(pos + 8), node.specifiers = deserializeVecExportSpecifier(pos + 24), node.source = deserializeOptionStringLiteral(pos + 48), node.attributes = withClause === null ? [] : withClause.attributes, parent = previousParent, node;
+	}, withClause = deserializeOptionBoxWithClause(pos + 104);
+	return node.declaration = deserializeOptionDeclaration(pos + 16), node.specifiers = deserializeVecExportSpecifier(pos + 32), node.source = deserializeOptionStringLiteral(pos + 56), node.attributes = withClause === null ? [] : withClause.attributes, parent = previousParent, node;
 }
 function deserializeExportDefaultDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2569,7 +2678,7 @@ function deserializeExportDefaultDeclaration(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.declaration = deserializeExportDefaultDeclarationKind(pos + 8), node.exportKind = "value", parent = previousParent, node;
+	return node.declaration = deserializeExportDefaultDeclarationKind(pos + 16), node.exportKind = "value", parent = previousParent, node;
 }
 function deserializeExportAllDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2578,13 +2687,13 @@ 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],
 		parent
-	}, withClause = deserializeOptionBoxWithClause(pos + 112);
-	return node.exported = deserializeOptionModuleExportName(pos + 8), node.source = deserializeStringLiteral(pos + 64), node.attributes = withClause === null ? [] : withClause.attributes, parent = previousParent, node;
+	}, withClause = deserializeOptionBoxWithClause(pos + 120);
+	return node.exported = deserializeOptionModuleExportName(pos + 16), node.source = deserializeStringLiteral(pos + 72), node.attributes = withClause === null ? [] : withClause.attributes, parent = previousParent, node;
 }
 function deserializeExportSpecifier(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2592,13 +2701,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],
 		parent
 	};
-	return node.local = deserializeModuleExportName(pos + 8), node.exported = deserializeModuleExportName(pos + 64), parent = previousParent, node;
+	return node.local = deserializeModuleExportName(pos + 16), node.exported = deserializeModuleExportName(pos + 72), parent = previousParent, node;
 }
 function deserializeExportDefaultDeclarationKind(pos) {
 	switch (uint8[pos]) {
@@ -2670,7 +2779,7 @@ function deserializeV8IntrinsicExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.name = deserializeIdentifierName(pos + 8), node.arguments = deserializeVecArgument(pos + 40), parent = previousParent, node;
+	return node.name = deserializeIdentifierName(pos + 16), node.arguments = deserializeVecArgument(pos + 48), parent = previousParent, node;
 }
 function deserializeBooleanLiteral(pos) {
 	let value = deserializeBool(pos + 12), start = deserializeU32(pos), end = deserializeU32(pos + 4), previousParent = parent, node = parent = {
@@ -2703,7 +2812,7 @@ function deserializeNumericLiteral(pos) {
 	return {
 		__proto__: NodeProto,
 		type: "Literal",
-		value: deserializeF64(pos + 8),
+		value: deserializeF64(pos + 32),
 		raw: deserializeOptionStr(pos + 16),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
@@ -2716,26 +2825,26 @@ function deserializeStringLiteral(pos) {
 		__proto__: NodeProto,
 		type: "Literal",
 		value: null,
-		raw: deserializeOptionStr(pos + 24),
+		raw: deserializeOptionStr(pos + 32),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, value = deserializeStr(pos + 8);
-	return deserializeBool(pos + 44) && (value = value.replace(/\uFFFD(.{4})/g, (_, hex) => StringFromCodePoint(parseInt(hex, 16)))), node.value = value, parent = previousParent, node;
+	}, value = deserializeStr(pos + 16);
+	return deserializeBool(pos + 12) && (value = value.replace(/\uFFFD(.{4})/g, (_, hex) => StringFromCodePoint(parseInt(hex, 16)))), node.value = value, parent = previousParent, node;
 }
 function deserializeBigIntLiteral(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "Literal",
 		value: null,
-		raw: deserializeOptionStr(pos + 24),
+		raw: deserializeOptionStr(pos + 32),
 		bigint: null,
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, bigint = deserializeStr(pos + 8);
+	}, bigint = deserializeStr(pos + 16);
 	return node.value = BigInt(bigint), node.bigint = bigint, parent = previousParent, node;
 }
 function deserializeRegExpLiteral(pos) {
@@ -2743,13 +2852,13 @@ function deserializeRegExpLiteral(pos) {
 		__proto__: NodeProto,
 		type: "Literal",
 		value: null,
-		raw: deserializeOptionStr(pos + 40),
+		raw: deserializeOptionStr(pos + 48),
 		regex: null,
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, regex = deserializeRegExp(pos + 8), value = null;
+	}, regex = deserializeRegExp(pos + 16), value = null;
 	try {
 		value = new RegExp(regex.pattern, regex.flags);
 	} catch {}
@@ -2776,8 +2885,8 @@ function deserializeJSXElement(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, closingElement = deserializeOptionBoxJSXClosingElement(pos + 40), openingElement = deserializeBoxJSXOpeningElement(pos + 8);
-	return closingElement === null && (openingElement.selfClosing = !0), node.openingElement = openingElement, node.children = deserializeVecJSXChild(pos + 16), node.closingElement = closingElement, parent = previousParent, node;
+	}, closingElement = deserializeOptionBoxJSXClosingElement(pos + 48), openingElement = deserializeBoxJSXOpeningElement(pos + 16);
+	return closingElement === null && (openingElement.selfClosing = !0), node.openingElement = openingElement, node.children = deserializeVecJSXChild(pos + 24), node.closingElement = closingElement, parent = previousParent, node;
 }
 function deserializeJSXOpeningElement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2792,7 +2901,7 @@ function deserializeJSXOpeningElement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.name = deserializeJSXElementName(pos + 8), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), node.attributes = deserializeVecJSXAttributeItem(pos + 32), node.selfClosing = !1, parent = previousParent, node;
+	return node.name = deserializeJSXElementName(pos + 16), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), node.attributes = deserializeVecJSXAttributeItem(pos + 40), node.selfClosing = !1, parent = previousParent, node;
 }
 function deserializeJSXClosingElement(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2804,7 +2913,7 @@ function deserializeJSXClosingElement(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.name = deserializeJSXElementName(pos + 8), parent = previousParent, node;
+	return node.name = deserializeJSXElementName(pos + 16), parent = previousParent, node;
 }
 function deserializeJSXFragment(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2818,7 +2927,7 @@ function deserializeJSXFragment(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.openingFragment = deserializeJSXOpeningFragment(pos + 8), node.children = deserializeVecJSXChild(pos + 24), node.closingFragment = deserializeJSXClosingFragment(pos + 48), parent = previousParent, node;
+	return node.openingFragment = deserializeJSXOpeningFragment(pos + 16), node.children = deserializeVecJSXChild(pos + 32), node.closingFragment = deserializeJSXClosingFragment(pos + 56), parent = previousParent, node;
 }
 function deserializeJSXOpeningFragment(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2883,7 +2992,7 @@ function deserializeJSXNamespacedName(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.namespace = deserializeJSXIdentifier(pos + 8), node.name = deserializeJSXIdentifier(pos + 40), parent = previousParent, node;
+	return node.namespace = deserializeJSXIdentifier(pos + 16), node.name = deserializeJSXIdentifier(pos + 48), parent = previousParent, node;
 }
 function deserializeJSXMemberExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -2896,7 +3005,7 @@ function deserializeJSXMemberExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.object = deserializeJSXMemberExpressionObject(pos + 8), node.property = deserializeJSXIdentifier(pos + 24), parent = previousParent, node;
+	return node.object = deserializeJSXMemberExpressionObject(pos + 16), node.property = deserializeJSXIdentifier(pos + 32), parent = previousParent, node;
 }
 function deserializeJSXMemberExpressionObject(pos) {
 	switch (uint8[pos]) {
@@ -2936,7 +3045,7 @@ function deserializeJSXExpressionContainer(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeJSXExpression(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeJSXExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeJSXExpression(pos) {
 	switch (uint8[pos]) {
@@ -3016,7 +3125,7 @@ function deserializeJSXAttribute(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.name = deserializeJSXAttributeName(pos + 8), node.value = deserializeOptionJSXAttributeValue(pos + 24), parent = previousParent, node;
+	return node.name = deserializeJSXAttributeName(pos + 16), node.value = deserializeOptionJSXAttributeValue(pos + 32), parent = previousParent, node;
 }
 function deserializeJSXSpreadAttribute(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3028,7 +3137,7 @@ function deserializeJSXSpreadAttribute(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.argument = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.argument = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeJSXAttributeName(pos) {
 	switch (uint8[pos]) {
@@ -3051,7 +3160,7 @@ function deserializeJSXIdentifier(pos) {
 	return {
 		__proto__: NodeProto,
 		type: "JSXIdentifier",
-		name: deserializeStr(pos + 8),
+		name: deserializeStr(pos + 16),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
@@ -3078,15 +3187,15 @@ function deserializeJSXSpreadChild(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeJSXText(pos) {
 	let start, end;
 	return {
 		__proto__: NodeProto,
 		type: "JSXText",
-		value: deserializeStr(pos + 8),
-		raw: deserializeOptionStr(pos + 24),
+		value: deserializeStr(pos + 16),
+		raw: deserializeOptionStr(pos + 32),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
@@ -3106,7 +3215,7 @@ function deserializeTSThisParameter(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = [], node.name = "this", node.optional = !1, node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 16), parent = previousParent, node;
+	return node.decorators = [], node.name = "this", node.optional = !1, node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24), parent = previousParent, node;
 }
 function deserializeTSEnumDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3114,14 +3223,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],
 		parent
 	};
-	return node.id = deserializeBindingIdentifier(pos + 8), node.body = deserializeTSEnumBody(pos + 40), parent = previousParent, node;
+	return node.id = deserializeBindingIdentifier(pos + 16), node.body = deserializeTSEnumBody(pos + 48), parent = previousParent, node;
 }
 function deserializeTSEnumBody(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3133,7 +3242,7 @@ function deserializeTSEnumBody(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.members = deserializeVecTSEnumMember(pos + 8), parent = previousParent, node;
+	return node.members = deserializeVecTSEnumMember(pos + 16), parent = previousParent, node;
 }
 function deserializeTSEnumMember(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3147,7 +3256,7 @@ function deserializeTSEnumMember(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.id = deserializeTSEnumMemberName(pos + 8), node.initializer = deserializeOptionExpression(pos + 24), node.computed = deserializeU8(pos + 8) > 1, parent = previousParent, node;
+	return node.id = deserializeTSEnumMemberName(pos + 16), node.initializer = deserializeOptionExpression(pos + 32), node.computed = deserializeU8(pos + 16) > 1, parent = previousParent, node;
 }
 function deserializeTSEnumMemberName(pos) {
 	switch (uint8[pos]) {
@@ -3168,7 +3277,7 @@ function deserializeTSTypeAnnotation(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeAnnotation = deserializeTSType(pos + 8), parent = previousParent, node;
+	return node.typeAnnotation = deserializeTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSLiteralType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3180,7 +3289,7 @@ function deserializeTSLiteralType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.literal = deserializeTSLiteral(pos + 8), parent = previousParent, node;
+	return node.literal = deserializeTSLiteral(pos + 16), parent = previousParent, node;
 }
 function deserializeTSLiteral(pos) {
 	switch (uint8[pos]) {
@@ -3248,7 +3357,7 @@ function deserializeTSConditionalType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.checkType = deserializeTSType(pos + 8), node.extendsType = deserializeTSType(pos + 24), node.trueType = deserializeTSType(pos + 40), node.falseType = deserializeTSType(pos + 56), parent = previousParent, node;
+	return node.checkType = deserializeTSType(pos + 16), node.extendsType = deserializeTSType(pos + 32), node.trueType = deserializeTSType(pos + 48), node.falseType = deserializeTSType(pos + 64), parent = previousParent, node;
 }
 function deserializeTSUnionType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3260,7 +3369,7 @@ function deserializeTSUnionType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.types = deserializeVecTSType(pos + 8), parent = previousParent, node;
+	return node.types = deserializeVecTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSIntersectionType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3272,24 +3381,24 @@ function deserializeTSIntersectionType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.types = deserializeVecTSType(pos + 8), parent = previousParent, node;
+	return node.types = deserializeVecTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSParenthesizedType(pos) {
 	let node;
-	return node = deserializeTSType(pos + 8), node;
+	return node = deserializeTSType(pos + 16), node;
 }
 function deserializeTSTypeOperator(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "TSTypeOperator",
-		operator: deserializeTSTypeOperatorOperator(pos + 28),
+		operator: deserializeTSTypeOperatorOperator(pos + 12),
 		typeAnnotation: null,
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
 	};
-	return node.typeAnnotation = deserializeTSType(pos + 8), parent = previousParent, node;
+	return node.typeAnnotation = deserializeTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSTypeOperatorOperator(pos) {
 	switch (uint8[pos]) {
@@ -3309,7 +3418,7 @@ function deserializeTSArrayType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.elementType = deserializeTSType(pos + 8), parent = previousParent, node;
+	return node.elementType = deserializeTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSIndexedAccessType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3322,7 +3431,7 @@ function deserializeTSIndexedAccessType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.objectType = deserializeTSType(pos + 8), node.indexType = deserializeTSType(pos + 24), parent = previousParent, node;
+	return node.objectType = deserializeTSType(pos + 16), node.indexType = deserializeTSType(pos + 32), parent = previousParent, node;
 }
 function deserializeTSTupleType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3334,7 +3443,7 @@ function deserializeTSTupleType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.elementTypes = deserializeVecTSTupleElement(pos + 8), parent = previousParent, node;
+	return node.elementTypes = deserializeVecTSTupleElement(pos + 16), parent = previousParent, node;
 }
 function deserializeTSNamedTupleMember(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3342,13 +3451,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],
 		parent
 	};
-	return node.label = deserializeIdentifierName(pos + 8), node.elementType = deserializeTSTupleElement(pos + 40), parent = previousParent, node;
+	return node.label = deserializeIdentifierName(pos + 16), node.elementType = deserializeTSTupleElement(pos + 48), parent = previousParent, node;
 }
 function deserializeTSOptionalType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3360,7 +3469,7 @@ function deserializeTSOptionalType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeAnnotation = deserializeTSType(pos + 8), parent = previousParent, node;
+	return node.typeAnnotation = deserializeTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSRestType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3372,7 +3481,7 @@ function deserializeTSRestType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeAnnotation = deserializeTSType(pos + 8), parent = previousParent, node;
+	return node.typeAnnotation = deserializeTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSTupleElement(pos) {
 	switch (uint8[pos]) {
@@ -3583,7 +3692,7 @@ function deserializeTSTypeReference(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeName = deserializeTSTypeName(pos + 8), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), parent = previousParent, node;
+	return node.typeName = deserializeTSTypeName(pos + 16), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), parent = previousParent, node;
 }
 function deserializeTSTypeName(pos) {
 	switch (uint8[pos]) {
@@ -3604,7 +3713,7 @@ function deserializeTSQualifiedName(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.left = deserializeTSTypeName(pos + 8), node.right = deserializeIdentifierName(pos + 24), parent = previousParent, node;
+	return node.left = deserializeTSTypeName(pos + 16), node.right = deserializeIdentifierName(pos + 32), parent = previousParent, node;
 }
 function deserializeTSTypeParameterInstantiation(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3616,7 +3725,7 @@ function deserializeTSTypeParameterInstantiation(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.params = deserializeVecTSType(pos + 8), parent = previousParent, node;
+	return node.params = deserializeVecTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeTSTypeParameter(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3625,15 +3734,15 @@ 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],
 		parent
 	};
-	return node.name = deserializeBindingIdentifier(pos + 8), node.constraint = deserializeOptionTSType(pos + 40), node.default = deserializeOptionTSType(pos + 56), parent = previousParent, node;
+	return node.name = deserializeBindingIdentifier(pos + 16), node.constraint = deserializeOptionTSType(pos + 48), node.default = deserializeOptionTSType(pos + 64), parent = previousParent, node;
 }
 function deserializeTSTypeParameterDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3645,7 +3754,7 @@ function deserializeTSTypeParameterDeclaration(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.params = deserializeVecTSTypeParameter(pos + 8), parent = previousParent, node;
+	return node.params = deserializeVecTSTypeParameter(pos + 16), parent = previousParent, node;
 }
 function deserializeTSTypeAliasDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3660,7 +3769,7 @@ function deserializeTSTypeAliasDeclaration(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.id = deserializeBindingIdentifier(pos + 8), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 40), node.typeAnnotation = deserializeTSType(pos + 48), parent = previousParent, node;
+	return node.id = deserializeBindingIdentifier(pos + 16), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 48), node.typeAnnotation = deserializeTSType(pos + 56), parent = previousParent, node;
 }
 function deserializeTSAccessibility(pos) {
 	switch (uint8[pos]) {
@@ -3680,7 +3789,7 @@ function deserializeTSClassImplements(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, expression = deserializeTSTypeName(pos + 8);
+	}, expression = deserializeTSTypeName(pos + 16);
 	if (expression.type === "TSQualifiedName") {
 		let object = expression.left, { right } = expression, start, end, previous = expression = {
 			__proto__: NodeProto,
@@ -3714,7 +3823,7 @@ function deserializeTSClassImplements(pos) {
 			}, right.parent = previous, object = left;
 		}
 	}
-	return node.expression = expression, node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), parent = previousParent, node;
+	return node.expression = expression, node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), parent = previousParent, node;
 }
 function deserializeTSInterfaceDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3730,7 +3839,7 @@ function deserializeTSInterfaceDeclaration(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.id = deserializeBindingIdentifier(pos + 8), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 40), node.extends = deserializeVecTSInterfaceHeritage(pos + 48), node.body = deserializeBoxTSInterfaceBody(pos + 72), parent = previousParent, node;
+	return node.id = deserializeBindingIdentifier(pos + 16), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 48), node.extends = deserializeVecTSInterfaceHeritage(pos + 56), node.body = deserializeBoxTSInterfaceBody(pos + 80), parent = previousParent, node;
 }
 function deserializeTSInterfaceBody(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3742,15 +3851,15 @@ function deserializeTSInterfaceBody(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.body = deserializeVecTSSignature(pos + 8), parent = previousParent, node;
+	return node.body = deserializeVecTSSignature(pos + 16), parent = previousParent, node;
 }
 function deserializeTSPropertySignature(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		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,
@@ -3760,7 +3869,7 @@ function deserializeTSPropertySignature(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.key = deserializePropertyKey(pos + 8), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24), node.static = !1, parent = previousParent, node;
+	return node.key = deserializePropertyKey(pos + 16), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32), node.static = !1, parent = previousParent, node;
 }
 function deserializeTSSignature(pos) {
 	switch (uint8[pos]) {
@@ -3778,15 +3887,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],
 		parent
 	};
-	return node.parameters = deserializeVecTSIndexSignatureName(pos + 8), node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 32), parent = previousParent, node;
+	return node.parameters = deserializeVecTSIndexSignatureName(pos + 16), node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 40), parent = previousParent, node;
 }
 function deserializeTSCallSignatureDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3799,8 +3908,8 @@ function deserializeTSCallSignatureDeclaration(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, params = deserializeBoxFormalParameters(pos + 24), thisParam = deserializeOptionBoxTSThisParameter(pos + 16);
-	return thisParam !== null && params.unshift(thisParam), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8), node.params = params, node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 32), parent = previousParent, node;
+	}, params = deserializeBoxFormalParameters(pos + 32), thisParam = deserializeOptionBoxTSThisParameter(pos + 24);
+	return thisParam !== null && params.unshift(thisParam), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16), node.params = params, node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 40), parent = previousParent, node;
 }
 function deserializeTSMethodSignatureKind(pos) {
 	switch (uint8[pos]) {
@@ -3828,8 +3937,8 @@ function deserializeTSMethodSignature(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, params = deserializeBoxFormalParameters(pos + 40), thisParam = deserializeOptionBoxTSThisParameter(pos + 32);
-	return thisParam !== null && params.unshift(thisParam), node.key = deserializePropertyKey(pos + 8), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 24), node.params = params, node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 48), node.readonly = !1, node.static = !1, parent = previousParent, node;
+	}, params = deserializeBoxFormalParameters(pos + 48), thisParam = deserializeOptionBoxTSThisParameter(pos + 40);
+	return thisParam !== null && params.unshift(thisParam), node.key = deserializePropertyKey(pos + 16), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 32), node.params = params, node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 56), node.readonly = !1, node.static = !1, parent = previousParent, node;
 }
 function deserializeTSConstructSignatureDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3843,14 +3952,14 @@ function deserializeTSConstructSignatureDeclaration(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8), node.params = deserializeBoxFormalParameters(pos + 16), node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 24), parent = previousParent, node;
+	return node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16), node.params = deserializeBoxFormalParameters(pos + 24), node.returnType = deserializeOptionBoxTSTypeAnnotation(pos + 32), parent = previousParent, node;
 }
 function deserializeTSIndexSignatureName(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "Identifier",
 		decorators: null,
-		name: deserializeStr(pos + 8),
+		name: deserializeStr(pos + 16),
 		optional: null,
 		typeAnnotation: null,
 		start: start = deserializeU32(pos),
@@ -3858,7 +3967,7 @@ function deserializeTSIndexSignatureName(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.decorators = [], node.optional = !1, node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 24), parent = previousParent, node;
+	return node.decorators = [], node.optional = !1, node.typeAnnotation = deserializeBoxTSTypeAnnotation(pos + 32), parent = previousParent, node;
 }
 function deserializeTSInterfaceHeritage(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -3871,21 +3980,21 @@ function deserializeTSInterfaceHeritage(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), parent = previousParent, node;
 }
 function deserializeTSTypePredicate(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		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],
 		parent
 	};
-	return node.parameterName = deserializeTSTypePredicateName(pos + 8), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32), parent = previousParent, node;
+	return node.parameterName = deserializeTSTypePredicateName(pos + 16), node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 40), parent = previousParent, node;
 }
 function deserializeTSTypePredicateName(pos) {
 	switch (uint8[pos]) {
@@ -3895,7 +4004,7 @@ function deserializeTSTypePredicateName(pos) {
 	}
 }
 function deserializeTSModuleDeclaration(pos) {
-	let kind = deserializeTSModuleDeclarationKind(pos + 88), start = deserializeU32(pos), end = deserializeU32(pos + 4), declare = deserializeBool(pos + 89), node, previousParent = parent, body = deserializeOptionTSModuleDeclarationBody(pos + 64);
+	let kind = deserializeTSModuleDeclarationKind(pos + 88), start = deserializeU32(pos), end = deserializeU32(pos + 4), declare = deserializeBool(pos + 89), node, previousParent = parent, body = deserializeOptionTSModuleDeclarationBody(pos + 72);
 	if (body === null) node = parent = {
 		__proto__: NodeProto,
 		type: "TSModuleDeclaration",
@@ -3907,7 +4016,7 @@ function deserializeTSModuleDeclaration(pos) {
 		end,
 		range: [start, end],
 		parent
-	}, node.id = deserializeTSModuleDeclarationName(pos + 8);
+	}, node.id = deserializeTSModuleDeclarationName(pos + 16);
 	else {
 		node = parent = {
 			__proto__: NodeProto,
@@ -3922,7 +4031,7 @@ function deserializeTSModuleDeclaration(pos) {
 			range: [start, end],
 			parent
 		};
-		let id = deserializeTSModuleDeclarationName(pos + 8);
+		let id = deserializeTSModuleDeclarationName(pos + 16);
 		if (body.type === "TSModuleBlock") node.id = id, body.parent = node;
 		else {
 			let innerId = body.id;
@@ -4001,11 +4110,11 @@ function deserializeTSGlobalDeclaration(pos) {
 		name: "global",
 		optional: !1,
 		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],
 		parent
-	}, node.body = deserializeTSModuleBlock(pos + 16), node.kind = "global", node.global = !0, parent = previousParent, node;
+	}, node.body = deserializeTSModuleBlock(pos + 24), node.kind = "global", node.global = !0, parent = previousParent, node;
 }
 function deserializeTSModuleBlock(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4016,8 +4125,8 @@ function deserializeTSModuleBlock(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, body = deserializeVecDirective(pos + 8);
-	return body.push(...deserializeVecStatement(pos + 32)), node.body = body, parent = previousParent, node;
+	}, body = deserializeVecDirective(pos + 16);
+	return body.push(...deserializeVecStatement(pos + 40)), node.body = body, parent = previousParent, node;
 }
 function deserializeTSTypeLiteral(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4029,7 +4138,7 @@ function deserializeTSTypeLiteral(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.members = deserializeVecTSSignature(pos + 8), parent = previousParent, node;
+	return node.members = deserializeVecTSSignature(pos + 16), parent = previousParent, node;
 }
 function deserializeTSInferType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4041,7 +4150,7 @@ function deserializeTSInferType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeParameter = deserializeBoxTSTypeParameter(pos + 8), parent = previousParent, node;
+	return node.typeParameter = deserializeBoxTSTypeParameter(pos + 16), parent = previousParent, node;
 }
 function deserializeTSTypeQuery(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4054,7 +4163,7 @@ function deserializeTSTypeQuery(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.exprName = deserializeTSTypeQueryExprName(pos + 8), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 24), parent = previousParent, node;
+	return node.exprName = deserializeTSTypeQueryExprName(pos + 16), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 32), parent = previousParent, node;
 }
 function deserializeTSTypeQueryExprName(pos) {
 	switch (uint8[pos]) {
@@ -4078,7 +4187,7 @@ function deserializeTSImportType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.source = deserializeStringLiteral(pos + 8), node.options = deserializeOptionBoxObjectExpression(pos + 56), node.qualifier = deserializeOptionTSImportTypeQualifier(pos + 64), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 80), parent = previousParent, node;
+	return node.source = deserializeStringLiteral(pos + 16), node.options = deserializeOptionBoxObjectExpression(pos + 64), node.qualifier = deserializeOptionTSImportTypeQualifier(pos + 72), node.typeArguments = deserializeOptionBoxTSTypeParameterInstantiation(pos + 88), parent = previousParent, node;
 }
 function deserializeTSImportTypeQualifier(pos) {
 	switch (uint8[pos]) {
@@ -4098,7 +4207,7 @@ function deserializeTSImportTypeQualifiedName(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.left = deserializeTSImportTypeQualifier(pos + 8), node.right = deserializeIdentifierName(pos + 24), parent = previousParent, node;
+	return node.left = deserializeTSImportTypeQualifier(pos + 16), node.right = deserializeIdentifierName(pos + 32), parent = previousParent, node;
 }
 function deserializeTSFunctionType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4111,8 +4220,8 @@ function deserializeTSFunctionType(pos) {
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
-	}, params = deserializeBoxFormalParameters(pos + 24), thisParam = deserializeOptionBoxTSThisParameter(pos + 16);
-	return thisParam !== null && params.unshift(thisParam), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8), node.params = params, node.returnType = deserializeBoxTSTypeAnnotation(pos + 32), parent = previousParent, node;
+	}, params = deserializeBoxFormalParameters(pos + 32), thisParam = deserializeOptionBoxTSThisParameter(pos + 24);
+	return thisParam !== null && params.unshift(thisParam), node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16), node.params = params, node.returnType = deserializeBoxTSTypeAnnotation(pos + 40), parent = previousParent, node;
 }
 function deserializeTSConstructorType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4127,7 +4236,7 @@ function deserializeTSConstructorType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 8), node.params = deserializeBoxFormalParameters(pos + 16), node.returnType = deserializeBoxTSTypeAnnotation(pos + 24), parent = previousParent, node;
+	return node.typeParameters = deserializeOptionBoxTSTypeParameterDeclaration(pos + 16), node.params = deserializeBoxFormalParameters(pos + 24), node.returnType = deserializeBoxTSTypeAnnotation(pos + 32), parent = previousParent, node;
 }
 function deserializeTSMappedType(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4144,7 +4253,7 @@ function deserializeTSMappedType(pos) {
 		range: [start, end],
 		parent
 	}, optional = deserializeOptionTSMappedTypeModifierOperator(pos + 96);
-	return optional === null && (optional = !1), node.key = deserializeBindingIdentifier(pos + 8), node.constraint = deserializeTSType(pos + 40), node.nameType = deserializeOptionTSType(pos + 56), node.typeAnnotation = deserializeOptionTSType(pos + 72), node.optional = optional, parent = previousParent, node;
+	return optional === null && (optional = !1), node.key = deserializeBindingIdentifier(pos + 16), node.constraint = deserializeTSType(pos + 48), node.nameType = deserializeOptionTSType(pos + 64), node.typeAnnotation = deserializeOptionTSType(pos + 80), node.optional = optional, parent = previousParent, node;
 }
 function deserializeTSMappedTypeModifierOperator(pos) {
 	switch (uint8[pos]) {
@@ -4165,7 +4274,7 @@ function deserializeTSTemplateLiteralType(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.quasis = deserializeVecTemplateElement(pos + 8), node.types = deserializeVecTSType(pos + 32), parent = previousParent, node;
+	return node.quasis = deserializeVecTemplateElement(pos + 16), node.types = deserializeVecTSType(pos + 40), parent = previousParent, node;
 }
 function deserializeTSAsExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4178,7 +4287,7 @@ function deserializeTSAsExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), node.typeAnnotation = deserializeTSType(pos + 24), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), node.typeAnnotation = deserializeTSType(pos + 32), parent = previousParent, node;
 }
 function deserializeTSSatisfiesExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4191,7 +4300,7 @@ function deserializeTSSatisfiesExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), node.typeAnnotation = deserializeTSType(pos + 24), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), node.typeAnnotation = deserializeTSType(pos + 32), parent = previousParent, node;
 }
 function deserializeTSTypeAssertion(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4204,7 +4313,7 @@ function deserializeTSTypeAssertion(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.typeAnnotation = deserializeTSType(pos + 8), node.expression = deserializeExpression(pos + 24), parent = previousParent, node;
+	return node.typeAnnotation = deserializeTSType(pos + 16), node.expression = deserializeExpression(pos + 32), parent = previousParent, node;
 }
 function deserializeTSImportEqualsDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4212,13 +4321,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],
 		parent
 	};
-	return node.id = deserializeBindingIdentifier(pos + 8), node.moduleReference = deserializeTSModuleReference(pos + 40), parent = previousParent, node;
+	return node.id = deserializeBindingIdentifier(pos + 16), node.moduleReference = deserializeTSModuleReference(pos + 48), parent = previousParent, node;
 }
 function deserializeTSModuleReference(pos) {
 	switch (uint8[pos]) {
@@ -4238,7 +4347,7 @@ function deserializeTSExternalModuleReference(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeStringLiteral(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeStringLiteral(pos + 16), parent = previousParent, node;
 }
 function deserializeTSNonNullExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4250,7 +4359,7 @@ function deserializeTSNonNullExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeDecorator(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4262,7 +4371,7 @@ function deserializeDecorator(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeTSExportAssignment(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4274,7 +4383,7 @@ function deserializeTSExportAssignment(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), parent = previousParent, node;
 }
 function deserializeTSNamespaceExportDeclaration(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4286,7 +4395,7 @@ function deserializeTSNamespaceExportDeclaration(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.id = deserializeIdentifierName(pos + 8), parent = previousParent, node;
+	return node.id = deserializeIdentifierName(pos + 16), parent = previousParent, node;
 }
 function deserializeTSInstantiationExpression(pos) {
 	let start, end, previousParent = parent, node = parent = {
@@ -4299,7 +4408,7 @@ function deserializeTSInstantiationExpression(pos) {
 		range: [start, end],
 		parent
 	};
-	return node.expression = deserializeExpression(pos + 8), node.typeArguments = deserializeBoxTSTypeParameterInstantiation(pos + 24), parent = previousParent, node;
+	return node.expression = deserializeExpression(pos + 16), node.typeArguments = deserializeBoxTSTypeParameterInstantiation(pos + 32), parent = previousParent, node;
 }
 function deserializeImportOrExportKind(pos) {
 	switch (uint8[pos]) {
@@ -4313,26 +4422,26 @@ function deserializeJSDocNullableType(pos) {
 		__proto__: NodeProto,
 		type: "TSJSDocNullableType",
 		typeAnnotation: null,
-		postfix: deserializeBool(pos + 28),
+		postfix: deserializeBool(pos + 12),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
 	};
-	return node.typeAnnotation = deserializeTSType(pos + 8), parent = previousParent, node;
+	return node.typeAnnotation = deserializeTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeJSDocNonNullableType(pos) {
 	let start, end, previousParent = parent, node = parent = {
 		__proto__: NodeProto,
 		type: "TSJSDocNonNullableType",
 		typeAnnotation: null,
-		postfix: deserializeBool(pos + 28),
+		postfix: deserializeBool(pos + 12),
 		start: start = deserializeU32(pos),
 		end: end = deserializeU32(pos + 4),
 		range: [start, end],
 		parent
 	};
-	return node.typeAnnotation = deserializeTSType(pos + 8), parent = previousParent, node;
+	return node.typeAnnotation = deserializeTSType(pos + 16), parent = previousParent, node;
 }
 function deserializeJSDocUnknownType(pos) {
 	let start, end;
@@ -4345,6 +4454,14 @@ function deserializeJSDocUnknownType(pos) {
 		parent
 	};
 }
+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 deserializeAssignmentOperator(pos) {
 	switch (uint8[pos]) {
 		case 0: return "=";
@@ -4420,20 +4537,6 @@ function deserializeUpdateOperator(pos) {
 		default: throw Error(`Unexpected discriminant ${uint8[pos]} for UpdateOperator`);
 	}
 }
-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 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 "";
@@ -4788,7 +4891,7 @@ function deserializeOptionForStatementInit(pos) {
 	return uint8[pos] === 65 ? null : deserializeForStatementInit(pos);
 }
 function deserializeOptionLabelIdentifier(pos) {
-	return uint32[pos + 8 >> 2] === 0 && uint32[pos + 12 >> 2] === 0 ? null : deserializeLabelIdentifier(pos);
+	return uint32[pos + 16 >> 2] === 0 && uint32[pos + 20 >> 2] === 0 ? null : deserializeLabelIdentifier(pos);
 }
 function deserializeVecSwitchCase(pos) {
 	let arr = [], pos32 = pos >> 2;
@@ -4807,7 +4910,7 @@ function deserializeOptionBoxBlockStatement(pos) {
 	return uint32[pos >> 2] === 0 && uint32[pos + 4 >> 2] === 0 ? null : deserializeBoxBlockStatement(pos);
 }
 function deserializeOptionCatchParameter(pos) {
-	return uint8[pos + 8] === 4 ? null : deserializeCatchParameter(pos);
+	return uint8[pos + 16] === 4 ? null : deserializeCatchParameter(pos);
 }
 function deserializeBoxBindingIdentifier(pos) {
 	return deserializeBindingIdentifier(uint32[pos >> 2]);
@@ -4845,7 +4948,7 @@ function deserializeVecOptionBindingPattern(pos) {
 	return arr;
 }
 function deserializeOptionBindingIdentifier(pos) {
-	return uint32[pos + 8 >> 2] === 0 && uint32[pos + 12 >> 2] === 0 ? null : deserializeBindingIdentifier(pos);
+	return uint32[pos + 16 >> 2] === 0 && uint32[pos + 20 >> 2] === 0 ? null : deserializeBindingIdentifier(pos);
 }
 function deserializeBoxTSTypeParameterDeclaration(pos) {
 	return deserializeTSTypeParameterDeclaration(uint32[pos >> 2]);
@@ -4987,7 +5090,7 @@ function deserializeVecExportSpecifier(pos) {
 	return arr;
 }
 function deserializeOptionStringLiteral(pos) {
-	return uint8[pos + 44] === 2 ? null : deserializeStringLiteral(pos);
+	return uint8[pos + 12] === 2 ? null : deserializeStringLiteral(pos);
 }
 function deserializeOptionModuleExportName(pos) {
 	return uint8[pos] === 3 ? null : deserializeModuleExportName(pos);
@@ -4995,6 +5098,9 @@ function deserializeOptionModuleExportName(pos) {
 function deserializeF64(pos) {
 	return float64[pos >> 3];
 }
+function deserializeU8(pos) {
+	return uint8[pos];
+}
 function deserializeBoxJSXOpeningElement(pos) {
 	return deserializeJSXOpeningElement(uint32[pos >> 2]);
 }
@@ -5256,9 +5362,123 @@ function deserializeOptionTSMappedTypeModifierOperator(pos) {
 function deserializeBoxTSExternalModuleReference(pos) {
 	return deserializeTSExternalModuleReference(uint32[pos >> 2]);
 }
+function deserializeU32(pos) {
+	return uint32[pos >> 2];
+}
+let tokensAndComments = null, previousTokensAndComments = [], tokensAndCommentsUint32 = null, tokensAndCommentsLen = 0, tokensAndCommentsBackingUint32 = EMPTY_UINT32_ARRAY;
+/**
+* Initialize tokens-and-comments buffer.
+*
+* Creates a buffer containing tokens and comments interleaved in ascending order of `start`.
+*
+* Each token/comment in the input buffers is 16 bytes, with `start` as the first `u32`.
+*
+* `tokensAndCommentsUint32` contains 16-byte entries with the layout:
+* `{ start: u32, index: u32, type: u32, 4 bytes padding }`.
+*
+* `index` is the index of the token/comment within its original buffer (in 16-byte units).
+*/
+function initTokensAndCommentsBuffer() {
+	tokensUint32 === null && initTokensBuffer(), commentsUint32 === null && initCommentsBuffer(), tokensAndCommentsLen = tokensLen + commentsLen;
+	let requiredLen32 = tokensAndCommentsLen + 1 << 2, backingLen = tokensAndCommentsBackingUint32.length;
+	backingLen < requiredLen32 && (tokensAndCommentsBackingUint32 = new Uint32Array(MathMax(requiredLen32, backingLen === 0 ? 256 : backingLen << 1))), tokensAndCommentsUint32 = tokensAndCommentsBackingUint32, commentsLen === 0 ? fillMergedEntries(0, tokensUint32, 0, 0, tokensLen) : tokensLen === 0 ? fillMergedEntries(1, commentsUint32, 0, 0, commentsLen) : mergeTokensAndComments(tokensUint32, commentsUint32), tokensAndCommentsUint32[(tokensAndCommentsLen << 2) + 2] = 0;
+}
+/**
+* Merge tokens and comments in ascending order of `start`.
+*
+* Uses two separate inner loops (one for token runs, one for comment runs)
+* so the branch predictor sees a consistent "continue" pattern within each run,
+* only mispredicting once at each run transition.
+*/
+function mergeTokensAndComments(tokensUint32, commentsUint32) {
+	let tokenIndex = 0, commentIndex = 0, mergedPos32 = 0, tokenStart = tokensUint32[0], commentStart = commentsUint32[0];
+	for (; commentStart < tokenStart;) {
+		if (writeMergedEntry(1, mergedPos32, commentIndex, commentStart), mergedPos32 += 4, ++commentIndex === commentsLen) {
+			fillMergedEntries(0, tokensUint32, mergedPos32, tokenIndex, tokensLen);
+			return;
+		}
+		commentStart = commentsUint32[commentIndex << 2];
+	}
+	for (;;) {
+		do {
+			if (writeMergedEntry(0, mergedPos32, tokenIndex, tokenStart), mergedPos32 += 4, ++tokenIndex === tokensLen) {
+				fillMergedEntries(1, commentsUint32, mergedPos32, commentIndex, commentsLen);
+				return;
+			}
+			tokenStart = tokensUint32[tokenIndex << 2];
+		} while (tokenStart < commentStart);
+		do {
+			if (writeMergedEntry(1, mergedPos32, commentIndex, commentStart), mergedPos32 += 4, ++commentIndex === commentsLen) {
+				fillMergedEntries(0, tokensUint32, mergedPos32, tokenIndex, tokensLen);
+				return;
+			}
+			commentStart = commentsUint32[commentIndex << 2];
+		} while (commentStart < tokenStart);
+	}
+}
+/**
+* Write a single entry to the merged buffer.
+*/
+function writeMergedEntry(type, mergedPos32, originalIndex, start) {
+	tokensAndCommentsUint32[mergedPos32] = start, tokensAndCommentsUint32[mergedPos32 + 1] = originalIndex, tokensAndCommentsUint32[mergedPos32 + 2] = type;
+}
+/**
+* Fill output entries from a single source buffer (tokens or comments) sequentially.
+* Used for fast paths and for appending remaining items after the merge loop.
+*/
+function fillMergedEntries(type, srcUint32, mergedPos32, srcIndex, srcLen) {
+	let srcPos32 = srcIndex << 2;
+	for (; srcIndex < srcLen; srcIndex++) tokensAndCommentsUint32[mergedPos32] = srcUint32[srcPos32], tokensAndCommentsUint32[mergedPos32 + 1] = srcIndex, tokensAndCommentsUint32[mergedPos32 + 2] = type, mergedPos32 += 4, srcPos32 += 4;
+}
+/**
+* Get token or comment from the merged buffer at `index`.
+* Deserializes the underlying token/comment if needed.
+*
+* @param index - Index in the merged buffer
+* @returns Deserialized token or comment
+*/
+function getTokenOrComment(index) {
+	let pos32 = index << 2, originalIndex = tokensAndCommentsUint32[pos32 + 1];
+	return tokensAndCommentsUint32[pos32 + 2] === 0 ? getToken(originalIndex) : getComment(originalIndex);
+}
+/**
+* Get the `end` value for an entry in the merged `tokensAndComments` buffer,
+* by looking it up in the original tokens or comments buffer.
+*
+* @param entryIndex - Index in the merged buffer
+* @returns The `end` offset of the token/comment in source text
+*/
+function getTokenOrCommentEnd(entryIndex) {
+	let pos32 = entryIndex << 2, originalEndPos32 = (tokensAndCommentsUint32[pos32 + 1] << 2) + 1;
+	return tokensAndCommentsUint32[pos32 + 2] === 0 ? tokensUint32[originalEndPos32] : commentsUint32[originalEndPos32];
+}
+/**
+* Get all tokens and comments in source order.
+*
+* Builds and caches the merged array on first call.
+* Subsequent calls return the same cached array.
+*
+* @returns Array of all tokens and comments, sorted by source position
+*/
+function getTokensAndComments() {
+	if (tokensAndComments !== null) return tokensAndComments;
+	if (tokensUint32 === null && initTokensBuffer(), commentsUint32 === null && initCommentsBuffer(), commentsLen === 0) return tokens === null && initTokens(), tokensAndComments = tokens;
+	if (tokensLen === 0) return comments === null && initComments(), tokensAndComments = comments;
+	allTokensDeserialized || deserializeTokens(), allCommentsDeserialized || deserializeComments(), tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), previousTokensAndComments.length >= tokensAndCommentsLen ? (tokensAndComments = previousTokensAndComments, tokensAndComments.length = tokensAndCommentsLen) : (tokensAndComments = previousTokensAndComments = Array(tokensAndCommentsLen).fill(0), tokensAndComments[0] = null);
+	for (let i = 0; i < tokensAndCommentsLen; i++) {
+		let pos32 = i << 2, originalIndex = tokensAndCommentsUint32[pos32 + 1];
+		tokensAndComments[i] = tokensAndCommentsUint32[pos32 + 2] === 0 ? cachedTokens[originalIndex] : cachedComments[originalIndex];
+	}
+	return tokensAndComments;
+}
+/**
+* Reset merged tokens-and-comments array and buffer after file has been linted.
+*/
+function resetTokensAndComments() {
+	tokensAndComments = null, tokensAndCommentsUint32 = null, tokensAndCommentsLen = 0;
+}
 //#endregion
 //#region src-js/plugins/comments_methods.ts
-const WHITESPACE_ONLY_REGEXP = /^\s*$/;
 /**
 * Retrieve an array containing all comments in the source code.
 * @returns Array of `Comment`s in order they appear in source.
@@ -5284,19 +5504,19 @@ function getAllComments() {
 * @returns Array of `Comment`s in occurrence order.
 */
 function getCommentsBefore(nodeOrToken) {
-	comments === null && initComments();
-	let targetStart = nodeOrToken.range[0], sliceEnd = 0;
-	for (let endIndex = comments.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		comments[mid].start < targetStart ? sliceEnd = mid + 1 : endIndex = mid;
-	}
-	let sliceStart = comments.length;
-	for (let i = sliceEnd - 1; i >= 0; i--) {
-		let comment = comments[i], gap = sourceText.slice(comment.end, targetStart);
-		if (WHITESPACE_ONLY_REGEXP.test(gap)) sliceStart = i, targetStart = comment.start;
-		else break;
-	}
-	return comments.slice(sliceStart, sliceEnd);
+	if (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), commentsLen === 0) return [];
+	let targetStart = nodeOrToken.range[0], searchIndex = 0;
+	for (let endIndex = tokensAndCommentsLen; searchIndex < endIndex;) {
+		let mid = searchIndex + endIndex >>> 1;
+		tokensAndCommentsUint32[mid << 2] < targetStart ? searchIndex = mid + 1 : endIndex = mid;
+	}
+	let startTypePos32 = (searchIndex << 2) - 2, typePos32 = startTypePos32;
+	for (; typePos32 > 0 && tokensAndCommentsUint32[typePos32] !== 0;) typePos32 -= 4;
+	let count32 = startTypePos32 - typePos32;
+	if (count32 === 0) return [];
+	let sliceStart = tokensAndCommentsUint32[typePos32 + 3], sliceEnd = sliceStart + (count32 >> 2);
+	for (let i = sliceStart; i < sliceEnd; i++) getComment(i);
+	return cachedComments.slice(sliceStart, sliceEnd);
 }
 /**
 * Get all comment tokens directly after the given node or token.
@@ -5317,19 +5537,19 @@ function getCommentsBefore(nodeOrToken) {
 * @returns Array of `Comment`s in occurrence order.
 */
 function getCommentsAfter(nodeOrToken) {
-	comments === null && initComments();
-	let targetEnd = nodeOrToken.range[1], sliceStart = 0;
-	for (let endIndex = comments.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		comments[mid].start < targetEnd ? sliceStart = mid + 1 : endIndex = mid;
-	}
-	let commentsLength = comments.length, sliceEnd = 0;
-	for (let i = sliceStart; i < commentsLength; i++) {
-		let comment = comments[i], gap = sourceText.slice(targetEnd, comment.start);
-		if (WHITESPACE_ONLY_REGEXP.test(gap)) sliceEnd = i + 1, targetEnd = comment.end;
-		else break;
-	}
-	return comments.slice(sliceStart, sliceEnd);
+	if (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), commentsLen === 0) return [];
+	let targetEnd = nodeOrToken.range[1], searchIndex = 0;
+	for (let endIndex = tokensAndCommentsLen; searchIndex < endIndex;) {
+		let mid = searchIndex + endIndex >>> 1;
+		tokensAndCommentsUint32[mid << 2] < targetEnd ? searchIndex = mid + 1 : endIndex = mid;
+	}
+	let startTypePos32 = (searchIndex << 2) + 2, typePos32 = startTypePos32;
+	for (; tokensAndCommentsUint32[typePos32] !== 0;) typePos32 += 4;
+	let count32 = typePos32 - startTypePos32;
+	if (count32 === 0) return [];
+	let sliceStart = tokensAndCommentsUint32[startTypePos32 - 1], sliceEnd = sliceStart + (count32 >> 2);
+	for (let i = sliceStart; i < sliceEnd; i++) getComment(i);
+	return cachedComments.slice(sliceStart, sliceEnd);
 }
 /**
 * Get all comment tokens inside the given node.
@@ -5337,18 +5557,19 @@ function getCommentsAfter(nodeOrToken) {
 * @returns Array of `Comment`s in occurrence order.
 */
 function getCommentsInside(node) {
-	comments === null && initComments();
+	if (commentsUint32 === null && initCommentsBuffer(), commentsLen === 0) return [];
 	let { range } = node, rangeStart = range[0], rangeEnd = range[1], sliceStart = 0;
-	for (let endIndex = comments.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		comments[mid].start < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = commentsLen; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		commentsUint32[mid << 2] < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
 	}
 	let sliceEnd = sliceStart;
-	for (let endIndex = comments.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		comments[mid].start < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = commentsLen; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		commentsUint32[mid << 2] < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
 	}
-	return comments.slice(sliceStart, sliceEnd);
+	for (let i = sliceStart; i < sliceEnd; i++) getComment(i);
+	return cachedComments.slice(sliceStart, sliceEnd);
 }
 /**
 * Check whether any comments exist or not between the given 2 nodes.
@@ -5357,13 +5578,13 @@ function getCommentsInside(node) {
 * @returns `true` if one or more comments exist between the two.
 */
 function commentsExistBetween(nodeOrToken1, nodeOrToken2) {
-	comments === null && initComments();
+	if (commentsUint32 === null && initCommentsBuffer(), commentsLen === 0) return !1;
 	let betweenRangeStart = nodeOrToken1.range[1], firstCommentBetween = 0;
-	for (let endIndex = comments.length; firstCommentBetween < endIndex;) {
-		let mid = firstCommentBetween + endIndex >> 1;
-		comments[mid].start < betweenRangeStart ? firstCommentBetween = mid + 1 : endIndex = mid;
+	for (let endIndex = commentsLen; firstCommentBetween < endIndex;) {
+		let mid = firstCommentBetween + endIndex >>> 1;
+		commentsUint32[mid << 2] < betweenRangeStart ? firstCommentBetween = mid + 1 : endIndex = mid;
 	}
-	return firstCommentBetween < comments.length && comments[firstCommentBetween].end <= nodeOrToken2.range[0];
+	return firstCommentBetween < commentsLen && commentsUint32[(firstCommentBetween << 2) + 1] <= nodeOrToken2.range[0];
 }
 /**
 * Retrieve the JSDoc comment for a given node.
@@ -12151,32 +12372,34 @@ const INCLUDE_COMMENTS_SKIP_OPTIONS = {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getTokens(node, countOptions, afterCount) {
-	tokens === null && initTokens();
 	let count = typeof countOptions == "object" && countOptions ? countOptions.count : null, beforeCount = typeof countOptions == "number" ? countOptions : 0;
 	afterCount = (typeof countOptions == "number" || countOptions === void 0) && typeof afterCount == "number" ? afterCount : 0;
-	let filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let { range } = node, rangeStart = range[0], rangeEnd = range[1], sliceStart = 0;
-	for (let endIndex = tokenList.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
 	}
 	let sliceEnd = sliceStart;
-	for (let endIndex = tokenList.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	}
+	if (sliceStart = MathMax(0, sliceStart - beforeCount), sliceEnd = MathMin(sliceEnd + afterCount, len), typeof filter != "function") {
+		let end = MathMin(sliceStart + (count ?? sliceEnd), sliceEnd);
+		return collectEntries(sliceStart, end, includeComments);
 	}
-	if (sliceStart = MathMax(0, sliceStart - beforeCount), sliceEnd = MathMin(sliceEnd + afterCount, tokenList.length), typeof filter != "function") return tokenList.slice(sliceStart, MathMin(sliceStart + (count ?? sliceEnd), sliceEnd));
 	let allTokens = [];
 	if (typeof count != "number") {
 		for (let i = sliceStart; i < sliceEnd; i++) {
-			let token = tokenList[i];
+			let token = getEntry(i, includeComments);
 			filter(token) && allTokens.push(token);
 		}
 		return allTokens;
 	}
 	for (let i = sliceStart; i < sliceEnd && count > 0; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && (allTokens.push(token), count--);
 	}
 	return allTokens;
@@ -12190,29 +12413,25 @@ function getTokens(node, countOptions, afterCount) {
 * @returns `Token` (or `Token | Comment` if `includeComments` is `true`), or `null` if none found.
 */
 function getFirstToken(node, skipOptions) {
-	tokens === null && initTokens();
-	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = typeof skipOptions == "object" && !!skipOptions && "includeComments" in skipOptions && skipOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = getIncludeComments(skipOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let { range } = node, rangeStart = range[0], rangeEnd = range[1], startIndex = 0;
-	for (let endIndex = tokenList.length; startIndex < endIndex;) {
-		let mid = startIndex + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? startIndex = mid + 1 : endIndex = mid;
+	for (let endIndex = len; startIndex < endIndex;) {
+		let mid = startIndex + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? startIndex = mid + 1 : endIndex = mid;
 	}
-	let tokensLength = tokenList.length;
 	if (typeof filter != "function") {
 		let skipTo = startIndex + (skip ?? 0);
-		if (skipTo >= tokensLength) return null;
-		let token = tokenList[skipTo];
-		return token.start >= rangeEnd ? null : token;
+		return skipTo >= len || entryStart(skipTo, uint32) >= rangeEnd ? null : getEntry(skipTo, includeComments);
 	}
-	if (typeof skip != "number") for (let i = startIndex; i < tokensLength; i++) {
-		let token = tokenList[i];
-		if (token.start >= rangeEnd) return null;
+	if (typeof skip != "number") for (let i = startIndex; i < len; i++) {
+		if (entryStart(i, uint32) >= rangeEnd) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) return token;
 	}
-	else for (let i = startIndex; i < tokensLength; i++) {
-		let token = tokenList[i];
-		if (token.start >= rangeEnd) return null;
+	else for (let i = startIndex; i < len; i++) {
+		if (entryStart(i, uint32) >= rangeEnd) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) {
 			if (skip <= 0) return token;
 			skip--;
@@ -12229,27 +12448,26 @@ function getFirstToken(node, skipOptions) {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getFirstTokens(node, countOptions) {
-	tokens === null && initTokens();
-	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let { range } = node, rangeStart = range[0], rangeEnd = range[1], sliceStart = 0;
-	for (let endIndex = tokenList.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
 	}
 	let sliceEnd = sliceStart;
-	for (let endIndex = tokenList.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
 	}
-	if (typeof filter != "function") return typeof count == "number" ? tokenList.slice(sliceStart, MathMin(sliceStart + count, sliceEnd)) : tokenList.slice(sliceStart, sliceEnd);
+	if (typeof filter != "function") return typeof count == "number" ? collectEntries(sliceStart, MathMin(sliceStart + count, sliceEnd), includeComments) : collectEntries(sliceStart, sliceEnd, includeComments);
 	let firstTokens = [];
 	if (typeof count != "number") for (let i = sliceStart; i < sliceEnd; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && firstTokens.push(token);
 	}
 	else for (let i = sliceStart; i < sliceEnd && firstTokens.length < count; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && firstTokens.push(token);
 	}
 	return firstTokens;
@@ -12263,28 +12481,25 @@ function getFirstTokens(node, countOptions) {
 * @returns `Token` (or `Token | Comment` if `includeComments` is `true`), or `null` if none found.
 */
 function getLastToken(node, skipOptions) {
-	tokens === null && initTokens();
-	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = typeof skipOptions == "object" && !!skipOptions && "includeComments" in skipOptions && skipOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = getIncludeComments(skipOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let { range } = node, rangeStart = range[0], rangeEnd = range[1], lastTokenIndex = 0;
-	for (let endIndex = tokenList.length; lastTokenIndex < endIndex;) {
-		let mid = lastTokenIndex + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? lastTokenIndex = mid + 1 : endIndex = mid;
+	for (let endIndex = len; lastTokenIndex < endIndex;) {
+		let mid = lastTokenIndex + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? lastTokenIndex = mid + 1 : endIndex = mid;
 	}
 	if (--lastTokenIndex, typeof filter != "function") {
 		let skipTo = lastTokenIndex - (skip ?? 0);
-		if (skipTo < 0) return null;
-		let token = tokenList[skipTo];
-		return token.start < rangeStart ? null : token;
+		return skipTo < 0 || entryStart(skipTo, uint32) < rangeStart ? null : getEntry(skipTo, includeComments);
 	}
 	if (typeof skip != "number") for (let i = lastTokenIndex; i >= 0; i--) {
-		let token = tokenList[i];
-		if (token.start < rangeStart) return null;
+		if (entryStart(i, uint32) < rangeStart) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) return token;
 	}
 	else for (let i = lastTokenIndex; i >= 0; i--) {
-		let token = tokenList[i];
-		if (token.start < rangeStart) return null;
+		if (entryStart(i, uint32) < rangeStart) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) {
 			if (skip <= 0) return token;
 			skip--;
@@ -12301,27 +12516,26 @@ function getLastToken(node, skipOptions) {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getLastTokens(node, countOptions) {
-	tokens === null && initTokens();
-	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let { range } = node, rangeStart = range[0], rangeEnd = range[1], sliceStart = 0;
-	for (let endIndex = tokenList.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
 	}
 	let sliceEnd = sliceStart;
-	for (let endIndex = tokenList.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
 	}
-	if (typeof filter != "function") return typeof count == "number" ? tokenList.slice(MathMax(sliceStart, sliceEnd - count), sliceEnd) : tokenList.slice(sliceStart, sliceEnd);
+	if (typeof filter != "function") return collectEntries(typeof count == "number" ? MathMax(sliceStart, sliceEnd - count) : sliceStart, sliceEnd, includeComments);
 	let lastTokens = [];
 	if (typeof count != "number") for (let i = sliceStart; i < sliceEnd; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && lastTokens.push(token);
 	}
 	else for (let i = sliceEnd - 1; i >= sliceStart && lastTokens.length < count; i--) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && lastTokens.unshift(token);
 	}
 	return lastTokens;
@@ -12335,25 +12549,24 @@ function getLastTokens(node, countOptions) {
 * @returns `Token` (or `Token | Comment` if `includeComments` is `true`), or `null` if none found.
 */
 function getTokenBefore(nodeOrToken, skipOptions) {
-	tokens === null && initTokens();
-	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = typeof skipOptions == "object" && !!skipOptions && "includeComments" in skipOptions && skipOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = getIncludeComments(skipOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let nodeStart = nodeOrToken.range[0], beforeIndex = 0;
-	for (let endIndex = tokenList.length; beforeIndex < endIndex;) {
-		let mid = beforeIndex + endIndex >> 1;
-		tokenList[mid].start < nodeStart ? beforeIndex = mid + 1 : endIndex = mid;
+	for (let endIndex = len; beforeIndex < endIndex;) {
+		let mid = beforeIndex + endIndex >>> 1;
+		uint32[mid << 2] < nodeStart ? beforeIndex = mid + 1 : endIndex = mid;
 	}
 	if (--beforeIndex, typeof filter != "function") {
 		let skipTo = beforeIndex - (skip ?? 0);
-		return skipTo < 0 ? null : tokenList[skipTo];
+		return skipTo < 0 ? null : getEntry(skipTo, includeComments);
 	}
 	if (typeof skip != "number") for (; beforeIndex >= 0;) {
-		let token = tokenList[beforeIndex];
+		let token = getEntry(beforeIndex, includeComments);
 		if (filter(token)) return token;
 		beforeIndex--;
 	}
 	else for (; beforeIndex >= 0;) {
-		let token = tokenList[beforeIndex];
+		let token = getEntry(beforeIndex, includeComments);
 		if (filter(token)) {
 			if (skip <= 0) return token;
 			skip--;
@@ -12383,22 +12596,21 @@ function getTokenOrCommentBefore(nodeOrToken, skip) {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getTokensBefore(nodeOrToken, countOptions) {
-	tokens === null && initTokens();
-	let count = typeof countOptions == "number" ? MathMax(0, countOptions) : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let count = typeof countOptions == "number" ? MathMax(0, countOptions) : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let targetStart = nodeOrToken.range[0], sliceEnd = 0;
-	for (let endIndex = tokenList.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		tokenList[mid].start < targetStart ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		uint32[mid << 2] < targetStart ? sliceEnd = mid + 1 : endIndex = mid;
 	}
-	if (typeof filter != "function") return typeof count == "number" ? tokenList.slice(sliceEnd - count, sliceEnd) : tokenList.slice(0, sliceEnd);
+	if (typeof filter != "function") return collectEntries(typeof count == "number" ? MathMax(0, sliceEnd - count) : 0, sliceEnd, includeComments);
 	let tokensBefore = [];
 	if (typeof count != "number") for (let i = 0; i < sliceEnd; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && tokensBefore.push(token);
 	}
 	else for (let i = sliceEnd - 1; i >= 0 && tokensBefore.length < count; i--) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && tokensBefore.unshift(token);
 	}
 	return tokensBefore;
@@ -12412,25 +12624,23 @@ function getTokensBefore(nodeOrToken, countOptions) {
 * @returns `Token` (or `Token | Comment` if `includeComments` is `true`), or `null` if none found.
 */
 function getTokenAfter(nodeOrToken, skipOptions) {
-	tokens === null && initTokens();
-	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = typeof skipOptions == "object" && !!skipOptions && "includeComments" in skipOptions && skipOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = getIncludeComments(skipOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let rangeEnd = nodeOrToken.range[1], startIndex = 0;
-	for (let endIndex = tokenList.length; startIndex < endIndex;) {
-		let mid = startIndex + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? startIndex = mid + 1 : endIndex = mid;
+	for (let endIndex = len; startIndex < endIndex;) {
+		let mid = startIndex + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? startIndex = mid + 1 : endIndex = mid;
 	}
-	let tokensLength = tokenList.length;
 	if (typeof filter != "function") {
 		let skipTo = startIndex + (skip ?? 0);
-		return skipTo >= tokensLength ? null : tokenList[skipTo];
+		return skipTo >= len ? null : getEntry(skipTo, includeComments);
 	}
-	if (typeof skip != "number") for (let i = startIndex; i < tokensLength; i++) {
-		let token = tokenList[i];
+	if (typeof skip != "number") for (let i = startIndex; i < len; i++) {
+		let token = getEntry(i, includeComments);
 		if (filter(token)) return token;
 	}
-	else for (let i = startIndex; i < tokensLength; i++) {
-		let token = tokenList[i];
+	else for (let i = startIndex; i < len; i++) {
+		let token = getEntry(i, includeComments);
 		if (filter(token)) {
 			if (skip <= 0) return token;
 			skip--;
@@ -12459,22 +12669,21 @@ function getTokenOrCommentAfter(nodeOrToken, skip) {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getTokensAfter(nodeOrToken, countOptions) {
-	tokens === null && initTokens();
-	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let rangeEnd = nodeOrToken.range[1], sliceStart = 0;
-	for (let endIndex = tokenList.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? sliceStart = mid + 1 : endIndex = mid;
 	}
-	if (typeof filter != "function") return typeof count == "number" ? tokenList.slice(sliceStart, sliceStart + count) : tokenList.slice(sliceStart);
+	if (typeof filter != "function") return typeof count == "number" ? collectEntries(sliceStart, MathMin(sliceStart + count, len), includeComments) : collectEntries(sliceStart, len, includeComments);
 	let tokenListAfter = [];
-	if (typeof count != "number") for (let i = sliceStart; i < tokenList.length; i++) {
-		let token = tokenList[i];
+	if (typeof count != "number") for (let i = sliceStart; i < len; i++) {
+		let token = getEntry(i, includeComments);
 		filter(token) && tokenListAfter.push(token);
 	}
-	else for (let i = sliceStart; i < tokenList.length && tokenListAfter.length < count; i++) {
-		let token = tokenList[i];
+	else for (let i = sliceStart; i < len && tokenListAfter.length < count; i++) {
+		let token = getEntry(i, includeComments);
 		filter(token) && tokenListAfter.push(token);
 	}
 	return tokenListAfter;
@@ -12494,27 +12703,26 @@ function getTokensAfter(nodeOrToken, countOptions) {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getTokensBetween(left, right, countOptions) {
-	tokens === null && initTokens();
-	let count = typeof countOptions == "object" && countOptions ? countOptions.count : null, padding = typeof countOptions == "number" ? countOptions : 0, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let count = typeof countOptions == "object" && countOptions ? countOptions.count : null, padding = typeof countOptions == "number" ? countOptions : 0, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let rangeStart = left.range[1], rangeEnd = right.range[0], sliceStart = 0;
-	for (let endIndex = tokenList.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
 	}
 	let sliceEnd = sliceStart;
-	for (let endIndex = tokenList.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
 	}
-	if (sliceStart = MathMax(0, sliceStart - padding), sliceEnd += padding, typeof filter != "function") return typeof count == "number" ? tokenList.slice(sliceStart, MathMin(sliceStart + count, sliceEnd)) : tokenList.slice(sliceStart, sliceEnd);
+	if (sliceStart = MathMax(0, sliceStart - padding), sliceEnd = MathMin(sliceEnd + padding, len), typeof filter != "function") return typeof count == "number" ? collectEntries(sliceStart, MathMin(sliceStart + count, sliceEnd), includeComments) : collectEntries(sliceStart, sliceEnd, includeComments);
 	let tokensBetween = [];
 	if (typeof count != "number") for (let i = sliceStart; i < sliceEnd; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && tokensBetween.push(token);
 	}
 	else for (let i = sliceStart; i < sliceEnd && tokensBetween.length < count; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && tokensBetween.push(token);
 	}
 	return tokensBetween;
@@ -12529,28 +12737,25 @@ function getTokensBetween(left, right, countOptions) {
 * @returns `Token` (or `Token | Comment` if `includeComments` is `true`), or `null` if none found.
 */
 function getFirstTokenBetween(left, right, skipOptions) {
-	tokens === null && initTokens();
-	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = typeof skipOptions == "object" && !!skipOptions && "includeComments" in skipOptions && skipOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
-	let rangeStart = left.range[1], rangeEnd = right.range[0], tokensLength = tokenList.length, firstTokenIndex = 0;
-	for (let endIndex = tokenList.length; firstTokenIndex < endIndex;) {
-		let mid = firstTokenIndex + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? firstTokenIndex = mid + 1 : endIndex = mid;
+	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = getIncludeComments(skipOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
+	let rangeStart = left.range[1], rangeEnd = right.range[0], firstTokenIndex = 0;
+	for (let endIndex = len; firstTokenIndex < endIndex;) {
+		let mid = firstTokenIndex + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? firstTokenIndex = mid + 1 : endIndex = mid;
 	}
 	if (typeof filter != "function") {
 		let skipTo = firstTokenIndex + (skip ?? 0);
-		if (skipTo >= tokensLength) return null;
-		let token = tokenList[skipTo];
-		return token.start >= rangeEnd ? null : token;
+		return skipTo >= len || entryStart(skipTo, uint32) >= rangeEnd ? null : getEntry(skipTo, includeComments);
 	}
-	if (typeof skip != "number") for (let i = firstTokenIndex; i < tokensLength; i++) {
-		let token = tokenList[i];
-		if (token.start >= rangeEnd) return null;
+	if (typeof skip != "number") for (let i = firstTokenIndex; i < len; i++) {
+		if (entryStart(i, uint32) >= rangeEnd) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) return token;
 	}
-	else for (let i = firstTokenIndex; i < tokensLength; i++) {
-		let token = tokenList[i];
-		if (token.start >= rangeEnd) return null;
+	else for (let i = firstTokenIndex; i < len; i++) {
+		if (entryStart(i, uint32) >= rangeEnd) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) {
 			if (skip <= 0) return token;
 			skip--;
@@ -12568,27 +12773,26 @@ function getFirstTokenBetween(left, right, skipOptions) {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getFirstTokensBetween(left, right, countOptions) {
-	tokens === null && initTokens();
-	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let rangeStart = left.range[1], rangeEnd = right.range[0], sliceStart = 0;
-	for (let endIndex = tokenList.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
 	}
 	let sliceEnd = sliceStart;
-	for (let endIndex = tokenList.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
 	}
-	if (typeof filter != "function") return typeof count == "number" ? tokenList.slice(sliceStart, MathMin(sliceStart + count, sliceEnd)) : tokenList.slice(sliceStart, sliceEnd);
+	if (typeof filter != "function") return typeof count == "number" ? collectEntries(sliceStart, MathMin(sliceStart + count, sliceEnd), includeComments) : collectEntries(sliceStart, sliceEnd, includeComments);
 	let firstTokens = [];
 	if (typeof count != "number") for (let i = sliceStart; i < sliceEnd; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && firstTokens.push(token);
 	}
 	else for (let i = sliceStart; i < sliceEnd && firstTokens.length < count; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && firstTokens.push(token);
 	}
 	return firstTokens;
@@ -12603,28 +12807,25 @@ function getFirstTokensBetween(left, right, countOptions) {
 * @returns `Token` (or `Token | Comment` if `includeComments` is `true`), or `null` if none found.
 */
 function getLastTokenBetween(left, right, skipOptions) {
-	tokens === null && initTokens();
-	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = typeof skipOptions == "object" && !!skipOptions && "includeComments" in skipOptions && skipOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let skip = typeof skipOptions == "number" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.skip : null, filter = typeof skipOptions == "function" ? skipOptions : typeof skipOptions == "object" && skipOptions ? skipOptions.filter : null, includeComments = getIncludeComments(skipOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let rangeStart = left.range[1], rangeEnd = right.range[0], lastTokenIndex = 0;
-	for (let endIndex = tokenList.length; lastTokenIndex < endIndex;) {
-		let mid = lastTokenIndex + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? lastTokenIndex = mid + 1 : endIndex = mid;
+	for (let endIndex = len; lastTokenIndex < endIndex;) {
+		let mid = lastTokenIndex + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? lastTokenIndex = mid + 1 : endIndex = mid;
 	}
 	if (--lastTokenIndex, typeof filter != "function") {
 		let skipTo = lastTokenIndex - (skip ?? 0);
-		if (skipTo < 0) return null;
-		let token = tokenList[skipTo];
-		return token.start < rangeStart ? null : token;
+		return skipTo < 0 || entryStart(skipTo, uint32) < rangeStart ? null : getEntry(skipTo, includeComments);
 	}
 	if (typeof skip != "number") for (let i = lastTokenIndex; i >= 0; i--) {
-		let token = tokenList[i];
-		if (token.start < rangeStart) return null;
+		if (entryStart(i, uint32) < rangeStart) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) return token;
 	}
 	else for (let i = lastTokenIndex; i >= 0; i--) {
-		let token = tokenList[i];
-		if (token.start < rangeStart) return null;
+		if (entryStart(i, uint32) < rangeStart) return null;
+		let token = getEntry(i, includeComments);
 		if (filter(token)) {
 			if (skip <= 0) return token;
 			skip--;
@@ -12642,46 +12843,44 @@ function getLastTokenBetween(left, right, skipOptions) {
 * @returns Array of `Token`s, or array of `Token | Comment`s if `includeComments` is `true`.
 */
 function getLastTokensBetween(left, right, countOptions) {
-	tokens === null && initTokens();
-	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = typeof countOptions == "object" && !!countOptions && "includeComments" in countOptions && countOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
+	let count = typeof countOptions == "number" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.count : null, filter = typeof countOptions == "function" ? countOptions : typeof countOptions == "object" && countOptions ? countOptions.filter : null, includeComments = getIncludeComments(countOptions), uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
 	let rangeStart = left.range[1], rangeEnd = right.range[0], sliceStart = 0;
-	for (let endIndex = tokenList.length; sliceStart < endIndex;) {
-		let mid = sliceStart + endIndex >> 1;
-		tokenList[mid].start < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceStart < endIndex;) {
+		let mid = sliceStart + endIndex >>> 1;
+		uint32[mid << 2] < rangeStart ? sliceStart = mid + 1 : endIndex = mid;
 	}
 	let sliceEnd = sliceStart;
-	for (let endIndex = tokenList.length; sliceEnd < endIndex;) {
-		let mid = sliceEnd + endIndex >> 1;
-		tokenList[mid].start < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
+	for (let endIndex = len; sliceEnd < endIndex;) {
+		let mid = sliceEnd + endIndex >>> 1;
+		uint32[mid << 2] < rangeEnd ? sliceEnd = mid + 1 : endIndex = mid;
 	}
-	if (typeof filter != "function") return typeof count == "number" ? tokenList.slice(MathMax(sliceStart, sliceEnd - count), sliceEnd) : tokenList.slice(sliceStart, sliceEnd);
+	if (typeof filter != "function") return collectEntries(typeof count == "number" ? MathMax(sliceStart, sliceEnd - count) : sliceStart, sliceEnd, includeComments);
 	let tokensBetween = [];
 	if (typeof count != "number") for (let i = sliceStart; i < sliceEnd; i++) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && tokensBetween.push(token);
 	}
 	else for (let i = sliceEnd - 1; i >= sliceStart && tokensBetween.length < count; i--) {
-		let token = tokenList[i];
+		let token = getEntry(i, includeComments);
 		filter(token) && tokensBetween.unshift(token);
 	}
 	return tokensBetween;
 }
 /**
 * Get the token starting at the specified index.
-* @param index - Index of the start of the token's range.
+* @param offset - Start offset of the token.
 * @param rangeOptions - Options object.
 * @returns `Token` (or `Token | Comment` if `includeComments` is `true`), or `null` if none found.
 */
-function getTokenByRangeStart(index, rangeOptions) {
-	tokens === null && initTokens();
-	let includeComments = typeof rangeOptions == "object" && !!rangeOptions && "includeComments" in rangeOptions && rangeOptions.includeComments, tokenList;
-	includeComments ? (tokensAndComments === null && initTokensAndComments(), tokenList = tokensAndComments) : tokenList = tokens;
-	for (let lo = 0, hi = tokenList.length; lo < hi;) {
-		let mid = lo + hi >> 1, token = tokenList[mid], tokenStart = token.start;
-		if (tokenStart < index) lo = mid + 1;
-		else if (tokenStart > index) hi = mid;
-		else return token;
+function getTokenByRangeStart(offset, rangeOptions) {
+	let includeComments = typeof rangeOptions == "object" && !!rangeOptions && "includeComments" in rangeOptions && !!rangeOptions.includeComments, uint32, len;
+	includeComments === !1 ? (tokensUint32 === null && initTokensBuffer(), uint32 = tokensUint32, len = tokensLen) : (tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer(), uint32 = tokensAndCommentsUint32, len = tokensAndCommentsLen);
+	for (let lo = 0, hi = len; lo < hi;) {
+		let mid = lo + hi >>> 1, tokenStart = uint32[mid << 2];
+		if (tokenStart < offset) lo = mid + 1;
+		else if (tokenStart > offset) hi = mid;
+		else return getEntry(mid, includeComments);
 	}
 	return null;
 }
@@ -12701,20 +12900,19 @@ const JSX_WHITESPACE_REGEXP = /\s/u;
 *   any of the tokens found between the two given nodes or tokens.
 */
 function isSpaceBetween(first, second) {
-	tokensAndComments === null && (tokens === null && initTokens(), initTokensAndComments());
+	tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer();
 	let range1 = first.range, range2 = second.range, rangeStart = range1[0], rangeEnd = range2[0];
 	rangeStart < rangeEnd ? rangeStart = range1[1] : (rangeEnd = rangeStart, rangeStart = range2[1]);
-	let tokenBetweenIndex = 0;
-	for (let endIndex = tokensAndComments.length; tokenBetweenIndex < endIndex;) {
-		let mid = tokenBetweenIndex + endIndex >> 1;
-		tokensAndComments[mid].start < rangeStart ? tokenBetweenIndex = mid + 1 : endIndex = mid;
-	}
-	let tokensAndCommentsLength = tokensAndComments.length;
-	for (let lastTokenEnd = rangeStart; tokenBetweenIndex < tokensAndCommentsLength; tokenBetweenIndex++) {
-		let token = tokensAndComments[tokenBetweenIndex], tokenStart = token.start;
+	let index = 0;
+	for (let endIndex = tokensAndCommentsLen; index < endIndex;) {
+		let mid = index + endIndex >>> 1;
+		tokensAndCommentsUint32[mid << 2] < rangeStart ? index = mid + 1 : endIndex = mid;
+	}
+	for (let lastTokenEnd = rangeStart; index < tokensAndCommentsLen; index++) {
+		let tokenStart = tokensAndCommentsUint32[index << 2];
 		if (tokenStart > rangeEnd) break;
 		if (tokenStart !== lastTokenEnd) return !0;
-		lastTokenEnd = token.end;
+		lastTokenEnd = entryEnd(index, !0);
 	}
 	return !1;
 }
@@ -12739,23 +12937,91 @@ function isSpaceBetween(first, second) {
 *   any of the tokens found between the two given nodes or tokens.
 */
 function isSpaceBetweenTokens(first, second) {
-	tokensAndComments === null && (tokens === null && initTokens(), initTokensAndComments());
+	tokensAndCommentsUint32 === null && initTokensAndCommentsBuffer();
 	let range1 = first.range, range2 = second.range, rangeStart = range1[0], rangeEnd = range2[0];
 	rangeStart < rangeEnd ? rangeStart = range1[1] : (rangeEnd = rangeStart, rangeStart = range2[1]);
-	let tokenBetweenIndex = 0;
-	for (let endIndex = tokensAndComments.length; tokenBetweenIndex < endIndex;) {
-		let mid = tokenBetweenIndex + endIndex >> 1;
-		tokensAndComments[mid].start < rangeStart ? tokenBetweenIndex = mid + 1 : endIndex = mid;
-	}
-	let tokensAndCommentsLength = tokensAndComments.length;
-	for (let lastTokenEnd = rangeStart; tokenBetweenIndex < tokensAndCommentsLength; tokenBetweenIndex++) {
-		let token = tokensAndComments[tokenBetweenIndex], tokenStart = token.start;
+	let index = 0;
+	for (let endIndex = tokensAndCommentsLen; index < endIndex;) {
+		let mid = index + endIndex >>> 1;
+		tokensAndCommentsUint32[mid << 2] < rangeStart ? index = mid + 1 : endIndex = mid;
+	}
+	for (let lastTokenEnd = rangeStart; index < tokensAndCommentsLen; index++) {
+		let tokenStart = tokensAndCommentsUint32[index << 2];
 		if (tokenStart > rangeEnd) break;
+		let token = getTokenOrComment(index);
 		if (tokenStart !== lastTokenEnd || token.type === "JSXText" && JSX_WHITESPACE_REGEXP.test(token.value)) return !0;
 		lastTokenEnd = token.end;
 	}
 	return !1;
 }
+/**
+* Extract `includeComments` boolean from options.
+*
+* @param options - Options object, number, function, or nullish
+* @returns `true` if `options` has `includeComments: true`
+*/
+function getIncludeComments(options) {
+	return typeof options == "object" && !!options && "includeComments" in options && !!options.includeComments;
+}
+/**
+* Get a token at `index`, deserializing if needed.
+* For `includeComments` mode, gets from the merged buffer instead.
+*
+* @param index - Entry index in the tokens or merged buffer
+* @param includeComments - Whether to use the merged tokens-and-comments buffer
+* @returns Deserialized token or comment
+*/
+function getEntry(index, includeComments) {
+	return includeComments === !0 ? getTokenOrComment(index) : getToken(index);
+}
+/**
+* Get `start` offset of token/comment at `index` from the given buffer.
+*
+* @param index - Entry index
+* @param uint32 - The `Uint32Array` buffer (tokens or merged)
+* @returns Start offset in source text
+*/
+function entryStart(index, uint32) {
+	return uint32[index << 2];
+}
+/**
+* Get `end` offset of token/comment at `index`.
+* For tokens-only, reads from `tokensUint32`. For `includeComments`, looks up from the original buffer.
+*
+* @param index - Entry index in the tokens or merged buffer
+* @param includeComments - Whether to use the merged tokens-and-comments buffer
+* @returns End offset in source text
+*/
+function entryEnd(index, includeComments) {
+	return includeComments === !0 ? getTokenOrCommentEnd(index) : tokensUint32[(index << 2) + 1];
+}
+/**
+* Collect tokens/comments from `startIndex` (inclusive) to `endIndex` (exclusive) into an array.
+* Deserializes each token/comment on demand.
+*
+* For tokens-only mode, batch-deserializes then slices `cachedTokens`.
+* For `includeComments` mode, builds the array entry by entry from the merged buffer.
+*
+* @param startIndex - First entry index (inclusive)
+* @param endIndex - Last entry index (exclusive)
+* @param includeComments - Whether to use the merged tokens-and-comments buffer
+* @returns Array of tokens (and optionally comments)
+*/
+function collectEntries(startIndex, endIndex, includeComments) {
+	if (includeComments === !1) {
+		for (let i = startIndex; i < endIndex; i++) getToken(i);
+		return cachedTokens.slice(startIndex, endIndex);
+	}
+	let len = endIndex - startIndex;
+	if (len === 0) return [];
+	let tokensAndCommentsSubset = Array(len).fill(0);
+	tokensAndCommentsSubset[0] = null;
+	let i = 0;
+	do
+		tokensAndCommentsSubset[i] = getTokenOrComment(startIndex + i);
+	while (++i < len);
+	return tokensAndCommentsSubset;
+}
 //#endregion
 //#region src-js/plugins/source_code.ts
 const textDecoder = new TextDecoder("utf-8", { ignoreBOM: !0 });
@@ -12773,7 +13039,7 @@ function setupSourceForFile(bufferInput, hasBOMInput) {
 */
 function initSourceText() {
 	let { uint32 } = buffer, programPos = uint32[DATA_POINTER_POS_32];
-	sourceStartPos = uint32[programPos + 8 >> 2], sourceByteLen = uint32[programPos + 16 >> 2], sourceText = textDecoder.decode(buffer.subarray(sourceStartPos, sourceStartPos + sourceByteLen));
+	sourceStartPos = uint32[programPos + 16 >> 2], sourceByteLen = uint32[programPos + 24 >> 2], sourceText = textDecoder.decode(buffer.subarray(sourceStartPos, sourceStartPos + sourceByteLen));
 }
 /**
 * Deserialize AST from buffer.
@@ -12792,7 +13058,7 @@ function initAst() {
 * and no danger of an infinite loop due to a circular AST (unlikely but possible).
 */
 function resetSourceAndAst() {
-	buffer = null, sourceText = null, ast = null, resetBuffer(), resetLines(), resetScopeManager(), resetTokens(), resetComments();
+	buffer = null, sourceText = null, ast = null, resetBuffer(), resetLinesAndLocs(), resetScopeManager(), resetTokens(), resetComments(), resetTokensAndComments();
 }
 /**
 * Get whether file is JSX.
@@ -12826,7 +13092,7 @@ const SOURCE_CODE = ObjectFreeze({
 		return lines.length === 0 && initLines(), lineStartIndices;
 	},
 	get tokensAndComments() {
-		return tokensAndComments === null && (tokens === null && initTokens(), initTokensAndComments()), tokensAndComments;
+		return getTokensAndComments();
 	},
 	getText(node, beforeCount, afterCount) {
 		if (sourceText === null && initSourceText(), !node) return sourceText;
@@ -13281,7 +13547,7 @@ function resetSettings() {
 }
 //#endregion
 //#region package.json
-var version = "1.56.0";
+var version = "1.57.0";
 //#endregion
 //#region src-js/plugins/context.ts
 let filePath = null, cwd = null;
@@ -16753,7 +17019,7 @@ function conformHookFn(hookFn, hookName) {
 	return hookFn;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/eslint@9.39.3_jiti@2.6.1/node_modules/eslint/lib/shared/assert.js
+//#region ../../node_modules/.pnpm/eslint@9.39.4_jiti@2.6.1/node_modules/eslint/lib/shared/assert.js
 /**
 * @fileoverview Assertion utilities equivalent to the Node.js node:asserts module.
 * @author Josh Goldberg
@@ -22497,7 +22763,7 @@ const mergers = [
 			visit1(...args), visit2(...args), visit3(...args);
 		};
 	}
-], buffers = [], afterHooks = [];
+], buffers = [], afterHooks = [], OPTIONS_DESCRIPTOR = { value: null };
 /**
 * Lint a file.
 *
@@ -22551,7 +22817,7 @@ function lintFileImpl(filePath, bufferId, buffer, ruleIds, optionsIds, settingsJ
 		let ruleDetails = registeredRules[ruleIds[i]];
 		ruleDetails.ruleIndex = i;
 		let optionsId = optionsIds[i];
-		ObjectDefineProperty(ruleDetails.context, "options", { value: optionsId === 0 ? ruleDetails.defaultOptions : allOptions[optionsId] });
+		OPTIONS_DESCRIPTOR.value = optionsId === 0 ? ruleDetails.defaultOptions : allOptions[optionsId], ObjectDefineProperty(ruleDetails.context, "options", OPTIONS_DESCRIPTOR);
 		let { visitor } = ruleDetails;
 		if (visitor === null) visitor = ruleDetails.rule.create(ruleDetails.context);
 		else {