vona-core 5.0.129 → 5.0.131

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';
 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';
@@ -541,6 +541,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 +831,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 +1750,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;
@@ -2685,6 +2693,34 @@ function __formatLoggerFilterCheckInfo(info) {
   return info;
 }
 
+function jsxEnhance() {
+  const createElementOriginal = React.createElement;
+  React.createElement = function (...args) {
+    const component = createElementOriginal(...args);
+    return _translateJsxRender(component);
+  };
+}
+function _translateJsxRender(component) {
+  if (typeof component !== 'object' || !component.$$typeof) return component;
+  const componentNew = {};
+  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
+  };
+  const children = componentNew.props.children;
+  if (children) {
+    if (Array.isArray(children)) {
+      componentNew.props.children = children.map(item => _translateJsxRender(item));
+    } else if (typeof children === 'object' && !children.toJSON) {
+      componentNew.props.children = _translateJsxRender(children);
+    }
+  }
+  return componentNew;
+}
+
 async function loadConfig (app, modules) {
   app.meta.hmrCacheConfigModules = deepExtend({}, app.config.modules);
   // load configs
@@ -2985,6 +3021,7 @@ function __createApp({
 }) {
   // patch zod, should before config
   zodEnhance();
+  jsxEnhance();
   // env
   const env2 = prepareEnv(env);
   // appInfo
@@ -3275,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, localeDefault, 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/lib/utils/jsx-enhance.d.ts

@@ -0,0 +1 @@
+export declare function jsxEnhance(): void;

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.129",
+  "version": "5.0.131",
   "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.17",
     "@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;
-    }
-}