vona-module-a-orm 5.0.75 → 5.0.77

package/dist/config/config.d.ts

@@ -41,51 +41,7 @@ export declare function config(_app: VonaApplication): {
         presetDefault: TSummerCachePreset;
         preset: {
             redis: import("vona-module-a-summer").IDecoratorSummerCacheOptions;
-            redisWithIgnoreNull: {
-                ignoreNull: boolean;
-                preset?: TSummerCachePreset;
-                mode?: import("vona-module-a-summer").TSummerCacheMode;
-                mem?: {
-                    max?: number;
-                    ttl?: number;
-                    updateAgeOnGet?: boolean;
-                    updateAgeOnHas?: boolean;
-                    broadcastOnSet?: import("vona-module-a-cache").TypeBroadcastOnSet;
-                    disableInstance?: boolean;
-                };
-                redis?: {
-                    ttl?: number;
-                    updateAgeOnGet?: boolean;
-                    client?: keyof import("vona-module-a-redis").IRedisClientRecord;
-                    disableInstance?: boolean;
-                };
-                emptyArrayAsNull?: boolean;
-                enable?: boolean;
-                meta?: Omit<IOnionOptionsMeta, never> | undefined;
-            };
             all: import("vona-module-a-summer").IDecoratorSummerCacheOptions;
-            allWithIgnoreNull: {
-                ignoreNull: boolean;
-                preset?: TSummerCachePreset;
-                mode?: import("vona-module-a-summer").TSummerCacheMode;
-                mem?: {
-                    max?: number;
-                    ttl?: number;
-                    updateAgeOnGet?: boolean;
-                    updateAgeOnHas?: boolean;
-                    broadcastOnSet?: import("vona-module-a-cache").TypeBroadcastOnSet;
-                    disableInstance?: boolean;
-                };
-                redis?: {
-                    ttl?: number;
-                    updateAgeOnGet?: boolean;
-                    client?: keyof import("vona-module-a-redis").IRedisClientRecord;
-                    disableInstance?: boolean;
-                };
-                emptyArrayAsNull?: boolean;
-                enable?: boolean;
-                meta?: Omit<IOnionOptionsMeta, never> | undefined;
-            };
         };
         redis: {
             client: string;

package/dist/index.js

@@ -3,9 +3,9 @@ import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, appResource, Virtual
 import { AopMethod } from 'vona-module-a-aspect';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import { AsyncLocalStorage, AsyncResource } from 'node:async_hooks';
+import { isNil, catchError, safeBoolean, isClass, ensureArray, hashkey } from '@cabloy/utils';
 import knex from 'knex';
 import { BeanMutateBase } from 'vona-module-a-beanmutate';
-import { isNil, safeBoolean, isClass, ensureArray, hashkey } from '@cabloy/utils';
 import { swapDeps } from '@cabloy/deps';
 import { prepareClassType, getTargetDecoratorRules, getTargetDecoratorRuleColumnsMap, Api, v, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapi';
 import { ZodMetadata } from '@cabloy/zod-openapi';
@@ -15,7 +15,7 @@ import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Queue, BeanQueueBase } from 'vona-module-a-queue';
 import { Schedule } from 'vona-module-a-schedule';
-import { configAllWithIgnoreNull, configAll, configRedisWithIgnoreNull, configRedis } from 'vona-module-a-summer';
+import { configAll, configRedis } from 'vona-module-a-summer';
 import { ServiceDatabaseAsyncLocalStorage as ServiceDatabaseAsyncLocalStorage$1, ServiceTransactionConsistency‌ as ServiceTransactionConsistency_ } from 'vona-module-a-orm';
 import { mutate } from 'mutate-on-copy';
 
@@ -686,7 +686,9 @@ let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
   }
   async __close() {
     if (this._knex) {
-      await this._knex.destroy();
+      await catchError(() => {
+        return this._knex.destroy();
+      });
       this._knex = undefined;
     }
   }
@@ -2910,8 +2912,9 @@ class BeanModelCache extends BeanModelCrud {
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // insert
     const res = await this._insertBulk(table, items, options);
-    // clear cache
-    await this.cacheQueryClear(table);
+    // delete cache
+    const ids = res.map(item => cast(item).id);
+    await this.cacheEntityDel(ids, table);
     return res;
   }
   async mutate(data, options) {
@@ -2996,9 +2999,10 @@ class BeanModelCache extends BeanModelCrud {
     const cache = this.cacheEntity.getInstance(table);
     let items = await cache.mget(ids, {
       mget: async ids => {
-        return await super._mget_original(table, ids, {
+        const items = await super._mget_original(table, ids, {
           disableDeleted: true
         });
+        return items.map(item => item === undefined ? null : item);
       },
       db: this.db
     });
@@ -3181,10 +3185,7 @@ class BeanModelCache extends BeanModelCrud {
       }
       // select
       const options2 = deepExtend({}, options, {
-        columns: undefined,
-        cache: {
-          emptyArrayAsNull: true
-        }
+        columns: undefined
       });
       const items = await this.__select_raw(table, params, options2);
       return items[0];
@@ -3242,10 +3243,7 @@ class BeanModelCache extends BeanModelCrud {
           id
         }) : options?.where;
         const options2 = deepExtend({}, options, {
-          where: undefined,
-          cache: {
-            emptyArrayAsNull: true
-          }
+          where: undefined
         });
         const items = await this.__select_raw(table, {
           where,
@@ -3302,15 +3300,10 @@ class BeanModelCache extends BeanModelCrud {
     let id = this.__checkCacheKeyValid(where, table);
     if (isNil(id)) {
       // check where and get id
-      const options2 = deepExtend({}, options, {
-        cache: {
-          emptyArrayAsNull: true
-        }
-      });
       const items = await this.__select_raw(table, {
         where,
         columns: ['id']
-      }, options2);
+      }, options);
       if (items.length === 0) {
         // donothing
         return;
@@ -3337,9 +3330,10 @@ class BeanModelCache extends BeanModelCrud {
     const item = await cache.get(id, {
       get: async () => {
         // where: maybe contain aux key
-        return await super._get(table, where, {
+        const item = await super._get(table, where, {
           disableDeleted: true
         });
+        return item === undefined ? null : item;
       },
       db: this.db
     });
@@ -3481,13 +3475,13 @@ class BeanModelCache extends BeanModelCrud {
     if (options?.disableCacheQuery === true || options?.disableCacheQuery === false) {
       return options?.disableCacheQuery;
     }
-    return !this.cacheQuery.enabled;
+    return !(options?.cache?.enable ?? this.cacheQuery.enabled);
   }
   _checkDisableCacheEntityByOptions(options) {
     if (options?.disableCacheEntity === true || options?.disableCacheEntity === false) {
       return options?.disableCacheEntity;
     }
-    return !this.cacheEntity.enabled;
+    return !(options?.cache?.enable ?? this.cacheEntity.enabled);
   }
   __checkIfOnlyKey(keys, table, noCheckLength) {
     const columnId = `${table}.id`;
@@ -3736,9 +3730,7 @@ function config(_app) {
       presetDefault: 'redis',
       preset: {
         redis: configRedis,
-        redisWithIgnoreNull: configRedisWithIgnoreNull,
-        all: configAll,
-        allWithIgnoreNull: configAllWithIgnoreNull
+        all: configAll
       },
       redis: {
         client: 'model'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
   "type": "module",
-  "version": "5.0.75",
+  "version": "5.0.77",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {