imodel 0.17.2 → 0.18.0

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.2
+ * imodel v0.18.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']>} */

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.17.2
+ * imodel v0.18.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}
  */
@@ -5416,8 +5416,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 +5437,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 +5454,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 +5471,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 +5488,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 +5513,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))
   };
 }

package/migrate.d.mts

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

package/migrate.mjs

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

package/package.json

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