zengen 0.1.2 → 0.1.32

package/src/cli.ts

@@ -24,15 +24,17 @@ program
 // 构建命令
 program
   .command('build')
-  .description('Build documentation site from Markdown files')
-  .argument('<src-dir>', 'Source directory containing Markdown files')
-  .option('-o, --out <dir>', 'Output directory for generated HTML', 'dist')
+  .description('Build documentation site from Markdown files in current directory')
   .option('-t, --template <file>', 'Custom template file')
   .option('-w, --watch', 'Watch for changes and rebuild automatically')
+  .option('-s, --serve', 'Start HTTP server for preview (requires --watch)')
+  .option('-p, --port <number>', 'HTTP server port', '3000')
+  .option('--host <host>', 'HTTP server host', 'localhost')
   .option('-v, --verbose', 'Show detailed output')
   .option('-c, --config <file>', 'Configuration file')
+  .option('--base-url <url>', 'Base URL for generated links (e.g., https://example.com/docs)')
   .option('--clean', 'Clean output directory before building')
-  .action(async (srcDir, options) => {
+  .action(async (options) => {
     try {
       // 加载配置文件
       let config: ZenConfig = {};
@@ -47,15 +49,24 @@ program
         }
       }
 
+      // 强制使用当前目录作为 src 目录，输出到 .zen/dist 目录
+      const currentDir = process.cwd();
+      const outDir = path.join(currentDir, '.zen', 'dist');
+
       // 合并命令行参数和配置
       const buildOptions = {
-        srcDir: path.resolve(srcDir),
-        outDir: path.resolve(options.out),
+        srcDir: currentDir,
+        outDir: outDir,
         template: options.template ? path.resolve(options.template) : undefined,
         watch: options.watch,
-        verbose: options.verbose
+        serve: options.serve,
+        port: parseInt(options.port, 10),
+        host: options.host,
+        verbose: options.verbose,
+        baseUrl: options.baseUrl || config.baseUrl
       };
 
+
       const builder = new ZenBuilder(config);
 
       // 验证配置
@@ -66,6 +77,12 @@ program
         process.exit(1);
       }
 
+      // 警告 --serve 选项需要 --watch 选项
+      if (options.serve && !options.watch) {
+        console.warn('⚠️ Warning: --serve option requires --watch option, ignoring --serve');
+        buildOptions.serve = false;
+      }
+
       // 清理输出目录
       if (options.clean) {
         await builder.clean(buildOptions.outDir);
@@ -86,12 +103,13 @@ program
 // 清理命令
 program
   .command('clean')
-  .description('Clean output directory')
-  .argument('<dir>', 'Directory to clean')
-  .action(async (dir) => {
+  .description('Clean .zen/dist output directory')
+  .action(async () => {
     try {
       const builder = new ZenBuilder();
-      await builder.clean(path.resolve(dir));
+      const currentDir = process.cwd();
+      const outDir = path.join(currentDir, '.zen', 'dist');
+      await builder.clean(outDir);
     } catch (error) {
       console.error('❌ Clean failed:', error);
       process.exit(1);
@@ -108,7 +126,6 @@ program
       const targetDir = path.resolve(options.dir);
 
       // 创建目录结构
-      await fs.mkdir(path.join(targetDir, 'docs'), { recursive: true });
       await fs.mkdir(path.join(targetDir, 'static'), { recursive: true });
 
       // 创建示例文档
@@ -118,9 +135,9 @@ This is an example documentation page generated by ZEN.
 
 ## Getting Started
 
-1. Write your documentation in Markdown format
-2. Run \`zengen build docs --out dist\`
-3. Open the generated HTML files in your browser
+1. Write your documentation in Markdown format in current directory
+2. Run \`zengen build\`
+3. Open the generated HTML files in your browser at .zen/dist
 
 ## Features
 
@@ -141,15 +158,13 @@ console.log('Hello ZEN!');
 *Happy documenting!*`;
 
       await fs.writeFile(
-        path.join(targetDir, 'docs', 'index.md'),
+        path.join(targetDir, 'index.md'),
         exampleDoc,
         'utf-8'
       );
 
       // 创建配置文件
       const config = {
-        srcDir: './docs',
-        outDir: './dist',
         template: undefined,
         i18n: {
           sourceLang: 'en-US',
@@ -172,9 +187,10 @@ console.log('Hello ZEN!');
           packageJson.scripts = {};
         }
 
-        packageJson.scripts.build = 'zengen build docs --out dist';
-        packageJson.scripts['build:watch'] = 'zengen build docs --out dist --watch';
-        packageJson.scripts.clean = 'zengen clean dist';
+        packageJson.scripts.build = 'zengen build';
+        packageJson.scripts['build:watch'] = 'zengen build --watch';
+        packageJson.scripts['build:serve'] = 'zengen build --watch --serve';
+        packageJson.scripts.clean = 'zengen clean';
 
         await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf-8');
       } catch (error) {
@@ -183,9 +199,10 @@ console.log('Hello ZEN!');
           name: 'zen-docs',
           version: '1.0.0',
           scripts: {
-            build: 'zengen build docs --out dist',
-            'build:watch': 'zengen build docs --out dist --watch',
-            clean: 'zengen clean dist'
+            build: 'zengen build',
+            'build:watch': 'zengen build --watch',
+            'build:serve': 'zengen build --watch --serve',
+            clean: 'zengen clean'
           }
         };
 
@@ -200,14 +217,14 @@ console.log('Hello ZEN!');
 🎉 ZEN project initialized successfully!
 
 Next steps:
-1. Add your Markdown files to the 'docs' directory
-2. Run 'npm run build' to generate the site
+1. Add your Markdown files to the current directory
+2. Run 'npm run build' to generate the site (output will be in .zen/dist)
 3. Run 'npm run build:watch' for development with auto-reload
+4. Run 'npm run build:serve' for development with auto-reload and HTTP server
 
 Project structure:
 ${targetDir}/
-├── docs/           # Your documentation files
-│   └── index.md    # Example document
+├── index.md        # Example document (in current directory)
 ├── static/         # Static assets (images, CSS, JS)
 ├── zen.config.json # Configuration file
 └── package.json    # npm scripts
@@ -247,49 +264,17 @@ Commands:
   info      Show this information
 
 Examples:
-  $ zengen build ./docs --out ./dist
-  $ zengen build ./docs --out ./dist --watch
+  $ zengen build
+  $ zengen build --watch
+  $ zengen build --watch --serve
+  $ zengen build --watch --serve --port 8080
   $ zengen init --dir ./my-docs
-  $ zengen clean ./dist
+  $ zengen clean
 
 For more help, run: zengen --help
     `);
   });
 
-// 默认命令（兼容旧格式）
-program
-  .argument('[src-dir]', 'Source directory')
-  .option('-o, --out <dir>', 'Output directory')
-  .option('-t, --template <file>', 'Custom template file')
-  .option('-w, --watch', 'Watch for changes')
-  .option('-v, --verbose', 'Show detailed output')
-  .action(async (srcDir, options) => {
-    if (!srcDir) {
-      program.help();
-      return;
-    }
-
-    try {
-      const builder = new ZenBuilder();
-
-      const buildOptions = {
-        srcDir: path.resolve(srcDir),
-        outDir: path.resolve(options.out || 'dist'),
-        template: options.template ? path.resolve(options.template) : undefined,
-        watch: options.watch,
-        verbose: options.verbose
-      };
-
-      if (options.watch) {
-        await builder.watch(buildOptions);
-      } else {
-        await builder.build(buildOptions);
-      }
-    } catch (error) {
-      console.error('❌ Build failed:', error);
-      process.exit(1);
-    }
-  });
 
 // 错误处理
 program.showHelpAfterError();

package/src/markdown.ts

@@ -171,6 +171,11 @@ export class MarkdownConverter {
       for (const entry of entries) {
         const fullPath = path.join(currentPath, entry.name);
 
+        // 忽略 .zen 目录
+        if (entry.name === '.zen') {
+          continue;
+        }
+
         if (entry.isDirectory()) {
           await scanDirectory(fullPath);
         } else if (entry.isFile() && entry.name.endsWith('.md')) {

package/src/navigation.ts

@@ -2,6 +2,19 @@ import { NavigationItem, FileInfo } from './types';
 import * as path from 'path';
 
 export class NavigationGenerator {
+  private baseUrl: string;
+
+  constructor(baseUrl: string = '') {
+    this.baseUrl = baseUrl;
+  }
+
+  /**
+   * 更新 baseUrl
+   */
+  setBaseUrl(baseUrl: string): void {
+    this.baseUrl = baseUrl;
+  }
+
   /**
    * 从文件信息生成导航结构
    */
@@ -40,9 +53,10 @@ export class NavigationGenerator {
       const title = file.metadata?.title || this.formatTitle(displayName);
 
       // 生成路径
-      const itemPath = isMarkdownFile
+      const rawPath = isMarkdownFile
         ? `/${file.relativePath.replace(/\.md$/, '.html')}`
         : `/${parts.slice(0, i + 1).join('/')}`;
+      const itemPath = this.generatePath(rawPath);
 
       if (isLastPart) {
         // 添加文件节点
@@ -76,6 +90,21 @@ export class NavigationGenerator {
     }
   }
 
+  /**
+   * 生成带 baseUrl 的路径
+   */
+  private generatePath(path: string): string {
+    if (!this.baseUrl) {
+      return path;
+    }
+
+    // 确保 baseUrl 不以斜杠结尾，路径以斜杠开头
+    const cleanBaseUrl = this.baseUrl.replace(/\/$/, '');
+    const cleanPath = path.startsWith('/') ? path : `/${path}`;
+
+    return `${cleanBaseUrl}${cleanPath}`;
+  }
+
   /**
    * 格式化标题（将连字符/下划线转换为空格并首字母大写）
    */
@@ -99,7 +128,8 @@ export class NavigationGenerator {
   generateFlat(files: FileInfo[]): NavigationItem[] {
     return files.map(file => {
       const title = file.metadata?.title || this.formatTitle(file.name);
-      const itemPath = `/${file.relativePath.replace(/\.md$/, '.html')}`;
+      const rawPath = `/${file.relativePath.replace(/\.md$/, '.html')}`;
+      const itemPath = this.generatePath(rawPath);
 
       return {
         title,
@@ -162,13 +192,14 @@ export class NavigationGenerator {
   /**
    * 生成站点地图 XML
    */
-  generateSitemap(files: FileInfo[], baseUrl: string = 'https://example.com'): string {
+  generateSitemap(files: FileInfo[], baseUrl?: string): string {
+    const effectiveBaseUrl = baseUrl || this.baseUrl || 'https://example.com';
     const urls = files.map(file => {
       const path = `/${file.relativePath.replace(/\.md$/, '.html')}`;
       const lastmod = file.metadata?.last_modified || file.metadata?.date || new Date().toISOString().split('T')[0];
 
       return `  <url>
-    <loc>${baseUrl}${path}</loc>
+    <loc>${effectiveBaseUrl}${path}</loc>
     <lastmod>${lastmod}</lastmod>
     <changefreq>weekly</changefreq>
     <priority>0.8</priority>

package/src/types.ts

@@ -4,6 +4,10 @@ export interface BuildOptions {
   template?: string;
   watch?: boolean;
   verbose?: boolean;
+  serve?: boolean;
+  port?: number;
+  host?: string;
+  baseUrl?: string;
 }
 
 export interface FileInfo {
@@ -39,6 +43,7 @@ export interface ZenConfig {
   srcDir?: string;
   outDir?: string;
   template?: string;
+  baseUrl?: string;
   i18n?: {
     sourceLang: string;
     targetLangs: string[];

package/test-build/test.md

@@ -0,0 +1 @@
+# Test Document