sonamu 0.2.34 → 0.2.36

package/src/entity/migrator.ts

@@ -52,7 +52,6 @@ import {
   isKnexError,
   RelationOn,
 } from "../types/types";
-import { propIf } from "../utils/lodash-able";
 import { EntityManager } from "./entity-manager";
 import { Entity } from "./entity";
 import { Sonamu } from "../api";
@@ -993,7 +992,6 @@ export class Migrator {
     if (rawType === "char" && colField === "uuid") {
       return {
         type: "uuid",
-        ...propIf(length !== undefined, {}),
       };
     }
 
@@ -1007,7 +1005,7 @@ export class Migrator {
         // case "char":
         return {
           type: "string",
-          ...propIf(length !== undefined, {
+          ...(length !== undefined && {
             length,
           }),
         };
@@ -1038,7 +1036,7 @@ export class Migrator {
             type: "decimal",
             precision: parseInt(precision),
             scale: parseInt(scale),
-            ...propIf(unsigned === "unsigned", {
+            ...(unsigned === "unsigned" && {
               unsigned: true,
             }),
           };
@@ -1049,7 +1047,7 @@ export class Migrator {
             type: "float",
             precision: parseInt(precision),
             scale: parseInt(scale),
-            ...propIf(unsigned === "unsigned", {
+            ...(unsigned === "unsigned" && {
               unsigned: true,
             }),
           };
@@ -1073,15 +1071,13 @@ export class Migrator {
       const cols = _cols.map((col) => ({
         ...col,
         // Default 값은 숫자나 MySQL Expression이 아닌 경우 ""로 감싸줌
-        ...(col.Default !== null
-          ? {
-              Default:
-                col.Default.replace(/[0-9]+/g, "").length > 0 &&
-                col.Extra !== "DEFAULT_GENERATED"
-                  ? `"${col.Default}"`
-                  : col.Default,
-            }
-          : {}),
+        ...(col.Default !== null && {
+          Default:
+            col.Default.replace(/[0-9]+/g, "").length > 0 &&
+            col.Extra !== "DEFAULT_GENERATED"
+              ? `"${col.Default}"`
+              : col.Default,
+        }),
       }));
 
       const [indexes] = await compareDB.raw(`SHOW INDEX FROM ${tableName}`);
@@ -1154,12 +1150,10 @@ export class Migrator {
           const column = {
             name: prop.name,
             type,
-            ...(isIntegerProp(prop)
-              ? { unsigned: prop.unsigned === true }
-              : {}),
-            ...(isStringProp(prop) || isEnumProp(prop)
-              ? { length: prop.length }
-              : {}),
+            ...(isIntegerProp(prop) && { unsigned: prop.unsigned === true }),
+            ...((isStringProp(prop) || isEnumProp(prop)) && {
+              length: prop.length,
+            }),
             nullable: prop.nullable === true,
             ...(() => {
               if (prop.dbDefault !== undefined) {
@@ -1170,12 +1164,10 @@ export class Migrator {
               return {};
             })(),
             // Decimal, Float 타입의 경우 precision, scale 추가
-            ...(isDecimalProp(prop) || isFloatProp(prop)
-              ? {
-                  precision: prop.precision ?? 8,
-                  scale: prop.scale ?? 2,
-                }
-              : {}),
+            ...((isDecimalProp(prop) || isFloatProp(prop)) && {
+              precision: prop.precision ?? 8,
+              scale: prop.scale ?? 2,
+            }),
           };
 
           r.columns.push(column);

package/src/templates/generated.template.ts

@@ -140,6 +140,7 @@ export class Template__generated extends Template {
       label: `Enums: ${entity.id}`,
       lines: [
         ...Object.entries(entity.enumLabels)
+          .filter(([_, enumLabel]) => Object.keys(enumLabel).length > 0)
           .map(([enumId, enumLabel]) => [
             `export const ${enumId} = z.enum([${Object.keys(enumLabel).map(
               (el) => `"${el}"`

package/src/templates/service.template.ts

@@ -241,13 +241,13 @@ export async function ${api.methodName}${typeParamsDef}(
     return `  export function ${camelize(
       methodNameSwr,
       true
-    )}${typeParamsDef}(${[paramsDef, "options?: SwrOptions"]
+    )}${typeParamsDef}(${[paramsDef, "swrOptions?: SwrOptions"]
       .filter((p) => p !== "")
       .join(",")}, ): SWRResponse<${returnTypeDef}, SWRError> {
     return useSWR(handleConditional([
       \`${apiBaseUrl}\`,
       ${payloadDef},
-    ], options?.conditional)${
+    ], swrOptions?.conditional)${
       api.options.httpMethod === "POST" ? ", swrPostFetcher" : ""
     });
   }`;

package/src/utils/lodash-able.ts

@@ -5,7 +5,3 @@ export function wrapIf(
   const [ok, wrapped] = predicate(source);
   return ok ? wrapped : source;
 }
-
-export function propIf(expression: boolean, obj: any) {
-  return expression ? obj : {};
-}

package/src/utils/sql-parser.ts

@@ -0,0 +1,40 @@
+import { uniq } from "lodash";
+import { AST, ColumnRef, Expr, ExpressionValue, Select } from "node-sql-parser";
+
+export function getTableName(expr: ColumnRef) {
+  if ("table" in expr && expr.table !== null) {
+    return typeof expr.table === "string"
+      ? expr.table
+      : (expr.table as { type: string; value: string }).value;
+  }
+  return null;
+}
+
+// where 조건에 사용된 테이블명을 추출
+export function getTableNamesFromWhere(ast: AST | AST[]): string[] {
+  const extractTableNames = (where: Select["where"]): string[] => {
+    if (where === null || !(where.type === "binary_expr" && "left" in where)) {
+      return [];
+    }
+
+    const extractTableName = (expr: Expr | ExpressionValue): string[] => {
+      if (expr.type === "column_ref") {
+        const table = getTableName(expr as ColumnRef);
+        return table ? [table] : [];
+      } else if (expr.type === "binary_expr" && "left" in expr) {
+        return extractTableNames(expr);
+      }
+      return [];
+    };
+
+    return [...extractTableName(where.left), ...extractTableName(where.right)];
+  };
+
+  return uniq(
+    (Array.isArray(ast) ? ast : [ast]).flatMap((a) =>
+      a.type === "select" || a.type === "update" || a.type === "delete"
+        ? extractTableNames(a.where)
+        : []
+    )
+  );
+}