@mdfriday/foundry 26.3.7 → 26.3.8

package/dist/cli.js

@@ -118,6 +118,7 @@ var init_project_metadata = __esm({
       contentLinks;
       staticLink;
       fileLink;
+      baseURLStructure;
       constructor(data) {
         this.id = data.id;
         this.name = data.name;
@@ -129,6 +130,7 @@ var init_project_metadata = __esm({
         this.contentLinks = data.contentLinks || [];
         this.staticLink = data.staticLink || null;
         this.fileLink = data.fileLink || null;
+        this.baseURLStructure = data.baseURLStructure || null;
       }
       static create(data) {
         if (!data.id || !data.name) {
@@ -168,6 +170,9 @@ var init_project_metadata = __esm({
         if (this.fileLink) {
           result.fileLink = this.fileLink;
         }
+        if (this.baseURLStructure) {
+          result.baseURLStructure = this.baseURLStructure;
+        }
         return result;
       }
     };
@@ -1337,6 +1342,80 @@ var init_project = __esm({
         }
         return linkDirs;
       }
+      // ============================================================================
+      // baseURL Structure Management
+      // ============================================================================
+      /**
+       * 获取 baseURL（从 Hugo config.json）
+       */
+      async getBaseURL() {
+        const config = await this.loadConfig();
+        return config.baseURL || "/";
+      }
+      /**
+       * 设置 baseURL（更新 Hugo config.json）
+       */
+      async setBaseURL(baseURL) {
+        const config = await this.loadConfig();
+        config.baseURL = baseURL;
+        const configPath = import_path2.default.join(this.projectPath, "config.json");
+        await import_fs.promises.writeFile(configPath, JSON.stringify(config, null, 2), "utf-8");
+        this.config = config;
+      }
+      /**
+       * 解析 baseURL 路径信息
+       */
+      parseBaseURLPath(baseURL) {
+        let normalized = baseURL.trim();
+        if (normalized.startsWith("/")) {
+          normalized = normalized.slice(1);
+        }
+        if (normalized.endsWith("/")) {
+          normalized = normalized.slice(0, -1);
+        }
+        if (normalized === "") {
+          return {
+            isRoot: true,
+            pathParts: [],
+            parentParts: [],
+            finalDirName: "",
+            relativeToPublic: "."
+          };
+        }
+        const parts = normalized.split("/").filter((p2) => p2 !== "");
+        if (parts.length === 0) {
+          return {
+            isRoot: true,
+            pathParts: [],
+            parentParts: [],
+            finalDirName: "",
+            relativeToPublic: "."
+          };
+        }
+        const depth = parts.length;
+        const relativeToPublic = depth === 1 ? "." : "../".repeat(depth - 1).slice(0, -1);
+        return {
+          isRoot: false,
+          pathParts: parts,
+          parentParts: parts.slice(0, -1),
+          finalDirName: parts[parts.length - 1],
+          relativeToPublic
+        };
+      }
+      /**
+       * 获取当前 baseURL 结构信息
+       */
+      getBaseURLStructure() {
+        return this.metadata.baseURLStructure || null;
+      }
+      /**
+       * 更新 baseURL 结构记录
+       */
+      updateBaseURLStructure(info) {
+        this.metadata = this.metadata.update({
+          baseURLStructure: info
+        });
+      }
     };
   }
 });
@@ -3303,7 +3382,8 @@ var init_workspace_factory = __esm({
         });
         const defaultTheme = options.theme || "https://gohugo.net/quartz-theme.zip?version=1.2";
         const config = {
-          baseURL: "/",
+          baseURL: options.baseURL || "/",
+          // 新增：使用传入的 baseURL
           title: name,
           contentDir,
           publishDir,
@@ -3792,6 +3872,154 @@ var init_workspace_factory = __esm({
       // ============================================================================
       // Private Helpers
       // ============================================================================
+      // ============================================================================
+      // baseURL Structure Management
+      // ============================================================================
+      /**
+       * 在 public/ 目录下创建 baseURL 访问路径结构
+       * 
+       * 例如：baseURL = "/blog/" 时，在 public/ 下创建 blog/ -> . (symlink)
+       */
+      async setupBaseURLStructure(project) {
+        if (!this.fileSystemRepo) {
+          throw new Error("FileSystemRepository is required for baseURL structure");
+        }
+        const baseURL = await project.getBaseURL();
+        const pathInfo = project.parseBaseURLPath(baseURL);
+        const projectRoot = project.getPath();
+        const publicDir = import_path3.default.join(projectRoot, "public");
+        if (pathInfo.isRoot) {
+          log5.debug("baseURL is root, no structure needed");
+          return {
+            serverRoot: publicDir,
+            baseURL: "/",
+            symlinkCreated: false
+          };
+        }
+        log5.info("Creating baseURL structure in public/", {
+          baseURL,
+          pathParts: pathInfo.pathParts
+        });
+        let currentDir = publicDir;
+        for (const dirName of pathInfo.parentParts) {
+          currentDir = import_path3.default.join(currentDir, dirName);
+          if (!await this.fileSystemRepo.exists(currentDir)) {
+            await this.fileSystemRepo.createDirectory(currentDir, false);
+            log5.debug(`Created parent directory: ${dirName}`);
+          }
+        }
+        const symlinkPath = import_path3.default.join(currentDir, pathInfo.finalDirName);
+        if (await this.fileSystemRepo.exists(symlinkPath)) {
+          await this.fileSystemRepo.remove(symlinkPath, true);
+          log5.debug(`Removed existing symlink: ${symlinkPath}`);
+        }
+        const symlinkResult = await this.fileSystemRepo.createSymlink(
+          pathInfo.relativeToPublic,
+          symlinkPath
+        );
+        if (!symlinkResult.success) {
+          log5.error("Failed to create baseURL symlink", {
+            target: pathInfo.relativeToPublic,
+            link: symlinkPath,
+            error: symlinkResult.error
+          });
+          throw new Error(`Failed to create baseURL structure: ${symlinkResult.error}`);
+        }
+        log5.info("baseURL structure created successfully", {
+          symlinkPath: pathInfo.pathParts.join("/"),
+          target: pathInfo.relativeToPublic
+        });
+        project.updateBaseURLStructure({
+          baseURL,
+          createdAt: Date.now(),
+          pathParts: pathInfo.pathParts
+        });
+        await this.projectRepo.saveProjectMetadata(
+          project.getPath(),
+          project.getMetadata().toJSON()
+        );
+        return {
+          serverRoot: publicDir,
+          baseURL,
+          symlinkCreated: true
+        };
+      }
+      /**
+       * 清理 public/ 下的 baseURL 路径结构
+       */
+      async cleanBaseURLStructure(project) {
+        if (!this.fileSystemRepo) {
+          return;
+        }
+        const structureInfo = project.getBaseURLStructure();
+        if (!structureInfo || structureInfo.pathParts.length === 0) {
+          return;
+        }
+        const projectRoot = project.getPath();
+        const publicDir = import_path3.default.join(projectRoot, "public");
+        log5.info("Cleaning baseURL structure in public/", {
+          pathParts: structureInfo.pathParts
+        });
+        for (let i = structureInfo.pathParts.length; i > 0; i--) {
+          const targetPath = import_path3.default.join(
+            publicDir,
+            ...structureInfo.pathParts.slice(0, i)
+          );
+          if (await this.fileSystemRepo.exists(targetPath)) {
+            await this.fileSystemRepo.remove(targetPath, true);
+            log5.debug(`Removed: ${structureInfo.pathParts.slice(0, i).join("/")}`);
+          }
+          if (i > 1) {
+            const parentPath = import_path3.default.join(
+              publicDir,
+              ...structureInfo.pathParts.slice(0, i - 1)
+            );
+            if (await this.fileSystemRepo.exists(parentPath)) {
+              const children = await this.fileSystemRepo.readDirectory(parentPath);
+              if (children.length > 0) {
+                break;
+              }
+            }
+          }
+        }
+        project.updateBaseURLStructure(null);
+        await this.projectRepo.saveProjectMetadata(
+          project.getPath(),
+          project.getMetadata().toJSON()
+        );
+        log5.info("baseURL structure cleaned");
+      }
+      /**
+       * 确保 baseURL 结构正确
+       * 检查 baseURL 是否变化，如需要则重新创建
+       */
+      async ensureBaseURLStructure(project) {
+        const currentBaseURL = await project.getBaseURL();
+        const structureInfo = project.getBaseURLStructure();
+        const needRecreate = !structureInfo || structureInfo.baseURL !== currentBaseURL;
+        if (needRecreate) {
+          if (structureInfo) {
+            log5.info("baseURL changed, recreating structure", {
+              old: structureInfo.baseURL,
+              new: currentBaseURL
+            });
+            await this.cleanBaseURLStructure(project);
+          }
+          const result = await this.setupBaseURLStructure(project);
+          return {
+            ...result,
+            recreated: true
+          };
+        }
+        return {
+          serverRoot: import_path3.default.join(project.getPath(), "public"),
+          baseURL: currentBaseURL,
+          recreated: false
+        };
+      }
+      // ============================================================================
+      // Private Helpers
+      // ============================================================================
       createSampleContent() {
         return `---
 title: Welcome to MDFriday
@@ -4059,6 +4287,29 @@ Please specify a project name with --project <name>`);
       createIdentityStorage(workspace) {
         return this.workspaceFactory.createIdentityStorage(workspace);
       }
+      // ============================================================================
+      // baseURL Structure Management
+      // ============================================================================
+      /**
+       * 设置项目的 baseURL 路径结构
+       * 在 public/ 目录下创建对应的 symlink 结构
+       */
+      async setupProjectBaseURLStructure(project) {
+        return this.workspaceFactory.setupBaseURLStructure(project);
+      }
+      /**
+       * 清理项目的 baseURL 路径结构
+       */
+      async cleanProjectBaseURLStructure(project) {
+        return this.workspaceFactory.cleanBaseURLStructure(project);
+      }
+      /**
+       * 确保项目的 baseURL 路径结构正确
+       * 检查 baseURL 是否变化，如需要则重新创建
+       */
+      async ensureProjectBaseURLStructure(project) {
+        return this.workspaceFactory.ensureBaseURLStructure(project);
+      }
     };
   }
 });
@@ -50508,16 +50759,20 @@ var ProjectNewCommand = class {
         createOptions.theme = options.theme;
       if (options.path)
         createOptions.projectPath = options.path;
+      if (options.baseUrl)
+        createOptions.baseURL = options.baseUrl;
       const project = await this.workspaceAppService.createProject(workspace, name, createOptions);
       const info = project.getInfo();
       const displayTheme = options.theme || "quartz (default)";
+      const baseURL = options.baseUrl || "/";
       log19.info(`Created project: ${name}`);
       return {
         success: true,
         message: `\u2713 Project created: ${name}
   Path: ${info.path}
   Theme: ${displayTheme}
-  Language: ${options.language || defaultLanguage2}`,
+  Language: ${options.language || defaultLanguage2}
+` + (baseURL !== "/" ? `  Base URL: ${baseURL}` : ""),
         data: info
       };
     } catch (error) {
@@ -51410,11 +51665,19 @@ var BuildCommand = class {
       project.addBuildHistory(historyEntry);
       await this.workspaceAppService.saveProject(project);
       log82.info(`Build completed in ${duration}ms`);
+      const structureInfo = await this.workspaceAppService.setupProjectBaseURLStructure(project);
+      log82.debug("baseURL structure setup complete", structureInfo);
       let message = `\u2713 Built site in ${(duration / 1e3).toFixed(1)}s
 `;
       message += `\u2713 Project: ${project.getName()}
 `;
       message += `\u2713 Output: ${outputDir}`;
+      if (structureInfo.symlinkCreated) {
+        message += `
+\u2713 Base URL structure created: ${structureInfo.baseURL}`;
+        message += `
+  Run 'mdf serve' to preview at http://localhost:8080${structureInfo.baseURL}`;
+      }
       if (options.parallel) {
         message += "\n\u2713 Used parallel processing";
       }
@@ -51437,7 +51700,8 @@ var BuildCommand = class {
           duration,
           outputDir,
           contentDirs,
-          snapshot: snapshotInfo
+          snapshot: snapshotInfo,
+          baseURL: structureInfo.baseURL
         }
       };
     } catch (error) {
@@ -52582,6 +52846,10 @@ var ServeCommand = class {
       const host = options.host || "localhost";
       const livereloadPort = options.livereloadPort || 35729;
       const enableLivereload = options.livereload !== false;
+      const structureInfo = await this.workspaceAppService.ensureProjectBaseURLStructure(project);
+      if (structureInfo.recreated) {
+        log88.info("baseURL structure created/updated");
+      }
       const projContentDirs = await project.getContentDirs();
       const contentDirs = project.getLinkDirs();
       const modulesDir = workspace.getModulesDir();
@@ -52629,11 +52897,10 @@ var ServeCommand = class {
       if (!this.coordinator.isInitialized()) {
         throw new Error("Failed to initialize build coordinator");
       }
-      const liveReloadStatus = this.coordinator.getLiveReloadStatus();
-      const url = liveReloadStatus.url || `http://${host}:${port}`;
-      log88.info(`Server running at ${url}`);
+      const serverUrl = `http://${host}:${port}${structureInfo.baseURL}`;
+      log88.info(`Server running at ${serverUrl}`);
       if (options.open) {
-        await this.openBrowser(url);
+        await this.openBrowser(serverUrl);
       }
       let isShuttingDown = false;
       const cleanup = async () => {
@@ -52662,14 +52929,14 @@ var ServeCommand = class {
       process.on("SIGHUP", cleanup);
       return {
         success: true,
-        message: `\u2713 Server running at ${url}
+        message: `\u2713 Server running at ${serverUrl}
 ` + (enableLivereload ? `\u2713 LiveReload enabled on port ${livereloadPort}
 ` : "") + (options.publish ? `\u2713 Auto-publish enabled (${options.publish})
 ` : "") + `\u2713 Watching for changes...
 
 Press Ctrl+C to stop`,
         data: {
-          url,
+          url: serverUrl,
           port,
           host,
           livereloadPort: enableLivereload ? livereloadPort : void 0,
@@ -54380,6 +54647,7 @@ Commands:
       --source-file <path>          Create from single file (uses note theme by default)
       --theme <url>                 Theme URL (default: quartz)
       --language <lang>             Default language (default: en)
+      --base-url <url>              Base URL for the site (e.g., /blog/)
     project list                  List all projects
     project show [name]           Show project details
     project delete <name>         Delete a project
@@ -54488,6 +54756,8 @@ Examples:
   
   # Project
   mdf project new my-blog         Create a new project
+  mdf project new my-blog --base-url /blog/
+                                  Create project with custom base URL
   mdf project new my-blog --source ~/Documents/my-blog
                                   Create project from existing folder (auto-detect content/static)
   mdf project new my-note --source-file ~/Documents/my-note.md
@@ -54562,7 +54832,7 @@ For more information, visit: https://help.mdfriday.com
    * Show version
    */
   showVersion() {
-    const version = "26.3.7";
+    const version = "26.3.8";
     return {
       success: true,
       message: `MDFriday CLI v${version}`