imodel 0.17.2 → 0.19.0

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.2
+ * imodel v0.19.0
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -469,19 +469,19 @@ declare function deleting(size?: number): FieldDecorator<Date | null>;
 
 /**
  * @overload
- * @param {Hooks} hook
+ * @param {Partial<Hooks>} hook
  * @param  {boolean} [approach] 插入位置是否为更靠近执行的位置
  * @returns {ClassDecorator}
  */
-declare function hooks(hook: Hooks, approach?: boolean | undefined): ClassDecorator;
+declare function hooks(hook: Partial<Hooks>, approach?: boolean | undefined): ClassDecorator;
 /**
  * @overload
  * @param {Function} Model
- * @param {Hooks} hook
+ * @param {Partial<Hooks>} hook
  * @param  {boolean} [approach] 插入位置是否为更靠近执行的位置
  * @returns {void}
  */
-declare function hooks(Model: Function, hook: Hooks, approach?: boolean | undefined): void;
+declare function hooks(Model: Function, hook: Partial<Hooks>, approach?: boolean | undefined): void;
 /** @type {Hook<Hooks['where']>} */
 declare const where: Hook<Hooks["where"]>;
 /** @type {Hook<Hooks['beforeCreateMany']>} */
@@ -2118,10 +2118,10 @@ declare class Query<T extends Fields, TB extends unknown = any> extends Subquery
      */
     contains(text?: string): this;
     /**
-     * @param {any} [primary]
+     * @param {...any | any[]} primaries
      * @returns {this}
      */
-    primary(primary?: any, ...args: any[]): this;
+    primary(...primaries: (any | any[])[]): this;
     /**
      *
      * @param  {...string | string[]} groups
@@ -2180,6 +2180,15 @@ declare function bindHooks(hooks: Readonly<Partial<Hooks>>, that: any): Readonly
  */
 /** @import {FieldDefine, Fields, TableDefine,} from './types/table' */
 declare class Scene {
+    /**
+     * @template {TableDefine<Fields, string>} T
+     * @param {{scene?: Scene} | Scene} source
+     * @param {T} table
+     * @returns {T}
+     */
+    static table<T extends TableDefine<Fields, string>>(source: {
+        scene?: Scene;
+    } | Scene, table: T): T;
     /**
      *
      * @param {Map<string, Scene.Define>} map
@@ -2564,6 +2573,13 @@ declare function field<T extends MainFieldType>(type: T, options: {
     default?: ToType<T, boolean, boolean> | symbol;
 } & FieldDefineOption): FieldDefine<T, boolean, boolean>;
 
+/**
+ *
+ * @param {any} v
+ * @returns
+ */
+declare function toBool(v: any): boolean;
+
 /**
  *
  * @param {boolean} [d]
@@ -2571,4 +2587,4 @@ declare function field<T extends MainFieldType>(type: T, options: {
 declare function setDevelopment(d?: boolean): void;
 declare let isDevelopment: boolean;
 
-export { Build, type ClassDecorator, type Column, type ColumnOptions, Connection, type Constraint, Create, type DBColumn, type DBIndex, type DBTable, Destroy, type Environment, type FieldDecorator, type FieldDefine, type FieldDefineOption, type FieldDefineType, type FieldSpecific, type FieldSpecificValue, type FieldType, type FieldTypeDefine, type FieldValue, type Fields, type FindArg, type FindRange, type GetName, type Hook, type Hooks, type IConnection, type Index, type IndexInfo, type IndexOptions, type JOIN, type Join, type JoinType, type MainFieldType, type MaybePromise, type MethodDecorator, Model, type Options, PseudoDestroy, Query, type QueryOptions, type Queryable, Save, Scene, Select, type SelectItem, SetValue, type Skip, Submodel, type Support, type TableConnect, type TableConnection, type TableDefine, type TableType, type TableValue, type ToFieldType, type ToType, type TransactionFn, type VirtualTable, Where, type WhereItem, type WhereLike, type WhereOr, type WhereRaw, type WhereValue, type Wheres, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, creating, decrement, defaultValue, field as define, deleted, deleting, divide, field$1 as field, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, setDevelopment, sort, model as submodel, toNot, toPrimaries, toPrimary, uncreatable, undeleted, updating, uuid, values, where, withDeleted };
+export { Build, type ClassDecorator, type Column, type ColumnOptions, Connection, type Constraint, Create, type DBColumn, type DBIndex, type DBTable, Destroy, type Environment, type FieldDecorator, type FieldDefine, type FieldDefineOption, type FieldDefineType, type FieldSpecific, type FieldSpecificValue, type FieldType, type FieldTypeDefine, type FieldValue, type Fields, type FindArg, type FindRange, type GetName, type Hook, type Hooks, type IConnection, type Index, type IndexInfo, type IndexOptions, type JOIN, type Join, type JoinType, type MainFieldType, type MaybePromise, type MethodDecorator, Model, type Options, PseudoDestroy, Query, type QueryOptions, type Queryable, Save, Scene, Select, type SelectItem, SetValue, type Skip, Submodel, type Support, type TableConnect, type TableConnection, type TableDefine, type TableType, type TableValue, type ToFieldType, type ToType, type TransactionFn, type VirtualTable, Where, type WhereItem, type WhereLike, type WhereOr, type WhereRaw, type WhereValue, type Wheres, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, creating, decrement, defaultValue, field as define, deleted, deleting, divide, field$1 as field, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, setDevelopment, sort, model as submodel, toBool, toNot, toPrimaries, toPrimary, uncreatable, undeleted, updating, uuid, values, where, withDeleted };

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.2
+ * imodel v0.19.0
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -3963,14 +3963,14 @@ function buildHooks(Model) {
 const isBeforeList = [['where', true], ['beforeCreateMany', true], ['afterCreateMany', false], ['beforeCreate', true], ['afterCreate', false], ['beforeUpdate', true], ['afterUpdate', false], ['beforeDelete', true], ['afterDelete', false]];
 /**
  * @overload
- * @param {Hooks} hook
+ * @param {Partial<Hooks>} hook
  * @param  {boolean} [approach] 插入位置是否为更靠近执行的位置
  * @returns {ClassDecorator}
  */
 /**
  * @overload
  * @param {Function} Model
- * @param {Hooks} hook
+ * @param {Partial<Hooks>} hook
  * @param  {boolean} [approach] 插入位置是否为更靠近执行的位置
  * @returns {void}
  */
@@ -4855,7 +4855,20 @@ function coefficient(...value) {
   };
 }
 
