sonamu 0.2.31 → 0.2.33

package/dist/templates/generated_http.template.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,45 +31,47 @@ class Template__generated_http extends base_template_1.Template {
         };
     }
     render({}) {
-        const { syncer: { types, apis }, config: { route: { prefix }, }, } = sonamu_1.Sonamu;
-        const lines = apis.map((api) => {
-            var _a, _b;
-            const reqObject = this.resolveApiParams(api, types);
-            const dataLines = (() => {
-                var _a;
-                if (((_a = api.options.httpMethod) !== null && _a !== void 0 ? _a : "GET") === "GET") {
-                    return {
-                        querystring: [
-                            qs_1.default
-                                .stringify(reqObject, { encode: false })
-                                .split("&")
-                                .join("\n\t&"),
-                        ],
-                        body: [],
-                    };
-                }
-                else {
-                    return {
-                        querystring: [],
-                        body: [
-                            "",
-                            prettier_1.default.format(JSON.stringify(reqObject), {
-                                parser: "json",
-                            }),
-                        ],
-                    };
-                }
-            })();
-            return [
-                [
-                    `${(_a = api.options.httpMethod) !== null && _a !== void 0 ? _a : "GET"} {{baseUrl}}${prefix}${api.path}`,
-                    ...dataLines.querystring,
-                ].join("\n\t?"),
-                `Content-Type: ${(_b = api.options.contentType) !== null && _b !== void 0 ? _b : "application/json"}`,
-                ...dataLines.body,
-            ].join("\n");
+        return __awaiter(this, void 0, void 0, function* () {
+            const { syncer: { types, apis }, config: { route: { prefix }, }, } = sonamu_1.Sonamu;
+            const lines = yield Promise.all(apis.map((api) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                const reqObject = this.resolveApiParams(api, types);
+                const dataLines = yield (() => __awaiter(this, void 0, void 0, function* () {
+                    var _c;
+                    if (((_c = api.options.httpMethod) !== null && _c !== void 0 ? _c : "GET") === "GET") {
+                        return {
+                            querystring: [
+                                qs_1.default
+                                    .stringify(reqObject, { encode: false })
+                                    .split("&")
+                                    .join("\n\t&"),
+                            ],
+                            body: [],
+                        };
+                    }
+                    else {
+                        return {
+                            querystring: [],
+                            body: [
+                                "",
+                                yield prettier_1.default.format(JSON.stringify(reqObject), {
+                                    parser: "json",
+                                }),
+                            ],
+                        };
+                    }
+                }))();
+                return [
+                    [
+                        `${(_a = api.options.httpMethod) !== null && _a !== void 0 ? _a : "GET"} {{baseUrl}}${prefix}${api.path}`,
+                        ...dataLines.querystring,
+                    ].join("\n\t?"),
+                    `Content-Type: ${(_b = api.options.contentType) !== null && _b !== void 0 ? _b : "application/json"}`,
+                    ...dataLines.body,
+                ].join("\n");
+            })));
+            return Object.assign(Object.assign({}, this.getTargetAndPath()), { body: lines.join("\n\n###\n\n"), importKeys: [] });
         });
-        return Object.assign(Object.assign({}, this.getTargetAndPath()), { body: lines.join("\n\n###\n\n"), importKeys: [] });
     }
     zodTypeToReqDefault(zodType, name) {
         var _a;

package/dist/templates/generated_http.template.js.map

@@ -1 +1 @@
-{"version":3,"file":"generated_http.template.js","sourceRoot":"","sources":["../../src/templates/generated_http.template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generated_http.template.js","sourceRoot":"","sources":["../../src/templates/generated_http.template.ts"],"names":[],"mappings":"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"}

package/dist/templates/view_form.template.d.ts

@@ -18,8 +18,8 @@ export declare class Template__view_form extends Template {
         preTemplates: {
             key: "entity" | "init_types" | "generated" | "generated_sso" | "generated_http" | "model" | "model_test" | "bridge" | "service" | "view_list" | "view_list_columns" | "view_search_input" | "view_form" | "view_id_all_select" | "view_id_async_select" | "view_enums_select" | "view_enums_dropdown" | "view_enums_buttonset";
             options: {
-                entityId: string;
                 title: string;
+                entityId: string;
                 parentId?: string | undefined;
                 table?: string | undefined;
             } | {
@@ -40,12 +40,12 @@ export declare class Template__view_form extends Template {
                 entityId: string;
                 extra?: unknown;
             } | {
+                entityId: string;
                 columns: {
                     name: string;
                     label: string;
                     tc: string;
                 }[];
-                entityId: string;
                 columnImports: string;
             } | {
                 entityId: string;

package/dist/templates/view_list.template.d.ts

@@ -23,8 +23,8 @@ export declare class Template__view_list extends Template {
         preTemplates: {
             key: "entity" | "init_types" | "generated" | "generated_sso" | "generated_http" | "model" | "model_test" | "bridge" | "service" | "view_list" | "view_list_columns" | "view_search_input" | "view_form" | "view_id_all_select" | "view_id_async_select" | "view_enums_select" | "view_enums_dropdown" | "view_enums_buttonset";
             options: {
-                entityId: string;
                 title: string;
+                entityId: string;
                 parentId?: string | undefined;
                 table?: string | undefined;
             } | {
@@ -45,12 +45,12 @@ export declare class Template__view_list extends Template {
                 entityId: string;
                 extra?: unknown;
             } | {
+                entityId: string;
                 columns: {
                     name: string;
                     label: string;
                     tc: string;
                 }[];
-                entityId: string;
                 columnImports: string;
             } | {
                 entityId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonamu",
-  "version": "0.2.31",
+  "version": "0.2.33",
   "description": "Sonamu — TypeScript Fullstack API Framework",
   "keywords": [
     "typescript",
@@ -48,11 +48,11 @@
     "@types/lodash": "^4.14.198",
     "@types/luxon": "^3.0.1",
     "@types/node": "^20.6.3",
-    "@types/prettier": "^2.7.0",
+    "@types/prettier": "^3.0.0",
     "@types/prompts": "^2.0.14",
     "@types/qs": "^6.9.7",
     "@types/uuid": "^8.3.4",
-    "prettier": "^2.7.1",
+    "prettier": "^3.2.5",
     "source-map-support": "^0.5.21",
     "typescript": "^5.2.2"
   },

package/src/api/sonamu.ts

@@ -152,6 +152,10 @@ class SonamuClass {
 
     if (isLocal() && !isTest() && enableSync) {
       await this.syncer.sync();
+
+      fetch("http://localhost:57001/api/reload", {
+        method: "GET",
+      }).catch(() => console.log("Failed to reload Sonamu UI"));
     }
 
     this.isInitialized = true;

package/src/bin/cli.ts

@@ -29,7 +29,7 @@ import process from "process";
 let migrator: Migrator;
 
 async function bootstrap() {
-  await Sonamu.init();
+  await Sonamu.init(false, false);
 
   await tsicli(process.argv, {
     types: {
@@ -210,10 +210,15 @@ async function fixture_init() {
     // 3. knex migration 정보 복사
     await Promise.all(
       ["knex_migrations", "knex_migrations_lock"].map(async (tableName) => {
-        await db.raw(
-          `INSERT INTO \`${conn.database}\`.${tableName}
-          SELECT * FROM \`${srcConn.database}\`.${tableName}`
+        const [table] = await db.raw(
+          `SHOW TABLES FROM \`${srcConn.database}\` LIKE '${tableName}'`
         );
+        if (table?.length) {
+          await db.raw(
+            `INSERT INTO \`${conn.database}\`.${tableName}
+          SELECT * FROM \`${srcConn.database}\`.${tableName}`
+          );
+        }
       })
     );
 
@@ -310,7 +315,7 @@ async function ui() {
     const sonamuUI: {
       startServers: (appRootPath: string) => void;
     } = await import("@sonamu-kit/ui" as string);
-    sonamuUI.startServers(Sonamu.appRootPath);
+    sonamuUI.startServers(Sonamu.apiRootPath);
   } 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.`);
@@ -365,7 +370,7 @@ async function smd_migration() {
       `${names.fs}.entity.json`
     );
 
-    const formatted = prettier.format(JSON.stringify(entityJson), {
+    const formatted = await prettier.format(JSON.stringify(entityJson), {
       parser: "json",
     });
     writeFileSync(dstPath, formatted);

package/src/database/_batch_update.ts

@@ -0,0 +1,106 @@
+/*
+  아래의 링크에서 참고해서 가져온 소스코드
+  https://github.com/knex/knex/issues/5716
+*/
+
+import { Knex } from "knex";
+
+export type RowWithId<Id extends string> = {
+  [key in Id]: any;
+} & Record<string, any>;
+
+/**
+ * Batch update rows in a table. Technically its a patch since it only updates the specified columns. Any omitted columns will not be affected
+ * @param knex
+ * @param tableName
+ * @param id
+ * @param rows
+ * @param chunkSize
+ * @param trx
+ */
+export async function batchUpdate<Id extends string>(
+  knex: Knex,
+  tableName: string,
+  id: Id,
+  rows: RowWithId<Id>[],
+  chunkSize = 50,
+  trx: Knex.Transaction | null = null
+) {
+  const chunks: RowWithId<Id>[][] = [];
+  for (let i = 0; i < rows.length; i += chunkSize) {
+    chunks.push(rows.slice(i, i + chunkSize));
+  }
+
+  const executeUpdate = async (
+    chunk: RowWithId<Id>[],
+    transaction: Knex.Transaction
+  ) => {
+    const sql = generateBatchUpdateSQL(knex, tableName, chunk, id);
+    return knex.raw(sql).transacting(transaction);
+  };
+
+  if (trx) {
+    for (const chunk of chunks) {
+      await executeUpdate(chunk, trx);
+    }
+  } else {
+    await knex.transaction(async (newTrx) => {
+      for (const chunk of chunks) {
+        await executeUpdate(chunk, newTrx);
+      }
+    });
+  }
+}
+
+/**
+ * Generate a set of unique keys in a data array
+ *
+ * Example:
+ * [ { a: 1, b: 2 }, { a: 3, c: 4 } ] => Set([ "a", "b", "c" ])
+ * @param data
+ */
+function generateKeySetFromData(data: Record<string, any>[]) {
+  const keySet: Set<string> = new Set();
+  for (const row of data) {
+    for (const key of Object.keys(row)) {
+      keySet.add(key);
+    }
+  }
+  return keySet;
+}
+
+function generateBatchUpdateSQL<Id extends string>(
+  knex: Knex,
+  tableName: string,
+  data: Record<string, any>[],
+  identifier: Id
+) {
+  const keySet = generateKeySetFromData(data);
+  const bindings = [];
+
+  const cases = [];
+  for (const key of keySet) {
+    if (key === identifier) continue;
+
+    const rows = [];
+    for (const row of data) {
+      if (Object.hasOwnProperty.call(row, key)) {
+        rows.push(`WHEN \`${identifier}\` = ? THEN ?`);
+        bindings.push(row[identifier], row[key]);
+      }
+    }
+
+    const whenThen = rows.join(" ");
+    cases.push(`\`${key}\` = CASE ${whenThen} ELSE \`${key}\` END`);
+  }
+
+  const whereInIds = data.map((row) => row[identifier]);
+  const whereInPlaceholders = whereInIds.map(() => "?").join(", ");
+  const sql = knex.raw(
+    `UPDATE \`${tableName}\` SET ${cases.join(
+      ", "
+    )} WHERE ${identifier} IN (${whereInPlaceholders})`,
+    [...bindings, ...whereInIds]
+  );
+  return sql.toString();
+}

package/src/database/base-model.ts

@@ -202,6 +202,7 @@ export class BaseModelClass {
     build,
     debug,
     db: _db,
+    optimizeCountQuery,
   }: {
     subset: U;
     params: T;
@@ -216,6 +217,7 @@ export class BaseModelClass {
     baseTable?: string;
     debug?: boolean | "list" | "count";
     db?: Knex;
+    optimizeCountQuery?: boolean;
   }): Promise<{
     rows: any[];
     total?: number | undefined;
@@ -236,20 +238,70 @@ export class BaseModelClass {
       virtual,
     });
 
-    // join
-    joins.map((join) => {
-      if (join.join == "inner") {
-        qb.innerJoin(
-          `${join.table} as ${join.as}`,
-          this.getJoinClause(db, join)
+    const applyJoinClause = (
+      qb: Knex.QueryBuilder,
+      joins: SubsetQuery["joins"]
+    ) => {
+      joins.map((join) => {
+        if (join.join == "inner") {
+          qb.innerJoin(
+            `${join.table} as ${join.as}`,
+            this.getJoinClause(db, join)
+          );
+        } else if (join.join == "outer") {
+          qb.leftOuterJoin(
+            `${join.table} as ${join.as}`,
+            this.getJoinClause(db, join)
+          );
+        }
+      });
+    };
+
+    // countQuery
+    const total = await (async () => {
+      if (queryMode === "list") {
+        return undefined;
+      }
+
+      const clonedQb = qb.clone().clear("order").clear("offset").clear("limit");
+
+      // optmizeCountQuery가 true인 경우 다른 clause에 영향을 주지 않는 모든 join을 제외함
+      if (optimizeCountQuery) {
+        const queryThatNotYetAppliedJoins = clonedQb.toQuery();
+        const afterWhereClause = queryThatNotYetAppliedJoins.split("where")[1];
+        applyJoinClause(
+          clonedQb,
+          joins.filter((j) => {
+            return afterWhereClause.includes(`\`${j.as}\``);
+          })
         );
-      } else if (join.join == "outer") {
-        qb.leftOuterJoin(
-          `${join.table} as ${join.as}`,
-          this.getJoinClause(db, join)
+      } else {
+        applyJoinClause(clonedQb, joins);
+      }
+
+      const [, matched] =
+        clonedQb
+          .toQuery()
+          .toLowerCase()
+          .match(/select (distinct .+) from/) ?? [];
+      const countQuery = matched
+        ? clonedQb
+            .clear("select")
+            .select(db.raw(`COUNT(${matched.split(",")[0]}) as total`))
+            .first()
+        : clonedQb.clear("select").count("*", { as: "total" }).first();
+      const countRow: { total?: number } = await countQuery;
+
+      // debug: countQuery
+      if (debug === true || debug === "count") {
+        console.debug(
+          "DEBUG: count query",
+          chalk.blue(countQuery.toQuery().toString())
         );
       }
-    });
+
+      return countRow?.total ?? 0;
+    })();
 
     // listQuery
     const rows = await (async () => {
@@ -266,6 +318,9 @@ export class BaseModelClass {
       // select, rows
       const listQuery = qb.clone().select(select);
 
+      // join
+      applyJoinClause(listQuery, joins);
+
       let rows = await listQuery;
       // debug: listQuery
       if (debug === true || debug === "list") {
@@ -280,37 +335,6 @@ export class BaseModelClass {
       return rows;
     })();
 
-    // countQuery
-    const total = await (async () => {
-      if (queryMode === "list") {
-        return undefined;
-      }
-
-      const clonedQb = qb.clone().clear("order").clear("offset").clear("limit");
-      const [, matched] =
-        clonedQb
-          .toQuery()
-          .toLowerCase()
-          .match(/select (distinct .+) from/) ?? [];
-      const countQuery = matched
-        ? clonedQb
-            .clear("select")
-            .select(db.raw(`COUNT(${matched.split(",")[0]}) as total`))
-            .first()
-        : clonedQb.clear("select").count("*", { as: "total" }).first();
-      const countRow: { total?: number } = await countQuery;
-
-      // debug: countQuery
-      if (debug === true || debug === "count") {
-        console.debug(
-          "DEBUG: count query",
-          chalk.blue(countQuery.toQuery().toString())
-        );
-      }
-
-      return countRow?.total ?? 0;
-    })();
-
     return { rows, total, subsetQuery, qb };
   }
 

package/src/database/upsert-builder.ts

@@ -1,8 +1,9 @@
 import { v4 as uuidv4 } from "uuid";
-import _, { chunk, defaults, groupBy } from "lodash";
+import { defaults, groupBy, uniq } from "lodash";
 import { Knex } from "knex";
 import { EntityManager } from "../entity/entity-manager";
 import { nonNullable } from "../utils/utils";
+import { RowWithId, batchUpdate } from "./_batch_update";
 
 type TableData = {
   references: Set<string>;
@@ -213,14 +214,14 @@ export class UpsertBuilder {
       }
     );
 
-    const extractFields = _.uniq(references).map(
+    const extractFields = uniq(references).map(
       (reference) => reference.split(".")[1]
     );
 
     // UUID 기준으로 id 추출
     const uuids = table.rows.map((row) => row.uuid);
     const upsertedRows = await wdb(tableName)
-      .select(_.uniq(["uuid", "id", ...extractFields]))
+      .select(uniq(["uuid", "id", ...extractFields]))
       .whereIn("uuid", uuids);
     const uuidMap = new Map<string, any>(
       upsertedRows.map((row: any) => [row.uuid, row])
@@ -266,6 +267,7 @@ export class UpsertBuilder {
   ): Promise<void> {
     options = defaults(options, {
       chunkSize: 500,
+      where: "id",
     });
 
     if (this.hasTable(tableName) === false) {
@@ -276,14 +278,16 @@ export class UpsertBuilder {
       return;
     }
 
-    const chunks = chunk(table.rows, options.chunkSize);
-    for await (const chunk of chunks) {
-      await Promise.all(
-        chunk.map(async ({ id, ...row }) => {
-          const { uuid, ...update } = row;
-          return await wdb(tableName).where("id", id).update(update);
-        })
-      );
-    }
+    const rows = table.rows.map((_row) => {
+      const { uuid, ...row } = _row;
+      return row as RowWithId<string>;
+    });
+    await batchUpdate(
+      wdb,
+      tableName,
+      options.where ?? "id",
+      rows,
+      options.chunkSize
+    );
   }
 }

package/src/entity/entity.ts

@@ -631,7 +631,7 @@ export class Entity {
     const json = this.toJson();
     writeFileSync(
       jsonPath,
-      prettier.format(JSON.stringify(json), {
+      await prettier.format(JSON.stringify(json), {
         parser: "json",
       })
     );