@astrojs/markdown-remark 4.0.1 → 4.2.0

package/dist/import-plugin-browser.d.ts

@@ -0,0 +1,2 @@
+import type * as unified from 'unified';
+export declare function importPlugin(p: string): Promise<unified.Plugin>;

package/dist/import-plugin-browser.js

@@ -0,0 +1,7 @@
+async function importPlugin(p) {
+  const importResult = await import(p);
+  return importResult.default;
+}
+export {
+  importPlugin
+};

package/dist/import-plugin-default.d.ts

@@ -0,0 +1,2 @@
+import type * as unified from 'unified';
+export declare function importPlugin(p: string): Promise<unified.Plugin>;

package/dist/import-plugin-default.js

@@ -0,0 +1,18 @@
+import { resolve as importMetaResolve } from "import-meta-resolve";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
+let cwdUrlStr;
+async function importPlugin(p) {
+  try {
+    const importResult2 = await import(p);
+    return importResult2.default;
+  } catch {
+  }
+  cwdUrlStr ??= pathToFileURL(path.join(process.cwd(), "package.json")).toString();
+  const resolved = importMetaResolve(p, cwdUrlStr);
+  const importResult = await import(resolved);
+  return importResult.default;
+}
+export {
+  importPlugin
+};

package/dist/index.js

@@ -30,7 +30,8 @@ const markdownConfigDefaults = {
     langs: [],
     theme: "github-dark",
     experimentalThemes: {},
-    wrap: false
+    wrap: false,
+    transformers: []
   },
   remarkPlugins: [],
   rehypePlugins: [],

package/dist/load-plugins.js

