modern-monaco 0.1.4 → 0.1.6

package/dist/shiki.js

@@ -7751,8 +7751,8 @@ var MINIMUM_LINE_HEIGHT = 8;
 var MINIMUM_MAX_DIGIT_WIDTH = 5;
 function render(highlighter, input, options = {}) {
   const isBrowser = typeof globalThis.document?.querySelector === "function";
-  if (!options.userAgent && !isBrowser) {
-    throw new Error("`userAgent` option is required in non-browser environment");
+  if (!options.userAgent && !options.fontFamily && !isBrowser) {
+    throw new Error("`userAgent` or `fontFamily` option is required in non-browser environment");
   }
   const code = typeof input === "string" ? input : input.code;
   const filename = typeof input === "string" ? void 0 : input.filename;
@@ -8097,30 +8097,41 @@ async function initShiki({
   return highlighterCore;
 }
 function loadTMTheme(src, cdn = "https://esm.sh") {
+  if (typeof src === "string" && /^[a-zA-Z]/.test(src)) {
+    src = src.replace(/\s+/g, "-").replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
+  }
   if (typeof src === "string" && tmThemes.has(src)) {
     const theme = tmThemes.get(src);
     if (theme) {
       return theme;
     }
-    const url = new URL(`/tm-themes@${version2}/themes/${src}.json`, cdn);
-    return cache.fetch(url).then(
+    const url2 = new URL(`/tm-themes@${version2}/themes/${src}.json`, cdn);
+    return cache.fetch(url2).then(
       (res) => res.json().then((theme2) => {
         tmThemes.set(src, theme2);
         return theme2;
       })
     );
   }
-  return cache.fetch(src).then((res) => res.json());
+  const url = typeof src === "string" ? new URL(src) : src;
+  if (url.protocol === "http" || url.protocol === "https") {
+    return cache.fetch(url).then((res) => res.json());
+  }
+  throw new Error(`Unsupported theme source: ${src}`);
 }
 function loadTMGrammar(src, cdn = "https://esm.sh") {
   if (typeof src === "string") {
     const g = tmGrammars.find((g2) => g2.name === src);
     if (g) {
-      const url = new URL(`/tm-grammars@${version}/grammars/${g.name}.json`, cdn);
-      return cache.fetch(url).then((res) => res.json());
+      const url2 = new URL(`/tm-grammars@${version}/grammars/${g.name}.json`, cdn);
+      return cache.fetch(url2).then((res) => res.json());
     }
   }
-  return cache.fetch(src).then((res) => res.json());
+  const url = typeof src === "string" ? new URL(src) : src;
+  if (url.protocol === "http" || url.protocol === "https") {
+    return cache.fetch(url).then((res) => res.json());
+  }
+  throw new Error(`Unsupported grammar source: ${src}`);
 }
 function getGarmmarInfoFromPath(path) {
   const idx = path.lastIndexOf(".");
@@ -8132,7 +8143,15 @@ function getGarmmarInfoFromPath(path) {
 function getLanguageIdFromPath(path) {
   return getGarmmarInfoFromPath(path)?.name;
 }
+function getExtnameFromLanguageId(language) {
+  const g = tmGrammars.find((g2) => g2.name === language);
+  if (g) {
+    return g.aliases?.[0] ?? g.name;
+  }
+  return void 0;
+}
 export {
+  getExtnameFromLanguageId,
   getGarmmarInfoFromPath,
   getLanguageIdFromPath,
   initShiki,

package/dist/ssr/index.js

@@ -12,14 +12,14 @@ async function renderToString(input, options) {
   const highlighter = await (ssrHighlighter ?? (ssrHighlighter = initShiki(shiki)));
   const promises = [];
   if (theme && !highlighter.getLoadedThemes().includes(theme)) {
-    console.info(`[modern-monaco] Loading theme '${theme}' from ${shiki?.tmDownloadCDN ?? "https://esm.sh"}/tm-themes ...`);
+    console.info(`[modern-monaco] Loading theme '${theme}' from CDN...`);
     promises.push(highlighter.loadThemeFromCDN(theme));
   }
   if (language || filename) {
     const languageId = language ?? getLanguageIdFromPath(filename);
     if (languageId && !highlighter.getLoadedLanguages().includes(languageId)) {
       console.info(
-        `[modern-monaco] Loading garmmar '${languageId}' from ${shiki?.tmDownloadCDN ?? "https://esm.sh"}/tm-grammars ...`
+        `[modern-monaco] Loading garmmar '${languageId}' from CDN...`
       );
       promises.push(highlighter.loadGrammarFromCDN(languageId));
     }

package/dist/ssr/workerd.js

@@ -11,14 +11,14 @@ async function renderToString(input, options) {
   const highlighter = await (ssrHighlighter ?? (ssrHighlighter = initShiki(shiki)));
   const promises = [];
   if (theme && !highlighter.getLoadedThemes().includes(theme)) {
-    console.info(`[modern-monaco] Loading theme '${theme}' from ${shiki?.tmDownloadCDN ?? "https://esm.sh"}/tm-themes ...`);
+    console.info(`[modern-monaco] Loading theme '${theme}' from CDN...`);
     promises.push(highlighter.loadThemeFromCDN(theme));
   }
   if (language || filename) {
     const languageId = language ?? getLanguageIdFromPath(filename);
     if (languageId && !highlighter.getLoadedLanguages().includes(languageId)) {
       console.info(
-        `[modern-monaco] Loading garmmar '${languageId}' from ${shiki?.tmDownloadCDN ?? "https://esm.sh"}/tm-grammars ...`
+        `[modern-monaco] Loading garmmar '${languageId}' from CDN...`
       );
       promises.push(highlighter.loadGrammarFromCDN(languageId));
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "modern-monaco",
   "description": "A modern version of Monaco Editor",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",