@chronoter/main 0.1.10 → 0.2.0

package/dist/cli.js

@@ -8,6 +8,10 @@ import { visit } from 'unist-util-visit';
 import { compile } from '@mdx-js/mdx';
 import matter from 'gray-matter';
 import remarkGfm from 'remark-gfm';
+import rehypeSlug from 'rehype-slug';
+import { unified } from 'unified';
+import remarkParse from 'remark-parse';
+import GithubSlugger from 'github-slugger';
 import { fileURLToPath } from 'url';
 import { Command } from 'commander';
 import chalk2 from 'chalk';
@@ -237,12 +241,14 @@ var init_processor = __esm({
             throw new MDXError(`Failed to parse frontmatter: ${message}`, filePath);
           }
           const code = await this.compile(content, filePath, options?.baseUrl);
+          const headings = this.extractHeadings(content);
           const slug = this.generateSlug(filePath);
           const frontmatter = this.parseFrontmatter(data);
           return {
             code,
             frontmatter,
-            slug
+            slug,
+            headings
           };
         } catch (error) {
           if (error instanceof MDXError) {
@@ -295,7 +301,8 @@ var init_processor = __esm({
           const result = await compile(source, {
             outputFormat: "function-body",
             development: false,
-            remarkPlugins
+            remarkPlugins,
+            rehypePlugins: [rehypeSlug]
           });
           return String(result);
         } catch (error) {
@@ -320,6 +327,52 @@ var init_processor = __esm({
         const fileName = basename(filePath, extname(filePath));
         return fileName;
       }
+      /**
+       * Markdownコンテンツから見出しを抽出する
+       *
+       * @param content - Markdownコンテンツ
+       * @returns 見出しの配列（h2, h3のみ）
+       * @private
+       */
+      extractHeadings(content) {
+        const headings = [];
+        const slugger = new GithubSlugger();
+        try {
+          const tree = unified().use(remarkParse).parse(content);
+          visit(tree, "heading", (node) => {
+            if (node.depth === 2 || node.depth === 3) {
+              const text = this.extractTextFromNode(node.children);
+              const id = slugger.slug(text);
+              headings.push({
+                id,
+                text,
+                level: node.depth
+              });
+            }
+          });
+        } catch (error) {
+          console.warn("Failed to extract headings:", error);
+        }
+        return headings;
+      }
+      /**
+       * 見出しノードの子要素からテキストを抽出する
+       *
+       * @param children - 見出しノードの子要素
+       * @returns テキスト
+       * @private
+       */
+      extractTextFromNode(children) {
+        return children.map((child) => {
+          if (child.type === "text") {
+            return child.value;
+          }
+          if ("children" in child && Array.isArray(child.children)) {
+            return this.extractTextFromNode(child.children);
+          }
+          return "";
+        }).join("");
+      }
     };
   }
 });
@@ -446,16 +499,17 @@ var init_router = __esm({
       /**
        * ファイルパスからルートを作成
        *
-       * @param filePath - MDXまたはMDファイルのパス
-       * @param baseDir - ベースディレクトリパス
+       * @param filePath - MDXまたはMDファイルの絶対パス
+       * @param baseDir - ベースディレクトリパス（docsDir）
        * @returns 生成されたルート
        */
       async createRoute(filePath, baseDir) {
         const frontmatter = await this.extractFrontmatter(filePath);
         const urlPath = this.filePathToUrlPath(filePath, baseDir);
+        const relativeFilePath = path.relative(baseDir, filePath);
         return {
           path: urlPath,
-          filePath,
+          filePath: relativeFilePath,
           frontmatter
         };
       }
@@ -513,12 +567,17 @@ var routing_middleware_exports = {};
 __export(routing_middleware_exports, {
   createRoutingMiddleware: () => createRoutingMiddleware
 });
-var __filename$1, __dirname$1, createRoutingMiddleware, handleAllRoutesRequest, handleRouteRequest, handleMDXRequest, handle500;
+var __filename$1, __dirname$1, hasFileExtension, createRoutingMiddleware, handleAllRoutesRequest, handleRouteRequest, handleMDXRequest, handle500;
 var init_routing_middleware = __esm({
   "src/server/routing-middleware.ts"() {
     init_router();
     __filename$1 = fileURLToPath(import.meta.url);
     __dirname$1 = dirname(__filename$1);
+    hasFileExtension = (urlPath) => {
+      const lastSegment = urlPath.split("/").pop() || "";
+      const dotIndex = lastSegment.lastIndexOf(".");
+      return dotIndex > 0;
+    };
     createRoutingMiddleware = (server, options) => {
       const { config, cwd } = options;
       const routeGenerator = new RouteGenerator();
@@ -569,7 +628,8 @@ var init_routing_middleware = __esm({
         }
         const urlPath = url.split("?")[0];
         if (urlPath === "/__chronoter_mdx__") {
-          return handleMDXRequest(req, res, cwd);
+          const docsDir = config.docsDir ? resolve(cwd, config.docsDir) : cwd;
+          return handleMDXRequest(req, res, docsDir);
         }
         if (urlPath === "/__chronoter_routes__") {
           return handleRouteRequest(req, res, getRoutes, routeGenerator);
@@ -579,7 +639,7 @@ var init_routing_middleware = __esm({
         }
         if (urlPath.startsWith("/@") || // Vite内部リクエスト
         urlPath.startsWith("/node_modules") || urlPath.startsWith("/src/") || // Viteが処理するソースファイル
-        urlPath.includes(".") && !urlPath.endsWith("/") && !urlPath.startsWith("/src/")) {
+        hasFileExtension(urlPath) && !urlPath.endsWith("/") && !urlPath.startsWith("/src/")) {
           return next();
         }
         try {
@@ -689,7 +749,7 @@ var init_routing_middleware = __esm({
         );
       }
     };
-    handleMDXRequest = async (req, res, cwd) => {
+    handleMDXRequest = async (req, res, docsDir) => {
       try {
         const url = new URL(req.url || "", `http://${req.headers.host}`);
         const filePath = url.searchParams.get("path");
@@ -699,8 +759,8 @@ var init_routing_middleware = __esm({
           res.end(JSON.stringify({ error: "Missing 'path' query parameter" }));
           return;
         }
-        const absolutePath = resolve(cwd, filePath);
-        if (!absolutePath.startsWith(cwd)) {
+        const absolutePath = resolve(docsDir, filePath);
+        if (!absolutePath.startsWith(docsDir)) {
           res.statusCode = 403;
           res.setHeader("Content-Type", "application/json");
           res.end(JSON.stringify({ error: "Access denied" }));
@@ -715,7 +775,8 @@ var init_routing_middleware = __esm({
           JSON.stringify({
             code: processedMDX.code,
             frontmatter: processedMDX.frontmatter,
-            slug: processedMDX.slug
+            slug: processedMDX.slug,
+            headings: processedMDX.headings
           })
         );
       } catch (error) {
@@ -824,7 +885,7 @@ var ConfigError = class _ConfigError extends Error {
   }
 };
 var siteConfigSchema = z.object({
-  title: z.string().min(1, "site.title is required"),
+  title: z.string().min(1, "site.title must not be empty").optional(),
   description: z.string().optional(),
   baseUrl: z.string().url("site.baseUrl must be a valid URL").optional()
 });
@@ -840,7 +901,7 @@ var themeConfigSchema = z.object({
   logo: z.string().optional()
 });
 var chronoterConfigSchema = z.object({
-  site: siteConfigSchema,
+  site: siteConfigSchema.optional(),
   navigation: z.array(navigationItemSchema).optional(),
   docsDir: z.string().min(1, "docsDir must not be empty").optional(),
   outDir: z.string().optional(),
@@ -850,6 +911,10 @@ var chronoterConfigSchema = z.object({
 
 // src/core/config/defaults.ts
 var defaultConfig = {
+  site: {
+    title: "Chronoter Documentation"
+    // デフォルトタイトル
+  },
   docsDir: ".",
   // デフォルトはルートディレクトリ
   theme: {
@@ -858,9 +923,12 @@ var defaultConfig = {
   }
 };
 var mergeWithDefaults = (userConfig) => {
-  const site = userConfig.site;
   return {
-    site,
+    site: {
+      title: userConfig.site?.title ?? defaultConfig.site.title,
+      description: userConfig.site?.description,
+      baseUrl: userConfig.site?.baseUrl
+    },
     docsDir: userConfig.docsDir ?? defaultConfig.docsDir,
     navigation: userConfig.navigation,
     theme: {
@@ -896,10 +964,7 @@ var ConfigLoader = class {
       return this.validate(parsedConfig);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-        throw new ConfigError(
-          `Config file not found: ${configPath}
-Please create a chronoter.config.json file.`
-        );
+        return defaultConfig;
       }
       if (error instanceof ConfigError) {
         throw error;
@@ -1015,10 +1080,22 @@ var createViteConfig = (config, options = {}) => {
           );
         }
       },
-      // ビルド済みクライアントファイル配信ミドルウェアを登録するプラグイン
+      // ビルド済みクライアントファイル配信プラグイン
       // npmパッケージとして使用時、/server/client/ へのリクエストをdist内のファイルから配信
       {
         name: "chronoter-built-client",
+        // Viteのモジュール解決フック: /server/client/main.js を解決
+        // transformIndexHtml がHTMLを解析する際にモジュール解決を試みるため必要
+        resolveId(id) {
+          if (id === "/server/client/main.js" || id === "/server/client/main.css") {
+            const fileName = id.replace("/server/client/", "");
+            const clientFilePath = resolve(__dirname2, "server/client", fileName);
+            if (existsSync(clientFilePath)) {
+              return clientFilePath;
+            }
+          }
+          return null;
+        },
         configureServer(server) {
           server.middlewares.use((req, res, next) => {
             const url = req.url || "";
@@ -1649,7 +1726,7 @@ var runVersionCheck = async (packageName, currentVersion) => {
 
 // src/cli/index.ts
 var PACKAGE_NAME = "chronoter";
-var CURRENT_VERSION = "0.1.10";
+var CURRENT_VERSION = "0.2.0";
 var createCliProgram = () => {
   const program = new Command();
   program.name("chronoter").description("Chronoter - MDX-based documentation site generator").version(CURRENT_VERSION);

package/dist/index.js

@@ -7,6 +7,10 @@ import { visit } from 'unist-util-visit';
 import { compile } from '@mdx-js/mdx';
 import matter from 'gray-matter';
 import remarkGfm from 'remark-gfm';
+import rehypeSlug from 'rehype-slug';
+import { unified } from 'unified';
+import remarkParse from 'remark-parse';
+import GithubSlugger from 'github-slugger';
 import { fileURLToPath } from 'url';
 import chalk2 from 'chalk';
 import { defineConfig, createServer } from 'vite';
@@ -232,12 +236,14 @@ var init_processor = __esm({
             throw new MDXError(`Failed to parse frontmatter: ${message}`, filePath);
           }
           const code = await this.compile(content, filePath, options?.baseUrl);
+          const headings = this.extractHeadings(content);
           const slug = this.generateSlug(filePath);
           const frontmatter = this.parseFrontmatter(data);
           return {
             code,
             frontmatter,
-            slug
+            slug,
+            headings
           };
         } catch (error) {
           if (error instanceof MDXError) {
@@ -290,7 +296,8 @@ var init_processor = __esm({
           const result = await compile(source, {
             outputFormat: "function-body",
             development: false,
-            remarkPlugins
+            remarkPlugins,
+            rehypePlugins: [rehypeSlug]
           });
           return String(result);
         } catch (error) {
@@ -315,6 +322,52 @@ var init_processor = __esm({
         const fileName = basename(filePath, extname(filePath));
         return fileName;
       }
+      /**
+       * Markdownコンテンツから見出しを抽出する
+       *
+       * @param content - Markdownコンテンツ
+       * @returns 見出しの配列（h2, h3のみ）
+       * @private
+       */
+      extractHeadings(content) {
+        const headings = [];
+        const slugger = new GithubSlugger();
+        try {
+          const tree = unified().use(remarkParse).parse(content);
+          visit(tree, "heading", (node) => {
+            if (node.depth === 2 || node.depth === 3) {
+              const text = this.extractTextFromNode(node.children);
+              const id = slugger.slug(text);
+              headings.push({
+                id,
+                text,
+                level: node.depth
+              });
+            }
+          });
+        } catch (error) {
+          console.warn("Failed to extract headings:", error);
+        }
+        return headings;
+      }
+      /**
+       * 見出しノードの子要素からテキストを抽出する
+       *
+       * @param children - 見出しノードの子要素
+       * @returns テキスト
+       * @private
+       */
+      extractTextFromNode(children) {
+        return children.map((child) => {
+          if (child.type === "text") {
+            return child.value;
+          }
+          if ("children" in child && Array.isArray(child.children)) {
+            return this.extractTextFromNode(child.children);
+          }
+          return "";
+        }).join("");
+      }
     };
   }
 });
@@ -441,16 +494,17 @@ var init_router = __esm({
       /**
        * ファイルパスからルートを作成
        *
-       * @param filePath - MDXまたはMDファイルのパス
-       * @param baseDir - ベースディレクトリパス
+       * @param filePath - MDXまたはMDファイルの絶対パス
+       * @param baseDir - ベースディレクトリパス（docsDir）
        * @returns 生成されたルート
        */
       async createRoute(filePath, baseDir) {
         const frontmatter = await this.extractFrontmatter(filePath);
         const urlPath = this.filePathToUrlPath(filePath, baseDir);
+        const relativeFilePath = path.relative(baseDir, filePath);
         return {
           path: urlPath,
-          filePath,
+          filePath: relativeFilePath,
           frontmatter
         };
       }
@@ -508,12 +562,17 @@ var routing_middleware_exports = {};
 __export(routing_middleware_exports, {
   createRoutingMiddleware: () => createRoutingMiddleware
 });
-var __filename$1, __dirname$1, createRoutingMiddleware, handleAllRoutesRequest, handleRouteRequest, handleMDXRequest, handle500;
+var __filename$1, __dirname$1, hasFileExtension, createRoutingMiddleware, handleAllRoutesRequest, handleRouteRequest, handleMDXRequest, handle500;
 var init_routing_middleware = __esm({
   "src/server/routing-middleware.ts"() {
     init_router();
     __filename$1 = fileURLToPath(import.meta.url);
     __dirname$1 = dirname(__filename$1);
+    hasFileExtension = (urlPath) => {
+      const lastSegment = urlPath.split("/").pop() || "";
+      const dotIndex = lastSegment.lastIndexOf(".");
+      return dotIndex > 0;
+    };
     createRoutingMiddleware = (server, options) => {
       const { config, cwd } = options;
       const routeGenerator = new RouteGenerator();
@@ -564,7 +623,8 @@ var init_routing_middleware = __esm({
         }
         const urlPath = url.split("?")[0];
         if (urlPath === "/__chronoter_mdx__") {
-          return handleMDXRequest(req, res, cwd);
+          const docsDir = config.docsDir ? resolve(cwd, config.docsDir) : cwd;
+          return handleMDXRequest(req, res, docsDir);
         }
         if (urlPath === "/__chronoter_routes__") {
           return handleRouteRequest(req, res, getRoutes, routeGenerator);
@@ -574,7 +634,7 @@ var init_routing_middleware = __esm({
         }
         if (urlPath.startsWith("/@") || // Vite内部リクエスト
         urlPath.startsWith("/node_modules") || urlPath.startsWith("/src/") || // Viteが処理するソースファイル
-        urlPath.includes(".") && !urlPath.endsWith("/") && !urlPath.startsWith("/src/")) {
+        hasFileExtension(urlPath) && !urlPath.endsWith("/") && !urlPath.startsWith("/src/")) {
           return next();
         }
         try {
@@ -684,7 +744,7 @@ var init_routing_middleware = __esm({
         );
       }
     };
-    handleMDXRequest = async (req, res, cwd) => {
+    handleMDXRequest = async (req, res, docsDir) => {
       try {
         const url = new URL(req.url || "", `http://${req.headers.host}`);
         const filePath = url.searchParams.get("path");
@@ -694,8 +754,8 @@ var init_routing_middleware = __esm({
           res.end(JSON.stringify({ error: "Missing 'path' query parameter" }));
           return;
         }
-        const absolutePath = resolve(cwd, filePath);
-        if (!absolutePath.startsWith(cwd)) {
+        const absolutePath = resolve(docsDir, filePath);
+        if (!absolutePath.startsWith(docsDir)) {
           res.statusCode = 403;
           res.setHeader("Content-Type", "application/json");
           res.end(JSON.stringify({ error: "Access denied" }));
@@ -710,7 +770,8 @@ var init_routing_middleware = __esm({
           JSON.stringify({
             code: processedMDX.code,
             frontmatter: processedMDX.frontmatter,
-            slug: processedMDX.slug
+            slug: processedMDX.slug,
+            headings: processedMDX.headings
           })
         );
       } catch (error) {
@@ -819,7 +880,7 @@ var ConfigError = class _ConfigError extends Error {
   }
 };
 var siteConfigSchema = z.object({
-  title: z.string().min(1, "site.title is required"),
+  title: z.string().min(1, "site.title must not be empty").optional(),
   description: z.string().optional(),
   baseUrl: z.string().url("site.baseUrl must be a valid URL").optional()
 });
@@ -835,7 +896,7 @@ var themeConfigSchema = z.object({
   logo: z.string().optional()
 });
 var chronoterConfigSchema = z.object({
-  site: siteConfigSchema,
+  site: siteConfigSchema.optional(),
   navigation: z.array(navigationItemSchema).optional(),
   docsDir: z.string().min(1, "docsDir must not be empty").optional(),
   outDir: z.string().optional(),
@@ -845,6 +906,10 @@ var chronoterConfigSchema = z.object({
 
 // src/core/config/defaults.ts
 var defaultConfig = {
+  site: {
+    title: "Chronoter Documentation"
+    // デフォルトタイトル
+  },
   docsDir: ".",
   // デフォルトはルートディレクトリ
   theme: {
@@ -853,9 +918,12 @@ var defaultConfig = {
   }
 };
 var mergeWithDefaults = (userConfig) => {
-  const site = userConfig.site;
   return {
-    site,
+    site: {
+      title: userConfig.site?.title ?? defaultConfig.site.title,
+      description: userConfig.site?.description,
+      baseUrl: userConfig.site?.baseUrl
+    },
     docsDir: userConfig.docsDir ?? defaultConfig.docsDir,
     navigation: userConfig.navigation,
     theme: {
@@ -891,10 +959,7 @@ var ConfigLoader = class {
       return this.validate(parsedConfig);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-        throw new ConfigError(
-          `Config file not found: ${configPath}
-Please create a chronoter.config.json file.`
-        );
+        return defaultConfig;
       }
       if (error instanceof ConfigError) {
         throw error;
@@ -1010,10 +1075,22 @@ var createViteConfig = (config, options = {}) => {
           );
         }
       },
-      // ビルド済みクライアントファイル配信ミドルウェアを登録するプラグイン
+      // ビルド済みクライアントファイル配信プラグイン
       // npmパッケージとして使用時、/server/client/ へのリクエストをdist内のファイルから配信
       {
         name: "chronoter-built-client",
+        // Viteのモジュール解決フック: /server/client/main.js を解決
+        // transformIndexHtml がHTMLを解析する際にモジュール解決を試みるため必要
+        resolveId(id) {
+          if (id === "/server/client/main.js" || id === "/server/client/main.css") {
+            const fileName = id.replace("/server/client/", "");
+            const clientFilePath = resolve(__dirname2, "server/client", fileName);
+            if (existsSync(clientFilePath)) {
+              return clientFilePath;
+            }
+          }
+          return null;
+        },
         configureServer(server) {
           server.middlewares.use((req, res, next) => {
             const url = req.url || "";