imodel 0.20.1 → 0.20.2

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.20.1
+ * imodel v0.20.2
  * (c) 2019-2026 猛火Fierflame
  * @license MIT
  */
@@ -272,6 +272,27 @@ interface Environment<T extends object> extends BaseEnvironment {
     readonly transaction: T | null;
 }
 
+declare const Destroy: unique symbol;
+interface Destroy {
+    [Destroy](connection: Connection, run: (data: any) => Promise<object | null>, table: TableDefine<Fields<MainFieldType>>): PromiseLike<this | null>;
+}
+declare const PseudoDestroy: unique symbol;
+interface PseudoDestroy {
+    [PseudoDestroy](connection: Connection, update: Record<string, SetValue>, run: (data: any) => Promise<object | null>, table: TableDefine<Fields<MainFieldType>>): PromiseLike<this | null>;
+}
+declare const Save: unique symbol;
+interface Save {
+    [Save](connection: Connection, run: (data: any, newData?: any) => Promise<object | null>, newData: Record<string, any> | null, table: TableDefine): PromiseLike<this | null>;
+}
+declare const Create: unique symbol;
+interface Create<T = unknown> {
+    [Create](connection: Connection, data: object, run: (data: any, that: any) => Promise<object>, table: TableDefine): PromiseLike<T>;
+}
+declare const Build: unique symbol;
+interface Build<T = unknown> {
+    [Build](data: object, others: object | boolean): T;
+}
+
 type TableType = '' | 'table' | 'view';
 interface FindArg {
     /** 排序配置，true 表示逆序 */
@@ -341,6 +362,15 @@ interface Savepoint {
     [Symbol.asyncDispose](): Promise<void>;
 }
 interface ConnectionInterface {
+    build<T extends Fields>(build: Build<T>, data: object, saved?: boolean): T;
+    build<T extends Fields>(table: TableDefine<T>, data: object, saved?: boolean): FieldValue<T>;
+    build(p: Build | TableDefine, data: object, saved?: boolean): any;
+    build<T extends Fields>(build: Build<T>, data: object, unsaved?: object): T;
+    build<T extends Fields>(table: TableDefine<T>, data: object, unsaved?: object): FieldValue<T>;
+    build(p: Build | TableDefine, data: object, unsaved?: object): any;
+    build<T extends Fields>(build: Build<T>, data: object, saved?: object | boolean): T;
+    build<T extends Fields>(table: TableDefine<T>, data: object, saved?: object | boolean): FieldValue<T>;
+    build(p: Build | TableDefine, data: object, saved?: object | boolean): any;
     dbType(): Promise<string>;
     dbVersion(): Promise<string>;
     query(...values: any[]): Promise<any[]>;
@@ -1655,27 +1685,6 @@ declare class Where {
     #private;
 }
 
-declare const Destroy: unique symbol;
-interface Destroy {
-    [Destroy](connection: Connection, run: (data: any) => Promise<object | null>, table: TableDefine<Fields<MainFieldType>>): PromiseLike<this | null>;
-}
-declare const PseudoDestroy: unique symbol;
-interface PseudoDestroy {
-    [PseudoDestroy](connection: Connection, update: Record<string, SetValue>, run: (data: any) => Promise<object | null>, table: TableDefine<Fields<MainFieldType>>): PromiseLike<this | null>;
-}
-declare const Save: unique symbol;
-interface Save {
-    [Save](connection: Connection, run: (data: any, newData?: any) => Promise<object | null>, newData: Record<string, any> | null, table: TableDefine): PromiseLike<this | null>;
-}
-declare const Create: unique symbol;
-interface Create<T = unknown> {
-    [Create](connection: Connection, data: object, run: (data: any, that: any) => Promise<object>, table: TableDefine): PromiseLike<T>;
-}
-declare const Build: unique symbol;
-interface Build<T = unknown> {
-    [Build](data: object, others: object | boolean): T;
-}
-
 declare class Connection<E extends object = object> {
     #private;
     constructor(connection: PromiseLike<IConnection<E>> | IConnection<E>, transaction?: E | null);
@@ -1840,10 +1849,11 @@ type QueryOptions<T extends Fields, TB extends unknown = any> = {
  */
 /**
  * @template {Fields} T
- * @template {object} [TB=object]
+ * @template {object | never} [TB=object]
  * @implements {Queryable<T>}
+ * @implements {Action<any[]>}
  */
-declare class Query<T extends Fields, TB extends unknown = any> extends Subquery implements Queryable {
+declare class Query<T extends Fields, TB extends unknown = any> extends Subquery implements Queryable, Action {
     /**
      * @template {Fields} F
      * @template {new (o: QueryOptions<F>) => Query<F>} T
@@ -2027,6 +2037,18 @@ declare class Query<T extends Fields, TB extends unknown = any> extends Subquery
      * @param {LockType?} [lock]
      */
     lock(lock?: LockType | null): this;
+    invoke(connect: any): Promise<any>;
+    /**
+     * @param {string[]} fields
+     * @param {Skip} [skip]
+     * @returns {Action<FieldValue<T>[]>}
+     */
+    search(fields: string[], skip?: Skip): Action<FieldValue<T>[]>;
+    /**
+     * @param {Skip} [skip]
+     * @returns {Action<(FieldValue<T> | TB)[]>}
+     */
+    find(skip?: Skip): Action<(FieldValue<T> | TB)[]>;
     /**
      *
      * @param {object} a
@@ -2068,88 +2090,100 @@ declare function mergeHooks(...hooks: (Readonly<Partial<Hooks>> | Readonly<Parti
  */
 declare function bindHooks(hooks: Readonly<Partial<Hooks>>, that: any): Readonly<Partial<Hooks>>;
 
-declare function export_default$i<T>(tableDef: TableDefine, data: T): Action<(T extends Destroy ? T : object) | null>;
+declare function export_default$j<T>(tableDef: TableDefine, data: T): Action<(T extends Destroy ? T : object) | null>;
 
-declare function export_default$h(queryable: Queryable): Action<number>;
+declare function export_default$i(queryable: Queryable): Action<number>;
 
-declare function export_default$g<T extends TableDefine>(model: T, list: object[], skip?: Skip): Action<TableValue<T>[]>;
-declare function export_default$g<T extends TableDefine>(model: T, value: object, skip?: Skip): Action<T extends Build<infer R> ? R : TableValue<T>>;
-declare function export_default$g<T extends TableDefine>(model: T, p: object | object[], skip?: Skip): Action<TableValue<T>[] | (T extends Build<infer R> ? R : TableValue<T>)>;
+declare function export_default$h<T extends TableDefine>(model: T, list: object[], skip?: Skip): Action<TableValue<T>[]>;
+declare function export_default$h<T extends TableDefine>(model: T, value: object, skip?: Skip): Action<T extends Build<infer R> ? R : TableValue<T>>;
+declare function export_default$h<T extends TableDefine>(model: T, p: object | object[], skip?: Skip): Action<TableValue<T>[] | (T extends Build<infer R> ? R : TableValue<T>)>;
 
-declare function export_default$f({ table, connect, fields }: TableDefine, where?: Wheres | null): Action<number>;
+declare function export_default$g({ table, connect, fields }: TableDefine, where?: Wheres | null): Action<number>;
 
-declare function export_default$e({ table, connect, fields }: TableDefine, returning?: string[] | null, where?: Wheres | null): Action<any[]>;
+declare function export_default$f({ table, connect, fields }: TableDefine, returning?: string[] | null, where?: Wheres | null): Action<any[]>;
 
-declare function export_default$d(queryable: Queryable, update?: Record<string, SetValue> | boolean): Action<number>;
+declare function export_default$e(queryable: Queryable, update?: Record<string, SetValue> | boolean): Action<number>;
 
-declare function export_default$c<T extends Destroy & PseudoDestroy>(tableDef: TableDefine, data: T, update?: Record<string, any> | boolean): Action<T | null>;
-declare function export_default$c<T extends Destroy & PseudoDestroy>(tableDef: TableDefine, data: any, update?: Record<string, any> | boolean): Action<T | object | null>;
-declare function export_default$c(tableDef: TableDefine, data: any, update?: Record<string, any> | boolean): Action<object | null>;
+declare function export_default$d<T extends Destroy & PseudoDestroy>(tableDef: TableDefine, data: T, update?: Record<string, any> | boolean): Action<T | null>;
+declare function export_default$d<T extends Destroy & PseudoDestroy>(tableDef: TableDefine, data: any, update?: Record<string, any> | boolean): Action<T | object | null>;
+declare function export_default$d(tableDef: TableDefine, data: any, update?: Record<string, any> | boolean): Action<object | null>;
 
-declare function export_default$b<T extends TableDefine>(sql: T, skip?: Skip): Action<T extends Build<infer R> ? R[] : T extends TableDefine<infer F> ? FieldValue<F>[] : never>;
+/** @deprecated */
+declare function export_default$c<T extends TableDefine>(sql: T, skip?: Skip): Action<T extends Build<infer R> ? R[] : T extends TableDefine<infer F> ? FieldValue<F>[] : never>;
 
-declare function export_default$a<T extends TableDefine>(sql: T, skip?: Skip): Action<T extends Build<infer R> ? R : T extends TableDefine<infer F> ? FieldValue<F> : never>;
+declare function export_default$b<T extends TableDefine>(sql: T, skip?: Skip): Action<T extends Build<infer R> ? R : T extends TableDefine<infer F> ? FieldValue<F> : never>;
 
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T[], ignoreConflict?: boolean): Action<T[]>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T, ignoreConflict?: boolean): Action<T>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T | T[], ignoreConflict?: boolean): Action<T | T[]>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T[], keys?: string[], ignoreConflict?: boolean): Action<T[]>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T, keys?: string[], ignoreConflict?: boolean): Action<T>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: string[], ignoreConflict?: boolean): Action<T | T[]>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T[], keys?: string[] | boolean, ignoreConflict?: boolean): Action<T[]>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T, keys?: string[] | boolean, ignoreConflict?: boolean): Action<T>;
-declare function export_default$9<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: string[] | boolean, ignoreConflict?: boolean): Action<T | T[]>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T[], ignoreConflict?: boolean): Action<T[]>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T, ignoreConflict?: boolean): Action<T>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T | T[], ignoreConflict?: boolean): Action<T | T[]>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T[], keys?: string[], ignoreConflict?: boolean): Action<T[]>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T, keys?: string[], ignoreConflict?: boolean): Action<T>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: string[], ignoreConflict?: boolean): Action<T | T[]>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T[], keys?: string[] | boolean, ignoreConflict?: boolean): Action<T[]>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T, keys?: string[] | boolean, ignoreConflict?: boolean): Action<T>;
+declare function export_default$a<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: string[] | boolean, ignoreConflict?: boolean): Action<T | T[]>;
 
