sonamu 0.2.28 → 0.2.29

package/src/entity/migrator.ts

@@ -57,7 +57,6 @@ import { EntityManager } from "./entity-manager";
 import { Entity } from "./entity";
 import { Sonamu } from "../api";
 import { ServiceUnavailableException } from "../exceptions/so-exceptions";
-import { nonNullable } from "../utils/utils";
 
 type MigratorMode = "dev" | "deploy";
 export type MigratorOptions = {
@@ -104,7 +103,12 @@ export class Migrator {
       if (
         (dbConfig.fixture_local.connection as Knex.MySql2ConnectionConfig)
           .host !==
-        (dbConfig.fixture_remote.connection as Knex.MySql2ConnectionConfig).host
+          (dbConfig.fixture_remote.connection as Knex.MySql2ConnectionConfig)
+            .host ||
+        (dbConfig.fixture_local.connection as Knex.MySql2ConnectionConfig)
+          .database !==
+          (dbConfig.fixture_remote.connection as Knex.MySql2ConnectionConfig)
+            .database
       ) {
         const fixtureRemoteDB = knex(dbConfig.fixture_remote);
         applyDBs.push(fixtureRemoteDB);
@@ -190,7 +194,7 @@ export class Migrator {
     if (onlyTs.length > 0) {
       console.debug({ onlyTs });
       throw new ServiceUnavailableException(
-        `There is an un-compiled TS migration files.\nPlease run the dev:serve\n\n${onlyTs
+        `There is an un-compiled TS migration files.\nPlease compile them first.\n\n${onlyTs
           .map((f) => f.name)
           .join("\n")}`
       );
@@ -302,23 +306,27 @@ export class Migrator {
       applied: string[];
     }[]
   > {
-    // get connections
-    const conns = (
-      await Promise.all(
-        targets.map(async (target) => {
-          const knexOptions =
-            Sonamu.dbConfig[target as keyof typeof Sonamu.dbConfig];
-          if (knexOptions === undefined) {
-            return null;
-          }
+    // get uniq knex configs
+    const configs = uniqBy(
+      targets
+        .map((target) => ({
+          connKey: target,
+          options: Sonamu.dbConfig[target as keyof typeof Sonamu.dbConfig],
+        }))
+        .filter((c) => c.options !== undefined),
+      ({ options }) =>
+        `${(options.connection as Knex.MySql2ConnectionConfig).host}:${
+          (options.connection as Knex.MySql2ConnectionConfig).port ?? 3306
+        }/${(options.connection as Knex.MySql2ConnectionConfig).database}`
+    );
 
-          return {
-            connKey: target,
-            knex: knex(knexOptions),
-          };
-        })
-      )
-    ).filter(nonNullable);
+    // get connections
+    const conns = await Promise.all(
+      configs.map(async (config) => ({
+        connKey: config.connKey,
+        knex: knex(config.options),
+      }))
+    );
 
     // action
     const result = await (async () => {
@@ -629,8 +637,8 @@ export class Migrator {
 
     // 기존 ShadowDB 리셋
     console.log(chalk.magenta(`${shadowDatabase} 리셋`));
-    await tdb.raw(`DROP DATABASE IF EXISTS ${shadowDatabase};`);
-    await tdb.raw(`CREATE DATABASE ${shadowDatabase};`);
+    await tdb.raw(`DROP DATABASE IF EXISTS \`${shadowDatabase}\`;`);
+    await tdb.raw(`CREATE DATABASE \`${shadowDatabase}\`;`);
 
     // ShadowDB 테이블 + 데이터 생성
     console.log(chalk.magenta(`${shadowDatabase} 데이터베이스 생성`));
@@ -660,7 +668,7 @@ export class Migrator {
 
       // 생성한 Shadow DB 삭제
       console.log(chalk.magenta(`${shadowDatabase} 삭제`));
-      await sdb.raw(`DROP DATABASE IF EXISTS ${shadowDatabase};`);
+      await sdb.raw(`DROP DATABASE IF EXISTS \`${shadowDatabase}\`;`);
 
       return [
         {

package/src/syncer/syncer.ts

@@ -1332,6 +1332,12 @@ export class Syncer {
     table?: string,
     title?: string
   ) {
+    if (/^[a-zA-Z_$][a-zA-Z_$0-9]*$/.test(entityId) === false) {
+      throw new BadRequestException(
+        "entityId는 자바스크립트 변수명 규칙을 따라야 합니다."
+      );
+    }
+
     await this.generateTemplate("entity", {
       entityId,
       parentId,

package/src/templates/entity.template.ts

@@ -1,6 +1,7 @@
 import { TemplateOptions } from "../types/types";
 import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
 import { Template } from "./base-template";
+import { Sonamu } from "../api";
 
 export class Template__entity extends Template {
   constructor() {
@@ -8,8 +9,10 @@ export class Template__entity extends Template {
   }
 
   getTargetAndPath(names: EntityNamesRecord, parentNames?: EntityNamesRecord) {
+    const { dir } = Sonamu.config.api;
+
     return {
-      target: "api/src/application",
+      target: `${dir}/src/application`,
       path: `${(parentNames ?? names).fs}/${names.fs}.entity.json`,
     };
   }

package/src/templates/generated.template.ts

@@ -6,6 +6,7 @@ import { EntityPropNode } from "../types/types";
 import { propNodeToZodTypeDef, zodTypeToZodCode } from "../api/code-converters";
 import { Template } from "./base-template";
 import { nonNullable } from "../utils/utils";
+import { Sonamu } from "../api";
 
 export type SourceCode = {
   label: string;
@@ -18,8 +19,10 @@ export class Template__generated extends Template {
   }
 
   getTargetAndPath() {
+    const { dir } = Sonamu.config.api;
+
     return {
-      target: "api/src/application",
+      target: `${dir}/src/application`,
       path: `sonamu.generated.ts`,
     };
   }

package/src/templates/generated_http.template.ts

@@ -13,8 +13,10 @@ export class Template__generated_http extends Template {
   }
 
   getTargetAndPath() {
+    const { dir } = Sonamu.config.api;
+
     return {
-      target: "api/src/application",
+      target: `${dir}/src/application`,
       path: `sonamu.generated.http`,
     };
   }

package/src/templates/generated_sso.template.ts

@@ -5,6 +5,7 @@ import { camelize } from "inflection";
 import { SourceCode } from "./generated.template";
 import { uniq } from "lodash";
 import { nonNullable } from "../utils/utils";
+import { Sonamu } from "../api";
 
 export class Template__generated_sso extends Template {
   constructor() {
@@ -12,8 +13,10 @@ export class Template__generated_sso extends Template {
   }
 
   getTargetAndPath() {
+    const { dir } = Sonamu.config.api;
+
     return {
-      target: "api/src/application",
+      target: `${dir}/src/application`,
       path: `sonamu.generated.sso.ts`,
     };
   }

package/src/templates/init_types.template.ts

@@ -1,6 +1,7 @@
 import { TemplateOptions } from "../types/types";
 import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
 import { Template } from "./base-template";
+import { Sonamu } from "../api";
 
 export class Template__init_types extends Template {
   constructor() {
@@ -8,8 +9,10 @@ export class Template__init_types extends Template {
   }
 
   getTargetAndPath(names: EntityNamesRecord) {
+    const { dir } = Sonamu.config.api;
+
     return {
-      target: "api/src/application",
+      target: `${dir}/src/application`,
       path: `${names.fs}/${names.fs}.types.ts`,
     };
   }

package/src/templates/model.template.ts

@@ -2,6 +2,7 @@ import { RenderingNode, TemplateOptions } from "../types/types";
 import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
 import { Template } from "./base-template";
 import { Template__view_list } from "./view_list.template";
+import { Sonamu } from "../api";
 
 export class Template__model extends Template {
   constructor() {
@@ -9,8 +10,10 @@ export class Template__model extends Template {
   }
 
   getTargetAndPath(names: EntityNamesRecord) {
+    const { dir } = Sonamu.config.api;
+
     return {
-      target: "api/src/application",
+      target: `${dir}/src/application`,
       path: `${names.fs}/${names.fs}.model.ts`,
     };
   }

package/src/templates/model_test.template.ts

@@ -1,6 +1,7 @@
 import { TemplateOptions } from "../types/types";
 import { EntityManager, EntityNamesRecord } from "../entity/entity-manager";
 import { Template } from "./base-template";
+import { Sonamu } from "../api";
 
 export class Template__model_test extends Template {
   constructor() {
@@ -8,8 +9,10 @@ export class Template__model_test extends Template {
   }
 
   getTargetAndPath(names: EntityNamesRecord) {
+    const { dir } = Sonamu.config.api;
+
     return {
-      target: "api/src/application",
+      target: `${dir}/src/application`,
       path: `${names.fs}/${names.fs}.model.test.ts`,
     };
   }

package/src/testing/fixture-manager.ts

@@ -150,7 +150,7 @@ export class FixtureManagerClass {
               )
               .into(tableName);
             console.log("OK");
-            await transaction.raw(`SET FOREIGN_KEY_CHECKS = 0`);
+            await transaction.raw(`SET FOREIGN_KEY_CHECKS = 1`);
           });
         }
       })