sonamu 0.5.7 → 0.6.0

package/src/database/puri.types.ts

@@ -1,9 +1,9 @@
+import { DatabaseSchemaExtend } from "../types/types";
+import { Puri } from "./puri";
+import { PuriWrapper } from "./puri-wrapper";
+
 // 메타데이터 컬럼 제외
-type ExcludeMetadataColumns<T> = T extends {
-  __fulltext__: readonly (infer _Col)[];
-}
-  ? Omit<T, "__fulltext__">
-  : T;
+type ExcludeMetadataColumns<T> = Exclude<T, "__fulltext__">;
 
 // TTables의 모든 테이블에서 사용 가능한 컬럼 경로
 export type AvailableColumns<TTables extends Record<string, any>> =
@@ -124,3 +124,16 @@ type NullableToOptional<T> = {
 export type InsertData<T> = NullableToOptional<
   Omit<T, "id" | "created_at" | "__fulltext__">
 >;
+
+// SubsetQuery를 위한 타입 유틸리티
+type ExtractTTables<T extends Puri<any, any, any>> =
+  T extends Puri<any, infer TTables, any> ? TTables : never;
+export type UnionExtractedTTables<
+  SubsetKey extends string,
+  SubsetQueries extends Record<
+    SubsetKey,
+    (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => Puri<any, any, any>
+  >,
+> = {
+  [K in SubsetKey]: ExtractTTables<ReturnType<SubsetQueries[K]>>;
+}[SubsetKey];

package/src/database/upsert-builder.ts

@@ -1,5 +1,5 @@
 import { randomUUID } from "crypto";
-import _ from "lodash";
+import * as _ from "lodash-es";
 import { Knex } from "knex";
 import { EntityManager } from "../entity/entity-manager";
 import { nonNullable } from "../utils/utils";

package/src/entity/entity-manager.ts

@@ -1,12 +1,13 @@
-import chalk from "chalk";
 import { glob } from "fs/promises";
 import inflection from "inflection";
-import _ from "lodash";
+import * as _ from "lodash-es";
 import path from "path";
 import { Entity } from "./entity";
 import { EntityJson } from "../types/types";
 import { Sonamu } from "../api/sonamu";
 import { readFile } from "fs/promises";
+import { AbsolutePath } from "../utils/path-utils";
+import assert from "assert";
 
 export type EntityNamesRecord = Record<
   | "fs"
@@ -30,7 +31,7 @@ class EntityManagerClass {
   public isAutoloaded: boolean = false;
 
   // 경로 전달받아 모든 entity.json 파일 로드
-  async autoload(doSilent: boolean = false) {
+  async autoload(_: boolean = false) {
     if (this.isAutoloaded) {
       return;
     }
@@ -38,30 +39,28 @@ class EntityManagerClass {
       Sonamu.apiRootPath,
       "/src/application/**/*.entity.json"
     );
-    !doSilent && console.log(chalk.yellow(`autoload ${pathPattern}`));
 
+    let count = 0;
     for await (const file of glob(path.resolve(pathPattern!))) {
       await this.register(JSON.parse((await readFile(file)).toString()));
+      count++;
     }
+    // !doSilent &&
+    //   console.log(
+    //     chalk.gray(
+    //       `[Loading] Loaded entity definitions from "*.entity.json" files: ${count} files.`
+    //     )
+    //   );
+
     this.isAutoloaded = true;
   }
 
   async reload(doSilent: boolean = false) {
-    console.log("reload");
     this.entities.clear();
     this.modulePaths.clear();
     this.tableSpecs.clear();
     this.isAutoloaded = false;
 
-    const sonamuPath = path.join(
-      Sonamu.apiRootPath,
-      `dist/application/sonamu.generated.js`
-    );
-    // CJS
-    if (require?.cache && require.cache[sonamuPath]) {
-      delete require.cache[sonamuPath];
-    }
-
     return await this.autoload(doSilent);
   }
 
@@ -70,7 +69,6 @@ class EntityManagerClass {
     await entity.registerModulePaths();
     entity.registerTableSpecs();
     this.entities.set(json.id, entity);
-    // console.debug(chalk.cyan(`register :: ${entity.id}`));
   }
 
   get(entityId: string): Entity {
@@ -152,6 +150,12 @@ class EntityManagerClass {
       constant: inflection.underscore(entityId).toUpperCase(),
     };
   }
+
+  getEntityIdFromPath(filePath: AbsolutePath): string {
+    const matched = filePath.match(/application\/(.+)\//);
+    assert(matched?.[1]);
+    return inflection.camelize(matched[1].replace(/\-/g, "_"));
+  }
 }
 
 export const EntityManager = new EntityManagerClass();

package/src/entity/entity.ts

@@ -1,4 +1,5 @@
-import _ from "lodash";
+import * as _ from "lodash-es";
+import { createImportUrl } from "../utils/esm-utils";
 import { EntityManager as EntityManager } from "./entity-manager";
 import {
   EntityProp,
@@ -553,8 +554,8 @@ export class Entity {
     );
 
     if (await exists(typesFileDistPath)) {
-      const importPath = path.relative(__dirname, typesFileDistPath);
-      const t = await import(importPath);
+      const importUrl = createImportUrl(typesFileDistPath);
+      const t = await import(importUrl);
       this.types = Object.keys(t).reduce((result, key) => {
         EntityManager.setModulePath(key, typesModulePath);
         return {

package/src/index.ts

@@ -1,4 +1,5 @@
 export type * from "./api/context";
+export * from "./api/config";
 export * from "./api/decorators";
 export * from "./api/sonamu";
 export * from "./database/base-model";
@@ -21,6 +22,7 @@ export * from "./entity/entity";
 export * from "./migration/migrator";
 export * from "./migration/types";
 export * from "./file-storage/driver";
+export * from "./naite/naite";
 
 // export * from "./api/code-converters";
 // export * from "./entity/entity-utils";

package/src/migration/code-generation.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import * as _ from "lodash-es";
 import prettier from "prettier";
 import equal from "fast-deep-equal";
 import {

package/src/migration/migration-set.ts

@@ -1,6 +1,6 @@
 import { Knex } from "knex";
 import { DBColumn, DBForeign, DBIndex } from "./types";
-import _ from "lodash";
+import * as _ from "lodash-es";
 import inflection from "inflection";
 import { Entity } from "../entity/entity";
 import { EntityManager } from "../entity/entity-manager";

package/src/migration/migrator.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import * as _ from "lodash-es";
 import knex, { Knex } from "knex";
 import chalk from "chalk";
 import { DateTime } from "luxon";
@@ -73,63 +73,24 @@ export class Migrator {
     }
   }
 
-  private async getMigrationCodes(): Promise<{
-    normal: MigrationCode[];
-    onlyTs: MigrationCode[];
-    onlyJs: MigrationCode[];
-  }> {
-    const srcMigrationsDir = `${Sonamu.apiRootPath}/src/migrations`;
-    const distMigrationsDir = `${Sonamu.apiRootPath}/dist/migrations`;
+  private async getMigrationCodes(): Promise<MigrationCode[]> {
+    const srcMigrationsDir = path.join(Sonamu.apiRootPath, "src", "migrations"); // 이건 환경에 관계없이 항상 src에서 찾아야 해요.
 
     if (!(await exists(srcMigrationsDir))) {
       await mkdir(srcMigrationsDir, {
         recursive: true,
       });
     }
-    if (!(await exists(distMigrationsDir))) {
-      await mkdir(distMigrationsDir, {
-        recursive: true,
-      });
-    }
-    const srcMigrations = (await readdir(srcMigrationsDir))
-      .filter((f) => f.endsWith(".ts"))
-      .map((f) => f.split(".")[0]);
-    const distMigrations = (await readdir(distMigrationsDir))
-      .filter((f) => f.endsWith(".js"))
-      .map((f) => f.split(".")[0]);
-
-    const normal = _.intersection(srcMigrations, distMigrations)
-      .map((filename) => {
-        return {
-          name: filename,
-          path: path.join(srcMigrationsDir, filename) + ".ts",
-        };
-      })
-      .sort((a, b) => (a > b ? 1 : -1));
 
-    const onlyTs = _.difference(srcMigrations, distMigrations).map(
-      (filename) => {
-        return {
-          name: filename,
-          path: path.join(srcMigrationsDir, filename) + ".ts",
-        };
-      }
-    );
-
-    const onlyJs = _.difference(distMigrations, srcMigrations).map(
-      (filename) => {
-        return {
-          name: filename,
-          path: path.join(distMigrationsDir, filename) + ".js",
-        };
-      }
-    );
+    const codes = (await readdir(srcMigrationsDir))
+      .filter((f) => f.endsWith(".ts"))
+      .map((f) => ({
+        name: f.replace(".ts", ""),
+        path: path.join(srcMigrationsDir, f),
+      }))
+      .sort((a, b) => (a.name < b.name ? 1 : -1)); // 이름 내림차순 정렬(최신순)
 
-    return {
-      normal,
-      onlyTs,
-      onlyJs,
-    };
+    return codes;
   }
 
   /**
@@ -142,25 +103,7 @@ export class Migrator {
    * @returns
    */
   async getStatus(): Promise<MigrationStatus> {
-    const { normal, onlyTs, onlyJs } = await this.getMigrationCodes();
-    if (onlyTs.length > 0) {
-      console.debug({ onlyTs });
-      throw new ServiceUnavailableException(
-        `There are un-compiled TS migration files.\nPlease compile them first. You might want to run a development server with HMR.\n\n${onlyTs
-          .map((f) => f.name)
-          .join("\n")}`
-      );
-    }
-    if (onlyJs.length > 0) {
-      console.debug({ onlyJs });
-      await Promise.all(
-        onlyJs.map(async (f) => {
-          execSync(
-            `rm -f ${f.path.replace("/src/", "/dist/").replace(".ts", ".js")}`
-          );
-        })
-      );
-    }
+    const codes = await this.getMigrationCodes();
 
     const connKeys = Object.keys(Sonamu.dbConfig).filter(
       (key) => key.endsWith("_slave") === false
@@ -187,7 +130,7 @@ export class Migrator {
           try {
             const [, fdList] = await tConn.migrate.list();
             return fdList.map((fd: { file: string }) =>
-              fd.file.replace(".js", "")
+              fd.file.replace(".ts", "")
             );
           } catch (err) {
             return [];
@@ -222,6 +165,11 @@ export class Migrator {
     const preparedCodes: GenMigrationCode[] = await (async () => {
       const status0conn = statuses.find((status) => status.status === 0);
       if (status0conn === undefined) {
+        console.warn(
+          chalk.yellow(
+            `While trying to prepare migration codes, we found that there is no database to compare migrations. We need at least one database where every migration is applied(status === 0). You might want to apply your existing migrations to one of the databases.`
+          )
+        );
         return [];
       }
 
@@ -235,14 +183,10 @@ export class Migrator {
 
     return {
       conns: statuses,
-      codes: normal,
+      codes,
       preparedCodes,
     };
     /*
-    TS/JS 코드 컴파일 상태 확인
-    1. 원본 파일 없는 JS파일이 존재하는 경우: 삭제
-    2. 컴파일 되지 않은 TS파일이 존재하는 경우: throw 쳐서 데브 서버 오픈 요청
-    
     DB 마이그레이션 상태 확인
     1. 전체 DB설정에 대해서 현재 마이그레이션 상태 확인
     - connKey: string
@@ -355,12 +299,9 @@ export class Migrator {
       );
     }
 
-    const delFiles = codeNames
-      .map((codeName) => [
-        `${Sonamu.apiRootPath}/src/migrations/${codeName}.ts`,
-        `${Sonamu.apiRootPath}/dist/migrations/${codeName}.js`,
-      ])
-      .flat();
+    const delFiles = codeNames.map(
+      (codeName) => `${Sonamu.apiRootPath}/src/migrations/${codeName}.ts`
+    );
 
     const res = await Promise.all(
       delFiles.map(async (delFile) => {
@@ -421,14 +362,13 @@ export class Migrator {
     ];
     const migrationsDir = `${Sonamu.apiRootPath}/src/migrations`;
     const delList = pendingList.map((df) => {
-      return path.join(migrationsDir, df.file).replace(".js", ".ts");
+      return path.join(migrationsDir, df.file);
     });
     for (let p of delList) {
       if (await exists(p)) {
         await unlink(p);
       }
     }
-    await this.cleanUpDist(true);
   }
 
   /**
@@ -553,75 +493,6 @@ export class Migrator {
     console.dir({ rollbackAllResult }, { depth: null });
     console.timeEnd(chalk.red("rollback:"));
   }
-
-  /**
-   * 빌드된 마이그레이션 파일을 삭제합니다.
-   *
-   * CLI에서 사용됩니다.
-   *
-   * @param force 강제 삭제 여부
-   * @returns
-   */
-  async cleanUpDist(force: boolean = false): Promise<void> {
-    async function getFilesUnder(dir: string): Promise<string[]> {
-      const migrationPath = path.join(Sonamu.apiRootPath, dir, "migrations");
-      if (!(await exists(migrationPath))) {
-        await mkdir(migrationPath, {
-          recursive: true,
-        });
-      }
-      return (await readdir(migrationPath)).filter(
-        (filename) => filename.startsWith(".") === false
-      );
-    }
-
-    const files = {
-      src: await getFilesUnder("src"),
-      dist: await getFilesUnder("dist"),
-    };
-
-    const diffOnSrc = _.differenceBy(
-      files.src,
-      files.dist,
-      (filename) => filename.split(".")[0]
-    );
-    if (diffOnSrc.length > 0) {
-      throw new Error(
-        "컴파일 되지 않은 파일이 있습니다.\n" + diffOnSrc.join("\n")
-      );
-    }
-
-    const diffOnDist = _.differenceBy(
-      files.dist,
-      files.src,
-      (filename) => filename.split(".")[0]
-    );
-    if (diffOnDist.length > 0) {
-      console.log(chalk.red("원본 ts파일을 찾을 수 없는 js파일이 있습니다."));
-      console.log(diffOnDist);
-
-      if (!force) {
-        const answer = await prompts({
-          type: "confirm",
-          name: "value",
-          message: "삭제를 진행하시겠습니까?",
-          initial: true,
-        });
-        if (answer.value === false) {
-          return;
-        }
-      }
-
-      const filesToRm = diffOnDist.map((filename) => {
-        return path.join(Sonamu.apiRootPath, "dist", "migrations", filename);
-      });
-      for (const filePath of filesToRm) {
-        await unlink(filePath);
-      }
-      console.log(chalk.green(`${filesToRm.length}건 삭제되었습니다!`));
-    }
-  }
-
   /**
    * Shadow DB 테스트를 진행합니다.
    *

package/src/naite/naite.ts

@@ -0,0 +1,70 @@
+import { Sonamu } from "../api/sonamu";
+
+export class Naite {
+  // 테스트 로그 기록
+  static t(name: string, value: any) {
+    const context = Sonamu.getContext();
+    const store = context?.naiteStore;
+
+    if (!store) {
+      return;
+    }
+    if (store.has(name)) {
+      // 이미 값이 있는 경우
+      if (Array.isArray(store.get(name))) {
+        // 배열에 추가
+        store.set(name, [...store.get(name), value]);
+      } else {
+        // 배열이 아닌 경우 배열로 변환
+        store.set(name, [store.get(name), value]);
+      }
+    } else {
+      // 값이 없는 경우 추가
+      store.set(name, value);
+    }
+  }
+
+  // 테스트에서 값 가져오기
+  static get(name: string): any {
+    const context = Sonamu.getContext();
+    if (!context?.naiteStore || !context.naiteStore.has(name)) {
+      throw new Error(`Naite.get: \`${name}\` not found`);
+    }
+    return context?.naiteStore?.get(name);
+  }
+
+  // 전체 리스트 가져오기
+  static getAll(): { [key: string]: any } {
+    const context = Sonamu.getContext();
+    if (!context?.naiteStore) {
+      return {};
+    }
+    return Object.fromEntries(context.naiteStore.entries());
+  }
+
+  // expect 래퍼 (CJS-ESM 이슈로 현재 사용불가)
+  // static expect(name: string) {
+  //   if (!this.vitestExpect) {
+  //     throw new Error("Vitest is not initialized");
+  //   }
+  //   return this.vitestExpect(this.get(name));
+  // }
+
+  // 일반 로그 레벨
+  static d(_message: string) {
+    // TODO: Logger 연결
+    console.log(`[DEBUG] ${_message}`);
+  }
+  static i(_message: string) {
+    // TODO: Logger 연결
+    console.log(`[INFO] ${_message}`);
+  }
+  static w(_message: string) {
+    // TODO: Logger 연결
+    console.log(`[WARN] ${_message}`);
+  }
+  static e(_message: string) {
+    // TODO: Logger 연결
+    console.log(`[ERROR] ${_message}`);
+  }
+}