vona-core 5.0.108 → 5.0.110

package/dist/index.js

@@ -318,8 +318,9 @@ function prepareEnv(env) {
 function beanFullNameFromOnionName(onionName, sceneName) {
   return onionName.replace(':', `.${sceneName}.`);
 }
-function onionNameFromBeanFullName(beanFullName, sceneName) {
-  return beanFullName.replace(`.${sceneName}.`, ':');
+function onionNameFromBeanFullName(beanFullName) {
+  const parts = beanFullName.split('.');
+  return `${parts[0]}:${parts[2]}`;
 }
 function filterHeaders(headers, whitelist) {
   if (!headers) return;
@@ -695,8 +696,7 @@ class BeanBaseSimple extends BeanSimple {
     return appResource.getBean(this[SymbolBeanFullName]);
   }
   get $onionName() {
-    const parts = this.$beanFullName.split('.');
-    return `${parts[0]}:${parts[2]}`;
+    return onionNameFromBeanFullName(this.$beanFullName);
   }
   get $onionOptions() {
     return this.$beanOptions.options;
@@ -1729,6 +1729,7 @@ class AppLocale extends BeanSimple {
   }
   getText(supportCustomMessage, moduleScope, locale, key, ...args) {
     if (!key) return key;
+    if (typeof key === 'object') key = String(key);
     if (typeof key !== 'string') throw new Error(`${key} should be string`);
     const pos = key.indexOf(LocaleModuleNameSeparator);
     if (pos > -1) {
@@ -1756,7 +1757,19 @@ class BeanScopeLocale extends BeanSimple {
 }
 
 function $localeScope(moduleName, key) {
-  return `${moduleName}::${String(key)}`;
+  return $makeLocaleMagic(`${moduleName}::${String(key)}`);
+}
+function $makeLocaleMagic(str) {
+  return {
+    toString() {
+      return str;
+    },
+    toJSON() {
+      if (!str || !str.includes(LocaleModuleNameSeparator)) return str;
+      const app = useApp();
+      return app.meta.text(str);
+    }
+  };
 }
 
 const BeanModuleScope$1 = Symbol('BeanScopeScene#ModuleScope');
@@ -2998,6 +3011,14 @@ function handleProcessMaster(workers) {
     // console.log(`----------------- worker ${_worker.process.pid} died`, _code, _signal);
     if (cluster.workers && Object.keys(cluster.workers).length === 0) {
       clearTimeout(__timeout);
+      // log
+      const app = useApp();
+      if (app.meta.env.LOGGER_DUMMY !== 'true') {
+        const message = `Master shutdown gracefully: ${process.pid}`;
+        // eslint-disable-next-line
+        console.log(chalk.cyan(message));
+      }
+      // exit
       process.exit(0);
     }
   });
@@ -3216,4 +3237,4 @@ function prepareNativeBinding(nativeBinding) {
 
 zodExtendOpenApi();
 
-export { $Class, $customKey, $localeScope, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, instanceDesp, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, useApp, usePrepareArg, usePrepareArgs, uuidv4 };
+export { $Class, $customKey, $localeScope, $makeLocaleMagic, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, instanceDesp, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, useApp, usePrepareArg, usePrepareArgs, uuidv4 };

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

@@ -15,3 +15,7 @@ export interface ILocaleRecord {
     'en-us': never;
     'zh-cn': never;
 }
+export interface ILocaleMagic<T extends string = string> {
+    toString: () => T;
+    toJSON(): () => T;
+}

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

@@ -1,2 +1,4 @@
 import type { IBeanScopeLocale } from '../../type.ts';
-export declare function $localeScope<M extends keyof IBeanScopeLocale, K extends keyof IBeanScopeLocale[M]>(moduleName: M, key: K): `${M}::${K extends string ? K : never}`;
+import type { ILocaleMagic } from './type.ts';
+export declare function $localeScope<M extends keyof IBeanScopeLocale, K extends keyof IBeanScopeLocale[M]>(moduleName: M, key: K): ILocaleMagic<`${M}::${K extends string ? K : never}`>;
+export declare function $makeLocaleMagic<T extends string>(str: T): ILocaleMagic<T>;

package/dist/lib/utils/util.d.ts

@@ -59,7 +59,7 @@ export declare function polyfillDispose(instance: any): void;
 export declare function pathToHref(fileName: string): string;
 export declare function prepareEnv(env: Partial<NodeJS.ProcessEnv>): VonaConfigEnv;
 export declare function beanFullNameFromOnionName(onionName: string, sceneName: keyof IBeanSceneRecord): keyof IBeanRecord;
-export declare function onionNameFromBeanFullName(beanFullName: string, sceneName: keyof IBeanSceneRecord): string;
+export declare function onionNameFromBeanFullName(beanFullName: string): string;
 export declare function filterHeaders(headers: object | undefined, whitelist: string[]): {} | undefined;
 export declare function combineFilePathSafe(dir: string, file: string): string;
 export declare function loadJSONFile(fileName: string): Promise<any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.108",
+  "version": "5.0.110",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -36,9 +36,9 @@
     "@cabloy/utils": "^1.0.49",
     "@cabloy/word-utils": "^2.0.1",
     "@cabloy/zod-errors-custom": "^2.0.4",
-    "@cabloy/zod-openapi": "^1.0.7",
+    "@cabloy/zod-openapi": "^1.0.8",
     "@cabloy/zod-query": "^2.0.4",
-    "@cabloy/zod-to-openapi": "^8.1.4",
+    "@cabloy/zod-to-openapi": "^8.1.5",
     "chalk": "^5.3.0",
     "fs-extra": "^10.1.0",
     "koa": "^3.0.0",