-/** @import { Fields, Options, Queryable, Select, TableConnect, VirtualTable } from './types' */
+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 { FieldDefine, Fields, Options, Queryable, Select, TableConnect, VirtualTable } from './types' */
 /** @import { WhereValue, Wheres } from './Where.mjs' */
 /**
  *
@@ -4953,7 +4966,7 @@ class Query extends Subquery {
   #options = {
     where: []
   };
-  /** @type {string[]} 主键字段 */
+  /** @type {[string, FieldDefine][]} 主键字段 */
   #primaryFields = [];
   get options() {
     return this.#options;
@@ -4977,7 +4990,6 @@ class Query extends Subquery {
         ...options.#options
       };
       this.#primaryFields = options.#primaryFields;
-      this.#primary = options.#primary;
     } else {
       const {
         connect,
@@ -4991,7 +5003,7 @@ class Query extends Subquery {
       this.fields = fields;
       this.pseudo = typeof pseudo === 'string' ? pseudo : '';
       this.#build = typeof build === 'function' ? build : null;
-      this.#primaryFields = Object.entries(fields).filter(([, v]) => v.primary).sort(([, a], [, b]) => Number(a.primary) - Number(b.primary)).map(([v]) => v);
+      this.#primaryFields = Object.entries(fields).filter(([, v]) => v.primary).sort(([, a], [, b]) => Number(a.primary) - Number(b.primary));
       if (noBuild) {
         this.#build = null;
       } else if (typeof options[Build] === 'function') {
@@ -5326,17 +5338,13 @@ class Query extends Subquery {
     this.#options.where = [...this.#options.where, ...matches];
     return this;
   }
-  /** @type {string | number | bigint | object | undefined} */
-  #primary;
   /**
-   * @param {any} [primary]
+   * @param {...any | any[]} primaries
    * @returns {this}
    */
-  primary(primary) {
-    if (this.#primary) {
-      return this;
-    }
-    if (!primary) {
+  primary(...primaries) {
+    const primary = primaries?.flat();
+    if (!primary.length) {
       return this;
     }
     const primaryFields = this.#primaryFields;
@@ -5344,27 +5352,26 @@ class Query extends Subquery {
       return this;
     }
     if (primaryFields.length === 1) {
-      const [field] = primaryFields;
-      const m = this.where(field, '=', primary);
-      m.#primary = primary;
-      return m;
+      const [[field]] = primaryFields;
+      return this.where(field, 'in', primary);
     }
-    if (typeof primary === 'object') {
-      let m = this;
-      for (const p of primaryFields) {
-        m = m.where(p, '=', primary[p]);
+    const list = primary.map(primary => {
+      if (typeof primary === 'object') {
+        return primaryFields.map(([p]) => primary[p]);
       }
-      m.#primary = primary;
-      return m;
-    }
-    const values = `${primary}`.split('$');
-    if (values.length !== primaryFields.length) ;
-    let m = this;
-    for (let i = 0; i < primaryFields.length; i++) {
-      m = m.where(primaryFields[i], '=', values[i]);
-    }
-    m.#primary = primary;
-    return m;
+      const values = `${primary}`.split('$');
+      if (values.length !== primaryFields.length) ;
+      return primaryFields.map(([, {
+        type
+      }], i) => {
+        const value = values[i] ?? null;
+        if (type !== 'bool' || value === null) {
+          return value;
+        }
+        return toBool(value);
+      });
+    });
+    return this.where(primaryFields.map(f => f[0]), 'in', list);
   }
   /**
    *
@@ -5416,8 +5423,8 @@ function toPrimaries(model, documents) {
  * @returns {Hooks['where'] | undefined}
  */
 function mergeWhere(hooks) {
-  if (!hooks.length) {
-    return;
+  if (hooks.length <= 1) {
+    return hooks[0];
   }
   return async function (conn, model) {
     let that;
@@ -5437,8 +5444,8 @@ function mergeWhere(hooks) {
  * @returns {Hooks['beforeCreateMany'] | undefined}
  */
 function mergeBeforeCreateMany(hooks) {
-  if (!hooks.length) {
-    return;
+  if (hooks.length <= 1) {
+    return hooks[0];
   }
   return async function (conn, model, record) {
     let data = record;
@@ -5454,8 +5461,8 @@ function mergeBeforeCreateMany(hooks) {
  * @returns {Hooks['beforeCreate'] | undefined}
  */
 function mergeBeforeCreate(hooks) {
-  if (!hooks.length) {
-    return;
+  if (hooks.length <= 1) {
+    return hooks[0];
   }
   return async function (conn, model, record) {
     let data = record;
@@ -5471,8 +5478,8 @@ function mergeBeforeCreate(hooks) {
  * @returns {Hooks['beforeUpdate'] | undefined}
  */
 function mergeBeforeUpdate(hooks) {
-  if (!hooks.length) {
-    return;
+  if (hooks.length <= 1) {
+    return hooks[0];
   }
   return async function (conn, model, record, set) {
     let data = set;
@@ -5488,8 +5495,8 @@ function mergeBeforeUpdate(hooks) {
  * @returns {((this: any, ...argv: T) => MaybePromise<void>) | undefined}
  */
 function mergeRun(hooks) {
-  if (!hooks.length) {
-    return;
+  if (hooks.length <= 1) {
+    return hooks[0];
   }
   return async function (...p) {
     for (const hook of hooks) {
@@ -5513,14 +5520,14 @@ function filterFunction(v) {
 function mergeHooks(...hooks) {
   const allHooks = hooks.flat();
   return {
-    where: mergeWhere(allHooks.map(v => v.where).filter(filterFunction)),
-    beforeCreateMany: mergeBeforeCreateMany(allHooks.map(v => v.beforeCreateMany).filter(filterFunction)),
+    where: mergeWhere(allHooks.map(v => v.where).filter(filterFunction).reverse()),
+    beforeCreateMany: mergeBeforeCreateMany(allHooks.map(v => v.beforeCreateMany).filter(filterFunction).reverse()),
     afterCreateMany: mergeRun(allHooks.map(v => v.afterCreateMany).filter(filterFunction)),
-    beforeCreate: mergeBeforeCreate(allHooks.map(v => v.beforeCreate).filter(filterFunction)),
+    beforeCreate: mergeBeforeCreate(allHooks.map(v => v.beforeCreate).filter(filterFunction).reverse()),
     afterCreate: mergeRun(allHooks.map(v => v.afterCreate).filter(filterFunction)),
-    beforeUpdate: mergeBeforeUpdate(allHooks.map(v => v.beforeUpdate).filter(filterFunction)),
+    beforeUpdate: mergeBeforeUpdate(allHooks.map(v => v.beforeUpdate).filter(filterFunction).reverse()),
     afterUpdate: mergeRun(allHooks.map(v => v.afterUpdate).filter(filterFunction)),
-    beforeDelete: mergeRun(allHooks.map(v => v.beforeDelete).filter(filterFunction)),
+    beforeDelete: mergeRun(allHooks.map(v => v.beforeDelete).filter(filterFunction).reverse()),
     afterDelete: mergeRun(allHooks.map(v => v.afterDelete).filter(filterFunction))
   };
 }
@@ -6510,7 +6517,8 @@ class Scene {
       return {
         ...table,
         table: tableMap.table,
-        fields: this.#cloneField(table.fields, tableMap)
+        fields: this.#cloneField(table.fields, tableMap),
+        scene: this
         // TODO: 索引？
       };
     }
@@ -6550,6 +6558,19 @@ class Scene {
   table(table) {
     return this.#getModel(table);
   }
+  /**
+   * @template {TableDefine<Fields, string>} T
+   * @param {{scene?: Scene} | Scene} source
+   * @param {T} table
+   * @returns {T}
+   */
+  static table(source, table) {
+    const scene = source instanceof Scene ? source : source?.scene;
+    if (!(scene instanceof Scene)) {
+      return table;
+    }
+    return scene.table(table);
+  }
 }
 
 /** @import { FieldDefine, FieldDefineOption, MainFieldType, ToType } from './types' */
@@ -6702,4 +6723,4 @@ function field(type, {
   };
 }
 
-export { Build, Connection, Create, Destroy, Model, PseudoDestroy, Query, Save, Scene, Submodel, Where, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, creating, decrement, defaultValue, field as define, deleted, deleting, divide, field$1 as field, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, setDevelopment, sort, model as submodel, toNot, toPrimaries, toPrimary, uncreatable, undeleted, updating, uuid, values, where, withDeleted };
+export { Build, Connection, Create, Destroy, Model, PseudoDestroy, Query, Save, Scene, Submodel, Where, afterCreate, afterCreateMany, afterDelete, afterUpdate, beforeCreate, beforeCreateMany, beforeDelete, beforeUpdate, bindHooks, coefficient, column, creating, decrement, defaultValue, field as define, deleted, deleting, divide, field$1 as field, getPrimaryFields, getPrimaryKeys, hooks, immutable, increment, index, isDevelopment, isPseudo, mergeHooks, model, multiply, now, primary, prop, pseudo, setDevelopment, sort, model as submodel, toBool, toNot, toPrimaries, toPrimary, uncreatable, undeleted, updating, uuid, values, where, withDeleted };

package/migrate.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.2
+ * imodel v0.19.0
  * (c) 2019-2026 undefined
  * @license undefined
  */

package/migrate.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.2
+ * imodel v0.19.0
  * (c) 2019-2026 undefined
  * @license undefined
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imodel",
-  "version": "0.17.2",
+  "version": "0.19.0",
   "main": "index.mjs",
   "type": "module",
   "repository": {