vona-core 5.0.52 → 5.0.54

package/dist/lib/bean/beanBaseSimple.d.ts

@@ -1,13 +1,16 @@
 import type { IDecoratorBeanOptionsBase } from '../decorator/interface/beanOptions.ts';
 import { BeanSimple } from './beanSimple.ts';
 export declare const SymbolBeanFullName: unique symbol;
+export declare const SymbolBeanInstanceKey: unique symbol;
 export declare const SymbolModuleBelong: unique symbol;
 export declare const SymbolModuleName: unique symbol;
 export declare class BeanBaseSimple extends BeanSimple {
     private [SymbolBeanFullName];
+    private [SymbolBeanInstanceKey];
     protected get [SymbolModuleBelong](): string;
     protected get [SymbolModuleName](): string | undefined;
     get $beanFullName(): string;
+    get $beanInstanceKey(): string;
     protected get $beanOptions(): IDecoratorBeanOptionsBase;
     get $onionName(): string;
     protected get $onionOptions(): unknown | undefined;

package/dist/lib/bean/beanBaseSimple.js

@@ -1,10 +1,12 @@
 import { appResource } from "../core/resource.js";
 import { BeanSimple } from "./beanSimple.js";
 export const SymbolBeanFullName = Symbol('SymbolBeanFullName');
+export const SymbolBeanInstanceKey = Symbol('SymbolBeanInstanceKey');
 export const SymbolModuleBelong = Symbol('SymbolModuleBelong');
 export const SymbolModuleName = Symbol('SymbolModuleName');
 export class BeanBaseSimple extends BeanSimple {
     [SymbolBeanFullName];
+    [SymbolBeanInstanceKey];
     get [SymbolModuleBelong]() {
         return appResource._getModuleBelong(this[SymbolBeanFullName]);
     }
@@ -14,6 +16,9 @@ export class BeanBaseSimple extends BeanSimple {
     get $beanFullName() {
         return this[SymbolBeanFullName];
     }
+    get $beanInstanceKey() {
+        return this[SymbolBeanInstanceKey];
+    }
     get $beanOptions() {
         return appResource.getBean(this[SymbolBeanFullName]);
     }

package/dist/lib/bean/beanContainer.d.ts

@@ -11,6 +11,7 @@ export declare class BeanContainer {
     private [SymbolBeanContainerInstances];
     static create(app: VonaApplication, ctx: VonaContext | undefined): BeanContainer;
     protected constructor(app: VonaApplication, ctx: VonaContext | undefined);
+    disposeInstance(beanInstanceKey: string): Promise<void>;
     /** get specific module's scope */
     scope<K extends TypeBeanScopeRecordKeys>(moduleScope: K): IBeanScopeRecord[K];
     _getBean<T>(A: Constructable<T>, ...args: any[]): T;

package/dist/lib/bean/beanContainer.js

@@ -6,7 +6,7 @@ import { __prepareInjectSelectorInfo } from "../decorator/index.js";
 import { compose } from "../utils/util.js";
 import { BeanAopBase } from "./beanAopBase.js";
 import { BeanBase } from "./beanBase.js";
-import { SymbolBeanFullName } from "./beanBaseSimple.js";
+import { SymbolBeanFullName, SymbolBeanInstanceKey } from "./beanBaseSimple.js";
 import { BeanSimple } from "./beanSimple.js";
 const SymbolProxyMagic = Symbol('SymbolProxyMagic');
 const SymbolProxyAopMethod = Symbol('SymbolProxyAopMethod');
@@ -45,6 +45,15 @@ export class BeanContainer {
         }
         this[SymbolBeanContainerInstances] = {};
     }
+    async disposeInstance(beanInstanceKey) {
+        const beanInstance = this[SymbolBeanContainerInstances][beanInstanceKey];
+        if (beanInstance) {
+            if (!(beanInstance instanceof BeanAopBase) && beanInstance.__dispose__) {
+                await beanInstance.__dispose__();
+            }
+            delete this[SymbolBeanContainerInstances][beanInstanceKey];
+        }
+    }
     // scope<T>(moduleScope: string): T;
     scope(moduleScope) {
         return this._getBean(`${moduleScope}.scope.module`);
@@ -103,6 +112,7 @@ export class BeanContainer {
             const fullName = appResource.getBeanFullName(beanFullName);
             if (fullName) {
                 const key = __getSelectorKey(fullName, withSelector, args[0]);
+                __setPropertyValue(beanInstance, SymbolBeanInstanceKey, key);
                 this[SymbolBeanContainerInstances][key] = beanInstance;
             }
         }

package/dist/lib/bean/beanSimple.d.ts

@@ -3,5 +3,5 @@ import type { VonaApplication } from '../core/application.ts';
 export declare class BeanSimple {
     protected app: VonaApplication;
     protected get ctx(): VonaContext;
-    protected get bean(): import("vona").BeanContainer;
+    protected get bean(): import("./beanContainer.ts").BeanContainer;
 }

package/dist/lib/bean/resource/locale/appLocale.d.ts

@@ -1,7 +1,7 @@
 import type { ILocaleInfos } from './type.ts';
 import { BeanSimple } from '../../beanSimple.ts';
 export declare class AppLocale extends BeanSimple {
-    get locale(): keyof ILocaleInfos;
-    set locale(value: keyof ILocaleInfos);
+    get current(): keyof ILocaleInfos;
+    set current(value: keyof ILocaleInfos);
     getText<T extends keyof ILocaleInfos>(supportCustomMessage: boolean, moduleScope: string | undefined, locale: T | undefined, key: string, ...args: any[]): string;
 }

package/dist/lib/bean/resource/locale/appLocale.js

@@ -2,10 +2,10 @@ import * as localeutil from '@cabloy/localeutil';
 import { BeanSimple } from "../../beanSimple.js";
 import { LocaleModuleNameSeparator } from "./type.js";
 export class AppLocale extends BeanSimple {
-    get locale() {
+    get current() {
         return this.ctx.locale;
     }
-    set locale(value) {
+    set current(value) {
         this.ctx.locale = value;
     }
     /** @internal */
@@ -40,6 +40,6 @@ export class AppLocale extends BeanSimple {
             moduleScope = key.substring(0, pos);
             key = key.substring(pos + LocaleModuleNameSeparator.length);
         }
-        return localeutil.getLocaleText(supportCustomMessage, moduleScope ? this.app.meta.localeModules[moduleScope] : undefined, this.app.meta.locales, locale || this.locale, key, ...args);
+        return localeutil.getLocaleText(supportCustomMessage, moduleScope ? this.app.meta.localeModules[moduleScope] : undefined, this.app.meta.locales, locale || this.current, key, ...args);
     }
 }

package/dist/lib/utils/zod-enhance.d.ts

@@ -1,5 +1,5 @@
-import type { ILocaleInfos } from 'vona';
 import type z from 'zod';
+import type { ILocaleInfos } from '../bean/resource/locale/type.ts';
 import type { VonaApplication } from '../core/application.ts';
 export type ZodLocaleError = () => {
     localeError: z.core.$ZodErrorMap;

package/dist/lib/utils/zod-enhance.js

@@ -9,6 +9,6 @@ export function zodEnhance(app) {
 }
 export function zodSetLocaleErrors(app, localeErrors, localeDefault) {
     setLocaleErrors(() => {
-        return app.meta.locale.locale;
+        return app.meta.locale.current;
     }, localeErrors, localeDefault);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.52",
+  "version": "5.0.54",
   "description": "vona",
   "publishConfig": {
     "access": "public"