-declare function export_default$8<T>(tableDef: TableDefine, data: T, value: Record<string, SetValue>): Action<(T extends PseudoDestroy ? T : object) | null>;
+declare function export_default$9<T>(tableDef: TableDefine, data: T, value: Record<string, SetValue>): Action<(T extends PseudoDestroy ? T : object) | null>;
 
-declare function export_default$7<T>(model: TableDefine, data: T, newData?: Record<string, any> | null, skip?: Skip): Action<(T extends Save ? T : object) | null>;
+declare function export_default$8<T>(model: TableDefine, data: T, newData?: Record<string, any> | null, skip?: Skip): Action<(T extends Save ? T : object) | null>;
 
-declare function export_default$6<T extends TableDefine>(sql: T, fields: string[], skip?: Skip): Action<T extends TableDefine<infer F> ? FieldValue<F>[] : never>;
+/** @deprecated */
+declare function export_default$7<T extends TableDefine>(sql: T, fields: string[], skip?: Skip): Action<T extends TableDefine<infer F> ? FieldValue<F>[] : never>;
 
-declare function export_default$5(queryable: Queryable): Action<any[]>;
+/** @deprecated */
+declare function export_default$6(queryable: Queryable): Action<any[]>;
 
-declare function export_default$4({ table, connect, fields }: TableDefine, pKeys: string[], setKeys: string[], list: Record<string, any>[], skip?: Skip | boolean): Action<number>;
+declare function export_default$5({ table, connect, fields }: TableDefine, pKeys: string[], setKeys: string[], list: Record<string, any>[], skip?: Skip | boolean): Action<number>;
 
