vona-module-a-executor 5.0.13 → 5.0.15

package/dist/.metadata/index.d.ts

@@ -20,7 +20,7 @@ declare module 'vona' {
 /** service: begin */
 export * from '../service/executor.ts';
 import 'vona';
-declare module 'vona-module-a-web' {
+declare module 'vona-module-a-bean' {
     interface IServiceRecord {
         'a-executor:executor': never;
     }
@@ -28,6 +28,10 @@ declare module 'vona-module-a-web' {
 declare module 'vona-module-a-executor' {
     interface ServiceExecutor {
     }
+    interface ServiceExecutor {
+        get $beanFullName(): 'a-executor.service.executor';
+        get $onionName(): 'a-executor:executor';
+    }
 }
 /** service: end */
 /** service: begin */

package/dist/index.js

@@ -1,7 +1,7 @@
 import { BeanInfo, BeanBase, cast, deepExtend, BeanScopeBase } from 'vona';
-import { Bean, Scope } from 'vona-module-a-bean';
-import { combineParamsAndQuery } from '@cabloy/utils';
-import { Service } from 'vona-module-a-web';
+import { isNil, combineParamsAndQuery } from '@cabloy/utils';
+import { Bean, Service, Scope } from 'vona-module-a-bean';
+import { Aspect } from 'vona-module-a-aspect';
 
 function __delegateProperties(ctx, ctxCaller) {
   for (const property of ['state']) {
@@ -58,7 +58,7 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
     return await this.scope.service.executor.performActionInner(method, url, options);
   }
   runInBackground(fn) {
-    return this.bean.database.newDbIsolate(() => {
+    return this.bean.database.switchDbIsolate(() => {
       return this.newCtx(fn);
     });
   }
@@ -70,16 +70,17 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
   }
   async mockCtx(fn, options) {
     options = Object.assign({}, options);
-    options.dbInfo = options.dbInfo === undefined ? true : options.dbInfo;
+    options.dbInfo = isNil(options.dbInfo) ? {
+      level: 1
+    } : options.dbInfo;
     options.instanceName = options.instanceName === undefined ? this.ctx?.instanceName ?? '' : options.instanceName;
     return this.newCtx(fn, options);
   }
   async newCtx(fn, options) {
-    if (!options?.dbInfo) return this._newCtxInner(fn, options);
-    const dbInfo = options.dbInfo === true ? {} : options.dbInfo;
-    return this.bean.database.newDb(() => {
+    if (isNil(options?.dbInfo)) return this._newCtxInner(fn, options);
+    return this.bean.database.switchDb(() => {
       return this._newCtxInner(fn, options);
-    }, dbInfo);
+    }, options?.dbInfo);
   }
   async _newCtxInner(fn, options) {
     options = Object.assign({}, options);
@@ -147,12 +148,23 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
   }
 }) || _class$2) || _class$2);
 
+function _applyDecoratedDescriptor(i, e, r, n, l) {
+  var a = {};
+  return Object.keys(n).forEach(function (i) {
+    a[i] = n[i];
+  }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = true), a = r.slice().reverse().reduce(function (r, n) {
+    return n(i, e, r) || r;
+  }, a), l && void 0 !== a.initializer && (a.value = a.initializer ? a.initializer.call(l) : void 0, a.initializer = void 0), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
+}
+
 const SymbolRouterMiddleware = Symbol('SymbolRouterMiddleware');
 
-var _dec$1, _dec2$1, _class$1;
+var _dec$1, _dec2$1, _dec3, _dec4, _dec5, _class$1, _class2;
 let ServiceExecutor = (_dec$1 = Service(), _dec2$1 = BeanInfo({
   module: "a-executor"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class ServiceExecutor extends BeanBase {
+}), _dec3 = Aspect.aopMethod('a-logger:log', {
+  level: 'debug'
+}), _dec4 = Reflect.metadata("design:type", Function), _dec5 = Reflect.metadata("design:paramtypes", [typeof METHOD === "undefined" ? Object : METHOD, String, typeof IPerformActionOptions === "undefined" ? Object : IPerformActionOptions]), _dec$1(_class$1 = _dec2$1(_class$1 = (_class2 = class ServiceExecutor extends BeanBase {
   async performActionInner(method, url, options) {
     // app
     const app = this.app;
@@ -218,14 +230,14 @@ let ServiceExecutor = (_dec$1 = Service(), _dec2$1 = BeanInfo({
     const clientName = options?.dbInfo?.clientName ?? current?.clientName;
     const locale = options?.locale === undefined ? this.ctx?.locale : options.locale;
     const instanceName = options?.instanceName === undefined ? this.ctx?.instanceName : options.instanceName;
-    options = {
+    options = Object.assign({}, options, {
       dbInfo: {
         level,
         clientName
       },
       locale,
       instanceName
-    };
+    });
     if (this.ctx) {
       options = deepExtend({
         extraData: {
@@ -247,7 +259,7 @@ let ServiceExecutor = (_dec$1 = Service(), _dec2$1 = BeanInfo({
     }
     return options;
   }
-}) || _class$1) || _class$1);
+}, _applyDecoratedDescriptor(_class2.prototype, "performActionInner", [_dec3, _dec4, _dec5], Object.getOwnPropertyDescriptor(_class2.prototype, "performActionInner"), _class2.prototype), _class2)) || _class$1) || _class$1);
 
 // for (const key of ['x-clientid', 'x-scene']) {
 //   if (!headers[key]) {

package/dist/types/executor.d.ts

@@ -1,6 +1,6 @@
 import type { ContextState, IInstanceRecord, ILocaleInfos, PowerPartial } from 'vona';
-import type { IDbInfo, ITransactionOptions } from 'vona-module-a-database';
 import type { ConfigOnions } from 'vona-module-a-onion';
+import type { IDbInfo, ITransactionOptions } from 'vona-module-a-orm';
 export declare const SymbolRouterMiddleware: unique symbol;
 export interface INewCtxExtraData {
     state?: ContextState;
@@ -9,7 +9,7 @@ export interface INewCtxExtraData {
     };
 }
 export interface INewCtxOptions extends INewCtxBaseOptions {
-    dbInfo?: IDbInfo | true;
+    dbInfo?: Partial<IDbInfo>;
 }
 export interface INewCtxBaseOptions {
     locale?: keyof ILocaleInfos;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-executor",
   "type": "module",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "title": "a-executor",
   "vonaModule": {
     "dependencies": {}