pawajs 1.5.1 → 1.5.2

package/CHANGELOG.md

@@ -18,4 +18,5 @@ CHANGELOG.md
 + version 1.4.31- 1.4.32 - tried updating key to add element when server key is different
 + version 1.4.33 - added registerComponent.lazy
 + version 1.4.33 -1.4.42 fixing lazy registration component
-+ version 1.5.1 stable
++ version 1.5.1 stable
++ version 1.5.2 - added function dependencies

package/index.js

@@ -1,4 +1,4 @@
-import { track, trigger, createEffect } from './reactive.js'
+import { track, trigger, createEffect, runWithEffect, deleteEffect } from './reactive.js'
 import { PawaElement, PawaComment } from './pawaElement.js';
 import {
     If,
@@ -335,8 +335,10 @@ RegisterComponent.lazy=(...args)=>{
             }
 
             const processName =(compName) => {
+                if (__pawaDev.tool && isServer()) {
+                    components.delete(compName.toUppercase())
+                }
                 if (components.has(compName.toUpperCase()) || lazyComponents.has(compName.toUpperCase()) && !__pawaDev.tool) return;
-                
                 if (typeof compName === 'string') {
                      lazyComponents.set(compName.toUpperCase(), { name: compName, component: componentFunc });
                 }
@@ -764,17 +766,6 @@ export const $state = (initialValue, section = null) => {
                 localStorage.setItem(section, JSON.stringify(states))
             }, 50)
         }
-        globalEffectMap.forEach((effect) => {
-
-            if (effect.deps?.has(target.id)) {
-                if (effect.cleanup) {
-                    effect.cleanup();
-                }
-                effect.cleanup = effect.callback();
-            } else if (effect.deps.size === 0) {
-                effect.cleanup = effect.callback();
-            }
-        });
     });
     if (Array.isArray(section)) {
         if (stateContext._hasRun === false && typeof initialValue === 'function') {
@@ -816,47 +807,55 @@ const stateWatch = (callback, dependencies) => {
         console.warn('stateWatch: Callback function is required');
         return;
     }
-    const dep = new Set()
-    if (dependencies) {
-        dependencies.forEach(d => {
-            dep.add(d.id)
-        })
-    }
+    const dep = new Set();
+
+    const runner = () => {
+        if (!watchCallbacks.has(callback)) {
+            watchCallbacks.set(callback, true);
+            Promise.resolve().then(() => {
+                if (effect.cleanup) {
+                    effect.cleanup();
+                }
+
+                const result = runWithEffect(runner, callback);
+                if (typeof result === 'function') {
+                    effect.cleanup = result;
+                }
+                watchCallbacks.delete(callback);
+            });
+        }
+    };
+    runner._id = crypto.randomUUID();
+
     const effect = {
-        callback: () => {
-            if (!watchCallbacks.has(callback)) {
-                watchCallbacks.set(callback, true);
-                Promise.resolve().then(() => {
-                    if (effect.cleanup) {
-                        effect.cleanup();
-                    }
-                    const result = callback();
-                    // Handle cleanup function returned from callback
-                    if (typeof result === 'function') {
-                        effect.cleanup = result;
-                    }
-                    watchCallbacks.delete(callback);
-                });
-            }
-        },
+        callback: runner,
         deps: dep,
         cleanup: null,
     };
 
-    // Initial run with cleanup handling
-    const result = callback();
+    // Initial run with auto-tracking for explicit dependencies and the main callback
+    if (dependencies) {
+        dependencies.forEach(d => {
+            if (typeof d === 'function') {
+                runWithEffect(runner, d);
+            } else if (d && d.id) {
+                dep.add(d.id);
+                runWithEffect(runner, () => d.value);
+            }
+        });
+    }
+
+    const result = runWithEffect(runner, callback);
     if (typeof result === 'function') {
         effect.cleanup = result;
     }
 
-    globalEffectMap.set(callback, effect);
-
     return () => {
         if (effect.cleanup) {
             effect.cleanup();
         }
-        globalEffectMap.delete(callback);
         watchCallbacks.delete(callback);
+        deleteEffect.add(runner._id);
     };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pawajs",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "type":"module",
   "description": "pawajs library (reactive web runtime) for easily building web ui, enhancing html element, micro frontend etc ",
   "main": "index.js",

package/reactive.js

@@ -7,8 +7,17 @@
   export const componentMount=new Map()
  let queue = new Set();
 let isFlushing = false;
-let deleteEffect = new Set();
-
+export const deleteEffect = new Set();
+
+export const runWithEffect = (effect, fn) => {
+  const prev = activeEffect;
+  activeEffect = effect;
+  try {
+    return fn();
+  } finally {
+    activeEffect = prev;
+  }
+};
 
 
 const scheduled = new Set();