-declare function export_default$3({ table, connect, fields }: TableDefine, pKeys: string[], setKeys: string[], list: Record<string, any>[], returning?: string[] | null, skip?: Skip | boolean): Action<any[]>;
+declare function export_default$4({ table, connect, fields }: TableDefine, pKeys: string[], setKeys: string[], list: Record<string, any>[], returning?: string[] | null, skip?: Skip | boolean): Action<any[]>;
 
-declare function export_default$2({ table, connect, fields }: TableDefine, update: Record<string, any>, where?: Wheres | null, skip?: Skip | boolean): Action<number>;
+declare function export_default$3({ table, connect, fields }: TableDefine, update: Record<string, any>, where?: Wheres | null, skip?: Skip | boolean): Action<number>;
 
-declare function export_default$1<T extends Fields<MainFieldType>>({ table, connect, fields }: TableDefine<T>, update: Record<string, any>, returning?: string[] | null, where?: Wheres | null, skip?: Skip | boolean): Action<any[]>;
+declare function export_default$2<T extends Fields<MainFieldType>>({ table, connect, fields }: TableDefine<T>, update: Record<string, any>, returning?: string[] | null, where?: Wheres | null, skip?: Skip | boolean): Action<any[]>;
 
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T[], conflictSet?: Record<string, SetValue>): Action<T[]>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T, conflictSet?: Record<string, SetValue>): Action<T>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T | T[], conflictSet?: Record<string, SetValue>): Action<T | T[]>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T[], keys?: null | string[], conflictSet?: Record<string, SetValue>): Action<T[]>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T, keys?: null | string[], conflictSet?: Record<string, SetValue>): Action<T>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: null | string[], conflictSet?: Record<string, SetValue>): Action<T | T[]>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T[], keys?: null | string[], conflictKeys?: string[] | boolean, conflictSet?: Record<string, SetValue>): Action<T[]>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T, keys?: null | string[], conflictKeys?: string[] | boolean, conflictSet?: Record<string, SetValue>): Action<T>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: null | string[], conflictKeys?: string[] | boolean, conflictSet?: Record<string, SetValue>): Action<T | T[]>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T[], keys?: null | string[] | boolean | Record<string, SetValue>, conflictKeys?: string[] | boolean | Record<string, SetValue>, conflictSet?: Record<string, SetValue>): Action<T[]>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T, keys?: null | string[] | boolean | Record<string, SetValue>, conflictKeys?: string[] | boolean | Record<string, SetValue>, conflictSet?: Record<string, SetValue>): Action<T>;
-declare function export_default<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: null | string[] | boolean | Record<string, SetValue>, conflictKeys?: string[] | boolean | Record<string, SetValue>, conflictSet?: Record<string, SetValue>): Action<T | T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T[], conflictSet?: Record<string, SetValue>): Action<T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T, conflictSet?: Record<string, SetValue>): Action<T>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T | T[], conflictSet?: Record<string, SetValue>): Action<T | T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T[], keys?: null | string[], conflictSet?: Record<string, SetValue>): Action<T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T, keys?: null | string[], conflictSet?: Record<string, SetValue>): Action<T>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: null | string[], conflictSet?: Record<string, SetValue>): Action<T | T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T[], keys?: null | string[], conflictKeys?: string[] | boolean, conflictSet?: Record<string, SetValue>): Action<T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T, keys?: null | string[], conflictKeys?: string[] | boolean, conflictSet?: Record<string, SetValue>): Action<T>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: null | string[], conflictKeys?: string[] | boolean, conflictSet?: Record<string, SetValue>): Action<T | T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T[], keys?: null | string[] | boolean | Record<string, SetValue>, conflictKeys?: string[] | boolean | Record<string, SetValue>, conflictSet?: Record<string, SetValue>): Action<T[]>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T, keys?: null | string[] | boolean | Record<string, SetValue>, conflictKeys?: string[] | boolean | Record<string, SetValue>, conflictSet?: Record<string, SetValue>): Action<T>;
+declare function export_default$1<T extends object>(tableDefine: TableDefine, data: T | T[], keys?: null | string[] | boolean | Record<string, SetValue>, conflictKeys?: string[] | boolean | Record<string, SetValue>, conflictSet?: Record<string, SetValue>): Action<T | T[]>;
+
+/** @import Connection from './index.mts' */
+/** @import { TableDefine, Skip, SelectItem, ConnectionInterface } from '../types' */
+declare function export_default<T extends TableDefine>(model: T, primary: any, options?: {
+    skipWhere?: boolean;
+    lock?: 'S' | 'X' | null;
+    range?: FindRange;
+}): Action<(T extends Build<infer R> ? R : T extends TableDefine<infer F> ? FieldValue<F> : never) | null>;
 
 declare namespace index_d {
   export {
-    export_default$i as completelyDestroy,
-    export_default$h as count,
-    export_default$g as create,
-    export_default$f as delete,
-    export_default$e as deleteReturn,
-    export_default$c as destroy,
-    export_default$d as destroyMany,
-    export_default$b as find,
-    export_default$a as first,
-    export_default$9 as insert,
-    export_default$8 as pseudoDestroy,
-    export_default$7 as save,
-    export_default$6 as search,
-    export_default$5 as select,
-    export_default$2 as update,
-    export_default$4 as updateList,
-    export_default$3 as updateListReturn,
-    export_default$1 as updateReturn,
-    export_default as upsert,
+    export_default$j as completelyDestroy,
+    export_default$i as count,
+    export_default$h as create,
+    export_default$g as delete,
+    export_default$f as deleteReturn,
+    export_default$d as destroy,
+    export_default$e as destroyMany,
+    export_default$c as find,
+    export_default$b as first,
+    export_default as get,
+    export_default$a as insert,
+    export_default$9 as pseudoDestroy,
+    export_default$8 as save,
+    export_default$7 as search,
+    export_default$6 as select,
+    export_default$3 as update,
+    export_default$5 as updateList,
+    export_default$4 as updateListReturn,
+    export_default$2 as updateReturn,
+    export_default$1 as upsert,
   };
 }
 
