sonamu 0.5.2 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sonamu",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Sonamu — TypeScript Fullstack API Framework",
   "keywords": [
     "typescript",
@@ -24,6 +24,10 @@
     "url": "https://github.com/ping-alive/sonamu.git"
   },
   "bin": "./dist/bin/cli-wrapper.js",
+  "files": [
+    "dist",
+    "src"
+  ],
   "dependencies": {
     "@aws-sdk/client-s3": "^3.921.0",
     "@aws-sdk/s3-request-presigner": "^3.921.0",

package/src/api/code-converters.ts

@@ -400,7 +400,7 @@ export function zodTypeToZodCode(zt: z.ZodType<any>): string {
         .join(",")}])`;
     case "enum":
       // NOTE: z.enum(["A", "B"])도 z.enum({ A: "A", B: "B" })로 처리됨.
-      return `z.enum([${Object.entries((zt as z.ZodEnum).def.entries)
+      return `z.enum({${Object.entries((zt as z.ZodEnum).def.entries)
         .map(([key, val]) =>
           typeof val === "string" ? `${key}: "${val}"` : `${key}: ${val}`)
         .join(", ")}})`;

package/src/api/decorators.ts

@@ -40,12 +40,16 @@ export type StreamDecoratorOptions = {
   guards?: GuardKey[];
   description?: string;
 };
+export type UploadDecoratorOptions = {
+  mode?: "single" | "multiple";
+};
 export const registeredApis: {
   modelName: string;
   methodName: string;
   path: string;
   options: ApiDecoratorOptions;
   streamOptions?: StreamDecoratorOptions;
+  uploadOptions?: UploadDecoratorOptions;
 }[] = [];
 export type ExtendedApi = {
   modelName: string;
@@ -53,6 +57,7 @@ export type ExtendedApi = {
   path: string;
   options: ApiDecoratorOptions;
   streamOptions?: StreamDecoratorOptions;
+  uploadOptions?: UploadDecoratorOptions;
   typeParameters: ApiParamType.TypeParam[];
   parameters: ApiParam[];
   returnType: ApiParamType;
@@ -176,13 +181,23 @@ export function transactional(options: TransactionalOptions = {}) {
   };
 }
 
-export function upload() {
+export function upload(options: UploadDecoratorOptions = {}) {
   return function (
     _target: Object,
     _propertyKey: string,
     descriptor: PropertyDescriptor
   ) {
     const originalMethod = descriptor.value;
+    const modelName = _target.constructor.name.match(/(.+)Class$/)![1];
+    const methodName = _propertyKey;
+
+    // registeredApis에서 해당 API 찾아서 uploadOptions 추가
+    const existingApi = registeredApis.find(
+      (api) => api.modelName === modelName && api.methodName === methodName
+    );
+    if (existingApi) {
+      existingApi.uploadOptions = options;
+    }
 
     descriptor.value = async function (this: any, ...args: any[]) {
       const { request } = Sonamu.getContext();
@@ -196,20 +211,19 @@ export function upload() {
         throw new Error("Storage가 설정되지 않았습니다.");
       }
 
-      if (request.file) {
-        const rawFile = await request.file();
-        if (rawFile) {
-          const { FileStorage } = await import("../file-storage/file-storage");
-          uploadContext.file = new FileStorage(rawFile, storage);
-        }
-      } else if (request.files) {
-        const { FileStorage } = await import("../file-storage/file-storage");
+      const { FileStorage } = await import("../file-storage/file-storage");
+      if (options.mode === "multiple") {
         const rawFilesIterator = request.files();
         for await (const rawFile of rawFilesIterator) {
           if (rawFile) {
             uploadContext.files.push(new FileStorage(rawFile, storage));
           }
         }
+      } else {
+        const rawFile = await request.file();
+        if (rawFile) {
+          uploadContext.file = new FileStorage(rawFile, storage);
+        }
       }
 
       return Sonamu.uploadStorage.run({ uploadContext }, () => {

package/src/bin/cli-wrapper.ts

@@ -47,7 +47,7 @@ if (!existsSync(scriptPath)) {
 
 const result = spawnSync(
   process.execPath,
-  ["--no-warnings", scriptPath, ...args],
+  ["-r", "source-map-support/register", "--no-warnings", scriptPath, ...args],
   {
     stdio: "inherit",
   }

package/src/database/puri-wrapper.ts

@@ -17,9 +17,12 @@ export type TransactionalOptions = {
 };
 
 export class PuriWrapper<
-  DBSchema extends DatabaseSchemaExtend = DatabaseSchemaExtend
+  DBSchema extends DatabaseSchemaExtend = DatabaseSchemaExtend,
 > {
-  constructor(public knex: Knex, public upsertBuilder: UpsertBuilder) {}
+  constructor(
+    public knex: Knex,
+    public upsertBuilder: UpsertBuilder
+  ) {}
 
   raw(sql: string): Knex.Raw {
     return this.knex.raw(sql);
@@ -40,14 +43,14 @@ export class PuriWrapper<
   }
 
   async transaction<T>(
-    callback: (trx: PuriWrapper) => Promise<T>,
+    callback: (trx: PuriTransactionWrapper) => Promise<T>,
     options: TransactionalOptions = {}
   ): Promise<T> {
     const { isolation, readOnly } = options;
 
     return this.knex.transaction(
       async (trx) => {
-        return callback(new PuriWrapper(trx, this.upsertBuilder));
+        return callback(new PuriTransactionWrapper(trx, this.upsertBuilder));
       },
       { isolationLevel: isolation, readOnly }
     );
@@ -127,3 +130,20 @@ export class PuriWrapper<
     }
   }
 }
+
+export class PuriTransactionWrapper extends PuriWrapper {
+  constructor(
+    public trx: Knex.Transaction,
+    public upsertBuilder: UpsertBuilder
+  ) {
+    super(trx, upsertBuilder);
+  }
+
+  async rollback(): Promise<void> {
+    await this.trx.rollback();
+  }
+
+  async commit(): Promise<void> {
+    await this.trx.commit();
+  }
+}

package/src/database/puri.ts

@@ -224,7 +224,9 @@ export class Puri<
   }
 
   // WhereIn (조인된 테이블 컬럼도 지원)
-  whereIn<TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>>(
+  whereIn<
+    TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>,
+  >(
     column: TColumn,
     values: ExtractColumnType<
       TSchema,
@@ -264,7 +266,10 @@ export class Puri<
 
   whereMatch<
     TColumn extends FulltextColumns<TSchema, TTable, TOriginal, TJoined>,
-  >(column: TColumn, value: string): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
+  >(
+    column: TColumn,
+    value: string
+  ): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
     this.knexQuery.whereRaw(`MATCH (${String(column)}) AGAINST (?)`, [value]);
     return this;
   }
@@ -276,7 +281,9 @@ export class Puri<
     ) => WhereGroup<TSchema, TTable, TOriginal, TJoined>
   ): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
     this.knexQuery.where((builder) => {
-      const group = new WhereGroup<TSchema, TTable, TOriginal, TJoined>(builder);
+      const group = new WhereGroup<TSchema, TTable, TOriginal, TJoined>(
+        builder
+      );
       callback(group);
     });
     return this;
@@ -288,7 +295,9 @@ export class Puri<
     ) => WhereGroup<TSchema, TTable, TOriginal, TJoined>
   ): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
     this.knexQuery.orWhere((builder) => {
-      const group = new WhereGroup<TSchema, TTable, TOriginal, TJoined>(builder);
+      const group = new WhereGroup<TSchema, TTable, TOriginal, TJoined>(
+        builder
+      );
       callback(group);
     });
     return this;
@@ -297,12 +306,22 @@ export class Puri<
   // Join
   join<
     TJoinTable extends keyof TSchema,
-    TLColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined & Record<TJoinTable, TSchema[TJoinTable]>>,
-    TRColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined & Record<TJoinTable, TSchema[TJoinTable]>>,
+    TLColumn extends AvailableColumns<
+      TSchema,
+      TTable,
+      TOriginal,
+      TJoined & Record<TJoinTable, TSchema[TJoinTable]>
+    >,
+    TRColumn extends AvailableColumns<
+      TSchema,
+      TTable,
+      TOriginal,
+      TJoined & Record<TJoinTable, TSchema[TJoinTable]>
+    >,
   >(
     table: TJoinTable,
     left: TLColumn,
-    right: TRColumn,
+    right: TRColumn
   ): Puri<
     TSchema,
     TTable,
@@ -327,7 +346,13 @@ export class Puri<
     alias: TAlias,
     left: string,
     right: string
-  ): Puri<TSchema, TTable, TOriginal, TResult, TJoined & Record<TAlias, TSubResult>>;
+  ): Puri<
+    TSchema,
+    TTable,
+    TOriginal,
+    TResult,
+    TJoined & Record<TAlias, TSubResult>
+  >;
   join(
     table: string,
     left: string,
@@ -361,12 +386,22 @@ export class Puri<
 
   leftJoin<
     TJoinTable extends keyof TSchema,
-    TLColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined & Record<TJoinTable, TSchema[TJoinTable]>>,
-    TRColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined & Record<TJoinTable, TSchema[TJoinTable]>>,
+    TLColumn extends AvailableColumns<
+      TSchema,
+      TTable,
+      TOriginal,
+      TJoined & Record<TJoinTable, TSchema[TJoinTable]>
+    >,
+    TRColumn extends AvailableColumns<
+      TSchema,
+      TTable,
+      TOriginal,
+      TJoined & Record<TJoinTable, TSchema[TJoinTable]>
+    >,
   >(
     table: TJoinTable,
     left: TLColumn,
-    right: TRColumn,
+    right: TRColumn
   ): Puri<
     TSchema,
     TTable,
@@ -407,7 +442,15 @@ export class Puri<
   }
 
   // OrderBy
-  orderBy<TColumn extends ResultAvailableColumns<TSchema, TTable, TOriginal, TResult, TJoined>>(
+  orderBy<
+    TColumn extends ResultAvailableColumns<
+      TSchema,
+      TTable,
+      TOriginal,
+      TResult,
+      TJoined
+    >,
+  >(
     column: TColumn,
     direction: "asc" | "desc"
   ): Puri<TSchema, TTable, TOriginal, TResult, TJoined>;
@@ -431,21 +474,39 @@ export class Puri<
   }
 
   // Group by (조인된 테이블 컬럼도 지원)
-  groupBy<TColumns extends ResultAvailableColumns<TSchema, TTable, TOriginal, TResult, TJoined>>(
-    ...columns: TColumns[]
-  ): Puri<TSchema, TTable, TOriginal, TResult, TJoined>;
-  groupBy(...columns: string[]): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
+  groupBy<
+    TColumns extends ResultAvailableColumns<
+      TSchema,
+      TTable,
+      TOriginal,
+      TResult,
+      TJoined
+    >,
+  >(...columns: TColumns[]): Puri<TSchema, TTable, TOriginal, TResult, TJoined>;
+  groupBy(
+    ...columns: string[]
+  ): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
     this.knexQuery.groupBy(...(columns as string[]));
     return this;
   }
 
   having(condition: string): Puri<TSchema, TTable, TOriginal, TResult, TJoined>;
-  having<TColumn extends ResultAvailableColumns<TSchema, TTable, TOriginal, TResult, TJoined>>(
+  having<
+    TColumn extends ResultAvailableColumns<
+      TSchema,
+      TTable,
+      TOriginal,
+      TResult,
+      TJoined
+    >,
+  >(
     condition: TColumn,
     operator: ComparisonOperator,
     value: any
   ): Puri<TSchema, TTable, TOriginal, TResult, TJoined>;
-  having(...conditions: string[]): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
+  having(
+    ...conditions: string[]
+  ): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
     this.knexQuery.having(...(conditions as [string, string, string]));
     return this;
   }
@@ -641,6 +702,32 @@ export class Puri<
   raw(): Knex.QueryBuilder {
     return this.knexQuery;
   }
+
+  increment<
+    TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>,
+  >(
+    column: TColumn,
+    value: number
+  ): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
+    if (value <= 0) {
+      throw new Error("Increment value must be greater than 0");
+    }
+    this.knexQuery.increment(column, value);
+    return this;
+  }
+
+  decrement<
+    TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>,
+  >(
+    column: TColumn,
+    value: number
+  ): Puri<TSchema, TTable, TOriginal, TResult, TJoined> {
+    if (value <= 0) {
+      throw new Error("Decrement value must be greater than 0");
+    }
+    this.knexQuery.decrement(column, value);
+    return this;
+  }
 }
 
 // 11. Database 클래스
@@ -685,7 +772,9 @@ class WhereGroup<
   orWhere(
     conditions: WhereCondition<TSchema, TTable, TOriginal, TJoined>
   ): WhereGroup<TSchema, TTable, TOriginal, TJoined>;
-  orWhere<TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>>(
+  orWhere<
+    TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>,
+  >(
     column: TColumn,
     value: ExtractColumnType<
       TSchema,
@@ -695,7 +784,9 @@ class WhereGroup<
       TJoined
     >
   ): WhereGroup<TSchema, TTable, TOriginal, TJoined>;
-  orWhere<TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>>(
+  orWhere<
+    TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>,
+  >(
     column: TColumn,
     operator: ComparisonOperator | "like",
     value: ExtractColumnType<
@@ -712,7 +803,9 @@ class WhereGroup<
     return this;
   }
 
-  whereIn<TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>>(
+  whereIn<
+    TColumn extends AvailableColumns<TSchema, TTable, TOriginal, TJoined>,
+  >(
     column: TColumn,
     values: ExtractColumnType<
       TSchema,
@@ -789,18 +882,28 @@ export class JoinClauseGroup<
   constructor(private callback: Knex.JoinClause) {}
 
   on(
-    callback: (joinClause: JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>) => void
+    callback: (
+      joinClause: JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>
+    ) => void
+  ): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>;
+  on(
+    column: string,
+    value: any
   ): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>;
-  on(column: string, value: any): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>;
   on(...args: any[]): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined> {
     this.callback.on(...(args as [string, string]));
     return this;
   }
 
   orOn(
-    callback: (joinClause: JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>) => void
+    callback: (
+      joinClause: JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>
+    ) => void
+  ): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>;
+  orOn(
+    column: string,
+    value: any
   ): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>;
-  orOn(column: string, value: any): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined>;
   orOn(...args: any[]): JoinClauseGroup<TSchema, TTable, TOriginal, TJoined> {
     this.callback.orOn(...(args as [string, string]));
     return this;

package/src/database/puri.types.ts

@@ -1,20 +1,33 @@
 export type ComparisonOperator = "=" | ">" | ">=" | "<" | "<=" | "<>" | "!=";
 export type Expand<T> = T extends any[]
   ? { [K in keyof T[0]]: T[0][K] }[] // 배열이면 첫 번째 요소를 Expand하고 배열로 감쌈
-  : T extends object ? { [K in keyof T]: T[K] } : T;
-    
+  : T extends object
+    ? { [K in keyof T]: T[K] }
+    : T;
+
 // EmptyRecord가 남아있으면 AvailableColumns 추론이 제대로 되지 않음 (EmptyRecord를 {}로 변경하면 정상 동작함)
-export type MergeJoined<TExisting, TNew> = 
-  TExisting extends EmptyRecord 
-    ? TNew  // 첫 join: EmptyRecord 제거하고 대체
-    : TExisting & TNew;  // 이후 join: 누적
+export type MergeJoined<TExisting, TNew> = TExisting extends EmptyRecord
+  ? TNew // 첫 join: EmptyRecord 제거하고 대체
+  : TExisting & TNew; // 이후 join: 누적
 
-type DeepEqual<T, U> = [T] extends [U] ? [U] extends [T] ? true : false : false;
-type Extends<T, U> = DeepEqual<T, Record<string, never>> extends true ? false : (T extends U ? true : false);
+type DeepEqual<T, U> = [T] extends [U]
+  ? [U] extends [T]
+    ? true
+    : false
+  : false;
+type Extends<T, U> =
+  DeepEqual<T, Record<string, never>> extends true
+    ? false
+    : T extends U
+      ? true
+      : false;
 type NullableToOptional<T> = {
-  [K in keyof T as T[K] extends null | undefined ? K : never]?: Exclude<T[K], null | undefined>
+  [K in keyof T as T[K] extends null | undefined ? K : never]?: Exclude<
+    T[K],
+    null | undefined
+  >;
 } & Partial<{
-  [K in keyof T as T[K] extends null | undefined ? never : K]: T[K]
+  [K in keyof T as T[K] extends null | undefined ? never : K]: T[K];
 }>;
 
 // Join 등이 Empty 상태일 떄 {}가 아니라 EmptyRecord를 써서
@@ -27,7 +40,9 @@ export type ResultAvailableColumns<
   TOriginal = any,
   TResult = any,
   TJoined = EmptyRecord,
-> = AvailableColumns<TSchema, T, TOriginal, TJoined> | `${keyof TResult & string}`;
+> =
+  | AvailableColumns<TSchema, T, TOriginal, TJoined>
+  | `${keyof TResult & string}`;
 
 // 사용 가능한 컬럼 경로 타입 (메인 테이블 + 조인된 테이블들)
 export type AvailableColumns<
@@ -37,14 +52,14 @@ export type AvailableColumns<
   TJoined = EmptyRecord,
 > = T extends keyof TSchema
   ? // 기존 테이블 케이스
-  | (Extends<TJoined, Record<string, any>> extends false
-    // 이게 TSchema[T]에 존재하면
-    ? keyof TSchema[T]
-    : {
-        [K in keyof TJoined]: TJoined[K] extends Record<string, any>
-          ? `${string & K}.${keyof TJoined[K] & string}`
-          : never;
-      }[keyof TJoined])
+    | (Extends<TJoined, Record<string, any>> extends false
+          ? // 이게 TSchema[T]에 존재하면
+            keyof TSchema[T]
+          : {
+              [K in keyof TJoined]: TJoined[K] extends Record<string, any>
+                ? `${string & K}.${keyof TJoined[K] & string}`
+                : never;
+            }[keyof TJoined])
       | `${T & string}.${keyof TSchema[T] & string}`
   : // 서브쿼리 케이스 (T는 alias string)
     | keyof TOriginal
@@ -156,27 +171,15 @@ export type WhereCondition<
   T extends keyof TSchema | string,
   TOriginal = any,
   TJoined = EmptyRecord,
-> =
-  // 메인 테이블/서브쿼리 조건들
-  (T extends keyof TSchema
-    ? {
-        [K in keyof TSchema[T]]?: TSchema[T][K] | TSchema[T][K][];
-      }
-    : {
-        [K in keyof TOriginal]?: TOriginal[K] | TOriginal[K][];
-      }) &
-    // 조인된 테이블들의 조건들
-    (TJoined extends Record<string, any>
-      ? {
-          [K in keyof TJoined as TJoined[K] extends Record<string, any>
-            ? keyof TJoined[K] & string
-            : never]?: TJoined[K] extends Record<string, any>
-            ?
-                | TJoined[K][K extends keyof TJoined[K] ? K : never]
-                | TJoined[K][K extends keyof TJoined[K] ? K : never][]
-            : never;
-        }
-      : Record<string, never>);
+> = {
+  [key in AvailableColumns<TSchema, T, TOriginal, TJoined>]?: ExtractColumnType<
+    TSchema,
+    T,
+    key & string,
+    TOriginal,
+    TJoined
+  >;
+};
 
 // Fulltext index 컬럼 추출 타입 (메인 테이블 + 조인된 테이블)
 export type FulltextColumns<
@@ -219,4 +222,6 @@ export type FulltextColumns<
           : never);
 
 // Insert 타입: id, created_at 제외
-export type InsertData<T> = NullableToOptional<Omit<T, "id" | "created_at" | "__fulltext__">>;
+export type InsertData<T> = NullableToOptional<
+  Omit<T, "id" | "created_at" | "__fulltext__">
+>;

package/src/index.ts

@@ -16,9 +16,10 @@ export * from "./utils/controller";
 export * from "./utils/model";
 export * from "./utils/utils";
 export * from "./testing/fixture-manager";
-export * from "./migration/migrator";
 export * from "./entity/entity-manager";
 export * from "./entity/entity";
+export * from "./migration/migrator";
+export * from "./migration/types";
 export * from "./file-storage/driver";
 
 // export * from "./api/code-converters";

package/src/migration/code-generation.ts

@@ -77,7 +77,7 @@ function genColumnDefinitions(columns: MigrationColumn[]): string[] {
         columnType = "text";
       }
       chains.push(
-        `${column.type}('${column.name}'${
+        `${columnType}('${column.name}'${
           column.length ? `, ${column.length}` : ""
         }${extraType ? `, '${extraType}'` : ""})`
       );
@@ -680,9 +680,9 @@ export async function generateAlterCode(
     // boolean인 경우 기본값 정규화 (MySQL에서는 TINYINT(1)로 저장되므로 0 또는 1로 정규화)
     // TODO: db.ts에 typeCase 설정 확인하여 처리하도록 수정 필요
     if (col.type === "boolean" && col.defaultTo !== undefined) {
-      if (col.defaultTo === "0" || col.defaultTo === "false") {
+      if (col.defaultTo === "0" || col.defaultTo.toLowerCase() === "false") {
         col.defaultTo = "0";
-      } else if (col.defaultTo === "1" || col.defaultTo === "true") {
+      } else if (col.defaultTo === "1" || col.defaultTo.toLowerCase() === "true") {
         col.defaultTo = "1";
       }
     }

package/src/migration/types.ts

@@ -1,3 +1,4 @@
+import { SonamuDBConfig } from "../database/db";
 import { GenMigrationCode } from "../types/types";
 
 export type MigrationCode = {
@@ -10,7 +11,7 @@ export type MigrationStatus = {
   codes: MigrationCode[];
   conns: {
     name: string;
-    connKey: string;
+    connKey: keyof SonamuDBConfig;
     connString: ConnString;
     currentVersion: string;
     status: string | number;

package/src/templates/generated_http.template.ts

@@ -84,7 +84,12 @@ export class Template__generated_http extends Template {
         ])
       );
     } else if (zodType instanceof z.ZodArray) {
-      return [this.zodTypeToReqDefault((zodType as z.ZodArray<z.ZodType>).element, name)];
+      return [
+        this.zodTypeToReqDefault(
+          (zodType as z.ZodArray<z.ZodType>).element,
+          name
+        ),
+      ];
     } else if (zodType instanceof z.ZodString) {
       if (name.endsWith("_at") || name.endsWith("_date") || name === "range") {
         return "2000-01-01";
@@ -97,17 +102,23 @@ export class Template__generated_http extends Template {
       }
 
       const minValue = zodType.minValue ?? 0;
-      return minValue > Number.MIN_SAFE_INTEGER  ? minValue : 0;
+      return minValue > Number.MIN_SAFE_INTEGER ? minValue : 0;
     } else if (zodType instanceof z.ZodBoolean) {
       return false;
     } else if (zodType instanceof z.ZodEnum) {
       return zodType.options[0];
     } else if (zodType instanceof z.ZodOptional) {
-      return this.zodTypeToReqDefault((zodType as z.ZodOptional<z.ZodType>).def.innerType, name);
+      return this.zodTypeToReqDefault(
+        (zodType as z.ZodOptional<z.ZodType>).def.innerType,
+        name
+      );
     } else if (zodType instanceof z.ZodNullable) {
       return null;
     } else if (zodType instanceof z.ZodUnion) {
-      return this.zodTypeToReqDefault((zodType as z.ZodUnion<z.ZodType[]>).def.options[0], name);
+      return this.zodTypeToReqDefault(
+        (zodType as z.ZodUnion<z.ZodType[]>).def.options[0],
+        name
+      );
     } else if (zodType instanceof z.ZodUnknown) {
       return "unknown";
     } else if (zodType instanceof z.ZodTuple) {
@@ -119,16 +130,29 @@ export class Template__generated_http extends Template {
     } else if (zodType instanceof z.ZodLiteral) {
       return zodType.value;
     } else if (zodType instanceof z.ZodRecord || zodType instanceof z.ZodMap) {
-      const kvDef = (zodType as z.ZodRecord<any, z.ZodType> | z.ZodMap<z.ZodType, z.ZodType>).def
+      const kvDef = (
+        zodType as z.ZodRecord<any, z.ZodType> | z.ZodMap<z.ZodType, z.ZodType>
+      ).def;
       const key = this.zodTypeToReqDefault(kvDef.keyType, name) as any;
       const value = this.zodTypeToReqDefault(kvDef.valueType, name);
       return { [key]: value };
     } else if (zodType instanceof z.ZodSet) {
-      return [this.zodTypeToReqDefault((zodType as z.ZodSet<z.ZodType>).def.valueType, name)];
+      return [
+        this.zodTypeToReqDefault(
+          (zodType as z.ZodSet<z.ZodType>).def.valueType,
+          name
+        ),
+      ];
     } else if (zodType instanceof z.ZodIntersection) {
-      return this.zodTypeToReqDefault((zodType as z.ZodIntersection<z.ZodType, z.ZodType>).def.right, name);
+      return this.zodTypeToReqDefault(
+        (zodType as z.ZodIntersection<z.ZodType, z.ZodType>).def.right,
+        name
+      );
     } else if (zodType instanceof z.ZodDefault) {
-      return this.zodTypeToReqDefault((zodType as z.ZodDefault<z.ZodType>).def.innerType, name);
+      return this.zodTypeToReqDefault(
+        (zodType as z.ZodDefault<z.ZodType>).def.innerType,
+        name
+      );
     } else {
       // console.log(zodType);
       return `unknown-${zodType.type}`;
@@ -140,8 +164,15 @@ export class Template__generated_http extends Template {
     references: { [typeName: string]: z.ZodObject<any> }
   ): { [key: string]: unknown } {
     const reqType = getZodObjectFromApi(api, references);
-    return this.zodTypeToReqDefault(reqType, "unknownName") as {
-      [key: string]: unknown;
-    };
+    try {
+      const def = this.zodTypeToReqDefault(reqType, "unknownName") as {
+        [key: string]: unknown;
+      };
+      return def;
+    } catch (error) {
+      throw new Error(
+        `Invalid zod type detected on ${api.modelName}:${api.methodName}`
+      );
+    }
   }
 }

package/src/templates/generated_sso.template.ts

@@ -89,12 +89,14 @@ export class Template__generated_sso extends Template {
       } as Omit<SourceCode, "label">
     );
 
+    const body = sourceCode.lines.join("\n");
+    const isUsingManyToManyBaseSchema = body.includes("ManyToManyBaseSchema");
     return {
       ...this.getTargetAndPath(),
       body: sourceCode.lines.join("\n"),
       importKeys: sourceCode.importKeys,
       customHeaders: [
-        `import { SubsetQuery, ManyToManyBaseSchema } from "sonamu";`,
+        `import { SubsetQuery, ${isUsingManyToManyBaseSchema ? "ManyToManyBaseSchema" : ""} } from "sonamu";`,
       ],
     };
   }

package/src/templates/service.template.ts

@@ -219,18 +219,31 @@ export async function ${methodNameAxios}${typeParamsDef}(${paramsDef}): Promise<
     returnTypeDef: string,
     paramsWithoutContext: ApiParam[]
   ) {
-    const formDataDef = [
-      'formData.append("file", file);',
-      ...paramsWithoutContext.map(
-        (param) => `formData.append('${param.name}', String(${param.name}));`
-      ),
-    ].join("\n");
+    const isMultiple = api.uploadOptions?.mode === "multiple";
+    const fileParamName = isMultiple ? "files" : "file";
+    const fileParamType = isMultiple ? "File[]" : "File";
+
+    const formDataDef = isMultiple
+      ? [
+          `${fileParamName}.forEach(f => formData.append("${fileParamName}", f));`,
+          ...paramsWithoutContext.map(
+            (param) =>
+              `formData.append('${param.name}', String(${param.name}));`
+          ),
+        ].join("\n")
+      : [
+          `formData.append("${fileParamName}", ${fileParamName});`,
+          ...paramsWithoutContext.map(
+            (param) =>
+              `formData.append('${param.name}', String(${param.name}));`
+          ),
+        ].join("\n");
 
     const paramsDefComma = paramsDef !== "" ? ", " : "";
     return `
 export async function ${api.methodName}${typeParamsDef}(
   ${paramsDef}${paramsDefComma}
-  file: File,
+  ${fileParamName}: ${fileParamType},
   onUploadProgress?: (pe:AxiosProgressEvent) => void
   ): Promise<${returnTypeDef}> {
     const formData = new FormData();

package/src/testing/fixture-manager.ts

@@ -568,6 +568,8 @@ export class FixtureManagerClass {
       if (!isRelationProp(prop)) {
         if (prop.type === "json") {
           insertData[propName] = JSON.stringify(column.value);
+        } else if (prop.type === "timestamp" || prop.type === "datetime") {
+          insertData[propName] = new Date(column.value);
         } else {
           insertData[propName] = column.value;
         }

package/.swcrc

@@ -1,15 +0,0 @@
-{
-  "$schema": "https://swc.rs/schema.json",
-  "module": {
-    "type": "commonjs"
-  },
-  "jsc": {
-    "parser": {
-      "syntax": "typescript",
-      "decorators": true
-    },
-    "target": "es5"
-  },
-  "minify": true,
-  "sourceMaps": true
-}

package/import-to-require.js

@@ -1,27 +0,0 @@
-const fs = require("fs/promises");
-
-export const ImportToRequirePlugin = {
-  name: "import-to-require",
-  setup(build) {
-    if (build.initialOptions.define.TSUP_FORMAT === '"cjs"') {
-      // 빌드 전에 src/database/db.ts 파일을 읽어서 변환
-      build.onLoad({ filter: /database\/db.ts/ }, async (args) => {
-        console.debug(`reading ${args.path}`);
-        let contents = await fs.readFile(args.path, "utf8");
-
-        // 'await import(' 패턴을 찾아 'require('로 변환
-        contents = contents.replace(
-          /\bawait import\(([^)]+)\)/g,
-          (_, modulePath) => {
-            return `require(${modulePath})`;
-          }
-        );
-
-        return {
-          contents,
-          loader: "ts", // TypeScript를 지원하도록 'ts' 로더 설정
-        };
-      });
-    }
-  },
-};

package/nodemon.json

@@ -1,6 +0,0 @@
-{
-  "watch": ["src"],
-  "ext": "ts,json",
-  "exec": "swc src --config-file .swcrc -d dist --strip-leading-paths && tsc --emitDeclarationOnly && node -r source-map-support/register -r dotenv/config dist/index.js",
-  "signal": "SIGUSR2"
-}

package/tsconfig.json

@@ -1,56 +0,0 @@
-{
-  "compilerOptions": {
-    /* Basic Options */
-    "target": "ESNext",
-    "module": "ESNext",
-    "outDir": "dist",
-    "sourceMap": true,
-    "lib": ["esnext", "dom"],
-
-    // NOTE(Haze, 251106): SSE 관련 fastify 타입 이슈로 명시적으로 추가함.
-    "types": ["fastify-sse-v2"],
-
-    "declaration": true,
-    "declarationMap": true,
-
-    /* Strict Type-Checking Options */
-    "strict": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "strictBindCallApply": true,
-    "strictPropertyInitialization": true,
-    "noImplicitThis": true,
-    "alwaysStrict": true,
-
-    /* Additional Checks */
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-    // "noUncheckedIndexedAccess": true, // FIXME
-
-    /* Module Resolution Options */
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-
-    /* Experimental Options */
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-
-    /* Advanced Options */
-    "forceConsistentCasingInFileNames": true,
-    "noErrorTruncation": true
-  },
-  "exclude": [
-    "node_modules",
-    "dist",
-    "src/**/*.test.ts",
-    "src/**/*.test-hold.ts",
-    "src/**/*.ignore.ts",
-    "wasted_src/**",
-    "_templates/**",
-    "**/__mocks__/**"
-  ]
-}

package/tsup.config.js

@@ -1,47 +0,0 @@
-// tsup.config.js
-import { defineConfig } from "tsup";
-import { ImportToRequirePlugin } from "./import-to-require";
-
-export default defineConfig({
-  entry: [
-    "src/index.ts",
-    "src/bin/cli.ts",
-    "src/bin/cli-wrapper.ts",
-    "src/database/drivers/knex/base-model.ts",
-    "src/database/drivers/kysely/base-model.ts",
-  ],
-  dts: true,
-  format: [
-    "cjs",
-    // "esm"
-  ],
-  target: "esnext",
-  clean: true,
-  sourcemap: true,
-  shims: true,
-  platform: "node",
-  splitting: true,
-  esbuildPlugins: [ImportToRequirePlugin],
-  external: [
-    "chalk",
-    "dotenv",
-    "fast-deep-equal",
-    "fastify",
-    "glob",
-    "inflection",
-    "knex",
-    "lodash",
-    "luxon",
-    "mysql2",
-    "node-sql-parser",
-    "prompts",
-    "qs",
-    "tsicli",
-    "uuid",
-    "zod",
-    "prettier",
-    "source-map-support",
-    "tsup",
-    "typescript",
-  ],
-});