@qualcomm-ui/mdx-vite 3.7.4 → 3.8.0

package/dist/cli.js

@@ -3614,7 +3614,11 @@ var configSchema = implement().with({
     z2.literal("timestamp"),
     z2.literal("user-and-timestamp")
   ]).optional(),
-  routingStrategy: z2.union([z2.literal("vite-generouted"), z2.any()]).optional(),
+  routingStrategy: z2.union([
+    z2.literal("vite-generouted"),
+    z2.literal("react-router-directory-groups"),
+    z2.any()
+  ]).optional(),
   throwOnError: z2.boolean().optional(),
   typeDocProps: z2.string().optional(),
   typeDocPropsOptions: typeDocPropsSchema.optional(),
@@ -3668,7 +3672,7 @@ import remarkMdx2 from "remark-mdx";
 import remarkParse3 from "remark-parse";
 import remarkStringify3 from "remark-stringify";
 import { unified as unified3 } from "unified";
-import { visit as visit10 } from "unist-util-visit";
+import { visit as visit11 } from "unist-util-visit";
 import {
   UniqueIdService
 } from "@qualcomm-ui/mdx-common";
@@ -4350,8 +4354,57 @@ var remarkRemoveJsx = () => {
 import { toString } from "mdast-util-to-string";
 import { visit as visit7 } from "unist-util-visit";
 
-// src/docs-plugin/remark/remark-spoilers.ts
+// src/docs-plugin/remark/remark-serialize-jsx.ts
 import { visit as visit8 } from "unist-util-visit";
+function getSerializeJsxStartMatch(text) {
+  return text.match(/^:::\s*serialize-jsx\s*$/);
+}
+function getSerializeJsxEndMatch(text) {
+  return text.trim() === ":::";
+}
+var isJsxNode = (node) => node.type === "mdxJsxFlowElement" || node.type === "mdxJsxTextElement";
+function createSerializeJsxPlugin(filter) {
+  return () => (tree) => {
+    visit8(tree, "paragraph", (node, index, parent) => {
+      if (!parent || index === void 0) {
+        return;
+      }
+      const firstChild = node.children[0];
+      if (firstChild?.type !== "text") {
+        return;
+      }
+      if (!getSerializeJsxStartMatch(firstChild.value)) {
+        return;
+      }
+      let endIndex = index + 1;
+      const contentNodes = [];
+      while (endIndex < parent.children.length) {
+        const child = parent.children[endIndex];
+        if (child.type === "paragraph") {
+          const firstText = child.children[0];
+          if (firstText?.type === "text" && getSerializeJsxEndMatch(firstText.value)) {
+            break;
+          }
+        }
+        contentNodes.push(child);
+        endIndex++;
+      }
+      if (endIndex >= parent.children.length) {
+        return;
+      }
+      parent.children.splice(
+        index,
+        endIndex - index + 1,
+        ...contentNodes.filter(filter)
+      );
+    });
+  };
+}
+var remarkSerializeJsxRender = createSerializeJsxPlugin(isJsxNode);
+var remarkSerializeJsxKnowledge = createSerializeJsxPlugin((n) => !isJsxNode(n));
+
+// src/docs-plugin/remark/remark-spoilers.ts
+import { visit as visit9 } from "unist-util-visit";
 function getSpoilerStartMatch(text) {
   return text.match(/^:::\s*spoiler\s*(.*)$/);
 }
@@ -4363,7 +4416,7 @@ function isSpoilerBlock(text) {
 }
 
 // src/docs-plugin/remark/remark-steps.ts
-import { visit as visit9 } from "unist-util-visit";
+import { visit as visit10 } from "unist-util-visit";
 function getStepStartMatch(text) {
   return text.match(/^:::\s*steps(?:\s+(h[1-6](?:-h[1-6])?))?\s*$/);
 }
@@ -4476,7 +4529,7 @@ var DocPropsIndexer = class {
    */
   getTypeDocPropsNodes = () => {
     return (tree, _file, done) => {
-      visit10(tree, "mdxJsxFlowElement", (node) => {
+      visit11(tree, "mdxJsxFlowElement", (node) => {
         if (node && "name" in node && docPropsJsxNodes.includes(node.name)) {
           const nameAttr = node.attributes?.find(
             (attr) => attr.name === "name"
@@ -4622,7 +4675,7 @@ var DocPropsIndexer = class {
 // src/docs-plugin/link-validator.ts
 import chalk2 from "chalk";
 import { posix } from "node:path";
-import { visit as visit11 } from "unist-util-visit";
+import { visit as visit12 } from "unist-util-visit";
 var externalPrefixes = ["https://", "http://", "mailto:", "tel:"];
 function isExternal(url) {
   return externalPrefixes.some((prefix) => url.startsWith(prefix));
@@ -4648,7 +4701,7 @@ function resolveLink(url, sourcePathname) {
 }
 function collectLinks(tree, sourceFile, sourcePathname) {
   const links = [];
-  visit11(tree, "link", (node) => {
+  visit12(tree, "link", (node) => {
     const resolved = resolveLink(node.url, sourcePathname);
     if (!resolved) {
       return;
@@ -4680,8 +4733,8 @@ function collectAnchorIds(tree) {
       anchorIds.add(id);
     }
   };
-  visit11(tree, "mdxJsxFlowElement", collectAnchorId);
-  visit11(tree, "mdxJsxTextElement", collectAnchorId);
+  visit12(tree, "mdxJsxFlowElement", collectAnchorId);
+  visit12(tree, "mdxJsxTextElement", collectAnchorId);
   return anchorIds;
 }
 function validateLinks(links, pageMap, docPropIds, anchorIds) {
@@ -4733,7 +4786,7 @@ import { toString as toString2 } from "mdast-util-to-string";
 import remarkGfm2 from "remark-gfm";
 import remarkStringify4 from "remark-stringify";
 import { unified as unified4 } from "unified";
-import { visit as visit12 } from "unist-util-visit";
+import { visit as visit13 } from "unist-util-visit";
 
 // src/docs-plugin/markdown/knowledge/utils.ts
 import { createHash as createHash2 } from "node:crypto";
@@ -4745,9 +4798,9 @@ function computeMd5(content) {
 // src/docs-plugin/markdown/knowledge/section-extractor.ts
 function transformLinks() {
   return () => (tree) => {
-    visit12(tree, "link", (node) => {
+    visit13(tree, "link", (node) => {
       let text = "";
-      visit12(node, "text", (textNode) => {
+      visit13(node, "text", (textNode) => {
         text += textNode.value;
       });
       Object.assign(node, {
@@ -5323,7 +5376,10 @@ function isPathSeparator(char) {
   return pathSeparatorRegex.test(char);
 }
 var indexRouteRegex = /((^|[.]|[+]\/)(index|_index))(\/[^\/]+)?$|(\/_?index\/)/;
-function getRemixFlatRoutesSegments(name, index, paramPrefixChar = "$") {
+function getRemixFlatRoutesSegments(name, index, paramPrefixCharOrOptions = "$") {
+  const options = typeof paramPrefixCharOrOptions === "string" ? { paramPrefixChar: paramPrefixCharOrOptions } : paramPrefixCharOrOptions;
+  const paramPrefixChar = options.paramPrefixChar ?? "$";
+  const directoryMode = options.directoryMode ?? false;
   let routeSegments = [];
   let i = 0;
   let routeSegment = "";
@@ -5340,6 +5396,18 @@ function getRemixFlatRoutesSegments(name, index, paramPrefixChar = "$") {
     name = name.replace(/\+\//g, ".");
     hasPlus = true;
   }
+  if (directoryMode && /\//.test(name)) {
+    if (name.endsWith(".route")) {
+      const lastSlash = name.lastIndexOf("/");
+      if (lastSlash >= 0) {
+        const head = name.substring(0, lastSlash).replace(/\//g, ".");
+        name = `${head}/${name.substring(lastSlash + 1)}`;
+      }
+    } else {
+      name = name.replace(/\//g, ".");
+    }
+    hasPlus = true;
+  }
   const hasFolder = /\//.test(name);
   if ((hasPlus && hasFolder || !hasPlus) && !(name.endsWith(".route") || name.endsWith(".index"))) {
     const last = name.lastIndexOf("/");
@@ -5403,6 +5471,27 @@ function getRemixHybridRoutesPathSegments(filePath) {
     indexRouteRegex.test(routeWithoutExtension)
   );
 }
+function getRemixHybridDirectoryRoutesPathSegments(filePath) {
+  const routeWithoutExtension = filePath.substring(0, filePath.lastIndexOf("."));
+  if (hasPrivateFolderSegment(routeWithoutExtension)) {
+    return [];
+  }
+  return getRemixFlatRoutesSegments(
+    routeWithoutExtension,
+    indexRouteRegex.test(routeWithoutExtension),
+    { directoryMode: true }
+  );
+}
+function hasPrivateFolderSegment(routeWithoutExtension) {
+  const segments = routeWithoutExtension.split("/");
+  for (let i = 0; i < segments.length - 1; i++) {
+    const segment = segments[i];
+    if (segment.startsWith("_") && !segment.includes("+")) {
+      return true;
+    }
+  }
+  return false;
+}
 function getPathSegmentsFromFileName(filePath, pageDirectory, strategy) {
   const filePathWithoutPageDirectory = filePath.substring(
     filePath.indexOf(pageDirectory) + pageDirectory.length + 1
@@ -5413,6 +5502,10 @@ function getPathSegmentsFromFileName(filePath, pageDirectory, strategy) {
   switch (strategy) {
     case "vite-generouted":
       return getGeneroutedPathSegments(filePathWithoutPageDirectory);
+    case "react-router-directory-groups":
+      return getRemixHybridDirectoryRoutesPathSegments(
+        filePathWithoutPageDirectory
+      );
     default:
       return getRemixHybridRoutesPathSegments(filePathWithoutPageDirectory);
   }
@@ -5427,8 +5520,24 @@ function filterFileGlob(fileGlob, ext, srcDir, router) {
       (file) => file.split("/").filter((segment) => !restrictedPattern.test(segment)).join("/")
     ).map((file) => join(srcDir, file));
   }
+  if (typeof router === "string" && router === "react-router-directory-groups") {
+    return fileGlob.filter(
+      (file) => file.endsWith(ext) && !file.includes("$") && !hasPrivateFolderInRelativePath(file, srcDir)
+    );
+  }
   return fileGlob.filter((file) => file.endsWith(ext) && !file.includes("$"));
 }
+function hasPrivateFolderInRelativePath(file, srcDir) {
+  const relative = file.startsWith(srcDir) ? file.slice(srcDir.length) : file;
+  const segments = relative.split("/").filter(Boolean);
+  for (let i = 0; i < segments.length - 1; i++) {
+    const segment = segments[i];
+    if (segment.startsWith("_") && !segment.includes("+")) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // src/docs-plugin/nav-builder/transform-route-meta-array.ts
 function transformRouteMetaArray(meta, routeMetaNav) {
@@ -5623,6 +5732,7 @@ var SearchIndexer = class {
           gfm: true,
           interpolateFrontmatter: frontmatter,
           mdx: true,
+          plugins: [remarkSerializeJsxKnowledge],
           removeJsx: true,
           removeMermaidCodeBlocks: true
         });