sonamu 0.7.1 → 0.7.3

package/src/migration/migration-set.ts

@@ -88,10 +88,6 @@ export function getMigrationSetFromEntity(entity: Entity): MigrationSetAndJoinTa
         r.joinTables.push({
           table: through.from.split(".")[0],
           indexes: [
-            {
-              type: "unique",
-              columns: ["uuid"],
-            },
             // 조인 테이블에 걸린 인덱스 찾아와서 연결
             ...entity.indexes
               .filter((index) => index.columns.find((col) => col.includes(`${prop.joinTable}.`)))
@@ -113,11 +109,6 @@ export function getMigrationSetFromEntity(entity: Entity): MigrationSetAndJoinTa
                 nullable: false,
               } as MigrationColumn;
             }),
-            {
-              name: "uuid",
-              nullable: true,
-              type: "uuid",
-            },
           ],
           foreigns: fields.map((field) => {
             // 현재 필드가 어떤 테이블에 속하는지 판단
@@ -175,17 +166,6 @@ export function getMigrationSetFromEntity(entity: Entity): MigrationSetAndJoinTa
     index.columns.find((col) => col.includes(".") === false),
   );
 
-  // uuid
-  migrationSet.columns = migrationSet.columns.concat({
-    name: "uuid",
-    nullable: true,
-    type: "uuid",
-  } as MigrationColumn);
-  migrationSet.indexes = migrationSet.indexes.concat({
-    type: "unique",
-    columns: ["uuid"],
-  } as MigrationIndex);
-
   return migrationSet;
 }
 

package/src/migration/migrator.ts

@@ -341,7 +341,7 @@ export class Migrator {
         ...tables[0],
         indexes: unique(
           tables.flatMap((t) => t.indexes),
-          (index) => [index.type, ...index.columns.sort()].join("-"),
+          (index) => [index.type, ...index.columns].join("-"),
         ),
       };
     });

package/src/migration/postgresql-schema-reader.ts

@@ -109,6 +109,7 @@ class PostgreSQLSchemaReaderClass {
 
       return {
         type,
+        name: indexName,
         columns: currentIndexes.map((idx) => idx.column_name),
       };
     });

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