@@ -1,19 +1,10 @@
-import { resolve as importMetaResolve } from "import-meta-resolve";
-import path from "node:path";
-import { pathToFileURL } from "node:url";
-const cwdUrlStr = pathToFileURL(path.join(process.cwd(), "package.json")).toString();
+import { importPlugin as _importPlugin } from "#import-plugin";
 async function importPlugin(p) {
   if (typeof p === "string") {
-    try {
-      const importResult2 = await import(p);
-      return importResult2.default;
-    } catch {
-    }
-    const resolved = importMetaResolve(p, cwdUrlStr);
-    const importResult = await import(resolved);
-    return importResult.default;
+    return await _importPlugin(p);
+  } else {
+    return p;
   }
-  return p;
 }
 function loadPlugins(items) {
   return items.map((p) => {

package/dist/rehype-images.js

@@ -1,6 +1,7 @@
 import { visit } from "unist-util-visit";
 function rehypeImages() {
   return () => function(tree, file) {
+    const imageOccurrenceMap = /* @__PURE__ */ new Map();
     visit(tree, (node) => {
       if (node.type !== "element")
         return;
@@ -8,8 +9,13 @@ function rehypeImages() {
         return;
       if (node.properties?.src) {
         if (file.data.imagePaths?.has(node.properties.src)) {
-          node.properties["__ASTRO_IMAGE_"] = node.properties.src;
-          delete node.properties.src;
+          const { ...props } = node.properties;
+          const index = imageOccurrenceMap.get(node.properties.src) || 0;
+          imageOccurrenceMap.set(node.properties.src, index + 1);
+          node.properties["__ASTRO_IMAGE_"] = JSON.stringify({ ...props, index });
+          Object.keys(props).forEach((prop) => {
+            delete node.properties[prop];
+          });
         }
       }
     });

package/dist/shiki.d.ts

@@ -4,4 +4,4 @@ export interface ShikiHighlighter {
         inline?: boolean;
     }): string;
 }
-export declare function createShikiHighlighter({ langs, theme, experimentalThemes, wrap, }?: ShikiConfig): Promise<ShikiHighlighter>;
+export declare function createShikiHighlighter({ langs, theme, experimentalThemes, wrap, transformers, }?: ShikiConfig): Promise<ShikiHighlighter>;

package/dist/shiki.js

@@ -1,29 +1,24 @@
-import { bundledLanguages, getHighlighter } from "shikiji";
+import { bundledLanguages, createCssVariablesTheme, getHighlighter } from "shikiji";
 import { visit } from "unist-util-visit";
 const ASTRO_COLOR_REPLACEMENTS = {
-  "#000001": "var(--astro-code-color-text)",
-  "#000002": "var(--astro-code-color-background)",
-  "#000004": "var(--astro-code-token-constant)",
-  "#000005": "var(--astro-code-token-string)",
-  "#000006": "var(--astro-code-token-comment)",
-  "#000007": "var(--astro-code-token-keyword)",
-  "#000008": "var(--astro-code-token-parameter)",
-  "#000009": "var(--astro-code-token-function)",
-  "#000010": "var(--astro-code-token-string-expression)",
-  "#000011": "var(--astro-code-token-punctuation)",
-  "#000012": "var(--astro-code-token-link)"
+  "--astro-code-foreground": "--astro-code-color-text",
+  "--astro-code-background": "--astro-code-color-background"
 };
 const COLOR_REPLACEMENT_REGEX = new RegExp(
   `(${Object.keys(ASTRO_COLOR_REPLACEMENTS).join("|")})`,
   "g"
 );
+let _cssVariablesTheme;
+const cssVariablesTheme = () => _cssVariablesTheme ?? (_cssVariablesTheme = createCssVariablesTheme({ variablePrefix: "--astro-code-" }));
 async function createShikiHighlighter({
   langs = [],
   theme = "github-dark",
   experimentalThemes = {},
-  wrap = false
+  wrap = false,
+  transformers = []
 } = {}) {
   const themes = experimentalThemes;
+  theme = theme === "css-variables" ? cssVariablesTheme() : theme;
   const highlighter = await getHighlighter({
     langs: langs.length ? langs : Object.keys(bundledLanguages),
     themes: Object.values(themes).length ? Object.values(themes) : [theme]
@@ -40,61 +35,67 @@ async function createShikiHighlighter({
       return highlighter.codeToHtml(code, {
         ...themeOptions,
         lang,
-        transforms: {
-          pre(node) {
-            if (inline) {
-              node.tagName = "code";
-            }
-            const classValue = node.properties.class ?? "";
-            const styleValue = node.properties.style ?? "";
-            node.properties.class = classValue.replace(/shiki/g, "astro-code");
-            if (wrap === false) {
-              node.properties.style = styleValue + "; overflow-x: auto;";
-            } else if (wrap === true) {
-              node.properties.style = styleValue + "; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;";
-            }
-          },
-          line(node) {
-            if (lang === "diff") {
-              const innerSpanNode = node.children[0];
-              const innerSpanTextNode = innerSpanNode?.type === "element" && innerSpanNode.children?.[0];
-              if (innerSpanTextNode && innerSpanTextNode.type === "text") {
-                const start = innerSpanTextNode.value[0];
-                if (start === "+" || start === "-") {
-                  innerSpanTextNode.value = innerSpanTextNode.value.slice(1);
-                  innerSpanNode.children.unshift({
-                    type: "element",
-                    tagName: "span",
-                    properties: { style: "user-select: none;" },
-                    children: [{ type: "text", value: start }]
-                  });
+        transformers: [
+          {
+            pre(node) {
+              if (inline) {
+                node.tagName = "code";
+              }
+              const classValue = normalizePropAsString(node.properties.class) ?? "";
+              const styleValue = normalizePropAsString(node.properties.style) ?? "";
+              node.properties.class = classValue.replace(/shiki/g, "astro-code");
+              if (wrap === false) {
+                node.properties.style = styleValue + "; overflow-x: auto;";
+              } else if (wrap === true) {
+                node.properties.style = styleValue + "; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;";
+              }
+            },
+            line(node) {
+              if (lang === "diff") {
+                const innerSpanNode = node.children[0];
+                const innerSpanTextNode = innerSpanNode?.type === "element" && innerSpanNode.children?.[0];
+                if (innerSpanTextNode && innerSpanTextNode.type === "text") {
+                  const start = innerSpanTextNode.value[0];
+                  if (start === "+" || start === "-") {
+                    innerSpanTextNode.value = innerSpanTextNode.value.slice(1);
+                    innerSpanNode.children.unshift({
+                      type: "element",
+                      tagName: "span",
+                      properties: { style: "user-select: none;" },
+                      children: [{ type: "text", value: start }]
+                    });
+                  }
                 }
               }
+            },
+            code(node) {
+              if (inline) {
+                return node.children[0];
+              }
+            },
+            root(node) {
+              if (Object.values(experimentalThemes).length) {
+                return;
+              }
+              const themeName = typeof theme === "string" ? theme : theme.name;
+              if (themeName === "css-variables") {
+                visit(node, "element", (child) => {
+                  if (child.properties?.style) {
+                    child.properties.style = replaceCssVariables(child.properties.style);
+                  }
+                });
+              }
             }
           },
-          code(node) {
-            if (inline) {
-              return node.children[0];
-            }
-          },
-          root(node) {
-            if (Object.values(experimentalThemes).length) {
-              return;
-            }
-            const themeName = typeof theme === "string" ? theme : theme.name;
-            if (themeName === "css-variables") {
-              visit(node, "element", (child) => {
-                if (child.properties?.style) {
-                  child.properties.style = replaceCssVariables(child.properties.style);
-                }
-              });
-            }
-          }
-        }
+          ...transformers
+        ]
       });
     }
   };
 }
+function normalizePropAsString(value) {
+  return Array.isArray(value) ? value.join(" ") : value;
+}
 function replaceCssVariables(str) {
   return str.replace(COLOR_REPLACEMENT_REGEX, (match) => ASTRO_COLOR_REPLACEMENTS[match] || match);
 }

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import type * as hast from 'hast';
 import type * as mdast from 'mdast';
 import type { Options as RemarkRehypeOptions } from 'remark-rehype';
-import type { BuiltinTheme, LanguageRegistration, ThemeRegistration, ThemeRegistrationRaw } from 'shikiji';
+import type { BuiltinTheme, LanguageRegistration, ShikijiTransformer, ThemeRegistration, ThemeRegistrationRaw } from 'shikiji';
 import type * as unified from 'unified';
 import type { VFile } from 'vfile';
 export type { Node } from 'unist';
@@ -13,11 +13,13 @@ export type RemarkPlugins = (string | [string, any] | RemarkPlugin | [RemarkPlug
 export type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, hast.Root>;
 export type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
 export type RemarkRehype = RemarkRehypeOptions;
+export type ThemePresets = BuiltinTheme | 'css-variables';
 export interface ShikiConfig {
     langs?: LanguageRegistration[];
-    theme?: BuiltinTheme | ThemeRegistration | ThemeRegistrationRaw;
-    experimentalThemes?: Record<string, BuiltinTheme | ThemeRegistration | ThemeRegistrationRaw>;
+    theme?: ThemePresets | ThemeRegistration | ThemeRegistrationRaw;
+    experimentalThemes?: Record<string, ThemePresets | ThemeRegistration | ThemeRegistrationRaw>;
     wrap?: boolean | null;
+    transformers?: ShikijiTransformer[];
 }
 export interface AstroMarkdownOptions {
     syntaxHighlight?: 'shiki' | 'prism' | false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "4.0.1",
+  "version": "4.2.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -16,6 +16,12 @@
     ".": "./dist/index.js",
     "./dist/internal.js": "./dist/internal.js"
   },
+  "imports": {
+    "#import-plugin": {
+      "browser": "./dist/import-plugin-browser.js",
+      "default": "./dist/import-plugin-default.js"
+    }
+  },
   "files": [
     "dist"
   ],
@@ -30,7 +36,7 @@
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.0.0",
     "remark-smartypants": "^2.0.0",
-    "shikiji": "^0.6.13",
+    "shikiji": "^0.9.18",
     "unified": "^11.0.4",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1"
@@ -43,6 +49,7 @@
     "@types/mocha": "^10.0.4",
     "@types/unist": "^3.0.2",
     "chai": "^4.3.7",
+    "esbuild": "^0.19.6",
     "mdast-util-mdx-expression": "^2.0.0",
     "mocha": "^10.2.0",
     "astro-scripts": "0.0.14"