zova-jsx 1.1.20 → 1.1.22

package/dist/index.js

@@ -1,9 +1,9 @@
 import { compose } from '@cabloy/compose';
-import { celEnvBase, getProperty, evaluateExpressions, isPromise } from '@cabloy/utils';
+import { celEnvBase, getProperty, evaluateExpressions, isEmptyObject, isNil, isPromise } from '@cabloy/utils';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import { classes } from 'typestyle';
 import { h, createTextVNode } from 'vue';
-import { BeanSimple, objectAssignReactive, cast, beanFullNameFromOnionName, deepExtend } from 'zova-core';
+import { BeanSimple, objectAssignReactive, cast, beanFullNameFromOnionName } from 'zova-core';
 
 const renderFieldJsxPropsSystem = ['children', 'v-slot', 'v-slot-scope', 'v-if', 'v-for', 'v-each', 'key'];
 
@@ -162,9 +162,7 @@ class ZovaJsx extends BeanSimple {
         const actionChildPrev = actionChildren[index - 1];
         const resName = cast(actionChildPrev.props)?.res;
         if (resName) {
-          celScope = objectAssignReactive({}, celScope, {
-            [resName]: actionRes
-          });
+          celScope[resName] = actionRes;
         }
       }
       // vIf
@@ -173,9 +171,7 @@ class ZovaJsx extends BeanSimple {
       // action
       if (actionChild.type === 'actionVar') {
         const props = this.renderJsxProps(actionChild.props, {}, celScope, renderContext);
-        celScope = objectAssignReactive({}, celScope, {
-          [cast(props).name]: cast(props).value
-        });
+        celScope[cast(props).name] = cast(props).value;
         return next(undefined);
       } else if (actionChild.type === 'actionExpr') {
         const expression = this.evaluateExpression(cast(actionChild.props)?.expression, celScope);
@@ -211,8 +207,9 @@ class ZovaJsx extends BeanSimple {
     const onionOptions = beanInstance.$onionOptions;
     // props
     let props = this.renderJsxProps(actionChild.props, {}, celScope, renderContext);
-    if (onionOptions) {
-      props = deepExtend({}, onionOptions, props);
+    if (!isEmptyObject(onionOptions)) {
+      // not use deepExtend, maybe: Maximum call stack size exceeded
+      props = Object.assign({}, onionOptions, props);
     }
     if (!renderContext) throw new Error('should provide renderContext');
     return beanInstance.execute(props, renderContext, next);
@@ -374,9 +371,17 @@ class ZovaJsx extends BeanSimple {
       if (isJsxComponent(jsxChild)) {
         if (jsxChild.type === 'var') {
           const props = this.renderJsxProps(jsxChild.props, {}, celScope, renderContext);
-          celScope = objectAssignReactive({}, celScope, {
-            [cast(props).name]: cast(props).value
-          });
+          celScope[cast(props).name] = cast(props).value;
+          child = undefined;
+        } else if (jsxChild.type === 'log') {
+          const props = this.renderJsxProps(jsxChild.props, {}, celScope, renderContext);
+          const name = cast(props).name;
+          const message = cast(props).message;
+          if (isNil(name)) {
+            console.log(message);
+          } else {
+            console.log(name, message);
+          }
           child = undefined;
         } else {
           child = this.render(jsxChild, undefined, celScope, renderContext);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.20",
-  "gitHead": "105e4dce1e85740f1f8a7ba9add2029beeaf9316",
+  "version": "1.1.22",
+  "gitHead": "8d42f31a8ee23be4564814a901d770307635c849",
   "description": "Zova JSX",
   "keywords": [
     "ioc",
@@ -41,10 +41,10 @@
   },
   "dependencies": {
     "@cabloy/compose": "^2.1.4",
-    "@cabloy/utils": "^2.1.6",
+    "@cabloy/utils": "^2.1.9",
     "@cabloy/word-utils": "^2.1.8",
     "typestyle": "^2.4.0",
     "vue": "^3.5.32",
-    "zova-core": "^5.1.20"
+    "zova-core": "^5.1.21"
   }
 }