mini-shiki 4.0.1 → 4.1.0

package/dist/shiki.js

@@ -79,9 +79,10 @@ function isSpecialTheme(theme) {
 * // => [['hello\n', 0], ['world', 6]]
 * ```
 */
+const RE_NEWLINE = /(\r?\n)/g;
 function splitLines(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 = 0; i < parts.length; i += 2) {
@@ -195,7 +196,7 @@ function normalizeTheme(rawTheme) {
 * Resolve
 */
 async function resolveLangs(langs) {
-	return Array.from(new Set((await Promise.all(langs.filter((l) => !isSpecialLang(l)).map(async (lang) => await normalizeGetter(lang).then((r) => Array.isArray(r) ? r : [r])))).flat()));
+	return [...new Set((await Promise.all(langs.filter((l) => !isSpecialLang(l)).map(async (lang) => await normalizeGetter(lang).then((r) => Array.isArray(r) ? r : [r])))).flat())];
 }
 async function resolveThemes(themes) {
 	return (await Promise.all(themes.map(async (theme) => isSpecialTheme(theme) ? null : normalizeTheme(await normalizeGetter(theme))))).filter((i) => !!i);
@@ -206,13 +207,17 @@ function resolveLangAlias(name, alias) {
 		const resolved = new Set([name]);
 		while (alias[name]) {
 			name = alias[name];
-			if (resolved.has(name)) throw new ShikiError(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
+			if (resolved.has(name)) throw new ShikiError(`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();
@@ -291,7 +296,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(([_, lang]) => !lang);
 		if (missingLangs.length) {
 			const dependents = langsGraphArray.filter(([_, lang]) => {
@@ -553,6 +558,8 @@ function getGrammarStack(state, theme) {
 	if (!(state instanceof GrammarState)) throw new ShikiError("Invalid grammar state");
 	return state.getInternalStack(theme);
 }
+const RE_COMMA = /,/;
+const RE_SPACE = / /;
 /**
 * Code to tokens, with a simple theme.
 */
@@ -633,7 +640,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;
@@ -642,7 +649,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.explanation = [];
@@ -687,7 +694,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) {
@@ -708,13 +715,13 @@ function explainThemeScope(themeSettingsSelectors, scope, parentScopes) {
 /**
 * Get tokens with multiple themes
 */
-function codeToTokensWithThemes(primitive, code, options) {
+function codeToTokensWithThemes(primitive, code, options, codeToTokensBaseFn = codeToTokensBase) {
 	const themes = Object.entries(options.themes).filter((i) => i[1]).map((i) => ({
 		color: i[0],
 		theme: i[1]
 	}));
 	const themedTokens = themes.map((t) => {
-		const tokens$1 = codeToTokensBase(primitive, code, {
+		const tokens$1 = codeToTokensBaseFn(primitive, code, {
 			...options,
 			theme: t.theme
 		});
@@ -790,7 +797,7 @@ function alignThemesTokenization(...themes) {
 }
 
 //#endregion
-//#region node_modules/shiki/dist/langs-bundle-full-CQWtMIqW.mjs
+//#region node_modules/shiki/dist/langs-bundle-full-YTHnHqaM.mjs
 const bundledLanguagesInfo = [
 	{
 		"id": "abap",
@@ -1514,7 +1521,7 @@ const bundledLanguagesInfo = [
 	},
 	{
 		"id": "nextflow-groovy",
-		"name": "nextflow-groovy",
+		"name": "Nextflow Groovy",
 		"import": () => import("@shikijs/langs/nextflow-groovy")
 	},
 	{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini-shiki",
-  "version": "4.0.1",
+  "version": "4.1.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": "^4.0.1",
-    "@shikijs/langs": "^4.0.1",
-    "@shikijs/themes": "^4.0.1",
-    "@shikijs/types": "^4.0.1",
+    "@shikijs/engine-oniguruma": "^4.1.0",
+    "@shikijs/langs": "^4.1.0",
+    "@shikijs/themes": "^4.1.0",
+    "@shikijs/types": "^4.1.0",
     "@shikijs/vscode-textmate": "^10.0.2"
   }
 }