@simplysm/orm-common 13.0.38 → 13.0.39

package/src/exec/queryable.ts

@@ -19,7 +19,7 @@ import {
   type DataToColumnBuilderRecord,
 } from "../schema/factory/column-builder";
 import type { ColumnPrimitive, ColumnPrimitiveStr } from "../types/column";
-import type { WhereExprUnit } from "../expr/expr-unit";
+import type { WhereExprUnit, ExprInput } from "../expr/expr-unit";
 import { ExprUnit } from "../expr/expr-unit";
 import type { Expr } from "../types/expr";
 import { ArgumentError, objClearUndefined } from "@simplysm/core-common";
@@ -128,7 +128,7 @@ class RecursiveQueryable<TBaseData extends DataRecord> {
           columns: transformColumnsAlias(this._baseQr.meta.columns, selfAlias, ""),
           isCustomColumns: false,
         }),
-    );
+    ) as any;
   }
 
   /**
@@ -247,16 +247,16 @@ export class Queryable<
    * }))
    * ```
    */
-  select<R extends DataRecord>(
-    fn: (columns: QueryableRecord<TData>) => QueryableRecord<R>,
-  ): Queryable<R, never> {
+  select<R extends Record<string, any>>(
+    fn: (columns: QueryableRecord<TData>) => R,
+  ): Queryable<UnwrapQueryableRecord<R>, never> {
     if (Array.isArray(this.meta.from)) {
       const newFroms = this.meta.from.map((from) => from.select(fn));
       return new Queryable({
         ...this.meta,
         from: newFroms,
-        columns: transformColumnsAlias<R>(newFroms[0].meta.columns, this.meta.as, ""),
-      });
+        columns: transformColumnsAlias(newFroms[0].meta.columns, this.meta.as, ""),
+      }) as any;
     }
 
     const newColumns = fn(this.meta.columns);
@@ -1175,7 +1175,10 @@ export class Queryable<
     return from;
   }
 