@@ -2567,5 +2601,5 @@ declare function toBool(v: any): boolean;
 declare function setDevelopment(d?: boolean): void;
 declare let isDevelopment: boolean;
 
-export { Build, CheckViolationError, Connection, ConnectionError, Create, Destroy, ForeignKeyViolationError, InvalidInputSyntaxError, Model, NotNullViolationError, OperatorMismatchError, PseudoDestroy, Query, Save, Scene, Select, SetValue, Submodel, UniqueViolationError, Where, index_d as actions, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, export_default$i as completelyDestroy, export_default$h as count, export_default$g as create, creating, decrement, defaultValue, field as define, export_default$f as delete, export_default$e as deleteReturn, deleted, deleting, export_default$c as destroy, export_default$d as destroyMany, divide, field$1 as field, export_default$b as find, export_default$a as first, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, export_default$9 as insert, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, export_default$8 as pseudoDestroy, export_default$7 as save, export_default$6 as search, export_default$5 as select, setDevelopment, sort, model as submodel, toBool, toNot, toPrimaries, toPrimary, uncreatable, undeleted, export_default$2 as update, export_default$4 as updateList, export_default$3 as updateListReturn, export_default$1 as updateReturn, updating, export_default as upsert, uuid, values, where, withDeleted };
-export type { Action, BaseEnvironment, ClassDecorator, Column, ColumnOptions, ConnectionInterface, Constraint, DBColumn, DBIndex, DBTable, Environment, FieldDecorator, FieldDefine, FieldDefineOption, FieldDefineType, FieldSpecific, FieldSpecificValue, FieldType, FieldTypeDefine, FieldValue, Fields, FindArg, FindRange, GetName, Hook, Hooks, IConnection, IDBTable, Index, IndexInfo, IndexOptions, JOIN, Join, JoinType, LockType, MainFieldType, MaybePromise, MethodDecorator, Options, QueryOptions, Queryable, Savepoint, SelectItem, Skip, Support, TableConnect, TableConnection, TableDefine, TableType, TableValue, ToFieldType, ToType, TransactionFn, TransactionHandler, TransactionHandlerArray, WhereExists, WhereItem, WhereLike, WhereOr, WhereRaw, WhereValue, Wheres };
+export { index_d as Action, Build, CheckViolationError, Connection, ConnectionError, Create, Destroy, ForeignKeyViolationError, InvalidInputSyntaxError, Model, NotNullViolationError, OperatorMismatchError, PseudoDestroy, Query, Save, Scene, Select, SetValue, Submodel, Subquery, UniqueViolationError, Where, index_d as actions, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, export_default$j as completelyDestroy, export_default$i as count, export_default$h as create, creating, decrement, defaultValue, field as define, export_default$g as delete, export_default$f as deleteReturn, deleted, deleting, export_default$d as destroy, export_default$e as destroyMany, divide, field$1 as field, export_default$c as find, export_default$b as first, export_default as get, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, export_default$a as insert, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, export_default$9 as pseudoDestroy, export_default$8 as save, export_default$7 as search, export_default$6 as select, setDevelopment, sort, model as submodel, toBool, toNot, toPrimaries, toPrimary, uncreatable, undeleted, export_default$3 as update, export_default$5 as updateList, export_default$4 as updateListReturn, export_default$2 as updateReturn, updating, export_default$1 as upsert, uuid, values, where, withDeleted };
+export type { BaseEnvironment, ClassDecorator, Column, ColumnOptions, ConnectionInterface, Constraint, DBColumn, DBIndex, DBTable, Environment, FieldDecorator, FieldDefine, FieldDefineOption, FieldDefineType, FieldSpecific, FieldSpecificValue, FieldType, FieldTypeDefine, FieldValue, Fields, FindArg, FindRange, GetName, Hook, Hooks, IConnection, IDBTable, Index, IndexInfo, IndexOptions, JOIN, Join, JoinType, LockType, MainFieldType, MaybePromise, MethodDecorator, Options, QueryOptions, Queryable, Savepoint, SelectItem, Skip, Support, TableConnect, TableConnection, TableDefine, TableType, TableValue, ToFieldType, ToType, TransactionFn, TransactionHandler, TransactionHandlerArray, WhereExists, WhereItem, WhereLike, WhereOr, WhereRaw, WhereValue, Wheres };

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.20.1
+ * imodel v0.20.2
  * (c) 2019-2026 猛火Fierflame
  * @license MIT
  */
