@pierre/diffs 1.3.0-beta.3 → 1.3.0-beta.5

package/dist/worker/worker-portable.js

@@ -10,42 +10,34 @@ var __export = (all$1) => {
 };
 
 //#endregion
-//#region ../../node_modules/.bun/shiki@4.0.2/node_modules/shiki/dist/chunk-CtajNgzt.mjs
+//#region ../../node_modules/.bun/shiki@4.2.0/node_modules/shiki/dist/chunk-BBjsoOtd.mjs
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __exportAll = (all$1, no_symbols) => {
 	let target = {};
-	for (var name in all$1) {
-		__defProp$1(target, name, {
-			get: all$1[name],
-			enumerable: true
-		});
-	}
-	if (!no_symbols) {
-		__defProp$1(target, Symbol.toStringTag, { value: "Module" });
-	}
+	for (var name in all$1) __defProp$1(target, name, {
+		get: all$1[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp$1(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i$2 = 0, n = keys.length, key$1; i$2 < n; i$2++) {
-			key$1 = keys[i$2];
-			if (!__hasOwnProp.call(to, key$1) && key$1 !== except) {
-				__defProp$1(to, key$1, {
-					get: ((k$2) => from[k$2]).bind(null, key$1),
-					enumerable: !(desc = __getOwnPropDesc(from, key$1)) || desc.enumerable
-				});
-			}
-		}
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i$2 = 0, n = keys.length, key$1; i$2 < n; i$2++) {
+		key$1 = keys[i$2];
+		if (!__hasOwnProp.call(to, key$1) && key$1 !== except) __defProp$1(to, key$1, {
+			get: ((k$2) => from[k$2]).bind(null, key$1),
+			enumerable: !(desc = __getOwnPropDesc(from, key$1)) || desc.enumerable
+		});
 	}
 	return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+types@4.0.2/node_modules/@shikijs/types/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+types@4.2.0/node_modules/@shikijs/types/dist/index.mjs
 var ShikiError$1 = class extends Error {
 	constructor(message) {
 		super(message);
@@ -2911,7 +2903,7 @@ var Registry = class {
 var INITIAL = StateStackImpl.NULL;
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+primitive@4.0.2/node_modules/@shikijs/primitive/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+primitive@4.2.0/node_modules/@shikijs/primitive/dist/index.mjs
 function resolveColorReplacements(theme, options) {
 	const replacements = typeof theme === "string" ? {} : { ...theme.colorReplacements };
 	const themeName = typeof theme === "string" ? theme : theme.name;
@@ -2923,8 +2915,8 @@ function applyColorReplacements(color, replacements) {
 	if (!color) return color;
 	return replacements?.[color?.toLowerCase()] || color;
 }
-function toArray(x$1) {
-	return Array.isArray(x$1) ? x$1 : [x$1];
+function toArray(x$2) {
+	return Array.isArray(x$2) ? x$2 : [x$2];
 }
 /**
 * Normalize a getter to a promise.
@@ -2985,9 +2977,10 @@ function isSpecialTheme(theme) {
 * // => [['hello\n', 0], ['world', 6]]
 * ```
 */
+const RE_NEWLINE = /(\r?\n)/g;
 function splitLines$1(code, preserveEnding = false) {
 	if (code.length === 0) return [["", 0]];
-	const parts = code.split(/(\r?\n)/g);
+	const parts = code.split(RE_NEWLINE);
 	let index = 0;
 	const lines = [];
 	for (let i$2 = 0; i$2 < parts.length; i$2 += 2) {
@@ -3101,7 +3094,7 @@ function normalizeTheme(rawTheme) {
 * Resolve
 */
 async function resolveLangs(langs) {
-	return Array.from(new Set((await Promise.all(langs.filter((l$2) => !isSpecialLang(l$2)).map(async (lang) => await normalizeGetter(lang).then((r$3) => Array.isArray(r$3) ? r$3 : [r$3])))).flat()));
+	return [...new Set((await Promise.all(langs.filter((l$2) => !isSpecialLang(l$2)).map(async (lang) => await normalizeGetter(lang).then((r$3) => Array.isArray(r$3) ? r$3 : [r$3])))).flat())];
 }
 async function resolveThemes(themes) {
 	return (await Promise.all(themes.map(async (theme) => isSpecialTheme(theme) ? null : normalizeTheme(await normalizeGetter(theme))))).filter((i$2) => !!i$2);
@@ -3112,13 +3105,17 @@ function resolveLangAlias(name, alias) {
 		const resolved = new Set([name]);
 		while (alias[name]) {
 			name = alias[name];
-			if (resolved.has(name)) throw new ShikiError$1(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
+			if (resolved.has(name)) throw new ShikiError$1(`Circular alias \`${[...resolved].join(" -> ")} -> ${name}\``);
 			resolved.add(name);
 		}
 	}
 	return name;
 }
 var Registry$1 = class extends Registry {
+	_resolver;
+	_themes;
+	_langs;
+	_alias;
 	_resolvedThemes = /* @__PURE__ */ new Map();
 	_resolvedGrammars = /* @__PURE__ */ new Map();
 	_langMap = /* @__PURE__ */ new Map();
@@ -3197,7 +3194,7 @@ var Registry$1 = class extends Registry {
 	}
 	loadLanguages(langs) {
 		for (const lang of langs) this.resolveEmbeddedLanguages(lang);
-		const langsGraphArray = Array.from(this._langGraph.entries());
+		const langsGraphArray = [...this._langGraph.entries()];
 		const missingLangs = langsGraphArray.filter(([_$2, lang]) => !lang);
 		if (missingLangs.length) {
 			const dependents = langsGraphArray.filter(([_$2, lang]) => {
@@ -3463,6 +3460,8 @@ function getGrammarStack(state, theme) {
 	if (!(state instanceof GrammarState)) throw new ShikiError$1("Invalid grammar state");
 	return state.getInternalStack(theme);
 }
+const RE_COMMA = /,/;
+const RE_SPACE = / /;
 /**
 * Code to tokens, with a simple theme.
 */
@@ -3553,7 +3552,7 @@ function _tokenizeWithTheme(code, grammar, theme, colorMap, options) {
 					let selectors;
 					switch (typeof setting.scope) {
 						case "string":
-							selectors = setting.scope.split(/,/).map((scope) => scope.trim());
+							selectors = setting.scope.split(RE_COMMA).map((scope) => scope.trim());
 							break;
 						case "object":
 							selectors = setting.scope;
@@ -3562,7 +3561,7 @@ function _tokenizeWithTheme(code, grammar, theme, colorMap, options) {
 					}
 					themeSettingsSelectors.push({
 						settings: setting,
-						selectors: selectors.map((selector) => selector.split(/ /))
+						selectors: selectors.map((selector) => selector.split(RE_SPACE))
 					});
 				}
 				token$1.explanation = [];
@@ -3607,7 +3606,7 @@ function matchesOne(selector, scope) {
 	return selector === scope || scope.substring(0, selector.length) === selector && scope[selector.length] === ".";
 }
 function matches(selectors, scope, parentScopes) {
-	if (!matchesOne(selectors[selectors.length - 1], scope)) return false;
+	if (!matchesOne(selectors.at(-1), scope)) return false;
 	let selectorParentIndex = selectors.length - 2;
 	let parentIndex = parentScopes.length - 1;
 	while (selectorParentIndex >= 0 && parentIndex >= 0) {
@@ -6523,7 +6522,7 @@ function serializeAttributes(state, properties) {
 */
 function serializeAttribute(state, key$1, value) {
 	const info = find(state.schema, key$1);
-	const x$1 = state.settings.allowParseErrors && state.schema.space === "html" ? 0 : 1;
+	const x$2 = state.settings.allowParseErrors && state.schema.space === "html" ? 0 : 1;
 	const y$2 = state.settings.allowDangerousCharacters ? 0 : 1;
 	let quote = state.quote;
 	/** @type {string | undefined} */
@@ -6536,14 +6535,14 @@ function serializeAttribute(state, key$1, value) {
 	if (value === null || value === undefined || value === false || typeof value === "number" && Number.isNaN(value)) {
 		return "";
 	}
-	const name = stringifyEntities(info.attribute, Object.assign({}, state.settings.characterReferences, { subset: constants.name[x$1][y$2] }));
+	const name = stringifyEntities(info.attribute, Object.assign({}, state.settings.characterReferences, { subset: constants.name[x$2][y$2] }));
 	if (value === true) return name;
 	value = Array.isArray(value) ? (info.commaSeparated ? stringify$1 : stringify$2)(value, { padLeft: !state.settings.tightCommaSeparatedLists }) : String(value);
 	if (state.settings.collapseEmptyAttributes && !value) return name;
 	if (state.settings.preferUnquoted) {
 		result = stringifyEntities(value, Object.assign({}, state.settings.characterReferences, {
 			attribute: true,
-			subset: constants.unquoted[x$1][y$2]
+			subset: constants.unquoted[x$2][y$2]
 		}));
 	}
 	if (result !== value) {
@@ -6551,7 +6550,7 @@ function serializeAttribute(state, key$1, value) {
 			quote = state.alternative;
 		}
 		result = quote + stringifyEntities(value, Object.assign({}, state.settings.characterReferences, {
-			subset: (quote === "'" ? constants.single : constants.double)[x$1][y$2],
+			subset: (quote === "'" ? constants.single : constants.double)[x$2][y$2],
 			attribute: true
 		})) + quote;
 	}
@@ -6759,7 +6758,8 @@ function all(parent) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+core@4.0.2/node_modules/@shikijs/core/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+core@4.2.0/node_modules/@shikijs/core/dist/index.mjs
+const RE_WHITESPACE = /\s+/g;
 /**
 * Utility to append class to a hast node
 *
@@ -6769,12 +6769,16 @@ function addClassToHast(node, className) {
 	if (!className) return node;
 	node.properties ||= {};
 	node.properties.class ||= [];
-	if (typeof node.properties.class === "string") node.properties.class = node.properties.class.split(/\s+/g);
+	if (typeof node.properties.class === "string") node.properties.class = node.properties.class.split(RE_WHITESPACE);
 	if (!Array.isArray(node.properties.class)) node.properties.class = [];
-	const targets = Array.isArray(className) ? className : className.split(/\s+/g);
+	const targets = Array.isArray(className) ? className : className.split(RE_WHITESPACE);
 	for (const c of targets) if (c && !node.properties.class.includes(c)) node.properties.class.push(c);
 	return node;
 }
+const RE_LANG_ATTR = /:?lang=["']([^"']+)["']/g;
+const RE_CODE_FENCE = /(?:```|~~~)([\w-]+)/g;
+const RE_LATEX_BEGIN = /\\begin\{([\w-]+)\}/g;
+const RE_SCRIPT_LANG = /<script\s+(?:type|lang)=["']([^"']+)["']/gi;
 /**
 * Creates a converter between index and position in a code block.
 *
@@ -6785,7 +6789,7 @@ function createPositionConverter(code) {
 	function indexToPos(index) {
 		if (index === code.length) return {
 			line: lines.length - 1,
-			character: lines[lines.length - 1].length
+			character: lines.at(-1).length
 		};
 		let character = index;
 		let line = 0;
@@ -6832,28 +6836,27 @@ function createPositionConverter(code) {
 */
 function guessEmbeddedLanguages(code, _lang, highlighter$1) {
 	const langs = /* @__PURE__ */ new Set();
-	for (const match of code.matchAll(/:?lang=["']([^"']+)["']/g)) {
+	for (const match of code.matchAll(RE_LANG_ATTR)) {
 		const lang = match[1].toLowerCase().trim();
 		if (lang) langs.add(lang);
 	}
-	for (const match of code.matchAll(/(?:```|~~~)([\w-]+)/g)) {
+	for (const match of code.matchAll(RE_CODE_FENCE)) {
 		const lang = match[1].toLowerCase().trim();
 		if (lang) langs.add(lang);
 	}
-	for (const match of code.matchAll(/\\begin\{([\w-]+)\}/g)) {
+	for (const match of code.matchAll(RE_LATEX_BEGIN)) {
 		const lang = match[1].toLowerCase().trim();
 		if (lang) langs.add(lang);
 	}
-	for (const match of code.matchAll(/<script\s+(?:type|lang)=["']([^"']+)["']/gi)) {
+	for (const match of code.matchAll(RE_SCRIPT_LANG)) {
 		const fullType = match[1].toLowerCase().trim();
 		const lang = fullType.includes("/") ? fullType.split("/").pop() : fullType;
 		if (lang) langs.add(lang);
 	}
-	if (!highlighter$1) return Array.from(langs);
+	if (!highlighter$1) return [...langs];
 	const bundle = highlighter$1.getBundledLanguages();
-	return Array.from(langs).filter((l$2) => l$2 && bundle[l$2]);
+	return [...langs].filter((l$2) => l$2 && bundle[l$2]);
 }
-const DEFAULT_COLOR_LIGHT_DARK = "light-dark()";
 const COLOR_KEYS = ["color", "background-color"];
 /**
 * Split a token into multiple tokens by given offsets.
@@ -6882,7 +6885,7 @@ function splitToken(token$1, offsets) {
 * Split 2D tokens array by given breakpoints.
 */
 function splitTokens(tokens, breakpoints) {
-	const sorted = Array.from(breakpoints instanceof Set ? breakpoints : new Set(breakpoints)).sort((a$1, b$2) => a$1 - b$2);
+	const sorted = [...breakpoints instanceof Set ? breakpoints : new Set(breakpoints)].sort((a$1, b$2) => a$1 - b$2);
 	if (!sorted.length) return tokens;
 	return tokens.map((line) => {
 		return line.flatMap((token$1) => {
@@ -6908,7 +6911,7 @@ function flatTokenVariants(merged, variantsOrder, cssVariablePrefix, defaultColo
 	styles.forEach((cur, idx) => {
 		for (const key$1 of styleKeys) {
 			const value = cur[key$1] || "inherit";
-			if (idx === 0 && defaultColor && COLOR_KEYS.includes(key$1)) if (defaultColor === DEFAULT_COLOR_LIGHT_DARK && styles.length > 1) {
+			if (idx === 0 && defaultColor && COLOR_KEYS.includes(key$1)) if (defaultColor === "light-dark()" && styles.length > 1) {
 				const lightIndex = variantsOrder.findIndex((t) => t === "light");
 				const darkIndex = variantsOrder.findIndex((t) => t === "dark");
 				if (lightIndex === -1 || darkIndex === -1) throw new ShikiError$1("When using `defaultColor: \"light-dark()\"`, you must provide both `light` and `dark` themes");
@@ -6990,7 +6993,7 @@ function transformerDecorations() {
 		code(codeEl) {
 			if (!this.options.decorations?.length) return;
 			const ctx = getContext(this);
-			const lines = Array.from(codeEl.children).filter((i$2) => i$2.type === "element" && i$2.tagName === "span");
+			const lines = [...codeEl.children].filter((i$2) => i$2.type === "element" && i$2.tagName === "span");
 			if (lines.length !== ctx.converter.lines.length) throw new ShikiError$1(`Number of lines in code element (${lines.length}) does not match the number of lines in the source (${ctx.converter.lines.length}). Failed to apply decorations.`);
 			function applyLineSection(line, start, end, decoration) {
 				const lineEl = lines[line];
@@ -7150,8 +7153,8 @@ function findSequence(value, position) {
 function parseColor(sequence) {
 	const colorMode = sequence.shift();
 	if (colorMode === "2") {
-		const rgb = sequence.splice(0, 3).map((x$1) => Number.parseInt(x$1));
-		if (rgb.length !== 3 || rgb.some((x$1) => Number.isNaN(x$1))) return;
+		const rgb = sequence.splice(0, 3).map((x$2) => Number.parseInt(x$2));
+		if (rgb.length !== 3 || rgb.some((x$2) => Number.isNaN(x$2))) return;
 		return {
 			type: "rgb",
 			rgb
@@ -7299,7 +7302,7 @@ function createColorPalette(namedColorsMap = defaultNamedColorsMap) {
 		return namedColorsMap[name];
 	}
 	function rgbColor(rgb) {
-		return `#${rgb.map((x$1) => Math.max(0, Math.min(x$1, 255)).toString(16).padStart(2, "0")).join("")}`;
+		return `#${rgb.map((x$2) => Math.max(0, Math.min(x$2, 255)).toString(16).padStart(2, "0")).join("")}`;
 	}
 	let colorTable;
 	function getColorTable() {
@@ -7339,6 +7342,8 @@ function createColorPalette(namedColorsMap = defaultNamedColorsMap) {
 	}
 	return { value };
 }
+const RE_HEX_COLOR = /#([0-9a-f]{3,8})/i;
+const RE_CSS_VAR_ANSI = /var\((--[\w-]+-ansi-[\w-]+)\)/;
 /**
 * Default ANSI palette (VSCode compatible fallbacks)
 * Used when the theme does not define terminal.ansi* colors.
@@ -7400,7 +7405,7 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
 * Adds 50% alpha to a hex color string or the "-dim" postfix to a CSS variable
 */
 function dimColor(color) {
-	const hexMatch = color.match(/#([0-9a-f]{3,8})/i);
+	const hexMatch = color.match(RE_HEX_COLOR);
 	if (hexMatch) {
 		const hex = hexMatch[1];
 		if (hex.length === 8) {
@@ -7420,7 +7425,7 @@ function dimColor(color) {
 			return `#${r$3}${r$3}${g}${g}${b$2}${b$2}80`;
 		}
 	}
-	const cssVarMatch = color.match(/var\((--[\w-]+-ansi-[\w-]+)\)/);
+	const cssVarMatch = color.match(RE_CSS_VAR_ANSI);
 	if (cssVarMatch) return `var(${cssVarMatch[1]}-dim)`;
 	return color;
 }
@@ -7458,7 +7463,7 @@ function codeToTokens(primitive, code, options) {
 		if (themes.length === 0) throw new ShikiError$1("`themes` option must not be empty");
 		const themeTokens = codeToTokensWithThemes(primitive, code, options, codeToTokensBase$1);
 		grammarState = getLastGrammarStateFromMap(themeTokens);
-		if (defaultColor && DEFAULT_COLOR_LIGHT_DARK !== defaultColor && !themes.find((t) => t.color === defaultColor)) throw new ShikiError$1(`\`themes\` option must contain the defaultColor key \`${defaultColor}\``);
+		if (defaultColor && "light-dark()" !== defaultColor && !themes.some((t) => t.color === defaultColor)) throw new ShikiError$1(`\`themes\` option must contain the defaultColor key \`${defaultColor}\``);
 		const themeRegs = themes.map((t) => primitive.getTheme(t.theme));
 		const themesOrder = themes.map((t) => t.color);
 		tokens = themeTokens.map((line) => line.map((token$1) => flatTokenVariants(token$1, themesOrder, cssVariablePrefix, defaultColor, colorsRendering)));
@@ -7491,7 +7496,7 @@ function mapThemeColors(themes, themeRegs, themeColorReplacements, cssVariablePr
 		const value = applyColorReplacements(themeRegs[idx][property], themeColorReplacements[idx]) || "inherit";
 		const cssVar = `${cssVariablePrefix + t.color}${property === "bg" ? "-bg" : ""}:${value}`;
 		if (idx === 0 && defaultColor) {
-			if (defaultColor === DEFAULT_COLOR_LIGHT_DARK && themes.length > 1) {
+			if (defaultColor === "light-dark()" && themes.length > 1) {
 				const lightIndex = themes.findIndex((t$1) => t$1.color === "light");
 				const darkIndex = themes.findIndex((t$1) => t$1.color === "dark");
 				if (lightIndex === -1 || darkIndex === -1) throw new ShikiError$1("When using `defaultColor: \"light-dark()\"`, you must provide both `light` and `dark` themes");
@@ -7503,6 +7508,8 @@ function mapThemeColors(themes, themeRegs, themeColorReplacements, cssVariablePr
 		return null;
 	}).filter((i$2) => !!i$2).join(";");
 }
+const RE_WHITESPACE_ONLY = /^\s+$/;
+const RE_LEADING_TRAILING_WHITESPACE = /^(\s*)(.*?)(\s*)$/;
 function codeToHast(primitive, code, options, transformerContext = {
 	meta: {},
 	options,
@@ -7681,7 +7688,7 @@ function mergeWhitespaceTokens(tokens) {
 		let firstOffset;
 		line.forEach((token$1, idx) => {
 			const couldMerge = !(token$1.fontStyle && (token$1.fontStyle & FontStyle.Underline || token$1.fontStyle & FontStyle.Strikethrough));
-			if (couldMerge && token$1.content.match(/^\s+$/) && line[idx + 1]) {
+			if (couldMerge && RE_WHITESPACE_ONLY.test(token$1.content) && line[idx + 1]) {
 				if (firstOffset === void 0) firstOffset = token$1.offset;
 				carryOnContent += token$1.content;
 			} else if (carryOnContent) {
@@ -7704,8 +7711,8 @@ function mergeWhitespaceTokens(tokens) {
 function splitWhitespaceTokens(tokens) {
 	return tokens.map((line) => {
 		return line.flatMap((token$1) => {
-			if (token$1.content.match(/^\s+$/)) return token$1;
-			const match = token$1.content.match(/^(\s*)(.*?)(\s*)$/);
+			if (RE_WHITESPACE_ONLY.test(token$1.content)) return token$1;
+			const match = token$1.content.match(RE_LEADING_TRAILING_WHITESPACE);
 			if (!match) return token$1;
 			const [, leading, content, trailing] = match;
 			if (!leading && !trailing) return token$1;
@@ -7734,7 +7741,7 @@ function mergeAdjacentStyledTokens(tokens) {
 				newLine.push({ ...token$1 });
 				continue;
 			}
-			const prevToken = newLine[newLine.length - 1];
+			const prevToken = newLine.at(-1);
 			const prevStyle = stringifyTokenStyle(prevToken.htmlStyle || getTokenStyleObject(prevToken));
 			const currentStyle = stringifyTokenStyle(token$1.htmlStyle || getTokenStyleObject(token$1));
 			const isPrevDecorated = prevToken.fontStyle && (prevToken.fontStyle & FontStyle.Underline || prevToken.fontStyle & FontStyle.Strikethrough);
@@ -8126,18 +8133,20 @@ function createCssVariablesTheme(options = {}) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.0.2/node_modules/@shikijs/engine-javascript/dist/scanner-BFcBmQR1.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.2.0/node_modules/@shikijs/engine-javascript/dist/scanner-DX8LRFGE.mjs
 const MAX = 4294967295;
 var JavaScriptScanner = class {
+	patterns;
+	options;
 	regexps;
 	constructor(patterns, options = {}) {
 		this.patterns = patterns;
 		this.options = options;
-		const { forgiving = false, cache, regexConstructor } = options;
+		const { forgiving = false, cache: cache$1, regexConstructor } = options;
 		if (!regexConstructor) throw new Error("Option `regexConstructor` is not provided");
 		this.regexps = patterns.map((p$1) => {
 			if (typeof p$1 !== "string") return p$1;
-			const cached = cache?.get(p$1);
+			const cached = cache$1?.get(p$1);
 			if (cached) {
 				if (cached instanceof RegExp) return cached;
 				if (forgiving) return null;
@@ -8145,10 +8154,10 @@ var JavaScriptScanner = class {
 			}
 			try {
 				const regex = regexConstructor(p$1);
-				cache?.set(p$1, regex);
+				cache$1?.set(p$1, regex);
 				return regex;
 			} catch (e) {
-				cache?.set(p$1, e);
+				cache$1?.set(p$1, e);
 				if (forgiving) return null;
 				throw e;
 			}
@@ -8201,7 +8210,7 @@ var JavaScriptScanner = class {
 };
 
 //#endregion
-//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/utils.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.2/node_modules/oniguruma-parser/dist/utils.js
 function r$2(e) {
 	if ([...e].length !== 1) throw new Error(`Expected "${e}" to be a single code point`);
 	return e.codePointAt(0);
@@ -8231,7 +8240,7 @@ function u(e, t) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/tokenizer/tokenize.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.2/node_modules/oniguruma-parser/dist/tokenizer/tokenize.js
 const m$1 = o$1`\[\^?`, b$1 = `c.? | C(?:-.?)?|${o$1`[pP]\{(?:\^?[-\x20_]*[A-Za-z][-\x20\w]*\})?`}|${o$1`x[89A-Fa-f]\p{AHex}(?:\\x[89A-Fa-f]\p{AHex})*`}|${o$1`u(?:\p{AHex}{4})? | x\{[^\}]*\}? | x\p{AHex}{0,2}`}|${o$1`o\{[^\}]*\}?`}|${o$1`\d{1,3}`}`, y$1 = /[?*+][?+]?|\{(?:\d+(?:,\d*)?|,\d+)\}\??/, C$1 = new RegExp(o$1`
   \\ (?:
     ${b$1}
@@ -8333,7 +8342,7 @@ function F$1(e, n, t, o$2) {
 		if (a$1 === "N" || a$1 === "R") return { token: k$1("newline", t, { negate: a$1 === "N" }) };
 		if (a$1 === "O") return { token: k$1("any", t) };
 		if (a$1 === "X") return { token: k$1("text_segment", t) };
-		const r$3 = x(t, { inCharClass: !1 });
+		const r$3 = x$1(t, { inCharClass: !1 });
 		return Array.isArray(r$3) ? { tokens: r$3 } : { token: r$3 };
 	}
 	if (s$1 === "(") {
@@ -8344,13 +8353,13 @@ function F$1(e, n, t, o$2) {
 			return { lastIndex: o$2 + 1 };
 		}
 		if (/^\(\?[-imx]+[:)]$/.test(t)) return { token: L$1(t, e) };
-		if (e.pushModX(e.getCurrentModX()), e.numOpenGroups++, t === "(" && !e.captureGroup || t === "(?:") return { token: f$1("group", t) };
-		if (t === "(?>") return { token: f$1("atomic", t) };
-		if (t === "(?=" || t === "(?!" || t === "(?<=" || t === "(?<!") return { token: f$1(t[2] === "<" ? "lookbehind" : "lookahead", t, { negate: t.endsWith("!") }) };
-		if (t === "(" && e.captureGroup || t.startsWith("(?<") && t.endsWith(">") || t.startsWith("(?'") && t.endsWith("'")) return { token: f$1("capturing", t, { ...t !== "(" && { name: t.slice(3, -1) } }) };
+		if (e.pushModX(e.getCurrentModX()), e.numOpenGroups++, t === "(" && !e.captureGroup || t === "(?:") return { token: f("group", t) };
+		if (t === "(?>") return { token: f("atomic", t) };
+		if (t === "(?=" || t === "(?!" || t === "(?<=" || t === "(?<!") return { token: f(t[2] === "<" ? "lookbehind" : "lookahead", t, { negate: t.endsWith("!") }) };
+		if (t === "(" && e.captureGroup || t.startsWith("(?<") && t.endsWith(">") || t.startsWith("(?'") && t.endsWith("'")) return { token: f("capturing", t, { ...t !== "(" && { name: t.slice(3, -1) } }) };
 		if (t.startsWith("(?~")) {
 			if (t === "(?~|") throw new Error(`Unsupported absence function kind "${t}"`);
-			return { token: f$1("absence_repeater", t) };
+			return { token: f("absence_repeater", t) };
 		}
 		throw t === "(?(" ? new Error(`Unsupported conditional "${t}"`) : new Error(`Invalid or unsupported group option "${t}"`);
 	}
@@ -8399,7 +8408,7 @@ function K$1(e, n, t) {
 	};
 }
 function X$1(e) {
-	if (e[0] === "\\") return x(e, { inCharClass: !0 });
+	if (e[0] === "\\") return x$1(e, { inCharClass: !0 });
 	if (e[0] === "[") {
 		const n = /\[:(?<negate>\^?)(?<name>[a-z]+):\]/.exec(e);
 		if (!n || !i.has(n.groups.name)) throw new Error(`Invalid POSIX class "${e}"`);
@@ -8410,7 +8419,7 @@ function X$1(e) {
 	}
 	return e === "-" ? U$1(e) : e === "&&" ? H(e) : d(r$2(e), e);
 }
-function x(e, { inCharClass: n }) {
+function x$1(e, { inCharClass: n }) {
 	const t = e[1];
 	if (t === "c" || t === "C") return Z(e);
 	if ("dDhHsSwW".includes(t)) return q(e);
@@ -8523,7 +8532,7 @@ function Q$1(e) {
 		raw: e
 	};
 }
-function f$1(e, n, t = {}) {
+function f(e, n, t = {}) {
 	return {
 		type: "GroupOpen",
 		kind: e,
@@ -8584,7 +8593,7 @@ function L$1(e, n) {
 	o$2 ??= "";
 	const s$1 = (n.getCurrentModX() || t.includes("x")) && !o$2.includes("x"), a$1 = v(t), r$3 = v(o$2), i$2 = {};
 	if (a$1 && (i$2.enable = a$1), r$3 && (i$2.disable = r$3), e.endsWith(")")) return n.replaceCurrentModX(s$1), I$1("flags", e, { flags: i$2 });
-	if (e.endsWith(":")) return n.pushModX(s$1), n.numOpenGroups++, f$1("group", e, { ...(a$1 || r$3) && { flags: i$2 } });
+	if (e.endsWith(":")) return n.pushModX(s$1), n.numOpenGroups++, f("group", e, { ...(a$1 || r$3) && { flags: i$2 } });
 	throw new Error(`Unexpected flag modifier "${e}"`);
 }
 function j(e) {
@@ -8728,7 +8737,7 @@ function te$1(e) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/parser/node-utils.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.2/node_modules/oniguruma-parser/dist/parser/node-utils.js
 function o(e, t) {
 	if (!Array.isArray(e.body)) throw new Error("Expected node with body array");
 	if (e.body.length !== 1) return !1;
@@ -8761,7 +8770,7 @@ const y = new Set([
 ]);
 
 //#endregion
-//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/parser/parse.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.2/node_modules/oniguruma-parser/dist/parser/parse.js
 function J(e, r$3 = {}) {
 	const n = {
 		flags: "",
@@ -8776,30 +8785,30 @@ function J(e, r$3 = {}) {
 			singleline: !1,
 			...r$3.rules
 		}
-	}, t = M(e, {
+	}, o$2 = M(e, {
 		flags: n.flags,
 		rules: {
 			captureGroup: n.rules.captureGroup,
 			singleline: n.rules.singleline
 		}
-	}), s$1 = (p$1, N) => {
-		const u$1 = t.tokens[o$2.nextIndex];
-		switch (o$2.parent = p$1, o$2.nextIndex++, u$1.type) {
+	}), i$2 = (p$1, N) => {
+		const u$1 = o$2.tokens[t.nextIndex];
+		switch (t.parent = p$1, t.nextIndex++, u$1.type) {
 			case "Alternator": return b();
 			case "Assertion": return W(u$1);
-			case "Backreference": return X(u$1, o$2);
+			case "Backreference": return X(u$1, t);
 			case "Character": return m(u$1.value, { useLastValid: !!N.isCheckingRangeEnd });
-			case "CharacterClassHyphen": return ee(u$1, o$2, N);
-			case "CharacterClassOpen": return re(u$1, o$2, N);
-			case "CharacterSet": return ne(u$1, o$2);
+			case "CharacterClassHyphen": return ee(u$1, t, N);
+			case "CharacterClassOpen": return re(u$1, t, N);
+			case "CharacterSet": return ne(u$1, t);
 			case "Directive": return I(u$1.kind, { flags: u$1.flags });
-			case "GroupOpen": return te(u$1, o$2, N);
+			case "GroupOpen": return te(u$1, t, N);
 			case "NamedCallout": return U(u$1.kind, u$1.tag, u$1.arguments);
-			case "Quantifier": return oe(u$1, o$2);
-			case "Subroutine": return ae(u$1, o$2);
+			case "Quantifier": return oe(u$1, t);
+			case "Subroutine": return ae(u$1, t);
 			default: throw new Error(`Unexpected token type "${u$1.type}"`);
 		}
-	}, o$2 = {
+	}, t = {
 		capturingGroups: [],
 		hasNumberedRef: !1,
 		namedGroupsByName: new Map(),
@@ -8810,25 +8819,25 @@ function J(e, r$3 = {}) {
 		skipLookbehindValidation: n.skipLookbehindValidation,
 		skipPropertyNameValidation: n.skipPropertyNameValidation,
 		subroutines: [],
-		tokens: t.tokens,
+		tokens: o$2.tokens,
 		unicodePropertyMap: n.unicodePropertyMap,
-		walk: s$1
-	}, i$2 = B(T(t.flags));
-	let d$1 = i$2.body[0];
-	for (; o$2.nextIndex < t.tokens.length;) {
-		const p$1 = s$1(d$1, {});
-		p$1.type === "Alternative" ? (i$2.body.push(p$1), d$1 = p$1) : d$1.body.push(p$1);
-	}
-	const { capturingGroups: a$1, hasNumberedRef: l$2, namedGroupsByName: c, subroutines: f$2 } = o$2;
+		walk: i$2
+	}, d$1 = B(T(o$2.flags));
+	let s$1 = d$1.body[0];
+	for (; t.nextIndex < o$2.tokens.length;) {
+		const p$1 = i$2(s$1, {});
+		p$1.type === "Alternative" ? (d$1.body.push(p$1), s$1 = p$1) : s$1.body.push(p$1);
+	}
+	const { capturingGroups: a$1, hasNumberedRef: l$2, namedGroupsByName: c, subroutines: f$1 } = t;
 	if (l$2 && c.size && !n.rules.captureGroup) throw new Error("Numbered backref/subroutine not allowed when using named capture");
-	for (const { ref: p$1 } of f$2) if (typeof p$1 == "number") {
+	for (const { ref: p$1 } of f$1) if (typeof p$1 == "number") {
 		if (p$1 > a$1.length) throw new Error("Subroutine uses a group number that's not defined");
 		p$1 && (a$1[p$1 - 1].isSubroutined = !0);
 	} else if (c.has(p$1)) {
 		if (c.get(p$1).length > 1) throw new Error(o$1`Subroutine uses a duplicate group name "\g<${p$1}>"`);
 		c.get(p$1)[0].isSubroutined = !0;
 	} else throw new Error(o$1`Subroutine uses a group name that's not defined "\g<${p$1}>"`);
-	return i$2;
+	return d$1;
 }
 function W({ kind: e }) {
 	return F(u({
@@ -8845,106 +8854,106 @@ function W({ kind: e }) {
 	}[e], `Unexpected assertion kind "${e}"`), { negate: e === o$1`\B` || e === o$1`\Y` });
 }
 function X({ raw: e }, r$3) {
-	const n = /^\\k[<']/.test(e), t = n ? e.slice(3, -1) : e.slice(1), s$1 = (o$2, i$2 = !1) => {
-		const d$1 = r$3.capturingGroups.length;
+	const n = /^\\k[<']/.test(e), o$2 = n ? e.slice(3, -1) : e.slice(1), i$2 = (t, d$1 = !1) => {
+		const s$1 = r$3.capturingGroups.length;
 		let a$1 = !1;
-		if (o$2 > d$1) if (r$3.skipBackrefValidation) a$1 = !0;
+		if (t > s$1) if (r$3.skipBackrefValidation) a$1 = !0;
 		else throw new Error(`Not enough capturing groups defined to the left "${e}"`);
-		return r$3.hasNumberedRef = !0, k(i$2 ? d$1 + 1 - o$2 : o$2, { orphan: a$1 });
+		return r$3.hasNumberedRef = !0, k(d$1 ? s$1 + 1 - t : t, { orphan: a$1 });
 	};
 	if (n) {
-		const o$2 = /^(?<sign>-?)0*(?<num>[1-9]\d*)$/.exec(t);
-		if (o$2) return s$1(+o$2.groups.num, !!o$2.groups.sign);
-		if (/[-+]/.test(t)) throw new Error(`Invalid backref name "${e}"`);
-		if (!r$3.namedGroupsByName.has(t)) throw new Error(`Group name not defined to the left "${e}"`);
-		return k(t);
+		const t = /^(?<sign>-?)0*(?<num>[1-9]\d*)$/.exec(o$2);
+		if (t) return i$2(+t.groups.num, !!t.groups.sign);
+		if (/[-+]/.test(o$2)) throw new Error(`Invalid backref name "${e}"`);
+		if (!r$3.namedGroupsByName.has(o$2)) throw new Error(`Group name not defined to the left "${e}"`);
+		return k(o$2);
 	}
-	return s$1(+t);
+	return i$2(+o$2);
 }
 function ee(e, r$3, n) {
-	const { tokens: t, walk: s$1 } = r$3, o$2 = r$3.parent, i$2 = o$2.body.at(-1), d$1 = t[r$3.nextIndex];
-	if (!n.isCheckingRangeEnd && i$2 && i$2.type !== "CharacterClass" && i$2.type !== "CharacterClassRange" && d$1 && d$1.type !== "CharacterClassOpen" && d$1.type !== "CharacterClassClose" && d$1.type !== "CharacterClassIntersector") {
-		const a$1 = s$1(o$2, {
+	const { tokens: o$2, walk: i$2 } = r$3, t = r$3.parent, d$1 = t.body.at(-1), s$1 = o$2[r$3.nextIndex];
+	if (!n.isCheckingRangeEnd && d$1 && d$1.type !== "CharacterClass" && d$1.type !== "CharacterClassRange" && s$1 && s$1.type !== "CharacterClassOpen" && s$1.type !== "CharacterClassClose" && s$1.type !== "CharacterClassIntersector") {
+		const a$1 = i$2(t, {
 			...n,
 			isCheckingRangeEnd: !0
 		});
-		if (i$2.type === "Character" && a$1.type === "Character") return o$2.body.pop(), L(i$2, a$1);
+		if (d$1.type === "Character" && a$1.type === "Character") return t.body.pop(), L(d$1, a$1);
 		throw new Error("Invalid character class range");
 	}
 	return m(r$2("-"));
 }
 function re({ negate: e }, r$3, n) {
-	const { tokens: t, walk: s$1 } = r$3, o$2 = t[r$3.nextIndex], i$2 = [C()];
-	let d$1 = z(o$2);
-	for (; d$1.type !== "CharacterClassClose";) {
-		if (d$1.type === "CharacterClassIntersector") i$2.push(C()), r$3.nextIndex++;
+	const { tokens: o$2, walk: i$2 } = r$3, t = [C()], d$1 = o$2[r$3.nextIndex];
+	let s$1 = z(d$1);
+	for (; s$1.type !== "CharacterClassClose";) {
+		if (s$1.type === "CharacterClassIntersector") t.push(C()), r$3.nextIndex++;
 		else {
-			const l$2 = i$2.at(-1);
-			l$2.body.push(s$1(l$2, n));
+			const l$2 = t.at(-1);
+			l$2.body.push(i$2(l$2, n));
 		}
-		d$1 = z(t[r$3.nextIndex], o$2);
+		s$1 = z(o$2[r$3.nextIndex], d$1);
 	}
 	const a$1 = C({ negate: e });
-	return i$2.length === 1 ? a$1.body = i$2[0].body : (a$1.kind = "intersection", a$1.body = i$2.map((l$2) => l$2.body.length === 1 ? l$2.body[0] : l$2)), r$3.nextIndex++, a$1;
+	return t.length === 1 ? a$1.body = t[0].body : (a$1.kind = "intersection", a$1.body = t.map((l$2) => l$2.body.length === 1 ? l$2.body[0] : l$2)), r$3.nextIndex++, a$1;
 }
-function ne({ kind: e, negate: r$3, value: n }, t) {
-	const { normalizeUnknownPropertyNames: s$1, skipPropertyNameValidation: o$2, unicodePropertyMap: i$2 } = t;
+function ne({ kind: e, negate: r$3, value: n }, o$2) {
+	const { normalizeUnknownPropertyNames: i$2, skipPropertyNameValidation: t, unicodePropertyMap: d$1 } = o$2;
 	if (e === "property") {
-		const d$1 = w(n);
-		if (i.has(d$1) && !i$2?.has(d$1)) e = "posix", n = d$1;
+		const s$1 = w(n);
+		if (i.has(s$1) && !d$1?.has(s$1)) e = "posix", n = s$1;
 		else return Q(n, {
 			negate: r$3,
-			normalizeUnknownPropertyNames: s$1,
-			skipPropertyNameValidation: o$2,
-			unicodePropertyMap: i$2
+			normalizeUnknownPropertyNames: i$2,
+			skipPropertyNameValidation: t,
+			unicodePropertyMap: d$1
 		});
 	}
 	return e === "posix" ? R(n, { negate: r$3 }) : E(e, { negate: r$3 });
 }
 function te(e, r$3, n) {
-	const { tokens: t, capturingGroups: s$1, namedGroupsByName: o$2, skipLookbehindValidation: i$2, walk: d$1 } = r$3, a$1 = ie(e), l$2 = a$1.type === "AbsenceFunction", c = $(a$1), f$2 = c && a$1.negate;
-	if (a$1.type === "CapturingGroup" && (s$1.push(a$1), a$1.name && l$1(o$2, a$1.name, []).push(a$1)), l$2 && n.isInAbsenceFunction) throw new Error("Nested absence function not supported by Oniguruma");
-	let p$1 = D(t[r$3.nextIndex]);
+	const { tokens: o$2, capturingGroups: i$2, namedGroupsByName: t, skipLookbehindValidation: d$1, walk: s$1 } = r$3, a$1 = ie(e), l$2 = a$1.type === "AbsenceFunction", c = $(a$1), f$1 = c && a$1.negate;
+	if (a$1.type === "CapturingGroup" && (i$2.push(a$1), a$1.name && l$1(t, a$1.name, []).push(a$1)), l$2 && n.isInAbsenceFunction) throw new Error("Nested absence function not supported by Oniguruma");
+	let p$1 = D(o$2[r$3.nextIndex]);
 	for (; p$1.type !== "GroupClose";) {
 		if (p$1.type === "Alternator") a$1.body.push(b()), r$3.nextIndex++;
 		else {
-			const N = a$1.body.at(-1), u$1 = d$1(N, {
+			const N = a$1.body.at(-1), u$1 = s$1(N, {
 				...n,
 				isInAbsenceFunction: n.isInAbsenceFunction || l$2,
 				isInLookbehind: n.isInLookbehind || c,
-				isInNegLookbehind: n.isInNegLookbehind || f$2
+				isInNegLookbehind: n.isInNegLookbehind || f$1
 			});
-			if (N.body.push(u$1), (c || n.isInLookbehind) && !i$2) {
+			if (N.body.push(u$1), (c || n.isInLookbehind) && !d$1) {
 				const v$1 = "Lookbehind includes a pattern not allowed by Oniguruma";
-				if (f$2 || n.isInNegLookbehind) {
+				if (f$1 || n.isInNegLookbehind) {
 					if (M$1(u$1) || u$1.type === "CapturingGroup") throw new Error(v$1);
 				} else if (M$1(u$1) || $(u$1) && u$1.negate) throw new Error(v$1);
 			}
 		}
-		p$1 = D(t[r$3.nextIndex]);
+		p$1 = D(o$2[r$3.nextIndex]);
 	}
 	return r$3.nextIndex++, a$1;
 }
-function oe({ kind: e, min: r$3, max: n }, t) {
-	const s$1 = t.parent, o$2 = s$1.body.at(-1);
-	if (!o$2 || !s(o$2)) throw new Error("Quantifier requires a repeatable token");
-	const i$2 = _(e, r$3, n, o$2);
-	return s$1.body.pop(), i$2;
+function oe({ kind: e, min: r$3, max: n }, o$2) {
+	const i$2 = o$2.parent, t = i$2.body.at(-1);
+	if (!t || !s(t)) throw new Error("Quantifier requires a repeatable token");
+	const d$1 = _(e, r$3, n, t);
+	return i$2.body.pop(), d$1;
 }
 function ae({ raw: e }, r$3) {
-	const { capturingGroups: n, subroutines: t } = r$3;
-	let s$1 = e.slice(3, -1);
-	const o$2 = /^(?<sign>[-+]?)0*(?<num>[1-9]\d*)$/.exec(s$1);
-	if (o$2) {
-		const d$1 = +o$2.groups.num, a$1 = n.length;
-		if (r$3.hasNumberedRef = !0, s$1 = {
-			"": d$1,
-			"+": a$1 + d$1,
-			"-": a$1 + 1 - d$1
-		}[o$2.groups.sign], s$1 < 1) throw new Error("Invalid subroutine number");
-	} else s$1 === "0" && (s$1 = 0);
-	const i$2 = O(s$1);
-	return t.push(i$2), i$2;
+	const { capturingGroups: n, subroutines: o$2 } = r$3;
+	let i$2 = e.slice(3, -1);
+	const t = /^(?<sign>[-+]?)0*(?<num>[1-9]\d*)$/.exec(i$2);
+	if (t) {
+		const s$1 = +t.groups.num, a$1 = n.length;
+		if (r$3.hasNumberedRef = !0, i$2 = {
+			"": s$1,
+			"+": a$1 + s$1,
+			"-": a$1 + 1 - s$1
+		}[t.groups.sign], i$2 < 1) throw new Error("Invalid subroutine number");
+	} else i$2 === "0" && (i$2 = 0);
+	const d$1 = O(i$2);
+	return o$2.push(d$1), d$1;
 }
 function G(e, r$3) {
 	if (e !== "repeater") throw new Error(`Unexpected absence function kind "${e}"`);
@@ -8996,9 +9005,9 @@ function m(e, r$3) {
 		...r$3
 	};
 	if (e > 1114111) {
-		const t = e.toString(16);
+		const o$2 = e.toString(16);
 		if (n.useLastValid) e = 1114111;
-		else throw e > 1310719 ? new Error(`Invalid code point out of range "\\x{${t}}"`) : new Error(`Invalid code point out of range in JS "\\x{${t}}"`);
+		else throw e > 1310719 ? new Error(`Invalid code point out of range "\\x{${o$2}}"`) : new Error(`Invalid code point out of range in JS "\\x{${o$2}}"`);
 	}
 	return {
 		type: "Character",
@@ -9027,11 +9036,11 @@ function L(e, r$3) {
 	};
 }
 function E(e, r$3) {
-	const n = !!r$3?.negate, t = {
+	const n = !!r$3?.negate, o$2 = {
 		type: "CharacterSet",
 		kind: e
 	};
-	return (e === "digit" || e === "hex" || e === "newline" || e === "space" || e === "word") && (t.negate = n), (e === "text_segment" || e === "newline" && !n) && (t.variableLength = !0), t;
+	return (e === "digit" || e === "hex" || e === "newline" || e === "space" || e === "word") && (o$2.negate = n), (e === "text_segment" || e === "newline" && !n) && (o$2.variableLength = !0), o$2;
 }
 function I(e, r$3 = {}) {
 	if (e === "keep") return {
@@ -9092,14 +9101,14 @@ function R(e, r$3) {
 		negate: n
 	};
 }
-function _(e, r$3, n, t) {
+function _(e, r$3, n, o$2) {
 	if (r$3 > n) throw new Error("Invalid reversed quantifier range");
 	return {
 		type: "Quantifier",
 		kind: e,
 		min: r$3,
 		max: n,
-		body: t
+		body: o$2
 	};
 }
 function B(e, r$3) {
@@ -9123,28 +9132,28 @@ function Q(e, r$3) {
 		unicodePropertyMap: null,
 		...r$3
 	};
-	let t = n.unicodePropertyMap?.get(w(e));
-	if (!t) {
-		if (n.normalizeUnknownPropertyNames) t = de(e);
+	let o$2 = n.unicodePropertyMap?.get(w(e));
+	if (!o$2) {
+		if (n.normalizeUnknownPropertyNames) o$2 = de(e);
 		else if (n.unicodePropertyMap && !n.skipPropertyNameValidation) throw new Error(o$1`Invalid Unicode property "\p{${e}}"`);
 	}
 	return {
 		type: "CharacterSet",
 		kind: "property",
-		value: t ?? e,
+		value: o$2 ?? e,
 		negate: n.negate
 	};
 }
-function ie({ flags: e, kind: r$3, name: n, negate: t, number: s$1 }) {
+function ie({ flags: e, kind: r$3, name: n, negate: o$2, number: i$2 }) {
 	switch (r$3) {
 		case "absence_repeater": return G("repeater");
 		case "atomic": return A({ atomic: !0 });
-		case "capturing": return P(s$1, { name: n });
+		case "capturing": return P(i$2, { name: n });
 		case "group": return A({ flags: e });
 		case "lookahead":
 		case "lookbehind": return K({
 			behind: r$3 === "lookbehind",
-			negate: t
+			negate: o$2
 		});
 		default: throw new Error(`Unexpected group kind "${r$3}"`);
 	}
@@ -9175,16 +9184,17 @@ function w(e) {
 	return e.replace(/[- _]+/g, "").toLowerCase();
 }
 function z(e, r$3) {
-	return u(e, `${r$3?.type === "Character" && r$3.value === 93 ? "Empty" : "Unclosed"} character class`);
+	const n = r$3;
+	return u(e, `Unclosed character class${n?.type === "Character" && n.value === 93 && n.raw === "]" ? " (started with \"]\")" : ""}`);
 }
 function D(e) {
 	return u(e, "Unclosed group");
 }
 
 //#endregion
-//#region ../../node_modules/.bun/oniguruma-parser@0.12.1/node_modules/oniguruma-parser/dist/traverser/traverse.js
+//#region ../../node_modules/.bun/oniguruma-parser@0.12.2/node_modules/oniguruma-parser/dist/traverser/traverse.js
 function S(a$1, v$1, N = null) {
-	function u$1(e, s$1) {
+	function b$2(e, s$1) {
 		for (let t = 0; t < e.length; t++) {
 			const r$3 = n(e[t], s$1, t, e);
 			t = Math.max(-1, t + r$3);
@@ -9199,40 +9209,39 @@ function S(a$1, v$1, N = null) {
 			container: r$3,
 			root: a$1,
 			remove() {
-				f(r$3).splice(Math.max(0, l(t) + i$2), 1), i$2--, c = !0;
+				x(r$3).splice(Math.max(0, l(t) + i$2), 1), i$2--, c = !0;
 			},
 			removeAllNextSiblings() {
-				return f(r$3).splice(l(t) + 1);
+				return x(r$3).splice(l(t) + 1);
 			},
 			removeAllPrevSiblings() {
 				const o$2 = l(t) + i$2;
-				return i$2 -= o$2, f(r$3).splice(0, Math.max(0, o$2));
+				return i$2 -= o$2, x(r$3).splice(0, Math.max(0, o$2));
 			},
-			replaceWith(o$2, y$2 = {}) {
-				const b$2 = !!y$2.traverse;
-				r$3 ? r$3[Math.max(0, l(t) + i$2)] = o$2 : u(s$1, "Can't replace root node")[t] = o$2, b$2 && n(o$2, s$1, t, r$3), c = !0;
+			replaceWith(o$2, m$2 = {}) {
+				const y$2 = !!m$2.traverse;
+				r$3 ? r$3[Math.max(0, l(t) + i$2)] = o$2 : u(s$1, "Can't replace root node")[t] = o$2, y$2 && n(o$2, s$1, t, r$3), c = !0;
 			},
-			replaceWithMultiple(o$2, y$2 = {}) {
-				const b$2 = !!y$2.traverse;
-				if (f(r$3).splice(Math.max(0, l(t) + i$2), 1, ...o$2), i$2 += o$2.length - 1, b$2) {
+			replaceWithMultiple(o$2, m$2 = {}) {
+				const y$2 = !!m$2.traverse;
+				if (x(r$3).splice(Math.max(0, l(t) + i$2), 1, ...o$2), i$2 += o$2.length - 1, y$2) {
 					let g = 0;
-					for (let x$1 = 0; x$1 < o$2.length; x$1++) g += n(o$2[x$1], s$1, l(t) + x$1 + g, r$3);
+					for (let p$1 = 0; p$1 < o$2.length; p$1++) g += n(o$2[p$1], s$1, l(t) + p$1 + g, r$3);
 				}
 				c = !0;
 			},
 			skip() {
 				c = !0;
 			}
-		}, { type: m$2 } = e, h$1 = v$1["*"], p$1 = v$1[m$2], R$2 = typeof h$1 == "function" ? h$1 : h$1?.enter, P$2 = typeof p$1 == "function" ? p$1 : p$1?.enter;
-		if (R$2?.(d$1, N), P$2?.(d$1, N), !c) switch (m$2) {
+		}, { type: f$1 } = e, u$1 = v$1["*"], h$1 = v$1[f$1], R$2 = typeof u$1 == "function" ? u$1 : u$1?.enter, P$2 = typeof h$1 == "function" ? h$1 : h$1?.enter;
+		if (R$2?.(d$1, N), P$2?.(d$1, N), !c) switch (f$1) {
 			case "AbsenceFunction":
-			case "CapturingGroup":
-			case "Group":
-				u$1(e.body, e);
-				break;
 			case "Alternative":
+			case "CapturingGroup":
 			case "CharacterClass":
-				u$1(e.body, e);
+			case "Group":
+			case "LookaroundAssertion":
+				b$2(e.body, e);
 				break;
 			case "Assertion":
 			case "Backreference":
@@ -9245,22 +9254,19 @@ function S(a$1, v$1, N = null) {
 			case "CharacterClassRange":
 				n(e.min, e, "min"), n(e.max, e, "max");
 				break;
-			case "LookaroundAssertion":
-				u$1(e.body, e);
-				break;
 			case "Quantifier":
 				n(e.body, e, "body");
 				break;
 			case "Regex":
-				u$1(e.body, e), n(e.flags, e, "flags");
+				b$2(e.body, e), n(e.flags, e, "flags");
 				break;
-			default: throw new Error(`Unexpected node type "${m$2}"`);
+			default: throw new Error(`Unexpected node type "${f$1}"`);
 		}
-		return p$1?.exit?.(d$1, N), h$1?.exit?.(d$1, N), i$2;
+		return h$1?.exit?.(d$1, N), u$1?.exit?.(d$1, N), i$2;
 	}
 	return n(a$1), a$1;
 }
-function f(a$1) {
+function x(a$1) {
 	if (!Array.isArray(a$1)) throw new Error("Container expected");
 	return a$1;
 }
@@ -9522,7 +9528,7 @@ function atomic(expression, data) {
 						if (captureTransfers.size) {
 							const newCaptureTransfers = new Map();
 							captureTransfers.forEach((from, to) => {
-								newCaptureTransfers.set(to >= addedCaptureNum ? to + 1 : to, from.map((f$2) => f$2 >= addedCaptureNum ? f$2 + 1 : f$2));
+								newCaptureTransfers.set(to >= addedCaptureNum ? to + 1 : to, from.map((f$1) => f$1 >= addedCaptureNum ? f$1 + 1 : f$1));
 							});
 							captureTransfers = newCaptureTransfers;
 						}
@@ -9958,18 +9964,18 @@ function mapCaptureTransfers(captureTransfers, left, reps, numCapturesAddedInExp
 			const numCapturesAddedInLeft = numCapturesInLeft * reps;
 			const newTo = to > recursionDelimCaptureNum + numCapturesInLeft ? to + numCapturesAddedInExpansion : to;
 			const newFrom = [];
-			for (const f$2 of from) {
-				if (f$2 <= recursionDelimCaptureNum) {
-					newFrom.push(f$2);
-				} else if (f$2 > recursionDelimCaptureNum + numCapturesInLeft + numCapturesInRight) {
-					newFrom.push(f$2 + numCapturesAddedInExpansion);
-				} else if (f$2 <= recursionDelimCaptureNum + numCapturesInLeft) {
+			for (const f$1 of from) {
+				if (f$1 <= recursionDelimCaptureNum) {
+					newFrom.push(f$1);
+				} else if (f$1 > recursionDelimCaptureNum + numCapturesInLeft + numCapturesInRight) {
+					newFrom.push(f$1 + numCapturesAddedInExpansion);
+				} else if (f$1 <= recursionDelimCaptureNum + numCapturesInLeft) {
 					for (let i$2 = 0; i$2 <= reps; i$2++) {
-						newFrom.push(f$2 + numCapturesInLeft * i$2);
+						newFrom.push(f$1 + numCapturesInLeft * i$2);
 					}
 				} else {
 					for (let i$2 = 0; i$2 <= reps; i$2++) {
-						newFrom.push(f$2 + numCapturesAddedInLeft + numCapturesInRight * i$2);
+						newFrom.push(f$1 + numCapturesAddedInLeft + numCapturesInRight * i$2);
 					}
 				}
 			}
@@ -9981,36 +9987,36 @@ function mapCaptureTransfers(captureTransfers, left, reps, numCapturesAddedInExp
 }
 
 //#endregion
-//#region ../../node_modules/.bun/oniguruma-to-es@4.3.4/node_modules/oniguruma-to-es/dist/esm/index.js
+//#region ../../node_modules/.bun/oniguruma-to-es@4.3.6/node_modules/oniguruma-to-es/dist/esm/index.js
 var cp = String.fromCodePoint;
 var r = String.raw;
-var envFlags = {
-	flagGroups: (() => {
-		try {
-			new RegExp("(?i:)");
-		} catch {
-			return false;
-		}
-		return true;
-	})(),
-	unicodeSets: (() => {
-		try {
-			new RegExp("[[]]", "v");
-		} catch {
-			return false;
-		}
-		return true;
-	})()
-};
+var envFlags = {};
+var globalRegExp = globalThis.RegExp;
+envFlags.flagGroups = (() => {
+	try {
+		new globalRegExp("(?i:)");
+	} catch {
+		return false;
+	}
+	return true;
+})();
+envFlags.unicodeSets = (() => {
+	try {
+		new globalRegExp("[[]]", "v");
+	} catch {
+		return false;
+	}
+	return true;
+})();
 envFlags.bugFlagVLiteralHyphenIsRange = envFlags.unicodeSets ? (() => {
 	try {
-		new RegExp(r`[\d\-a]`, "v");
+		new globalRegExp(r`[\d\-a]`, "v");
 	} catch {
 		return true;
 	}
 	return false;
 })() : false;
-envFlags.bugNestedClassIgnoresNegation = envFlags.unicodeSets && new RegExp("[[^a]]", "v").test("a");
+envFlags.bugNestedClassIgnoresNegation = envFlags.unicodeSets && new globalRegExp("[[^a]]", "v").test("a");
 function getNewCurrentFlags(current, { enable, disable }) {
 	return {
 		dotAll: !disable?.dotAll && !!(enable?.dotAll || current.dotAll),
@@ -10492,7 +10498,7 @@ var FirstPassVisitor = {
 			"spaceIsAscii",
 			"wordIsAscii",
 			"textSegmentMode"
-		].forEach((f$2) => delete node[f$2]);
+		].forEach((f$1) => delete node[f$1]);
 		Object.assign(node, {
 			global: false,
 			hasIndices: false,
@@ -10636,7 +10642,9 @@ var SecondPassVisitor = {
 			}
 		},
 		exit({ node }, { openRefs }) {
-			openRefs.delete(node.number);
+			if (openRefs.get(node.number) === node) {
+				openRefs.delete(node.number);
+			}
 		}
 	},
 	Group: {
@@ -11636,7 +11644,7 @@ function toRegExpDetails(pattern, options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.0.2/node_modules/@shikijs/engine-javascript/dist/engine-compile.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.2.0/node_modules/@shikijs/engine-javascript/dist/engine-compile.mjs
 /**
 * The default regex constructor for the JavaScript RegExp engine.
 */
@@ -11664,10 +11672,11 @@ function defaultJavaScriptRegexConstructor(pattern, options) {
 * Set `forgiving` to `true` to ignore these errors and skip any unsupported or invalid patterns.
 */
 function createJavaScriptRegexEngine(options = {}) {
-	const _options = Object.assign({
+	const _options = {
 		target: "auto",
-		cache: /* @__PURE__ */ new Map()
-	}, options);
+		cache: /* @__PURE__ */ new Map(),
+		...options
+	};
 	_options.regexConstructor ||= (pattern) => defaultJavaScriptRegexConstructor(pattern, { target: _options.target });
 	return {
 		createScanner(patterns) {
@@ -11680,7 +11689,7 @@ function createJavaScriptRegexEngine(options = {}) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.0.2/node_modules/@shikijs/engine-javascript/dist/engine-raw.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-javascript@4.2.0/node_modules/@shikijs/engine-javascript/dist/engine-raw.mjs
 /**
 * Raw JavaScript regex engine that only supports precompiled grammars.
 *
@@ -11706,7 +11715,7 @@ function createJavaScriptRawEngine() {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+engine-oniguruma@4.0.2/node_modules/@shikijs/engine-oniguruma/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+engine-oniguruma@4.2.0/node_modules/@shikijs/engine-oniguruma/dist/index.mjs
 var dist_exports = /* @__PURE__ */ __export({
 	createOnigurumaEngine: () => createOnigurumaEngine,
 	getDefaultWasmLoader: () => getDefaultWasmLoader,
@@ -11725,7 +11734,7 @@ function getHeapMax() {
 function _emscripten_get_now() {
 	return typeof performance !== "undefined" ? performance.now() : Date.now();
 }
-const alignUp = (x$1, multiple) => x$1 + (multiple - x$1 % multiple) % multiple;
+const alignUp = (x$2, multiple) => x$2 + (multiple - x$2 % multiple) % multiple;
 async function main(init) {
 	let wasmMemory;
 	let buffer;
@@ -11808,10 +11817,10 @@ async function main(init) {
 			env: asmLibraryArg,
 			wasi_snapshot_preview1: asmLibraryArg
 		};
-		const exports$1 = await init(info);
-		wasmMemory = exports$1.memory;
+		const exports = await init(info);
+		wasmMemory = exports.memory;
 		updateGlobalBufferAndViews(wasmMemory.buffer);
-		Object.assign(binding, exports$1);
+		Object.assign(binding, exports);
 		binding.UTF8ToString = UTF8ToString;
 	}
 	await createWasm();
@@ -12130,7 +12139,7 @@ async function createOnigurumaEngine(options) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/shiki@4.0.2/node_modules/shiki/dist/engine-oniguruma.mjs
+//#region ../../node_modules/.bun/shiki@4.2.0/node_modules/shiki/dist/engine-oniguruma.mjs
 var engine_oniguruma_exports = /* @__PURE__ */ __exportAll({});
 __reExport(engine_oniguruma_exports, dist_exports);
 
@@ -12234,11 +12243,500 @@ function attachResolvedLanguages(resolvedLanguages, highlighter$1) {
 
 //#endregion
 //#region src/highlighter/themes/constants.ts
-const ResolvedThemes = new Map();
-const ResolvingThemes = new Map();
-const RegisteredCustomThemes = new Map();
 const AttachedThemes = new Set();
 
+//#endregion
+//#region ../theming/dist/modules/createThemeCollection.js
+function createThemeCollection(options) {
+	const descriptors = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const entry of getCollectionEntries(options.themes)) {
+		const themes = isThemeCollectionSource(entry) ? entry.getThemes() : [entry];
+		for (const descriptor of themes) {
+			if (seen.has(descriptor.name)) throw new Error(`Theme collection already contains theme "${descriptor.name}"`);
+			seen.add(descriptor.name);
+			descriptors.push(descriptor);
+		}
+	}
+	const allThemes = Object.freeze([...descriptors]);
+	const lightThemes = Object.freeze(allThemes.filter((descriptor) => descriptor.colorScheme === "light"));
+	const darkThemes = Object.freeze(allThemes.filter((descriptor) => descriptor.colorScheme === "dark"));
+	const themesByName = new Map(allThemes.map((descriptor) => [descriptor.name, descriptor]));
+	const allNames = Object.freeze(allThemes.map((descriptor) => descriptor.name));
+	const lightNames = Object.freeze(lightThemes.map((descriptor) => descriptor.name));
+	const darkNames = Object.freeze(darkThemes.map((descriptor) => descriptor.name));
+	function filteredThemes(filterOptions) {
+		if (filterOptions == null) return allThemes;
+		const { colorScheme, collection } = filterOptions;
+		if (collection == null) {
+			if (colorScheme === "light") return lightThemes;
+			if (colorScheme === "dark") return darkThemes;
+			return allThemes;
+		}
+		return allThemes.filter((descriptor) => {
+			if (descriptor.collection !== collection) return false;
+			return colorScheme == null || descriptor.colorScheme === colorScheme;
+		});
+	}
+	return {
+		getTheme(name) {
+			return themesByName.get(name);
+		},
+		getThemes(themeOptions) {
+			return filteredThemes(themeOptions);
+		},
+		getThemeNames(namesOptions) {
+			if (namesOptions?.collection == null) {
+				if (namesOptions?.colorScheme === "light") return lightNames;
+				if (namesOptions?.colorScheme === "dark") return darkNames;
+				return allNames;
+			}
+			return filteredThemes(namesOptions).map((descriptor) => descriptor.name);
+		},
+		hasTheme(name) {
+			return themesByName.has(name);
+		},
+		orderBy(compare) {
+			return createThemeCollection({ themes: allThemes.map((descriptor, index) => ({
+				descriptor,
+				index
+			})).sort((a$1, b$2) => {
+				const result = compare(a$1.descriptor, b$2.descriptor);
+				if (result !== 0) return result;
+				return a$1.index - b$2.index;
+			}).map((entry) => entry.descriptor) });
+		},
+		pick(names) {
+			const picked = [];
+			const pickedNames = /* @__PURE__ */ new Set();
+			for (const name of names) {
+				if (pickedNames.has(name)) throw new Error(`Theme collection pick already includes theme "${name}"`);
+				pickedNames.add(name);
+				const descriptor = themesByName.get(name);
+				if (descriptor == null) throw new Error(`Theme collection does not contain theme "${name}"`);
+				picked.push(descriptor);
+			}
+			return createThemeCollection({ themes: picked });
+		},
+		registerInto(resolver) {
+			for (const descriptor of allThemes) resolver.registerThemeIfAbsent(descriptor.name, descriptor.load);
+		}
+	};
+}
+function getCollectionEntries(input) {
+	if (isThemeCollectionEntry(input)) return [input];
+	return input;
+}
+function isThemeCollectionEntry(input) {
+	return isThemeCollectionSource(input) || isThemeDescriptor(input);
+}
+function isThemeDescriptor(input) {
+	return typeof input.name === "string" && typeof input.load === "function";
+}
+function isThemeCollectionSource(entry) {
+	return typeof entry.getThemes === "function";
+}
+
+//#endregion
+//#region ../theming/dist/modules/createThemeCatalog.js
+function createThemeCatalog(options) {
+	const collection = createThemeCollection({ themes: options.themes });
+	if (!collection.hasTheme(options.defaultLightThemeName)) throw new Error(`Default light theme "${options.defaultLightThemeName}" is not in the catalog`);
+	if (!collection.hasTheme(options.defaultDarkThemeName)) throw new Error(`Default dark theme "${options.defaultDarkThemeName}" is not in the catalog`);
+	return {
+		...collection,
+		defaultLightThemeName: options.defaultLightThemeName,
+		defaultDarkThemeName: options.defaultDarkThemeName
+	};
+}
+
+//#endregion
+//#region ../theming/dist/modules/unwrapDefault.js
+function unwrapDefault(value) {
+	return value !== null && typeof value === "object" && "default" in value ? value.default : value;
+}
+
+//#endregion
+//#region ../theming/dist/modules/createThemeResolver.js
+var DuplicateThemeError = class extends Error {
+	constructor(name) {
+		super(`Theme "${name}" is already registered`);
+		this.name = "DuplicateThemeError";
+	}
+};
+var UnregisteredThemeError = class extends Error {
+	constructor(name) {
+		super(`No loader registered for theme "${name}"`);
+		this.name = "UnregisteredThemeError";
+	}
+};
+var UnresolvedThemeError = class extends Error {
+	constructor(name) {
+		super(`Theme "${name}" has not been resolved`);
+		this.name = "UnresolvedThemeError";
+	}
+};
+function createThemeResolver() {
+	const loaders = /* @__PURE__ */ new Map();
+	const resolved = /* @__PURE__ */ new Map();
+	const inflight = /* @__PURE__ */ new Map();
+	let cacheGeneration = 0;
+	function registerTheme(name, loader) {
+		if (loaders.has(name)) throw new DuplicateThemeError(name);
+		loaders.set(name, loader);
+	}
+	function registerThemeIfAbsent(name, loader) {
+		if (loaders.has(name)) return false;
+		loaders.set(name, loader);
+		return true;
+	}
+	function hasRegisteredTheme(name) {
+		return loaders.has(name);
+	}
+	function resolveTheme(name) {
+		const cached = resolved.get(name);
+		if (cached !== void 0) return Promise.resolve(cached);
+		const existing = inflight.get(name);
+		if (existing !== void 0) return existing;
+		const loader = loaders.get(name);
+		if (loader === void 0) return Promise.reject(new UnregisteredThemeError(name));
+		const generation = cacheGeneration;
+		const promise = loader().then((result) => {
+			const theme = unwrapDefault(result);
+			if (generation === cacheGeneration) resolved.set(name, theme);
+			if (inflight.get(name) === promise) inflight.delete(name);
+			return theme;
+		}).catch((err) => {
+			if (inflight.get(name) === promise) inflight.delete(name);
+			throw err;
+		});
+		inflight.set(name, promise);
+		return promise;
+	}
+	function resolveThemes$1(names) {
+		return Promise.all(names.map((name) => resolveTheme(name)));
+	}
+	function seedResolvedTheme(name, theme) {
+		resolved.set(name, theme);
+	}
+	function seedResolvedThemes(entries) {
+		for (const [name, theme] of entries) seedResolvedTheme(name, theme);
+	}
+	function getResolvedTheme(name) {
+		return resolved.get(name);
+	}
+	function getResolvedThemes(names) {
+		const themes = [];
+		for (const name of names) {
+			const theme = resolved.get(name);
+			if (theme === void 0) throw new UnresolvedThemeError(name);
+			themes.push(theme);
+		}
+		return themes;
+	}
+	function hasResolvedTheme(name) {
+		return resolved.has(name);
+	}
+	function hasResolvedThemes(names) {
+		for (const name of names) if (!resolved.has(name)) return false;
+		return true;
+	}
+	function getResolvedOrResolveTheme(name) {
+		const cached = resolved.get(name);
+		if (cached !== void 0) return cached;
+		return resolveTheme(name);
+	}
+	function clearResolvedThemes() {
+		cacheGeneration++;
+		resolved.clear();
+		inflight.clear();
+	}
+	return {
+		clearResolvedThemes,
+		getResolvedOrResolveTheme,
+		getResolvedTheme,
+		getResolvedThemes,
+		hasRegisteredTheme,
+		hasResolvedTheme,
+		hasResolvedThemes,
+		registerTheme,
+		registerThemeIfAbsent,
+		resolveTheme,
+		resolveThemes: resolveThemes$1,
+		seedResolvedTheme,
+		seedResolvedThemes
+	};
+}
+
+//#endregion
+//#region ../theming/dist/modules/createThemeController.js
+const FALLBACK_LIGHT_THEME = "pierre-light";
+const FALLBACK_DARK_THEME = "pierre-dark";
+function getStorage() {
+	try {
+		if (typeof globalThis !== "undefined" && globalThis.localStorage != null) return globalThis.localStorage;
+	} catch {}
+}
+function createLocalStorageAdapter(storageKey, defaults) {
+	return {
+		load() {
+			const raw$1 = getStorage()?.getItem(storageKey);
+			if (raw$1 == null) return null;
+			try {
+				const parsed = JSON.parse(raw$1);
+				if (parsed.mode == null) return null;
+				return {
+					darkThemeName: parsed.darkThemeName ?? defaults.darkThemeName,
+					lightThemeName: parsed.lightThemeName ?? defaults.lightThemeName,
+					mode: parsed.mode
+				};
+			} catch {
+				return null;
+			}
+		},
+		save(selection) {
+			const storage = getStorage();
+			try {
+				storage?.setItem(storageKey, JSON.stringify(selection));
+			} catch {}
+		}
+	};
+}
+function systemPrefersDark() {
+	try {
+		if (typeof globalThis !== "undefined" && globalThis.matchMedia != null) return globalThis.matchMedia("(prefers-color-scheme: dark)").matches;
+	} catch {}
+	return false;
+}
+function resolveColorScheme(mode) {
+	if (mode === "dark") return "dark";
+	if (mode === "light") return "light";
+	return systemPrefersDark() ? "dark" : "light";
+}
+function createThemeController(options) {
+	const { storageKey, preloadInactive = false } = options;
+	const catalog = "catalog" in options && options.catalog != null ? options.catalog : void 0;
+	const selectedResolver = options.resolver ?? (catalog != null ? createThemeResolver() : void 0);
+	if (selectedResolver == null) throw new Error("createThemeController requires a catalog or resolver");
+	const resolver = selectedResolver;
+	catalog?.registerInto(resolver);
+	const defaultDarkThemeName = options.defaultDarkThemeName ?? catalog?.defaultDarkThemeName ?? FALLBACK_DARK_THEME;
+	const defaultLightThemeName = options.defaultLightThemeName ?? catalog?.defaultLightThemeName ?? FALLBACK_LIGHT_THEME;
+	const persistence = options.persistence ?? (storageKey != null ? createLocalStorageAdapter(storageKey, {
+		darkThemeName: defaultDarkThemeName,
+		lightThemeName: defaultLightThemeName
+	}) : void 0);
+	const initialMode = options.defaultMode ?? "system";
+	let state = {
+		darkThemeName: defaultDarkThemeName,
+		lightThemeName: defaultLightThemeName,
+		mode: initialMode,
+		resolvedTheme: void 0,
+		resolvedColorScheme: resolveColorScheme(initialMode)
+	};
+	const listeners = /* @__PURE__ */ new Set();
+	let activeResolutionId = 0;
+	let pendingSelectionPatch;
+	function notify() {
+		for (const listener of listeners) listener();
+	}
+	function hydrateFromStorage() {
+		const loaded = persistence?.load();
+		if (loaded == null) return;
+		state = {
+			...state,
+			darkThemeName: loaded.darkThemeName,
+			lightThemeName: loaded.lightThemeName,
+			mode: loaded.mode,
+			resolvedColorScheme: resolveColorScheme(loaded.mode)
+		};
+	}
+	function persist() {
+		persistence?.save({
+			darkThemeName: state.darkThemeName,
+			lightThemeName: state.lightThemeName,
+			mode: state.mode
+		});
+	}
+	function activeThemeNameFor(selection) {
+		return selection.resolvedColorScheme === "dark" ? selection.darkThemeName : selection.lightThemeName;
+	}
+	function intendedState(patch = {}) {
+		return {
+			...state,
+			...pendingSelectionPatch,
+			...patch
+		};
+	}
+	function reportResolutionError(error, context) {
+		if (options.onResolutionError != null) {
+			options.onResolutionError(error, context);
+			return;
+		}
+		console.error(`[theming] Failed to resolve theme "${context.name}" for ${context.colorScheme} color scheme`, error);
+	}
+	function preloadInactiveFor(selection) {
+		if (!preloadInactive) return;
+		const activeName = activeThemeNameFor(selection);
+		const inactive = selection.resolvedColorScheme === "dark" ? selection.lightThemeName : selection.darkThemeName;
+		if (inactive !== activeName && resolver.getResolvedTheme(inactive) === void 0) resolver.resolveTheme(inactive).catch(() => {});
+	}
+	function resolveActive(patch = {}, { notifyPending = false, persistOnSuccess = false } = {}) {
+		const selectionPatch = {
+			...pendingSelectionPatch,
+			...patch
+		};
+		const next = intendedState(patch);
+		const name = activeThemeNameFor(next);
+		const colorScheme = next.resolvedColorScheme;
+		const cached = resolver.getResolvedTheme(name);
+		if (cached !== void 0) {
+			activeResolutionId++;
+			pendingSelectionPatch = void 0;
+			state = {
+				...state,
+				...selectionPatch,
+				pendingThemeResolution: void 0,
+				resolutionError: void 0,
+				resolvedTheme: cached
+			};
+			if (persistOnSuccess) persist();
+			notify();
+			preloadInactiveFor(state);
+			return;
+		}
+		const resolutionId = ++activeResolutionId;
+		pendingSelectionPatch = selectionPatch;
+		state = {
+			...state,
+			pendingThemeResolution: {
+				colorScheme,
+				name
+			},
+			resolutionError: void 0
+		};
+		if (notifyPending) notify();
+		resolver.resolveTheme(name).then((theme) => {
+			if (resolutionId !== activeResolutionId) return;
+			const latestIntended = intendedState();
+			if (latestIntended.resolvedColorScheme !== colorScheme || activeThemeNameFor(latestIntended) !== name) return;
+			const patchToCommit = pendingSelectionPatch ?? {};
+			pendingSelectionPatch = void 0;
+			state = {
+				...state,
+				...patchToCommit,
+				pendingThemeResolution: void 0,
+				resolutionError: void 0,
+				resolvedTheme: theme
+			};
+			if (persistOnSuccess) persist();
+			notify();
+			preloadInactiveFor(state);
+		}).catch((error) => {
+			if (resolutionId !== activeResolutionId) return;
+			pendingSelectionPatch = void 0;
+			state = {
+				...state,
+				pendingThemeResolution: void 0,
+				resolutionError: {
+					colorScheme,
+					error,
+					name
+				}
+			};
+			reportResolutionError(error, {
+				colorScheme,
+				name
+			});
+			notify();
+		});
+	}
+	function updateInactiveThemeName(key$1, name) {
+		state = {
+			...state,
+			[key$1]: name,
+			resolutionError: void 0
+		};
+		persist();
+		notify();
+		preloadInactiveFor(state);
+	}
+	function isSchemeActiveInIntendedState(scheme, patch = {}) {
+		return intendedState(patch).resolvedColorScheme === scheme;
+	}
+	function setActiveSelection(patch) {
+		resolveActive(patch, {
+			notifyPending: true,
+			persistOnSuccess: true
+		});
+	}
+	function setInactiveThemeName(scheme, key$1, name) {
+		if (isSchemeActiveInIntendedState(scheme, { [key$1]: name })) setActiveSelection({ [key$1]: name });
+		else updateInactiveThemeName(key$1, name);
+	}
+	function setMode(mode) {
+		setActiveSelection({
+			mode,
+			resolvedColorScheme: resolveColorScheme(mode)
+		});
+	}
+	function maybeUpdateSystemColorScheme() {
+		if (intendedState().mode !== "system") return;
+		const next = resolveColorScheme("system");
+		if (next !== intendedState().resolvedColorScheme) resolveActive({ resolvedColorScheme: next }, { notifyPending: true });
+	}
+	function isSelectedValue(key$1, value) {
+		return intendedState()[key$1] === value;
+	}
+	let mediaQuery;
+	const handleMediaChange = () => {
+		maybeUpdateSystemColorScheme();
+	};
+	function attachMediaListener() {
+		try {
+			if (typeof globalThis !== "undefined" && globalThis.matchMedia != null) {
+				mediaQuery = globalThis.matchMedia("(prefers-color-scheme: dark)");
+				mediaQuery.addEventListener("change", handleMediaChange);
+			}
+		} catch {}
+	}
+	hydrateFromStorage();
+	attachMediaListener();
+	resolveActive();
+	return {
+		resolver,
+		destroy() {
+			if (mediaQuery != null) {
+				mediaQuery.removeEventListener("change", handleMediaChange);
+				mediaQuery = void 0;
+			}
+			listeners.clear();
+		},
+		getState() {
+			return state;
+		},
+		setColorMode(mode) {
+			if (isSelectedValue("mode", mode)) return;
+			setMode(mode);
+		},
+		setThemeNameForScheme(scheme, name) {
+			const key$1 = scheme === "light" ? "lightThemeName" : "darkThemeName";
+			if (isSelectedValue(key$1, name)) return;
+			setInactiveThemeName(scheme, key$1, name);
+		},
+		subscribe(listener) {
+			listeners.add(listener);
+			return () => {
+				listeners.delete(listener);
+			};
+		}
+	};
+}
+
+//#endregion
+//#region src/highlighter/themes/themeResolver.ts
+const themeResolver = createThemeResolver();
+
 //#endregion
 //#region src/highlighter/themes/attachResolvedThemes.ts
 function attachResolvedThemes(themes, highlighter$1) {
@@ -12246,15 +12744,15 @@ function attachResolvedThemes(themes, highlighter$1) {
 	for (let themeRef of themes) {
 		let resolvedTheme;
 		if (typeof themeRef === "string") {
-			resolvedTheme = ResolvedThemes.get(themeRef);
+			resolvedTheme = themeResolver.getResolvedTheme(themeRef);
 			if (resolvedTheme == null) {
 				throw new Error(`loadResolvedThemes: ${themeRef} is not resolved, you must resolve it before calling loadResolvedThemes`);
 			}
 		} else {
 			resolvedTheme = themeRef;
 			themeRef = themeRef.name;
-			if (!ResolvedThemes.has(themeRef)) {
-				ResolvedThemes.set(themeRef, resolvedTheme);
+			if (themeResolver.getResolvedTheme(themeRef) == null) {
+				themeResolver.seedResolvedTheme(themeRef, resolvedTheme);
 			}
 		}
 		if (AttachedThemes.has(themeRef)) continue;
@@ -14071,7 +14569,10 @@ function cleanLastNewline(contents) {
 }
 
 //#endregion
-//#region ../../node_modules/.bun/@shikijs+transformers@4.0.2/node_modules/@shikijs/transformers/dist/index.mjs
+//#region ../../node_modules/.bun/@shikijs+transformers@4.2.0/node_modules/@shikijs/transformers/dist/index.mjs
+const RE_SPLIT_COMMENT = /(\s+\/\/)/;
+const RE_V1_END_COMMENT_PREFIX = /(?:\/\/|["'#]|;{1,2}|%{1,2}|--)(\s*)$/;
+const RE_V3_END_COMMENT_PREFIX = /(?:\/\/|#|;{1,2}|%{1,2}|--)(\s*)$/;
 /**
 * some comment formats have to be located at the end of line
 * hence we can skip matching them for other tokens
@@ -14097,7 +14598,7 @@ function parseComments(lines, jsx, matchAlgorithm) {
 				if (token$1.type !== "text") return element$1;
 				const isLast = idx === line.children.length - 1;
 				if (!matchToken(token$1.value, isLast)) return element$1;
-				const rawSplits = token$1.value.split(/(\s+\/\/)/);
+				const rawSplits = token$1.value.split(RE_SPLIT_COMMENT);
 				if (rawSplits.length <= 1) return element$1;
 				let splits = [rawSplits[0]];
 				for (let i$2 = 1; i$2 < rawSplits.length; i$2 += 2) splits.push(rawSplits[i$2] + (rawSplits[i$2 + 1] || ""));
@@ -14203,12 +14704,22 @@ function matchToken(text$1, isLast) {
 * For matchAlgorithm v1
 */
 function v1ClearEndCommentPrefix(text$1) {
-	const match = text$1.match(/(?:\/\/|["'#]|;{1,2}|%{1,2}|--)(\s*)$/);
+	const match = text$1.match(RE_V1_END_COMMENT_PREFIX);
 	if (match && match[1].trim().length === 0) return text$1.slice(0, match.index);
 	return text$1;
 }
+/**
+* Remove empty comment prefixes at line end, e.g. `// `
+*
+* For matchAlgorithm v3
+*/
+function v3ClearEndCommentPrefix(text$1) {
+	const match = text$1.match(RE_V3_END_COMMENT_PREFIX);
+	if (match && match[1].trim().length === 0) return text$1.slice(0, match.index).trimEnd();
+	return text$1;
+}
 function createCommentNotationTransformer(name, regex, onMatch, matchAlgorithm) {
-	if (matchAlgorithm == null) matchAlgorithm = "v3";
+	matchAlgorithm ??= "v3";
 	return {
 		name,
 		code(code) {
@@ -14232,6 +14743,7 @@ function createCommentNotationTransformer(name, regex, onMatch, matchAlgorithm)
 				});
 				if (!replaced) continue;
 				if (matchAlgorithm === "v1") comment$1.info[1] = v1ClearEndCommentPrefix(comment$1.info[1]);
+				else if (matchAlgorithm === "v3") comment$1.info[1] = v3ClearEndCommentPrefix(comment$1.info[1]);
 				const isEmpty = comment$1.info[1].trim().length === 0;
 				if (isEmpty) comment$1.info[1] = "";
 				if (isEmpty && comment$1.isLineCommentOnly) linesToRemove.push(comment$1.line);
@@ -14277,9 +14789,10 @@ function transformerCompactLineOptions(lineOptions = []) {
 		}
 	};
 }
+const RE_HIGHLIGHT_LINES = /\{([\d,-]+)\}/;
 function parseMetaHighlightString(meta) {
 	if (!meta) return null;
-	const match = meta.match(/\{([\d,-]+)\}/);
+	const match = meta.match(RE_HIGHLIGHT_LINES);
 	if (!match) return null;
 	return match[1].split(",").flatMap((v$1) => {
 		const range$1 = v$1.split("-").map((n) => Number.parseInt(n, 10));
@@ -14305,9 +14818,11 @@ function transformerMetaHighlight(options = {}) {
 		}
 	};
 }
+const RE_WORD_MATCH = /\/((?:\\.|[^/])+)\//g;
+const RE_ESCAPE_BACKSLASH = /\\(.)/g;
 function parseMetaHighlightWords(meta) {
 	if (!meta) return [];
-	return Array.from(meta.matchAll(/\/((?:\\.|[^/])+)\//g)).map((v$1) => v$1[1].replace(/\\(.)/g, "$1"));
+	return [...meta.matchAll(RE_WORD_MATCH)].map((v$1) => v$1[1].replace(RE_ESCAPE_BACKSLASH, "$1"));
 }
 /**
 * Allow using `/word/` in the code snippet meta to mark highlighted words.
@@ -14343,8 +14858,9 @@ function findAllSubstringIndexes(str, substr) {
 	}
 	return indexes;
 }
+const RE_ESCAPE_SPECIAL = /[.*+?^${}()|[\]\\]/g;
 function escapeRegExp(str) {
-	return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return str.replace(RE_ESCAPE_SPECIAL, "\\$&");
 }
 function transformerNotationMap(options = {}, name = "@shikijs/transformers:notation-map") {
 	const { classMap = {}, classActivePre = void 0, classActiveCode = void 0 } = options;
@@ -14476,11 +14992,13 @@ function inheritElement(original, overrides) {
 		...overrides
 	};
 }
+const RE_CODE_WORD = /\s*\[!code word:((?:\\.|[^:\]])+)(:\d+)?\]/;
+const RE_UNESCAPE = /\\(.)/g;
 function transformerNotationWordHighlight(options = {}) {
 	const { classActiveWord = "highlighted-word", classActivePre = void 0 } = options;
-	return createCommentNotationTransformer("@shikijs/transformers:notation-highlight-word", /\s*\[!code word:((?:\\.|[^:\]])+)(:\d+)?\]/, function([_$2, word, range$1], _line, comment$1, lines, index) {
+	return createCommentNotationTransformer("@shikijs/transformers:notation-highlight-word", RE_CODE_WORD, function([_$2, word, range$1], _line, comment$1, lines, index) {
 		const lineNum = range$1 ? Number.parseInt(range$1.slice(1), 10) : lines.length;
-		word = word.replace(/\\(.)/g, "$1");
+		word = word.replace(RE_UNESCAPE, "$1");
 		for (let i$2 = index; i$2 < Math.min(index + lineNum, lines.length); i$2++) highlightWordInLine.call(this, lines[i$2], comment$1, word, classActiveWord);
 		if (classActivePre) this.addClassToHast(this.pre, classActivePre);
 		return true;
@@ -14542,6 +15060,8 @@ function transformerRemoveNotationEscape() {
 		}
 	};
 }
+const RE_INDENT_META = /\{indent:(\d+|false)\}/;
+const RE_NON_BLANK = /[^ \t]/;
 /**
 * Render indentations as separate tokens.
 * Apply with CSS, it can be used to render indent guides visually.
@@ -14550,7 +15070,7 @@ function transformerRenderIndentGuides(options = {}) {
 	return {
 		name: "@shikijs/transformers:render-indent-guides",
 		code(hast) {
-			const indent = Number(this.options.meta?.indent ?? this.options.meta?.__raw?.match(/\{indent:(\d+|false)\}/)?.[1] ?? options.indent ?? 2);
+			const indent = Number(this.options.meta?.indent ?? this.options.meta?.__raw?.match(RE_INDENT_META)?.[1] ?? options.indent ?? 2);
 			if (Number.isNaN(indent) || indent <= 0) return hast;
 			const indentRegex = new RegExp(` {${indent}}| {0,${indent - 1}}\t| {1,}$`, "g");
 			const emptyLines = [];
@@ -14563,7 +15083,7 @@ function transformerRenderIndentGuides(options = {}) {
 					continue;
 				}
 				const text$1 = first.children[0];
-				const blanks = text$1.value.split(/[^ \t]/, 1)[0];
+				const blanks = text$1.value.split(RE_NON_BLANK, 1)[0];
 				const ranges = [];
 				for (const match of blanks.matchAll(indentRegex)) {
 					const start = match.index;
@@ -14638,6 +15158,7 @@ function splitSpaces(parts, type, renderContinuousSpaces = true) {
 		...parts.slice(parts.length - rightCount)
 	];
 }
+const RE_SPACE_OR_TAB = /([ \t])/;
 /**
 * Render whitespaces as separate tokens.
 * Apply with CSS, it can be used to render tabs and spaces visually.
@@ -14665,7 +15186,7 @@ function transformerRenderWhitespace(options = {}) {
 					if (position === "leading" && index !== 0) return token$1;
 					const node = token$1.children[0];
 					if (node.type !== "text" || !node.value) return token$1;
-					const parts = splitSpaces(node.value.split(/([ \t])/).filter((i$2) => i$2.length), position === "boundary" && index === last && last !== 0 ? "trailing" : position, position !== "trailing" && position !== "leading");
+					const parts = splitSpaces(node.value.split(RE_SPACE_OR_TAB).filter((i$2) => i$2.length), position === "boundary" && index === last && last !== 0 ? "trailing" : position, position !== "trailing" && position !== "leading");
 					if (parts.length <= 1) return token$1;
 					return parts.map((part) => {
 						const clone$1 = {
@@ -15069,30 +15590,234 @@ function formatCSSVariablePrefix(type) {
 	return `--${type === "token" ? "diffs-token" : "diffs"}-`;
 }
 
+//#endregion
+//#region ../theming/dist/modules/color.js
+/**
+* Canonical color/contrast primitives
+*/
+const MIN_READABLE_RATIO = 3;
+const MIN_MUTED_RATIO = 4.5;
+const HEX_TRANSPARENT_RE = /^#(?:[0-9a-f]{3}0|[0-9a-f]{6}00)$/i;
+const ALPHA_ZERO_RE = /^0(?:\.0+)?%?$/;
+function getFunctionalAlpha(color) {
+	const openParen = color.indexOf("(");
+	if (openParen <= 0 || !color.endsWith(")")) return;
+	const fn = color.slice(0, openParen).trim();
+	if (!/^(?:rgb|rgba|hsl|hsla|hwb|lab|lch|oklab|oklch|color)$/i.test(fn)) return;
+	const inner = color.slice(openParen + 1, -1).trim();
+	if (inner.length === 0) return;
+	const slashIndex = inner.lastIndexOf("/");
+	if (slashIndex !== -1) return inner.slice(slashIndex + 1).trim();
+	if (/^(?:rgba|hsla)$/i.test(fn)) {
+		const parts = inner.split(",");
+		if (parts.length === 4) return parts[3]?.trim();
+	}
+}
+function parseHexRgba(color) {
+	const match = /^#([0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})\b/i.exec(color.trim());
+	if (match == null) return null;
+	const hex = match[1];
+	let expanded;
+	let alpha = 1;
+	if (hex.length === 3) expanded = hex.split("").map((c) => c + c).join("");
+	else if (hex.length === 6) expanded = hex;
+	else {
+		expanded = hex.slice(0, 6);
+		alpha = parseInt(hex.slice(6, 8), 16) / 255;
+	}
+	return [
+		parseInt(expanded.slice(0, 2), 16),
+		parseInt(expanded.slice(2, 4), 16),
+		parseInt(expanded.slice(4, 6), 16),
+		alpha
+	];
+}
+function relativeLuminance(color) {
+	if (color == null) return null;
+	const rgba = parseHexRgba(color);
+	if (rgba == null) return null;
+	const r$3 = rgba[0] / 255;
+	const g = rgba[1] / 255;
+	const b$2 = rgba[2] / 255;
+	const channel = (v$1) => v$1 <= .03928 ? v$1 / 12.92 : ((v$1 + .055) / 1.055) ** 2.4;
+	return .2126 * channel(r$3) + .7152 * channel(g) + .0722 * channel(b$2);
+}
+function contrastRatio(a$1, b$2) {
+	const [hi, lo] = a$1 > b$2 ? [a$1, b$2] : [b$2, a$1];
+	return (hi + .05) / (lo + .05);
+}
+function compositeOverBg(fgColor, bgColor) {
+	if (bgColor == null) return void 0;
+	const fgParts = parseHexRgba(fgColor);
+	const bgParts = parseHexRgba(bgColor);
+	if (fgParts == null || bgParts == null) return void 0;
+	const [fr, fg, fb, fa] = fgParts;
+	const [br, bg, bb] = bgParts;
+	return "#" + [
+		Math.round(fr * fa + br * (1 - fa)),
+		Math.round(fg * fa + bg * (1 - fa)),
+		Math.round(fb * fa + bb * (1 - fa))
+	].map((v$1) => v$1.toString(16).padStart(2, "0")).join("");
+}
+function isFullyTransparent(color) {
+	if (color == null) return false;
+	const normalized = color.trim().toLowerCase();
+	if (normalized === "transparent") return true;
+	if (HEX_TRANSPARENT_RE.test(normalized)) return true;
+	const alpha = getFunctionalAlpha(normalized);
+	return alpha != null && ALPHA_ZERO_RE.test(alpha);
+}
+function isDarkSurface(bg, fgHint) {
+	const fromBg = relativeLuminance(bg);
+	if (fromBg != null) return fromBg < .4;
+	const fromFg = relativeLuminance(fgHint);
+	return fromFg != null ? fromFg > .6 : false;
+}
+function surfacesMatch(a$1, b$2) {
+	if (a$1 == null || b$2 == null) return false;
+	if (a$1.trim().toLowerCase() === b$2.trim().toLowerCase()) return true;
+	const la = relativeLuminance(a$1);
+	const lb = relativeLuminance(b$2);
+	if (la == null || lb == null) return false;
+	return Math.abs(la - lb) < .06;
+}
+function hoverWouldEraseText(hover, bg, fg) {
+	if (bg == null || fg == null) return false;
+	const hoverL = relativeLuminance(hover);
+	const bgL = relativeLuminance(bg);
+	const fgL = relativeLuminance(fg);
+	if (hoverL == null || bgL == null || fgL == null) return false;
+	return Math.abs(hoverL - fgL) < Math.abs(hoverL - bgL);
+}
+function pickReadableForeground(bg, candidates) {
+	const bgL = relativeLuminance(bg);
+	const firstDefined = candidates.find((candidate) => candidate != null && candidate !== "");
+	if (bgL == null) return firstDefined;
+	let best;
+	let bestRatio = -1;
+	for (const candidate of candidates) {
+		if (candidate == null || candidate === "") continue;
+		const candidateL = relativeLuminance(candidate);
+		if (candidateL == null) continue;
+		const ratio = contrastRatio(bgL, candidateL);
+		if (ratio >= MIN_READABLE_RATIO) return candidate;
+		if (ratio > bestRatio) {
+			best = candidate;
+			bestRatio = ratio;
+		}
+	}
+	return best ?? firstDefined;
+}
+function deriveMutedFg(primaryFg, bg) {
+	if (bg == null) return primaryFg;
+	const fgParts = parseHexRgba(primaryFg);
+	const bgParts = parseHexRgba(bg);
+	const bgL = relativeLuminance(bg);
+	if (fgParts == null || bgParts == null || bgL == null) return `color-mix(in srgb, ${primaryFg} 70%, ${bg})`;
+	const [fr, fg2, fb] = fgParts;
+	const [br, bg3, bb] = bgParts;
+	for (const weight of [
+		.6,
+		.7,
+		.8,
+		.9
+	]) {
+		const hex = "#" + [
+			Math.round(fr * weight + br * (1 - weight)),
+			Math.round(fg2 * weight + bg3 * (1 - weight)),
+			Math.round(fb * weight + bb * (1 - weight))
+		].map((v$1) => v$1.toString(16).padStart(2, "0")).join("");
+		const L$2 = relativeLuminance(hex);
+		if (L$2 != null && contrastRatio(bgL, L$2) >= MIN_MUTED_RATIO) return hex;
+	}
+	return primaryFg;
+}
+
+//#endregion
+//#region ../theming/dist/modules/normalizeThemeColors.js
+const cache = /* @__PURE__ */ new WeakMap();
+function normalizeThemeColors(theme) {
+	const cached = cache.get(theme);
+	if (cached != null) return cached;
+	const originalColors = theme.colors ?? {};
+	const colors = { ...originalColors };
+	const editorBackground = originalColors["editor.background"] ?? theme.bg;
+	const editorForeground = originalColors["editor.foreground"] ?? theme.fg;
+	const sidebarBackground = originalColors["sideBar.background"] ?? editorBackground;
+	const sidebarForeground = originalColors["sideBar.foreground"] ?? editorForeground;
+	fill(colors, "editor.background", editorBackground);
+	fill(colors, "editor.foreground", editorForeground);
+	fill(colors, "sideBar.background", sidebarBackground);
+	fill(colors, "sideBar.foreground", sidebarForeground);
+	fill(colors, "input.background", originalColors["input.background"] ?? sidebarBackground);
+	fill(colors, "sideBarSectionHeader.foreground", originalColors["sideBarSectionHeader.foreground"] ?? sidebarForeground);
+	fill(colors, "list.activeSelectionForeground", originalColors["list.activeSelectionForeground"] ?? sidebarForeground);
+	fill(colors, "gitDecoration.addedResourceForeground", firstColor(originalColors["gitDecoration.addedResourceForeground"], originalColors["terminal.ansiGreen"], originalColors["editorGutter.addedBackground"]));
+	fill(colors, "gitDecoration.modifiedResourceForeground", firstColor(originalColors["gitDecoration.modifiedResourceForeground"], originalColors["terminal.ansiBlue"], originalColors["editorGutter.modifiedBackground"]));
+	fill(colors, "gitDecoration.deletedResourceForeground", firstColor(originalColors["gitDecoration.deletedResourceForeground"], originalColors["terminal.ansiRed"], originalColors["editorGutter.deletedBackground"]));
+	const focusRing = (isFullyTransparent(originalColors["list.focusOutline"]) ? void 0 : originalColors["list.focusOutline"]) ?? (isFullyTransparent(originalColors["focusBorder"]) ? void 0 : originalColors["focusBorder"]);
+	if (focusRing != null) colors["list.focusOutline"] = focusRing;
+	else delete colors["list.focusOutline"];
+	const hover = originalColors["list.hoverBackground"];
+	if (hover != null && (matchesSurface(hover, sidebarBackground) || hoverWouldEraseText(hover, sidebarBackground, sidebarForeground))) delete colors["list.hoverBackground"];
+	const result = Object.freeze({
+		...theme,
+		colors: Object.freeze(colors)
+	});
+	cache.set(theme, result);
+	return result;
+}
+function fill(colors, key$1, value) {
+	if (value != null && value !== "") colors[key$1] = value;
+}
+function firstColor(...candidates) {
+	for (const candidate of candidates) if (candidate != null && candidate !== "") return candidate;
+}
+function matchesSurface(color, surface) {
+	return surface != null && color.toLowerCase() === surface.toLowerCase();
+}
+
+//#endregion
+//#region ../theming/dist/color.js
+const colorUtils = {
+	compositeOverBg,
+	contrastRatio,
+	deriveMutedFg,
+	hoverWouldEraseText,
+	isDarkSurface,
+	isFullyTransparent,
+	pickReadableForeground,
+	relativeLuminance,
+	surfacesMatch
+};
+
 //#endregion
 //#region src/utils/getHighlighterThemeStyles.ts
 function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter: highlighter$1, prefix }) {
 	let styles = "";
 	if (typeof theme === "string") {
 		const themeData = highlighter$1.getTheme(theme);
-		styles += `color:${themeData.fg};`;
-		styles += `background-color:${themeData.bg};`;
-		styles += `${formatCSSVariablePrefix("global")}fg:${themeData.fg};`;
-		styles += `${formatCSSVariablePrefix("global")}bg:${themeData.bg};`;
-		styles += getThemeVariables(themeData, prefix);
+		const normalized = normalizeThemeColors(themeData);
+		styles += `color:${normalized.fg};`;
+		styles += `background-color:${normalized.bg};`;
+		styles += `${formatCSSVariablePrefix("global")}fg:${normalized.fg};`;
+		styles += `${formatCSSVariablePrefix("global")}bg:${normalized.bg};`;
+		styles += getGitVariables(themeData, prefix);
 	} else {
 		let themeData = highlighter$1.getTheme(theme.dark);
-		styles += `${formatCSSVariablePrefix("global")}dark:${themeData.fg};`;
-		styles += `${formatCSSVariablePrefix("global")}dark-bg:${themeData.bg};`;
-		styles += getThemeVariables(themeData, "dark");
+		let normalized = normalizeThemeColors(themeData);
+		styles += `${formatCSSVariablePrefix("global")}dark:${normalized.fg};`;
+		styles += `${formatCSSVariablePrefix("global")}dark-bg:${normalized.bg};`;
+		styles += getGitVariables(themeData, "dark");
 		themeData = highlighter$1.getTheme(theme.light);
-		styles += `${formatCSSVariablePrefix("global")}light:${themeData.fg};`;
-		styles += `${formatCSSVariablePrefix("global")}light-bg:${themeData.bg};`;
-		styles += getThemeVariables(themeData, "light");
+		normalized = normalizeThemeColors(themeData);
+		styles += `${formatCSSVariablePrefix("global")}light:${normalized.fg};`;
+		styles += `${formatCSSVariablePrefix("global")}light-bg:${normalized.bg};`;
+		styles += getGitVariables(themeData, "light");
 	}
 	return styles;
 }
-function getThemeVariables(themeData, modePrefix) {
+function getGitVariables(themeData, modePrefix) {
 	modePrefix = modePrefix != null ? `${modePrefix}-` : "";
 	let styles = "";
 	const additionGreen = themeData.colors?.["gitDecoration.addedResourceForeground"] ?? themeData.colors?.["terminal.ansiGreen"];
@@ -15200,6 +15925,18 @@ function hasTrailingContext(fileDiff) {
 	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
 	return additionRemaining > 0 || deletionRemaining > 0;
 }
+function hasTrailingContextMismatch(fileDiff) {
+	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
+	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) {
+		return false;
+	}
+	const additionRemaining = fileDiff.additionLines.length - (lastHunk.additionLineIndex + lastHunk.additionCount);
+	const deletionRemaining = fileDiff.deletionLines.length - (lastHunk.deletionLineIndex + lastHunk.deletionCount);
+	if (additionRemaining <= 0 && deletionRemaining <= 0) {
+		return false;
+	}
+	return additionRemaining !== deletionRemaining;
+}
 function getTrailingContextRangeSize({ fileDiff, errorPrefix }) {
 	const lastHunk = fileDiff.hunks[fileDiff.hunks.length - 1];
 	if (lastHunk == null || fileDiff.isPartial || fileDiff.additionLines.length === 0 || fileDiff.deletionLines.length === 0) {
@@ -16180,7 +16917,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 			transformers,
 			decorations: undefined,
 			defaultColor: false,
-			cssVariablePrefix: formatCSSVariablePrefix("token")
+			cssVariablePrefix: formatCSSVariablePrefix("token"),
+			tokenizeTimeLimit: 0
 		} : {
 			...options,
 			lang: "text",
@@ -16188,7 +16926,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
 			transformers,
 			decorations: undefined,
 			defaultColor: false,
-			cssVariablePrefix: formatCSSVariablePrefix("token")
+			cssVariablePrefix: formatCSSVariablePrefix("token"),
+			tokenizeTimeLimit: 0
 		};
 	})();
 	const deletionLines = (() => {
@@ -16281,7 +17020,8 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 				transformers,
 				defaultColor: false,
 				cssVariablePrefix: formatCSSVariablePrefix("token"),
-				tokenizeMaxLineLength
+				tokenizeMaxLineLength,
+				tokenizeTimeLimit: 0
 			};
 		}
 		return {
@@ -16290,7 +17030,8 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
 			transformers,
 			defaultColor: false,
 			cssVariablePrefix: formatCSSVariablePrefix("token"),
-			tokenizeMaxLineLength
+			tokenizeMaxLineLength,
+			tokenizeTimeLimit: 0
 		};
 	})();
 	const highlightedLines = getLineNodes(highlighter$1.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents, hastConfig));
@@ -16426,7 +17167,7 @@ function getHighlighter(preferredHighlighter = "shiki-js") {
 	highlighter ??= createHighlighterCore({
 		themes: [],
 		langs: [],
-		engine: preferredHighlighter === "shiki-wasm" ? createOnigurumaEngine(import("./wasm-BaDzIkIn.js")) : createJavaScriptRegexEngine()
+		engine: preferredHighlighter === "shiki-wasm" ? createOnigurumaEngine(import("./wasm-qE0LgnY3.js")) : createJavaScriptRegexEngine()
 	});
 	return highlighter;
 }