fumadocs-core 14.7.5 → 14.7.6

package/dist/mdx-plugins/index.d.ts

@@ -48,7 +48,7 @@ type RehypeCodeOptions = RehypeShikiOptions & {
 /**
  * Handle codeblocks
  */
-declare function rehypeCode(this: Processor, options?: Partial<RehypeCodeOptions>): Transformer<Root, Root>;
+declare function rehypeCode(this: Processor, _options?: Partial<RehypeCodeOptions>): Transformer<Root, Root>;
 declare function transformerTab(): ShikiTransformer;
 
 interface RemarkImageOptions {

package/dist/mdx-plugins/index.js

@@ -19,261 +19,11 @@ import {
 
 // src/mdx-plugins/rehype-code.ts
 import rehypeShikiFromHighlighter from "@shikijs/rehype/core";
-
-// ../../node_modules/.pnpm/shiki-transformers@1.0.1_shiki@1.27.2/node_modules/shiki-transformers/dist/index.js
-var matchers = [
-  [/^(<!--)(.+)(-->)$/, false],
-  [/^(\/\*)(.+)(\*\/)$/, false],
-  [/^(\/\/|["']|;{1,2}|%{1,2}|--|#)(.+)$/, true],
-  /**
-   * for multi-line comments like this
-   */
-  [/^(\*)(.+)$/, true]
-];
-function parseComments(lines, jsx) {
-  const out = [];
-  for (const line of lines) {
-    const elements = line.children;
-    const start = jsx ? elements.length - 2 : elements.length - 1;
-    for (let i = Math.max(start, 0); i < elements.length; i++) {
-      const token = elements[i];
-      if (token.type !== "element")
-        continue;
-      const isLast = i === elements.length - 1;
-      const match = matchToken(token, isLast);
-      if (!match) continue;
-      if (jsx && !isLast && i !== 0) {
-        const left = elements[i - 1];
-        const right = elements[i + 1];
-        out.push({
-          info: match,
-          line,
-          token,
-          isJsxStyle: isValue(left, "{") && isValue(right, "}")
-        });
-      } else {
-        out.push({
-          info: match,
-          line,
-          token,
-          isJsxStyle: false
-        });
-      }
-    }
-  }
-  return out;
-}
-function isValue(element, value) {
-  if (element.type !== "element") return false;
-  const text = element.children[0];
-  if (text.type !== "text")
-    return false;
-  return text.value.trim() === value;
-}
-function matchToken(token, isLast) {
-  const text = token.children[0];
-  if (text.type !== "text")
-    return;
-  for (const [matcher, endOfLine] of matchers) {
-    if (endOfLine && !isLast) continue;
-    let trimmed = text.value.trimStart();
-    const spaceFront = text.value.length - trimmed.length;
-    trimmed = trimmed.trimEnd();
-    const spaceEnd = text.value.length - trimmed.length - spaceFront;
-    const result = matcher.exec(trimmed);
-    if (!result) continue;
-    return [
-      " ".repeat(spaceFront) + result[1],
-      result[2],
-      result[3] ? result[3] + " ".repeat(spaceEnd) : void 0
-    ];
-  }
-}
-function createCommentNotationTransformer(name, regex, onMatch) {
-  return {
-    name,
-    code(code) {
-      const lines = code.children.filter((i) => i.type === "element");
-      const linesToRemove = [];
-      code.data ??= {};
-      const data = code.data;
-      data._shiki_notation ??= parseComments(lines, ["jsx", "tsx"].includes(this.options.lang));
-      const parsed = data._shiki_notation;
-      for (const comment of parsed) {
-        if (comment.info[1].length === 0) continue;
-        const isLineCommentOnly = comment.line.children.length === (comment.isJsxStyle ? 3 : 1);
-        let lineIdx = lines.indexOf(comment.line);
-        if (isLineCommentOnly) lineIdx++;
-        comment.info[1] = comment.info[1].replace(regex, (...match) => {
-          if (onMatch.call(this, match, comment.line, comment.token, lines, lineIdx)) {
-            return "";
-          }
-          return match[0];
-        });
-        const isEmpty = comment.info[1].trim().length === 0;
-        if (isEmpty) comment.info[1] = "";
-        if (isEmpty && isLineCommentOnly) {
-          linesToRemove.push(comment.line);
-        } else if (isEmpty && comment.isJsxStyle) {
-          comment.line.children.splice(comment.line.children.indexOf(comment.token) - 1, 3);
-        } else if (isEmpty) {
-          comment.line.children.splice(comment.line.children.indexOf(comment.token), 1);
-        } else {
-          const head = comment.token.children[0];
-          if (head.type === "text") {
-            head.value = comment.info.join("");
-          }
-        }
-      }
-      for (const line of linesToRemove)
-        code.children.splice(code.children.indexOf(line), 1);
-    }
-  };
-}
-function escapeRegExp(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function transformerNotationMap(options = {}, name = "@shikijs/transformers:notation-map") {
-  const {
-    classMap = {},
-    classActivePre = void 0
-  } = options;
-  return createCommentNotationTransformer(
-    name,
-    new RegExp(`\\s*\\[!code (${Object.keys(classMap).map(escapeRegExp).join("|")})(:\\d+)?\\]`),
-    function([_, match, range = ":1"], _line, _comment, lines, index) {
-      const lineNum = Number.parseInt(range.slice(1), 10);
-      for (let i = index; i < Math.min(index + lineNum, lines.length); i++) {
-        this.addClassToHast(lines[i], classMap[match]);
-      }
-      if (classActivePre)
-        this.addClassToHast(this.pre, classActivePre);
-      return true;
-    }
-  );
-}
-function transformerNotationDiff(options = {}) {
-  const {
-    classLineAdd = "diff add",
-    classLineRemove = "diff remove",
-    classActivePre = "has-diff"
-  } = options;
-  return transformerNotationMap(
-    {
-      classMap: {
-        "++": classLineAdd,
-        "--": classLineRemove
-      },
-      classActivePre
-    },
-    "@shikijs/transformers:notation-diff"
-  );
-}
-function transformerNotationHighlight(options = {}) {
-  const {
-    classActiveLine = "highlighted",
-    classActivePre = "has-highlighted"
-  } = options;
-  return transformerNotationMap(
-    {
-      classMap: {
-        highlight: classActiveLine,
-        hl: classActiveLine
-      },
-      classActivePre
-    },
-    "@shikijs/transformers:notation-highlight"
-  );
-}
-function highlightWordInLine(line, ignoredElement, word, className) {
-  const content = getTextContent(line);
-  let index = content.indexOf(word);
-  while (index !== -1) {
-    highlightRange.call(this, line.children, ignoredElement, index, word.length, className);
-    index = content.indexOf(word, index + 1);
-  }
-}
-function getTextContent(element) {
-  if (element.type === "text")
-    return element.value;
-  if (element.type === "element" && element.tagName === "span")
-    return element.children.map(getTextContent).join("");
-  return "";
-}
-function highlightRange(elements, ignoredElement, index, len, className) {
-  let currentIdx = 0;
-  for (let i = 0; i < elements.length; i++) {
-    const element = elements[i];
-    if (element.type !== "element" || element.tagName !== "span" || element === ignoredElement)
-      continue;
-    const textNode = element.children[0];
-    if (textNode.type !== "text")
-      continue;
-    if (hasOverlap([currentIdx, currentIdx + textNode.value.length - 1], [index, index + len])) {
-      const start = Math.max(0, index - currentIdx);
-      const length = len - Math.max(0, currentIdx - index);
-      if (length === 0)
-        continue;
-      const separated = separateToken(element, textNode, start, length);
-      this.addClassToHast(separated[1], className);
-      const output = separated.filter(Boolean);
-      elements.splice(i, 1, ...output);
-      i += output.length - 1;
-    }
-    currentIdx += textNode.value.length;
-  }
-}
-function hasOverlap(range1, range2) {
-  return range1[0] <= range2[1] && range1[1] >= range2[0];
-}
-function separateToken(span, textNode, index, len) {
-  const text = textNode.value;
-  const createNode = (value) => inheritElement(span, {
-    children: [
-      {
-        type: "text",
-        value
-      }
-    ]
-  });
-  return [
-    index > 0 ? createNode(text.slice(0, index)) : void 0,
-    createNode(text.slice(index, index + len)),
-    index + len < text.length ? createNode(text.slice(index + len)) : void 0
-  ];
-}
-function inheritElement(original, overrides) {
-  return {
-    ...original,
-    properties: {
-      ...original.properties
-    },
-    ...overrides
-  };
-}
-function transformerNotationWordHighlight(options = {}) {
-  const {
-    classActiveWord = "highlighted-word",
-    classActivePre = void 0
-  } = options;
-  return createCommentNotationTransformer(
-    "@shikijs/transformers:notation-highlight-word",
-    /\s*\[!code word:((?:\\.|[^:\]])+)(:\d+)?\]/,
-    function([_, word, range], _line, comment, lines, index) {
-      const lineNum = range ? Number.parseInt(range.slice(1), 10) : lines.length;
-      word = word.replace(/\\(.)/g, "$1");
-      for (let i = index; i < Math.min(index + lineNum, lines.length); i++) {
-        highlightWordInLine.call(this, lines[i], comment, word, classActiveWord);
-      }
-      if (classActivePre)
-        this.addClassToHast(this.pre, classActivePre);
-      return true;
-    }
-  );
-}
-var symbol = Symbol("highlighted-lines");
-
-// src/mdx-plugins/rehype-code.ts
+import {
+  transformerNotationDiff,
+  transformerNotationHighlight,
+  transformerNotationWordHighlight
+} from "@shikijs/transformers";
 import {
   getSingletonHighlighter,
   bundledLanguages
@@ -450,9 +200,15 @@ var rehypeCodeDefaultOptions = {
   experimentalJSEngine: false,
   transformers: [
     createStyleTransformer(),
-    transformerNotationHighlight(),
-    transformerNotationWordHighlight(),
-    transformerNotationDiff()
+    transformerNotationHighlight({
+      matchAlgorithm: "v3"
+    }),
+    transformerNotationWordHighlight({
+      matchAlgorithm: "v3"
+    }),
+    transformerNotationDiff({
+      matchAlgorithm: "v3"
+    })
   ],
   parseMetaString(meta) {
     const map = {};
@@ -467,53 +223,44 @@ var rehypeCodeDefaultOptions = {
     return map;
   }
 };
-function rehypeCode(options = {}) {
-  const codeOptions = {
+function rehypeCode(_options = {}) {
+  const options = {
     ...rehypeCodeDefaultOptions,
-    ...options
+    ..._options
   };
-  codeOptions.transformers ||= [];
-  codeOptions.transformers = [
-    {
-      name: "rehype-code:pre-process",
-      preprocess(code, { meta }) {
-        if (meta && "__parsed_raw" in meta) {
-          meta.__raw = meta.__parsed_raw;
-          delete meta.__parsed_raw;
-        }
-        if (meta && codeOptions.filterMetaString) {
-          meta.__raw = codeOptions.filterMetaString(meta.__raw ?? "");
-        }
-        return code.replace(/\n$/, "");
+  const transformers = [...options.transformers ?? []];
+  transformers.unshift({
+    name: "rehype-code:pre-process",
+    preprocess(code, { meta }) {
+      if (meta && "__parsed_raw" in meta) {
+        meta.__raw = meta.__parsed_raw;
+        delete meta.__parsed_raw;
       }
-    },
-    ...codeOptions.transformers
-  ];
-  if (codeOptions.icon !== false) {
-    codeOptions.transformers = [
-      ...codeOptions.transformers,
-      transformerIcon(codeOptions.icon)
-    ];
-  }
-  if (codeOptions.tab !== false) {
-    codeOptions.transformers = [...codeOptions.transformers, transformerTab()];
+      if (meta && options.filterMetaString) {
+        meta.__raw = options.filterMetaString(meta.__raw ?? "");
+      }
+      return code.replace(/\n$/, "");
+    }
+  });
+  if (options.icon !== false) {
+    transformers.push(transformerIcon(options.icon));
   }
-  let themeItems = [];
-  if ("themes" in codeOptions) {
-    themeItems = Object.values(codeOptions.themes);
-  } else if ("theme" in codeOptions) {
-    themeItems = [codeOptions.theme];
+  if (options.tab !== false) {
+    transformers.push(transformerTab());
   }
   const highlighter = getSingletonHighlighter({
-    engine: codeOptions.experimentalJSEngine ? createJavaScriptRegexEngine() : createOnigurumaEngine(() => import("shiki/wasm")),
-    themes: themeItems.filter(Boolean),
-    langs: codeOptions.langs ?? Object.keys(bundledLanguages)
+    engine: options.experimentalJSEngine ? createJavaScriptRegexEngine() : createOnigurumaEngine(() => import("shiki/wasm")),
+    themes: "themes" in options ? Object.values(options.themes).filter(Boolean) : [options.theme],
+    langs: options.langs ?? (options.lazy ? void 0 : Object.keys(bundledLanguages))
   });
   const transformer = highlighter.then(
-    (instance) => rehypeShikiFromHighlighter(instance, codeOptions)
+    (instance) => rehypeShikiFromHighlighter(instance, {
+      ...options,
+      transformers
+    })
   );
   return async (tree, file) => {
-    (await transformer)(tree, file, () => {
+    await (await transformer)(tree, file, () => {
     });
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "14.7.5",
+  "version": "14.7.6",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -79,7 +79,8 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.5.10",
     "@orama/orama": "^2.1.1",
-    "@shikijs/rehype": "^1.27.2",
+    "@shikijs/rehype": "^2.0.3",
+    "@shikijs/transformers": "^2.0.3",
     "github-slugger": "^2.0.0",
     "hast-util-to-estree": "^3.1.1",
     "hast-util-to-jsx-runtime": "^2.3.2",
@@ -89,7 +90,7 @@
     "remark": "^15.0.0",
     "remark-gfm": "^4.0.0",
     "scroll-into-view-if-needed": "^3.1.0",
-    "shiki": "^1.27.2",
+    "shiki": "^2.0.3",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
@@ -110,7 +111,6 @@
     "next": "^15.1.5",
     "remark-mdx": "^3.1.0",
     "remark-rehype": "^11.1.1",
-    "shiki-transformers": "^1.0.1",
     "typescript": "^5.7.3",
     "unified": "^11.0.5",
     "vfile": "^6.0.3",