@windrun-huaiin/third-ui 31.2.0 → 31.3.1

package/dist/fuma/fuma-page-genarator.d.ts

@@ -5,7 +5,6 @@ interface FumaPageParams {
     sourceKey: string;
     mdxContentSource: any | (() => Promise<any>);
     getMDXComponents: () => any;
-    mdxSourceDir: string;
     githubBaseUrl?: string;
     copyButtonComponent?: ReactElement<LLMCopyButtonProps, typeof LLMCopyButton>;
     supportedLocales?: string[];
@@ -16,7 +15,7 @@ interface FumaPageParams {
     localePrefixAsNeeded?: boolean;
     defaultLocale?: string;
 }
-export declare function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, supportedLocales, showBreadcrumb, showTableOfContent, tocRenderMode, showTableOfContentPopover, localePrefixAsNeeded, defaultLocale, }: FumaPageParams): {
+export declare function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, githubBaseUrl, copyButtonComponent, supportedLocales, showBreadcrumb, showTableOfContent, tocRenderMode, showTableOfContentPopover, localePrefixAsNeeded, defaultLocale, }: FumaPageParams): {
     Page: ({ params }: {
         params: Promise<{
             locale: string;

package/dist/fuma/fuma-page-genarator.js

@@ -10,8 +10,9 @@ var navigation = require('next/navigation');
 var tocClerkPortable = require('./mdx/toc-clerk-portable.js');
 var lib = require('@windrun-huaiin/base-ui/lib');
 
-function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, tocRenderMode = 'portable-clerk', showTableOfContentPopover = false, localePrefixAsNeeded = true, defaultLocale = 'en', }) {
+function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, githubBaseUrl, copyButtonComponent, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, tocRenderMode = 'portable-clerk', showTableOfContentPopover = false, localePrefixAsNeeded = true, defaultLocale = 'en', }) {
     var _a;
+    const resolvedMdxSourceDir = `src/mdx/${sourceKey}`;
     const isLocalMdDebugEnabled = ((_a = process.env.LOCAL_MD_DEBUG) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
     const now = () => (typeof performance !== 'undefined' ? performance.now() : Date.now());
     const durationMs = (startedAt) => Number((now() - startedAt).toFixed(1));
@@ -52,7 +53,7 @@ function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSour
             if (!page$1) {
                 navigation.notFound();
             }
-            const path = githubBaseUrl ? `${mdxSourceDir}/${page$1.path}` : undefined;
+            const path = githubBaseUrl ? `${resolvedMdxSourceDir}/${page$1.path}` : undefined;
             const tocFooterElement = (jsxRuntime.jsx(tocFooterWrapper.TocFooterWrapper, { lastModified: page$1.data.date, copyButtonComponent: copyButtonComponent
                     ? React.cloneElement(copyButtonComponent, { sourceKey })
                     : undefined, editPath: path, githubBaseUrl: githubBaseUrl }));
@@ -118,7 +119,7 @@ function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSour
                 };
             }
             const baseUrl = process.env.NEXT_PUBLIC_BASE_URL;
-            const baseRoute = mdxSourceDir.replace('src/mdx/', '');
+            const baseRoute = resolvedMdxSourceDir.replace('src/mdx/', '');
             // build the current page path
             const currentPath = slug ? slug.join('/') : '';
             const localizedPath = utils.getAsNeededLocalizedUrl(locale || defaultLocale, `/${baseRoute}${currentPath ? `/${currentPath}` : ''}`, localePrefixAsNeeded, defaultLocale);

package/dist/fuma/fuma-page-genarator.mjs

@@ -8,8 +8,9 @@ import { notFound } from 'next/navigation';
 import { PortableClerkTOC, PortableClerkTOCTitle } from './mdx/toc-clerk-portable.mjs';
 import { themeSvgIconColor } from '@windrun-huaiin/base-ui/lib';
 
-function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSourceDir, githubBaseUrl, copyButtonComponent, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, tocRenderMode = 'portable-clerk', showTableOfContentPopover = false, localePrefixAsNeeded = true, defaultLocale = 'en', }) {
+function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, githubBaseUrl, copyButtonComponent, supportedLocales = ['en'], showBreadcrumb = true, showTableOfContent = true, tocRenderMode = 'portable-clerk', showTableOfContentPopover = false, localePrefixAsNeeded = true, defaultLocale = 'en', }) {
     var _a;
+    const resolvedMdxSourceDir = `src/mdx/${sourceKey}`;
     const isLocalMdDebugEnabled = ((_a = process.env.LOCAL_MD_DEBUG) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
     const now = () => (typeof performance !== 'undefined' ? performance.now() : Date.now());
     const durationMs = (startedAt) => Number((now() - startedAt).toFixed(1));
@@ -50,7 +51,7 @@ function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSour
             if (!page) {
                 notFound();
             }
-            const path = githubBaseUrl ? `${mdxSourceDir}/${page.path}` : undefined;
+            const path = githubBaseUrl ? `${resolvedMdxSourceDir}/${page.path}` : undefined;
             const tocFooterElement = (jsx(TocFooterWrapper, { lastModified: page.data.date, copyButtonComponent: copyButtonComponent
                     ? cloneElement(copyButtonComponent, { sourceKey })
                     : undefined, editPath: path, githubBaseUrl: githubBaseUrl }));
@@ -116,7 +117,7 @@ function createFumaPage({ sourceKey, mdxContentSource, getMDXComponents, mdxSour
                 };
             }
             const baseUrl = process.env.NEXT_PUBLIC_BASE_URL;
-            const baseRoute = mdxSourceDir.replace('src/mdx/', '');
+            const baseRoute = resolvedMdxSourceDir.replace('src/mdx/', '');
             // build the current page path
             const currentPath = slug ? slug.join('/') : '';
             const localizedPath = getAsNeededLocalizedUrl(locale || defaultLocale, `/${baseRoute}${currentPath ? `/${currentPath}` : ''}`, localePrefixAsNeeded, defaultLocale);

package/dist/fuma/mdx/toc-footer-wrapper.js

@@ -4,9 +4,12 @@
 var jsxRuntime = require('react/jsx-runtime');
 var tocBase = require('./toc-base.js');
 
+function joinUrlPath(baseUrl, path) {
+    return `${baseUrl.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+}
 function TocFooterWrapper({ lastModified, editPath, githubBaseUrl, copyButtonComponent }) {
     const showEdit = githubBaseUrl && editPath;
-    return (jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-2 items-start m-4", children: [jsxRuntime.jsx(tocBase.LastUpdatedDate, { date: lastModified }), copyButtonComponent, showEdit && jsxRuntime.jsx(tocBase.EditOnGitHub, { url: `${githubBaseUrl}${editPath}` })] }));
+    return (jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-2 items-start m-4", children: [jsxRuntime.jsx(tocBase.LastUpdatedDate, { date: lastModified }), copyButtonComponent, showEdit && jsxRuntime.jsx(tocBase.EditOnGitHub, { url: joinUrlPath(githubBaseUrl, editPath) })] }));
 }
 
 exports.TocFooterWrapper = TocFooterWrapper;

package/dist/fuma/mdx/toc-footer-wrapper.mjs

@@ -2,9 +2,12 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { LastUpdatedDate, EditOnGitHub } from './toc-base.mjs';
 
+function joinUrlPath(baseUrl, path) {
+    return `${baseUrl.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+}
 function TocFooterWrapper({ lastModified, editPath, githubBaseUrl, copyButtonComponent }) {
     const showEdit = githubBaseUrl && editPath;
-    return (jsxs("div", { className: "flex flex-col gap-y-2 items-start m-4", children: [jsx(LastUpdatedDate, { date: lastModified }), copyButtonComponent, showEdit && jsx(EditOnGitHub, { url: `${githubBaseUrl}${editPath}` })] }));
+    return (jsxs("div", { className: "flex flex-col gap-y-2 items-start m-4", children: [jsx(LastUpdatedDate, { date: lastModified }), copyButtonComponent, showEdit && jsx(EditOnGitHub, { url: joinUrlPath(githubBaseUrl, editPath) })] }));
 }
 
 export { TocFooterWrapper };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windrun-huaiin/third-ui",
-  "version": "31.2.0",
+  "version": "31.3.1",
   "description": "Third-party integrated UI components for windrun-huaiin projects",
   "exports": {
     "./clerk": {
@@ -243,9 +243,9 @@
     "tslib": "^2.8.1",
     "unified": "^11.0.5",
     "zod": "^4.3.6",
-    "@windrun-huaiin/lib": "^31.0.1",
+    "@windrun-huaiin/contracts": "^31.0.0",
     "@windrun-huaiin/base-ui": "^31.0.0",
-    "@windrun-huaiin/contracts": "^31.0.0"
+    "@windrun-huaiin/lib": "^31.0.2"
   },
   "peerDependencies": {
     "clsx": "^2.1.1",

package/src/fuma/fuma-page-genarator.tsx

@@ -25,10 +25,6 @@ interface FumaPageParams {
    * The  mdx components handler, refer to fumadocs 
    */
   getMDXComponents: () => any;
-  /* 
-   * The source directory of the mdx content, used to generate the edit path
-   */
-  mdxSourceDir: string;
   /* 
    * The github base url, used to generate the edit path, if not provided, the edit path will not be shown
    */
@@ -79,7 +75,6 @@ export function createFumaPage({
   sourceKey,
   mdxContentSource,
   getMDXComponents,
-  mdxSourceDir,
   githubBaseUrl,
   copyButtonComponent,
   supportedLocales = ['en'],
@@ -90,6 +85,7 @@ export function createFumaPage({
   localePrefixAsNeeded = true,
   defaultLocale = 'en',
 }: FumaPageParams) {
+  const resolvedMdxSourceDir = `src/mdx/${sourceKey}`;
   const isLocalMdDebugEnabled = process.env.LOCAL_MD_DEBUG?.toLowerCase() === 'true';
   const now = () => (typeof performance !== 'undefined' ? performance.now() : Date.now());
   const durationMs = (startedAt: number) => Number((now() - startedAt).toFixed(1));
@@ -132,7 +128,7 @@ export function createFumaPage({
       notFound();
     }
 
-    const path = githubBaseUrl ? `${mdxSourceDir}/${page.path}` : undefined;
+    const path = githubBaseUrl ? `${resolvedMdxSourceDir}/${page.path}` : undefined;
     const tocFooterElement = (
       <TocFooterWrapper
         lastModified={page.data.date}
@@ -222,7 +218,7 @@ export function createFumaPage({
       };
     }
     const baseUrl = process.env.NEXT_PUBLIC_BASE_URL!;
-    const baseRoute = mdxSourceDir.replace('src/mdx/', '');
+    const baseRoute = resolvedMdxSourceDir.replace('src/mdx/', '');
     // build the current page path
     const currentPath = slug ? slug.join('/') : '';
     const localizedPath = getAsNeededLocalizedUrl(locale || defaultLocale, `/${baseRoute}${currentPath ? `/${currentPath}` : ''}`, localePrefixAsNeeded, defaultLocale);

package/src/fuma/mdx/toc-footer-wrapper.tsx

@@ -10,13 +10,17 @@ interface TocFooterProps {
   copyButtonComponent?: React.ReactNode;
 }
 
+function joinUrlPath(baseUrl: string, path: string) {
+  return `${baseUrl.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+}
+
 export function TocFooterWrapper({ lastModified, editPath, githubBaseUrl, copyButtonComponent }: TocFooterProps) {
   const showEdit = githubBaseUrl && editPath;
   return (
     <div className="flex flex-col gap-y-2 items-start m-4">
       <LastUpdatedDate date={lastModified} />
       {copyButtonComponent}
-      {showEdit && <EditOnGitHub url={`${githubBaseUrl}${editPath}`} />}
+      {showEdit && <EditOnGitHub url={joinUrlPath(githubBaseUrl, editPath)} />}
     </div>
   );
 }