vasille-jsx 4.2.0 → 4.3.0

package/lib/components.js

@@ -1,10 +1,15 @@
-import { ArrayModel, ArrayView, Fragment, MapModel, MapView, SetModel, SetView, SwitchedNode, userError, Watch as CoreWatch, } from "vasille";
+import { ArrayModel, ArrayView, Fragment, MapModel, MapView, reportError, safe, SetModel, SetView, SwitchedNode, userError, Watch as CoreWatch, } from "vasille";
 export function Slot({ model, slot, ...options }, ctx, defaultSlot) {
-    if (model) {
-        model(options, ctx);
+    try {
+        if (model) {
+            model(options, ctx);
+        }
+        else {
+            (slot ?? defaultSlot)?.({}, ctx);
+        }
     }
-    else {
-        (slot ?? defaultSlot)?.({}, ctx);
+    catch (e) {
+        reportError(e);
     }
 }
 export function Switch(options, ctx) {
@@ -35,20 +40,21 @@ export function For({ of: model, slot: _slot }, ctx, defaultSlot) {
     }
     // fallback if is used external Array/Map/Set
     else {
+        const safeSlot = safe(slot);
         console.warn("Vasille <For of/> fallback detected. Please provide reactive data.");
         if (model instanceof Array) {
             model.forEach((value) => {
-                slot(ctx, value, value);
+                safeSlot(ctx, value, value);
             });
         }
         else if (model instanceof Map) {
             model.forEach((value, key) => {
-                slot(ctx, value, key);
+                safeSlot(ctx, value, key);
             });
         }
         else if (model instanceof Set) {
             model.forEach(value => {
-                slot(ctx, value, value);
+                safeSlot(ctx, value, value);
             });
         }
         else {
@@ -60,7 +66,7 @@ export function Watch({ $model, slot: _slot }, ctx, defaultSlot) {
     const slot = _slot ?? defaultSlot;
     /* istanbul ignore else */
     if (slot) {
-        ctx.create(new CoreWatch({ model: $model, slot }, ctx.runner));
+        ctx.create(new CoreWatch({ model: $model, slot: safe(slot) }, ctx.runner));
     }
 }
 export function Debug({ $model }, ctx) {
@@ -74,7 +80,7 @@ export function Delay({ time, slot: _slot }, ctx, defaultSlot) {
         /* istanbul ignore else */
         if (slot) {
             timer = setTimeout(() => {
-                slot(node);
+                safe(slot)(node);
                 timer = undefined;
             }, time);
         }

package/lib/compose.js

@@ -12,7 +12,7 @@ export function view(renderer) {
         node.create(frag);
         try {
             const result = renderer(frag, props);
-            if (result !== undefined && callback) {
+            if (result !== undefined && result !== null && callback) {
                 callback(result);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vasille-jsx",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "The same framework which is designed to build bulletproof frontends (JSX components)",
   "main": "lib/index.js",
   "exports": {
@@ -44,7 +44,7 @@
     "opera 15"
   ],
   "dependencies": {
-    "vasille": "^4.1.0"
+    "vasille": "^4.3.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",