sonamu 0.8.26 → 0.9.0

package/src/auth/plugins/entity-definitions/index.ts

@@ -19,7 +19,7 @@ import { passkeyEntityDef } from "./passkey";
 import { phoneNumberEntityDef } from "./phone-number";
 import { ssoEntityDef } from "./sso";
 import { twoFactorEntityDef } from "./two-factor";
-import type { BetterAuthEntityDef, BetterAuthPluginId } from "./types";
+import { type BetterAuthEntityDef, type BetterAuthPluginId } from "./types";
 import { usernameEntityDef } from "./username";
 
 /**

package/src/auth/plugins/entity-definitions/jwt.ts

@@ -1,4 +1,4 @@
-import type { BetterAuthEntityDef } from "./types";
+import { type BetterAuthEntityDef } from "./types";
 
 /**
  * better-auth JWT 플러그인 엔티티 정의

package/src/auth/plugins/entity-definitions/organization.ts

@@ -1,4 +1,4 @@
-import type { BetterAuthEntityDef } from "./types";
+import { type BetterAuthEntityDef } from "./types";
 
 /**
  * better-auth Organization 플러그인 엔티티 정의

package/src/auth/plugins/entity-definitions/passkey.ts

@@ -1,4 +1,4 @@
-import type { BetterAuthEntityDef } from "./types";
+import { type BetterAuthEntityDef } from "./types";
 
 /**
  * better-auth Passkey 플러그인 엔티티 정의

package/src/auth/plugins/entity-definitions/phone-number.ts

@@ -1,4 +1,4 @@
-import type { BetterAuthEntityDef } from "./types";
+import { type BetterAuthEntityDef } from "./types";
 
 /**
  * better-auth phone-number 플러그인 엔티티 정의

package/src/auth/plugins/entity-definitions/sso.ts

@@ -1,4 +1,4 @@
-import type { BetterAuthEntityDef } from "./types";
+import { type BetterAuthEntityDef } from "./types";
 
 /**
  * better-auth SSO 플러그인 엔티티 정의

package/src/auth/plugins/entity-definitions/two-factor.ts

@@ -1,4 +1,4 @@
-import type { BetterAuthEntityDef } from "./types";
+import { type BetterAuthEntityDef } from "./types";
 
 /**
  * better-auth 2FA (Two-Factor Authentication) 플러그인 엔티티 정의

package/src/auth/plugins/entity-definitions/types.ts

@@ -1,4 +1,4 @@
-import type { EntityIndex, EntityJson, EntityProp } from "../../../types/types";
+import { type EntityIndex, type EntityJson, type EntityProp } from "../../../types/types";
 
 /**
  * better-auth 플러그인 ID

package/src/auth/plugins/entity-definitions/username.ts

@@ -1,4 +1,4 @@
-import type { BetterAuthEntityDef } from "./types";
+import { type BetterAuthEntityDef } from "./types";
 
 /**
  * better-auth username 플러그인 엔티티 정의

package/src/auth/plugins/wrappers/admin.ts

@@ -1,4 +1,6 @@
-import { admin as _admin, type AdminOptions } from "better-auth/plugins";
+import { admin as _admin } from "better-auth/plugins";
+import { type AdminOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { AdminOptions } from "better-auth/plugins";

package/src/auth/plugins/wrappers/anonymous.ts

@@ -1,4 +1,6 @@
-import { anonymous as _anonymous, type AnonymousOptions } from "better-auth/plugins";
+import { anonymous as _anonymous } from "better-auth/plugins";
+import { type AnonymousOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { AnonymousOptions } from "better-auth/plugins";

package/src/auth/plugins/wrappers/api-key.ts

@@ -1,4 +1,6 @@
-import { apiKey as _apiKey, type ApiKeyOptions } from "better-auth/plugins";
+import { apiKey as _apiKey } from "better-auth/plugins";
+import { type ApiKeyOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { ApiKeyOptions } from "better-auth/plugins";

package/src/auth/plugins/wrappers/jwt.ts

@@ -1,4 +1,6 @@
-import { jwt as _jwt, type JwtOptions } from "better-auth/plugins";
+import { jwt as _jwt } from "better-auth/plugins";
+import { type JwtOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { JwtOptions } from "better-auth/plugins";

package/src/auth/plugins/wrappers/organization.ts

@@ -1,4 +1,6 @@
-import { organization as _organization, type OrganizationOptions } from "better-auth/plugins";
+import { organization as _organization } from "better-auth/plugins";
+import { type OrganizationOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { OrganizationOptions } from "better-auth/plugins";

package/src/auth/plugins/wrappers/passkey.ts

@@ -1,4 +1,6 @@
-import { passkey as _passkey, type PasskeyOptions } from "@better-auth/passkey";
+import { passkey as _passkey } from "@better-auth/passkey";
+import { type PasskeyOptions } from "@better-auth/passkey";
+
 import { merge } from "../../../utils/utils";
 
 export type { PasskeyOptions } from "@better-auth/passkey";

package/src/auth/plugins/wrappers/phone-number.ts

@@ -1,4 +1,6 @@
-import { phoneNumber as _phoneNumber, type PhoneNumberOptions } from "better-auth/plugins";
+import { phoneNumber as _phoneNumber } from "better-auth/plugins";
+import { type PhoneNumberOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { PhoneNumberOptions } from "better-auth/plugins";

package/src/auth/plugins/wrappers/sso.ts

@@ -1,4 +1,5 @@
-import { sso as _sso, type SSOOptions } from "@better-auth/sso";
+import { sso as _sso } from "@better-auth/sso";
+import { type SSOOptions } from "@better-auth/sso";
 
 export type { SSOOptions } from "@better-auth/sso";
 

package/src/auth/plugins/wrappers/two-factor.ts

@@ -1,4 +1,6 @@
-import { twoFactor as _twoFactor, type TwoFactorOptions } from "better-auth/plugins";
+import { twoFactor as _twoFactor } from "better-auth/plugins";
+import { type TwoFactorOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { TwoFactorOptions } from "better-auth/plugins";

package/src/auth/plugins/wrappers/username.ts

@@ -1,4 +1,6 @@
-import { username as _username, type UsernameOptions } from "better-auth/plugins";
+import { username as _username } from "better-auth/plugins";
+import { type UsernameOptions } from "better-auth/plugins";
+
 import { merge } from "../../../utils/utils";
 
 export type { UsernameOptions } from "better-auth/plugins";

package/src/bin/__tests__/ts-loader-register.test.ts

@@ -13,7 +13,6 @@ type GlobalWithTsLoaderRegisterState = typeof globalThis & {
 function resetRegisterState() {
   const globalState = globalThis as GlobalWithTsLoaderRegisterState;
   delete globalState[tsLoaderRegisterStateKey];
-  delete process.env.SWCRC_PATH;
 }
 
 describe("ensureTsLoaderRegistered", () => {
@@ -21,7 +20,6 @@ describe("ensureTsLoaderRegistered", () => {
     vi.resetModules();
     vi.restoreAllMocks();
     vi.unmock("node:module");
-    vi.unmock("../../utils/fs-utils.js");
     resetRegisterState();
   });
 
@@ -29,18 +27,14 @@ describe("ensureTsLoaderRegistered", () => {
     vi.resetModules();
     vi.restoreAllMocks();
     vi.unmock("node:module");
-    vi.unmock("../../utils/fs-utils.js");
     resetRegisterState();
   });
 
-  it("프로젝트 .swcrc를 우선 사용하고 중복 등록하지 않는다", async () => {
+  it("중복 등록하지 않는다", async () => {
     const registerMock = vi.fn();
     vi.doMock("node:module", () => ({
       register: registerMock,
     }));
-    vi.doMock("../../utils/fs-utils.js", () => ({
-      exists: vi.fn(async (candidate: string) => candidate === "/tmp/fixture-api/.swcrc"),
-    }));
 
     const module = await import("../ts-loader-registration");
 
@@ -49,14 +43,15 @@ describe("ensureTsLoaderRegistered", () => {
     await module.ensureTsLoaderRegistered("/tmp/fixture-api");
 
     expect(registerMock).toHaveBeenCalledTimes(1);
-    expect(registerMock).toHaveBeenCalledWith("@sonamu-kit/ts-loader/loader", {
-      parentURL: expect.stringContaining("/src/bin/ts-loader-registration"),
-    });
-    expect(process.env.SWCRC_PATH).toBe("/tmp/fixture-api/.swcrc");
+    expect(registerMock).toHaveBeenCalledWith(
+      expect.stringContaining("/modules/ts-loader/dist/loader.js"),
+      {
+        parentURL: expect.stringContaining("/src/bin/ts-loader-registration"),
+      },
+    );
 
     await module.ensureTsLoaderRegistered("/tmp/another-api");
 
     expect(registerMock).toHaveBeenCalledTimes(1);
-    expect(process.env.SWCRC_PATH).toBe("/tmp/fixture-api/.swcrc");
   });
 });

package/src/bin/build-config.ts

@@ -18,7 +18,7 @@ export const API_ARTIFACTS: BuildArtifact<{ configFilePath: string }>[] = [
     projectPath: "api",
     preBuildCommand: () => "rm -rf dist",
     buildCommand: ({ configFilePath }) =>
-      `tsc --noEmit && swc src -d dist --config-file ${configFilePath} --strip-leading-paths`,
+      `tsc --noEmit && pnpm exec tsdown --config ${JSON.stringify(configFilePath)}`,
   },
 ];
 
@@ -32,7 +32,7 @@ export const WEB_ARTIFACTS: BuildArtifact[] = [
     description: "Web 프로젝트 클라이언트 빌드 산출물",
     projectPath: "web",
     preBuildCommand: () => "rm -rf dist/client",
-    buildCommand: () => "tsc --noEmit && vite build --outDir dist/client",
+    buildCommand: () => "tsc --noEmit && vite build --config vite.config.ts --outDir dist/client",
   },
   {
     name: "Web Server",
@@ -40,7 +40,7 @@ export const WEB_ARTIFACTS: BuildArtifact[] = [
     projectPath: "web",
     preBuildCommand: () => "rm -rf dist/server",
     buildCommand: () =>
-      "tsc --noEmit && vite build --ssr src/entry-server.generated.tsx --outDir dist/server",
+      "tsc --noEmit && vite build --config vite.config.ts --ssr src/entry-server.generated.tsx --outDir dist/server",
     postBuildCommand: () =>
       "rm -rf ../api/web-dist && mkdir -p ../api/web-dist && cp -r dist/* ../api/web-dist",
   },

package/src/bin/cli.ts

@@ -6,20 +6,20 @@ dotenv.config();
 import assert from "assert";
 import { execSync, spawn } from "child_process";
 import { cp, mkdir, readdir, readFile, rm, symlink, writeFile } from "fs/promises";
-import knex, { type Knex } from "knex";
 import { createRequire } from "module";
 import os from "os";
 import path from "path";
 import process from "process";
+
+import knex from "knex";
+import { type Knex } from "knex";
 import { tsicli } from "tsicli";
-import { Sonamu } from "../api";
+
+import { Sonamu } from "../api/sonamu";
 import { addCompanionsToEntities, generateBetterAuthEntities } from "../auth/auth-generator";
-import {
-  type BetterAuthPluginId,
-  isValidPluginId,
-  SUPPORTED_PLUGIN_IDS,
-} from "../auth/plugins/entity-definitions";
-import type { SonamuDBConfig } from "../database/db";
+import { isValidPluginId, SUPPORTED_PLUGIN_IDS } from "../auth/plugins/entity-definitions";
+import { type BetterAuthPluginId } from "../auth/plugins/entity-definitions";
+import { type SonamuDBConfig } from "../database/db";
 import { EntityManager } from "../entity/entity-manager";
 import { Migrator } from "../migration/migrator";
 import { FixtureManager } from "../testing/fixture-manager";
@@ -33,7 +33,8 @@ import {
 } from "../utils/console-util";
 import { exists } from "../utils/fs-utils";
 import { findApiRootPath, findAppRootPath } from "../utils/utils";
-import { API_ARTIFACTS, type BuildArtifact, WEB_ARTIFACTS } from "./build-config";
+import { API_ARTIFACTS, WEB_ARTIFACTS } from "./build-config";
+import { type BuildArtifact } from "./build-config";
 import { fixtureExploreCommand, fixtureFetchCommand, fixtureGenCommand } from "./fixture";
 import { testCommand } from "./test-command";
 
@@ -368,23 +369,24 @@ async function dev_web() {
 }
 
 /**
- * SWC 설정 파일 경로를 결정합니다. API 빌드(SWC)에서만 사용됩니다.
- * 프로젝트 루트에 .swcrc가 있으면 그것을, 없으면 sonamu 기본 설정을 사용합니다.
+ * API 빌드 설정 파일 경로를 결정합니다.
+ * 프로젝트 루트에 `tsdown.config.ts`가 있으면 그것을, 없으면 sonamu 기본 설정을 사용합니다.
  */