@@ -86,10 +86,12 @@ export function defaultCatch(e: any) {
 /*
   Isomorphic Types
 */
-export type ListResult<T> = {
-  rows: T[];
-  total?: number;
-};
+export type ListResult<LP extends { queryMode?: SonamuQueryMode }, T> = LP["queryMode"] extends "list"
+  ? { rows: T[] }
+  : LP["queryMode"] extends "count"
+    ? { total: number }
+    : { rows: T[]; total: number };
+
 export const SonamuQueryMode = z.enum(["both", "list", "count"]);
 export type SonamuQueryMode = z.infer<typeof SonamuQueryMode>;
 

package/src/syncer/file-patterns.ts

@@ -30,7 +30,7 @@ export const checksumPatternGroup: GlobPattern<ApiRelativePath> = {
   model: "src/application/**/*.model.ts",
   frame: "src/application/**/*.frame.ts",
   functions: "src/application/**/*.functions.ts",
-  config: "sonamu.config.ts",
+  config: "src/sonamu.config.ts",
 };
 
 /**

package/src/syncer/syncer.ts

@@ -1,4 +1,4 @@
-import { hot } from "@sonamu-kit/hot-hook";
+import { hot } from "@sonamu-kit/hmr-hook";
 import assert from "assert";
 import chalk from "chalk";
 import { mkdir, readFile, writeFile } from "fs/promises";
@@ -122,7 +122,7 @@ export class Syncer {
     }
 
     // 싱크 작업이 끝나면 모든 모듈을 로드합니다.
-    // hot-hook에 의해 invalidate된 부분들이 아니라면 캐시 그대로 유지합니다.
+    // hmr-hook에 의해 invalidate된 부분들이 아니라면 캐시 그대로 유지합니다.
     await this.autoloadTypes();
     await this.autoloadModels();
     await this.autoloadApis();

package/src/template/implementations/service.template.ts

@@ -85,11 +85,12 @@ export class Template__service extends Template {
             );
 
             // 파라미터 타입 정의
-            const typeParamsDef = api.typeParameters
+            const typeParametersAsTsType = api.typeParameters
               .map((typeParam) => {
                 return apiParamTypeToTsType(typeParam, importKeys);
               })
               .join(", ");
+            const typeParamsDef = typeParametersAsTsType ? `<${typeParametersAsTsType}>` : "";
             typeParamNames = typeParamNames.concat(
               api.typeParameters.map((typeParam) => typeParam.id),
             );

package/src/template/zod-converter.ts

@@ -342,7 +342,7 @@ export function zodTypeToTsTypeDef(zt: z.ZodType): string {
         // ZodType - 재귀적으로 변환
         if (part && typeof part === "object" && (part as z.ZodType)._zod) {
           const innerType = zodTypeToTsTypeDef(part as z.ZodType);
-          return `\${${innerType}}`;
+          return `$\{${innerType}}`;
         }
 
         // 폴백
@@ -571,6 +571,8 @@ function resolveRenderType(key: string, zodType: z.ZodTypeAny): RenderingNode["r
     return "string-plain";
   } else if (zodType instanceof z.ZodLiteral) {
     return "string-plain";
+  } else if (zodType instanceof z.ZodTemplateLiteral) {
+    return "string-plain";
   } else {
     throw new Error(`타입 파싱 불가 ${key} ${zodType.def.type}`);
   }

package/src/types/types.ts

@@ -175,7 +175,7 @@ export type EntityProp =
 export type EntityIndex = {
   type: "index" | "unique" | "fulltext";
   columns: string[];
-  name?: string;
+  name: string;
   parser?: "built-in" | "ngram";
 };
 export type EntityJson = {
@@ -451,6 +451,7 @@ export type MigrationColumn = {
   scale?: number;
 };
 export type MigrationIndex = {
+  name: string;
   columns: string[];
   type: "unique" | "index" | "fulltext";
   parser?: "built-in" | "ngram";
@@ -942,7 +943,7 @@ const EntityIndexSchema = z
   .object({
     type: z.enum(["index", "unique", "fulltext"]),
     columns: z.array(z.string()),
-    name: z.string().optional(),
+    name: z.string().min(1).max(63),
     parser: z.enum(["built-in", "ngram"]).optional(),
   })
   .strict();

package/src/utils/model.ts

@@ -1,7 +1,13 @@
-export type ListResult<T> = {
-  rows: T[];
-  total?: number;
-};
+import type { SonamuQueryMode } from "..";
+
+export type ListResult<
+  LP extends { queryMode?: SonamuQueryMode },
+  T,
+> = LP["queryMode"] extends "list"
+  ? { rows: T[] }
+  : LP["queryMode"] extends "count"
+    ? { total: number }
+    : { rows: T[]; total: number };
 
 export type ArrayOr<T> = T | T[];
 

package/src/utils/path-utils.ts

@@ -10,7 +10,7 @@ import { isHotReloadServer, isTest } from "./controller.js";
  *
  * **기준점**: `Sonamu.apiRootPath` (일반적으로 프로젝트의 `/api` 디렉토리)
  */
-export type ApiRelativePath = `${"src" | "dist"}/${string}` | "sonamu.config.ts";
+export type ApiRelativePath = `${"src" | "dist"}/${string}`;
 
 /**
  * 앱 루트 기준 상대 경로 (api/, web/ 등 타겟 디렉토리로 시작)
@@ -90,7 +90,10 @@ export type AbsolutePath = `/${string}`;
  * @param anyPath
  * @returns
  */
-export function runtimePath(anyPath: string, isDev: boolean = isHotReloadServer() || isTest()): string {
+export function runtimePath(
+  anyPath: string,
+  isDev: boolean = isHotReloadServer() || isTest(),
+): string {
   if (isDev) {
     return anyPath.replace(/dist\//, "src/").replace(/\.js/, ".ts");
   } else {

package/dist/bin/hot-hook-register.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hot-hook-register.d.ts","sourceRoot":"","sources":["../../src/bin/hot-hook-register.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAaH,OAAO,EAAE,CAAC"}

package/dist/bin/loader-register.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=loader-register.d.ts.map

package/dist/bin/loader-register.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"loader-register.d.ts","sourceRoot":"","sources":["../../src/bin/loader-register.ts"],"names":[],"mappings":""}

package/dist/bin/loader-register.js

@@ -1,34 +0,0 @@
-import { register } from "node:module";
-import * as path from "node:path";
-import { exists } from "../utils/fs-utils.js";
-import { findApiRootPath } from "../utils/utils.js";
-/**
- * @sonamu-kit/loader/loader를 등록하는 스크립트입니다.
- * 이 스크립트는 sonamu cli로 dev 실행할 때 --import로 실행됩니다.
- */ async function setupSwcConfig() {
-    try {
-        const apiRoot = findApiRootPath();
-        // 프로젝트 루트에서 .swcrc 찾기
-        const projectSwcrcPath = path.join(apiRoot, ".swcrc");
-        if (await exists(projectSwcrcPath)) {
-            // 사용자 프로젝트에 .swcrc가 있으면 우선으로 사용합니다.
-            process.env.SWCRC_PATH = projectSwcrcPath;
-            return;
-        }
-        // 아니라면 sonamu가 관리하는 .swcrc.project-default를 가져다 씁니다.
-        const sonamuSwcrcPath = path.join(import.meta.dirname, "..", "..", ".swcrc.project-default");
-        if (await exists(sonamuSwcrcPath)) {
-            process.env.SWCRC_PATH = sonamuSwcrcPath;
-            return;
-        }
-    } catch  {
-    // 환경 변수 설정 실패는 무시 (loader가 기본 설정 사용)
-    }
-}
-// swc 설정 파일 경로를 환경 변수로 설정
-await setupSwcConfig();
-register("@sonamu-kit/loader/loader", {
-    parentURL: import.meta.url
-});
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vbG9hZGVyLXJlZ2lzdGVyLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlZ2lzdGVyIH0gZnJvbSBcIm5vZGU6bW9kdWxlXCI7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gXCJub2RlOnBhdGhcIjtcbmltcG9ydCB7IGV4aXN0cyB9IGZyb20gXCIuLi91dGlscy9mcy11dGlscy5qc1wiO1xuaW1wb3J0IHsgZmluZEFwaVJvb3RQYXRoIH0gZnJvbSBcIi4uL3V0aWxzL3V0aWxzLmpzXCI7XG5cbi8qKlxuICogQHNvbmFtdS1raXQvbG9hZGVyL2xvYWRlcuulvCDrk7HroZ3tlZjripQg7Iqk7YGs66a97Yq47J6F64uI64ukLlxuICog7J20IOyKpO2BrOumve2KuOuKlCBzb25hbXUgY2xp66GcIGRldiDsi6TtlontlaAg65WMIC0taW1wb3J066GcIOyLpO2WieuQqeuLiOuLpC5cbiAqL1xuYXN5bmMgZnVuY3Rpb24gc2V0dXBTd2NDb25maWcoKSB7XG4gIHRyeSB7XG4gICAgY29uc3QgYXBpUm9vdCA9IGZpbmRBcGlSb290UGF0aCgpO1xuXG4gICAgLy8g7ZSE66Gc7KCd7Yq4IOujqO2KuOyXkOyEnCAuc3djcmMg7LC+6riwXG4gICAgY29uc3QgcHJvamVjdFN3Y3JjUGF0aCA9IHBhdGguam9pbihhcGlSb290LCBcIi5zd2NyY1wiKTtcbiAgICBpZiAoYXdhaXQgZXhpc3RzKHByb2plY3RTd2NyY1BhdGgpKSB7XG4gICAgICAvLyDsgqzsmqnsnpAg7ZSE66Gc7KCd7Yq47JeQIC5zd2NyY+qwgCDsnojsnLzrqbQg7Jqw7ISg7Jy866GcIOyCrOyaqe2VqeuLiOuLpC5cbiAgICAgIHByb2Nlc3MuZW52LlNXQ1JDX1BBVEggPSBwcm9qZWN0U3djcmNQYXRoO1xuICAgICAgcmV0dXJuO1xuICAgIH1cblxuICAgIC8vIOyVhOuLiOudvOuptCBzb25hbXXqsIAg6rSA66as7ZWY64qUIC5zd2NyYy5wcm9qZWN0LWRlZmF1bHTrpbwg6rCA7KC464ukIOyUgeuLiOuLpC5cbiAgICBjb25zdCBzb25hbXVTd2NyY1BhdGggPSBwYXRoLmpvaW4oaW1wb3J0Lm1ldGEuZGlybmFtZSwgXCIuLlwiLCBcIi4uXCIsIFwiLnN3Y3JjLnByb2plY3QtZGVmYXVsdFwiKTtcbiAgICBpZiAoYXdhaXQgZXhpc3RzKHNvbmFtdVN3Y3JjUGF0aCkpIHtcbiAgICAgIHByb2Nlc3MuZW52LlNXQ1JDX1BBVEggPSBzb25hbXVTd2NyY1BhdGg7XG4gICAgICByZXR1cm47XG4gICAgfVxuICB9IGNhdGNoIHtcbiAgICAvLyDtmZjqsr0g67OA7IiYIOyEpOyglSDsi6TtjKjripQg66y07IucIChsb2FkZXLqsIAg6riw67O4IOyEpOyglSDsgqzsmqkpXG4gIH1cbn1cblxuLy8gc3djIOyEpOyglSDtjIzsnbwg6rK966Gc66W8IO2ZmOqyvSDrs4DsiJjroZwg7ISk7KCVXG5hd2FpdCBzZXR1cFN3Y0NvbmZpZygpO1xuXG5yZWdpc3RlcihcIkBzb25hbXUta2l0L2xvYWRlci9sb2FkZXJcIiwge1xuICBwYXJlbnRVUkw6IGltcG9ydC5tZXRhLnVybCxcbn0pO1xuIl0sIm5hbWVzIjpbInJlZ2lzdGVyIiwicGF0aCIsImV4aXN0cyIsImZpbmRBcGlSb290UGF0aCIsInNldHVwU3djQ29uZmlnIiwiYXBpUm9vdCIsInByb2plY3RTd2NyY1BhdGgiLCJqb2luIiwicHJvY2VzcyIsImVudiIsIlNXQ1JDX1BBVEgiLCJzb25hbXVTd2NyY1BhdGgiLCJkaXJuYW1lIiwicGFyZW50VVJMIiwidXJsIl0sIm1hcHBpbmdzIjoiQUFBQSxTQUFTQSxRQUFRLFFBQVEsY0FBYztBQUN2QyxZQUFZQyxVQUFVLFlBQVk7QUFDbEMsU0FBU0MsTUFBTSxRQUFRLHVCQUF1QjtBQUM5QyxTQUFTQyxlQUFlLFFBQVEsb0JBQW9CO0FBRXBEOzs7Q0FHQyxHQUNELGVBQWVDO0lBQ2IsSUFBSTtRQUNGLE1BQU1DLFVBQVVGO1FBRWhCLHNCQUFzQjtRQUN0QixNQUFNRyxtQkFBbUJMLEtBQUtNLElBQUksQ0FBQ0YsU0FBUztRQUM1QyxJQUFJLE1BQU1ILE9BQU9JLG1CQUFtQjtZQUNsQyxvQ0FBb0M7WUFDcENFLFFBQVFDLEdBQUcsQ0FBQ0MsVUFBVSxHQUFHSjtZQUN6QjtRQUNGO1FBRUEscURBQXFEO1FBQ3JELE1BQU1LLGtCQUFrQlYsS0FBS00sSUFBSSxDQUFDLFlBQVlLLE9BQU8sRUFBRSxNQUFNLE1BQU07UUFDbkUsSUFBSSxNQUFNVixPQUFPUyxrQkFBa0I7WUFDakNILFFBQVFDLEdBQUcsQ0FBQ0MsVUFBVSxHQUFHQztZQUN6QjtRQUNGO0lBQ0YsRUFBRSxPQUFNO0lBQ04scUNBQXFDO0lBQ3ZDO0FBQ0Y7QUFFQSwwQkFBMEI7QUFDMUIsTUFBTVA7QUFFTkosU0FBUyw2QkFBNkI7SUFDcENhLFdBQVcsWUFBWUMsR0FBRztBQUM1QiJ9