modern-monaco 0.4.1 → 0.4.2

package/dist/core.mjs

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.4.1";
+var version = "0.4.2";
 
 // src/core.ts
 import { getExtnameFromLanguageId, getLanguageIdFromPath, grammars, initShiki, setDefaultWasmLoader, themes } from "./shiki.mjs";

package/dist/shiki.mjs

@@ -3240,9 +3240,10 @@ function isNoneTheme(theme) {
 function isSpecialTheme(theme) {
   return isNoneTheme(theme);
 }
+var 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) {
@@ -3333,7 +3334,7 @@ function normalizeTheme(rawTheme) {
   return theme;
 }
 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(themes2) {
   return (await Promise.all(themes2.map(async (theme) => isSpecialTheme(theme) ? null : normalizeTheme(await normalizeGetter(theme))))).filter((i) => !!i);
@@ -3344,13 +3345,17 @@ function resolveLangAlias(name, alias) {
     const resolved = /* @__PURE__ */ 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 Registry2 = class extends Registry {
+  _resolver;
+  _themes;
+  _langs;
+  _alias;
   _resolvedThemes = /* @__PURE__ */ new Map();
   _resolvedGrammars = /* @__PURE__ */ new Map();
   _langMap = /* @__PURE__ */ new Map();
@@ -3429,7 +3434,7 @@ var Registry2 = 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]) => {
@@ -3674,6 +3679,8 @@ function getGrammarStack(state, theme) {
   if (!(state instanceof GrammarState)) throw new ShikiError("Invalid grammar state");
   return state.getInternalStack(theme);
 }
+var RE_COMMA = /,/;
+var RE_SPACE = / /;
 function codeToTokensBase(primitive, code, options = {}) {
   const { theme: themeName = primitive.getLoadedThemes()[0] } = options;
   if (isPlainLang(primitive.resolveLangAlias(options.lang || "text")) || isNoneTheme(themeName)) return splitLines(code).map((line) => [{
@@ -3761,7 +3768,7 @@ function _tokenizeWithTheme(code, grammar, theme, colorMap2, 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;
@@ -3771,7 +3778,7 @@ function _tokenizeWithTheme(code, grammar, theme, colorMap2, options) {
           }
           themeSettingsSelectors.push({
             settings: setting,
-            selectors: selectors.map((selector) => selector.split(/ /))
+            selectors: selectors.map((selector) => selector.split(RE_SPACE))
           });
         }
         token.explanation = [];
@@ -3816,7 +3823,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) {
@@ -6102,13 +6109,14 @@ function all(parent) {
 }
 
 // node_modules/@shikijs/core/dist/index.mjs
+var RE_WHITESPACE = /\s+/g;
 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;
 }
@@ -6117,7 +6125,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;
@@ -6143,7 +6151,6 @@ function createPositionConverter(code) {
     posToIndex
   };
 }
-var DEFAULT_COLOR_LIGHT_DARK = "light-dark()";
 var COLOR_KEYS = ["color", "background-color"];
 function splitToken(token, offsets) {
   let lastOffset = 0;
@@ -6164,7 +6171,7 @@ function splitToken(token, offsets) {
   return tokens;
 }
 function splitTokens(tokens, breakpoints) {
-  const sorted = Array.from(breakpoints instanceof Set ? breakpoints : new Set(breakpoints)).sort((a, b) => a - b);
+  const sorted = [...breakpoints instanceof Set ? breakpoints : new Set(breakpoints)].sort((a, b) => a - b);
   if (!sorted.length) return tokens;
   return tokens.map((line) => {
     return line.flatMap((token) => {
@@ -6190,7 +6197,7 @@ function flatTokenVariants(merged, variantsOrder, cssVariablePrefix, defaultColo
   styles.forEach((cur, idx) => {
     for (const key2 of styleKeys) {
       const value = cur[key2] || "inherit";
-      if (idx === 0 && defaultColor && COLOR_KEYS.includes(key2)) if (defaultColor === DEFAULT_COLOR_LIGHT_DARK && styles.length > 1) {
+      if (idx === 0 && defaultColor && COLOR_KEYS.includes(key2)) 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('When using `defaultColor: "light-dark()"`, you must provide both `light` and `dark` themes');
@@ -6269,7 +6276,7 @@ function transformerDecorations() {
     code(codeEl) {
       if (!this.options.decorations?.length) return;
       const ctx = getContext(this);
-      const lines = Array.from(codeEl.children).filter((i) => i.type === "element" && i.tagName === "span");
+      const lines = [...codeEl.children].filter((i) => i.type === "element" && i.tagName === "span");
       if (lines.length !== ctx.converter.lines.length) throw new ShikiError(`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];
@@ -6622,6 +6629,8 @@ function createColorPalette(namedColorsMap = defaultNamedColorsMap) {
   }
   return { value };
 }
+var RE_HEX_COLOR = /#([0-9a-f]{3,8})/i;
+var RE_CSS_VAR_ANSI = /var\((--[\w-]+-ansi-[\w-]+)\)/;
 var defaultAnsiColors = {
   black: "#000000",
   red: "#cd3131",
@@ -6676,7 +6685,7 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
   }));
 }
 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) {
@@ -6696,7 +6705,7 @@ function dimColor(color) {
       return `#${r}${r}${g}${g}${b}${b}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;
 }
@@ -6725,7 +6734,7 @@ function codeToTokens(primitive, code, options) {
     if (themes2.length === 0) throw new ShikiError("`themes` option must not be empty");
     const themeTokens = codeToTokensWithThemes(primitive, code, options, codeToTokensBase2);
     grammarState = getLastGrammarStateFromMap(themeTokens);
-    if (defaultColor && DEFAULT_COLOR_LIGHT_DARK !== defaultColor && !themes2.find((t) => t.color === defaultColor)) throw new ShikiError(`\`themes\` option must contain the defaultColor key \`${defaultColor}\``);
+    if (defaultColor && "light-dark()" !== defaultColor && !themes2.some((t) => t.color === defaultColor)) throw new ShikiError(`\`themes\` option must contain the defaultColor key \`${defaultColor}\``);
     const themeRegs = themes2.map((t) => primitive.getTheme(t.theme));
     const themesOrder = themes2.map((t) => t.color);
     tokens = themeTokens.map((line) => line.map((token) => flatTokenVariants(token, themesOrder, cssVariablePrefix, defaultColor, colorsRendering)));
@@ -6758,7 +6767,7 @@ function mapThemeColors(themes2, themeRegs, themeColorReplacements, cssVariableP
     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 && themes2.length > 1) {
+      if (defaultColor === "light-dark()" && themes2.length > 1) {
         const lightIndex = themes2.findIndex((t2) => t2.color === "light");
         const darkIndex = themes2.findIndex((t2) => t2.color === "dark");
         if (lightIndex === -1 || darkIndex === -1) throw new ShikiError('When using `defaultColor: "light-dark()"`, you must provide both `light` and `dark` themes');
@@ -6770,6 +6779,8 @@ function mapThemeColors(themes2, themeRegs, themeColorReplacements, cssVariableP
     return null;
   }).filter((i) => !!i).join(";");
 }
+var RE_WHITESPACE_ONLY = /^\s+$/;
+var RE_LEADING_TRAILING_WHITESPACE = /^(\s*)(.*?)(\s*)$/;
 function codeToHast(primitive, code, options, transformerContext = {
   meta: {},
   options,
@@ -6948,7 +6959,7 @@ function mergeWhitespaceTokens(tokens) {
     let firstOffset;
     line.forEach((token, idx) => {
       const couldMerge = !(token.fontStyle && (token.fontStyle & FontStyle.Underline || token.fontStyle & FontStyle.Strikethrough));
-      if (couldMerge && token.content.match(/^\s+$/) && line[idx + 1]) {
+      if (couldMerge && RE_WHITESPACE_ONLY.test(token.content) && line[idx + 1]) {
         if (firstOffset === void 0) firstOffset = token.offset;
         carryOnContent += token.content;
       } else if (carryOnContent) {
@@ -6971,8 +6982,8 @@ function mergeWhitespaceTokens(tokens) {
 function splitWhitespaceTokens(tokens) {
   return tokens.map((line) => {
     return line.flatMap((token) => {
-      if (token.content.match(/^\s+$/)) return token;
-      const match = token.content.match(/^(\s*)(.*?)(\s*)$/);
+      if (RE_WHITESPACE_ONLY.test(token.content)) return token;
+      const match = token.content.match(RE_LEADING_TRAILING_WHITESPACE);
       if (!match) return token;
       const [, leading, content, trailing] = match;
       if (!leading && !trailing) return token;
@@ -7001,7 +7012,7 @@ function mergeAdjacentStyledTokens(tokens) {
         newLine.push({ ...token });
         continue;
       }
-      const prevToken = newLine[newLine.length - 1];
+      const prevToken = newLine.at(-1);
       const prevStyle = stringifyTokenStyle(prevToken.htmlStyle || getTokenStyleObject(prevToken));
       const currentStyle = stringifyTokenStyle(token.htmlStyle || getTokenStyleObject(token));
       const isPrevDecorated = prevToken.fontStyle && (prevToken.fontStyle & FontStyle.Underline || prevToken.fontStyle & FontStyle.Strikethrough);
@@ -7139,10 +7150,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();
@@ -7681,7 +7692,7 @@ function textmateThemeToMonacoTheme(theme) {
       if (s && settings?.foreground) {
         rules.push({
           token: s,
-          foreground: normalizeColor(theme.bg, settings.foreground),
+          foreground: normalizeColor(settings.foreground),
           fontStyle: settings?.fontStyle
         });
       }
@@ -7689,7 +7700,7 @@ function textmateThemeToMonacoTheme(theme) {
   }
   return {
     base: theme.type === "dark" ? "vs-dark" : "vs",
-    colors: Object.fromEntries(Object.entries(theme.colors ?? {}).map(([key2, value]) => [key2, normalizeColor(theme.bg, value)])),
+    colors: Object.fromEntries(Object.entries(theme.colors ?? {}).map(([key2, value]) => [key2, normalizeColor(value)])),
     inherit: false,
     rules
   };
@@ -7717,7 +7728,7 @@ function initShikiMonacoTokenizer(monaco, highlighter) {
     const ret = highlighter.setTheme(themeId);
     colorMap.length = ret.colorMap.length;
     ret.colorMap.forEach((color, i) => {
-      colorMap[i] = normalizeColor(ret.theme.bg, color);
+      colorMap[i] = normalizeColor(color);
     });
     colorToScopeMap.clear();
     theme.rules.forEach((rule) => {
@@ -7788,27 +7799,19 @@ function toRGBA(hex) {
     rgba[i] = parseInt(hex.slice(j, j + step).repeat(3 - step), 16);
   }
   if (Number.isNaN(rgba[3])) {
-    rgba[3] = 1;
-  } else {
-    rgba[3] /= 255;
+    rgba[3] = 255;
   }
   return rgba;
 }
 function toHexColor(rgb) {
   return "#" + rgb.map((c) => c.toString(16).padStart(2, "0")).join("");
 }
-function channelMixer(channelA, channelB, amount) {
-  const a = channelA * (1 - amount);
-  const b = channelB * amount;
-  return Math.round(a + b);
-}
-function normalizeColor(bg, fg) {
-  const fgRgba = toRGBA(Array.isArray(fg) ? fg[0] : fg);
-  if (fgRgba[3] === 1) {
-    return toHexColor(fgRgba.slice(0, 3));
+function normalizeColor(color) {
+  const rgba = toRGBA(Array.isArray(color) ? color[0] : color);
+  if (rgba[3] === 255) {
+    return toHexColor(rgba.slice(0, 3));
   }
-  const bgRgba = toRGBA(bg);
-  return toHexColor([0, 1, 2].map((i) => channelMixer(bgRgba[i], fgRgba[i], fgRgba[3])));
+  return toHexColor(rgba);
 }
 
 // src/shiki.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-monaco",
   "description": "A modern version of Monaco Editor",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
@@ -71,9 +71,9 @@
   "sideEffects": ["dist/index.mjs"],
   "devDependencies": {
     "@esm.sh/import-map": "0.4.0",
-    "@shikijs/core": "4.0.2",
-    "@shikijs/engine-oniguruma": "4.0.2",
-    "@types/bun": "1.3.13",
+    "@shikijs/core": "4.1.0",
+    "@shikijs/engine-oniguruma": "4.1.0",
+    "@types/bun": "1.3.14",
     "esbuild": "0.28.0",
     "monaco-editor-core": "0.55.1",
     "tm-grammars": "1.31.15",