zova-jsx 1.1.26 → 1.1.28

package/dist/index.js

@@ -3,7 +3,7 @@ import { celEnvBase, getProperty, evaluateExpressions, isEmptyObject, isNil, isP
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import { classes } from 'typestyle';
 import { h, createTextVNode } from 'vue';
-import { BeanSimple, objectAssignReactive, cast, beanFullNameFromOnionName } from 'zova-core';
+import { BeanSimple, objectAssignReactive, cast } from 'zova-core';
 
 const renderFieldJsxPropsSystem = ['children', 'v-slot', 'v-slot-scope', 'v-if', 'v-for', 'v-each', 'key'];
 
@@ -34,14 +34,12 @@ function normalizePropName(name) {
 }
 
 class ZovaJsx extends BeanSimple {
-  constructor(components, actions, celEnv) {
+  constructor(components, celEnv) {
     super();
     this._components = void 0;
-    this._actions = void 0;
     this._celEnv = void 0;
     this._transientObject = void 0;
     this._components = components;
-    this._actions = actions;
     this._celEnv = this._prepareCelEnv(celEnv ?? celEnvBase);
   }
   _prepareCelEnv(celEnv) {
@@ -72,9 +70,6 @@ class ZovaJsx extends BeanSimple {
   get components() {
     return this._components;
   }
-  get actions() {
-    return this._actions;
-  }
   get celEnv() {
     return this._celEnv;
   }
@@ -169,14 +164,7 @@ class ZovaJsx extends BeanSimple {
       const vIf = this.evaluateExpression(actionChild.props?.['v-if'], celScope);
       if (vIf === false) return next(undefined);
       // action
-      if (actionChild.type === 'actionVar') {
-        const props = this.renderJsxProps(actionChild.props, {}, celScope, renderContext);
-        celScope[cast(props).name] = cast(props).value;
-        return next(undefined);
-      } else if (actionChild.type === 'actionExpr') {
-        const expression = this.evaluateExpression(cast(actionChild.props)?.expression, celScope);
-        return next(expression);
-      } else if (isJsxEvent(actionChild)) {
+      if (actionChild.type === 'ActionActions') {
         // nested action
         eventRes[index] = [];
         return this.renderEventDirect(actionChild, objectAssignReactive({}, celScope), renderContext, eventRes[index], next);
@@ -188,8 +176,7 @@ class ZovaJsx extends BeanSimple {
   }
   _renderEventActionNormal(actionChild, celScope, renderContext, next) {
     // action
-    const actionName = this.normalizeAction(actionChild.type);
-    const beanFullName = beanFullNameFromOnionName(actionName, 'action');
+    const beanFullName = actionChild.type;
     const beanInstance = this.sys.bean._getBeanSyncOnly(beanFullName);
     if (beanInstance) {
       // sync
@@ -206,7 +193,7 @@ class ZovaJsx extends BeanSimple {
   _renderEventActionNormal_inner(beanInstance, actionChild, celScope, renderContext, next) {
     const onionOptions = beanInstance.$onionOptions;
     // props
-    let props = this.renderJsxProps(actionChild.props, {}, celScope, renderContext);
+    let props = this.renderJsxProps(cast(actionChild.props).options, {}, celScope, renderContext);
     if (!isEmptyObject(onionOptions)) {
       // not use deepExtend, maybe: Maximum call stack size exceeded
       props = Object.assign({}, onionOptions, props);
@@ -271,9 +258,6 @@ class ZovaJsx extends BeanSimple {
     // div/QInput/Zova Component
     return type;
   }
-  normalizeAction(type) {
-    return this.actions?.[type] ?? type;
-  }
   _renderJsxSingle(Component, componentJsx, props, celScope, renderContext) {
     const _isZovaComponent = isZovaComponent(Component);
     // key

package/dist/lib/zovaJsx.d.ts

@@ -5,16 +5,14 @@ import type { TypeRenderComponent, TypeRenderComponentJsx, TypeRenderComponentJs
 type CelEnv = typeof celEnvBase;
 export declare class ZovaJsx extends BeanSimple {
     private _components;
-    private _actions;
     private _celEnv;
     private _transientObject;
-    constructor(components?: {}, actions?: Record<string, string>, celEnv?: CelEnv);
+    constructor(components?: {}, celEnv?: CelEnv);
     private _prepareCelEnv;
     setTransientObject<T>(transientObject: {} | undefined, fnMethod: () => T): T;
     get transientObject(): any;
     get event(): Event | undefined;
     get components(): {} | undefined;
-    get actions(): Record<string, string> | undefined;
     get celEnv(): CelEnv;
     evaluateExpression(expression: any, celScope?: {}): any;
     renderJsxOrCel(componentJsx: TypeRenderComponent | any, props: {} | undefined, celScope?: {}, renderContext?: {}): any;
@@ -27,7 +25,6 @@ export declare class ZovaJsx extends BeanSimple {
     render(componentJsx: TypeRenderComponent, propsInit: {} | undefined, celScope?: {}, renderContext?: {}): VNode | VNode[] | undefined;
     normalizeComponenJsx(componentJsx: TypeRenderComponent, propsInit?: {}): TypeRenderComponentJsx;
     normalizeComponent(type: TypeRenderComponent): TypeRenderComponent;
-    normalizeAction(type: string): string;
     private _renderJsxSingle;
     renderJsxProps(jsxProps: TypeRenderComponentJsxProps | undefined, props: {}, celScope?: {}, renderContext?: {}): {};
     private _renderJsxChildrenCollect;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.26",
-  "gitHead": "a247f88a55c663d313296039f874560ee5a13e01",
+  "version": "1.1.28",
+  "gitHead": "6162f8e212146d3e5f98145fcf43adc52912694e",
   "description": "Zova JSX",
   "keywords": [
     "ioc",
@@ -45,6 +45,6 @@
     "@cabloy/word-utils": "^2.1.9",
     "typestyle": "^2.4.0",
     "vue": "^3.5.32",
-    "zova-core": "^5.1.24"
+    "zova-core": "^5.1.25"
   }
 }