vona-core 5.0.114 → 5.0.115

package/dist/index.js

@@ -1691,6 +1691,53 @@ const errorsInternal = {
 
 const LocaleModuleNameSeparator = '::';
 
+function $localeScope(moduleName, key, ...args) {
+  return $makeLocaleMagic(`${moduleName}::${String(key)}`, ...args);
+}
+function $makeLocaleMagic(str, ...args) {
+  return {
+    toString() {
+      return str;
+    },
+    toJSON() {
+      if (!str || !str.includes(LocaleModuleNameSeparator)) return str;
+      const app = useApp();
+      return app.meta.text(str, ...args);
+    }
+  };
+}
+function text(strings, ...expressions) {
+  return {
+    toString() {
+      let result = '';
+      for (let i = 0; i < expressions.length; i++) {
+        result += strings[i];
+        result += expressions[i];
+      }
+      return result;
+    },
+    toJSON() {
+      const app = useApp();
+      let result = '';
+      for (let i = 0; i < strings.length; i++) {
+        result += strings[i];
+        if (i < expressions.length) {
+          const expression = app.meta.text(expressions[i]);
+          if (typeof expression === 'string' || isLocaleMagic(expression)) {
+            result += app.meta.text(expression);
+          } else {
+            result += expression;
+          }
+        }
+      }
+      return result;
+    }
+  };
+}
+function isLocaleMagic(str) {
+  return typeof str === 'object' && cast(str).toJSON;
+}
+
 class AppLocale extends BeanSimple {
   get current() {
     return this.ctx.locale;
@@ -1730,7 +1777,9 @@ class AppLocale extends BeanSimple {
   }
   getText(supportCustomMessage, moduleScope, locale, key, ...args) {
     if (!key) return key;
-    if (typeof key === 'object') key = String(key);
+    if (isLocaleMagic(key)) {
+      return cast(key).toJSON();
+    }
     if (typeof key !== 'string') throw new Error(`${key} should be string`);
     const pos = key.indexOf(LocaleModuleNameSeparator);
     if (pos > -1) {
@@ -1757,22 +1806,6 @@ class BeanScopeLocale extends BeanSimple {
   }
 }
 
-function $localeScope(moduleName, 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');
 const BeanModuleScene = Symbol('BeanScopeScene#BeanModuleScene');
 class BeanScopeScene extends BeanSimple {
@@ -3238,4 +3271,4 @@ function prepareNativeBinding(nativeBinding) {
 
 zodExtendOpenApi();
 
-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 };
+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, isLocaleMagic, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, text, useApp, usePrepareArg, usePrepareArgs, uuidv4 };

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

@@ -5,5 +5,5 @@ export declare class AppLocale extends BeanSimple {
     set current(value: keyof ILocaleRecord);
     get tz(): string | undefined;
     set tz(value: string | undefined);
-    getText<T extends keyof ILocaleRecord>(supportCustomMessage: boolean, moduleScope: string | undefined, locale: T | undefined, key: string, ...args: any[]): string;
+    getText<T extends keyof ILocaleRecord>(supportCustomMessage: boolean, moduleScope: string | undefined, locale: T | undefined, key: string | object, ...args: any[]): string;
 }

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

@@ -4,8 +4,8 @@ export interface IModuleLocale {
     locale: <T extends keyof ILocaleRecord>(locale: T, ...args: any[]) => string;
 }
 export interface IModuleLocaleText {
-    (text: string, ...args: any[]): string;
-    locale: <T extends keyof ILocaleRecord>(locale: T, text: string, ...args: any[]) => string;
+    (text: string | object, ...args: any[]): string;
+    locale: <T extends keyof ILocaleRecord>(locale: T, text: string | object, ...args: any[]) => string;
 }
 export type TypeModuleLocales<T> = {
     [prop in keyof T]: IModuleLocale;

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

@@ -1,4 +1,6 @@
 import type { IBeanScopeLocale } from '../../type.ts';
 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>;
+export declare function $localeScope<M extends keyof IBeanScopeLocale, K extends keyof IBeanScopeLocale[M]>(moduleName: M, key: K, ...args: any[]): ILocaleMagic<`${M}::${K extends string ? K : never}`>;
+export declare function $makeLocaleMagic<T extends string>(str: T, ...args: any[]): ILocaleMagic<T>;
+export declare function text(strings: any, ...expressions: any): ILocaleMagic;
+export declare function isLocaleMagic(str: string | object): any;

package/package.json

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