mini-shiki 3.17.0 → 3.18.0

package/dist/shiki.js

@@ -41,6 +41,7 @@ function isSpecialTheme(theme) {
 	return isNoneTheme(theme);
 }
 function splitLines(code, preserveEnding = false) {
+	if (code.length === 0) return [["", 0]];
 	const parts = code.split(/(\r?\n)/g);
 	let index = 0;
 	const lines = [];
@@ -417,25 +418,41 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
 	}));
 }
 function dimColor(color) {
-	const hexMatch = color.match(/#([0-9a-f]{3})([0-9a-f]{3})?([0-9a-f]{2})?/i);
-	if (hexMatch) if (hexMatch[3]) {
-		const alpha = Math.round(Number.parseInt(hexMatch[3], 16) / 2).toString(16).padStart(2, "0");
-		return `#${hexMatch[1]}${hexMatch[2]}${alpha}`;
-	} else if (hexMatch[2]) return `#${hexMatch[1]}${hexMatch[2]}80`;
-	else return `#${Array.from(hexMatch[1]).map((x) => `${x}${x}`).join("")}80`;
+	const hexMatch = color.match(/#([0-9a-f]{3,8})/i);
+	if (hexMatch) {
+		const hex = hexMatch[1];
+		if (hex.length === 8) {
+			const alpha = Math.round(Number.parseInt(hex.slice(6, 8), 16) / 2).toString(16).padStart(2, "0");
+			return `#${hex.slice(0, 6)}${alpha}`;
+		} else if (hex.length === 6) return `#${hex}80`;
+		else if (hex.length === 4) {
+			const r = hex[0];
+			const g = hex[1];
+			const b = hex[2];
+			const a = hex[3];
+			const alpha = Math.round(Number.parseInt(`${a}${a}`, 16) / 2).toString(16).padStart(2, "0");
+			return `#${r}${r}${g}${g}${b}${b}${alpha}`;
+		} else if (hex.length === 3) {
+			const r = hex[0];
+			const g = hex[1];
+			const b = hex[2];
+			return `#${r}${r}${g}${g}${b}${b}80`;
+		}
+	}
 	const cssVarMatch = color.match(/var\((--[\w-]+-ansi-[\w-]+)\)/);
 	if (cssVarMatch) return `var(${cssVarMatch[1]}-dim)`;
 	return color;
 }
 function codeToTokensBase(internal, code, options = {}) {
-	const { lang = "text", theme: themeName = internal.getLoadedThemes()[0] } = options;
+	const { theme: themeName = internal.getLoadedThemes()[0] } = options;
+	const lang = internal.resolveLangAlias(options.lang || "text");
 	if (isPlainLang(lang) || isNoneTheme(themeName)) return splitLines(code).map((line) => [{
 		content: line[0],
 		offset: line[1]
 	}]);
 	const { theme, colorMap } = internal.setTheme(themeName);
 	if (lang === "ansi") return tokenizeAnsiWithTheme(theme, code, options);
-	const _grammar = internal.getLanguage(lang);
+	const _grammar = internal.getLanguage(options.lang || "text");
 	if (options.grammarState) {
 		if (options.grammarState.lang !== _grammar.name) throw new ShikiError(`Grammar state language "${options.grammarState.lang}" does not match highlight language "${_grammar.name}"`);
 		if (!options.grammarState.themes.includes(theme.name)) throw new ShikiError(`Grammar state themes "${options.grammarState.themes}" do not contain highlight theme "${theme.name}"`);
@@ -746,6 +763,18 @@ var ShikiError$1 = class extends Error {
 		this.name = "ShikiError";
 	}
 };
+function resolveLangAlias(name, alias) {
+	if (!alias) return name;
+	if (alias[name]) {
+		const resolved = /* @__PURE__ */ new Set([name]);
+		while (alias[name]) {
+			name = alias[name];
+			if (resolved.has(name)) throw new ShikiError$1(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
+			resolved.add(name);
+		}
+	}
+	return name;
+}
 var Registry$1 = class extends Registry {
 	constructor(_resolver, _themes, _langs, _alias = {}) {
 		super(_resolver);
@@ -788,14 +817,7 @@ var Registry$1 = class extends Registry {
 		this._syncRegistry.setTheme(textmateTheme);
 	}
 	getGrammar(name) {
-		if (this._alias[name]) {
-			const resolved = /* @__PURE__ */ new Set([name]);
-			while (this._alias[name]) {
-				name = this._alias[name];
-				if (resolved.has(name)) throw new ShikiError$1(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
-				resolved.add(name);
-			}
-		}
+		name = resolveLangAlias(name, this._alias);
 		return this._resolvedGrammars.get(name);
 	}
 	loadLanguage(lang) {
@@ -905,6 +927,9 @@ function createShikiInternalSync(options) {
 	const resolver = new Resolver(options.engine, langs);
 	const _registry = new Registry$1(resolver, themes, langs, options.langAlias);
 	let _lastTheme;
+	function resolveLangAlias$1(name) {
+		return resolveLangAlias(name, options.langAlias);
+	}
 	function getLanguage(name) {
 		ensureNotDisposed();
 		const _lang = _registry.getGrammar(typeof name === "string" ? name : name.name);
@@ -975,6 +1000,7 @@ function createShikiInternalSync(options) {
 		getLanguage,
 		getLoadedThemes,
 		getLoadedLanguages,
+		resolveLangAlias: resolveLangAlias$1,
 		loadLanguage,
 		loadLanguageSync,
 		loadTheme,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini-shiki",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "type": "module",
   "repository": "git+https://github.com/un-ts/mini-shiki.git",
   "homepage": "https://github.com/un-ts/mini-shiki#readme",
@@ -21,10 +21,10 @@
     "static"
   ],
   "dependencies": {
-    "@shikijs/engine-oniguruma": "^3.17.0",
-    "@shikijs/langs": "^3.17.0",
-    "@shikijs/themes": "^3.17.0",
-    "@shikijs/types": "^3.17.0",
+    "@shikijs/engine-oniguruma": "^3.18.0",
+    "@shikijs/langs": "^3.18.0",
+    "@shikijs/themes": "^3.18.0",
+    "@shikijs/types": "^3.18.0",
     "@shikijs/vscode-textmate": "^10.0.2"
   }
 }