czon 0.6.2 → 0.6.4

package/dist/process/summary.js

@@ -70,7 +70,7 @@ npx czon@latest ls-files
 
    基于内容，进行 MBTI 分析，分析内容创作者的性格倾向和行为特征，必须给出每个倾向维度的证据。
 
-   基于内容，进行价值观分析，探讨内容所反映的核心价值观和信念体系，给出价值观的排序和具体例子。
+   基于内容，进行施瓦茨价值观分析，探讨内容所反映的核心价值观和信念体系，给出价值观的排序和具体例子。
 
    基于内容，进行精神分析 (包括心理防御机制、潜意识动机等)，必须为每个评价标签给出置信度，给出具体例子，解释其作用和影响。
 

package/dist/process/template.js

@@ -63,13 +63,15 @@ const spiderStaticSiteGenerator = async () => {
         for (const lang of metadata_1.MetaData.options.langs || []) {
             const markdown = await fs.readFile(path.join(paths_1.CZON_SRC_DIR, lang, file.path), 'utf-8');
             const { frontmatter, body } = (0, frontmatter_1.parseFrontmatter)(markdown);
-            const markdownHtml = (0, convertMarkdownToHtml_1.convertMarkdownToHtml)(file.path, lang, body);
-            contents.push({
+            const article = {
                 lang,
                 file,
-                body: markdownHtml,
+                body: '',
                 frontmatter,
-            });
+                headings: [],
+            };
+            (0, convertMarkdownToHtml_1.convertMarkdownToHtml)(article, file.path, lang, body);
+            contents.push(article);
         }
     }
     while (queue.length > 0) {

package/dist/ssg/ContentPage.js

@@ -25,7 +25,7 @@ const ContentPage = props => {
     // 查找指向当前文章的其他文章
     const thisPath = (0, node_path_1.resolve)('/', props.file.path);
     const referencedFiles = props.ctx.site.files.filter(f => f.links.some(link => (0, node_path_1.resolve)('/', (0, node_path_1.dirname)(f.path), link) === thisPath));
-    return (react_1.default.createElement("html", { lang: props.lang, style: { background: 'black', overflow: 'hidden' } },
+    return (react_1.default.createElement("html", { lang: props.lang },
         react_1.default.createElement("head", null,
             react_1.default.createElement("meta", { charSet: "UTF-8" }),
             react_1.default.createElement("meta", { name: "viewport", content: "width=device-width, initial-scale=1.0" }),
@@ -49,8 +49,15 @@ const ContentPage = props => {
                 } })),
         react_1.default.createElement("body", null,
             react_1.default.createElement(PageLayout_1.PageLayout, { header: react_1.default.createElement(CZONHeader_1.CZONHeader, { ctx: props.ctx, lang: props.lang, file: props.file }), navigator: react_1.default.createElement("nav", { className: "sidebar hidden md:block" },
-                    react_1.default.createElement(Navigator_1.Navigator, { ctx: props.ctx, file: props.file, lang: props.lang })), main: react_1.default.createElement("main", { className: "content" },
+                    react_1.default.createElement(Navigator_1.Navigator, { ctx: props.ctx, file: props.file, lang: props.lang })), rightSidebar: react_1.default.createElement("aside", null,
+                    react_1.default.createElement("h2", { className: "text-2xl font-semibold mb-2" }, "Table of Contents"),
+                    props.content.headings.map(heading => (react_1.default.createElement("a", { key: heading.id, href: `#${heading.id}`, className: `block ps-${heading.depth * 4} mb-2` }, heading.text)))), main: react_1.default.createElement("main", { className: "content" },
                     react_1.default.createElement(ContentMeta_1.ContentMeta, { ctx: props.ctx, file: props.file, lang: props.lang }),
+                    react_1.default.createElement("div", { className: "border-b mb-4 pb-2 xl:hidden" },
+                        react_1.default.createElement("h2", { className: "text-2xl font-semibold mb-2" }, "Table of Contents"),
+                        props.content.headings.map(heading => (react_1.default.createElement("a", { key: heading.id, href: `#${heading.id}`, 
+                            // 按照 heading.depth 设置缩进
+                            className: `block ps-${heading.depth * 4} mb-2` }, heading.text)))),
                     react_1.default.createElement("div", { className: "content-body" },
                         react_1.default.createElement("article", { dangerouslySetInnerHTML: { __html: props.content.body } }),
                         relatedContents.length > 0 && (react_1.default.createElement(react_1.default.Fragment, null,
@@ -69,7 +76,7 @@ const ContentPage = props => {
                             }))))),
                     react_1.default.createElement("footer", { className: "footer" },
                         react_1.default.createElement(LanguageSwitcher_1.LanguageSwitcher, { ctx: props.ctx, lang: props.lang, file: props.file }),
-                        react_1.default.createElement(CZONFooter_1.CZONFooter, null))), footer: null }),
+                        react_1.default.createElement(CZONFooter_1.CZONFooter, null))) }),
             react_1.default.createElement("script", { id: "hljs-lib", src: "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/highlight.min.js", defer: true }),
             react_1.default.createElement("script", null, `
         document.getElementById('hljs-lib').addEventListener('load', () => {

package/dist/ssg/IndexPage.js

@@ -70,7 +70,7 @@ const IndexPage = props => {
                     })),
                     react_1.default.createElement("footer", null,
                         react_1.default.createElement(LanguageSwitcher_1.LanguageSwitcher, { ctx: props.ctx, lang: props.lang }),
-                        react_1.default.createElement(CZONFooter_1.CZONFooter, null))), footer: null }))));
+                        react_1.default.createElement(CZONFooter_1.CZONFooter, null))) }))));
     // TODO: 渲染多语言首页列表
     // return (
     //   <div>

package/dist/ssg/layouts/PageLayout.js

@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageLayout = void 0;
 const react_1 = __importDefault(require("react"));
 const PageLayout = props => {
+    const hasRightSidebar = !!props.rightSidebar;
     return (
     // 100% 宽度，100% 高度，垂直方向排列
     react_1.default.createElement("div", { className: "flex flex-col w-full h-full overflow-hidden items-stretch" },
-        react_1.default.createElement("header", { className: "shrink-0" }, props.header),
-        react_1.default.createElement("div", { className: "flex flex-col overflow-auto md:flex-row flex-1 md:overflow-hidden md:items-stretch" },
-            react_1.default.createElement("nav", { className: "md:overflow-auto md:shrink-0" }, props.navigator),
-            react_1.default.createElement("main", { className: "md:flex-1 md:overflow-auto" }, props.main)),
-        react_1.default.createElement("footer", { className: "shrink-0" }, props.footer)));
+        react_1.default.createElement("header", { className: "fixed h-18 top-0 left-0 right-0 z-10 shrink-0" }, props.header),
+        react_1.default.createElement("div", { className: "flex mt-18 flex-col overflow-auto md:flex-row flex-1 md:overflow-hidden md:items-stretch" },
+            props.navigator && (react_1.default.createElement("nav", { className: "fixed left-0 top-18 bottom-0 w-88 z-9 hidden lg:block overflow-auto shrink-0" }, props.navigator)),
+            react_1.default.createElement("main", { className: `w-full lg:pl-88 xl:pr-88 overflow-auto` }, props.main),
+            hasRightSidebar && (react_1.default.createElement("aside", { className: "fixed right-0 top-18 bottom-0 w-88 hidden xl:block overflow-auto shrink-0 sidebar-right" }, props.rightSidebar)))));
 };
 exports.PageLayout = PageLayout;
 //# sourceMappingURL=PageLayout.js.map

package/dist/ssg/style.js

@@ -40,7 +40,6 @@ html, body {
   margin: 0;
   padding: 0;
   width: 100%;
-  height: 100%;
 }
 
 html[lang='ar-SA'] {
@@ -56,16 +55,24 @@ html:not(.dark) body {
   color: var(--text-primary);
   background: var(--bg-secondary);
 }
+.czon-header {
+  background: var(--bg-secondary);
+}
+.anchor-heading {
+  scroll-margin-top: 72px;
+}
 
-      .sidebar {
-        width: 280px;
-        background: var(--sidebar-bg);
-        border-right: 1px solid var(--border-color);
-        padding: 2rem 1rem;
-        overflow-y: auto;
+       .sidebar {
+         background: var(--sidebar-bg);
+         border-right: 1px solid var(--border-color);
+         padding: 2rem 1rem;
+       }
 
-        flex-shrink: 0;
-      }
+       .sidebar-right {
+         background: var(--sidebar-bg);
+         border-left: 1px solid var(--border-color);
+         padding: 2rem 1rem;
+       }
 
       .sidebar-header {
         margin-bottom: 2rem;
@@ -122,12 +129,13 @@ html:not(.dark) body {
         color: var(--text-primary);
       }
 
-      .content {
-        flex: 1;
-        margin-inline-start: 80px;
-        padding: 3rem 4rem;
-        max-width: 900px;
-      }
+       .content {
+         flex: 1;
+         padding: 3rem 2rem;
+         max-width: 1200px;
+         width: 100%;
+         box-sizing: border-box;
+       }
 
       .content-header {
         margin-bottom: 2rem;
@@ -170,6 +178,24 @@ html:not(.dark) body {
         color: var(--text-primary);
       }
 
+      .content-body h4 {
+        font-size: 1.25rem;
+        margin: 1.25rem 0 0.625rem;
+        color: var(--text-primary);
+      }
+      
+      .content-body h5 {
+        font-size: 1.125rem;
+        margin: 1.125rem 0 0.5625rem;
+        color: var(--text-primary);
+      }
+
+      .content-body h6 {
+        font-size: 1rem;
+        margin: 1rem 0 0.5rem;
+        color: var(--text-primary);
+      }
+
       .content-body p {
         margin: 1rem 0;
       }
@@ -285,21 +311,22 @@ html:not(.dark) body {
         font-size: 0.875rem;
       }
 
-      @media (max-width: 768px) {
+       @media (max-width: 768px) {
 
-        .sidebar {
-          width: 100%;
-          height: auto;
-          position: static;
-          border-right: none;
-          border-bottom: 1px solid var(--border-color);
-        }
+         .sidebar {
+           width: 100%;
+           height: auto;
+           position: static;
+           border-right: none;
+           border-bottom: 1px solid var(--border-color);
+         }
 
-        .content {
-          margin-left: 0;
-          padding: 2rem;
-        }
-      }
+         .content {
+           margin-left: 0;
+           padding: 1.5rem;
+           max-width: 100%;
+         }
+       }
       
       /* Mermaid diagram styles */
       .mermaid-diagram {

package/dist/utils/convertMarkdownToHtml.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertMarkdownToHtml = void 0;
 const highlight_js_1 = __importDefault(require("highlight.js"));
 const marked_1 = require("marked");
-const marked_katex_extension_1 = __importDefault(require("marked-katex-extension"));
 const marked_footnote_1 = __importDefault(require("marked-footnote"));
-const metadata_1 = require("../metadata");
+const marked_katex_extension_1 = __importDefault(require("marked-katex-extension"));
 const path_1 = require("path");
+const metadata_1 = require("../metadata");
 // 辅助函数：转义 HTML 特殊字符
 function escapeHtml(unsafe) {
     return unsafe
@@ -26,7 +26,8 @@ marked_1.marked.use((0, marked_footnote_1.default)());
  * @param mdContent Markdown 内容字符串
  * @returns 转换后的 HTML 字符串
  */
-const convertMarkdownToHtml = (path, lang, mdContent) => {
+const convertMarkdownToHtml = (article, path, lang, mdContent) => {
+    const { headings } = article;
     const sourceFileMeta = metadata_1.MetaData.files.find(f => f.path === path);
     // 创建自定义渲染器
     const renderer = new marked_1.marked.Renderer();
@@ -87,6 +88,25 @@ const convertMarkdownToHtml = (path, lang, mdContent) => {
         const imagePath = (0, path_1.join)((0, path_1.dirname)(path), image.href);
         return `<img src="${(0, path_1.join)('..', '__raw__', imagePath)}" alt="${image.text}" />`;
     };
+    renderer.heading = function (heading) {
+        // 添加 id 属性以支持锚点链接
+        const id = (function () {
+            // 生成唯一的 ID，避免重复
+            for (let i = 0;; i++) {
+                const potentialId = i === 0 ? heading.text : `${heading.text}-${i}`;
+                if (!headings.find(h => h.id === potentialId)) {
+                    return potentialId;
+                }
+            }
+        })();
+        headings.push({
+            id,
+            text: heading.text,
+            depth: heading.depth,
+        });
+        // TODO: 处理重复的标题文本以避免重复的 id
+        return `<h${heading.depth} id="${id}" class="anchor-heading">${heading.text}</h${heading.depth}>`;
+    };
     // 重写代码块渲染器以支持 Mermaid - 使用 any 类型绕过类型检查
     renderer.code = function (code, language, isEscaped) {
         // 在 marked 17+ 中，code 参数是一个对象，包含 text 和 lang 属性
@@ -137,18 +157,12 @@ const convertMarkdownToHtml = (path, lang, mdContent) => {
             xhtml: false,
             async: false, // 强制同步模式
         });
-        // 如果结果是 Promise，等待它（虽然我们设置了 async: false）
-        if (result && typeof result.then === 'function') {
-            // 这不应该发生，但如果发生了，返回一个占位符
-            console.warn('marked.parse returned a Promise despite async: false');
-            return '<!-- Markdown conversion in progress -->';
-        }
-        return result;
+        article.body = result;
     }
     catch (error) {
         console.error('Error converting Markdown to HTML:', error);
         const errorMessage = error instanceof Error ? error.message : String(error);
-        return `<div class="error">Error converting Markdown: ${errorMessage}</div>`;
+        article.body = `<div class="error">Error converting Markdown: ${errorMessage}</div>`;
     }
 };
 exports.convertMarkdownToHtml = convertMarkdownToHtml;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "czon",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "CZone - AI enhanced Markdown content engine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",