@mandujs/cli 0.12.2 → 0.13.0

package/src/terminal/theme.ts

@@ -1,142 +1,142 @@
-/**
- * DNA-009: Mandu CLI Theme System
- *
- * Chalk-based dynamic color theme with NO_COLOR/FORCE_COLOR support
- * Inspired by OpenClaw's terminal/theme.ts
- */
-
-import { MANDU_PALETTE } from "./palette.js";
-
-// Bun's native console supports colors, but we need a simple wrapper
-// for consistent theming across the CLI
-
-/**
- * Check if rich output (colors) is supported
- */
-function checkRichSupport(): boolean {
-  // NO_COLOR takes precedence (accessibility standard)
-  if (process.env.NO_COLOR) {
-    const forceColor = process.env.FORCE_COLOR?.trim();
-    if (forceColor !== "1" && forceColor !== "true") {
-      return false;
-    }
-  }
-
-  // Check TTY
-  if (!process.stdout.isTTY) {
-    return false;
-  }
-
-  // Check TERM
-  const term = process.env.TERM;
-  if (term === "dumb") {
-    return false;
-  }
-
-  return true;
-}
-
-const richSupported = checkRichSupport();
-
-/**
- * ANSI escape code wrapper
- */
-function ansi(code: string) {
-  return richSupported ? `\x1b[${code}m` : "";
-}
-
-/**
- * Convert hex to ANSI 256 color (approximation)
- */
-function hexToAnsi256(hex: string): number {
-  const r = parseInt(hex.slice(1, 3), 16);
-  const g = parseInt(hex.slice(3, 5), 16);
-  const b = parseInt(hex.slice(5, 7), 16);
-
-  // Convert to 6x6x6 color cube
-  const ri = Math.round((r / 255) * 5);
-  const gi = Math.round((g / 255) * 5);
-  const bi = Math.round((b / 255) * 5);
-
-  return 16 + 36 * ri + 6 * gi + bi;
-}
-
-/**
- * Create a color function from hex
- */
-function hex(hexColor: string): (text: string) => string {
-  if (!richSupported) return (text) => text;
-
-  const colorCode = hexToAnsi256(hexColor);
-  return (text) => `\x1b[38;5;${colorCode}m${text}\x1b[0m`;
-}
-
-/**
- * Create a bold color function
- */
-function boldHex(hexColor: string): (text: string) => string {
-  if (!richSupported) return (text) => text;
-
-  const colorCode = hexToAnsi256(hexColor);
-  return (text) => `\x1b[1;38;5;${colorCode}m${text}\x1b[0m`;
-}
-
-/**
- * Mandu CLI Theme
- */
-export const theme = {
-  // Brand colors
-  accent: hex(MANDU_PALETTE.accent),
-  accentBright: hex(MANDU_PALETTE.accentBright),
-  accentDim: hex(MANDU_PALETTE.accentDim),
-
-  // Semantic colors
-  info: hex(MANDU_PALETTE.info),
-  success: hex(MANDU_PALETTE.success),
-  warn: hex(MANDU_PALETTE.warn),
-  error: hex(MANDU_PALETTE.error),
-
-  // Neutral
-  muted: hex(MANDU_PALETTE.muted),
-  dim: hex(MANDU_PALETTE.dim),
-
-  // Composite styles
-  heading: boldHex(MANDU_PALETTE.accent),
-  command: hex(MANDU_PALETTE.accentBright),
-  option: hex(MANDU_PALETTE.warn),
-  path: hex(MANDU_PALETTE.info),
-
-  // Basic styles
-  bold: richSupported ? (text: string) => `\x1b[1m${text}\x1b[0m` : (text: string) => text,
-  italic: richSupported ? (text: string) => `\x1b[3m${text}\x1b[0m` : (text: string) => text,
-  underline: richSupported ? (text: string) => `\x1b[4m${text}\x1b[0m` : (text: string) => text,
-
-  // Reset
-  reset: richSupported ? "\x1b[0m" : "",
-} as const;
-
-/**
- * Check if rich output is available
- */
-export function isRich(): boolean {
-  return richSupported;
-}
-
-/**
- * Conditionally apply color based on rich mode
- */
-export function colorize(
-  rich: boolean,
-  colorFn: (text: string) => string,
-  text: string
-): string {
-  return rich ? colorFn(text) : text;
-}
-
-/**
- * Strip ANSI codes from string (for width calculation)
- */
-export function stripAnsi(text: string): string {
-  // eslint-disable-next-line no-control-regex
-  return text.replace(/\x1b\[[0-9;]*m/g, "");
-}
+/**
+ * DNA-009: Mandu CLI Theme System
+ *
+ * Chalk-based dynamic color theme with NO_COLOR/FORCE_COLOR support
+ * Inspired by OpenClaw's terminal/theme.ts
+ */
+
+import { MANDU_PALETTE } from "./palette.js";
+
+// Bun's native console supports colors, but we need a simple wrapper
+// for consistent theming across the CLI
+
+/**
+ * Check if rich output (colors) is supported
+ */
+function checkRichSupport(): boolean {
+  // NO_COLOR takes precedence (accessibility standard)
+  if (process.env.NO_COLOR) {
+    const forceColor = process.env.FORCE_COLOR?.trim();
+    if (forceColor !== "1" && forceColor !== "true") {
+      return false;
+    }
+  }
+
+  // Check TTY
+  if (!process.stdout.isTTY) {
+    return false;
+  }
+
+  // Check TERM
+  const term = process.env.TERM;
+  if (term === "dumb") {
+    return false;
+  }
+
+  return true;
+}
+
+const richSupported = checkRichSupport();
+
+/**
+ * ANSI escape code wrapper
+ */
+function ansi(code: string) {
+  return richSupported ? `\x1b[${code}m` : "";
+}
+
+/**
+ * Convert hex to ANSI 256 color (approximation)
+ */
+function hexToAnsi256(hex: string): number {
+  const r = parseInt(hex.slice(1, 3), 16);
+  const g = parseInt(hex.slice(3, 5), 16);
+  const b = parseInt(hex.slice(5, 7), 16);
+
+  // Convert to 6x6x6 color cube
+  const ri = Math.round((r / 255) * 5);
+  const gi = Math.round((g / 255) * 5);
+  const bi = Math.round((b / 255) * 5);
+
+  return 16 + 36 * ri + 6 * gi + bi;
+}
+
+/**
+ * Create a color function from hex
+ */
+function hex(hexColor: string): (text: string) => string {
+  if (!richSupported) return (text) => text;
+
+  const colorCode = hexToAnsi256(hexColor);
+  return (text) => `\x1b[38;5;${colorCode}m${text}\x1b[0m`;
+}
+
+/**
+ * Create a bold color function
+ */
+function boldHex(hexColor: string): (text: string) => string {
+  if (!richSupported) return (text) => text;
+
+  const colorCode = hexToAnsi256(hexColor);
+  return (text) => `\x1b[1;38;5;${colorCode}m${text}\x1b[0m`;
+}
+
+/**
+ * Mandu CLI Theme
+ */
+export const theme = {
+  // Brand colors
+  accent: hex(MANDU_PALETTE.accent),
+  accentBright: hex(MANDU_PALETTE.accentBright),
+  accentDim: hex(MANDU_PALETTE.accentDim),
+
+  // Semantic colors
+  info: hex(MANDU_PALETTE.info),
+  success: hex(MANDU_PALETTE.success),
+  warn: hex(MANDU_PALETTE.warn),
+  error: hex(MANDU_PALETTE.error),
+
+  // Neutral
+  muted: hex(MANDU_PALETTE.muted),
+  dim: hex(MANDU_PALETTE.dim),
+
+  // Composite styles
+  heading: boldHex(MANDU_PALETTE.accent),
+  command: hex(MANDU_PALETTE.accentBright),
+  option: hex(MANDU_PALETTE.warn),
+  path: hex(MANDU_PALETTE.info),
+
+  // Basic styles
+  bold: richSupported ? (text: string) => `\x1b[1m${text}\x1b[0m` : (text: string) => text,
+  italic: richSupported ? (text: string) => `\x1b[3m${text}\x1b[0m` : (text: string) => text,
+  underline: richSupported ? (text: string) => `\x1b[4m${text}\x1b[0m` : (text: string) => text,
+
+  // Reset
+  reset: richSupported ? "\x1b[0m" : "",
+} as const;
+
+/**
+ * Check if rich output is available
+ */
+export function isRich(): boolean {
+  return richSupported;
+}
+
+/**
+ * Conditionally apply color based on rich mode
+ */
+export function colorize(
+  rich: boolean,
+  colorFn: (text: string) => string,
+  text: string
+): string {
+  return rich ? colorFn(text) : text;
+}
+
+/**
+ * Strip ANSI codes from string (for width calculation)
+ */
+export function stripAnsi(text: string): string {
+  // eslint-disable-next-line no-control-regex
+  return text.replace(/\x1b\[[0-9;]*m/g, "");
+}

package/src/util/bun.ts

@@ -1,6 +1,6 @@
-export function importFresh<T = unknown>(modulePath: string): Promise<T> {
-  const url = Bun.pathToFileURL(modulePath);
-  const cacheBusted = new URL(url.href);
-  cacheBusted.searchParams.set("t", Date.now().toString());
-  return import(cacheBusted.href) as Promise<T>;
-}
+export function importFresh<T = unknown>(modulePath: string): Promise<T> {
+  const url = Bun.pathToFileURL(modulePath);
+  const cacheBusted = new URL(url.href);
+  cacheBusted.searchParams.set("t", Date.now().toString());
+  return import(cacheBusted.href) as Promise<T>;
+}

package/src/util/fs.ts

@@ -1,28 +1,28 @@
-import path from "path";
-import fs from "fs/promises";
+import path from "path";
+import fs from "fs/promises";
 
 export function resolveFromCwd(...paths: string[]): string {
   return path.resolve(process.cwd(), ...paths);
 }
 
-export function getRootDir(): string {
-  return process.cwd();
-}
-
-export async function pathExists(targetPath: string): Promise<boolean> {
-  try {
-    await fs.access(targetPath);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-export async function isDirectory(targetPath: string): Promise<boolean> {
-  try {
-    const stat = await fs.stat(targetPath);
-    return stat.isDirectory();
-  } catch {
-    return false;
-  }
-}
+export function getRootDir(): string {
+  return process.cwd();
+}
+
+export async function pathExists(targetPath: string): Promise<boolean> {
+  try {
+    await fs.access(targetPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function isDirectory(targetPath: string): Promise<boolean> {
+  try {
+    const stat = await fs.stat(targetPath);
+    return stat.isDirectory();
+  } catch {
+    return false;
+  }
+}

package/src/util/handlers.ts

@@ -0,0 +1,96 @@
+import {
+  registerApiHandler,
+  registerPageLoader,
+  registerPageHandler,
+  registerLayoutLoader,
+  needsHydration,
+  type RoutesManifest,
+} from "@mandujs/core";
+import path from "path";
+
+export interface RegisterHandlersOptions {
+  /** 모듈 import 함수 (dev: importFresh, start: 표준 import) */
+  importFn: (modulePath: string) => Promise<any>;
+  /** 이미 등록된 layout 경로 추적용 Set */
+  registeredLayouts: Set<string>;
+  /** 리로드 시 layout 캐시 클리어 */
+  isReload?: boolean;
+}
+
+/**
+ * 매니페스트 라우트를 서버 핸들러로 등록
+ * dev.ts와 start.ts에서 공유
+ */
+export async function registerManifestHandlers(
+  manifest: RoutesManifest,
+  rootDir: string,
+  options: RegisterHandlersOptions
+): Promise<void> {
+  const { importFn, registeredLayouts, isReload = false } = options;
+
+  if (isReload) {
+    registeredLayouts.clear();
+  }
+
+  for (const route of manifest.routes) {
+    if (route.kind === "api") {
+      const modulePath = path.resolve(rootDir, route.module);
+      try {
+        const module = await importFn(modulePath);
+        let handler = module.default || module.handler || module;
+
+        // ManduFilling 인스턴스를 핸들러 함수로 래핑
+        if (handler && typeof handler.handle === "function") {
+          console.log(`  🔄 ManduFilling 래핑: ${route.id}`);
+          const filling = handler;
+          handler = async (req: Request, params?: Record<string, string>) => {
+            return filling.handle(req, params);
+          };
+        } else {
+          console.log(
+            `  ⚠️ 핸들러 타입: ${typeof handler}, handle: ${typeof handler?.handle}`
+          );
+        }
+
+        registerApiHandler(route.id, handler);
+        console.log(`  📡 API: ${route.pattern} -> ${route.id}`);
+      } catch (error) {
+        console.error(`  ❌ API 핸들러 로드 실패: ${route.id}`, error);
+      }
+    } else if (route.kind === "page" && route.componentModule) {
+      const componentPath = path.resolve(rootDir, route.componentModule);
+      const isIsland = needsHydration(route);
+      const hasLayout = route.layoutChain && route.layoutChain.length > 0;
+
+      // Layout 로더 등록
+      if (route.layoutChain) {
+        for (const layoutPath of route.layoutChain) {
+          if (!registeredLayouts.has(layoutPath)) {
+            const absLayoutPath = path.resolve(rootDir, layoutPath);
+            registerLayoutLoader(layoutPath, async () => {
+              return importFn(absLayoutPath);
+            });
+            registeredLayouts.add(layoutPath);
+            console.log(`  🎨 Layout: ${layoutPath}`);
+          }
+        }
+      }
+
+      // slotModule이 있으면 PageHandler 사용 (filling.loader 지원)
+      if (route.slotModule) {
+        registerPageHandler(route.id, async () => {
+          const module = await importFn(componentPath);
+          return module.default;
+        });
+        console.log(
+          `  📄 Page: ${route.pattern} -> ${route.id} (with loader)${isIsland ? " 🏝️" : ""}${hasLayout ? " 🎨" : ""}`
+        );
+      } else {
+        registerPageLoader(route.id, () => importFn(componentPath));
+        console.log(
+          `  📄 Page: ${route.pattern} -> ${route.id}${isIsland ? " 🏝️" : ""}${hasLayout ? " 🎨" : ""}`
+        );
+      }
+    }
+  }
+}

package/src/util/manifest.ts

@@ -1,52 +1,52 @@
-import path from "path";
-import {
-  generateManifest,
-  loadManifest,
-  type RoutesManifest,
-  type FSScannerConfig,
-} from "@mandujs/core";
-import { isDirectory } from "./fs";
-
-export type ManifestSource = "fs" | "spec";
-
-export interface ResolvedManifest {
-  manifest: RoutesManifest;
-  source: ManifestSource;
-  warnings: string[];
-}
-
-export async function resolveManifest(
-  rootDir: string,
-  options: { fsRoutes?: FSScannerConfig; outputPath?: string } = {}
-): Promise<ResolvedManifest> {
-  const appDir = path.resolve(rootDir, "app");
-  const hasApp = await isDirectory(appDir);
-
-  if (hasApp) {
-    const result = await generateManifest(rootDir, {
-      scanner: options.fsRoutes,
-      outputPath: options.outputPath,
-      skipLegacy: true,
-    });
-    return {
-      manifest: result.manifest,
-      source: "fs",
-      warnings: result.warnings,
-    };
-  }
-
-  const specPath = path.join(rootDir, "spec", "routes.manifest.json");
-  if (await Bun.file(specPath).exists()) {
-    const result = await loadManifest(specPath);
-    if (!result.success) {
-      throw new Error(result.errors?.join(", ") || "Failed to load routes manifest");
-    }
-    return {
-      manifest: result.data!,
-      source: "spec",
-      warnings: [],
-    };
-  }
-
-  throw new Error("No routes found. Create app/ routes or spec/routes.manifest.json");
-}
+import path from "path";
+import {
+  generateManifest,
+  loadManifest,
+  type RoutesManifest,
+  type FSScannerConfig,
+} from "@mandujs/core";
+import { isDirectory } from "./fs";
+
+export type ManifestSource = "fs" | "spec";
+
+export interface ResolvedManifest {
+  manifest: RoutesManifest;
+  source: ManifestSource;
+  warnings: string[];
+}
+
+export async function resolveManifest(
+  rootDir: string,
+  options: { fsRoutes?: FSScannerConfig; outputPath?: string } = {}
+): Promise<ResolvedManifest> {
+  const appDir = path.resolve(rootDir, "app");
+  const hasApp = await isDirectory(appDir);
+
+  if (hasApp) {
+    const result = await generateManifest(rootDir, {
+      scanner: options.fsRoutes,
+      outputPath: options.outputPath,
+      skipLegacy: true,
+    });
+    return {
+      manifest: result.manifest,
+      source: "fs",
+      warnings: result.warnings,
+    };
+  }
+
+  const specPath = path.join(rootDir, "spec", "routes.manifest.json");
+  if (await Bun.file(specPath).exists()) {
+    const result = await loadManifest(specPath);
+    if (!result.success) {
+      throw new Error(result.errors?.join(", ") || "Failed to load routes manifest");
+    }
+    return {
+      manifest: result.data!,
+      source: "spec",
+      warnings: [],
+    };
+  }
+
+  throw new Error("No routes found. Create app/ routes or spec/routes.manifest.json");
+}

package/src/util/output.ts

@@ -1,22 +1,22 @@
-import { getOutputMode } from "../terminal/output";
-
-export type OutputFormat = "console" | "agent" | "json";
-
-function normalizeFormat(value?: string): OutputFormat | undefined {
-  if (!value) return undefined;
-  const normalized = value.toLowerCase();
-  if (normalized === "console" || normalized === "agent" || normalized === "json") {
-    return normalized;
-  }
-  return undefined;
-}
-
-export function resolveOutputFormat(explicit?: OutputFormat): OutputFormat {
-  const env = process.env;
-
-  const direct = normalizeFormat(explicit) ?? normalizeFormat(env.MANDU_OUTPUT);
-  if (direct) return direct;
-
-  const mode = getOutputMode();
-  return mode === "json" ? "json" : "console";
-}
+import { getOutputMode } from "../terminal/output";
+
+export type OutputFormat = "console" | "agent" | "json";
+
+function normalizeFormat(value?: string): OutputFormat | undefined {
+  if (!value) return undefined;
+  const normalized = value.toLowerCase();
+  if (normalized === "console" || normalized === "agent" || normalized === "json") {
+    return normalized;
+  }
+  return undefined;
+}
+
+export function resolveOutputFormat(explicit?: OutputFormat): OutputFormat {
+  const env = process.env;
+
+  const direct = normalizeFormat(explicit) ?? normalizeFormat(env.MANDU_OUTPUT);
+  if (direct) return direct;
+
+  const mode = getOutputMode();
+  return mode === "json" ? "json" : "console";
+}