@qualcomm-ui/mdx-vite 3.7.4 → 3.8.0

package/dist/index.js

@@ -123,7 +123,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(),
@@ -1072,8 +1076,60 @@ function remarkSelfLinkHeadings(baseUrl = "", options) {
   };
 }
 
-// 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() === ":::";
+}
+function isSerializeJsxBlock(text) {
+  return !!getSerializeJsxStartMatch(text) || !!getSerializeJsxEndMatch(text);
+}
+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*(.*)$/);
 }
@@ -1090,7 +1146,7 @@ var remarkSpoilers = (options = {}) => {
     summaryClassName = []
   } = options;
   return (tree) => {
-    visit8(tree, "paragraph", (node, index, parent) => {
+    visit9(tree, "paragraph", (node, index, parent) => {
       if (!parent || index === void 0) {
         return;
       }
@@ -1160,7 +1216,7 @@ var remarkSpoilers = (options = {}) => {
 };
 
 // src/docs-plugin/remark/remark-steps.ts
-import { visit as visit9 } from "unist-util-visit";
+import { visit as visit10 } from "unist-util-visit";
 var defaultAllowedHeadings = /* @__PURE__ */ new Set([2, 3, 4]);
 function parseHeadingRange(value) {
   const match = value.match(/^h([1-6])(?:-h([1-6]))?$/);
@@ -1192,7 +1248,7 @@ function isStepBlock(text) {
 }
 var remarkSteps = () => {
   return (tree) => {
-    visit9(tree, "paragraph", (node, index, parent) => {
+    visit10(tree, "paragraph", (node, index, parent) => {
       if (!parent || index === void 0) {
         return;
       }
@@ -1290,7 +1346,7 @@ function createRemarkProcessor(options = {}) {
 import { minimatch as minimatch2 } from "minimatch";
 import { readdir } from "node:fs/promises";
 import { join as join5, relative } from "node:path";
-import { visit as visit17 } from "unist-util-visit";
+import { visit as visit18 } from "unist-util-visit";
 
 // src/docs-plugin/nav-builder/get-route-meta.ts
 function getRouteMeta(pathSegments, metaJson) {
@@ -1645,7 +1701,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 = "";
@@ -1662,6 +1721,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("/");
@@ -1725,6 +1796,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
@@ -1735,6 +1827,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);
   }
@@ -1749,8 +1845,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 relative4 = file.startsWith(srcDir) ? file.slice(srcDir.length) : file;
+  const segments = relative4.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) {
@@ -1814,7 +1926,7 @@ function filterFrontmatter(frontmatter, config) {
 // src/docs-plugin/markdown/knowledge/plugins/demo-plugin.ts
 import { readFile as readFile2 } from "node:fs/promises";
 import { basename, extname, join as join3 } from "node:path";
-import { visit as visit10 } from "unist-util-visit";
+import { visit as visit11 } from "unist-util-visit";
 import { kebabCase } from "@qualcomm-ui/utils/change-case";
 
 // src/docs-plugin/markdown/knowledge/utils.ts
@@ -1906,7 +2018,7 @@ async function collectDemoImports(demoCode, demoFilePath, visited = /* @__PURE__
 function formatDemos(demosFolder, verbose) {
   return () => async (tree) => {
     const promises = [];
-    visit10(
+    visit11(
       tree,
       "mdxJsxFlowElement",
       (node, index, parent) => {
@@ -2024,14 +2136,14 @@ function formatDemos(demosFolder, verbose) {
 // src/docs-plugin/markdown/knowledge/plugins/doc-props-plugin.ts
 import { readFile as readFile3 } from "node:fs/promises";
 import { dirname as dirname2, join as join4, resolve as resolve3 } from "node:path";
-import { visit as visit12 } from "unist-util-visit";
+import { visit as visit13 } from "unist-util-visit";
 
 // src/docs-plugin/doc-props/doc-props-indexer.ts
 import remarkMdx2 from "remark-mdx";
 import remarkParse3 from "remark-parse";
 import remarkStringify3 from "remark-stringify";
 import { unified as unified3 } from "unified";
-import { visit as visit11 } from "unist-util-visit";
+import { visit as visit12 } from "unist-util-visit";
 import {
   UniqueIdService
 } from "@qualcomm-ui/mdx-common";
@@ -2091,7 +2203,7 @@ var DocPropsIndexer = class {
    */
   getTypeDocPropsNodes = () => {
     return (tree, _file, done) => {
-      visit11(tree, "mdxJsxFlowElement", (node) => {
+      visit12(tree, "mdxJsxFlowElement", (node) => {
         if (node && "name" in node && docPropsJsxNodes.includes(node.name)) {
           const nameAttr = node.attributes?.find(
             (attr) => attr.name === "name"
@@ -2411,7 +2523,7 @@ ${tagContent.trim()}
    */
   propsToMarkdownList() {
     return () => (tree, _file, done) => {
-      visit12(
+      visit13(
         tree,
         "mdxJsxFlowElement",
         (node, index, parent) => {
@@ -2502,12 +2614,12 @@ ${propsToDefinitionList(outputs)}`);
 };
 
 // src/docs-plugin/markdown/knowledge/plugins/filter-text-directives.ts
-import { visit as visit13 } from "unist-util-visit";
+import { visit as visit14 } from "unist-util-visit";
 var filterTextDirectives = () => {
   return (tree, _file, done) => {
-    visit13(tree, "text", (node) => {
+    visit14(tree, "text", (node) => {
       const value = node.value?.trim?.();
-      if (value && (isStepBlock(value) || isSpoilerBlock(value))) {
+      if (value && (isStepBlock(value) || isSpoilerBlock(value) || isSerializeJsxBlock(value))) {
         Object.assign(node, {
           value: ``
         });
@@ -2518,10 +2630,10 @@ var filterTextDirectives = () => {
 };
 
 // src/docs-plugin/markdown/knowledge/plugins/npm-install-tabs-plugin.ts
-import { visit as visit14 } from "unist-util-visit";
+import { visit as visit15 } from "unist-util-visit";
 var formatNpmInstallTabs = () => {
   return (tree, _file, done) => {
-    visit14(
+    visit15(
       tree,
       "mdxJsxFlowElement",
       (node, index, parent) => {
@@ -2550,7 +2662,7 @@ var formatNpmInstallTabs = () => {
 };
 
 // src/docs-plugin/markdown/knowledge/plugins/qds-theme-plugin.ts
-import { visit as visit15 } from "unist-util-visit";
+import { visit as visit16 } from "unist-util-visit";
 function themeDataToJson(data, cssPropertyName) {
   if (!data || typeof data !== "object") {
     return "";
@@ -2609,7 +2721,7 @@ async function formatThemeNodes() {
     }
   };
   return () => (tree, _file, done) => {
-    visit15(tree, "mdxJsxFlowElement", (node) => {
+    visit16(tree, "mdxJsxFlowElement", (node) => {
       const handler = node.name && handlers[node.name];
       if (!handler) {
         return;
@@ -2645,12 +2757,12 @@ 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 visit16 } from "unist-util-visit";
+import { visit as visit17 } from "unist-util-visit";
 function transformLinks() {
   return () => (tree) => {
-    visit16(tree, "link", (node) => {
+    visit17(tree, "link", (node) => {
       let text = "";
-      visit16(node, "text", (textNode) => {
+      visit17(node, "text", (textNode) => {
         text += textNode.value;
       });
       Object.assign(node, {
@@ -3064,7 +3176,7 @@ ${pageEntry.content}`;
   }
   formatFrontmatterExpressions(frontmatter) {
     return () => (tree) => {
-      visit17(
+      visit18(
         tree,
         "mdxFlowExpression",
         (node, index, parent) => {
@@ -3103,7 +3215,7 @@ ${pageEntry.content}`;
       if (!baseUrl) {
         return;
       }
-      visit17(tree, "link", (node) => {
+      visit18(tree, "link", (node) => {
         if (node.url.startsWith("/")) {
           node.url = `${baseUrl}${node.url}`;
         }
@@ -3117,6 +3229,7 @@ ${pageEntry.content}`;
       gfm: true,
       mdx: true,
       plugins: [
+        remarkSerializeJsxKnowledge,
         formatNpmInstallTabs,
         this.propFormatter.propsToMarkdownList(),
         this.formatFrontmatterExpressions(frontmatter),
@@ -3209,7 +3322,7 @@ import { defined as defined2 } from "@qualcomm-ui/utils/guard";
 // src/docs-plugin/link-validator.ts
 import chalk2 from "chalk";
 import { posix } from "node:path";
-import { visit as visit18 } from "unist-util-visit";
+import { visit as visit19 } from "unist-util-visit";
 var externalPrefixes = ["https://", "http://", "mailto:", "tel:"];
 function isExternal(url) {
   return externalPrefixes.some((prefix) => url.startsWith(prefix));
@@ -3235,7 +3348,7 @@ function resolveLink(url, sourcePathname) {
 }
 function collectLinks(tree, sourceFile, sourcePathname) {
   const links = [];
-  visit18(tree, "link", (node) => {
+  visit19(tree, "link", (node) => {
     const resolved = resolveLink(node.url, sourcePathname);
     if (!resolved) {
       return;
@@ -3267,8 +3380,8 @@ function collectAnchorIds(tree) {
       anchorIds.add(id);
     }
   };
-  visit18(tree, "mdxJsxFlowElement", collectAnchorId);
-  visit18(tree, "mdxJsxTextElement", collectAnchorId);
+  visit19(tree, "mdxJsxFlowElement", collectAnchorId);
+  visit19(tree, "mdxJsxTextElement", collectAnchorId);
   return anchorIds;
 }
 function validateLinks(links, pageMap, docPropIds, anchorIds) {
@@ -3475,6 +3588,7 @@ var SearchIndexer = class {
           gfm: true,
           interpolateFrontmatter: frontmatter,
           mdx: true,
+          plugins: [remarkSerializeJsxKnowledge],
           removeJsx: true,
           removeMermaidCodeBlocks: true
         });
@@ -4076,7 +4190,7 @@ import remarkMdxFrontmatter from "remark-mdx-frontmatter";
 // src/docs-plugin/rehype/rehype-slug.ts
 import { headingRank } from "hast-util-heading-rank";
 import { toString as toString3 } from "hast-util-to-string";
-import { visit as visit19 } from "unist-util-visit";
+import { visit as visit20 } from "unist-util-visit";
 var emptyOptions2 = {};
 var rehypeSlug = (options) => {
   const settings = options || emptyOptions2;
@@ -4087,7 +4201,7 @@ var rehypeSlug = (options) => {
   const slugGenerator = new SlugGenerator();
   return (tree) => {
     slugGenerator.reset();
-    visit19(tree, "element", function(node) {
+    visit20(tree, "element", function(node) {
       if (headingRank(node) && !node.properties.id && allowedHeadings.has(node.tagName)) {
         node.properties.id = prefix + slugGenerator.createSlug(toString3(node));
       }
@@ -4447,6 +4561,7 @@ function getRemarkPlugins() {
     remarkFrontmatterDescription,
     remarkSpoilers,
     remarkSteps,
+    remarkSerializeJsxRender,
     remarkExtractMeta
   ];
 }
@@ -4458,7 +4573,7 @@ import { readFile as readFile4 } from "node:fs/promises";
 import postcss from "postcss";
 import selectorParser from "postcss-selector-parser";
 import { compile } from "tailwindcss";
-import { visit as visit20 } from "unist-util-visit";
+import { visit as visit21 } from "unist-util-visit";
 import { camelCase } from "@qualcomm-ui/utils/change-case";
 async function loadStylesheetContent(id) {
   const resolveId = id === "tailwindcss" ? "tailwindcss/index.css" : id;
@@ -5133,7 +5248,7 @@ function angularDemoPlugin({
   }
   async function extractRelativeImports2(filePath) {
     try {
-      let visit22 = function(node) {
+      let visit23 = function(node) {
         if (ts2.isImportDeclaration(node)) {
           const moduleSpecifier = node.moduleSpecifier;
           if (ts2.isStringLiteral(moduleSpecifier)) {
@@ -5152,9 +5267,9 @@ function angularDemoPlugin({
             }
           }
         }
-        ts2.forEachChild(node, visit22);
+        ts2.forEachChild(node, visit23);
       };
-      var visit21 = visit22;
+      var visit22 = visit23;
       const content = await readFile5(filePath, "utf-8");
       const sourceFile = ts2.createSourceFile(
         filePath,
@@ -5164,7 +5279,7 @@ function angularDemoPlugin({
         ts2.ScriptKind.TS
       );
       const relativeImports = [];
-      visit22(sourceFile);
+      visit23(sourceFile);
       return relativeImports;
     } catch (error) {
       logDev(
@@ -5187,16 +5302,16 @@ function angularDemoPlugin({
   }
   function stripImports(code, fileName) {
     try {
-      let visit22 = function(node) {
+      let visit23 = function(node) {
         if (ts2.isImportDeclaration(node)) {
           importRanges.push({
             end: node.getEnd(),
             start: node.getFullStart()
           });
         }
-        ts2.forEachChild(node, visit22);
+        ts2.forEachChild(node, visit23);
       };
-      var visit21 = visit22;
+      var visit22 = visit23;
       const sourceFile = ts2.createSourceFile(
         fileName,
         code,
@@ -5205,7 +5320,7 @@ function angularDemoPlugin({
         ts2.ScriptKind.TS
       );
       const importRanges = [];
-      visit22(sourceFile);
+      visit23(sourceFile);
       return importRanges.map((range) => {
         let endPos = range.end;
         if (code[endPos] === "\n") {
@@ -5317,7 +5432,7 @@ function angularDemoPlugin({
     let templateUrl = null;
     let hasDefaultExport = false;
     const importsFromAst = [];
-    function visit21(node) {
+    function visit22(node) {
       if (ts2.isImportDeclaration(node)) {
         importsFromAst.push(node.getFullText(sourceFile).trim());
       }
@@ -5365,9 +5480,9 @@ function angularDemoPlugin({
       if (ts2.isExportAssignment(node) && !node.isExportEquals) {
         hasDefaultExport = true;
       }
-      ts2.forEachChild(node, visit21);
+      ts2.forEachChild(node, visit22);
     }
-    visit21(sourceFile);
+    visit22(sourceFile);
     return {
       componentClass,
       hasDefaultExport,
@@ -5824,7 +5939,7 @@ function extractImports(code, fileName) {
   );
   const thirdPartyImports = [];
   const relativeImports = [];
-  function visit21(node) {
+  function visit22(node) {
     if (ts3.isImportDeclaration(node)) {
       const importSpec = parseImportDeclaration(node, fileName);
       if (importSpec) {
@@ -5835,9 +5950,9 @@ function extractImports(code, fileName) {
         }
       }
     }
-    ts3.forEachChild(node, visit21);
+    ts3.forEachChild(node, visit22);
   }
-  visit21(sourceFile);
+  visit22(sourceFile);
   return { relativeImports, thirdPartyImports };
 }
 function getScriptKind(fileName) {
@@ -6459,16 +6574,16 @@ function reactDemoPlugin({
   }
   function stripImports(code, fileName) {
     try {
-      let visit22 = function(node) {
+      let visit23 = function(node) {
         if (ts4.isImportDeclaration(node)) {
           importRanges.push({
             end: node.getEnd(),
             start: node.getFullStart()
           });
         }
-        ts4.forEachChild(node, visit22);
+        ts4.forEachChild(node, visit23);
       };
-      var visit21 = visit22;
+      var visit22 = visit23;
       const sourceFile = ts4.createSourceFile(
         fileName,
         code,
@@ -6477,7 +6592,7 @@ function reactDemoPlugin({
         getScriptKind(fileName)
       );
       const importRanges = [];
-      visit22(sourceFile);
+      visit23(sourceFile);
       return importRanges.map((range) => {
         let endPos = range.end;
         if (code[endPos] === "\n") {
@@ -6534,6 +6649,7 @@ export {
   getShikiTransformers,
   isCssAsset,
   isDemoFile,
+  isSerializeJsxBlock,
   isSpoilerBlock,
   isStepBlock,
   navMetaSchema,
@@ -6554,6 +6670,8 @@ export {
   remarkRemoveJsx,
   remarkRemoveMermaidCodeBlocks,
   remarkSelfLinkHeadings,
+  remarkSerializeJsxKnowledge,
+  remarkSerializeJsxRender,
   remarkSpoilers,
   remarkSteps,
   routeMetaSchema