@rohal12/spindle 0.52.3 → 0.52.5

package/dist/pkg/story-variables.js

@@ -101,13 +101,13 @@ function scanRegex(src, start, cache) {
 	};
 	let i = start + 1;
 	while (i < src.length) {
+		const lineEnd = regexLineEnd(src, i);
+		if (lineEnd !== -1) return done(lineEnd, false);
 		const c = src.charAt(i);
 		if (c === "\\") {
-			if (LINE_TERMINATOR_RE.test(src.charAt(i + 1))) return done(i + 1, false);
 			i += 2;
 			continue;
 		}
-		if (LINE_TERMINATOR_RE.test(c)) return done(i, false);
 		if (c === "[") {
 			i = scanRegexClass(src, i, cache);
 			if (src.charAt(i) !== "]") return done(i, false);
@@ -138,16 +138,17 @@ function scanRegexClass(src, open, cache) {
 	const opens = [open];
 	let i = open + 1;
 	while (i < src.length) {
+		const lineEnd = regexLineEnd(src, i);
+		if (lineEnd !== -1) {
+			i = lineEnd;
+			break;
+		}
 		const c = src.charAt(i);
 		if (c === "\\") {
-			if (LINE_TERMINATOR_RE.test(src.charAt(i + 1))) {
-				i++;
-				break;
-			}
 			i += 2;
 			continue;
 		}
-		if (c === "]" || LINE_TERMINATOR_RE.test(c)) break;
+		if (c === "]") break;
 		if (c === "[" && cache) opens.push(i);
 		i++;
 	}
@@ -156,6 +157,16 @@ function scanRegexClass(src, open, cache) {
 	return i;
 }
 /**
+* Index of the line break at `i`, escaped (`\` then a line break) or not,
+* where a regex literal or class ends unterminated; -1 if there is none.
+*/
+function regexLineEnd(src, i) {
+	const c = src.charAt(i);
+	if (LINE_TERMINATOR_RE.test(c)) return i;
+	if (c === "\\" && LINE_TERMINATOR_RE.test(src.charAt(i + 1))) return i + 1;
+	return -1;
+}
+/**
 * The next index from `from` on where `find` matches (-1 for none), for
 * searches from increasing positions: a search from within the stretch the
 * last one covered has the same answer.
@@ -1105,8 +1116,7 @@ function splitSigilTemplate(template) {
 		}
 		text += template.slice(i, brace);
 		i = brace + 1;
-		const sigil = template[i];
-		const end = sigil === "$" || sigil === "_" || sigil === "@" || sigil === "%" ? scanBalancedBrace(template, i, memo) : -1;
+		const end = isSigil(template[i]) ? scanBalancedBrace(template, i, memo) : -1;
 		if (end === -1) {
 			text += "{";
 			continue;
@@ -1122,6 +1132,25 @@ function splitSigilTemplate(template) {
 }
 //#endregion
 //#region src/markup/tokenizer.ts
+/** Variable sigils: story ($), temporary (_), local (@), transient (%). */
+var SIGIL_SCOPES = {
+	$: "variable",
+	_: "temporary",
+	"@": "local",
+	"%": "transient"
+};
+Object.fromEntries(Object.entries(SIGIL_SCOPES).map(([sigil, scope]) => [scope, sigil]));
+var SIGIL_CHARS = new Set(Object.keys(SIGIL_SCOPES));
+/** Whether `c` is a variable sigil. */
+function isSigil(c) {
+	return c !== void 0 && SIGIL_CHARS.has(c);
+}
+/** Copy the selectors set in `from` onto `target`, and return it. */
+function withSelectors(target, from) {
+	if (from.className) target.className = from.className;
+	if (from.id) target.id = from.id;
+	return target;
+}
 /** Tag name must start with a letter (covers standard and custom elements). */
 var VALID_TAG_START = /[a-zA-Z]/;
 /** HTML void elements: never have children or a closing tag. */
@@ -1141,13 +1170,6 @@ var HTML_VOID_TAGS = new Set([
 	"track",
 	"wbr"
 ]);
-/** Variable sigils: story ($), temporary (_), local (@), transient (%). */
-var SIGIL_CHARS = new Set([
-	"$",
-	"_",
-	"@",
-	"%"
-]);
 /**
 * Characters other than a sigil that open an expression after `{`:
 * `{(Math.max($a, 0))}`, `{!$done}`. Other characters that can start an
@@ -1158,25 +1180,32 @@ var EXPRESSION_START = new Set(["(", "!"]);
 /** Macros whose body is JavaScript source, kept verbatim instead of tokenized. */
 var RAW_BODY_MACROS = new Set(["do"]);
 /**
+* Link separators, in the order they are tried, and whether the target
+* comes first: display|target, display->target, target<-display.
+*/
+var LINK_SEPARATORS = [
+	["|", false],
+	["->", false],
+	["<-", true]
+];
+/**
 * Parse a Twine link interior into display and target.
 * Supports: display|target, display->target, target<-display, plain
 */
 function parseLink(inner) {
-	const pipeIdx = inner.indexOf("|");
-	if (pipeIdx !== -1) return {
-		display: inner.slice(0, pipeIdx).trim(),
-		target: inner.slice(pipeIdx + 1).trim()
-	};
-	const arrowIdx = inner.indexOf("->");
-	if (arrowIdx !== -1) return {
-		display: inner.slice(0, arrowIdx).trim(),
-		target: inner.slice(arrowIdx + 2).trim()
-	};
-	const revIdx = inner.indexOf("<-");
-	if (revIdx !== -1) return {
-		target: inner.slice(0, revIdx).trim(),
-		display: inner.slice(revIdx + 2).trim()
-	};
+	for (const [separator, targetFirst] of LINK_SEPARATORS) {
+		const idx = inner.indexOf(separator);
+		if (idx === -1) continue;
+		const before = inner.slice(0, idx).trim();
+		const after = inner.slice(idx + separator.length).trim();
+		return targetFirst ? {
+			display: after,
+			target: before
+		} : {
+			display: before,
+			target: after
+		};
+	}
 	const trimmed = inner.trim();
 	return {
 		display: trimmed,
@@ -1207,8 +1236,10 @@ function parseMacroContent(content) {
 }
 /**
 * Parse CSS selectors: .foo.bar#baz → { className: "foo bar", id: "baz" }
-* Scans .[a-zA-Z0-9_-]+ and #[a-zA-Z0-9_-]+ segments in any order.
-* Returns space-joined class string, last id wins, and position after last segment.
+* Scans .[a-zA-Z0-9_-]+ and #[a-zA-Z0-9_-]+ segments in any order, and one
+* space after them. Returns space-joined class string, last id wins (each
+* left out if empty), and the position after them: `startIdx` if there are
+* none.
 */
 function parseSelectors(input, startIdx) {
 	const classes = [];
@@ -1221,7 +1252,7 @@ function parseSelectors(input, startIdx) {
 		while (i < input.length) if (/[a-zA-Z0-9_-]/.test(input[i])) {
 			name += input[i];
 			i++;
-		} else if (input[i] === "{" && SIGIL_CHARS.has(input[i + 1])) {
+		} else if (input[i] === "{" && isSigil(input[i + 1])) {
 			const braceStart = i;
 			i += 2;
 			while (i < input.length && /[\w.]/.test(input[i])) i++;
@@ -1236,10 +1267,13 @@ function parseSelectors(input, startIdx) {
 		if (name) if (prefix === ".") classes.push(name);
 		else id = name;
 	}
+	if (i > startIdx && input[i] === " ") i++;
 	return {
-		className: classes.join(" "),
-		id,
-		endIdx: i
+		selectors: withSelectors({}, {
+			className: classes.join(" "),
+			id
+		}),
+		end: i
 	};
 }
 /**
@@ -1354,7 +1388,7 @@ function scanQuotedValue(input, j, quote, code, memo) {
 			continue;
 		}
 		if (input[j] === "{") {
-			const closeIdx = !code ? scanBlockClose(input, j, memo) : SIGIL_CHARS.has(input[j + 1]) ? scanBalancedBrace(input, j + 1, memo) : -1;
+			const closeIdx = !code ? scanBlockClose(input, j, memo) : isSigil(input[j + 1]) ? scanBalancedBrace(input, j + 1, memo) : -1;
 			if (closeIdx !== -1) {
 				j = closeIdx + 1;
 				checkpoint = true;
@@ -1430,12 +1464,7 @@ function scanMacroClose(input, contentStart, memo) {
 * code from just past the {. Returns -1 if it is unclosed.
 */
 function scanBlockClose(input, open, memo) {
-	let at = open + 1;
-	const c = input[at];
-	if (c === "." || c === "#") {
-		at = parseSelectors(input, at).endIdx;
-		if (input[at] === " ") at++;
-	}
+	const at = parseSelectors(input, open + 1).end;
 	const first = input[at];
 	if (first !== void 0 && (first === "/" || /[a-zA-Z]/.test(first))) return scanMacroClose(input, at, memo);
 	return scanBalancedBrace(input, at, memo);
@@ -1627,13 +1656,22 @@ function tokenize(input, options = {}) {
 	const memo = createScanMemo();
 	let i = 0;
 	let textStart = 0;
+	/** Push a text token for the text not yet tokenized before `end`. */
 	function flushText(end) {
-		if (end > textStart) tokens.push({
-			type: "text",
-			value: input.slice(textStart, end),
-			start: textStart,
-			end
-		});
+		if (end > textStart) {
+			tokens.push({
+				type: "text",
+				value: input.slice(textStart, end),
+				start: textStart,
+				end
+			});
+			textStart = end;
+		}
+	}
+	/** Push `token` and go on after it. */
+	function emit(token) {
+		tokens.push(token);
+		i = textStart = token.end;
 	}
 	/**
 	* After an opening raw-body macro ({do}), emit everything up to its
@@ -1675,34 +1713,66 @@ function tokenize(input, options = {}) {
 		atRe.lastIndex = closeStart;
 		const closeEnd = closeStart + atRe.exec(input)[0].length;
 		flushText(closeStart);
-		tokens.push({
+		emit({
 			type: "macro",
 			...parseMacroContent(input.slice(closeStart + 1, closeEnd - 1)),
 			start: closeStart,
 			end: closeEnd
 		});
-		i = closeEnd;
-		textStart = closeEnd;
 	}
 	/**
 	* Push an expression token for the `{…}` block opened at `start` whose
-	* expression starts at `exprStart`, flushing the text before it first
-	* when `flush`. Returns false, consuming nothing, if the block is unclosed.
+	* expression starts at `exprStart`, flushing the text before it first.
+	* Returns false, consuming nothing, if the block is unclosed.
 	*/
-	function pushExpression(exprStart, start, flush, className, id) {
+	function pushExpression(exprStart, start, selectors) {
 		const closeIdx = scanBalancedBrace(input, exprStart, memo);
 		if (closeIdx === -1) return false;
-		if (flush) flushText(start);
-		const token = {
+		flushText(start);
+		emit(withSelectors({
 			type: "expression",
 			expression: input.slice(exprStart, closeIdx),
 			start,
 			end: closeIdx + 1
-		};
-		if (className) token.className = className;
-		if (id) token.id = id;
-		tokens.push(token);
-		i = textStart = closeIdx + 1;
+		}, selectors));
+		return true;
+	}
+	/**
+	* Push a variable token for the `{…}` block opened at `start` whose sigil
+	* is at `sigilAt`: `{$name}`, `{_name.field.subfield}`. Anything else
+	* after the name makes the block an expression from the sigil on
+	* (`{$expr[...]}`). Returns false, consuming nothing, if it is unclosed.
+	*/
+	function pushVariable(sigilAt, start, selectors) {
+		let nameEnd = sigilAt + 1;
+		while (nameEnd < input.length && /[\w.]/.test(input[nameEnd])) nameEnd++;
+		if (input[nameEnd] !== "}") return pushExpression(sigilAt, start, selectors);
+		emit(withSelectors({
+			type: "variable",
+			name: input.slice(sigilAt + 1, nameEnd),
+			scope: SIGIL_SCOPES[input[sigilAt]],
+			start,
+			end: nameEnd + 1
+		}, selectors));
+		return true;
+	}
+	/**
+	* Push a macro token for the `{…}` block opened at `start` whose content
+	* (name, then arguments) starts at `contentStart`, then consume the body
+	* of a raw-body macro. Returns false, consuming nothing, if the block is
+	* unclosed.
+	*/
+	function pushMacro(contentStart, start, selectors) {
+		const closeIdx = scanMacroClose(input, contentStart, memo);
+		if (closeIdx === -1) return false;
+		const token = withSelectors({
+			type: "macro",
+			...parseMacroContent(input.slice(contentStart, closeIdx)),
+			start,
+			end: closeIdx + 1
+		}, selectors);
+		emit(token);
+		consumeRawBody(token.name, token.isClose);
 		return true;
 	}
 	while (i < input.length) {
@@ -1726,14 +1796,12 @@ function tokenize(input, options = {}) {
 			}
 			if ((next === "{" || next === "}") && (k - i) % 2 === 1) {
 				flushText(k - 1);
-				tokens.push({
+				emit({
 					type: "text",
 					value: next,
 					start: k - 1,
 					end: k + 1
 				});
-				i = k + 1;
-				textStart = i;
 				continue;
 			}
 			i = k;
@@ -1742,413 +1810,36 @@ function tokenize(input, options = {}) {
 		if (!textMode && input[i] === "[" && input[i + 1] === "[") {
 			flushText(i);
 			const start = i;
-			i += 2;
-			let className;
-			let id;
-			if (input[i] === "." || input[i] === "#") {
-				const parsed = parseSelectors(input, i);
-				className = parsed.className || void 0;
-				id = parsed.id || void 0;
-				i = parsed.endIdx;
-				if (input[i] === " ") i++;
-			}
-			const innerStart = i;
+			const { selectors, end: innerStart } = parseSelectors(input, i + 2);
 			const closeIdx = scanLinkClose(input, innerStart, memo);
 			if (closeIdx === -1) {
 				i = start + 2;
-				textStart = start;
 				continue;
 			}
-			const inner = input.slice(innerStart, closeIdx);
-			i = closeIdx + 2;
-			const { display, target } = parseLink(inner);
-			const linkToken = {
+			emit(withSelectors({
 				type: "link",
-				display,
-				target,
+				...parseLink(input.slice(innerStart, closeIdx)),
 				start,
-				end: i
-			};
-			if (className) linkToken.className = className;
-			if (id) linkToken.id = id;
-			tokens.push(linkToken);
-			textStart = i;
+				end: closeIdx + 2
+			}, selectors));
 			continue;
 		}
 		if (input[i] === "{") {
 			const start = i;
-			let nextChar = input[i + 1];
-			let className;
-			let id;
-			if (nextChar === "." || nextChar === "#") {
-				flushText(i);
-				const parsed = parseSelectors(input, i + 1);
-				className = parsed.className || void 0;
-				id = parsed.id || void 0;
-				let afterSelectors = parsed.endIdx;
-				if (input[afterSelectors] === " ") afterSelectors++;
-				const charAfter = input[afterSelectors];
-				if (charAfter === "$") {
-					i = afterSelectors + 1;
-					const nameStart = i;
-					while (i < input.length && /[\w.]/.test(input[i])) i++;
-					const name = input.slice(nameStart, i);
-					if (input[i] === "}") {
-						i++;
-						const token = {
-							type: "variable",
-							name,
-							scope: "variable",
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					const closeIdx$ = scanBalancedBrace(input, nameStart - 1, memo);
-					if (closeIdx$ !== -1) {
-						const expression = input.slice(afterSelectors, closeIdx$);
-						i = closeIdx$ + 1;
-						const token = {
-							type: "expression",
-							expression,
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					i = start + 1;
-					textStart = start;
-					continue;
-				}
-				if (charAfter === "_") {
-					i = afterSelectors + 1;
-					const nameStart = i;
-					while (i < input.length && /[\w.]/.test(input[i])) i++;
-					const name = input.slice(nameStart, i);
-					if (input[i] === "}") {
-						i++;
-						const token = {
-							type: "variable",
-							name,
-							scope: "temporary",
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					const closeIdx_ = scanBalancedBrace(input, nameStart - 1, memo);
-					if (closeIdx_ !== -1) {
-						const expression = input.slice(afterSelectors, closeIdx_);
-						i = closeIdx_ + 1;
-						const token = {
-							type: "expression",
-							expression,
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					i = start + 1;
-					textStart = start;
-					continue;
-				}
-				if (charAfter === "@") {
-					i = afterSelectors + 1;
-					const nameStart = i;
-					while (i < input.length && /[\w.]/.test(input[i])) i++;
-					const name = input.slice(nameStart, i);
-					if (input[i] === "}") {
-						i++;
-						const token = {
-							type: "variable",
-							name,
-							scope: "local",
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					const closeIdx_at = scanBalancedBrace(input, nameStart - 1, memo);
-					if (closeIdx_at !== -1) {
-						const expression = input.slice(afterSelectors, closeIdx_at);
-						i = closeIdx_at + 1;
-						const token = {
-							type: "expression",
-							expression,
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					i = start + 1;
-					textStart = start;
-					continue;
-				}
-				if (charAfter === "%") {
-					i = afterSelectors + 1;
-					const nameStart = i;
-					while (i < input.length && /[\w.]/.test(input[i])) i++;
-					const name = input.slice(nameStart, i);
-					if (input[i] === "}") {
-						i++;
-						const token = {
-							type: "variable",
-							name,
-							scope: "transient",
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					const closeIdx_pct = scanBalancedBrace(input, nameStart - 1, memo);
-					if (closeIdx_pct !== -1) {
-						const expression = input.slice(afterSelectors, closeIdx_pct);
-						i = closeIdx_pct + 1;
-						const token = {
-							type: "expression",
-							expression,
-							start,
-							end: i
-						};
-						if (className) token.className = className;
-						if (id) token.id = id;
-						tokens.push(token);
-						textStart = i;
-						continue;
-					}
-					i = start + 1;
-					textStart = start;
-					continue;
-				}
-				if (EXPRESSION_START.has(charAfter) && pushExpression(afterSelectors, start, false, className, id)) continue;
-				if (charAfter !== void 0 && /[a-zA-Z]/.test(charAfter)) {
-					const contentStart = afterSelectors;
-					const closeIdx = scanMacroClose(input, contentStart, memo);
-					if (closeIdx === -1) {
-						i = start + 1;
-						textStart = start;
-						continue;
-					}
-					const content = input.slice(contentStart, closeIdx);
-					i = closeIdx + 1;
-					const { name, rawArgs, isClose } = parseMacroContent(content);
-					const token = {
-						type: "macro",
-						name,
-						rawArgs,
-						isClose,
-						start,
-						end: i
-					};
-					if (className) token.className = className;
-					if (id) token.id = id;
-					tokens.push(token);
-					textStart = i;
-					consumeRawBody(name, isClose);
-					continue;
-				}
-				i = start + 1;
-				textStart = start;
-				continue;
-			}
-			if (nextChar === "$") {
-				flushText(i);
-				i += 2;
-				const nameStart = i;
-				while (i < input.length && /[\w.]/.test(input[i])) i++;
-				const name = input.slice(nameStart, i);
-				if (input[i] === "}") {
-					i++;
-					tokens.push({
-						type: "variable",
-						name,
-						scope: "variable",
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				const closeIdx = scanBalancedBrace(input, nameStart - 1, memo);
-				if (closeIdx !== -1) {
-					const expression = input.slice(start + 1, closeIdx);
-					i = closeIdx + 1;
-					tokens.push({
-						type: "expression",
-						expression,
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				i = start + 1;
-				textStart = start;
-				continue;
-			}
-			if (nextChar === "_") {
-				flushText(i);
-				i += 2;
-				const nameStart = i;
-				while (i < input.length && /[\w.]/.test(input[i])) i++;
-				const name = input.slice(nameStart, i);
-				if (input[i] === "}") {
-					i++;
-					tokens.push({
-						type: "variable",
-						name,
-						scope: "temporary",
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				const closeIdx = scanBalancedBrace(input, nameStart - 1, memo);
-				if (closeIdx !== -1) {
-					const expression = input.slice(start + 1, closeIdx);
-					i = closeIdx + 1;
-					tokens.push({
-						type: "expression",
-						expression,
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				i = start + 1;
-				textStart = start;
-				continue;
+			const { selectors, end: at } = parseSelectors(input, i + 1);
+			const prefixed = at > i + 1;
+			if (prefixed) flushText(start);
+			const c = input[at];
+			if (isSigil(c)) {
+				flushText(start);
+				if (pushVariable(at, start, selectors)) continue;
+			} else if (EXPRESSION_START.has(c)) {
+				if (pushExpression(at, start, selectors)) continue;
+			} else if (c !== void 0 && (/[a-zA-Z]/.test(c) || c === "/" && !prefixed)) {
+				flushText(start);
+				if (pushMacro(at, start, selectors)) continue;
 			}
-			if (nextChar === "@") {
-				flushText(i);
-				i += 2;
-				const nameStart = i;
-				while (i < input.length && /[\w.]/.test(input[i])) i++;
-				const name = input.slice(nameStart, i);
-				if (input[i] === "}") {
-					i++;
-					tokens.push({
-						type: "variable",
-						name,
-						scope: "local",
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				const closeIdx = scanBalancedBrace(input, nameStart - 1, memo);
-				if (closeIdx !== -1) {
-					const expression = input.slice(start + 1, closeIdx);
-					i = closeIdx + 1;
-					tokens.push({
-						type: "expression",
-						expression,
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				i = start + 1;
-				textStart = start;
-				continue;
-			}
-			if (nextChar === "%") {
-				flushText(i);
-				i += 2;
-				const nameStart = i;
-				while (i < input.length && /[\w.]/.test(input[i])) i++;
-				const name = input.slice(nameStart, i);
-				if (input[i] === "}") {
-					i++;
-					tokens.push({
-						type: "variable",
-						name,
-						scope: "transient",
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				const closeIdx = scanBalancedBrace(input, nameStart - 1, memo);
-				if (closeIdx !== -1) {
-					const expression = input.slice(start + 1, closeIdx);
-					i = closeIdx + 1;
-					tokens.push({
-						type: "expression",
-						expression,
-						start,
-						end: i
-					});
-					textStart = i;
-					continue;
-				}
-				i = start + 1;
-				textStart = start;
-				continue;
-			}
-			if (EXPRESSION_START.has(nextChar)) {
-				if (pushExpression(i + 1, start, true)) continue;
-				i++;
-				continue;
-			}
-			if (nextChar !== void 0 && (nextChar === "/" || /[a-zA-Z]/.test(nextChar))) {
-				flushText(i);
-				const contentStart = i + 1;
-				const closeIdx = scanMacroClose(input, contentStart, memo);
-				if (closeIdx === -1) {
-					i = start + 1;
-					textStart = start;
-					continue;
-				}
-				const content = input.slice(contentStart, closeIdx);
-				i = closeIdx + 1;
-				const { name, rawArgs, isClose } = parseMacroContent(content);
-				tokens.push({
-					type: "macro",
-					name,
-					rawArgs,
-					isClose,
-					start,
-					end: i
-				});
-				textStart = i;
-				consumeRawBody(name, isClose);
-				continue;
-			}
-			i++;
+			i = start + 1;
 			continue;
 		}
 		if (!textMode && input[i] === "<") {
@@ -2166,11 +1857,10 @@ function tokenize(input, options = {}) {
 					j++;
 					flushText(start);
 					if (HTML_VOID_TAGS.has(tagLower)) {
-						textStart = j;
-						i = j;
+						i = textStart = j;
 						continue;
 					}
-					tokens.push({
+					emit({
 						type: "html",
 						tag,
 						attributes: {},
@@ -2179,8 +1869,6 @@ function tokenize(input, options = {}) {
 						start,
 						end: j
 					});
-					textStart = j;
-					i = j;
 					continue;
 				}
 			} else {
@@ -2194,7 +1882,7 @@ function tokenize(input, options = {}) {
 				if (input[j] === ">") {
 					j++;
 					flushText(start);
-					tokens.push({
+					emit({
 						type: "html",
 						tag,
 						attributes: parseHtmlAttributes(input, attrsStart, memo).attributes,
@@ -2203,8 +1891,6 @@ function tokenize(input, options = {}) {
 						start,
 						end: j
 					});
-					textStart = j;
-					i = j;
 					continue;
 				}
 			}