vona-core 5.1.10 → 5.1.13

package/dist/index.js

@@ -614,7 +614,7 @@ class AppResource extends BeanSimple {
     if (!scene) scene = 'bean';
     scene = scene.replace(/\./g, '');
     // bean class name
-    const beanClassName = this._fixClassName(beanClass.name);
+    const beanClassName = beanClass.name;
     if (beanClassName.toLocaleUpperCase().startsWith(scene.toLocaleUpperCase())) {
       name = beanClassName.substring(scene.length);
     } else {
@@ -648,12 +648,6 @@ class AppResource extends BeanSimple {
     const beanOptions = this.getBean(beanFullName);
     return beanOptions?.module;
   }
-  _fixClassName(className) {
-    while (className.endsWith('2')) {
-      className = className.substring(0, className.length - 1);
-    }
-    return className;
-  }
   _prepareOnionOptions(options, optionsPrimitive, scene, name) {
     const app = useApp();
     if (!app?.config && scene !== 'scope') {
@@ -666,6 +660,13 @@ class AppResource extends BeanSimple {
       return deepExtend({}, options, optionsConfig);
     }
   }
+
+  // _fixClassName(className: string) {
+  //   while (className.endsWith('2')) {
+  //     className = className.substring(0, className.length - 1);
+  //   }
+  //   return className;
+  // }
 }
 const appResource = new AppResource();
 
@@ -2278,7 +2279,6 @@ class AppMeta extends BeanSimple {
     this.isProd = void 0;
     this.isTest = void 0;
     this.isDev = void 0;
-    this.isLocal = void 0;
     this.error = void 0;
     this.logger = void 0;
     this.locale = void 0;
@@ -2348,7 +2348,6 @@ class AppMeta extends BeanSimple {
     this.isProd = mode === 'prod';
     this.isTest = mode === 'test';
     this.isDev = mode === 'dev';
-    this.isLocal = this.isTest || this.isDev;
   }
   async waitAppStarted() {
     return new Promise((resolve, reject) => {
@@ -2721,16 +2720,27 @@ function jsxEnhance() {
     return _translateJsxRender(component);
   };
 }
+function _checkIfJsxEvent(type) {
+  return ['ZovaEvent', 'ZovaCommands'].includes(type) || type.includes('.command.');
+}
 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';
+  const type = typeof component.type === 'function' ? component.type(component.props) : component.type;
+  componentNew.$$typeof = _checkIfJsxEvent(type) ? 'zova-jsx:event' : 'zova-jsx:component';
   componentNew.type = type;
   componentNew.key = component.key;
-  componentNew.props = {
-    ...component.props
-  };
+  if (componentNew.$$typeof === 'zova-jsx:component' && typeof type === 'string' && type.includes(':')) {
+    componentNew.props = {
+      ...component.props,
+      ...component.props?.options
+    };
+    delete componentNew.props.options;
+  } else {
+    componentNew.props = {
+      ...component.props
+    };
+  }
   const children = componentNew.props.children;
   if (children) {
     if (Array.isArray(children)) {
@@ -3280,7 +3290,7 @@ function zodExtendOpenApi() {
   };
 }
 
-function $customKey(key) {
+function $protocolKey(key) {
   return key;
 }
 
@@ -3332,5 +3342,5 @@ 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, 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, formatLoggerErrors, 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 };
+export { $Class, $localeScope, $makeLocaleMagic, $protocolKey, 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, formatLoggerErrors, 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 };
 //# sourceMappingURL=index.js.map