@astrojs/markdown-remark 7.0.0-beta.8 → 7.0.0

package/dist/shiki.d.ts

@@ -40,5 +40,5 @@ export interface ShikiHighlighterHighlightOptions {
      */
     meta?: string;
 }
-export declare function createShikiHighlighter({ langs, theme, themes, langAlias, }?: CreateShikiHighlighterOptions): Promise<ShikiHighlighter>;
+export declare function createShikiHighlighter(options?: CreateShikiHighlighterOptions): Promise<ShikiHighlighter>;
 export type { ThemePresets };

package/dist/shiki.js

@@ -9,8 +9,48 @@ const cssVariablesTheme = () => _cssVariablesTheme ?? (_cssVariablesTheme = crea
   variablePrefix: "--astro-code-"
 }));
 const cachedHighlighters = /* @__PURE__ */ new Map();
+function clearShikiHighlighterCache() {
+  cachedHighlighters.clear();
+}
+function createShikiHighlighter(options) {
+  const key = getCacheKey(options);
+  let highlighterPromise = cachedHighlighters.get(key);
+  if (!highlighterPromise) {
+    highlighterPromise = createShikiHighlighterInternal(options);
+    cachedHighlighters.set(key, highlighterPromise);
+  }
+  return ensureLanguagesLoaded(highlighterPromise, options?.langs);
+}
+function getCacheKey(options) {
+  const keyCache = [];
+  const { theme, themes, langAlias } = options ?? {};
+  if (theme) {
+    keyCache.push(theme);
+  }
+  if (themes) {
+    keyCache.push(Object.entries(themes).sort());
+  }
+  if (langAlias) {
+    keyCache.push(Object.entries(langAlias).sort());
+  }
+  return keyCache.length > 0 ? JSON.stringify(keyCache) : "";
+}
+async function ensureLanguagesLoaded(promise, langs) {
+  const highlighter = await promise;
+  if (!langs) {
+    return highlighter;
+  }
+  const loadedLanguages = highlighter.getLoadedLanguages();
+  for (const lang of langs) {
+    if (typeof lang === "string" && (isSpecialLang(lang) || loadedLanguages.includes(lang))) {
+      continue;
+    }
+    await highlighter.loadLanguage(lang);
+  }
+  return highlighter;
+}
 let shikiEngine = void 0;
-async function createShikiHighlighter({
+async function createShikiHighlighterInternal({
   langs = [],
   theme = "github-dark",
   themes = {},
@@ -20,20 +60,12 @@ async function createShikiHighlighter({
   if (shikiEngine === void 0) {
     shikiEngine = await loadShikiEngine();
   }
-  const highlighterOptions = {
+  const highlighter = await createHighlighter({
     langs: ["plaintext", ...langs],
     langAlias,
     themes: Object.values(themes).length ? Object.values(themes) : [theme],
     engine: shikiEngine
-  };
-  const key = JSON.stringify(highlighterOptions, Object.keys(highlighterOptions).sort());
-  let highlighter;
-  if (cachedHighlighters.has(key)) {
-    highlighter = cachedHighlighters.get(key);
-  } else {
-    highlighter = await createHighlighter(highlighterOptions);
-    cachedHighlighters.set(key, highlighter);
-  }
+  });
   async function highlight(code, lang = "plaintext", options, to) {
     const resolvedLang = langAlias[lang] ?? lang;
     const loadedLanguages = highlighter.getLoadedLanguages();
@@ -55,7 +87,7 @@ async function createShikiHighlighter({
       lang,
       // NOTE: while we can spread `options.attributes` here so that Shiki can auto-serialize this as rendered
       // attributes on the top-level tag, it's not clear whether it is fine to pass all attributes as meta, as
-      // they're technically not meta, nor parsed from Shiki's `parseMetaString` API.
+      // they're technically neither meta nor parsed from Shiki's `parseMetaString` API.
       meta: options?.meta ? { __raw: options?.meta } : void 0,
       transformers: [
         {
@@ -113,6 +145,12 @@ async function createShikiHighlighter({
     },
     codeToHtml(code, lang, options = {}) {
       return highlight(code, lang, options, "html");
+    },
+    loadLanguage(...newLangs) {
+      return highlighter.loadLanguage(...newLangs);
+    },
+    getLoadedLanguages() {
+      return highlighter.getLoadedLanguages();
     }
   };
 }
@@ -120,5 +158,6 @@ function normalizePropAsString(value) {
   return Array.isArray(value) ? value.join(" ") : value;
 }
 export {
+  clearShikiHighlighterCache,
   createShikiHighlighter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "7.0.0-beta.8",
+  "version": "7.0.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -41,15 +41,15 @@
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.2",
     "remark-smartypants": "^3.0.2",
-    "shiki": "^3.22.0",
+    "shiki": "^4.0.0",
     "smol-toml": "^1.6.0",
     "unified": "^11.0.5",
     "unist-util-remove-position": "^5.0.0",
     "unist-util-visit": "^5.1.0",
     "unist-util-visit-parents": "^6.0.2",
     "vfile": "^6.0.3",
-    "@astrojs/internal-helpers": "0.8.0-beta.1",
-    "@astrojs/prism": "4.0.0-beta.2"
+    "@astrojs/internal-helpers": "0.8.0",
+    "@astrojs/prism": "4.0.0"
   },
   "devDependencies": {
     "@types/estree": "^1.0.8",