@xyd-js/content 0.0.0-build-1760f84-20251129221538 → 0.0.0-build-11974d8-20251130234931

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyd-js/content",
-  "version": "0.0.0-build-1760f84-20251129221538",
+  "version": "0.0.0-build-11974d8-20251130234931",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",
@@ -38,14 +38,14 @@
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.3",
     "vfile-matter": "^5.0.1",
-    "@xyd-js/context": "0.0.0-build-1760f84-20251129221538",
-    "@xyd-js/core": "0.0.0-build-1760f84-20251129221538",
-    "@xyd-js/gql": "0.0.0-build-1760f84-20251129221538",
-    "@xyd-js/openapi": "0.0.0-build-1760f84-20251129221538",
-    "@xyd-js/sources": "0.0.0-build-1760f84-20251129221538"
+    "@xyd-js/context": "0.0.0-build-11974d8-20251130234931",
+    "@xyd-js/core": "0.0.0-build-11974d8-20251130234931",
+    "@xyd-js/openapi": "0.0.0-build-11974d8-20251130234931",
+    "@xyd-js/gql": "0.0.0-build-11974d8-20251130234931",
+    "@xyd-js/sources": "0.0.0-build-11974d8-20251130234931"
   },
   "peerDependencies": {
-    "@xyd-js/components": "0.0.0-build-1760f84-20251129221538"
+    "@xyd-js/components": "0.0.0-build-11974d8-20251130234931"
   },
   "devDependencies": {
     "@types/node": "^22.14.1",

package/packages/md/plugins/index.ts

@@ -90,11 +90,75 @@ export function remarkFunctionPlugins(settings?: Settings): Plugin[] {
 let rehypeMermaid
 async function getMermaidPlugin() {
   if (!rehypeMermaid) {
-    rehypeMermaid = (await import('rehype-mermaid')).default
+    rehypeMermaid = (await import("rehype-mermaid")).default
   }
   return rehypeMermaid
 }
 
+let rehypeGraphviz
+let graphviz
+
+async function getGraphvizPlugin() {
+  if (!rehypeGraphviz) {
+    const graphizMod = (await import("@hpcc-js/wasm")).Graphviz
+    graphviz = await graphizMod.load()
+
+    rehypeGraphviz = (await import("rehype-graphviz")).default
+  }
+
+  return [
+    rehypeGraphviz,
+    {
+      graphviz
+    }
+  ]
+}
+
+/**
+ * Check if a specific diagram type is enabled in settings
+ */
+function isDiagramTypeEnabled(settings: Settings | undefined, diagramType: 'mermaid' | 'graphviz'): boolean {
+  const diagrams = settings?.integrations?.diagrams;
+
+  if (!diagrams) {
+    return false;
+  }
+
+  // If diagrams is just true, all types are enabled
+  if (diagrams === true) {
+    return true;
+  }
+
+  // If diagrams is an array, check if the type is included
+  if (Array.isArray(diagrams) && diagrams.includes(diagramType)) {
+    return true;
+  }
+
+  // If diagrams is an object, check if the type is configured
+  if (typeof diagrams === 'object' && !Array.isArray(diagrams)) {
+    if (diagramType in diagrams) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * Get options for a specific diagram type from settings
+ */
+function getDiagramOptions(settings: Settings | undefined, diagramType: 'mermaid' | 'graphviz') {
+  const diagrams = settings?.integrations?.diagrams;
+
+  if (!diagrams || typeof diagrams !== 'object' || Array.isArray(diagrams)) {
+    return {};
+  }
+
+  return diagrams[diagramType] && typeof diagrams[diagramType] === 'object'
+    ? diagrams[diagramType]
+    : {};
+}
+
 export async function thirdPartyRehypePlugins(settings?: Settings) {
   const plugins = [
     [rehypeRaw, {
@@ -103,10 +167,16 @@ export async function thirdPartyRehypePlugins(settings?: Settings) {
     rehypeKatex,
   ]
 
-  if (settings?.integrations?.diagrams) {
-    const options = typeof settings.integrations.diagrams === 'object' ? settings.integrations.diagrams : {};
+  // Add mermaid plugin if enabled
+  if (isDiagramTypeEnabled(settings, 'mermaid')) {
+    const mermaidOptions = getDiagramOptions(settings, 'mermaid');
+    plugins.push([await getMermaidPlugin(), mermaidOptions])
+  }
 
-    plugins.push([await getMermaidPlugin(), options])
+  // Add graphviz plugin if enabled
+  if (isDiagramTypeEnabled(settings, 'graphviz')) {
+    const graphvizPlugin = await getGraphvizPlugin()
+    plugins.push(graphvizPlugin)
   }
 
   return plugins

package/packages/md/search/index.ts

@@ -18,10 +18,14 @@ import { mdParameters } from '../plugins/utils/mdParameters'
 
 export async function mapSettingsToDocSections(xydSettings: Settings) {
     const pages = flatPages(xydSettings.navigation?.sidebar || [], {})
-        .map(page => ({
-            name: page,
-            path: path.join(process.cwd(), page)
-        }))
+        .map(page => {
+            let baseName = xydSettings.advanced?.basename || ""
+            
+            return {
+                name: path.join(baseName, page),
+                path: path.join(process.cwd(), page),
+            }
+        })
 
     return await processSections(pages, xydSettings)
 }
@@ -76,8 +80,9 @@ export async function mapContentToDocSections(
                                 console.error("Multiple h1 found")
                             }
 
+                            const pageUrl = route.startsWith("/") ? route : `/${route}`;
                             rootSection.pageId = slug
-                            rootSection.pageUrl = `/${route}`
+                            rootSection.pageUrl = pageUrl
                             rootSection.pageTitle = heading
                             rootSection.headingLevel = 1
                             rootSection.headingTitle = heading

package/tsup.config.ts

@@ -24,7 +24,9 @@ const config: Options = {
         // options.external = ['node:fs/promises']; // Mark 'node:fs/promises' as external
         // options.loader = { '.js': 'jsx' }; // Ensure proper handling of .js files
         options.external = [
-            'rehype-mermaid'
+            "rehype-mermaid",
+            "rehype-graphviz",
+            "@hpcc-js/wasm",
         ]
     },
 };