sonamu 0.0.40 → 0.0.42

package/src/bin/cli.ts

@@ -14,6 +14,7 @@ import { tsicli } from "tsicli";
 import { execSync } from "child_process";
 import { existsSync, mkdirSync, readdirSync, writeFileSync } from "fs";
 import { Sonamu } from "../api";
+import knex, { Knex } from "knex";
 
 let migrator: Migrator;
 
@@ -35,6 +36,7 @@ async function bootstrap() {
       "#name": "string",
     },
     args: [
+      ["fixture", "init"],
       ["fixture", "import", "#smdId", "#recordIds"],
       ["fixture", "sync"],
       ["migrate", "run"],
@@ -48,6 +50,7 @@ async function bootstrap() {
       ["scaffold", "model_test", "#smdId"],
       ["scaffold", "view_list", "#smdId"],
       ["scaffold", "view_form", "#smdId"],
+      ["ui"],
     ],
     runners: {
       migrate_run,
@@ -55,12 +58,14 @@ async function bootstrap() {
       migrate_rollback,
       migrate_clear,
       migrate_reset,
+      fixture_init,
       fixture_import,
       fixture_sync,
       stub_practice,
       stub_smd,
       scaffold_model,
       scaffold_model_test,
+      ui,
       // scaffold_view_list,
       // scaffold_view_form,
     },
@@ -120,6 +125,80 @@ async function migrate_reset() {
   await migrator.resetAll();
 }
 
+async function fixture_init() {
+  const srcConfig = Sonamu.dbConfig.development_master;
+  const targets = [
+    {
+      label: "(REMOTE) Fixture DB",
+      config: Sonamu.dbConfig.fixture_remote,
+    },
+    {
+      label: "(LOCAL) Fixture DB",
+      config: Sonamu.dbConfig.fixture_local,
+      toSkip: (() => {
+        const remoteConn = Sonamu.dbConfig.fixture_remote
+          .connection as Knex.ConnectionConfig;
+        const localConn = Sonamu.dbConfig.fixture_local
+          .connection as Knex.ConnectionConfig;
+        return (
+          remoteConn.host === localConn.host &&
+          remoteConn.database === localConn.database
+        );
+      })(),
+    },
+    {
+      label: "(LOCAL) Testing DB",
+      config: Sonamu.dbConfig.test,
+    },
+  ] as {
+    label: string;
+    config: Knex.Config;
+    toSkip?: boolean;
+  }[];
+
+  // 1. 기준DB 스키마를 덤프
+  console.log("DUMP...");
+  const dumpFilename = `/tmp/sonamu-fixture-init-${Date.now()}.sql`;
+  const srcConn = srcConfig.connection as Knex.ConnectionConfig;
+  execSync(
+    `mysqldump -h${srcConn.host} -u${srcConn.user} -p${srcConn.password} --single-transaction -d --no-create-db --triggers ${srcConn.database} > ${dumpFilename}`
+  );
+
+  // 2. 대상DB 각각에 대하여 존재여부 확인 후 붓기
+  for await (const { label, config, toSkip } of targets) {
+    const conn = config.connection as Knex.ConnectionConfig;
+
+    if (toSkip === true) {
+      console.log(chalk.red(`${label}: Skipped!`));
+      continue;
+    }
+
+    const db = knex({
+      ...config,
+      connection: {
+        ...((config.connection ?? {}) as Knex.ConnectionConfig),
+        database: undefined,
+      },
+    });
+    const [[row]] = await db.raw(`SHOW DATABASES LIKE "${conn.database}"`);
+    if (row) {
+      console.log(
+        chalk.yellow(`${label}: Database "${conn.database} Already exists`)
+      );
+      await db.destroy();
+      continue;
+    }
+
+    console.log(`SYNC to ${label}...`);
+    const mysqlCmd = `mysql -h${conn.host} -u${conn.user} -p${conn.password}`;
+    execSync(`${mysqlCmd} -e 'DROP DATABASE IF EXISTS ${conn.database}'`);
+    execSync(`${mysqlCmd} -e 'CREATE DATABASE ${conn.database}'`);
+    execSync(`${mysqlCmd} ${conn.database} < ${dumpFilename}`);
+
+    await db.destroy();
+  }
+}
+
 async function fixture_import(smdId: string, recordIds: number[]) {
   await setupFixtureManager();
 
@@ -205,3 +284,16 @@ async function scaffold_model_test(smdId: string) {
     smdId,
   });
 }
+
+async function ui() {
+  try {
+    const sonamuUI = await import("@sonamu-kit/ui" as any);
+    sonamuUI.startServers(Sonamu.appRootPath);
+  } 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/smd/migrator.ts

@@ -478,20 +478,22 @@ export class Migrator {
                 );
               }
             } else {
-              const smdForeigns = sortBy(smdSet.foreigns, (a) =>
-                [a.to, ...a.columns].join("-")
-              ).map((smdForeign) => {
+              const replaceNoActionOnMySQL = (f: MigrationForeign) => {
                 // MySQL에서 RESTRICT와 NO ACTION은 동일함
-                const { onDelete, onUpdate } = smdForeign;
+                const { onDelete, onUpdate } = f;
                 return {
-                  ...smdForeign,
+                  ...f,
                   onUpdate: onUpdate === "RESTRICT" ? "NO ACTION" : onUpdate,
                   onDelete: onDelete === "RESTRICT" ? "NO ACTION" : onDelete,
                 };
-              });
+              };
+
+              const smdForeigns = sortBy(smdSet.foreigns, (a) =>
+                [a.to, ...a.columns].join("-")
+              ).map((f) => replaceNoActionOnMySQL(f));
               const dbForeigns = sortBy(dbSet.foreigns, (a) =>
                 [a.to, ...a.columns].join("-")
-              );
+              ).map((f) => replaceNoActionOnMySQL(f));
 
               if (equal(smdForeigns, dbForeigns) === false) {
                 console.dir({ smdForeigns, dbForeigns }, { depth: null });

package/src/smd/smd-utils.ts

@@ -212,10 +212,7 @@ function enums(
 }
 function virtual(
   name: string,
-  option: Omit<
-    VirtualProp,
-    "name" | "type" | "index" | "unique" | "dbDefault" | "toFilter"
-  >
+  option: Omit<VirtualProp, "name" | "type" | "dbDefault" | "toFilter">
 ): VirtualProp {
   return {
     name,

package/src/smd/smd.ts

@@ -208,8 +208,28 @@ export class SMD {
           }
 
           // innerOrOuter
-          const innerOrOuter =
-            isAlreadyOuterJoined || relation.nullable ? "outer" : "inner";
+          const innerOrOuter = (() => {
+            if (isAlreadyOuterJoined) {
+              return "outer";
+            }
+
+            if (isOneToOneRelationProp(relation)) {
+              if (
+                relation.hasJoinColumn === true &&
+                (relation.nullable ?? false) === false
+              ) {
+                return "inner";
+              } else {
+                return "outer";
+              }
+            } else {
+              if (relation.nullable) {
+                return "outer";
+              } else {
+                return "inner";
+              }
+            }
+          })();
           const relSubsetQuery = relSMD.resolveSubsetQuery(
             `${prefix !== "" ? prefix + "." : ""}${groupKey}`,
             relFields,

package/src/testing/fixture-manager.ts

@@ -1,5 +1,4 @@
 import chalk from "chalk";
-import { execSync } from "child_process";
 import knex, { Knex } from "knex";
 import { uniq } from "lodash";
 import { Sonamu } from "../api";
@@ -44,10 +43,14 @@ export class FixtureManagerClass {
       const pConn = Sonamu.dbConfig.production_master
         .connection as Knex.ConnectionConfig & { port?: number };
       if (
-        `${tConn.host ?? "localhost"}:${tConn.port ?? 3306}` ===
-        `${pConn.host ?? "localhost"}:${pConn.port ?? 3306}`
+        `${tConn.host ?? "localhost"}:${tConn.port ?? 3306}/${
+          tConn.database
+        }` ===
+        `${pConn.host ?? "localhost"}:${pConn.port ?? 3306}/${pConn.database}`
       ) {
-        throw new Error("테스트DB와 프로덕션DB의 접속 정보가 동일합니다.");
+        throw new Error(
+          `테스트DB와 프로덕션DB에 동일한 데이터베이스가 사용되었습니다.`
+        );
       }
     }
 
@@ -102,50 +105,6 @@ export class FixtureManagerClass {
     // console.timeEnd("FIXTURE-CleanAndSeed");
   }
 
-  // TODO: 추후 작업
-  async initFixtureDB() {
-    const connectArgs = `-uDB_USER -pDB_PASS`;
-
-    console.log("DUMP...");
-    execSync(
-      `mysqldump -hwdb.closedshops.com ${connectArgs} --single-transaction -d --no-create-db --triggers --ignore-table=closedshops.pm_backup closedshops > /tmp/closedshops_scheme.sql`
-    );
-    console.log("SYNC to (TESTING) LOCAL closedshops...");
-    execSync(
-      `mysql -hlocal.closedshops.com ${connectArgs} -e 'DROP DATABASE closedshops'`
-    );
-    execSync(
-      `mysql -hlocal.closedshops.com ${connectArgs} -e 'CREATE DATABASE closedshops'`
-    );
-    execSync(
-      `mysql -hlocal.closedshops.com ${connectArgs} closedshops < /tmp/closedshops_scheme.sql;`
-    );
-    console.log("SED database names...");
-    execSync(
-      `sed -i'' -e 's/\`closedshops\`/\`closedshops_fixture\`/g' /tmp/closedshops_scheme.sql`
-    );
-    console.log("SYNC to (REMOTE FIXTURE) REMOTE closedshops_fixture...");
-    execSync(
-      `mysql -hwdb.closedshops.com ${connectArgs} -e 'DROP DATABASE closedshops_fixture'`
-    );
-    execSync(
-      `mysql -hwdb.closedshops.com ${connectArgs} -e 'CREATE DATABASE closedshops_fixture'`
-    );
-    execSync(
-      `mysql -hwdb.closedshops.com ${connectArgs} closedshops_fixture < /tmp/closedshops_scheme.sql;`
-    );
-    console.log("SYNC to (LOCAL FIXTURE) closedshops_fixture...");
-    execSync(
-      `mysql -hlocal.closedshops.com ${connectArgs} -e 'DROP DATABASE closedshops_fixture'`
-    );
-    execSync(
-      `mysql -hlocal.closedshops.com ${connectArgs} -e 'CREATE DATABASE closedshops_fixture'`
-    );
-    execSync(
-      `mysql -hlocal.closedshops.com ${connectArgs} closedshops_fixture < /tmp/closedshops_scheme.sql;`
-    );
-  }
-
   async getChecksum(db: Knex, tableName: string) {
     const [[checksumRow]] = await db.raw(`CHECKSUM TABLE ${tableName}`);
     return checksumRow.Checksum;

package/src/types/types.ts

@@ -39,8 +39,6 @@ export type DistributiveOmit<T, K extends keyof any> = T extends any
 export type CommonProp = {
   name: string;
   nullable?: boolean;
-  index?: true | string[];
-  unique?: true | string[];
   toFilter?: true;
   desc?: string;
   dbDefault?: string | number | { raw: string };