vona-module-a-executor 5.0.28 → 5.0.30

package/dist/index.js

@@ -1,4 +1,5 @@
 import { BeanInfo, BeanBase, cast, deepExtend, BeanScopeBase } from 'vona';
+import { __decorate, __metadata } from 'tslib';
 import { isNil, combineParamsAndQuery } from '@cabloy/utils';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { Aspect } from 'vona-module-a-aspect';
@@ -16,7 +17,6 @@ function __delegateProperty(ctx, ctxCaller, property) {
   if (!ctxCaller[property]) ctxCaller[property] = {};
   ctx[property] = ctxCaller[property];
 }
-
 // export function delegateProperty(ctx, ctxCaller, property) {
 //   if (!ctxCaller[property]) return;
 //   if (!ctx[property]) ctx[property] = {};
@@ -24,7 +24,6 @@ function __delegateProperty(ctx, ctxCaller, property) {
 //     ctx[property][key] = ctxCaller[property][key];
 //   }
 // }
-
 // function _delegateProperty(ctx, ctxCaller, property) {
 //   const keyMock = `__executeBean__mock__${property}__`;
 //   const keyOriginal = `__executeBean__mock__${property}__original__`;
@@ -48,10 +47,7 @@ function __delegateProperty(ctx, ctxCaller, property) {
 //   });
 // }
 
-var _dec$2, _dec2$2, _class$2;
-let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
-  module: "a-executor"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class BeanExecutor extends BeanBase {
+let BeanExecutor = class BeanExecutor extends BeanBase {
   async performAction(method, path, options) {
     // url
     const url = this.app.util.combineApiPath(path, '', true, true);
@@ -66,6 +62,10 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
     options = Object.assign({}, options);
     // instanceName !== undefined means isolate
     options.instanceName = options.instanceName === undefined ? this.ctx?.instanceName : options.instanceName;
+    if (options.instanceName === this.ctx?.instanceName) {
+      options.locale = options.locale === undefined ? this.ctx?.locale : options.locale;
+      options.tz = options.tz === undefined ? this.ctx?.tz : options.tz;
+    }
     return this.newCtx(fn, options);
   }
   async mockCtx(fn, options) {
@@ -89,16 +89,14 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
     options = Object.assign({}, options);
     // innerAccess
     const innerAccess = options.innerAccess !== false;
-    // ctx ref
-    const ctxRef = innerAccess ? this.ctx : undefined;
     // isolate
-    const isolate = !ctxRef || options.instanceName !== undefined;
-    const ctxCaller = !isolate && ctxRef ? ctxRef : undefined;
-    // locale/instanceName
-    if (ctxRef) {
-      options.locale = options.locale === undefined ? ctxRef.locale : options.locale;
-      options.tz = options.tz === undefined ? ctxRef.tz : options.tz;
-      options.instanceName = options.instanceName === undefined ? ctxRef.instanceName : options.instanceName;
+    const isolate = !this.ctx || options.instanceName !== undefined || !innerAccess && this.ctx?.instanceName === null;
+    const ctxCaller = !isolate && this.ctx ? this.ctx : undefined;
+    // locale/tz/instanceName
+    if (!isolate && this.ctx) {
+      options.locale = options.locale === undefined ? this.ctx.locale : options.locale;
+      options.tz = options.tz === undefined ? this.ctx.tz : options.tz;
+      options.instanceName = options.instanceName === undefined ? !innerAccess && this.ctx.instanceName === null ? undefined : this.ctx.instanceName : options.instanceName;
     }
     // run
     const ctx = this.app.createAnonymousContext(options.req, options.res);
@@ -160,25 +158,15 @@ let BeanExecutor = (_dec$2 = Bean(), _dec2$2 = BeanInfo({
     // ok
     return res;
   }
-}) || _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;
-}
+};
+BeanExecutor = __decorate([Bean(), BeanInfo({
+  module: "a-executor"
+})], BeanExecutor);
 
 const SymbolRouterMiddleware = Symbol('SymbolRouterMiddleware');
 
-var _dec$1, _dec2$1, _dec3, _dec4, _dec5, _class$1, _class2;
-let ServiceExecutor = (_dec$1 = Service(), _dec2$1 = BeanInfo({
-  module: "a-executor"
-}), _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 {
+var _a;
+let ServiceExecutor = class ServiceExecutor extends BeanBase {
   async performActionInner(method, url, options) {
     // app
     const app = this.app;
@@ -275,8 +263,13 @@ let ServiceExecutor = (_dec$1 = Service(), _dec2$1 = BeanInfo({
     }
     return options;
   }
-}, _applyDecoratedDescriptor(_class2.prototype, "performActionInner", [_dec3, _dec4, _dec5], Object.getOwnPropertyDescriptor(_class2.prototype, "performActionInner"), _class2.prototype), _class2)) || _class$1) || _class$1);
-
+};
+__decorate([Aspect.aopMethod('a-logger:log', {
+  level: 'debug'
+}), __metadata("design:type", Function), __metadata("design:paramtypes", [typeof (_a = typeof METHOD !== "undefined" && METHOD) === "function" ? _a : Object, String, Object]), __metadata("design:returntype", Promise)], ServiceExecutor.prototype, "performActionInner", null);
+ServiceExecutor = __decorate([Service(), BeanInfo({
+  module: "a-executor"
+})], ServiceExecutor);
 // for (const key of ['x-clientid', 'x-scene']) {
 //   if (!headers[key]) {
 //     const value =
@@ -297,11 +290,10 @@ let ServiceExecutor = (_dec$1 = Service(), _dec2$1 = BeanInfo({
 //   }
 // }
 
-var _dec, _dec2, _class;
-let ScopeModuleAExecutor = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleAExecutor = class ScopeModuleAExecutor extends BeanScopeBase {};
+ScopeModuleAExecutor = __decorate([Scope(), BeanInfo({
   module: "a-executor"
-}), _dec(_class = _dec2(_class = class ScopeModuleAExecutor extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleAExecutor);
 /** scope: end */
 
 export { BeanExecutor, ScopeModuleAExecutor, ServiceExecutor, SymbolRouterMiddleware };

package/package.json

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