vona-module-a-orm 5.0.55 → 5.0.56

package/dist/config/config.d.ts

@@ -59,6 +59,7 @@ export declare function config(_app: VonaApplication): {
                     client?: keyof import("vona-module-a-redis").IRedisClientRecord;
                     disableInstance?: boolean;
                 };
+                emptyArrayAsNull?: boolean;
                 enable?: boolean;
                 meta?: Omit<IOnionOptionsMeta, never> | undefined;
             };
@@ -81,6 +82,7 @@ export declare function config(_app: VonaApplication): {
                     client?: keyof import("vona-module-a-redis").IRedisClientRecord;
                     disableInstance?: boolean;
                 };
+                emptyArrayAsNull?: boolean;
                 enable?: boolean;
                 meta?: Omit<IOnionOptionsMeta, never> | undefined;
             };

package/dist/index.js

@@ -230,9 +230,16 @@ let ServiceDatabase = (_dec$t = Service(), _dec2$t = BeanInfo({
     return !clientName || clientName === 'default' ? this.getDefaultClientName() : clientName;
   }
   getDefaultClientName() {
-    let defaultClient = this.app.config.database.defaultClient;
+    const defaultClient = this.app.config.database.defaultClient;
     if (typeof defaultClient === 'function') {
-      defaultClient = defaultClient(this.ctx);
+      return defaultClient(this.ctx);
+    }
+    // check instance
+    if (!isNil(this.ctx.instanceName)) {
+      const configInstanceBase = this.$scope.instance.service.instance.getConfigInstanceBase(this.ctx.instanceName);
+      if (configInstanceBase?.isolate) {
+        return configInstanceBase.isolateClient;
+      }
     }
     return defaultClient;
   }
@@ -687,10 +694,10 @@ let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
     //   * should not use this.clientConfig.connection, because password is hidden
     const config = this.getClientConfig(this.clientName, true);
     config.connection = Object.assign({}, config.connection, connDatabaseName);
-    // only used by startup, so no consider that workders broadcast
+    // only used by startup, so no consider that workers broadcast
     this.configDatabase.clients[this.clientName] = config;
     // reload
-    await this.reload(config);
+    await this.scope.service.database.reloadClients(this.clientName, config);
   }
 }) || _class$m) || _class$m);
 
@@ -3095,10 +3102,10 @@ class BeanModelCache extends BeanModelCrud {
     }
     // 2: mget
     const ids = items.map(item => cast(item).id);
