sonamu 0.8.26 → 0.9.0

package/src/database/puri.types.test-d.ts

@@ -1,9 +1,10 @@
 import { describe, expectTypeOf, it } from "vitest";
-import type {
-  AvailableColumns,
-  ExtractColumnType,
-  LeftJoinedMarker,
-  ParseSelectObject,
+
+import {
+  type AvailableColumns,
+  type ExtractColumnType,
+  type LeftJoinedMarker,
+  type ParseSelectObject,
 } from "./puri.types";
 
 // ============================================================================

package/src/database/puri.types.ts

@@ -1,9 +1,10 @@
-/** biome-ignore-all lint/suspicious/noExplicitAny: Puri.types.ts는 다양한 타입을 사용하고 있습니다. */
+/* oxlint-disable @typescript-eslint/no-explicit-any */ // Puri.types.ts는 다양한 타입을 사용하고 있습니다.
 
-import type { QueryResult } from "pg";
-import type { DatabaseForeignKeys, DatabaseSchemaExtend } from "../types/types";
-import type { Puri } from "./puri";
-import type { PuriSubsetFn } from "./puri-subset.types";
+import { type QueryResult } from "pg";
+
+import { type DatabaseForeignKeys, type DatabaseSchemaExtend } from "../types/types";
+import { type Puri } from "./puri";
+import { type PuriSubsetFn } from "./puri-subset.types";
 
 // ============================================
 // 내부 타입 키 (메타데이터)
@@ -141,12 +142,8 @@ export type IsNullableColumn<
 // FK nullable 여부에 따른 마커 타입 결정
 // nullable FK로 leftJoin → LeftJoinedMarker (객체 자체가 null일 수 있음)
 // non-null FK로 leftJoin → 마커 없음 (부모가 있으면 자식도 반드시 있음)
-export type LeftJoinMarkerFor<TTables, Path extends string> = IsNullableColumn<
-  TTables,
-  Path
-> extends true
-  ? LeftJoinedMarker
-  : {};
+export type LeftJoinMarkerFor<TTables, Path extends string> =
+  IsNullableColumn<TTables, Path> extends true ? LeftJoinedMarker : {};
 
 // 주어진 테이블이 FK nullable로 leftJoin 된 테이블인지 확인합니다.
 // 사실 LeftJoinMarker가 붙었는지 확인하는게 다입니다.
@@ -351,7 +348,7 @@ export type InsertData<T> = Omit<
 };
 
 // Insert Result 타입
-export type InsertResult = Pick<QueryResult<any>, "command" | "rowCount" | "rows" | "oid">;
+export type InsertResult = Pick<QueryResult, "command" | "rowCount" | "rows" | "oid">;
 
 // SubsetQuery를 위한 타입 유틸리티
 export type ExtractTTables<T extends Puri<any, any, any>> =

package/src/database/transaction-context.ts

