vona-module-a-onion 5.0.28 → 5.0.30

package/dist/index.js

@@ -29,12 +29,22 @@ let ServiceOnion = (_dec$2 = ProxyDisable(), _dec2$2 = Service(), _dec3$1 = Bean
   __init__(sceneName) {
     this.sceneName = sceneName;
     this.sceneMeta = getOnionScenesMeta(this.app.meta.modules)[this.sceneName];
+    this.load();
+  }
+  load() {
     this._loadOnions();
     this._swapOnions(this.onionsGlobal);
+    this[SymbolOnionsEnabled] = {};
+    this[SymbolOnionsEnabledWrapped] = {};
+    this.clearCache();
+  }
+  clearCache() {
+    this._cacheOnionsGlobal = undefined;
+    this._cacheOnionsHandler = {};
   }
-  compose(ctx, fnStart, fnMid, fnEnd, executeCustom) {
+  compose(route, fnStart, fnMid, fnEnd, executeCustom) {
     // compose
-    const onions = this._composeOnionsHandler(ctx, fnStart, fnMid, fnEnd, executeCustom);
+    const onions = this._composeOnionsHandler(route, fnStart, fnMid, fnEnd, executeCustom);
     // invoke
     return compose(onions);
   }
@@ -94,9 +104,9 @@ let ServiceOnion = (_dec$2 = ProxyDisable(), _dec2$2 = Service(), _dec3$1 = Bean
     }
     return this._cacheOnionsGlobal;
   }
-  _composeOnionsHandler(ctx, fnStart, fnMid, fnEnd, executeCustom) {
-    const beanFullName = ctx?.getControllerBeanFullName();
-    const handlerName = ctx?.getHandler()?.name;
+  _composeOnionsHandler(route, fnStart, fnMid, fnEnd, executeCustom) {
+    const beanFullName = route?.controllerBeanFullName;
+    const handlerName = route?.action;
     const key = beanFullName ? `${beanFullName}:${handlerName}` : '';
     if (!this._cacheOnionsHandler[key]) {
       let onions = [];
@@ -105,7 +115,7 @@ let ServiceOnion = (_dec$2 = ProxyDisable(), _dec2$2 = Service(), _dec3$1 = Bean
       onions = onions.concat(this._composeOnionsGlobal(executeCustom));
       if (fnMid) onions = onions.concat(fnMid);
       // onions: handler
-      const onionsLocal = this._collectOnionsHandler(ctx);
+      const onionsLocal = this._collectOnionsHandler(route);
       for (const item of onionsLocal) {
         onions.push(this._wrapOnion(item, executeCustom));
       }
@@ -114,13 +124,13 @@ let ServiceOnion = (_dec$2 = ProxyDisable(), _dec2$2 = Service(), _dec3$1 = Bean
     }
     return this._cacheOnionsHandler[key];
   }
-  _collectOnionsHandler(ctx) {
-    if (!ctx?.getController()) return [];
+  _collectOnionsHandler(route) {
+    if (!route?.controller) return [];
     // onionsLocal: controller
-    const controllerOnionsLocal = appMetadata.getMetadata(SymbolUseOnionLocal, ctx.getController())?.[this.sceneName];
+    const controllerOnionsLocal = appMetadata.getMetadata(SymbolUseOnionLocal, route.controller)?.[this.sceneName];
     // onionsLocal: action
     const onionsLocal = [];
-    const actionOnionsLocal = appMetadata.getMetadata(SymbolUseOnionLocal, ctx.getControllerPrototype(), ctx.getHandlerName())?.[this.sceneName];
+    const actionOnionsLocal = appMetadata.getMetadata(SymbolUseOnionLocal, route.controller.prototype, route.action)?.[this.sceneName];
     const onionsLocalAll = [];
     if (actionOnionsLocal) {
       actionOnionsLocal.forEach(item => {

package/dist/service/onion_.d.ts

@@ -1,7 +1,8 @@
 import type { OnionSceneMeta } from '@cabloy/module-info';
-import type { Next, VonaContext } from 'vona';
+import type { Next } from 'vona';
 import type { IEventRecord } from 'vona-module-a-event';
 import type { IMetaNameRecord } from 'vona-module-a-meta';
+import type { ContextRoute } from 'vona-module-a-web';
 import type { IOnionExecuteCustom, IOnionSlice, TypeOnionsNormal } from '../types/onion.ts';
 import { BeanBase } from 'vona';
 declare const SymbolOnionsEnabled: unique symbol;
@@ -13,10 +14,12 @@ export declare class ServiceOnion<ONIONRECORD> extends BeanBase {
     onionsGlobal: IOnionSlice<ONIONRECORD, keyof ONIONRECORD>[];
     private [SymbolOnionsEnabled];
     private [SymbolOnionsEnabledWrapped];
-    _cacheOnionsGlobal: Function[];
-    _cacheOnionsHandler: Record<string, Function[]>;
+    private _cacheOnionsGlobal;
+    private _cacheOnionsHandler;
     protected __init__(sceneName: string): void;
-    compose(ctx: VonaContext | undefined, fnStart?: Function | Function[], fnMid?: Function | Function[], fnEnd?: Function | Function[], executeCustom?: IOnionExecuteCustom): (context: any, next?: any) => any;
+    load(): void;
+    clearCache(): void;
+    compose(route: ContextRoute | undefined, fnStart?: Function | Function[], fnMid?: Function | Function[], fnEnd?: Function | Function[], executeCustom?: IOnionExecuteCustom): (context: any, next?: any) => any;
     getOnionsEnabled(selector?: string | boolean, matchThis?: any, ...matchArgs: any[]): IOnionSlice<ONIONRECORD, keyof ONIONRECORD, unknown>[];
     getOnionsEnabledCached(_selector?: string | boolean, matchThis?: any, ...matchArgs: any[]): IOnionSlice<ONIONRECORD, keyof ONIONRECORD, unknown>[];
     getOnionsEnabledOfMeta(useCache: boolean, beanName: keyof IMetaNameRecord, selector?: string | boolean, matchThis?: any, ...matchArgs: any[]): IOnionSlice<ONIONRECORD, keyof ONIONRECORD, unknown>[];
@@ -27,7 +30,7 @@ export declare class ServiceOnion<ONIONRECORD> extends BeanBase {
     get composedOnionsGlobal(): Function[];
     private _composeOnionsGlobal;
     private _composeOnionsHandler;
-    _collectOnionsHandler(ctx: VonaContext | undefined): IOnionSlice<ONIONRECORD, keyof ONIONRECORD, unknown>[];
+    _collectOnionsHandler(route: ContextRoute | undefined): IOnionSlice<ONIONRECORD, keyof ONIONRECORD, unknown>[];
     getOnionOptions<T extends keyof ONIONRECORD>(onionName: T): ONIONRECORD[T] | undefined;
     getOnionOptionsDynamic<T extends keyof ONIONRECORD>(onionName: T, optionsCustom?: Partial<ONIONRECORD[T]>): ONIONRECORD[T];
     combineOnionOptions<T extends keyof ONIONRECORD>(item: IOnionSlice<ONIONRECORD, T>, optionsCustom?: Partial<ONIONRECORD[T]>): ONIONRECORD[T];

package/dist/types/onion.d.ts

@@ -30,6 +30,8 @@ export interface IOnionOptionsMeta extends VonaOnionOptionsMeta {
 }
 export interface IOnionOptionsBase<T extends string> extends IOnionOptionsEnable, IOnionOptionsMatch<TypeOnionOptionsMatchRule<T>> {
 }
+export interface TypeOnionOptionsBaseSimple<T extends string> extends TypeOnionOptionsEnableSimple, IOnionOptionsMatch<TypeOnionOptionsMatchRule<T>> {
+}
 export interface IOnionSlice<ONIONRECORD = unknown, ONIONNAME extends keyof ONIONRECORD = any, T = unknown> {
     name: ONIONNAME;
     beanOptions: IDecoratorBeanOptionsBase<T, ONIONRECORD[ONIONNAME]>;

package/package.json

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