sonamu 0.7.11 → 0.7.13

package/src/bin/cli.ts

@@ -22,66 +22,68 @@ import { BUILD_DIR, SWC_BUILD_COMMAND, TSC_TYPE_CHECK_COMMAND } from "./build-co
 let migrator: Migrator;
 
 async function bootstrap() {
-  const notToInit = ["dev", "build", "start", "ui"].includes(process.argv[2] ?? "");
+  const notToInit = ["dev", "build", "start"].includes(process.argv[2] ?? "");
   if (!notToInit) {
     await Sonamu.init(false, false);
   }
 
-  await tsicli(process.argv, {
-    types: {
-      "#entityId": {
-        type: "autocomplete",
-        name: "#entityId",
-        message: "Please input #entityId",
-        choices: EntityManager.getAllParentIds().map((entityId) => ({
-          title: entityId,
-          value: entityId,
-        })),
+  try {
+    await tsicli(process.argv, {
+      types: {
+        "#entityId": {
+          type: "autocomplete",
+          name: "#entityId",
+          message: "Please input #entityId",
+          choices: EntityManager.getAllParentIds().map((entityId) => ({
+            title: entityId,
+            value: entityId,
+          })),
+        },
+        "#recordIds": "number[]",
+        "#name": "string",
       },
-      "#recordIds": "number[]",
-      "#name": "string",
-    },
-    args: [
-      ["fixture", "init"],
-      ["fixture", "import", "#entityId", "#recordIds"],
-      ["fixture", "sync"],
-      ["migrate", "run"],
-      ["migrate", "check"],
-      ["migrate", "rollback"],
-      ["migrate", "reset"],
-      ["migrate", "clear"],
-      ["migrate", "status"],
-      ["stub", "practice", "#name"],
-      ["stub", "entity", "#name"],
-      ["scaffold", "model", "#entityId"],
-      ["scaffold", "model_test", "#entityId"],
-      ["scaffold", "view_list", "#entityId"],
-      ["scaffold", "view_form", "#entityId"],
-      ["ui"],
-      ["sync"],
-      ["dev"],
-      ["build"],
-      ["start"],
-    ],
-    runners: {
-      migrate_status,
-      migrate_run,
-      fixture_init,
-      fixture_import,
-      fixture_sync,
-      stub_practice,
-      stub_entity,
-      scaffold_model,
-      scaffold_model_test,
-      ui,
-      // scaffold_view_list,
-      // scaffold_view_form,
-      sync,
-      dev,
-      build,
-      start,
-    },
-  });
+      args: [
+        ["fixture", "init"],
+        ["fixture", "import", "#entityId", "#recordIds"],
+        ["fixture", "sync"],
+        ["migrate", "run"],
+        ["migrate", "check"],
+        ["migrate", "rollback"],
+        ["migrate", "reset"],
+        ["migrate", "clear"],
+        ["migrate", "status"],
+        ["stub", "practice", "#name"],
+        ["stub", "entity", "#name"],
+        ["scaffold", "model", "#entityId"],
+        ["scaffold", "model_test", "#entityId"],
+        ["scaffold", "view_list", "#entityId"],
+        ["scaffold", "view_form", "#entityId"],
+        ["sync"],
+        ["dev"],
+        ["build"],
+        ["start"],
+      ],
+      runners: {
+        migrate_status,
+        migrate_run,
+        fixture_init,
+        fixture_import,
+        fixture_sync,
+        stub_practice,
+        stub_entity,
+        scaffold_model,
+        scaffold_model_test,
+        // scaffold_view_list,
+        // scaffold_view_form,
+        sync,
+        dev,
+        build,
+        start,
+      },
+    });
+  } finally {
+    await Sonamu.destroy();
+  }
 }
 
 bootstrap().finally(async () => {
@@ -448,67 +450,3 @@ async function scaffold_model_test(entityId: string) {
     entityId,
   });
 }
-
-async function ui() {
-  try {
-    const apiRootPath = findApiRootPath();
-
-    // 사용자 프로젝트의 패키지들 중에서 @sonamu-kit/ui를 찾습니다.
-    // 이를 위해서 createRequire를 사용하여 프로젝트 경로 기준으로 resolve합니다.
-    const projectRequire = createRequire(path.join(apiRootPath, "package.json"));
-    const uiPackagePath = projectRequire.resolve("@sonamu-kit/ui"); // 없으면 여기서 터져요(MODULE_NOT_FOUND)
-    const uiNodePath = path.join(path.dirname(uiPackagePath), "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를 별도 프로세스로 실행 (hmr-hook 활성화)
-    const uiProcess = spawn(
-      process.execPath,
-      [
-        "--import",
-        "sonamu/ts-loader-register",
-        "--import",
-        "sonamu/hmr-hook-register",
-        "--enable-source-maps",
-        "--no-warnings",
-        uiNodePath,
-      ],
-      {
-        stdio: "inherit",
-        env: {
-          ...process.env,
-          HOT: "yes",
-          API_ROOT_PATH: apiRootPath, // UI는 얘만 알면 돼요! 나머지는 얘가 떠서 알아서 할 것임 ㅎ
-        },
-      },
-    );
-
-    // 종료 처리
-    const cleanup = () => {
-      console.log(chalk.yellow("\n\n👋 Shutting down UI server..."));
-      uiProcess.kill("SIGTERM");
-      process.exit(0);
-    };
-
-    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.`);
-      return;
-    }
-    throw e;
-  }
-}

package/src/database/base-model.ts

@@ -2,24 +2,13 @@
 
 import type { Knex } from "knex";
 import { group, isObject, omit, set } from "radashi";
+import type { ListResult } from "..";
 import { Sonamu } from "../api";
-import { EntityManager } from "../entity/entity-manager";
-import type { DatabaseSchemaExtend } from "../types/types";
+import type { DatabaseSchemaExtend, SonamuQueryMode } from "../types/types";
 import { getJoinTables, getTableNamesFromWhere } from "../utils/sql-parser";
 import { chunk } from "../utils/utils";
-import type {
-  EmbeddingItem,
-  EmbeddingProvider,
-  HybridSearchOptions,
-  HybridSearchResult,
-  ProgressCallback,
-  VectorSearchOptions,
-  VectorSearchResult,
-} from "../vector/types";
-import { VectorSearch } from "../vector/vector-search";
 import type {
   EnhancerMap,
-  ExecuteSubsetQueryResult,
   ResolveSubsetIntersection,
   UnionExtractedTTables,
 } from "./base-model.types";
@@ -69,118 +58,7 @@ export class BaseModelClass<
     return new PuriWrapper(db, new UpsertBuilder());
   }
 
-  // VectorSearch 인스턴스 캐시
-  private _vectorSearch: VectorSearch<any> | null = null;
-
-  /**
-   * 벡터 검색 인스턴스 반환
-   * - 기본 provider: voyage
-   * - 기본 dimensions: 1024 (DEFAULT_VECTOR_CONFIG 사용)
-   */
-  getVector<T = Record<string, unknown>>(): VectorSearch<T> {
-    if (this._vectorSearch) {
-      return this._vectorSearch as VectorSearch<T>;
-    }
-
-    const entity = EntityManager.get(this.modelName);
-
-    this._vectorSearch = new VectorSearch<T>(this.getDB("w"), entity.table);
-
-    return this._vectorSearch as VectorSearch<T>;
-  }
-
-  /**
-   * 벡터 검색 (코사인 유사도)
-   * @param query - 검색어
-   * @param options - 검색 옵션
-   */
-  async vectorSearch<T = Record<string, unknown>>(
-    query: string,
-    options: VectorSearchOptions & { provider?: EmbeddingProvider } = {},
-  ): Promise<VectorSearchResult<T>[]> {
-    const entity = EntityManager.get(this.modelName);
-    const vectorProp = entity.getVectorColumn();
-    if (!vectorProp) {
-      throw new Error(`${this.modelName} Entity에 vector 컬럼이 정의되지 않았습니다.`);
-    }
-
-    const vs = new VectorSearch<T>(this.getDB("w"), entity.table);
-    return vs.search(query, options.provider ?? "voyage", {
-      ...options,
-      embeddingColumn: options.embeddingColumn ?? vectorProp.name,
-    });
-  }
-
-  /**
-   * 하이브리드 검색 (Vector + FTS)
-   * @param query - 검색어
-   * @param options - 검색 옵션
-   */
-  async hybridSearch<T = Record<string, unknown>>(
-    query: string,
-    options: HybridSearchOptions & { provider?: EmbeddingProvider } = {},
-  ): Promise<HybridSearchResult<T>[]> {
-    const entity = EntityManager.get(this.modelName);
-    const vectorProp = entity.getVectorColumn();
-    if (!vectorProp) {
-      throw new Error(`${this.modelName} Entity에 vector 컬럼이 정의되지 않았습니다.`);
-    }
-
-    const vs = new VectorSearch<T>(this.getDB("w"), entity.table);
-    return vs.hybridSearch(query, options.provider ?? "voyage", {
-      ...options,
-      embeddingColumn: options.embeddingColumn ?? vectorProp.name,
-    });
-  }
-
-  /**
-   * 단일 레코드에 임베딩 저장
-   * @param id - 레코드 ID
-   * @param text - 임베딩할 텍스트
-   * @param options - provider, embeddingColumn 옵션
-   */
-  async saveEmbedding(
-    id: number,
-    text: string,
-    options: { provider?: EmbeddingProvider; embeddingColumn?: string } = {},
-  ): Promise<void> {
-    const entity = EntityManager.get(this.modelName);
-    const vectorProp = entity.getVectorColumn(options.embeddingColumn);
-    if (!vectorProp) {
-      throw new Error(`${this.modelName} Entity에 vector 컬럼이 정의되지 않았습니다.`);
-    }
-
-    const { provider = "voyage" } = options;
-    const vs = this.getVector();
-    return vs.saveEmbedding(id, text, provider, vectorProp.name);
-  }
-
-  /**
-   * 여러 레코드에 임베딩 일괄 저장
-   * @param items - { id, text } 배열
-   * @param options - provider, embeddingColumn, onProgress 옵션
-   */
-  async saveEmbeddingsBatch(
-    items: EmbeddingItem[],
-    options: {
-      provider?: EmbeddingProvider;
-      embeddingColumn?: string;
-      onProgress?: ProgressCallback;
-    } = {},
-  ): Promise<void> {
-    const entity = EntityManager.get(this.modelName);
-    const vectorProp = entity.getVectorColumn(options.embeddingColumn);
-    if (!vectorProp) {
-      throw new Error(`${this.modelName} Entity에 vector 컬럼이 정의되지 않았습니다.`);
-    }
-
-    const { provider = "voyage", onProgress } = options;
-    const vs = this.getVector();
-    return vs.saveEmbeddingsBatch(items, provider, vectorProp.name, onProgress);
-  }
-
   async destroy() {
-    this._vectorSearch = null;
     return DB.destroy();
   }
 
@@ -275,6 +153,11 @@ export class BaseModelClass<
   async executeSubsetQuery<
     T extends TSubsetKey,
     TComputedResults extends InferAllSubsets<TSubsetQueries, TLoaderQueries>,
+    LP extends {
+      num?: number;
+      page?: number;
+      queryMode?: SonamuQueryMode;
+    },
   >(
     params: {
       subset: T;
@@ -282,12 +165,12 @@ export class BaseModelClass<
       params: {
         num: number;
         page: number;
-        queryMode?: "list" | "count" | "both";
+        queryMode?: SonamuQueryMode;
       };
       debug?: boolean;
       optimizeCountQuery?: boolean;
     } & EnhancerParam<TSubsetKey, TComputedResults, TSubsetMapping>,
-  ): Promise<ExecuteSubsetQueryResult<TSubsetMapping, T>> {
+  ): Promise<ListResult<LP, TSubsetMapping[T]>> {
     const { subset, qb, params: queryParams, debug = false, optimizeCountQuery = false } = params;
 
     if (!this.loaderQueries) {
@@ -296,9 +179,13 @@ export class BaseModelClass<
 
     const { num, page } = queryParams;
 
-    // COUNT 쿼리 실행
+    // COUNT 쿼리 실행 (queryMode: list일 때는 0 리턴)
     const total = await this.executeCountQuery(qb, queryParams, debug, optimizeCountQuery);
 
+    if (queryParams?.queryMode === "count") {
+      return { total } as ListResult<LP, TSubsetMapping[T]>;
+    }
+
     // LIST 쿼리 실행
     const computedRows = await this.executeListQuery(subset, qb, queryParams, num, page, debug);
 
@@ -308,7 +195,13 @@ export class BaseModelClass<
       computedRows.map((row) => enhancer?.(row) ?? row),
     )) as TSubsetMapping[T][];
 
-    return { rows, total };
+    if (queryParams.queryMode === "list") {
+      // 리스트만 리턴
+      return { rows } as ListResult<LP, TSubsetMapping[T]>;
+    } else {
+      // 둘다 리턴
+      return { rows, total } as ListResult<LP, TSubsetMapping[T]>;
+    }
   }
 
   /**

package/src/database/base-model.types.ts

@@ -7,6 +7,7 @@
  * Enhancer, SubsetQuery 교집합 등 Model 계층에서 필요한 타입 정의.
  */
 
+import type { ListResult } from "..";
 import type { DatabaseSchemaExtend } from "../types/types";
 import type { Puri } from "./puri";
 import type { PuriSubsetFn } from "./puri-subset.types";
@@ -151,7 +152,5 @@ export type ExecuteSubsetQueryParams<
 export type ExecuteSubsetQueryResult<
   TSubsetMapping extends Record<string, any>,
   T extends string,
-> = {
-  rows: TSubsetMapping[T][];
-  total: number;
-};
+  LP extends { queryMode?: "list" | "count" | "both" },
+> = ListResult<LP, TSubsetMapping[T]>;

package/src/database/db.ts

@@ -56,30 +56,40 @@ export class DBClass {
     const instanceName = which === "w" ? "wdb" : "rdb";
 
     if (!this[instanceName]) {
-      let config: Knex.Config;
-      switch (process.env.NODE_ENV ?? "development") {
-        case "development":
-        case "staging":
-          config =
-            which === "w"
-              ? dbConfig.development_master
-              : (dbConfig.development_slave ?? dbConfig.development_master);
-          break;
-        case "production":
-          config =
-            which === "w"
-              ? dbConfig.production_master
-              : (dbConfig.production_slave ?? dbConfig.production_master);
-          break;
-        default:
-          throw new Error(`현재 ENV ${process.env.NODE_ENV}에는 설정 가능한 DB설정이 없습니다.`);
-      }
+      const config = this.getDBConfig(which);
       this[instanceName] = knex(config);
     }
 
     return this[instanceName];
   }
 
+  getDBConfig(which: DBPreset): Knex.Config {
+    const dbConfig = Sonamu.dbConfig;
+    if (process.env.NODE_ENV === "test") {
+      return {
+        ...dbConfig.test,
+        // 단일 풀
+        pool: {
+          min: 1,
+          max: 1,
+        },
+      };
+    }
+    switch (process.env.NODE_ENV ?? "development") {
+      case "development":
+      case "staging":
+        return which === "w"
+          ? dbConfig.development_master
+          : (dbConfig.development_slave ?? dbConfig.development_master);
+      case "production":
+        return which === "w"
+          ? dbConfig.production_master
+          : (dbConfig.production_slave ?? dbConfig.production_master);
+      default:
+        throw new Error(`현재 ENV ${process.env.NODE_ENV}에는 설정 가능한 DB설정이 없습니다.`);
+    }
+  }
+
   async destroy(): Promise<void> {
     if (this.wdb !== undefined) {
       await this.wdb.destroy();

package/src/database/puri-subset.test-d.ts

@@ -4,6 +4,7 @@ import type { Puri } from "./puri";
 import type { Hydrate, InferAllSubsets, LoadersResult } from "./puri-subset.types";
 import type { PuriWrapper } from "./puri-wrapper";
 
+/** biome-ignore lint/suspicious/noExplicitAny: Puri Subset 타입 시스템에서 any를 허용함 */
 type MockPuri<T> = Puri<DatabaseSchemaExtend, any, T>;
 
 describe("Hydrate", () => {

package/src/database/puri-subset.types.ts

@@ -1,3 +1,5 @@
+/** biome-ignore-all lint/suspicious/noExplicitAny: Puri Subset 타입 시스템에서 any를 허용함 */
+
 /**
  * Puri Subset 타입 시스템
  *