@shikijs/colorized-brackets 4.0.2 → 4.1.0

package/dist/index.mjs

@@ -1,5 +1,4 @@
 import { ShikiError } from "shiki";
-
 //#region src/themes.ts
 var themes_default = {
 	"andromeeda": [
@@ -495,11 +494,12 @@ var themes_default = {
 		"rgba(255, 18, 18, 0.8)"
 	]
 };
-
 //#endregion
 //#region src/utils.ts
+const RE_SOURCE_SCOPE = /^source.\w+$/;
+const RE_ESCAPE_REGEXP = /[.*+?^${}()|[\]\\]/g;
 function getEmbeddedLang(token) {
-	return token.explanation?.[0].scopes.findLast((scope) => scope.scopeName.match(/^source.\w+$/))?.scopeName.split(".")[1];
+	return token.explanation?.[0].scopes.findLast((scope) => scope.scopeName.match(RE_SOURCE_SCOPE))?.scopeName.split(".")[1];
 }
 function resolveConfig(config, lang) {
 	return {
@@ -508,7 +508,7 @@ function resolveConfig(config, lang) {
 	};
 }
 function escapeRegExp(string) {
-	return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return string.replace(RE_ESCAPE_REGEXP, "\\$&");
 }
 function shouldIgnoreToken(token, scopesAllowList, scopesDenyList) {
 	if (!token.explanation) return true;
@@ -520,7 +520,6 @@ function shouldIgnoreToken(token, scopesAllowList, scopesDenyList) {
 	if (scopesDenyList && scopesDenyList.length && token.explanation?.some((explanation) => explanation.scopes.some((scope) => scopesDenyList.some((denied) => scope.scopeName === denied || scope.scopeName.startsWith(`${denied}.`))))) return true;
 	return false;
 }
-
 //#endregion
 //#region src/colorizeBracketTokens.ts
 function colorizeBracketTokens(tokens, config, shikiOptions, lang) {
@@ -534,7 +533,7 @@ function colorizeBracketTokens(tokens, config, shikiOptions, lang) {
 		if (!pairDefinition || shouldIgnoreToken(token, pairDefinition.scopesAllowList, pairDefinition.scopesDenyList)) continue;
 		if (openers.has(token.content.trim())) openerStack.push(token);
 		else if (closers.has(token.content.trim())) {
-			const opener = openerStack.slice().reverse().find((t) => t.content.trim() === closerToOpener[token.content.trim()]);
+			const opener = openerStack.toReversed().find((t) => t.content.trim() === closerToOpener[token.content.trim()]);
 			if (opener) {
 				while (openerStack.at(-1) !== opener) {
 					const unexpected = openerStack.pop();
@@ -578,7 +577,7 @@ const DEFAULT_BRACKETS_COLORS = [
 ];
 function getColor(themes, themeName, level) {
 	const colors = themeName == null ? DEFAULT_BRACKETS_COLORS : getThemeColors(themeName, themes) ?? getThemeColors(themeName, themes_default) ?? DEFAULT_BRACKETS_COLORS;
-	if (level === -1) return colors[colors.length - 1];
+	if (level === -1) return colors.at(-1);
 	else return colors[level % (colors.length - 1)];
 }
 function getThemeColors(themeName, themes) {
@@ -587,9 +586,10 @@ function getThemeColors(themeName, themes) {
 	if (startsWithName) return themes[startsWithName];
 	return null;
 }
-
 //#endregion
 //#region src/splitBracketTokens.ts
+const RE_LEADING_SPACES = /^\s*/;
+const RE_TRAILING_SPACES = /\s*$/;
 function splitBracketTokens(rawToken, config, lang) {
 	const resolvedConfig = resolveConfig(config, getEmbeddedLang(rawToken) ?? lang);
 	if (resolvedConfig.bracketPairs.length === 0 || shouldIgnoreToken(rawToken)) return [rawToken];
@@ -626,8 +626,8 @@ function splitBracketTokens(rawToken, config, lang) {
 		const start = currentExplanationStart;
 		let length = explanation.content.length;
 		if (explanations.length === 1) length = rawToken.content.length;
-		else if (i === 0) length = (rawToken.content.match(/^\s*/)?.[0].length ?? 0) + explanation.content.trimStart().length;
-		else if (i === explanations.length - 1) length = explanation.content.trimEnd().length + (rawToken.content.match(/\s*$/)?.[0].length ?? 0);
+		else if (i === 0) length = (rawToken.content.match(RE_LEADING_SPACES)?.[0].length ?? 0) + explanation.content.trimStart().length;
+		else if (i === explanations.length - 1) length = explanation.content.trimEnd().length + (rawToken.content.match(RE_TRAILING_SPACES)?.[0].length ?? 0);
 		currentExplanationStart += length;
 		return {
 			...explanation,
@@ -642,7 +642,6 @@ function splitBracketTokens(rawToken, config, lang) {
 	}
 	return tokens;
 }
-
 //#endregion
 //#region src/index.ts
 const jinjaLikeBracketPairs = [
@@ -737,6 +736,5 @@ const EXPLICIT_TRIGGER_REGEX = /(^|\s)colorize-brackets($|\s)/;
 function isEnabled(config, meta) {
 	return !config.explicitTrigger || meta?.match(EXPLICIT_TRIGGER_REGEX) != null;
 }
-
 //#endregion
-export { transformerColorizedBrackets };
+export { transformerColorizedBrackets };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/colorized-brackets",
   "type": "module",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "VSCode-style colorized brackets transformer for Shiki",
   "author": "Michael Moore <mscottmoore@pm.me>",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "shiki": "4.0.2"
+    "shiki": "4.1.0"
   },
   "scripts": {
     "build": "tsdown",