@@ -244,12 +244,6 @@ function setDefaultOptions(v) {
   return v;
 }
 
-const Destroy = Symbol();
-const PseudoDestroy = Symbol();
-const Save = Symbol();
-const Create = Symbol();
-const Build = Symbol();
-
 /** @import { TableDefine, FieldDefine } from '../types/table' */
 /** @import { DBIndex, DBTable } from '../types/connection' */
 /**
@@ -380,6 +374,12 @@ function table2db(tables) {
   return allTables;
 }
 
+const Destroy = Symbol();
+const PseudoDestroy = Symbol();
+const Save = Symbol();
+const Create = Symbol();
+const Build = Symbol();
+
 function signal2promise(signal) {
   return new Promise((_, r) => {
     if (signal.aborted) {
@@ -428,7 +428,26 @@ function createInterface (connPromise, baseTransaction) {
       // TODO: 检测层数
     }
   }
+  function build(p, data, saved) {
+    if (typeof p[Build] === 'function') {
+      return p[Build](data, saved || false, {
+        isDevelopment,
+        values,
+        errors
+      });
+    }
+    if (typeof saved === 'boolean') {
+      return {
+        ...data
+      };
+    }
+    return {
+      ...data,
+      ...saved
+    };
+  }
   const ci = {
+    build,
     async dbType() {
       const conn = await connPromise;
       return conn.dbType;
@@ -1019,41 +1038,43 @@ const withDeleted = Symbol();
 /** @typedef {typeof withDeleted} withDeleted  */
 /** @typedef {deleted | undeleted | withDeleted} FindRange */
 
