nexa-reactivity 0.10.0 → 0.11.0

package/dist/core.d.ts

@@ -4,6 +4,7 @@ export interface NexaReactivityState {
     pendingEffects: Set<Effect>;
     targetToEffectsMap: WeakMap<object, Map<number | string | symbol, Set<Effect>>>;
     postFlushCallback: (() => void) | null;
+    signalDeps: Map<object, Set<Effect>>;
 }
 export declare class Effect {
     fn: () => any;

package/dist/core.js

@@ -9,7 +9,8 @@ if (!globalObj.__NEXA_REACTIVITY_STATE__) {
         batchDepth: 0,
         pendingEffects: new Set(),
         targetToEffectsMap: new WeakMap(),
-        postFlushCallback: null
+        postFlushCallback: null,
+        signalDeps: new Map()
     };
 }
 const state = globalObj.__NEXA_REACTIVITY_STATE__;
@@ -151,16 +152,34 @@ export function untracked(fn) {
     }
 }
 export function signal(value, label) {
+    let deps = null;
     const obj = {
         _nexa_label: label,
         get value() {
-            track(obj, 'value');
+            if (state.activeEffect) {
+                if (!deps)
+                    deps = new Set();
+                if (!deps.has(state.activeEffect)) {
+                    deps.add(state.activeEffect);
+                    state.activeEffect.deps.push(deps);
+                }
+            }
             return value;
         },
         set value(newValue) {
             if (!Object.is(value, newValue)) {
                 value = newValue;
-                trigger(obj, 'value');
+                if (deps) {
+                    for (const e of deps) {
+                        if (e !== state.activeEffect && !e.isQueued) {
+                            e.isQueued = true;
+                            state.pendingEffects.add(e);
+                        }
+                    }
+                    if (state.batchDepth === 0) {
+                        flushEffects();
+                    }
+                }
             }
         },
         peek() {
@@ -179,16 +198,17 @@ export function signal(value, label) {
 export function computed(fn) {
     let cachedValue;
     let dirty = true;
-    const runner = new Effect(fn, () => {
-        if (!dirty) {
-            dirty = true;
-            trigger(wrapper, 'value');
-        }
-    });
-    runner.priority = 100;
+    let deps = null;
     const wrapper = {
         get value() {
-            track(wrapper, 'value');
+            if (state.activeEffect) {
+                if (!deps)
+                    deps = new Set();
+                if (!deps.has(state.activeEffect)) {
+                    deps.add(state.activeEffect);
+                    state.activeEffect.deps.push(deps);
+                }
+            }
             if (dirty) {
                 cachedValue = runner.run();
                 dirty = false;
@@ -203,6 +223,23 @@ export function computed(fn) {
             return cachedValue;
         }
     };
+    const runner = new Effect(fn, () => {
+        if (!dirty) {
+            dirty = true;
+            if (deps) {
+                for (const e of deps) {
+                    if (e !== state.activeEffect && !e.isQueued) {
+                        e.isQueued = true;
+                        state.pendingEffects.add(e);
+                    }
+                }
+                if (state.batchDepth === 0) {
+                    flushEffects();
+                }
+            }
+        }
+    });
+    runner.priority = 100;
     return wrapper;
 }
 export function setPostFlushCallback(cb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexa-reactivity",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",