-    const options2 = params?.columns ? Object.assign({}, options, {
+    const options3 = params?.columns ? Object.assign({}, options, {
       columns: params?.columns
     }) : options;
-    return await this.__mget_raw(table, ids, options2);
+    return await this.__mget_raw(table, ids, options3);
   }
   async __select_cache(table, params, options) {
     // check if cache
@@ -3114,6 +3121,7 @@ class BeanModelCache extends BeanModelCrud {
     // cache
     const cache = this.cacheQuery.getInstance(table);
     const items = await cache.get(key, {
+      ...options?.cache,
       get: async () => {
         return await super._select(table, params, options, builder);
       },
@@ -3157,9 +3165,12 @@ class BeanModelCache extends BeanModelCrud {
         params.columns = options?.columns;
       }
       // select
-      const options2 = options?.columns ? Object.assign({}, options, {
-        columns: undefined
-      }) : options;
+      const options2 = deepExtend({}, options, {
+        columns: undefined,
+        cache: {
+          emptyArrayAsNull: true
+        }
+      });
       const items = await this.__select_raw(table, params, options2);
       return items[0];
     }
@@ -3215,13 +3226,16 @@ class BeanModelCache extends BeanModelCrud {
         const where = !isNil(id) ? Object.assign({}, options?.where, {
           id
         }) : options?.where;
-        options = Object.assign({}, options, {
-          where: undefined
+        const options2 = deepExtend({}, options, {
+          where: undefined,
+          cache: {
+            emptyArrayAsNull: true
+          }
         });
         const items = await this.__select_raw(table, {
           where,
           columns: ['id']
-        }, options);
+        }, options2);
         if (items.length === 0) {
           // donothing
           return;
@@ -3273,10 +3287,15 @@ 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']
-      }, options);
+      }, options2);
       if (items.length === 0) {
         // donothing
         return;
@@ -3823,71 +3842,17 @@ class Main extends BeanSimple {
   }
   async configLoaded(_config) {}
 }
-async function configDefault(app) {
-  return {
-    testDatabase: false,
-    defaultClient: app.meta.env.DATABASE_DEFAULT_CLIENT,
-    clients: {
-      pg: {
-        client: 'pg',
-        connection: {
-          host: app.meta.env.DATABASE_CLIENT_PG_HOST,
-          port: Number.parseInt(app.meta.env.DATABASE_CLIENT_PG_PORT),
-          user: app.meta.env.DATABASE_CLIENT_PG_USER,
-          password: app.meta.env.DATABASE_CLIENT_PG_PASSWORD,
-          database: app.meta.env.DATABASE_CLIENT_PG_DATABASE
-        }
-      },
-      mysql: {
-        client: 'mysql2',
-        connection: {
-          host: app.meta.env.DATABASE_CLIENT_MYSQL_HOST,
-          port: Number.parseInt(app.meta.env.DATABASE_CLIENT_MYSQL_PORT),
-          user: app.meta.env.DATABASE_CLIENT_MYSQL_USER,
-          password: app.meta.env.DATABASE_CLIENT_MYSQL_PASSWORD,
-          database: app.meta.env.DATABASE_CLIENT_MYSQL_DATABASE
-        }
-      }
-    },
-    base: {
-      pool: {
-        min: 0,
-        max: 5
-      },
-      acquireConnectionTimeout: 60000 * 10,
-      asyncStackTraces: true
-    }
-  };
+async function configDefault(_app) {
+  return {};
 }
 async function configDev(_app) {
-  return {
-    testDatabase: true,
-    base: {
-      pool: {
-        min: 0,
-        max: 1
-      }
-    }
-  };
+  return {};
 }
 async function configProd(_app) {
-  return {
-    testDatabase: false,
-    base: {
-      asyncStackTraces: false
-    }
-  };
+  return {};
 }
 async function configTest(_app) {
-  return {
-    testDatabase: true,
-    base: {
-      pool: {
-        min: 0,
-        max: 1
-      }
-    }
-  };
+  return {};
 }
 
 var _dec, _dec2, _class;

package/dist/main.d.ts

@@ -6,4 +6,4 @@ export declare class Main extends BeanSimple implements IModuleMain {
     moduleLoaded(): Promise<void>;
     configLoaded(_config: any): Promise<void>;
 }
-export declare function configDefault(app: VonaApplication): Promise<PowerPartial<ConfigDatabase>>;
+export declare function configDefault(_app: VonaApplication): Promise<PowerPartial<ConfigDatabase>>;

package/dist/types/model.d.ts

@@ -1,4 +1,5 @@
 import type { Knex } from 'knex';
+import type { TSummerCacheActionOptions } from 'vona-module-a-summer';
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { TypeModelColumn, TypeModelColumns, TypeModelColumnsPatch, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelOfModelLike, TypeModelParamsInclude, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from './relations.ts';
@@ -51,6 +52,7 @@ export interface IModelMethodOptionsGeneral {
     disableCacheQuery?: boolean;
     disableCacheEntity?: boolean;
     deleted?: boolean;
+    cache?: TSummerCacheActionOptions<unknown, unknown>;
 }
 export interface IModelInsertOptionsGeneral<_TRecord, Model extends BeanModelMeta | undefined = undefined> extends IModelMethodOptionsGeneral, IModelMutateRelationIncludeWrapper<Model> {
 }

package/package.json

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