sonamu 0.8.26 → 0.9.0

package/src/database/base-model.types.ts

@@ -1,4 +1,4 @@
-/** biome-ignore-all lint/suspicious/noExplicitAny: Puri의 타입은 개별 모델에서 확정되므로 BaseModel에서는 any를 허용함 */
+/* oxlint-disable @typescript-eslint/no-explicit-any */ // Puri의 타입은 개별 모델에서 확정되므로 BaseModel에서는 any를 허용함
 
 /**
  * BaseModel 타입 시스템
@@ -7,10 +7,10 @@
  * Enhancer, SubsetQuery 교집합 등 Model 계층에서 필요한 타입 정의.
  */
 
-import type { DatabaseSchemaExtend } from "../types/types";
-import type { Puri } from "./puri";
-import type { ExtractTTables } from "./puri.types";
-import type { PuriSubsetFn } from "./puri-subset.types";
+import { type DatabaseSchemaExtend } from "../types/types";
+import { type Puri } from "./puri";
+import { type PuriSubsetFn } from "./puri-subset.types";
+import { type ExtractTTables } from "./puri.types";
 
 // ============================================================================
 // Subset 교집합 계산 (onSubset 메서드용)
@@ -81,12 +81,13 @@ type IsEnhancerOptional<
   TSubsetMapping extends Record<TSubsetKey, any>,
   TSubsetQueries extends Record<TSubsetKey, PuriSubsetFn>,
   K extends TSubsetKey,
-> = TComputedResults[K] extends OmitVirtualQueryFromMapping<
-  TSubsetMapping[K],
-  ExtractVirtualQueryKeys<TSubsetQueries>
->
-  ? true
-  : false;
+> =
+  TComputedResults[K] extends OmitVirtualQueryFromMapping<
+    TSubsetMapping[K],
+    ExtractVirtualQueryKeys<TSubsetQueries>
+  >
+    ? true
+    : false;
 
 /**
  * 단일 Enhancer 함수 타입

package/src/database/db.ts

@@ -1,9 +1,9 @@
 import assert from "assert";
 import { AsyncLocalStorage } from "async_hooks";
-import type { Knex } from "knex";
-import { assign } from "radashi";
-import { Sonamu } from "../api";
-import type { DatabaseConfig, SonamuConfig } from "../api/config";
+
+import { type Knex } from "knex";
+
+import { type DatabaseConfig, type SonamuConfig } from "../api/config";
 import { createKnexInstance } from "./knex";
 import { TransactionContext } from "./transaction-context";
 
@@ -11,8 +11,37 @@ import { TransactionContext } from "./transaction-context";
  * 여러 설정 객체를 순차적으로 deep merge합니다.
  * undefined/null인 인자는 무시됩니다.
  */
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function mergeRecord(
+  target: Record<string, unknown>,
+  source: Record<string, unknown>,
+): Record<string, unknown> {
+  for (const [key, value] of Object.entries(source)) {
+    const currentValue = target[key];
+
+    if (isPlainObject(currentValue) && isPlainObject(value)) {
+      target[key] = mergeRecord({ ...currentValue }, value);
+    } else {
+      target[key] = value;
+    }
+  }
+
+  return target;
+}
+
 function mergeConfigs<T extends object>(...configs: (Partial<T> | undefined | null)[]): T {
-  return configs.reduce<T>((acc, config) => (config ? assign(acc, config as T) : acc), {} as T);
+  const merged: Record<string, unknown> = {};
+
+  for (const config of configs) {
+    if (config !== undefined && config !== null) {
+      mergeRecord(merged, config as Record<string, unknown>);
+    }
+  }
+
+  return merged as T;
 }
 
 export type DBPreset = "w" | "r";
