sonamu 0.0.20 → 0.0.22

package/src/smd/migrator.ts

@@ -124,6 +124,18 @@ export class Migrator {
     await this.cleanUpDist(true);
   }
 
+  async check(): Promise<void> {
+    const codes = await this.compareMigrations();
+    if (codes.length === 0) {
+      console.log(chalk.green("\n현재 모두 싱크된 상태입니다."));
+      return;
+    }
+
+    // 현재 생성된 코드 표기
+    console.table(codes, ["type", "title"]);
+    console.log(codes[0]);
+  }
+
   async run(): Promise<void> {
     // pending 마이그레이션 확인
     const [, pendingList] = await this.targets.pending.migrate.list();
@@ -420,14 +432,8 @@ export class Migrator {
           ).map((key) => {
             // 배열 원소의 순서가 달라서 불일치가 발생하는걸 방지하기 위해 각 항목별로 정렬 처리 후 비교
             if (key === "columnsAndIndexes") {
-              const smdColumns = sortBy(
-                smdSet.columns,
-                (a: any) => (a as MigrationColumn).name
-              );
-              const dbColumns = sortBy(
-                dbSet.columns,
-                (a: any) => (a as MigrationColumn).name
-              );
+              const smdColumns = sortBy(smdSet.columns, (a: any) => a.name);
+              const dbColumns = sortBy(dbSet.columns, (a: any) => a.name);
 
               /* 디버깅용 코드, 특정 컬럼에서 불일치 발생할 때 확인
               const smdCreatedAt = smdSet.columns.find(
@@ -439,11 +445,11 @@ export class Migrator {
               console.debug({ smdCreatedAt, dbCreatedAt });
               */
 
-              const smdIndexes = sortBy(smdSet.indexes, (a: any) =>
-                (a as MigrationIndex).columns.join("-")
+              const smdIndexes = sortBy(smdSet.indexes, (a) =>
+                [a.type, ...a.columns].join("-")
               );
-              const dbIndexes = sortBy(dbSet.indexes, (a: any) =>
-                (a as MigrationIndex).columns.join("-")
+              const dbIndexes = sortBy(dbSet.indexes, (a) =>
+                [a.type, ...a.columns].join("-")
               );
 
               const isEqualColumns = equal(smdColumns, dbColumns);
@@ -462,17 +468,20 @@ export class Migrator {
                 );
               }
             } else {
-              const smdForeigns = sortBy(smdSet.foreigns, (a: any) =>
-                (a as MigrationForeign).columns.join("-")
+              const smdForeigns = sortBy(smdSet.foreigns, (a) =>
+                [a.to, ...a.columns].join("-")
               );
-              const dbForeigns = sortBy(dbSet.foreigns, (a: any) =>
-                (a as MigrationForeign).columns.join("-")
+              const dbForeigns = sortBy(dbSet.foreigns, (a) =>
+                [a.to, ...a.columns].join("-")
               );
 
               if (equal(smdForeigns, dbForeigns) === false) {
-                // TODO FK alter
-                console.log(chalk.red(`FK 다름! ${smdSet.table}`));
                 // console.dir({ smdForeigns, dbForeigns }, { depth: null });
+                return this.generateAlterCode_Foreigns(
+                  smdSet.table,
+                  smdForeigns,
+                  dbForeigns
+                );
               }
             }
             return null;
@@ -550,9 +559,6 @@ export class Migrator {
           columns: currentIndexes.map(
             (currentIndex) => currentIndex.Column_name
           ),
-          ...propIf(currentIndexes.length > 1, {
-            name: keyName,
-          }),
         };
       }
     );
@@ -742,66 +748,6 @@ export class Migrator {
           r.columns.push(column);
         }
 
-        // 일반 컬럼 + ToOne 케이스 컬럼
-        if (
-          !isRelationProp(prop) ||
-          isBelongsToOneRelationProp(prop) ||
-          (isOneToOneRelationProp(prop) && prop.hasJoinColumn)
-        ) {
-          const propName = !isRelationProp(prop)
-            ? prop.name
-            : `${prop.name}_id`;
-
-          // index 처리
-          if (prop.index !== undefined) {
-            if (prop.index !== true) {
-              prop.index.map((indexName) => {
-                const namedOne = r.indexes.find(
-                  (_index) => _index.name === indexName
-                );
-                if (namedOne) {
-                  namedOne.columns.push(propName);
-                } else {
-                  r.indexes.push({
-                    type: "index",
-                    columns: [propName],
-                    name: indexName,
-                  });
-                }
-              });
-            } else {
-              r.indexes.push({
-                type: "index",
-                columns: [propName],
-              });
-            }
-          }
-          // unique 처리
-          if (prop.unique !== undefined) {
-            if (prop.unique !== true) {
-              prop.unique.map((indexName) => {
-                const namedOne = r.indexes.find(
-                  (_index) => _index.name === indexName
-                );
-                if (namedOne) {
-                  namedOne.columns.push(propName);
-                } else {
-                  r.indexes.push({
-                    type: "unique",
-                    columns: [propName],
-                    name: indexName,
-                  });
-                }
-              });
-            } else {
-              r.indexes.push({
-                type: "unique",
-                columns: [propName],
-              });
-            }
-          }
-        }
-
         if (isManyToManyRelationProp(prop)) {
           // ManyToMany 케이스
           const relMd = SMDManager.get(prop.with);
@@ -888,6 +834,9 @@ export class Migrator {
       }
     );
 
+    // indexes
+    migrationSet.indexes = smd.indexes;
+
     // uuid
     migrationSet.columns = migrationSet.columns.concat({
       name: "uuid",
@@ -949,15 +898,11 @@ export class Migrator {
     }
     const lines = uniq(
       indexes.reduce((r, index) => {
-        if (index.name === undefined) {
-          r.push(`table.${index.type}(['${index.columns[0]}'])`);
-        } else {
-          r.push(
-            `table.${index.type}([${index.columns
-              .map((col) => `'${col}'`)
-              .join(",")}], '${index.name}')`
-          );
-        }
+        r.push(
+          `table.${index.type}([${index.columns
+            .map((col) => `'${col}'`)
+            .join(",")}])`
+        );
         return r;
       }, [] as string[])
     );
@@ -1362,10 +1307,10 @@ export class Migrator {
     };
     const extraIndexes = {
       db: differenceBy(dbIndexes, smdIndexes, (col) =>
-        [col.type, col.name ?? col.columns.join("-")].join("//")
+        [col.type, col.columns.join("-")].join("//")
       ),
       smd: differenceBy(smdIndexes, dbIndexes, (col) =>
-        [col.type, col.name ?? col.columns.join("-")].join("//")
+        [col.type, col.columns.join("-")].join("//")
       ),
     };
     if (extraIndexes.smd.length > 0) {
@@ -1439,6 +1384,87 @@ export class Migrator {
     return linesTo;
   }
 
+  generateAlterCode_Foreigns(
+    table: string,
+    smdForeigns: MigrationForeign[],
+    dbForeigns: MigrationForeign[]
+  ): GenMigrationCode[] {
+    // console.log({ smdForeigns, dbForeigns });
+
+    const getKey = (mf: MigrationForeign): string => {
+      return [mf.columns.join("-"), mf.to].join("///");
+    };
+    const fkTo = smdForeigns.reduce(
+      (result, smdF) => {
+        const matchingDbF = dbForeigns.find(
+          (dbF) => getKey(smdF) === getKey(dbF)
+        );
+        if (!matchingDbF) {
+          result.add.push(smdF);
+          return result;
+        }
+
+        if (equal(smdF, matchingDbF) === false) {
+          result.alterSrc.push(matchingDbF);
+          result.alterDst.push(smdF);
+          return result;
+        }
+        return result;
+      },
+      {
+        add: [] as MigrationForeign[],
+        alterSrc: [] as MigrationForeign[],
+        alterDst: [] as MigrationForeign[],
+      }
+    );
+
+    const linesTo = {
+      add: this.genForeignDefinitions(table, fkTo.add),
+      alterSrc: this.genForeignDefinitions(table, fkTo.alterSrc),
+      alterDst: this.genForeignDefinitions(table, fkTo.alterDst),
+    };
+
+    const lines: string[] = [
+      'import { Knex } from "knex";',
+      "",
+      "export async function up(knex: Knex): Promise<void> {",
+      `return knex.schema.alterTable("${table}", (table) => {`,
+      ...linesTo.add.up,
+      ...linesTo.alterSrc.down,
+      ...linesTo.alterDst.up,
+      "})",
+      "}",
+      "",
+      "export async function down(knex: Knex): Promise<void> {",
+      `return knex.schema.alterTable("${table}", (table) => {`,
+      ...linesTo.add.down,
+      ...linesTo.alterDst.down,
+      ...linesTo.alterSrc.up,
+      "})",
+      "}",
+    ];
+
+    const formatted = prettier.format(lines.join("\n"), {
+      parser: "typescript",
+    });
+
+    const title = [
+      "alter",
+      table,
+      "foreigns",
+      // TODO 바뀌는 부분
+    ].join("_");
+
+    return [
+      {
+        table,
+        title,
+        formatted,
+        type: "normal",
+      },
+    ];
+  }
+
   async destroy(): Promise<void> {
     await Promise.all(
       this.targets.apply.map((db) => {

package/src/smd/smd-utils.ts

@@ -15,6 +15,7 @@ import {
   JsonProp,
   ManyToManyRelationProp,
   OneToOneRelationProp,
+  SMDIndex,
   StringProp,
   TextProp,
   TimeProp,
@@ -22,6 +23,7 @@ import {
   UuidProp,
   VirtualProp,
 } from "../types/types";
+import { asArray } from "../utils/model";
 
 export const p = {
   integer,
@@ -264,3 +266,22 @@ function relationManyToMany(
     ...option,
   };
 }
+
+export const i = {
+  index,
+  unique,
+};
+
+function index(columns: string | string[]): SMDIndex {
+  return {
+    type: "index",
+    columns: asArray(columns),
+  };
+}
+
+function unique(columns: string | string[]): SMDIndex {
+  return {
+    type: "unique",
+    columns: asArray(columns),
+  };
+}

package/src/smd/smd.ts

@@ -15,6 +15,7 @@ import {
   SMDPropNode,
   isEnumProp,
   StringProp,
+  SMDIndex,
 } from "../types/types";
 import inflection from "inflection";
 import path from "path";
@@ -39,6 +40,7 @@ export class SMD {
   relations: {
     [key: string]: RelationProp;
   };
+  indexes: SMDIndex[];
   subsets: {
     [key: string]: string[];
   };
@@ -52,7 +54,15 @@ export class SMD {
     [name: string]: EnumsLabelKo<string>;
   } = {};
 
-  constructor({ id, parentId, table, title, props, subsets }: SMDInput<any>) {
+  constructor({
+    id,
+    parentId,
+    table,
+    title,
+    props,
+    indexes,
+    subsets,
+  }: SMDInput<any>) {
     // id
     this.id = id;
     this.parentId = parentId;
@@ -91,6 +101,9 @@ export class SMD {
       this.relations = {};
     }
 
+    // indexes
+    this.indexes = indexes ?? [];
+
     // subsets
     this.subsets = subsets ?? {};
 
@@ -514,22 +527,11 @@ export class SMD {
 
   registerTableSpecs(): void {
     const uniqueColumns = uniq(
-      this.props
-        .map((prop) => {
-          const propColumn =
-            isBelongsToOneRelationProp(prop) || isOneToOneRelationProp(prop)
-              ? `${prop.name}_id`
-              : prop.name;
-          if (prop.unique === true) {
-            return propColumn;
-          } else if (prop.unique && Array.isArray(prop.unique)) {
-            return propColumn;
-          } else {
-            return null;
-          }
-        })
-        .filter((prop) => prop !== null)
-    ) as string[];
+      this.indexes
+        .filter((idx) => idx.type === "unique")
+        .map((idx) => idx.columns)
+        .flat()
+    );
 
     SMDManager.setTableSpec({
       name: this.table,

package/src/templates/model_test.template.ts

@@ -21,7 +21,7 @@ export class Template__model_test extends Template {
       ...this.getTargetAndPath(names),
       body: `
 import { describe, test, expect } from "vitest";
-import { bootstrap } from '../../testing/helpers';
+import { bootstrap } from '../../testing/bootstrap';
 
 bootstrap([]);
 describe.skip("${smdId}ModelTest", () => {

package/src/templates/smd.template.ts

@@ -21,7 +21,7 @@ export class Template__smd extends Template {
     return {
       ...this.getTargetAndPath(names),
       body: `
-import { p, SMDInput } from "sonamu";
+import { p, i, SMDInput } from "sonamu";
 import { ${smdId}FieldExpr } from "./${names.fs}.generated";
 
 /*
@@ -37,6 +37,10 @@ export const ${names.camel}SmdInput: SMDInput<${smdId}FieldExpr> = {
       now: true,
     }),
   ],
+  indexes: [
+    i.index('created_at'),
+    //
+  ],
   subsets: {
     A: [ 'id', 'created_at' ]
   }

package/src/templates/view_search_input.template.ts

@@ -34,8 +34,8 @@ export function ${names.capital}SearchInput({
 }) {
   const [keyword, setKeyword] = useState<string>(inputValue ?? '');
 
-  const handleKeyDown = (e: { code: string }) => {
-    if (inputOnChange && e.code === 'Enter') {
+  const handleKeyDown = (e: { key: string }) => {
+    if (inputOnChange && e.key === 'Enter') {
       inputOnChange(e as any, {
         value: keyword,
       });
@@ -51,7 +51,7 @@ export function ${names.capital}SearchInput({
       labelPosition="left"
       action={{
         icon: 'search',
-        onClick: () => handleKeyDown({ code: 'Enter' }),
+        onClick: () => handleKeyDown({ key: 'Enter' }),
       }}
       {...inputProps}
       value={keyword}

package/src/types/types.ts

@@ -122,8 +122,6 @@ type _RelationProp = {
   name: string;
   with: string;
   nullable?: boolean;
-  index?: true | string[];
-  unique?: true | string[];
   toFilter?: true;
 };
 export type OneToOneRelationProp = _RelationProp & {
@@ -180,12 +178,19 @@ export type SMDProp =
   | VirtualProp
   | RelationProp;
 
+export type SMDIndex = {
+  type: "index" | "unique";
+  columns: string[];
+  name?: string;
+};
+
 export type SMDInput<T extends string> = {
   id: string;
   parentId?: string;
   table?: string;
   title?: string;
   props?: SMDProp[];
+  indexes?: SMDIndex[];
   subsets?: {
     [subset: string]: T[];
   };
@@ -323,6 +328,17 @@ export type SubsetQuery = {
 };
 
 /* Knex Migration */
+export type KnexError = {
+  code: string;
+  errno: number;
+  sql: string;
+  sqlMessage: string;
+  sqlState: string;
+};
+export function isKnexError(e: any): e is KnexError {
+  return e.code && e.sqlMessage && e.sqlState;
+}
+
 export type KnexColumnType =
   | "string"
   | "text"
@@ -352,7 +368,6 @@ export type MigrationColumn = {
 export type MigrationIndex = {
   columns: string[];
   type: "unique" | "index";
-  name?: string;
 };
 export type MigrationForeign = {
   columns: string[];