babel-plugin-vasille 4.2.5 → 4.3.1

package/README.md

@@ -104,6 +104,10 @@ All of these are supported:
 
 ## Change log
 
+### 4.3.0
+
+Add new function `safe` which make functions safe, errors are reported automatically.
+
 ### 4.2.0
 
 Add support for inlined conditions in JSX, binary `&&` and ternary `?:` operator.

package/lib/mesh.js

@@ -874,6 +874,7 @@ function composeExpression(path, internal) {
     switch (expr && expr.type) {
         case "CallExpression":
         case "OptionalCallExpression": {
+            /* istanbul ignore else */
             if ((0, call_js_1.calls)(path, ["watch"], internal)) {
                 (0, lib_js_1.parseCalculateCall)(path, internal);
                 const args = path.node.arguments;
@@ -887,16 +888,8 @@ function composeExpression(path, internal) {
             else if ((0, call_js_1.calls)(path, ["beforeMount", "afterMount"], internal)) {
                 const arg = path.get("arguments")[0];
                 if (arg && (arg.isFunctionExpression() || arg.isArrowFunctionExpression())) {
-                    const body = arg.isFunctionExpression() ? arg.get("body") : arg.get("body");
-                    /* istanbul ignore else */
-                    if (body.isBlockStatement()) {
-                        composeStatements(body.get("body"), internal);
-                        path.replaceWith(t.callExpression(arg.node, []));
-                    }
-                    else if (body.isExpression()) {
-                        composeExpression(body, internal);
-                        path.replaceWith(body);
-                    }
+                    meshFunction(arg, internal);
+                    path.replaceWith(t.callExpression(internal.safe(arg.node), []));
                 }
                 else {
                     (0, lib_js_1.err)(lib_js_1.Errors.IncorrectArguments, path, "Incorrect hint argument", internal);
@@ -908,9 +901,6 @@ function composeExpression(path, internal) {
                 }
                 path.get("callee").replaceWith(t.memberExpression(internal_js_1.ctx, t.identifier("runOnDestroy")));
             }
-            else {
-                meshExpression(path, internal);
-            }
             break;
         }
         case "JSXElement":
@@ -1050,13 +1040,12 @@ function composeStatement(path, internal) {
                         (0, lib_js_1.checkNonReactiveName)(idPath, internal);
                     }
                     // const s = new Set(), const m = new Map()
-                    else if (initPath.isNewExpression() && t.isIdentifier(initPath.node.callee)) {
-                        const name = initPath.node.callee.name;
-                        if (name === "Map" || name === "Set") {
-                            (0, lib_js_1.processModelCall)(initPath, name, kind === "const", internal, idName());
-                            meshInit = false;
-                            (0, lib_js_1.checkNonReactiveName)(idPath, internal);
-                        }
+                    else if (initPath.isNewExpression() &&
+                        t.isIdentifier(initPath.node.callee) &&
+                        ["Set", "Map"].includes(initPath.node.callee.name)) {
+                        (0, lib_js_1.processModelCall)(initPath, initPath.node.callee.name, kind === "const", internal, idName());
+                        meshInit = false;
+                        (0, lib_js_1.checkNonReactiveName)(idPath, internal);
                     }
                     else if (kind === "let") {
                         meshExpression(declaration.get("init"), internal);

package/lib/transformer.js

@@ -145,6 +145,7 @@ function transformProgram(path, filename, opts) {
         match: "VasilleMatch",
         set: "VasilleSet",
         Switch: "VasilleSwitch",
+        safe: "VasilleSafe",
     };
     function call(key, args) {
         used.add(key);
@@ -177,6 +178,7 @@ function transformProgram(path, filename, opts) {
         match: (name, arg) => call("match", arg ? [name, arg] : [name]),
         set: (obj, field, value) => call("set", [obj, field, value]),
         Switch: arg => call("Switch", [arg, internal_js_1.ctx]),
+        safe: (arg) => call("safe", [arg]),
     };
     function getCtx() {
         if (internal.isComposing)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-vasille",
-  "version": "4.2.5",
+  "version": "4.3.1",
   "description": "Convert Vasille Meta Language code to pure JavaScript",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -47,8 +47,8 @@
     "prettier": "^3.6.2",
     "ts-jest": "^29.4.1",
     "typescript": "^5.9.2",
-    "vasille": "^4.0.0",
-    "vasille-css": "^4.0.0",
-    "vasille-web": "^4.0.0"
+    "vasille": "^4.3.1",
+    "vasille-css": "^4.1.0",
+    "vasille-web": "^4.3.1"
   }
 }