sonamu 0.2.4 → 0.2.6

package/src/database/base-model.ts

@@ -214,6 +214,8 @@ export class BaseModelClass {
   }> {
     const db = this.getDB(subset.startsWith("A") ? "w" : "r");
     baseTable = baseTable ?? pluralize(underscore(this.modelName));
+    const queryMode =
+      params.queryMode ?? (params.id !== undefined ? "list" : "both");
 
     const { select, virtual, joins, loaders } = subsetQuery;
     const qb = build({
@@ -239,55 +241,55 @@ export class BaseModelClass {
       }
     });
 
-    // count
-    let countQuery;
-    if (params.id === undefined && params.withoutCount !== true) {
-      const clonedQb = qb.clone().clear("order");
-      const [, matched] =
-        clonedQb
-          .toQuery()
-          .toLowerCase()
-          .match(/select (distinct .+) from/) ?? [];
-      if (matched) {
-        countQuery = clonedQb
-          .clear("select")
-          .select(db.raw(`COUNT(${matched}) as total`));
-      } else {
-        countQuery = clonedQb.clear("select").count("*", { as: "total" });
+    // listQuery
+    const rows = await (async () => {
+      if (queryMode === "count") {
+        return [];
       }
-    }
 
-    // limit, offset
-    if (params.num !== 0) {
-      qb.limit(params.num!);
-      qb.offset(params.num! * (params.page! - 1));
-    }
+      // limit, offset
+      if (params.num !== 0) {
+        qb.limit(params.num!);
+        qb.offset(params.num! * (params.page! - 1));
+      }
 
-    // select, rows
-    qb.select(select);
-    const listQuery = qb.clone();
+      // select, rows
+      const listQuery = qb.clone().select(select);
 
-    // debug: listQuery
-    if (debug === true || debug === "list") {
-      console.debug(
-        "DEBUG: list query",
-        chalk.blue(listQuery.toQuery().toString())
-      );
-    }
+      let rows = await listQuery;
+      // debug: listQuery
+      if (debug === true || debug === "list") {
+        console.debug(
+          "DEBUG: list query",
+          chalk.blue(listQuery.toQuery().toString())
+        );
+      }
 
-    // listQuery
-    let rows = await listQuery;
-    rows = await this.useLoaders(db, rows, loaders);
-    rows = this.hydrate(rows);
+      rows = await this.useLoaders(db, rows, loaders);
+      rows = this.hydrate(rows);
+      return rows;
+    })();
 
     // countQuery
-    let total = 0;
-    if (countQuery) {
-      const countResult = await countQuery;
-      if (countResult && countResult[0] && countResult[0].total) {
-        total = countResult[0].total;
+    const total = await (async () => {
+      if (queryMode === "list") {
+        return undefined;
       }
 
+      const clonedQb = qb.clone().clear("order");
+      const [, matched] =
+        clonedQb
+          .toQuery()
+          .toLowerCase()
+          .match(/select (distinct .+) from/) ?? [];
+      const countQuery = matched
+        ? clonedQb
+            .clear("select")
+            .select(db.raw(`COUNT(${matched}) 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(
@@ -295,7 +297,9 @@ export class BaseModelClass {
           chalk.blue(countQuery.toQuery().toString())
         );
       }
-    }
+
+      return countRow?.total ?? 0;
+    })();
 
     return { rows, total, subsetQuery, qb };
   }

package/src/entity/migrator.ts

@@ -840,7 +840,7 @@ export class Migrator {
               ).map((f) => replaceNoActionOnMySQL(f));
 
               if (equal(entityForeigns, dbForeigns) === false) {
-                console.dir({ entityForeigns, dbForeigns }, { depth: null });
+                // console.dir({ entityForeigns, dbForeigns }, { depth: null });
                 return this.generateAlterCode_Foreigns(
                   entitySet.table,
                   entityForeigns,
@@ -1076,40 +1076,23 @@ export class Migrator {
       const foreignKeys = (matched ?? []).map((line: string) => {
         // 해당 라인을 정규식으로 파싱
         const matched = line.match(
-          /CONSTRAINT `(.+)` FOREIGN KEY \(`(.+)`\) REFERENCES `(.+)` \(`(.+)`\)( ON DELETE [A-Z ]+ ON UPDATE [A-Z ]+)*/
+          /CONSTRAINT `(.+)` FOREIGN KEY \(`(.+)`\) REFERENCES `(.+)` \(`(.+)`\)( ON [A-Z ]+)*/
         );
         if (!matched) {
           throw new Error(`인식할 수 없는 FOREIGN KEY CONSTRAINT ${line}`);
         }
-        const [, keyName, from, referencesTable, referencesField, _onClause] =
+        const [, keyName, from, referencesTable, referencesField, onClause] =
           matched;
-        const onClause = _onClause ?? "";
-
-        const { onDelete, onUpdate } = (() => {
-          // ON Clause가 둘다 있는 경우
-          if (
-            onClause.includes("ON DELETE") &&
-            onClause.includes("ON UPDATE")
-          ) {
-            const [, onDelete, onUpdate] = onClause.match(
-              /ON DELETE ([A-Z ]+) ON UPDATE ([A-Z ]+)/
-            )!;
-            return {
-              onDelete,
-              onUpdate,
-            };
-          }
+        // console.debug({ tableName, line, onClause });
 
-          // 각각 있는 경우
-          const onDelete =
-            onClause.match(/ON DELETE ([A-Z ]+)( ON)*/)?.[1] ?? "NO ACTION";
-          const onUpdate =
-            onClause.match(/ON UPDATE ([A-Z ]+)/)?.[1] ?? "NO ACTION";
-          return {
-            onDelete,
-            onUpdate,
-          };
-        })();
+        const [onUpdateFull, _onUpdate] =
+          (onClause ?? "").match(/ON UPDATE ([A-Z ]+)$/) ?? [];
+        const onUpdate = _onUpdate ?? "NO ACTION";
+
+        const onDelete =
+          (onClause ?? "")
+            .replace(onUpdateFull ?? "", "")
+            .match(/ON DELETE ([A-Z ]+) /)?.[1] ?? "NO ACTION";
 
         return {
           keyName,

package/src/shared/web.shared.ts.txt

@@ -55,11 +55,8 @@ export type ListResult<T> = {
   rows: T[];
   total?: number;
 };
-
-export type EnumsLabel<T extends string, L extends "ko" | "en"> = {
-  [key in T]: { [lang in L]: string };
-};
-export type EnumsLabelKo<T extends string> = EnumsLabel<T, "ko">;
+export const SonamuQueryMode = z.enum(["both", "list", "count"]);
+export type SonamuQueryMode = z.infer<typeof SonamuQueryMode>;
 
 /*
   SWR

package/src/syncer/syncer.ts

@@ -578,6 +578,8 @@ export class Syncer {
               return this.resolveParamDec({
                 name: (member as ts.PropertySignature).name as ts.Identifier,
                 type: (member as ts.PropertySignature).type as ts.TypeNode,
+                optional:
+                  (member as ts.PropertySignature).questionToken !== undefined,
               });
             }
           }),
@@ -971,7 +973,6 @@ export class Syncer {
       }
     })();
     if (filteredPathAndCodes.length === 0) {
-      console.log("요거란 말이지?");
       throw new AlreadyProcessedException(
         "이미 경로에 모든 파일이 존재합니다."
       );

package/src/templates/generated.template.ts

@@ -115,6 +115,7 @@ export class Template__generated extends Template {
       "zArrayable",
       "SQLDateTimeString",
       "SubsetQuery",
+      "SonamuQueryMode",
     ].filter((mod) => body.includes(mod));
 
     return {
@@ -210,7 +211,7 @@ z.object({
   search: ${entity.id}SearchField,
   keyword: z.string(),
   orderBy: ${entity.id}OrderBy,
-  withoutCount: z.boolean(),
+  queryMode: SonamuQueryMode,
   id: zArrayable(z.number().int().positive()),${filterBody}
 }).partial();
 `.trim();
@@ -237,7 +238,6 @@ z.object({
     const subsetKeys = Object.keys(entity.subsets);
     const importKeys: string[] = [];
     const lines: string[] = [
-      // `// Subsets: ${entity.id}`,
       ...subsetKeys
         .map((subsetKey) => {
           // 서브셋에서 FieldExpr[] 가져옴
@@ -271,31 +271,8 @@ z.object({
         .join(",")}]);`,
       `export type ${entity.names.module}SubsetKey = z.infer<typeof ${entity.names.module}SubsetKey>`,
       "",
-      // "/* BEGIN- Server-side Only */",
-      // // `import { SubsetQuery } from "sonamu";`,
-      // `export const ${camelize(entity.id, true)}SubsetQueries:{ [key in ${
-      //   entity.names.module
-      // }SubsetKey]: SubsetQuery} = ${JSON.stringify(subsetQueryObject)}`,
-      // "",
     ];
 
-    // ServerSide Only
-    // const subsetQueryObject = subsetKeys.reduce(
-    //   (r, subsetKey) => {
-    //     const subsetQuery = entity.getSubsetQuery(subsetKey);
-    //     r[subsetKey] = subsetQuery;
-    //     return r;
-    //   },
-    //   {} as {
-    //     [key: string]: SubsetQuery;
-    //   }
-    // );
-    // const lines2: string[] = [
-    //   `export const ${camelize(entity.id, true)}SubsetQueries:{ [key in ${
-    //     entity.names.module
-    //   }SubsetKey]: SubsetQuery} = ${JSON.stringify(subsetQueryObject)}`,
-    // ];
-
     return {
       label: `Subsets: ${entity.id}`,
       lines,

package/src/templates/view_list.template.ts

@@ -251,6 +251,7 @@ export class Template__view_list extends Template {
       .filter(
         (col) =>
           col.name !== "id" &&
+          col.name !== "queryMode" &&
           (["enums", "number-id"].includes(col.renderType) ||
             col.name.endsWith("_id"))
       )
@@ -576,7 +577,6 @@ export function getEnumInfoFromColName(
       underscore(entityId) + "_" + underscore(colName),
       false
     );
-    console.log({ idCandidate });
     try {
       const targetEntityNames = EntityManager.getNamesFromId(entityId);
       return {

package/src/testing/fixture-manager.ts

@@ -67,7 +67,7 @@ export class FixtureManagerClass {
       const [tables] = await this.tdb.raw(
         "SHOW TABLE STATUS WHERE Engine IS NOT NULL"
       );
-      return tables.map((tableInfo: any) => tableInfo["Name"]);
+      return tables.map((tableInfo: any) => tableInfo["Name"] as string);
     })();
 
     await this.tdb.raw(`SET FOREIGN_KEY_CHECKS = 0`);

package/src/types/types.ts

@@ -359,6 +359,10 @@ export type SubsetQuery = {
   loaders: SubsetLoader[];
 };
 
+/* BaseModel */
+export const SonamuQueryMode = z.enum(["both", "list", "count"]);
+export type SonamuQueryMode = z.infer<typeof SonamuQueryMode>;
+
 /* Knex Migration */
 export type KnexError = {
   code: string;

package/src/utils/model.ts

@@ -24,10 +24,10 @@ export function objToMap<T>(obj: { [k: string]: T }) {
   }
 }
 
-export class BaseListParams {
+export interface BaseListParams {
   id?: number | number[];
   num?: number;
   page?: number;
   keyword?: string;
-  withoutCount?: boolean;
+  queryMode?: "list" | "count" | "both";
 }