@@ -30,6 +59,7 @@ export class DBClass {
   private wdb?: Knex;
   private rdb?: Knex;
   private workerDBs: Map<number, Knex> = new Map();
+  private currentConfig: SonamuDBConfig | null = null;
 
   public transactionStorage = new AsyncLocalStorage<TransactionContext>();
 
@@ -37,12 +67,24 @@ export class DBClass {
     return this.transactionStorage.run(new TransactionContext(), callback);
   }
 
+  setConfig(dbConfig: SonamuDBConfig): void {
+    this.currentConfig = dbConfig;
+  }
+
+  private getCurrentConfig(): SonamuDBConfig {
+    if (this.currentConfig === null) {
+      throw new Error("Sonamu DB config has not been initialized");
+    }
+
+    return this.currentConfig;
+  }
+
   public getTransactionContext(): TransactionContext {
     return this.transactionStorage.getStore() ?? new TransactionContext();
   }
 
   getDB(which: DBPreset): Knex {
-    const dbConfig = Sonamu.dbConfig;
+    const dbConfig = this.getCurrentConfig();
 
     // 테스트 트랜잭션 격리
     if (process.env.NODE_ENV === "test") {
@@ -115,7 +157,7 @@ export class DBClass {
   }
 
   getDBConfig(which: DBPreset): Knex.Config {
-    const dbConfig = Sonamu.dbConfig;
+    const dbConfig = this.getCurrentConfig();
     if (process.env.NODE_ENV === "test") {
       return {
         ...dbConfig.test,
@@ -158,7 +200,7 @@ export class DBClass {
   }
 
   public generateDBConfig(config: SonamuConfig["database"]): SonamuDBConfig {
-    const defaultKnexConfig: Partial<DatabaseConfig> = assign(
+    const defaultKnexConfig = mergeConfigs<Partial<DatabaseConfig>>(
       {
         client: "postgresql",
         pool: {
@@ -170,38 +212,31 @@ export class DBClass {
         },
         connection: {
           database: config.name,
-          ...config.defaultOptions?.connection,
         },
       },
       config.defaultOptions,
     );
 
-    // biome-ignore format: 설정 구조 가독성을 위해 여러 줄로 유지
+    // oxfmt-ignore -- 설정 구조 가독성을 위해 여러 줄로 유지
     return {
       // 여기에 나열한 순서대로 Sonamu UI의 DB Migration 탭에 표시됩니다.
       test: mergeConfigs(
-        defaultKnexConfig, 
+        defaultKnexConfig,
         { connection: { database: `${config.name}_test` } },
-        config.environments?.test
+        config.environments?.test,
       ),
       fixture: mergeConfigs(
-        defaultKnexConfig, 
+        defaultKnexConfig,
         { connection: { database: `${config.name}_fixture` } },
         config.environments?.fixture,
       ),
-      development_master: mergeConfigs(
-        defaultKnexConfig, 
-        config.environments?.development
-      ),
+      development_master: mergeConfigs(defaultKnexConfig, config.environments?.development),
       development_slave: mergeConfigs(
         defaultKnexConfig,
         config.environments?.development,
         config.environments?.development_slave,
       ),
-      production_master: mergeConfigs(
-        defaultKnexConfig, 
-        config.environments?.production
-      ),
+      production_master: mergeConfigs(defaultKnexConfig, config.environments?.production),
       production_slave: mergeConfigs(
         defaultKnexConfig,
         config.environments?.production,

package/src/database/knex.ts

@@ -1,4 +1,4 @@
-import type { Knex } from "knex";
+import { type Knex } from "knex";
 import knex from "knex";
 
 export function createKnexInstance(config: Knex.Config): Knex {
@@ -12,7 +12,7 @@ export function createKnexInstance(config: Knex.Config): Knex {
   }
 
   config.pool = {
-    ...(config.pool ?? {}),
+    ...config.pool,
     propagateCreateError: false,
     idleTimeoutMillis: 10000,
     reapIntervalMillis: 1000,

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

@@ -1,10 +1,11 @@
 import { describe, expectTypeOf, it } from "vitest";
-import type { DatabaseSchemaExtend } from "../types/types";
-import type { Puri } from "./puri";
-import type { Hydrate, InferAllSubsets, LoadersResult } from "./puri-subset.types";
-import type { PuriWrapper } from "./puri-wrapper";
 
-/** biome-ignore lint/suspicious/noExplicitAny: Puri Subset 타입 시스템에서 any를 허용함 */
+import { type DatabaseSchemaExtend } from "../types/types";
+import { type Puri } from "./puri";
+import { type Hydrate, type InferAllSubsets, type LoadersResult } from "./puri-subset.types";
+import { type PuriWrapper } from "./puri-wrapper";
+
+// oxlint-disable-next-line @typescript-eslint/no-explicit-any -- Puri Subset 타입 시스템에서 any를 허용함
 type MockPuri<T> = Puri<DatabaseSchemaExtend, any, T>;
 
 describe("Hydrate", () => {
@@ -108,7 +109,7 @@ describe("Hydrate", () => {
 describe("LoadersResult", () => {
   it("단일 로더의 결과 타입을 생성한다", () => {
     type MockLoaderQb = (
-      qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+      qbWrapper: PuriWrapper,
       fromIds: number[] | string[],
     ) => MockPuri<{ id: number; title: string; refId: number }>;
 
@@ -128,12 +129,12 @@ describe("LoadersResult", () => {
 
   it("중첩 로더를 처리한다", () => {
     type CommentLoaderQb = (
-      qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+      qbWrapper: PuriWrapper,
       fromIds: number[] | string[],
     ) => MockPuri<{ id: number; content: string; refId: number }>;
 
     type PostLoaderQb = (
-      qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+      qbWrapper: PuriWrapper,
       fromIds: number[] | string[],
     ) => MockPuri<{ id: number; title: string; refId: number }>;
 
@@ -162,12 +163,12 @@ describe("LoadersResult", () => {
 
   it("중첩 로더의 as 경로도 hydrate한다", () => {
     type IngredientLoaderQb = (
-      qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+      qbWrapper: PuriWrapper,
       fromIds: number[] | string[],
     ) => MockPuri<{ id: number; name: string; refId: number }>;
 
     type PrescriptionItemLoaderQb = (
-      qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+      qbWrapper: PuriWrapper,
       fromIds: number[] | string[],
     ) => MockPuri<{
       id: number;
@@ -210,7 +211,7 @@ describe("LoadersResult", () => {
       as: "projects";
       refId: "id";
       qb: (
-        qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+        qbWrapper: PuriWrapper,
         fromIds: number[] | string[],
       ) => MockPuri<{ id: number; name: string; refId: number }>;
     };
@@ -218,7 +219,7 @@ describe("LoadersResult", () => {
       as: "department";
       refId: "id";
       qb: (
-        qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+        qbWrapper: PuriWrapper,
         fromIds: number[] | string[],
       ) => MockPuri<{ id: number; name: string; company_name: string; refId: number }>;
     };
@@ -226,7 +227,7 @@ describe("LoadersResult", () => {
       as: "employees";
       refId: "id";
       qb: (
-        qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+        qbWrapper: PuriWrapper,
         fromIds: number[] | string[],
       ) => MockPuri<{ id: number; employee_number: string; refId: number }>;
       loaders: [
@@ -234,7 +235,7 @@ describe("LoadersResult", () => {
           as: "user";
           refId: "id";
           qb: (
-            qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+            qbWrapper: PuriWrapper,
             fromIds: number[] | string[],
           ) => MockPuri<{ id: number; name: string; email: string; refId: number }>;
         },
@@ -264,7 +265,7 @@ describe("InferAllSubsets", () => {
   describe("서브셋이 하나인 경우", () => {
     it("로더 없이 기본 Subset 결과를 추론한다", () => {
       // SubsetQuery
-      type SubsetFnA = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnA = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         user__name: string;
         user__email: string;
@@ -295,7 +296,7 @@ describe("InferAllSubsets", () => {
 
     it("로더를 포함한 Subset 결과를 추론한다", () => {
       // SubsetQuery
-      type SubsetFnA = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnA = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         company__id: number;
         company__name: string;
@@ -311,7 +312,7 @@ describe("InferAllSubsets", () => {
         as: "company__departments";
         refId: "company__id";
         qb: (
-          qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+          qbWrapper: PuriWrapper,
           fromIds: number[] | string[],
         ) => MockPuri<{ id: number; name: string; refId: number }>;
       };
@@ -319,7 +320,7 @@ describe("InferAllSubsets", () => {
         as: "department__projects";
         refId: "department__id";
         qb: (
-          qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+          qbWrapper: PuriWrapper,
           fromIds: number[] | string[],
         ) => MockPuri<{ id: number; name: string; status: string; refId: number }>;
       };
@@ -347,7 +348,7 @@ describe("InferAllSubsets", () => {
 
     it("중첩 로더를 포함한 Subset 결과를 추론한다", () => {
       // SubsetQuery
-      type SubsetFnA = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnA = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         company__name: string;
       }>;
@@ -360,7 +361,7 @@ describe("InferAllSubsets", () => {
         as: "company__departments";
         refId: "company__id";
         qb: (
-          qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+          qbWrapper: PuriWrapper,
           fromIds: number[] | string[],
         ) => MockPuri<{ id: number; name: string; refId: number }>;
         loaders: [
@@ -368,7 +369,7 @@ describe("InferAllSubsets", () => {
             as: "projects";
             refId: "id";
             qb: (
-              qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+              qbWrapper: PuriWrapper,
               fromIds: number[] | string[],
             ) => MockPuri<{ id: number; name: string; status: string; refId: number }>;
           },
@@ -398,7 +399,7 @@ describe("InferAllSubsets", () => {
     });
 
     it("중첩 로더 경로 alias를 포함한 Subset 결과를 추론한다", () => {
-      type SubsetFnA = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnA = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         root__id: number;
       }>;
@@ -410,7 +411,7 @@ describe("InferAllSubsets", () => {
         as: "root__items";
         refId: "root__id";
         qb: (
-          qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+          qbWrapper: PuriWrapper,
           fromIds: number[] | string[],
         ) => MockPuri<{
           id: number;
@@ -423,7 +424,7 @@ describe("InferAllSubsets", () => {
             as: "test__inner_items";
             refId: "test__id";
             qb: (
-              qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+              qbWrapper: PuriWrapper,
               fromIds: number[] | string[],
             ) => MockPuri<{ id: number; name: string; refId: number }>;
           },
@@ -458,18 +459,18 @@ describe("InferAllSubsets", () => {
   describe("서브셋이 여러 개인 경우", () => {
     it("로더 없이 기본 Subset 결과를 추론한다", () => {
       // SubsetQuery
-      type SubsetFnA = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnA = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         name: string;
         email: string;
         department__name: string;
       }>;
-      type SubsetFnP = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnP = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         name: string;
         department__name: string;
       }>;
-      type SubsetFnSS = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnSS = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         name: string;
         email: string;
@@ -501,18 +502,18 @@ describe("InferAllSubsets", () => {
 
     it("로더를 포함한 Subset 결과를 추론한다", () => {
       // SubsetQuery
-      type SubsetFnA = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnA = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         name: string;
         email: string;
         department__name: string;
       }>;
-      type SubsetFnP = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnP = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         name: string;
         department__name: string;
       }>;
-      type SubsetFnSS = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => MockPuri<{
+      type SubsetFnSS = (qbWrapper: PuriWrapper) => MockPuri<{
         id: number;
         name: string;
         email: string;
@@ -529,7 +530,7 @@ describe("InferAllSubsets", () => {
         as: "projects";
         refId: "id";
         qb: (
-          qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+          qbWrapper: PuriWrapper,
           fromIds: number[] | string[],
         ) => MockPuri<{ id: number; name: string; status: string; refId: number }>;
         loaders: [
@@ -537,7 +538,7 @@ describe("InferAllSubsets", () => {
             as: "tags";
             refId: "id";
             qb: (
-              qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+              qbWrapper: PuriWrapper,
               fromIds: number[] | string[],
             ) => MockPuri<{ id: number; name: string; refId: number }>;
           },

package/src/database/puri-subset.types.ts

@@ -1,4 +1,4 @@
-/** biome-ignore-all lint/suspicious/noExplicitAny: Puri Subset 타입 시스템에서 any를 허용함 */
+/* oxlint-disable @typescript-eslint/no-explicit-any */ // Puri Subset 타입 시스템에서 any를 허용함
 
 /**
  * Puri Subset 타입 시스템
@@ -10,10 +10,9 @@
  * - Hydrate: flat한 결과를 중첩 객체로 변환 (예: user__name → { user: { name } })
  */
 
-import type { DatabaseSchemaExtend } from "../types/types";
-import type { Puri } from "./puri";
-import type { Expand } from "./puri.types";
-import type { PuriWrapper } from "./puri-wrapper";
+import { type Puri } from "./puri";
+import { type PuriWrapper } from "./puri-wrapper";
+import { type Expand } from "./puri.types";
 
 // ============================================================================
 // 기본 타입 정의
@@ -23,7 +22,7 @@ import type { PuriWrapper } from "./puri-wrapper";
  * SubsetQuery 함수 시그니처
  * PuriWrapper를 받아 Puri 쿼리 빌더를 반환
  */
-export type PuriSubsetFn = (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => Puri<any, any, any>;
+export type PuriSubsetFn = (qbWrapper: PuriWrapper) => Puri<any, any, any>;
 
 /**
  * Puri 인스턴스에서 TResult 타입 추출
@@ -40,7 +39,7 @@ export type ExtractPuriResult<T> = T extends Puri<any, any, infer R> ? R : never
  * @param fromIds - 부모 레코드 ID 배열
  */
 export type PuriLoaderQbFn = (
-  qbWrapper: PuriWrapper<DatabaseSchemaExtend>,
+  qbWrapper: PuriWrapper,
   fromIds: number[] | string[],
 ) => Puri<any, any, any>;
 

package/src/database/puri-wrapper.ts

@@ -1,12 +1,23 @@
-/** biome-ignore-all lint/suspicious/noExplicitAny: PuriWrapper는 다양한 타입을 사용하고 있습니다. */
+/* oxlint-disable @typescript-eslint/no-explicit-any */ // PuriWrapper는 다양한 타입을 사용하고 있습니다.
 
 import chalk from "chalk";
-import type { Knex } from "knex";
-import type { DatabaseSchemaExtend } from "../types/types";
-import type { DBPreset } from "./db";
+import { type Knex } from "knex";
+
+import { type DatabaseSchemaExtend } from "../types/types";
+import { type DBPreset } from "./db";
 import { Puri } from "./puri";
-import type { ColumnKeys, IdType, OmitInternalTypeKeys, PuriTable } from "./puri.types";
-import type { InsertOnlyOptions, UBRef, UpsertBuilder, UpsertOptions } from "./upsert-builder";
+import {
+  type ColumnKeys,
+  type IdType,
+  type OmitInternalTypeKeys,
+  type PuriTable,
+} from "./puri.types";
+import {
+  type InsertOnlyOptions,
+  type UBRef,
+  type UpsertBuilder,
+  type UpsertOptions,
+} from "./upsert-builder";
 
 type TableName<TSchema extends DatabaseSchemaExtend> = Extract<keyof TSchema, string>;
 
@@ -35,21 +46,17 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
     OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
   >;
   // 테이블명 + Alias로 시작
-  from<TTable extends keyof TSchema, TAlias extends string>(
-    spec: {
-      [K in TAlias]: TTable;
-    },
-  ): Puri<
+  from<TTable extends keyof TSchema, TAlias extends string>(spec: {
+    [K in TAlias]: TTable;
+  }): Puri<
     TSchema,
     Record<TAlias, PuriTable<TSchema[TTable]>>,
     OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
   >;
   // 서브쿼리로 시작
-  from<TAlias extends string, TSubResult>(
-    spec: {
-      [K in TAlias]: Puri<TSchema, any, TSubResult>;
-    },
-  ): Puri<
+  from<TAlias extends string, TSubResult>(spec: {
+    [K in TAlias]: Puri<TSchema, any, TSubResult>;
+  }): Puri<
     TSchema,
     Record<TAlias, PuriTable<TSubResult>>,
     OmitInternalTypeKeys<PuriTable<TSubResult>>
@@ -67,21 +74,17 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
     OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
   >;
   // 테이블명 + Alias로 시작
-  table<TTable extends keyof TSchema, TAlias extends string>(
-    spec: {
-      [K in TAlias]: TTable;
-    },
-  ): Puri<
+  table<TTable extends keyof TSchema, TAlias extends string>(spec: {
+    [K in TAlias]: TTable;
+  }): Puri<
     TSchema,
     Record<TAlias, PuriTable<TSchema[TTable]>>,
     OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
   >;
   // 서브쿼리로 시작
-  table<TAlias extends string, TSubResult>(
-    spec: {
-      [K in TAlias]: Puri<TSchema, any, TSubResult>;
-    },
-  ): Puri<
+  table<TAlias extends string, TSubResult>(spec: {
+    [K in TAlias]: Puri<TSchema, any, TSubResult>;
+  }): Puri<
     TSchema,
     Record<TAlias, PuriTable<TSubResult>>,
     OmitInternalTypeKeys<PuriTable<TSubResult>>

package/src/database/puri.ts

@@ -1,42 +1,44 @@
-/** biome-ignore-all lint/suspicious/noThenProperty: Puri는 thenable 인터페이스를 구현하고 있습니다. */
-/** biome-ignore-all lint/suspicious/noExplicitAny: Puri는 다양한 타입을 사용하고 있습니다. */
+/* oxlint-disable @typescript-eslint/no-explicit-any */ // Puri는 다양한 타입을 사용하고 있습니다.
 
 import assert from "assert";
+
 import chalk from "chalk";
 import inflection from "inflection";
-import type { Knex } from "knex";
-import { EntityManager, type TableSpec } from "../entity/entity-manager";
+import { type Knex } from "knex";
+
+import { EntityManager } from "../entity/entity-manager";
+import { type TableSpec } from "../entity/entity-manager";
 import { Naite } from "../naite/naite";
-import type {
-  AvailableColumns,
-  ColumnKeys,
-  ComparisonOperator,
-  Expand,
-  ExtractColumnType,
-  FulltextColumns,
-  FuzzyOperator,
-  InsertData,
-  InsertResult,
-  LeftJoinedMarker,
-  LeftJoinMarkerFor,
-  NumericColumns,
-  OnConflictAction,
-  ParseSelectObject,
-  ResultAvailableColumns,
-  SelectAllResult,
-  SelectObject,
-  SingleTableValue,
-  SqlExpression,
-  TsHighlightOptions,
-  TsQueryConfig,
-  TsQueryOptions,
-  TsRankOptions,
-  VectorColumns,
-  WhereCondition,
-  WhereOperator,
+import { type ClearStatements } from "./puri-subset.types";
+import {
+  type AvailableColumns,
+  type ColumnKeys,
+  type ComparisonOperator,
+  type Expand,
+  type ExtractColumnType,
+  type FulltextColumns,
+  type FuzzyOperator,
+  type InsertData,
+  type InsertResult,
+  type LeftJoinedMarker,
+  type LeftJoinMarkerFor,
+  type NumericColumns,
+  type OnConflictAction,
+  type ParseSelectObject,
+  type ResultAvailableColumns,
+  type SelectAllResult,
+  type SelectObject,
+  type SingleTableValue,
+  type SqlExpression,
+  type TsHighlightOptions,
+  type TsQueryConfig,
+  type TsQueryOptions,
+  type TsRankOptions,
+  type VectorColumns,
+  type WhereCondition,
+  type WhereOperator,
 } from "./puri.types";
 import { FUZZY_OPERATORS } from "./puri.types";
-import type { ClearStatements } from "./puri-subset.types";
 
 function normalizeFuzzyOperator(operator?: string): FuzzyOperator {
   const normalized = operator?.trim() ?? "<%";
@@ -481,7 +483,7 @@ export class Puri<TSchema, TTables extends Record<string, any>, TResult> {
   // DISTINCT
   distinct<TColumns extends AvailableColumns<TTables>>(...columns: TColumns[]): this;
   distinct(...columns: string[]): this {
-    this.knexQuery.distinct(...(columns as string[]));
+    this.knexQuery.distinct(...columns);
     return this;
   }
 
@@ -988,7 +990,7 @@ export class Puri<TSchema, TTables extends Record<string, any>, TResult> {
   // GROUP BY
   groupBy<TColumns extends ResultAvailableColumns<TTables, TResult>>(...columns: TColumns[]): this;
   groupBy(...columns: string[]): this {
-    this.knexQuery.groupBy(...(columns as string[]));
+    this.knexQuery.groupBy(...columns);
     return this;
   }