-async function resolveSwcConfigPath(): Promise<string> {
-  let swcFilePath = ".swcrc";
+async function resolveApiBuildConfigPath(): Promise<string> {
+  const localConfigPath = path.join(process.cwd(), "tsdown.config.ts");
+
   try {
-    if (await exists(swcFilePath)) {
-      console.log(chalk.dim("Using .swcrc from project root..."));
-    } else {
-      console.log(chalk.dim("Using default .swcrc from sonamu package..."));
-      swcFilePath = path.join(import.meta.dirname, "..", "..", ".swcrc.project-default");
+    if (await exists(localConfigPath)) {
+      console.log(chalk.dim("Using tsdown.config.ts from project root..."));
+      return localConfigPath;
     }
+
+    console.log(chalk.dim("Using default tsdown API config from sonamu package..."));
+    return path.join(import.meta.dirname, "..", "..", "tsdown.api.config.ts");
   } catch (error) {
-    console.error(chalk.red("Setting up swc config file failed."), error);
+    console.error(chalk.red("Setting up API build config failed."), error);
     process.exit(1);
   }
-  return swcFilePath;
 }
 
 /**
@@ -404,7 +406,7 @@ async function build_all() {
  */
 async function build_api() {
   const appRoot = findAppRootPath();
-  const swcFilePath = await resolveSwcConfigPath();
+  const configFilePath = await resolveApiBuildConfigPath();
 
   const apiStartedAt = Date.now();
   try {
@@ -412,7 +414,7 @@ async function build_api() {
       const cwd = path.join(appRoot, artifact.projectPath);
       printTaskHeader(artifact.name, artifact.description, cwd);
 
-      await runBuildSteps(artifact, { cwd, buildCommandArgs: { configFilePath: swcFilePath } });
+      await runBuildSteps(artifact, { cwd, buildCommandArgs: { configFilePath } });
     }
     printBuildSummary("API", true, Date.now() - apiStartedAt);
   } catch (e) {
@@ -623,7 +625,7 @@ async function fixture_init() {
   }
 
   // 2. 대상DB 각각에 대하여 존재여부 확인 후 붓기
-  for await (const { label, config, toSkip } of targets) {
+  for (const { label, config, toSkip } of targets) {
     const conn = config.connection as Knex.ConnectionConfig;
 
     if (toSkip === true) {
@@ -759,7 +761,7 @@ async function stub_practice(name: string) {
         const [, seqNo] = fileName.match(/^p([0-9]+)-/) ?? ["0", "0"];
         return parseInt(seqNo);
       })
-      .sort((a, b) => b - a);
+      .toSorted((a, b) => b - a);
 
     if (filteredSeqs.length > 0) {
       return filteredSeqs[0];
@@ -1111,7 +1113,7 @@ async function skills_sync_to(
                 hooks: [
                   {
                     type: "command",
-                    command: "pnpm biome check --changed 2>&1 | head -60",
+                    command: "pnpm check 2>&1 | head -60",
                   },
                 ],
               },

package/src/bin/fixture.ts

@@ -1,10 +1,12 @@
 import chalk from "chalk";
 import prompts from "prompts";
-import { Sonamu } from "../api";
+
+import { Sonamu } from "../api/sonamu";
 import { DB } from "../database/db";
 import { createKnexInstance } from "../database/knex";
 import { EntityManager } from "../entity/entity-manager";
-import { DataExplorer, type DataExplorerStrategy } from "../testing/data-explorer";
+import { DataExplorer } from "../testing/data-explorer";
+import { type DataExplorerStrategy } from "../testing/data-explorer";
 import { FixtureGenerator } from "../testing/fixture-generator";
 
 interface FixtureCommandOptions {

package/src/bin/hmr-hook-register.ts

@@ -19,4 +19,5 @@ if (process.env.HOT === "yes" && process.env.API_ROOT_PATH) {
   console.log("🔥 HMR-hook initialized");
 }
 
+// oxlint-disable-next-line
 export {};

package/src/bin/test-command.ts

@@ -1,8 +1,10 @@
 import path from "node:path";
+
 import chalk from "chalk";
-import type { SonamuConfig } from "../api/config";
+
+import { type SonamuConfig } from "../api/config";
 import { loadConfig } from "../api/config";
-import type { RunResult, TestCaseResult } from "../testing";
+import { type RunResult, type TestCaseResult } from "../testing";
 import { findApiRootPath } from "../utils/utils";
 
 async function loadTestConfig(): Promise<SonamuConfig> {

package/src/bin/ts-loader-registration.ts

@@ -1,8 +1,9 @@
+import { createRequire } from "node:module";
 import { register } from "node:module";
-import * as path from "node:path";
-import { exists } from "../utils/fs-utils.js";
+import { pathToFileURL } from "node:url";
 
 const tsLoaderRegisterStateKey = Symbol.for("sonamu.ts-loader-register.state");
+const require = createRequire(import.meta.url);
 
 type TsLoaderRegisterState = {
   registered: boolean;
@@ -22,33 +23,16 @@ function getTsLoaderRegisterState(): TsLoaderRegisterState {
   return globalState[tsLoaderRegisterStateKey];
 }
 
-async function setupSwcConfig(apiRoot: string) {
-  try {
-    const projectSwcrcPath = path.join(apiRoot, ".swcrc");
-    if (await exists(projectSwcrcPath)) {
-      process.env.SWCRC_PATH = projectSwcrcPath;
-      return;
-    }
-
-    const sonamuSwcrcPath = path.join(import.meta.dirname, "..", "..", ".swcrc.project-default");
-    if (await exists(sonamuSwcrcPath)) {
-      process.env.SWCRC_PATH = sonamuSwcrcPath;
-      return;
-    }
-  } catch {
-    // 환경 변수 설정 실패는 무시 (loader가 기본 설정 사용)
-  }
-}
-
 export async function ensureTsLoaderRegistered(apiRoot: string): Promise<void> {
   const state = getTsLoaderRegisterState();
   if (state.registered) {
     return;
   }
 
-  await setupSwcConfig(apiRoot);
+  void apiRoot;
+  const loaderPath = require.resolve("@sonamu-kit/ts-loader/loader");
 
-  register("@sonamu-kit/ts-loader/loader", {
+  register(pathToFileURL(loaderPath).href, {
     parentURL: import.meta.url,
   });
   state.registered = true;

package/src/cache/cache-manager.ts

@@ -1,6 +1,7 @@
 import { BentoCache, bentostore } from "bentocache";
 import { memoryDriver } from "bentocache/drivers/memory";
-import type { CacheConfig, CacheManager } from "./types";
+
+import { type CacheConfig, type CacheManager } from "./types";
 
 /**
  * BentoCache 인스턴스를 생성합니다.

package/src/cache/decorator.ts

@@ -1,6 +1,6 @@
-import type { BaseFrameClass } from "../api/base-frame";
+import { type BaseFrameClass } from "../api/base-frame";
 import { BaseModelClass } from "../database/base-model";
-import type { CacheDecoratorOptions, CacheManager } from "./types";
+import { type CacheDecoratorOptions, type CacheManager } from "./types";
 
 type DecoratorTarget = { constructor: { name: string } };
 

package/src/cache/types.ts

@@ -1,5 +1,5 @@
-import type { BentoCache } from "bentocache";
-import type { RawCommonOptions } from "bentocache/types";
+import { type BentoCache } from "bentocache";
+import { type RawCommonOptions } from "bentocache/types";
 
 /**
  * 캐시 설정 (sonamu.config.ts에서 사용)
@@ -28,5 +28,5 @@ export type CacheDecoratorOptions = {
 /**
  * CacheManager 타입 (BentoCache 확장)
  */
-// biome-ignore lint/suspicious/noExplicitAny: BentoCache의 제네릭 타입을 그대로 사용
+// oxlint-disable-next-line @typescript-eslint/no-explicit-any -- BentoCache의 제네릭 타입을 그대로 사용
 export type CacheManager = BentoCache<any>;

package/src/cache-control/cache-control.ts

@@ -1,5 +1,6 @@
-import type { FastifyReply } from "fastify";
-import type { CacheControlConfig } from "./types.js";
+import { type FastifyReply } from "fastify";
+
+import { type CacheControlConfig } from "./types.js";
 
 /**
  * 자주 사용하는 Cache-Control 프리셋입니다.

package/src/cache-control/types.ts

@@ -1,5 +1,5 @@
-import type { ExtendedApi } from "../api/decorators.js";
-import type { SSRRoute } from "../ssr/types.js";
+import { type ExtendedApi } from "../api/decorators.js";
+import { type SSRRoute } from "../ssr/types.js";
 
 /**
  * Cache-Control 헤더 설정을 위한 타입입니다.

package/src/compress/compress.ts

@@ -1,4 +1,4 @@
-import type { CompressConfig, CompressOptions } from "./types";
+import { type CompressConfig, type CompressOptions } from "./types";
 
 /**
  * 압축 프리셋입니다.

package/src/cone/cone-generator.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { Cone, EntityJson } from "../types/types";
+
+import { type Cone, type EntityJson } from "../types/types";
 
 /**
  * Cone 생성 컨텍스트
@@ -308,12 +309,12 @@ async function callAnthropicAPI(
     if (error && typeof error === "object" && "statusCode" in error) {
       const statusCode = (error as { statusCode: number }).statusCode;
       if (statusCode === 429) {
-        throw new Error("Rate limit exceeded. Please try again later.");
+        throw new Error("Rate limit exceeded. Please try again later.", { cause: error });
       }
     }
 
     const message = error instanceof Error ? error.message : "Unknown error";
-    throw new Error(`LLM API failed: ${message}`);
+    throw new Error(`LLM API failed: ${message}`, { cause: error });
   }
 }
 
@@ -348,6 +349,7 @@ function parseConeResponse(text: string): ConeGenerationResult {
       `Failed to parse LLM response: ${message}\n\n` +
         `Original response:\n${text}\n\n` +
         `Cleaned JSON:\n${jsonText}`,
+      { cause: error },
     );
   }
 }

package/src/database/_batch_update.ts

@@ -4,7 +4,7 @@
 */
 
 import { getLogger } from "@logtape/logtape";
-import type { Knex } from "knex";
+import { type Knex } from "knex";
 
 const logger = getLogger(["sonamu", "internal", "batch-update"]);
 

package/src/database/base-model.ts

@@ -1,22 +1,28 @@
 /** biome-ignore-all lint/suspicious/noExplicitAny: Puri의 타입은 개별 모델에서 확정되므로 BaseModel에서는 any를 허용함 */
-import { getLogger, type Logger } from "@logtape/logtape";
-import type { Knex } from "knex";
-import { cloneDeep, group, isObject, omit, set } from "radashi";
-import { type ListResult, normalizeFilterQuery, validateSonamuFilters } from "..";
-import { Sonamu } from "../api";
+import { getLogger } from "@logtape/logtape";
+import { type Logger } from "@logtape/logtape";
+import { type Knex } from "knex";
+import { cloneDeep, cluster, group, isObject, omit, set } from "radashi";
+
+import { Sonamu } from "../api/sonamu";
 import { EntityManager } from "../entity/entity-manager";
-import type { FilterOperator, FilterQuery } from "../filter/types";
+import { type FilterOperator, type FilterQuery } from "../filter/types";
+import { normalizeFilterQuery, validateSonamuFilters } from "../filter/utils";
 import { convertDomainToCategory } from "../logger/category";
-import type { DatabaseSchemaExtend, SonamuQueryMode } from "../types/types";
+import { type DatabaseSchemaExtend, type SonamuQueryMode } from "../types/types";
+import { type ListResult } from "../utils/model";
 import { getJoinTables, getTableNamesFromWhere } from "../utils/sql-parser";
-import { chunk } from "../utils/utils";
-import type { EnhancerMap, ResolveSubsetIntersection } from "./base-model.types";
-import type { DBPreset } from "./db";
+import { type EnhancerMap, type ResolveSubsetIntersection } from "./base-model.types";
+import { type DBPreset } from "./db";
 import { DB } from "./db";
 import { Puri } from "./puri";
-import type { UnionExtractedTTables } from "./puri.types";
-import type { InferAllSubsets, PuriLoaderQueries, PuriSubsetFn } from "./puri-subset.types";
+import {
+  type InferAllSubsets,
+  type PuriLoaderQueries,
+  type PuriSubsetFn,
+} from "./puri-subset.types";
 import { PuriWrapper } from "./puri-wrapper";
+import { type UnionExtractedTTables } from "./puri.types";
 import { UpsertBuilder } from "./upsert-builder";
 
 type UnknownDBRecord = Record<string, unknown>;
@@ -91,7 +97,7 @@ export class BaseModelClass<
     }
 
     let resultIds: number[] = [];
-    for (const items of chunk(unqKeys, chunkSize)) {
+    for (const items of cluster(unqKeys, chunkSize)) {
       const dbRows = await wdb(tableName)
         .select("id", wdb.raw(selectField))
         .whereIn(whereInField as string, items);
@@ -463,7 +469,7 @@ export class BaseModelClass<
         return qb.limit(num).offset(num * (page - 1));
       }
     })();
-    let unloadedRows = (await limitedQb) as any[];
+    let unloadedRows = await limitedQb;
 
     if (debug) {
       qb.debug();