@@ -1,5 +1,5 @@
-import type { DBPreset } from "./db";
-import type { PuriTransactionWrapper } from "./puri-wrapper";
+import { type DBPreset } from "./db";
+import { type PuriTransactionWrapper } from "./puri-wrapper";
 
 export class TransactionContext {
   private transactions: Map<DBPreset, PuriTransactionWrapper> = new Map();

package/src/database/upsert-builder.ts

@@ -1,13 +1,20 @@
-import { getLogger } from "@logtape/logtape";
 import { randomUUID } from "crypto";
-import type { Knex } from "knex";
-import { isArray, unique } from "radashi";
+
+import { getLogger } from "@logtape/logtape";
+import { type Knex } from "knex";
+import { cluster, isArray, unique } from "radashi";
+
 import { EntityManager } from "../entity/entity-manager";
 import { Naite } from "../naite/naite";
-import type { DatabaseForeignKeys, DatabaseSchemaExtend, EntityIndex } from "../types/types";
-import { assertDefined, chunk, nonNullable } from "../utils/utils";
-import { batchUpdate, type RowWithId } from "./_batch_update";
-import type { ColumnKeys, ForeignKeyColumns, IdType, TableName } from "./puri.types";
+import {
+  type DatabaseForeignKeys,
+  type DatabaseSchemaExtend,
+  type EntityIndex,
+} from "../types/types";
+import { assertDefined, nonNullable } from "../utils/utils";
+import { batchUpdate } from "./_batch_update";
+import { type RowWithId } from "./_batch_update";
+import { type ColumnKeys, type ForeignKeyColumns, type IdType, type TableName } from "./puri.types";
 
 const logger = getLogger(["sonamu", "internal", "upsert-builder"]);
 
@@ -207,7 +214,7 @@ export class UpsertBuilder {
     mode: "upsert" | "insert",
     options?: UpsertOptions<TTable>,
   ): Promise<IdType<DatabaseSchemaExtend, TTable>[]> {
-    if (this.hasTable(tableName) === false) {
+    if (!this.hasTable(tableName)) {
       return [];
     }
 
@@ -290,7 +297,7 @@ export class UpsertBuilder {
 
       // 현재 레벨 upsert
       const chunkSize = options?.chunkSize;
-      const levelChunks = chunkSize ? chunk(resolvedRows, chunkSize) : [resolvedRows];
+      const levelChunks = chunkSize ? cluster(resolvedRows, chunkSize) : [resolvedRows];
       const selectFields = unique(["id", ...extractFields]);
 
       for (let index = 0; index < levelChunks.length; index++) {
@@ -496,7 +503,7 @@ export class UpsertBuilder {
       where: options?.where ?? "id",
     };
 
-    if (this.hasTable(tableName) === false) {
+    if (!this.hasTable(tableName)) {
       return;
     }
     const table = this.tables.get(tableName);

package/src/dict/sd.ts

@@ -3,10 +3,10 @@
  * sonamu 코어 내부에서 사용하는 i18n 함수입니다.
  */
 
-import { Sonamu } from "../api/sonamu";
+import { type SonamuConfig } from "../api/config";
 import en from "./en";
 import ko from "./ko";
-import type { LocalizedString } from "./types";
+import { type LocalizedString } from "./types";
 
 type SonamuDict = typeof ko;
 type DictKey = keyof SonamuDict;
@@ -20,13 +20,26 @@ const dictionaries: Record<string, MergedDictionary> = {
   ko,
   en,
 };
+let currentI18nConfig: SonamuConfig["i18n"] | null = null;
 
 type SDReturnType<K extends DictKey> = SonamuDict[K] extends (...args: infer P) => string
   ? (...args: P) => LocalizedString
   : LocalizedString;
 
+function getCurrentI18nConfig(): SonamuConfig["i18n"] {
+  if (currentI18nConfig === null) {
+    throw new Error("Sonamu i18n config has not been initialized");
+  }
+
+  return currentI18nConfig;
+}
+
+export function setSDConfig(i18nConfig: SonamuConfig["i18n"]): void {
+  currentI18nConfig = i18nConfig;
+}
+
 function getDictValue<K extends DictKey>(key: K, locale: string): SDReturnType<K> {
-  const { defaultLocale, supportedLocales } = Sonamu.config.i18n;
+  const { defaultLocale, supportedLocales } = getCurrentI18nConfig();
 
   // 1. 지정된 locale에서 조회
   const dict = dictionaries[locale];
@@ -61,6 +74,6 @@ function getDictValue<K extends DictKey>(key: K, locale: string): SDReturnType<K
  * SD("error.entityNotFound")("User", 1)  // → "존재하지 않는 User ID 1" (LocalizedString)
  */
 export function SD<K extends DictKey>(key: K): SDReturnType<K> {
-  const configLocale = Sonamu.config.i18n.defaultLocale;
+  const configLocale = getCurrentI18nConfig().defaultLocale;
   return getDictValue(key, configLocale);
 }

package/src/dict/sonamu-dictionary.ts

@@ -1,21 +1,23 @@
-import { Workbook } from "@sheetkit/node";
 import { execSync } from "child_process";
 import fs from "fs";
 import path from "path";
+
+import { Workbook } from "@sheetkit/node";
 import ts from "typescript";
+
 import { Sonamu } from "../api/sonamu";
 import { EntityManager } from "../entity/entity-manager";
 import { BadRequestException } from "../exceptions/so-exceptions";
 import { formatCode } from "../utils/formatter";
 import { SD } from "./sd";
-import type {
-  DictEntry,
-  DictionaryResult,
-  DictionaryRow,
-  EntityKeyInfo,
-  I18nConfig,
-  ImportResult,
-  UsageResult,
+import {
+  type DictEntry,
+  type DictionaryResult,
+  type DictionaryRow,
+  type EntityKeyInfo,
+  type I18nConfig,
+  type ImportResult,
+  type UsageResult,
 } from "./types";
 
 /**
@@ -294,7 +296,7 @@ export class SonamuDictionary {
 
     // 파일 재생성
     const content = this.generateProjectDict(locale, existingEntries, isDefaultLocale);
-    const formatted = formatCode(content, "typescript", filePath);
+    const formatted = await formatCode(content, "typescript", filePath);
     fs.writeFileSync(filePath, formatted, "utf-8");
   }
 
@@ -328,7 +330,7 @@ export class SonamuDictionary {
    */
   generateProjectDict(locale: string, entries: DictEntry[], isDefaultLocale: boolean): string {
     // key 알파벳 순 정렬
-    const sorted = [...entries].sort((a, b) => a.key.localeCompare(b.key));
+    const sorted = [...entries].toSorted((a, b) => a.key.localeCompare(b.key));
 
     const lines: string[] = [];
 
@@ -408,11 +410,15 @@ export class SonamuDictionary {
   /**
    * dict 파일을 저장합니다.
    */
-  private saveDictFile(locale: string, entries: DictEntry[], isDefaultLocale: boolean): void {
+  private async saveDictFile(
+    locale: string,
+    entries: DictEntry[],
+    isDefaultLocale: boolean,
+  ): Promise<void> {
     const i18nDir = this.ensureI18nDir();
     const dictPath = path.join(i18nDir, `${locale}.ts`);
     const content = this.generateProjectDict(locale, entries, isDefaultLocale);
-    const formatted = formatCode(content, "typescript", dictPath);
+    const formatted = await formatCode(content, "typescript", dictPath);
     fs.writeFileSync(dictPath, formatted, "utf-8");
   }
 
@@ -834,7 +840,7 @@ export class SonamuDictionary {
     for (const locale of locales) {
       const entries = projectDictEntries[locale];
       if (entries.length > 0) {
-        this.saveDictFile(locale, entries, locale === defaultLocale);
+        await this.saveDictFile(locale, entries, locale === defaultLocale);
         updatedLocales++;
       }
     }
@@ -902,7 +908,7 @@ export class SonamuDictionary {
       }
 
       // dict 파일 저장
-      this.saveDictFile(locale, entries, locale === defaultLocale);
+      await this.saveDictFile(locale, entries, locale === defaultLocale);
     }
   }
 
@@ -939,7 +945,7 @@ export class SonamuDictionary {
         isFunction: this.isExpressionFunction(cellValue),
       });
 
-      this.saveDictFile(locale, entries, locale === defaultLocale);
+      await this.saveDictFile(locale, entries, locale === defaultLocale);
     }
   }
 
@@ -962,7 +968,7 @@ export class SonamuDictionary {
         entries.splice(index, 1);
         deleted = true;
 
-        this.saveDictFile(locale, entries, locale === defaultLocale);
+        await this.saveDictFile(locale, entries, locale === defaultLocale);
       }
     }
 

package/src/entity/entity-manager.ts

@@ -1,24 +1,25 @@
 import assert from "assert";
-import chalk from "chalk";
 import { glob, readFile } from "fs/promises";
-import inflection from "inflection";
 import path from "path";
+
+import chalk from "chalk";
+import inflection from "inflection";
 import { prettifyError, z } from "zod";
+
 import { Sonamu } from "../api/sonamu";
 import {
-  type EntityIndex,
-  type EntityJson,
   EntityJsonSchema,
   isSearchTextJsonSourceZodType,
   isSearchTextProp,
   SonamuFileArraySchema,
   SonamuFileSchema,
 } from "../types/types";
+import { type EntityIndex, type EntityJson } from "../types/types";
 import { globAsync } from "../utils/async-utils";
 import { importMembers } from "../utils/esm-utils";
-import type { AbsolutePath } from "../utils/path-utils";
+import { type AbsolutePath } from "../utils/path-utils";
 import { runtimePath } from "../utils/path-utils";
-import { Entity } from "./entity";
+import { type Entity } from "./entity";
 
 export type EntityNamesRecord = Record<
   "fs" | "fsPlural" | "camel" | "camelPlural" | "capital" | "capitalPlural" | "upper" | "constant",
@@ -82,6 +83,7 @@ class EntityManagerClass {
     json: EntityJson,
     options: { deferSearchTextJsonSourceValidation?: boolean } = {},
   ): Promise<void> {
+    const { Entity } = await import("./entity");
     const entity = new Entity(json);
     await entity.registerModulePaths();
     if (!options.deferSearchTextJsonSourceValidation) {
@@ -192,7 +194,7 @@ class EntityManagerClass {
   }
 
   getAllIds(): string[] {
-    return Array.from(EntityManager.entities.keys()).sort();
+    return Array.from(EntityManager.entities.keys()).toSorted();
   }
 
   getAllEntities(): Entity[] {

package/src/entity/entity-template-cone.ts

@@ -1,5 +1,12 @@
-import { type FakerMappingConfig, fakerMappings } from "../testing/faker-mappings";
-import type { Cone, EntityJson, EntityProp, OneToOneRelationProp, SubsetDef } from "../types/types";
+import { fakerMappings } from "../testing/faker-mappings";
+import { type FakerMappingConfig } from "../testing/faker-mappings";
+import {
+  type Cone,
+  type EntityJson,
+  type EntityProp,
+  type OneToOneRelationProp,
+  type SubsetDef,
+} from "../types/types";
 import {
   isBelongsToOneRelationProp,
   isEnumDefWithCone,
@@ -181,7 +188,7 @@ function shouldHaveDataSource(prop: EntityProp): boolean {
 
   // OneToOne은 hasJoinColumn: true인 경우에만 dataSource 필요
   if (isOneToOneRelationProp(prop)) {
-    return (prop as OneToOneRelationProp).hasJoinColumn === true;
+    return (prop as OneToOneRelationProp).hasJoinColumn;
   }
 
   return false;

package/src/entity/entity.ts

@@ -1,17 +1,13 @@
 import assert from "assert";
 import { writeFile } from "fs/promises";
-import inflection from "inflection";
 import path from "path";
+
+import inflection from "inflection";
 import { group, unique } from "radashi";
 import { z } from "zod";
+
 import { Sonamu } from "../api/sonamu";
 import {
-  type Cone,
-  type EntityIndex,
-  type EntityJson,
-  type EntityProp,
-  type EntityPropNode,
-  type EntitySubsetRow,
   getEnumDefValues,
   getSubsetFields,
   isBelongsToOneRelationProp,
@@ -24,6 +20,14 @@ import {
   isVirtualCodeProp,
   isVirtualProp,
   normalizeSubsetField,
+} from "../types/types";
+import {
+  type Cone,
+  type EntityIndex,
+  type EntityJson,
+  type EntityProp,
+  type EntityPropNode,
+  type EntitySubsetRow,
   type RelationProp,
   type SubsetField,
   type SubsetQuery,
@@ -209,7 +213,7 @@ export class Entity {
    */
   private buildNestedSelectObject(
     selectItems: string[],
-    // biome-ignore lint/suspicious/noExplicitAny: 반환 오브젝트의 값은 string일 수도 있고 또다른 오브젝트일 수도 있는데, 이를 재귀 타입으로 나타낼 수 없어 any로 처리합니다.
+    // oxlint-disable-next-line @typescript-eslint/no-explicit-any -- 반환 오브젝트의 값은 string일 수도 있고 또다른 오브젝트일 수도 있는데, 이를 재귀 타입으로 나타낼 수 없어 any로 처리합니다.
   ): Record<string, any> {
     const result: ReturnType<typeof this.buildNestedSelectObject> = {};
 
@@ -275,7 +279,7 @@ export class Entity {
    * @param withBraces true면 중괄호 포함, false면 내용만 반환
    */
   private stringifyNestedSelectObject(
-    // biome-ignore lint/suspicious/noExplicitAny: 중첩 오브젝트의 값은 string일 수도 있고 또다른 오브젝트일 수도 있는데, 이를 재귀 타입으로 나타낼 수 없어 any로 처리합니다.
+    // oxlint-disable-next-line @typescript-eslint/no-explicit-any -- 중첩 오브젝트의 값은 string일 수도 있고 또다른 오브젝트일 수도 있는데, 이를 재귀 타입으로 나타낼 수 없어 any로 처리합니다.
     obj: Record<string, any>,
     indent: number = 0,
     withBraces: boolean = true,
@@ -498,7 +502,7 @@ export class Entity {
             }
 
             if (isOneToOneRelationProp(relation)) {
-              if (relation.hasJoinColumn === true && (relation.nullable ?? false) === false) {
+              if (relation.hasJoinColumn && !(relation.nullable ?? false)) {
                 return "inner";
               } else {
                 return "outer";
@@ -736,7 +740,7 @@ export class Entity {
         }
         return propName;
       })
-      .filter((f) => f !== null) as string[];
+      .filter((f) => f !== null);
   }
 
   /**
@@ -746,7 +750,7 @@ export class Entity {
   private hasForeignKey(prop: RelationProp): boolean {
     return (
       prop.relationType === "BelongsToOne" ||
-      (prop.relationType === "OneToOne" && prop.hasJoinColumn === true)
+      (prop.relationType === "OneToOne" && prop.hasJoinColumn)
     );
   }
 
@@ -939,7 +943,7 @@ export class Entity {
       `src/application/${this.names.parentFs}/${this.names.fs}.entity.json`,
     );
     const json = this.toJson();
-    await writeFile(jsonPath, formatCode(JSON.stringify(json), "json", jsonPath));
+    await writeFile(jsonPath, await formatCode(JSON.stringify(json), "json", jsonPath));
 
     // reload
     await EntityManager.register(json);
@@ -1093,12 +1097,12 @@ export class Entity {
           isOpen: children.length > 0,
           has: Object.fromEntries(
             subsetKeys.map((subsetKey) => {
-              return [subsetKey, children.every((child) => child.has[subsetKey] === true)];
+              return [subsetKey, children.every((child) => child.has[subsetKey])];
             }),
           ),
           isInternal: Object.fromEntries(
             subsetKeys.map((subsetKey) => {
-              return [subsetKey, children.every((child) => child.isInternal[subsetKey] === true)];
+              return [subsetKey, children.every((child) => child.isInternal[subsetKey])];
             }),
           ),
         };
@@ -1281,7 +1285,7 @@ export class Entity {
   }
 
   getEntityIdFromSubsetField(subsetField: string): string {
-    if (subsetField.includes(".") === false) {
+    if (!subsetField.includes(".")) {
       return this.id;
     }
 

package/src/exceptions/error-handler.ts

@@ -1,5 +1,6 @@
-import type { FastifyInstance } from "fastify";
+import { type FastifyInstance } from "fastify";
 import type z from "zod";
+
 import { isSoException } from "./so-exceptions";
 
 export function setupErrorHandler(server: FastifyInstance) {

package/src/exceptions/so-exceptions.ts

@@ -1,4 +1,4 @@
-import type { LocalizedString } from "../dict/types";
+import { type LocalizedString } from "../dict/types";
 
 export abstract class SoException extends Error {
   constructor(

package/src/filter/utils.ts

@@ -1,6 +1,7 @@
-import type { Entity } from "../entity/entity";
+import { type Entity } from "../entity/entity";
 import { isEnumProp } from "../types/types";
-import { type FilterOperator, type FilterQuery, operatorsByPropType } from "./types";
+import { operatorsByPropType } from "./types";
+import { type FilterOperator, type FilterQuery } from "./types";
 
 // ============================================================
 // Query Normalization

package/src/logger/category.ts

@@ -1,5 +1,6 @@
 // NOTE: import * as inflection 혹은 import { underscore } 사용 시 오류 발생.
 import inflection from "inflection";
+
 import { asArray } from "../utils/model";
 
 // 두 카테고리가 동일한지 확인

package/src/logger/configure.ts

@@ -1,15 +1,15 @@
+import { configure, getConsoleSink } from "@logtape/logtape";
 import {
-  configure,
   type Filter,
   type FilterLike,
-  getConsoleSink,
   type LoggerConfig,
   type LogRecord,
   type Sink,
   type TextFormatter,
 } from "@logtape/logtape";
 import { getPrettyFormatter } from "@logtape/pretty";
-import type { FastifyReply, FastifyRequest } from "fastify";
+import { type FastifyReply, type FastifyRequest } from "fastify";
+
 import { isSameCategory } from "./category";
 
 export type SonamuLoggingOptions<TSinkId extends string, TFilterId extends string> = {
@@ -102,12 +102,12 @@ export async function configureLogTape<TSinkId extends string, TFilterId extends
 
   const sinks = {
     "fastify-console": defaultFastifySink(fastifyCategory),
-    ...(options.sinks ?? {}),
+    ...options.sinks,
   } as Record<TSinkId | "fastify-console", Sink>;
 
   const filters = {
     "fastify-console": defaultFastifyFilter(fastifyCategory),
-    ...(options.filters ?? {}),
+    ...options.filters,
   } as Record<TFilterId | "fastify-console", FilterLike>;
 
   const loggers: Set<LoggerConfig<TSinkId | "fastify-console", TFilterId | "fastify-console">> =

package/src/migration/__tests__/code-generation.search-text.test.ts

@@ -1,9 +1,9 @@
 import { describe, expect, test } from "vitest";
+
 import { Sonamu } from "../../api";
 import { Entity } from "../../entity/entity";
 import { EntityManager } from "../../entity/entity-manager";
-import type { MigrationSet } from "../../types/types";
-import { setupBiome } from "../../utils/formatter";
+import { type MigrationSet } from "../../types/types";
 import {
   generateAlterCode,
   generateCreateCode,
@@ -13,7 +13,6 @@ import { getMigrationSetFromEntity } from "../migration-set";
 
 const TEST_API_ROOT = "/Users/Nebuleto/Workspace/sonamu/modules/sonamu";
 
-setupBiome(TEST_API_ROOT);
 Sonamu.apiRootPath = TEST_API_ROOT;
 
 let entitySeq = 0;