-  private _buildSelectDef(columns: QueryableRecord<any>, prefix: string): Record<string, Expr> {
+  private _buildSelectDef(
+    columns: QueryableRecord<any> | QueryableWriteRecord<any>,
+    prefix: string,
+  ): Record<string, Expr> {
     const result: Record<string, Expr> = {};
 
     for (const [key, val] of Object.entries(columns)) {
@@ -1187,8 +1190,11 @@ export class Queryable<
         if (val.length > 0) {
           Object.assign(result, this._buildSelectDef(val[0], fullKey));
         }
-      } else if (typeof val === "object") {
+      } else if (typeof val === "object" && val != null) {
         Object.assign(result, this._buildSelectDef(val, fullKey));
+      } else {
+        // Plain value (string, number, boolean, etc.) — convert to Expr
+        result[fullKey] = expr.toExpr(val);
       }
     }
 
@@ -1476,14 +1482,14 @@ export class Queryable<
    * ```
    */
   async update(
-    recordFwd: (cols: QueryableRecord<TData>) => QueryableRecord<TFrom["$inferUpdate"]>,
+    recordFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferUpdate"]>,
   ): Promise<void>;
   async update<K extends keyof TFrom["$columns"] & string>(
-    recordFwd: (cols: QueryableRecord<TData>) => QueryableRecord<TFrom["$inferUpdate"]>,
+    recordFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferUpdate"]>,
     outputColumns: K[],
   ): Promise<Pick<TFrom["$columns"], K>[]>;
   async update<K extends keyof TFrom["$columns"] & string>(
-    recordFwd: (cols: QueryableRecord<TData>) => QueryableRecord<TFrom["$inferUpdate"]>,
+    recordFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferUpdate"]>,
     outputColumns?: K[],
   ): Promise<Pick<TFrom["$columns"], K>[] | void> {
     const results = await this.meta.db.executeDefs<Pick<TFrom["$columns"], K>>(
@@ -1533,7 +1539,7 @@ export class Queryable<
   }
 
   getUpdateQueryDef(
-    recordFwd: (cols: QueryableRecord<TData>) => QueryableRecord<TFrom["$inferUpdate"]>,
+    recordFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferUpdate"]>,
     outputColumns?: (keyof TFrom["$inferColumns"] & string)[],
   ): UpdateQueryDef {
     const from = this.meta.from as TableBuilder<any, any> | ViewBuilder<any, any, any>;
@@ -1614,39 +1620,41 @@ export class Queryable<
    * ```
    */
   async upsert(
-    updateFwd: (cols: QueryableRecord<TData>) => QueryableRecord<TFrom["$inferUpdate"]>,
+    updateFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferUpdate"]>,
   ): Promise<void>;
   async upsert<K extends keyof TFrom["$inferColumns"] & string>(
-    insertFwd: (cols: QueryableRecord<TData>) => QueryableRecord<TFrom["$inferInsert"]>,
+    insertFwd: (cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferInsert"]>,
     outputColumns?: K[],
   ): Promise<Pick<TFrom["$inferColumns"], K>[]>;
-  async upsert<U extends QueryableRecord<TFrom["$inferUpdate"]>>(
+  async upsert<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>>(
     updateFwd: (cols: QueryableRecord<TData>) => U,
-    insertFwd: (updateRecord: U) => QueryableRecord<TFrom["$inferInsert"]>,
+    insertFwd: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>,
   ): Promise<void>;
   async upsert<
-    U extends QueryableRecord<TFrom["$inferUpdate"]>,
+    U extends QueryableWriteRecord<TFrom["$inferUpdate"]>,
     K extends keyof TFrom["$inferColumns"] & string,
   >(
     updateFwd: (cols: QueryableRecord<TData>) => U,
-    insertFwd: (updateRecord: U) => QueryableRecord<TFrom["$inferInsert"]>,
+    insertFwd: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>,
     outputColumns?: K[],
   ): Promise<Pick<TFrom["$inferColumns"], K>[]>;
   async upsert<
-    U extends QueryableRecord<TFrom["$inferUpdate"]>,
+    U extends QueryableWriteRecord<TFrom["$inferUpdate"]>,
     K extends keyof TFrom["$inferColumns"] & string,
   >(
     updateFwdOrInsertFwd:
       | ((cols: QueryableRecord<TData>) => U)
-      | ((cols: QueryableRecord<TData>) => QueryableRecord<TFrom["$inferInsert"]>),
-    insertFwdOrOutputColumns?: ((updateRecord: U) => QueryableRecord<TFrom["$inferInsert"]>) | K[],
+      | ((cols: QueryableRecord<TData>) => QueryableWriteRecord<TFrom["$inferInsert"]>),
+    insertFwdOrOutputColumns?:
+      | ((updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>)
+      | K[],
     outputColumns?: K[],
   ): Promise<Pick<TFrom["$inferColumns"], K>[] | void> {
     const updateRecordFwd = updateFwdOrInsertFwd as (cols: QueryableRecord<TData>) => U;
 
     const insertRecordFwd = (
       insertFwdOrOutputColumns instanceof Function ? insertFwdOrOutputColumns : updateFwdOrInsertFwd
-    ) as (updateRecord: U) => QueryableRecord<TFrom["$inferInsert"]>;
+    ) as (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>;
 
     const realOutputColumns =
       insertFwdOrOutputColumns instanceof Function ? outputColumns : insertFwdOrOutputColumns;
@@ -1661,9 +1669,9 @@ export class Queryable<
     }
   }
 
-  getUpsertQueryDef<U extends QueryableRecord<TFrom["$inferUpdate"]>>(
+  getUpsertQueryDef<U extends QueryableWriteRecord<TFrom["$inferUpdate"]>>(
     updateRecordFwd: (cols: QueryableRecord<TData>) => U,
-    insertRecordFwd: (updateRecord: U) => QueryableRecord<TFrom["$inferInsert"]>,
+    insertRecordFwd: (updateRecord: U) => QueryableWriteRecord<TFrom["$inferInsert"]>,
     outputColumns?: (keyof TFrom["$inferColumns"] & string)[],
   ): UpsertQueryDef {
     const from = this.meta.from as TableBuilder<any, any> | ViewBuilder<any, any, any>;
@@ -1849,11 +1857,9 @@ interface QueryableMetaJoin {
 }
 
 export type QueryableRecord<TData extends DataRecord> = {
-  // 1. Primitive 처리
   [K in keyof TData]: TData[K] extends ColumnPrimitive
     ? ExprUnit<TData[K]>
-    : // 2. 배열 처리 (옵셔널 포함)
-      TData[K] extends (infer U)[]
+    : TData[K] extends (infer U)[]
       ? U extends DataRecord
         ? QueryableRecord<U>[]
         : never
@@ -1861,20 +1867,22 @@ export type QueryableRecord<TData extends DataRecord> = {
         ? U extends DataRecord
           ? NullableQueryableRecord<U>[] | undefined
           : never
-        : // 3. 단일 객체 처리 (옵셔널 포함)
-          TData[K] extends DataRecord
+        : TData[K] extends DataRecord
           ? QueryableRecord<TData[K]>
           : TData[K] extends DataRecord | undefined
             ? NullableQueryableRecord<Exclude<TData[K], undefined>> | undefined
             : never;
 };
 
+export type QueryableWriteRecord<TData> = {
+  [K in keyof TData]: TData[K] extends ColumnPrimitive ? ExprInput<TData[K]> : never;
+};
+
 export type NullableQueryableRecord<TData extends DataRecord> = {
-  // 1. Primitive — always | undefined (LEFT JOIN NULL propagation)
+  // Primitive — always | undefined (LEFT JOIN NULL propagation)
   [K in keyof TData]: TData[K] extends ColumnPrimitive
     ? ExprUnit<TData[K] | undefined>
-    : // 2. Array (optional included)
-      TData[K] extends (infer U)[]
+    : TData[K] extends (infer U)[]
       ? U extends DataRecord
         ? NullableQueryableRecord<U>[]
         : never
@@ -1882,14 +1890,30 @@ export type NullableQueryableRecord<TData extends DataRecord> = {
         ? U extends DataRecord
           ? NullableQueryableRecord<U>[] | undefined
           : never
-        : // 3. Single object (optional included)
-          TData[K] extends DataRecord
+        : TData[K] extends DataRecord
           ? NullableQueryableRecord<TData[K]>
           : TData[K] extends DataRecord | undefined
             ? NullableQueryableRecord<Exclude<TData[K], undefined>> | undefined
             : never;
 };
 
+/**
+ * QueryableRecord에서 DataRecord로 역변환
+ *
+ * ExprUnit<T>를 T로, 중첩 객체/배열을 재귀적으로 풀어냄
+ */
+export type UnwrapQueryableRecord<R> = {
+  [K in keyof R]: R[K] extends ExprUnit<infer T>
+    ? T
+    : NonNullable<R[K]> extends (infer U)[]
+      ? U extends Record<string, any>
+        ? UnwrapQueryableRecord<U>[] | Extract<R[K], undefined>
+        : never
+      : NonNullable<R[K]> extends Record<string, any>
+        ? UnwrapQueryableRecord<NonNullable<R[K]>> | Extract<R[K], undefined>
+        : never;
+};
+
 //#region ========== PathProxy - include용 타입 안전 경로 빌더 ==========
 
 /**

package/src/utils/result-parser.ts

@@ -2,6 +2,8 @@ import { bytesFromHex, DateOnly, DateTime, objEqual, Time, Uuid } from "@simplys
 import type { ColumnPrimitiveStr } from "../types/column";
 import type { ResultMeta } from "../types/db";
 
+declare function setImmediate(callback: () => void): void;
+
 // ============================================
 // Type Parsers
 // ============================================
@@ -116,6 +118,12 @@ function isEmptyObject(obj: Record<string, unknown>): boolean {
 /** yield 간격: N개 처리마다 이벤트 루프 양보 */
 const YIELD_INTERVAL = 100;
 
+/** 이벤트 루프 양보: Node.js에서는 setImmediate, 브라우저에서는 setTimeout 폴백 */
+const yieldToEventLoop: () => Promise<void> =
+  typeof setImmediate !== "undefined"
+    ? () => new Promise<void>((resolve) => setImmediate(resolve))
+    : () => new Promise<void>((resolve) => setTimeout(resolve, 0));
+
 /**
  * DB 쿼리 결과를 ResultMeta를 통해 TypeScript 객체로 변환
  *
@@ -183,7 +191,7 @@ async function parseSimpleRecords<TRecord>(
   for (let i = 0; i < rawResults.length; i++) {
     // yield 처리
     if (i > 0 && i % YIELD_INTERVAL === 0) {
-      await new Promise<void>((resolve) => setTimeout(resolve, 0));
+      await yieldToEventLoop();
     }
 
     const parsed = flatToNested(rawResults[i], columns);
@@ -221,7 +229,7 @@ async function parseJoinedRecords<TRecord>(
   const nestedRecords: Record<string, unknown>[] = [];
   for (let i = 0; i < rawResults.length; i++) {
     if (i > 0 && i % YIELD_INTERVAL === 0) {
-      await new Promise<void>((resolve) => setTimeout(resolve, 0));
+      await yieldToEventLoop();
     }
     nestedRecords.push(flatToNested(rawResults[i], meta.columns));
   }