-/** @import { Options, Queryable } from '../types' */
-/**
- *
- * @param {Partial<Queryable>} queryable
- * @returns {Options}
- */
-function getOptions({
+function getPseudoWhere({
   fields,
-  pseudo,
-  options: modelOptions
-}) {
-  const options = {
-    where: [],
-    ...modelOptions
-  };
+  pseudo
+}, range) {
   if (!pseudo || !fields) {
-    return options;
+    return null;
   }
   if (!(pseudo in fields)) {
-    return options;
+    return null;
   }
-  if (options.range === undeleted) {
-    options.where = [...options.where, {
+  if (range === undeleted) {
+    return {
       field: pseudo,
       operator: '<>',
       value: 0
-    }];
-  } else if (options.range !== withDeleted) {
-    options.where = [...options.where, {
+    };
+  } else if (range !== withDeleted) {
+    return {
       field: pseudo,
       operator: '=',
       value: 0
-    }];
+    };
+  }
+  return null;
+}
+function getOptions(queryable) {
+  const pseudoWhere = getPseudoWhere(queryable, queryable.options?.range);
+  if (!pseudoWhere) {
+    return {
+      where: [],
+      ...queryable.options
+    };
   }
-  return options;
+  return {
+    ...queryable.options,
+    where: [...(queryable.options?.where || []), pseudoWhere]
+  };
 }
 
 function count (queryable) {
@@ -2692,23 +2713,20 @@ async function search$1(conn, that, p, returnFields, skip) {
 
 /* eslint-disable max-len */
 
+/** @deprecated */
 function find (sql, skip) {
   return {
     connect: sql.connect,
-    async invoke(connect, connection, env) {
+    async invoke(connect, connection) {
       const conn = await connect();
       const result = await search$1(conn, connection, sql, true, skip);
-      if (typeof sql[Build] !== 'function') {
-        return result;
-      }
-      const R = sql[Build].bind(sql);
-      return result.map(it => R(it, true, env));
+      return result.map(it => conn.build(sql, it, true));
     }
   };
 }
 
 /** @import Connection from './index.mts' */
-/** @import { Environment, TableDefine, Skip, SelectItem, ConnectionInterface, BaseEnvironment } from '../types' */
+/** @import { TableDefine, Skip, SelectItem, ConnectionInterface } from '../types' */
 
 /**
  *
@@ -2716,11 +2734,10 @@ function find (sql, skip) {
  * @param {ConnectionInterface} conn
  * @param {Connection} that
  * @param {T} p
- * @param {BaseEnvironment} env
  * @param {Skip} [skip]
  * @returns {Promise<any>}
  */
-async function first$1(conn, that, p, env, skip) {
+async function first$1(conn, that, p, skip) {
   const {
     table,
     fields
@@ -2755,18 +2772,15 @@ async function first$1(conn, that, p, env, skip) {
   if (!item) {
     return null;
   }
-  if (typeof p[Build] !== 'function') {
-    return item;
-  }
-  return p[Build](item, true, env);
+  return conn.build(p, item);
 }
 
 function first (sql, skip) {
   return {
     connect: sql.connect,
-    async invoke(connect, connection, env) {
+    async invoke(connect, connection) {
       const conn = await connect();
-      return first$1(conn, connection, sql, env, skip);
+      return first$1(conn, connection, sql, skip);
     }
   };
 }
@@ -3363,6 +3377,7 @@ function save (model, data, newData, skip) {
   };
 }
 
+/** @deprecated */
 function search (sql, fields, skip) {
   return {
     connect: sql.connect,
@@ -3416,6 +3431,7 @@ function toSelect(queryable, lockable) {
   };
 }
 
+/** @deprecated */
 function select (queryable) {
   return {
     connect: queryable.connect,
@@ -3575,6 +3591,91 @@ function upsert ({
   };
 }
 
+const falseValues = new Set(['', '0', 'n', 'f', 'no', 'off', 'false', '否', '不', '假', '不是', '不行', '不可以']);
+
+/**
+ *
+ * @param {any} v
+ * @returns
+ */
+function toBool(v) {
+  if (typeof v !== 'string') {
+    return Boolean(v);
+  }
+  return !falseValues.has(v.toLowerCase());
+}
+
+/** @import Connection from './index.mts' */
+/** @import { TableDefine, Skip, SelectItem, ConnectionInterface } from '../types' */
+
+function get (model, primary, options) {
+  return {
+    connect: model.connect,
+    async invoke(connect, connection) {
+      const primaryFields = Object.entries(model.fields).filter(([, v]) => v.primary).sort(([, a], [, b]) => Number(a.primary) - Number(b.primary));
+      if (!primaryFields.length) {
+        throw new Error('no primary key');
+      }
+      const wheres = new Where();
+      if (primaryFields.length === 1) {
+        const [[field]] = primaryFields;
+        wheres.and(field, primary);
+      } else if (typeof primary === 'object') {
+        for (const [p] of primaryFields) {
+          wheres.and(p, primary[p]);
+        }
+      } else {
+        const values = `${primary}`.split('$');
+        if (values.length !== primaryFields.length) ;
+        for (const [i, [p, {
+          type
+        }]] of primaryFields.entries()) {
+          const value = values[i] ?? null;
+          const val = type !== 'bool' || value === null ? value : toBool(value);
+          wheres.and(p, val);
+        }
+      }
+      const whereValues = Where.parseParams([wheres]) || [];
+      const pseudoWhere = getPseudoWhere(model, options?.range);
+      if (pseudoWhere) {
+        whereValues.push(pseudoWhere);
+      }
+      const {
+        table,
+        fields
+      } = model;
+      const lock = options?.lock;
+      const [columns, fieldColumns, tableFields] = toColumns(fields);
+      const where = where2column(whereValues, fieldColumns);
+      where.push(...getFixedValueWhere(columns));
+      const whereHook = !options?.skipWhere && (await model.hooks?.where?.(connection, model));
+      if (whereHook) {
+        where.push(...where2column(Where.parse(whereHook), fieldColumns));
+      }
+      /** @type {SelectItem} */
+      const selects = {
+        table: typeof table === 'string' ? table : '',
+        columns,
+        where,
+        limit: 1,
+        sort: [],
+        select: select2column(columns, fieldColumns),
+        group: [],
+        having: [],
+        lock: options?.lock
+      };
+      const conn = await connect();
+      const list = await conn.select(selects);
+      const baseFieldSet = new Set(Object.keys(fieldColumns || columns));
+      const [item] = await findSub(conn, list, tableFields, baseFieldSet, lock);
+      if (!item) {
+        return null;
+      }
+      return conn.build(model, item);
+    }
+  };
+}
+
 var index$1 = /*#__PURE__*/Object.freeze({
 	__proto__: null,
 	completelyDestroy: completelyDestroy,
@@ -3586,6 +3687,7 @@ var index$1 = /*#__PURE__*/Object.freeze({
 	destroyMany: destroyMany,
 	find: find,
 	first: first,
+	get: get,
 	insert: insert,
 	pseudoDestroy: pseudoDestroy,
 	save: save,
@@ -3646,18 +3748,7 @@ class Connection {
     return this.#interface.type(table);
   }
   build(p, data, saved) {
-    if (typeof p[Build] === 'function') {
-      return p[Build](data, saved || false, this.#env);
-    }
-    if (typeof saved === 'boolean') {
-      return {
-        ...data
-      };
-    }
-    return {
-      ...data,
-      ...saved
-    };
+    return this.#interface.build(p, data, saved);
   }
   /** @deprecated */
 
@@ -5193,21 +5284,7 @@ function coefficient(...value) {
   };
 }
 
-const falseValues = new Set(['', '0', 'n', 'f', 'no', 'off', 'false', '否', '不', '假', '不是', '不行', '不可以']);
-
-/**
- *
- * @param {any} v
- * @returns
- */
-function toBool(v) {
-  if (typeof v !== 'string') {
-    return Boolean(v);
-  }
-  return !falseValues.has(v.toLowerCase());
-}
-
-/** @import { Action, FieldDefine, Fields, LockType, Options, Queryable, Select, Skip, TableConnect } from './types' */
+/** @import { Action, FieldDefine, Fields, FieldValue, LockType, Options, Queryable, Select, Skip, TableConnect } from './types' */
 /** @import { WhereValue, Wheres } from './Where.mjs' */
 /**
  *
@@ -5272,8 +5349,9 @@ function selectFn(fn, select, newSelect) {
  */
 /**
  * @template {Fields} T
- * @template {object} [TB=object]
+ * @template {object | never} [TB=object]
  * @implements {Queryable<T>}
+ * @implements {Action<any[]>}
  */
 class Query extends Subquery {
   /**
@@ -5751,6 +5829,41 @@ class Query extends Subquery {
     this.#options.lock = type === 'S' || type === 'X' ? type : null;
     return this;
   }
+  async invoke(connect) {
+    const selects = toSelect(this, true);
+    const conn = await connect();
+    return conn.select(selects);
+  }
+  /**
+   * @param {string[]} fields
+   * @param {Skip} [skip]
+   * @returns {Action<FieldValue<T>[]>}
+   */
+  search(fields, skip) {
+    return {
+      connect: this.connect,
+      invoke: async (connect, connection) => {
+        const returnFields = Array.isArray(fields) ? fields : [];
+        const conn = await connect();
+        const result = search$1(conn, connection, this, returnFields, skip);
+        return /** @type {any} */result;
+      }
+    };
+  }
+  /**
+   * @param {Skip} [skip]
+   * @returns {Action<(FieldValue<T> | TB)[]>}
+   */
+  find(skip) {
+    return {
+      connect: this.connect,
+      invoke: async (connect, connection) => {
+        const conn = await connect();
+        const result = await search$1(conn, connection, this, true, skip);
+        return result.map(it => conn.build(this, it, true));
+      }
+    };
+  }
 }
 
 /** @import { Fields, IndexInfo, FieldDefine } from './types' */
@@ -7107,4 +7220,4 @@ function field(type, {
   };
 }
 
-export { Build, CheckViolationError, Connection, ConnectionError, Create, Destroy, ForeignKeyViolationError, InvalidInputSyntaxError, Model, NotNullViolationError, OperatorMismatchError, PseudoDestroy, Query, Save, Scene, Submodel, UniqueViolationError, Where, index$1 as actions, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, completelyDestroy, count, create, creating, decrement, defaultValue, field as define, _delete as delete, deleteReturn, deleted, deleting, destroy, destroyMany, divide, field$1 as field, find, first, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, insert, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, pseudoDestroy, save, search, select, setDevelopment, sort, model as submodel, toBool, toNot, toPrimaries, toPrimary, uncreatable, undeleted, update, updateList, updateListReturn, updateReturn, updating, upsert, uuid, values, where, withDeleted };
+export { index$1 as Action, Build, CheckViolationError, Connection, ConnectionError, Create, Destroy, ForeignKeyViolationError, InvalidInputSyntaxError, Model, NotNullViolationError, OperatorMismatchError, PseudoDestroy, Query, Save, Scene, Submodel, Subquery, UniqueViolationError, Where, index$1 as actions, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, completelyDestroy, count, create, creating, decrement, defaultValue, field as define, _delete as delete, deleteReturn, deleted, deleting, destroy, destroyMany, divide, field$1 as field, find, first, get, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, insert, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, pseudoDestroy, save, search, select, setDevelopment, sort, model as submodel, toBool, toNot, toPrimaries, toPrimary, uncreatable, undeleted, update, updateList, updateListReturn, updateReturn, updating, upsert, uuid, values, where, withDeleted };

package/migrate.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.20.1
+ * imodel v0.20.2
  * (c) 2019-2026 猛火Fierflame
  * @license MIT
  */

package/migrate.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.20.1
+ * imodel v0.20.2
  * (c) 2019-2026 猛火Fierflame
  * @license MIT
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imodel",
-  "version": "0.20.1",
+  "version": "0.20.2",
   "main": "index.mjs",
   "type": "module",
   "author": "猛火Fierflame",