sonamu 0.5.6 → 0.6.0

package/src/api/sonamu.ts

@@ -4,8 +4,7 @@ import fastify from "fastify";
 import { readFile } from "fs/promises";
 import path from "path";
 import { exists } from "../utils/fs-utils";
-
-import type { FSWatcher } from "chokidar";
+import chokidar, { type FSWatcher } from "chokidar";
 import { formatInTimeZone } from "date-fns-tz";
 import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import type { IncomingMessage, Server, ServerResponse } from "http";
@@ -19,11 +18,7 @@ import {
 import type { Driver } from "../file-storage/driver";
 import { createSSEFactory } from "../stream/sse";
 import type { Syncer } from "../syncer/syncer";
-import {
-  ApiParamType,
-  SonamuFastifyConfig,
-  SonamuServerOptions,
-} from "../types/types";
+import { ApiParamType, SonamuFastifyConfig } from "../types/types";
 import { isLocal, isTest } from "../utils/controller";
 import { findApiRootPath } from "../utils/utils";
 import { humanizeZodError } from "../utils/zod-error";
@@ -32,23 +27,14 @@ import { getZodObjectFromApi } from "./code-converters";
 import type { AuthContext, Context, UploadContext } from "./context";
 import type { ExtendedApi } from "./decorators";
 import fastifyPassport from "@fastify/passport";
+import { loadConfig, SonamuConfig, SonamuServerOptions } from "./config";
+import { AbsolutePath } from "../utils/path-utils";
+import { isHotReloadServer } from "../utils/esm-utils";
+import { Template } from "../template";
+import assert from "assert";
+import { centerText } from "../utils/console-util";
+import { BaseModel } from "../database/base-model";
 
-export type SonamuConfig = {
-  projectName?: string;
-  api: {
-    dir: string;
-  };
-  sync: {
-    targets: string[];
-  };
-  route: {
-    prefix: string;
-  };
-  timezone?: string;
-  ui?: {
-    port: number;
-  };
-};
 export type SonamuSecrets = {
   [key: string]: string;
 };
@@ -67,7 +53,19 @@ class SonamuClass {
     if (store?.context) {
       return store.context;
     }
-    throw new Error("Sonamu cannot find context");
+
+    if (process.env.NODE_ENV === "test") {
+      // 테스팅 환경에서 컨텍스트가 주입되지 않은 경우 빈 컨텍스트 리턴
+      return {
+        request: null,
+        reply: null,
+        headers: {},
+        createSSE: () => {},
+        naiteStore: new Map<string, any>(),
+      } as unknown as Context;
+    } else {
+      throw new Error("Sonamu cannot find context");
+    }
   }
 
   public getUploadContext(): UploadContext {
@@ -80,11 +78,11 @@ class SonamuClass {
     );
   }
 
-  private _apiRootPath: string | null = null;
-  set apiRootPath(apiRootPath: string) {
+  private _apiRootPath: AbsolutePath | null = null;
+  set apiRootPath(apiRootPath: AbsolutePath) {
     this._apiRootPath = apiRootPath;
   }
-  get apiRootPath(): string {
+  get apiRootPath(): AbsolutePath {
     if (this._apiRootPath === null) {
       throw new Error("Sonamu has not been initialized");
     }
@@ -157,7 +155,7 @@ class SonamuClass {
   async init(
     doSilent: boolean = false,
     enableSync: boolean = true,
-    apiRootPath?: string,
+    apiRootPath?: AbsolutePath,
     forTesting: boolean = false
   ) {
     if (this.isInitialized) {
@@ -170,14 +168,8 @@ class SonamuClass {
 
     // API 루트 패스
     this.apiRootPath = apiRootPath ?? findApiRootPath();
-    const configPath = path.join(this.apiRootPath, "sonamu.config.json");
+    this.config = await loadConfig(this.apiRootPath);
     const secretsPath = path.join(this.apiRootPath, "sonamu.secrets.json");
-    if (!(await exists(configPath))) {
-      throw new Error(`Cannot find sonamu.config.json in ${configPath}`);
-    }
-    this.config = JSON.parse(
-      (await readFile(configPath)).toString()
-    ) as SonamuConfig;
     if (await exists(secretsPath)) {
       this.secrets = JSON.parse(
         (await readFile(secretsPath)).toString()
@@ -185,7 +177,7 @@ class SonamuClass {
     }
 
     // DB 로드
-    this.dbConfig = await DB.readKnexfile();
+    this.dbConfig = DB.generateDBConfig(this.config.database);
     !doSilent && console.log(chalk.green("DB Config Loaded!"));
     attachOnDuplicateUpdate();
 
@@ -204,14 +196,15 @@ class SonamuClass {
     this.syncer = new Syncer();
 
     // Autoload: Models / Types / APIs
-    await this.syncer.autoloadModels();
     await this.syncer.autoloadTypes();
+    await this.syncer.autoloadModels();
     await this.syncer.autoloadApis();
 
-    if (isLocal() && !isTest() && enableSync) {
+    await Template.autoload();
+
+    if (isLocal() && !isTest() && isHotReloadServer() && enableSync) {
       await this.syncer.sync();
 
-      // FIXME: hmr 설정된 경우만 워처 시작
       this.startWatcher();
 
       this.syncer.syncUI();
@@ -221,13 +214,15 @@ class SonamuClass {
     !doSilent && console.timeEnd(chalk.cyan("Sonamu.init"));
   }
 
-  async createServer(
-    options: SonamuServerOptions,
-    initOptions?: {
-      enableSync?: boolean;
-      doSilent?: boolean;
+  async createServer(initOptions?: {
+    enableSync?: boolean;
+    doSilent?: boolean;
+  }) {
+    if (this.isInitialized === false) {
+      await this.init(initOptions?.doSilent, initOptions?.enableSync);
     }
-  ) {
+
+    const options = this.config.server;
     const server = fastify(options.fastify);
     this.server = server;
 
@@ -278,7 +273,7 @@ class SonamuClass {
     this.server = server;
 
     // timezone 설정
-    const timezone = this.config.timezone;
+    const timezone = this.config.api.timezone;
     if (timezone) {
       const DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssXXX";
       // ISO 8601 날짜 형식 정규식 (예: 2024-01-15T09:30:00.000Z)
@@ -298,7 +293,7 @@ class SonamuClass {
 
     // 전체 라우팅 리스트
     server.get(
-      `${this.config.route.prefix}/routes`,
+      `${this.config.api.route.prefix}/routes`,
       async (_request, _reply): Promise<any> => {
         return this.syncer.apis;
       }
@@ -306,7 +301,7 @@ class SonamuClass {
 
     // Healthcheck API
     server.get(
-      `${this.config.route.prefix}/healthcheck`,
+      `${this.config.api.route.prefix}/healthcheck`,
       async (_request, _reply): Promise<string> => {
         return "ok";
       }
@@ -317,7 +312,8 @@ class SonamuClass {
       server.all("*", (request, reply) => {
         const found = this.syncer.apis.find(
           (api) =>
-            this.config.route.prefix + api.path === request.url.split("?")[0] &&
+            this.config.api.route.prefix + api.path ===
+              request.url.split("?")[0] &&
             (api.options.httpMethod ?? "GET") === request.method.toUpperCase()
         );
         if (found) {
@@ -335,7 +331,7 @@ class SonamuClass {
         // route
         server.route({
           method: api.options.httpMethod!,
-          url: this.config.route.prefix + api.path,
+          url: this.config.api.route.prefix + api.path,
           handler: this.getApiHandler(api, config),
         }); // END server.route
       });
@@ -413,27 +409,29 @@ class SonamuClass {
       );
 
       const context: Context = {
-        ...config.contextProvider(
-          {
-            request,
-            reply,
-            headers: request.headers,
-            createSSE,
-
-            // auth
-            user: request.user ?? null,
-            passport: {
-              login: request.login.bind(
-                request
-              ) as AuthContext["passport"]["login"],
-              logout: request.logout.bind(
-                request
-              ) as AuthContext["passport"]["logout"],
+        ...(await Promise.resolve(
+          config.contextProvider(
+            {
+              request,
+              reply,
+              headers: request.headers,
+              createSSE,
+              naiteStore: new Map<string, any>(),
+              // auth
+              user: request.user ?? null,
+              passport: {
+                login: request.login.bind(
+                  request
+                ) as AuthContext["passport"]["login"],
+                logout: request.logout.bind(
+                  request
+                ) as AuthContext["passport"]["logout"],
+              },
             },
-          },
-          request,
-          reply
-        ),
+            request,
+            reply
+          )
+        )),
       };
 
       const model = this.syncer.models[api.modelName];
@@ -461,24 +459,46 @@ class SonamuClass {
   }
 
   startWatcher(): void {
-    const watchPath = path.join(this.apiRootPath, "src");
-    const chokidar = require("chokidar") as typeof import("chokidar");
+    const watchPath = [
+      path.join(this.apiRootPath, "src"),
+      path.join(this.apiRootPath, "sonamu.config.ts"),
+    ];
+
     this.watcher = chokidar.watch(watchPath, {
       ignored: (path, stats) =>
-        (!!stats?.isFile() &&
-          !path.endsWith(".ts") &&
-          !path.endsWith(".json")) ||
-        path.endsWith("src/index.ts"),
+        !!stats?.isFile() && !path.endsWith(".ts") && !path.endsWith(".json"),
       persistent: true,
       ignoreInitial: true,
     });
+
     this.watcher.on("all", async (event: string, filePath: string) => {
+      const absolutePath = filePath as AbsolutePath;
+      assert(
+        absolutePath.startsWith(this.apiRootPath),
+        "File path is not within the API root path"
+      );
+
       if (event !== "change" && event !== "add") {
         return;
       }
 
       try {
-        await this.handleFileChange(event, filePath);
+        // sonamu.config.ts 변경 시 재시작
+        const isConfigTs =
+          filePath === path.join(this.apiRootPath, "sonamu.config.ts");
+
+        if (isConfigTs) {
+          const relativePath = filePath.replace(this.apiRootPath, "api");
+          console.log(
+            chalk.bold(
+              `Detected(${event}): ${chalk.blue(relativePath)} - Restarting...`
+            )
+          );
+          process.kill(process.pid, "SIGUSR2");
+          return;
+        }
+
+        await this.handleFileChange(event, absolutePath);
       } catch (e) {
         console.error(e);
       }
@@ -595,19 +615,18 @@ class SonamuClass {
 
   private async handleFileChange(
     event: string,
-    filePath: string
+    filePath: AbsolutePath
   ): Promise<void> {
     // 첫 번째 파일이면 HMR 시작 시간 기록
     if (this.pendingFiles.length === 0) {
       this.hmrStartTime = Date.now();
     }
-
     this.pendingFiles.push(filePath);
 
-    const relativePath = filePath.replace(this.apiRootPath, "api");
+    const relativePath = path.relative(this.apiRootPath, filePath);
     console.log(chalk.bold(`Detected(${event}): ${chalk.blue(relativePath)}`));
 
-    await this.syncer.syncFromWatcher([filePath]);
+    await this.syncer.syncFromWatcher(event, filePath);
 
     // 처리 완료된 파일을 대기 목록에서 제거
     this.pendingFiles = this.pendingFiles.slice(1);
@@ -619,20 +638,16 @@ class SonamuClass {
   }
 
   private async finishHMR(): Promise<void> {
-    await this.syncer.saveChecksums(await this.syncer.getCurrentChecksums());
+    await this.syncer.renewChecksums();
 
     const endTime = Date.now();
     const totalTime = endTime - this.hmrStartTime;
     const msg = `HMR Done! ${chalk.bold.white(`${totalTime}ms`)}`;
-    const margin = Math.max(0, (process.stdout.columns - msg.length) / 2);
 
-    console.log(
-      chalk.black.bgGreen(" ".repeat(margin) + msg + " ".repeat(margin))
-    );
+    console.log(chalk.black.bgGreen(centerText(msg)));
   }
 
   async destroy(): Promise<void> {
-    const { BaseModel } = require("../database/base-model");
     await BaseModel.destroy();
     await this.watcher?.close();
     this.storage?.destroy();

package/src/bin/build-config.ts

@@ -5,8 +5,9 @@ export const BUILD_DIR = "dist";
 
 /**
  * SWC 빌드 명령어
+ * .swcrc 설정 사용
  */
-export const SWC_BUILD_COMMAND = `swc src -d ${BUILD_DIR} --strip-leading-paths --source-maps -C module.type=commonjs -C jsc.parser.syntax=typescript -C jsc.parser.decorators=true -C jsc.target=es5`;
+export const SWC_BUILD_COMMAND = `swc src -d ${BUILD_DIR} --strip-leading-paths`;
 
 /**
  * TSC 타입 체크 명령어

package/src/bin/cli-wrapper.ts

@@ -10,7 +10,7 @@ import {
   TSC_TYPE_CHECK_COMMAND,
 } from "./build-config";
 
-const scriptPath = resolve(__dirname, "cli.js");
+const scriptPath = resolve(import.meta.dirname, "cli.js");
 const args = process.argv.slice(2);
 
 // build 명령어는 dist 없이도 실행 가능하도록 cli.ts 외부에서 처리(Sonamu.init에서 dist 필요)
@@ -56,7 +56,7 @@ if (args[0] === "build") {
 }
 
 if (args[0] === "dev:serve") {
-  build();
+  // build();
 }
 
 if (!existsSync(scriptPath)) {
@@ -66,7 +66,14 @@ if (!existsSync(scriptPath)) {
 
 const result = spawnSync(
   process.execPath,
-  ["-r", "source-map-support/register", "--no-warnings", scriptPath, ...args],
+  [
+    "--import",
+    "@sonamu-kit/loader", // Sonamu UI도 syncer를 다루므로, ts 로드 능력이 필요합니다.
+    "--enable-source-maps",
+    "--no-warnings",
+    scriptPath,
+    ...args
+  ],
   {
     stdio: "inherit",
   }

package/src/bin/cli.ts

@@ -3,25 +3,24 @@ import dotenv from "dotenv";
 dotenv.config();
 
 import path from "path";
+import { fileURLToPath } from "url";
 import { tsicli } from "tsicli";
-import { execSync } from "child_process";
-import { mkdir, readdir, readFile, writeFile } from "fs/promises";
+import { execSync, spawn } from "child_process";
+import { mkdir, readdir, writeFile } from "fs/promises";
 import { exists } from "../utils/fs-utils";
 import process from "process";
 import { Sonamu } from "../api";
 import knex, { Knex } from "knex";
-import { findApiRootPath } from "../utils/utils";
 import { EntityManager } from "../entity/entity-manager";
 import { Migrator } from "../migration/migrator";
 import { FixtureManager } from "../testing/fixture-manager";
-// import { SWC_BUILD_COMMAND } from "./build-config";
-import { NodemonSettings } from "nodemon";
+import { findApiRootPath } from "../utils/utils";
 
 let migrator: Migrator;
 
 async function bootstrap() {
-  // dev:serve 명령어가 아닌 경우에만 Sonamu 초기화
-  if (process.argv[2] !== "dev:serve") {
+  // dev 명령어가 아닌 경우에만 Sonamu 초기화
+  if (process.argv[2] !== "dev") {
     await Sonamu.init(false, false);
   }
 
@@ -56,8 +55,8 @@ async function bootstrap() {
       ["scaffold", "view_list", "#entityId"],
       ["scaffold", "view_form", "#entityId"],
       ["ui"],
-      ["dev:serve"],
-      ["serve"],
+      ["dev"],
+      ["start"],
     ],
     runners: {
       migrate_run,
@@ -76,8 +75,8 @@ async function bootstrap() {
       ui,
       // scaffold_view_list,
       // scaffold_view_form,
-      "dev:serve": dev_serve,
-      serve,
+      dev,
+      start,
     },
   });
 }
@@ -88,45 +87,57 @@ bootstrap().finally(async () => {
   await FixtureManager.destroy();
 });
 
-async function dev_serve() {
-  const nodemon = await import("nodemon");
+async function dev() {
+  const apiRoot = findApiRootPath();
+  const entryPoint = 'src/index.ts';   
 
-  const nodemonConfig = await (async () => {
-    const projectNodemonPath = path.join(findApiRootPath(), "nodemon.json");
-    const hasProjectNodemon = await exists(projectNodemonPath);
+  console.log(chalk.yellow.bold('🚀 Starting Sonamu dev server...\n'));
 
-    if (hasProjectNodemon) {
-      return JSON.parse(await readFile(projectNodemonPath, "utf8"));
+  const serverProcess = spawn(
+    "hot-runner",
+    [
+      "--clear-screen=false",
+      "--node-args=--import=@sonamu-kit/loader",
+      "--node-args=--import=sonamu/hot-hook-register",
+      "--node-args=--enable-source-maps",
+      entryPoint,
+    ],
+    {
+      cwd: apiRoot,
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        NODE_ENV: "development",
+        HOT: "yes",
+        API_ROOT_PATH: apiRoot,
+      },
     }
+  );
 
-    return {
-      watch: ["src/index.ts"],
-      ignore: ["dist/**", "**/*.js", "**/*.d.ts"],
-      exec: [
-        // SWC_BUILD_COMMAND,
-        "node --no-warnings -r source-map-support/register -r dotenv/config dist/index.js",
-      ].join(" && "),
-    } as NodemonSettings;
-  })();
-  nodemon.default(nodemonConfig);
-
-  // 프로세스 종료 처리
-  const cleanup = async () => {
-    await Sonamu.server?.close();
+  // 종료 처리
+  const cleanup = () => {
+    console.log(chalk.yellow('\n\n👋 Shutting down...'));
+    serverProcess.kill('SIGTERM');
     process.exit(0);
   };
 
-  process.on("SIGINT", cleanup);
-  process.on("SIGTERM", cleanup);
-  process.on("SIGUSR2", cleanup);
+  process.on('SIGINT', cleanup);
+  process.on('SIGTERM', cleanup);
+
+  serverProcess.on('exit', (code) => {
+    if (code !== 0) {
+      console.error(chalk.red(`❌ Server exited with code ${code}`));
+      process.exit(code || 1);
+    }
+  });
 }
 
-async function serve() {
-  const distIndexPath = path.join(Sonamu.apiRootPath, "dist", "index.js");
+async function start() {
+  const entryPoint = 'dist/index.js';  
 
-  if (!(await exists(distIndexPath))) {
+  if (!(await exists(entryPoint))) {
     console.log(
-      chalk.red("dist/index.js not found. Please build your project first.")
+      chalk.red(`${entryPoint} not found. Please build your project first.`)
     );
     console.log(chalk.blue("Run: yarn sonamu build"));
     return;
@@ -135,7 +146,7 @@ async function serve() {
   const { spawn } = await import("child_process");
   const serverProcess = spawn(
     "node",
-    ["-r", "source-map-support/register", "-r", "dotenv/config", distIndexPath],
+    ["--enable-source-maps", "-r", "dotenv/config", entryPoint],
     {
       cwd: Sonamu.apiRootPath,
       stdio: "inherit",
@@ -162,14 +173,12 @@ async function setupFixtureManager() {
 async function migrate_run() {
   await setupMigrator();
 
-  await migrator.cleanUpDist();
   await migrator.run();
 }
 
 async function migrate_check() {
   await setupMigrator();
 
-  await migrator.cleanUpDist();
   await migrator.check();
 }
 
@@ -347,7 +356,7 @@ async function stub_practice(name: string) {
 
   execSync(`code ${dstPath}`);
 
-  const runCode = `yarn node -r dotenv/config -r source-map-support/register dist/practices/${fileName.replace(
+  const runCode = `yarn node -r dotenv/config --enable-source-maps dist/practices/${fileName.replace(
     ".ts",
     ".js"
   )}`;
@@ -373,23 +382,66 @@ async function scaffold_model_test(entityId: string) {
 
 async function ui() {
   try {
-    type StartServersOptions = {
-      projectName: string;
-      apiRootPath: string;
-      port: number;
+    // @sonamu-kit/ui의 run-ui.ts 스크립트 경로 찾기
+    const uiModulePath = await import.meta.resolve("@sonamu-kit/ui");
+    const uiNodePath = path.join(
+      path.dirname(fileURLToPath(uiModulePath)),
+      "run-ui.js"
+    );
+
+    if (!(await exists(uiNodePath))) {
+      console.log(
+        chalk.red(
+          `UI runner script not found at ${uiNodePath}. Please rebuild @sonamu-kit/ui.`
+        )
+      );
+      return;
+    }
+
+    // UI를 별도 프로세스로 실행 (hot-hook 활성화)
+    const uiProcess = spawn(
+      process.execPath,
+      [
+        "--import", "@sonamu-kit/loader",
+        "--import", "sonamu/hot-hook-register",
+        "--enable-source-maps",
+        "--no-warnings",
+        uiNodePath,
+      ],
+      {
+        stdio: "inherit",
+        env: {
+          ...process.env,
+          HOT: "yes",
+          PROJECT_NAME:
+            Sonamu.config.projectName ?? path.basename(Sonamu.apiRootPath),
+          API_ROOT_PATH: Sonamu.apiRootPath,
+          UI_PORT: (Sonamu.config.ui?.port ?? 57000).toString(),
+        },
+      }
+    );
+
+    // 종료 처리
+    const cleanup = () => {
+      console.log(chalk.yellow("\n\n👋 Shutting down UI server..."));
+      uiProcess.kill("SIGTERM");
+      process.exit(0);
     };
-    const sonamuUI: {
-      startServers: (options: StartServersOptions) => void;
-    } = await import("@sonamu-kit/ui" as string);
-    sonamuUI.startServers({
-      projectName:
-        Sonamu.config.projectName ?? path.basename(Sonamu.apiRootPath),
-      apiRootPath: Sonamu.apiRootPath,
-      port: Sonamu.config.ui?.port ?? 57000,
+
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
+
+    uiProcess.on("exit", (code) => {
+      if (code !== 0) {
+        console.error(chalk.red(`❌ UI server exited with code ${code}`));
+        process.exit(code || 1);
+      }
     });
   } catch (e: unknown) {
     if (e instanceof Error && e.message.includes("isn't declared")) {
-      console.log(`You need to install ${chalk.blue(`@sonamu-kit/ui`)} first.`);
+      console.log(
+        `You need to install ${chalk.blue(`@sonamu-kit/ui`)} first.`
+      );
       return;
     }
     throw e;

package/src/bin/hot-hook-register.ts

@@ -0,0 +1,22 @@
+/**
+ * hot-hook 초기화하는 모듈입니다.
+ *
+ * 이 파일은 --import 플래그로 프로세스 시작 시 로드되어야 합니다.
+ *
+ * 환경변수:
+ * - API_ROOT_PATH: 사용자 프로젝트의 API 루트 경로
+ * - HOT: 'yes'일 때만 hot-hook 활성화
+ */
+
+if (process.env.HOT === "yes" && process.env.API_ROOT_PATH) {
+  const { hot } = await import("@sonamu-kit/hot-hook");
+
+  await hot.init({
+    rootDirectory: process.env.API_ROOT_PATH, // 이 친구가 프로젝트 API 경로로 잘 설정되어야 아래 바운더리가 작동합니다.
+    boundaries: [`./src/**/*.ts`], // 프로젝트의 이 친구들이 바운더리가 됩니다.
+  });
+
+  console.log("🔥 Hot-hook initialized");
+}
+
+export {};

package/src/database/base-model.ts

@@ -1,6 +1,6 @@
 import { DateTime } from "luxon";
 import { Knex } from "knex";
-import { chunk, groupBy, isObject, omit, set, uniq } from "lodash";
+import { chunk, groupBy, isObject, omit, set, uniq } from "lodash-es";
 import { DBPreset, DB } from "./db";
 import { isCustomJoinClause, type SubsetQuery } from "../types/types";
 import type { BaseListParams } from "../utils/model";