@shikijs/colorized-brackets 3.2.2 → 3.4.0

package/dist/index.d.mts

@@ -53,7 +53,7 @@ interface BracketPair {
  *
  * @param options
  * @param options.themes - custom themes; all Shiki built-in themes are supported without additional configuration
- * @param options.bracketPairs - bracket definitions; be default [], {}, (), and <> (TS-only)
+ * @param options.bracketPairs - bracket definitions; by default [], {}, (), and <> (TS-only)
  * @param options.langs - language-specific overrides for themes and bracketPairs
  * @returns Shiki transformer
  */

package/dist/index.mjs

@@ -584,7 +584,7 @@ function assignColorToToken(token, themes, shikiOptions, level) {
     token.color = getColor(themes, themeName, level);
   } else {
     const { defaultColor = "light", cssVariablePrefix = "--shiki-" } = shikiOptions;
-    const styles = typeof token.htmlStyle === "string" ? {} : token.htmlStyle || {};
+    const styles = typeof token.htmlStyle === "string" ? {} : structuredClone(token.htmlStyle ?? {});
     for (const [colorName, theme] of Object.entries(shikiOptions.themes)) {
       const themeName = typeof theme === "string" ? theme : theme?.name;
       const cssProperty = colorName === defaultColor ? "color" : `${cssVariablePrefix}${colorName}`;
@@ -603,7 +603,7 @@ const DEFAULT_BRACKETS_COLORS = [
   "rgba(255, 18, 18, 0.8)"
 ];
 function getColor(themes, themeName, level) {
-  const colors = themeName == null ? DEFAULT_BRACKETS_COLORS : themes[themeName] ?? builtInThemes[themeName] ?? DEFAULT_BRACKETS_COLORS;
+  const colors = themeName == null ? DEFAULT_BRACKETS_COLORS : getThemeColors(themeName, themes) ?? getThemeColors(themeName, builtInThemes) ?? DEFAULT_BRACKETS_COLORS;
   const isUnexpected = level === -1;
   if (isUnexpected) {
     return colors[colors.length - 1];
@@ -611,6 +611,14 @@ function getColor(themes, themeName, level) {
     return colors[level % (colors.length - 1)];
   }
 }
+function getThemeColors(themeName, themes) {
+  if (themes[themeName])
+    return themes[themeName];
+  const startsWithName = Object.keys(themes).sort().reverse().find((key) => themeName.startsWith(key));
+  if (startsWithName)
+    return themes[startsWithName];
+  return null;
+}
 
 function splitBracketTokens(rawToken, config, lang) {
   const embeddedLang = getEmbeddedLang(rawToken);

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@shikijs/colorized-brackets",
   "type": "module",
-  "version": "3.2.2",
-  "description": "Collective of common transformers transformers for Shiki",
+  "version": "3.4.0",
+  "description": "VSCode-style colorized brackets transformer for Shiki",
   "author": "Michael Moore <mscottmoore@pm.me>",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/shiki#readme",
@@ -27,7 +27,7 @@
     "dist"
   ],
   "dependencies": {
-    "shiki": "3.2.2"
+    "shiki": "3.4.0"
   },
   "scripts": {
     "build": "unbuild",