vona-core 5.0.130 → 5.0.132

package/dist/index.js

@@ -9,7 +9,6 @@ import { compose as compose$1 } from '@cabloy/compose';
 import { extend } from '@cabloy/extend';
 import fse from 'fs-extra';
 import * as uuid from 'uuid';
-import React from 'react';
 import { setLocaleErrors, setLocaleAdapter, translateError } from '@cabloy/zod-errors-custom';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import { setParseAdapter } from '@cabloy/zod-query';
@@ -25,6 +24,7 @@ import DailyRotateFile from 'winston-daily-rotate-file';
 import os from 'node:os';
 import { MESSAGE, LEVEL } from 'triple-beam';
 import cluster from 'node:cluster';
+import React from 'react';
 import { extendZodWithOpenApi } from '@cabloy/zod-to-openapi';
 import { z } from 'zod';
 import * as Retry from 'retry';
@@ -46,10 +46,6 @@ class BeanSimple {
   }
 }
 
-const localeDefault = {
-  modules: {}
-};
-
 const EnumAppEvent = {
   AppStarted: 'eb:event:appStarted',
   AppStartError: 'eb:event:appStartError'
@@ -541,6 +537,7 @@ function copyMetadataOfClasses(target, sources, transform) {
 const SymbolDecoratorBeanFullName = Symbol('SymbolDecoratorBeanFullName');
 const SymbolDecoratorBeanInfo = Symbol('SymbolDecoratorBeanInfo');
 const SymbolDecoratorProxyDisable = Symbol('SymbolDecoratorProxyDisable');
+const SymbolDecoratorGlobal = Symbol('SymbolDecoratorGlobal');
 const SymbolDecoratorVirtual = Symbol('SymbolDecoratorVirtual');
 const SymbolDecoratorUse = Symbol('SymbolDecoratorUse');
 class AppResource extends BeanSimple {
@@ -830,6 +827,13 @@ function createBeanDecorator(scene, options, optionsPrimitive, fn) {
   };
 }
 
+function Global() {
+  return function (target) {
+    // set metadata
+    appMetadata.defineMetadata(SymbolDecoratorGlobal, true, target);
+  };
+}
+
 function ProxyDisable() {
   return function (target) {
     // set metadata
@@ -1742,7 +1746,7 @@ function isLocaleMagic(str) {
 
 class AppLocale extends BeanSimple {
   get current() {
-    return this.ctx.locale;
+    return this.ctx ? this.ctx.locale : 'en-us';
   }
   set current(value) {
     this.ctx.locale = value;
@@ -2695,8 +2699,9 @@ function jsxEnhance() {
 function _translateJsxRender(component) {
   if (typeof component !== 'object' || !component.$$typeof) return component;
   const componentNew = {};
-  componentNew.$$typeof = 'zova-jsx';
-  componentNew.type = typeof component.type === 'function' ? component.type() : component.type;
+  const type = typeof component.type === 'function' ? component.type() : component.type;
+  componentNew.$$typeof = type === 'action' ? 'zova-jsx:event' : 'zova-jsx:component';
+  componentNew.type = type;
   componentNew.key = component.key;
   componentNew.props = {
     ...component.props
@@ -2786,10 +2791,14 @@ async function loadLocales (app, modules) {
   // load locales
   await loadLocales();
   async function loadLocales() {
-    const locales = (await app.options.locales()).locales;
-    // project locales
-    for (const locale in locales) {
-      _initLocales(locale, locales[locale]);
+    const localesAll = await app.options.locales();
+    // project locales default
+    for (const locale in localesAll.localesDefault) {
+      _initLocales(locale, localesAll.localesDefault[locale]);
+    }
+    // project locales modules
+    for (const locale in localesAll.localesModules) {
+      _initLocales(locale, localesAll.localesModules[locale]);
     }
     // app cache
     app.meta.hmrCacheLocaleModules = deepExtend({}, app.meta.localeModules);
@@ -3303,4 +3312,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, isLocaleMagic, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, text, 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, Global, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorGlobal, 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, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, text, useApp, usePrepareArg, usePrepareArgs, uuidv4 };

package/dist/lib/core/resource.d.ts

@@ -5,6 +5,7 @@ import { BeanSimple } from '../bean/beanSimple.ts';
 export declare const SymbolDecoratorBeanFullName: unique symbol;
 export declare const SymbolDecoratorBeanInfo: unique symbol;
 export declare const SymbolDecoratorProxyDisable: unique symbol;
+export declare const SymbolDecoratorGlobal: unique symbol;
 export declare const SymbolDecoratorVirtual: unique symbol;
 export declare const SymbolDecoratorUse: unique symbol;
 export type IAppResourceRecord = Record<string, IDecoratorBeanOptionsBase>;

package/dist/lib/decorator/class/global.d.ts

@@ -0,0 +1 @@
+export declare function Global(): ClassDecorator;

package/dist/lib/decorator/class/index.d.ts

@@ -1,5 +1,6 @@
 export * from './beanInfo.ts';
 export * from './createBeanDecorator.ts';
+export * from './global.ts';
 export * from './proxyDisable.ts';
 export * from './use.ts';
 export * from './virtual.ts';

package/dist/types/application/app.d.ts

@@ -8,15 +8,17 @@ export interface VonaModulesMeta {
     modules: Record<string, IModule>;
     moduleNames: string[];
 }
+export interface IBootstrapOptionsLocales {
+    localesDefault: {};
+    localesModules: VonaLocaleOptionalMap;
+}
 export type TypeBootstrapOptionsModulesMeta = () => Promise<{
     modulesMeta: VonaModulesMeta;
 }>;
 export type TypeBootstrapOptionsConfig = () => Promise<{
     default: TypeAppInfoConfig[];
 }>;
-export type TypeBootstrapOptionsLocales = () => Promise<{
-    locales: VonaLocaleOptionalMap;
-}>;
+export type TypeBootstrapOptionsLocales = () => Promise<IBootstrapOptionsLocales>;
 export interface KoaApplicationOptions {
     env?: string | undefined;
     keys?: string[] | undefined;

package/dist/types/config/locale.d.ts

@@ -1,11 +1,8 @@
 import type { ILocaleRecord } from '../../lib/bean/resource/locale/type.ts';
 import type { IBeanScopeLocale } from '../../lib/bean/type.ts';
 import type { PowerPartial } from '../utils/powerPartial.ts';
-export declare const localeDefault: {
-    modules: {};
-};
-export type VonaLocale = {
+export interface VonaLocale {
     modules: IBeanScopeLocale;
-} & typeof localeDefault;
+}
 export type VonaLocaleOptional = PowerPartial<VonaLocale>;
 export type VonaLocaleOptionalMap = Record<keyof ILocaleRecord, VonaLocaleOptional>;

package/dist/types/interface/index.d.ts

@@ -2,4 +2,3 @@ export * from './bootstrap.ts';
 export * from './logger.ts';
 export * from './module.ts';
 export * from './monkey.ts';
-export * from './react.ts';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.130",
+  "version": "5.0.132",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -26,13 +26,13 @@
   ],
   "dependencies": {
     "@cabloy/compose": "^2.0.15",
-    "@cabloy/extend": "^3.1.11",
+    "@cabloy/extend": "^3.1.13",
     "@cabloy/json5": "^1.0.19",
     "@cabloy/localeutil": "^2.0.11",
-    "@cabloy/module-info": "^1.3.37",
-    "@cabloy/module-info-pro": "^1.0.44",
+    "@cabloy/module-info": "^1.3.41",
+    "@cabloy/module-info-pro": "^1.0.45",
     "@cabloy/type-fest": "^5.3.1",
-    "@cabloy/utils": "^2.0.16",
+    "@cabloy/utils": "^2.0.18",
     "@cabloy/word-utils": "^2.0.2",
     "@cabloy/zod-errors-custom": "^2.0.6",
     "@cabloy/zod-openapi": "^1.0.8",

package/dist/types/interface/react.d.ts

@@ -1,7 +0,0 @@
-import 'react';
-declare module 'react' {
-    interface HTMLAttributes<T> {
-        name?: string;
-        value?: string;
-    }
-}