sonamu 0.7.53 → 0.8.0

package/src/syncer/syncer.ts

@@ -23,7 +23,7 @@ import { isTest } from "../utils/controller";
 import { copyFileWithReplaceCoreToShared, exists } from "../utils/fs-utils";
 import type { AbsolutePath } from "../utils/path-utils";
 import { runWithGracefulShutdown } from "../utils/process-utils";
-import { areFilesSame, findChangedFilesUsingChecksums, renewChecksums } from "./checksum";
+import { findChangedFilesUsingChecksums, renewChecksums } from "./checksum";
 import { generateTemplate, renderTemplate } from "./code-generator";
 import { createEntity, delEntity } from "./entity-operations";
 import {
@@ -55,13 +55,13 @@ export class Syncer {
 
   /**
    * 체크섬이 변경된 부분에 대해 싱크를 진행합니다.
-   * 다만 sonamu.shared.ts는 체크섬 비교 없이 무조건 싱크(복사)합니다.
+   * sonamu.shared.ts는 파일이 없을 때만 1회 생성하고, 이후에는 덮어쓰지 않습니다.
    * @returns
    */
   async sync(): Promise<void> {
     const { targets } = Sonamu.config.sync;
 
-    // sonamu.shared.ts는 무조건 싱크(복사)합니다.
+    // sonamu.shared.ts는 파일이 없을 때만 1회 생성합니다.
     await this.copySharedToTargets(targets);
 
     // 그 다음부터는 변경된 파일을 찾아서 동기화 작업을 실행합니다.
@@ -239,7 +239,12 @@ export class Syncer {
         console.warn(`Created directory '${path.dirname(destPath)}' because it did not exist.`);
       }
 
-      if (await areFilesSame({ data: convertedText }, { path: destPath })) {
+      // 파일이 이미 존재하면 건너뜁니다.
+      // sonamu.shared.ts는 프로젝트에서 자유롭게 커스터마이징할 수 있어야 하므로,
+      // 최초 1회만 생성하고 이후에는 덮어쓰지 않습니다.
+      // 템플릿 내용($[[dictUtils]] 등)이 변경되었을 때 반영이 필요하면,
+      // 해당 파일을 삭제한 뒤 `pnpm sonamu sync`로 재생성하면 됩니다.
+      if (await exists(destPath)) {
         continue;
       }
 
@@ -622,7 +627,13 @@ export class Syncer {
       const sourceFile = path.join(apiI18nDir, `${locale}.ts`);
       const targetFile = path.join(targetI18nDir, `${locale}.ts`);
 
-      await copyFileWithReplaceCoreToShared(sourceFile, targetFile);
+      const syncHeader = [
+        "/**",
+        " * @generated",
+        " * API에서 동기화된 파일입니다. 직접 수정하지 마세요.",
+        " */",
+      ].join("\n");
+      await copyFileWithReplaceCoreToShared(sourceFile, targetFile, syncHeader);
       !isTest() &&
         console.log(chalk.bold("Copied: ") + chalk.cyan(`${target}/src/i18n/${locale}.ts`));
     }

package/src/tasks/workflow-manager.ts

@@ -1,13 +1,14 @@
 import { getLogger, type Logger } from "@logtape/logtape";
 import { BackendPostgres, OpenWorkflow, type Worker } from "@sonamu-kit/tasks";
-import type {
-  RunnableWorkflow,
-  SchemaInput,
-  SchemaOutput,
-  StandardSchemaV1,
-  StepApi,
-  WorkflowRunHandle,
-  WorkflowSpec,
+import {
+  type RunnableWorkflow,
+  type SchemaInput,
+  type SchemaOutput,
+  type StandardSchemaV1,
+  type StepApi,
+  serializeRetryPolicy,
+  type WorkflowRunHandle,
+  type WorkflowSpec,
 } from "@sonamu-kit/tasks/internal";
 import assert from "assert";
 import type { Knex } from "knex";
@@ -92,6 +93,26 @@ export class WorkflowManager {
     this.#scheduledTasks = new Map();
   }
 
+  // Sonamu UI API에서 워크플로우 실행 목록 조회, 취소 등에 사용합니다.
+  get backend(): BackendPostgres {
+    return this.#backend;
+  }
+
+  get workflowDefinitions() {
+    return Array.from(this.#workflowsMap.values())
+      .flat()
+      .map((wf) => ({
+        id: wf.id,
+        name: wf.name,
+        version: wf.version,
+        schedules: wf.schedules.map((s) => ({
+          name: s.name,
+          expression: s.expression,
+        })),
+        retryPolicy: wf.retryPolicy ? serializeRetryPolicy(wf.retryPolicy) : undefined,
+      }));
+  }
+
   /**
    * 정의된 워크플로우 및 워크플로우에 대한 scheduled tasks를 동기화합니다.
    */

package/src/template/entity-converter.ts

@@ -13,11 +13,11 @@ import { propToZodType, zodTypeToRenderingNode } from "./zod-converter";
  */
 export async function getColumnsNode(entityId: string, subsetKey: string): Promise<RenderingNode> {
   const entity = EntityManager.get(entityId);
-  const subset = entity.subsets[subsetKey];
-  if (subset === undefined) {
+  const subsetDef = entity.subsets[subsetKey];
+  if (subsetDef === undefined) {
     throw new ServiceUnavailableException(SD("sonamu.error.subsetNotFound")(subsetKey));
   }
-  const propNodes = entity.fieldExprsToPropNodes(subset);
+  const propNodes = entity.fieldExprsToPropNodes(subsetDef);
   const rootPropNode: EntityPropNode = {
     nodeType: "object",
     children: propNodes,

package/src/template/helpers.ts

@@ -77,6 +77,55 @@ export function getRelationPropFromColName(entityId: string, colName: string): R
   }
 }
 
+/**
+ * FK 컬럼명에서 실제 relation 이름을 추출합니다.
+ * BelongsToOne/OneToOne relation은 subset에서 FK 컬럼명(user_id)으로 생성되므로 변환이 필요하고,
+ * ManyToMany relation은 subset에서 relation명(employee)으로 생성되므로 변환이 불필요합니다.
+ *
+ * @example
+ * getRelationNameFromColumnName("Employee", "user_id") // "user"
+ * getRelationNameFromColumnName("Project", "tag_ids") // "tags"
+ */
+export function getRelationNameFromColumnName(entityId: string, colName: string): string {
+  // _ids (복수) 처리
+  if (colName.endsWith("_ids")) {
+    const baseName = colName.replace(/_ids$/, "");
+    // 먼저 base name으로 찾기
+    try {
+      const relProp = getRelationPropFromColName(entityId, baseName);
+      return relProp.name;
+    } catch {
+      // pluralize해서 찾기
+      try {
+        const pluralName = inflection.pluralize(baseName);
+        const relProp = getRelationPropFromColName(entityId, pluralName);
+        return relProp.name;
+      } catch {
+        return colName;
+      }
+    }
+  }
+  // _id (단수) 처리
+  if (colName.endsWith("_id") && colName !== "id") {
+    const baseName = colName.replace(/_id$/, "");
+    // 먼저 base name으로 찾기
+    try {
+      const relProp = getRelationPropFromColName(entityId, baseName);
+      return relProp.name;
+    } catch {
+      // singularize해서 찾기
+      try {
+        const singularName = inflection.singularize(baseName);
+        const relProp = getRelationPropFromColName(entityId, singularName);
+        return relProp.name;
+      } catch {
+        return colName;
+      }
+    }
+  }
+  return colName;
+}
+
 /**
  * 소스 코드에서 객체 선언을 추출합니다.
  * 중괄호 카운팅 방식으로 중첩된 객체도 정확히 파싱합니다.

package/src/template/implementations/entry-server.template.ts

@@ -75,7 +75,7 @@ export async function render(url: string, preloadedData: PreloadedData[] = []) {
       ...this.getTargetAndPath(),
       body,
       importKeys: [],
-      customHeaders: [],
+      customHeaders: ["/**", " * @generated", " * 직접 수정하지 마세요.", " */"],
     };
   }
 }

package/src/template/implementations/generated.template.ts

@@ -128,6 +128,10 @@ export class Template__generated extends Template {
       body,
       importKeys: sourceCode.importKeys,
       customHeaders: [
+        "/**",
+        " * @generated",
+        " * 직접 수정하지 마세요.",
+        " */",
         "/** biome-ignore-all lint: generated는 무시 */",
         "/** biome-ignore-all assist: generated는 무시 */",
         "/** biome-ignore-all format: generated는 무시 */",

package/src/template/implementations/generated_http.template.ts

@@ -62,6 +62,7 @@ export class Template__generated_http extends Template {
       ...this.getTargetAndPath(),
       body: lines.join("\n\n###\n\n"),
       importKeys: [],
+      customHeaders: ["# @generated", "# 직접 수정하지 마세요."],
     };
   }
 

package/src/template/implementations/generated_sso.template.ts

@@ -145,7 +145,13 @@ export class Template__generated_sso extends Template {
       .join(", ");
 
     // customHeaders 구성
-    const customHeaders = [`import { ${sonamuImports} } from "sonamu";`];
+    const customHeaders = [
+      "/**",
+      " * @generated",
+      " * 직접 수정하지 마세요.",
+      " */",
+      `import { ${sonamuImports} } from "sonamu";`,
+    ];
     if (this.hasAuthConfig()) {
       customHeaders.push(`import type { User } from "better-auth";`);
     }
@@ -173,8 +179,15 @@ export class Template__generated_sso extends Template {
       entities.flatMap((entity) =>
         entity.props.filter(isManyToManyRelationProp).map((prop) => {
           const fromTableKey = inflection.singularize(entity.table);
-          const toTableKey = inflection.singularize(EntityManager.get(prop.with).table);
-          return { table: prop.joinTable, fromTableKey, toTableKey };
+          const toEntity = EntityManager.get(prop.with);
+          const toTableKey = inflection.singularize(toEntity.table);
+          return {
+            table: prop.joinTable,
+            fromTableKey,
+            toTableKey,
+            fromEntityId: entity.id,
+            toEntityId: toEntity.id,
+          };
         }),
       ),
       (joinTable) => joinTable.table,
@@ -205,10 +218,14 @@ export class Template__generated_sso extends Template {
         `declare module "sonamu" {`,
         `  export interface DatabaseSchemaExtend {`,
         ...entitySchemaLines,
-        ...joinTables.map(
-          (joinTable) =>
-            `${joinTable.table}: ManyToManyBaseSchema<"${joinTable.fromTableKey}", "${joinTable.toTableKey}">;`,
-        ),
+        ...joinTables.map((joinTable) => {
+          const fromEntity = EntityManager.get(joinTable.fromEntityId);
+          const toEntity = EntityManager.get(joinTable.toEntityId);
+          const fromPkType = fromEntity.getPkType() === "integer" ? "number" : "string";
+          const toPkType = toEntity.getPkType() === "integer" ? "number" : "string";
+
+          return `${joinTable.table}: ManyToManyBaseSchema<"${joinTable.fromTableKey}", "${joinTable.toTableKey}", ${fromPkType}, ${toPkType}>;`;
+        }),
         `  }`,
         ``,
         `  export interface DatabaseForeignKeys {`,
@@ -285,19 +302,31 @@ export class Template__generated_sso extends Template {
       };
     }
 
+    const importKeys: string[] = [];
+
     // additionalFields를 TypeScript 타입으로 변환
     const fieldLines = Object.entries(additionalFields).map(([key, value]) => {
       // biome-ignore lint/suspicious/noExplicitAny: better-auth additionalFields 구조
-      const fieldType = mapBetterAuthFieldType((value as any).type);
-      // biome-ignore lint/suspicious/noExplicitAny: better-auth additionalFields 구조
-      const isRequired = (value as any).required !== false;
+      const fieldConfig = value as any;
+      const isRequired = fieldConfig.required !== false;
+
+      let fieldType: string;
+
+      // sonamuType이 있으면 description을 타입명으로 사용
+      if (fieldConfig.sonamuType) {
+        fieldType = fieldConfig.sonamuType;
+        importKeys.push(fieldType);
+      } else {
+        fieldType = mapBetterAuthFieldType(fieldConfig.type);
+      }
+
       return `  ${key}${isRequired ? "" : "?"}: ${fieldType};`;
     });
 
     return {
       label: "Auth User Type",
       lines: ["export type SonamuUser = User & {", ...fieldLines, "};"],
-      importKeys: [],
+      importKeys,
     };
   }
 

package/src/template/implementations/queries.template.ts

@@ -101,6 +101,10 @@ ${functions.join("\n\n")}
       importKeys: diff(unique(importKeys), typeParamNames),
       customHeaders: hasQueries
         ? [
+            "/**",
+            " * @generated",
+            " * 직접 수정하지 마세요.",
+            " */",
             "/** biome-ignore-all lint: generated는 무시 */",
             "/** biome-ignore-all assist: generated는 무시 */",
             "",
@@ -113,6 +117,10 @@ ${functions.join("\n\n")}
             "",
           ]
         : [
+            "/**",
+            " * @generated",
+            " * 직접 수정하지 마세요.",
+            " */",
             "/** biome-ignore-all lint: generated는 무시 */",
             "/** biome-ignore-all assist: generated는 무시 */",
             "",

package/src/template/implementations/sd.template.ts

@@ -137,9 +137,28 @@ type SDReturnType<K extends DictKey> = MergedDictionary[K] extends (...args: inf
   : LocalizedString;
 
 function getDictValue<K extends DictKey>(key: K, locale: string): SDReturnType<K> {
+  // 1. 지정된 locale에서 조회
   const dict = dictionaries[locale];
-  const value = dict?.[key] ?? dictionaries[DEFAULT_LOCALE]?.[key] ?? key;
-  return value as unknown as SDReturnType<K>;
+  if (dict?.[key] !== undefined) {
+    return dict[key] as unknown as SDReturnType<K>;
+  }
+
+  // 2. default locale에서 조회
+  if (locale !== DEFAULT_LOCALE && dictionaries[DEFAULT_LOCALE]?.[key] !== undefined) {
+    return dictionaries[DEFAULT_LOCALE][key] as unknown as SDReturnType<K>;
+  }
+
+  // 3. supported locales 순회
+  for (const supportedLocale of SUPPORTED_LOCALES) {
+    if (supportedLocale !== locale && supportedLocale !== DEFAULT_LOCALE) {
+      if (dictionaries[supportedLocale]?.[key] !== undefined) {
+        return dictionaries[supportedLocale][key] as unknown as SDReturnType<K>;
+      }
+    }
+  }
+
+  // 4. 모두 실패 시 key 반환
+  return key as unknown as SDReturnType<K>;
 }
 
 /**
@@ -229,7 +248,7 @@ SD.enumLabels = (enumName: string): Record<string, LocalizedString> => {
       ...this.getTargetAndPath(undefined, target),
       body,
       importKeys: [],
-      customHeaders: [],
+      customHeaders: ["/**", " * @generated", " * 직접 수정하지 마세요.", " */"],
     };
   }
 

package/src/template/implementations/services.template.ts

@@ -321,19 +321,15 @@ ${functions.join("\n\n")}
         const hookName = inflection.camelize(assertDefined(listApi.options.resourceName), true);
         const useHookName = `use${inflection.camelize(hookName)}`;
 
+        // ListParams 타입명 구성
+        const listParamsType = `${names.capital}ListParams`;
+
         asyncIdConfigs.push(
           `
 // AsyncIdConfig: ${names.capital}
-export const ${names.capital}AsyncIdConfig = {
-  useList: ${names.capital}Service.${useHookName} as (
-    subset: string,
-    params?: Record<string, unknown>,
-    options?: { enabled?: boolean }
-  ) => {
-    data?: { rows: Record<string, unknown>[] };
-    isLoading: boolean;
-    error?: Error;
-  },
+export const ${names.capital}AsyncIdConfig: AsyncIdConfig<${names.capital}SubsetKey, ${names.capital}SubsetMapping, ${listParamsType}> = {
+  placeholderKey: "entity.${names.capital}",
+  useList: ${names.capital}Service.${useHookName},
 };
           `.trim(),
         );
@@ -369,6 +365,10 @@ export const ${names.capital}AsyncIdConfig = {
         ...Object.keys(BUILT_IN_TYPES),
       ]),
       customHeaders: [
+        "/**",
+        " * @generated",
+        " * 직접 수정하지 마세요.",
+        " */",
         "/** biome-ignore-all lint: generated는 무시 */",
         "/** biome-ignore-all assist: generated는 무시 */",
         "",
@@ -376,6 +376,7 @@ export const ${names.capital}AsyncIdConfig = {
         `import type { AxiosProgressEvent } from 'axios';`,
         `import qs from 'qs';`,
         `import { ${sonamuSharedImports} } from './sonamu.shared';`,
+        `import type { AsyncIdConfig } from '@sonamu-kit/react-components/components';`,
       ],
     };
   }