@reckona/mreact-reactive-core 0.0.152 → 0.0.154

package/src/tracking.ts

@@ -14,25 +14,49 @@ export function trackSource(source: Source): void {
     return;
   }
 
-  if (source.singleSubscriber === tracker) {
-    tracker.deps.add(source);
-    return;
+  addSourceSubscriber(source, tracker);
+  tracker.deps.add(source);
+}
+
+function addSourceSubscriber(source: Source, computation: ReactiveComputation): void {
+  const subscribers = source.subscribers;
+
+  if (subscribers === null) {
+    source.subscribers = computation;
+  } else if (subscribers instanceof Set) {
+    subscribers.add(computation);
+  } else if (subscribers !== computation) {
+    source.subscribers = new Set([subscribers, computation]);
   }
+}
 
-  const previousSize = source.subscribers.size;
-  source.subscribers.add(tracker);
-  tracker.deps.add(source);
+function removeSourceSubscriber(source: Source, computation: ReactiveComputation): boolean {
+  const subscribers = source.subscribers;
+
+  if (subscribers === computation) {
+    source.subscribers = null;
+    return true;
+  }
 
-  if (previousSize === 0) {
-    source.singleSubscriber = tracker;
-  } else if (source.subscribers.size > 1) {
-    source.singleSubscriber = undefined;
+  if (subscribers instanceof Set && subscribers.delete(computation)) {
+    if (subscribers.size === 0) {
+      source.subscribers = null;
+    }
+    return true;
   }
+
+  return false;
+}
+
+export function sourceSubscriberCount(source: Source): number {
+  const subscribers = source.subscribers;
+
+  return subscribers === null ? 0 : subscribers instanceof Set ? subscribers.size : 1;
 }
 
 export function cleanupDeps(computation: ReactiveComputation): void {
   for (const dep of computation.deps) {
-    if (!dep.subscribers.delete(computation)) {
+    if (!removeSourceSubscriber(dep, computation)) {
       continue;
     }
 
@@ -40,15 +64,25 @@ export function cleanupDeps(computation: ReactiveComputation): void {
       dep.trackedBy = undefined;
       dep.trackedVersion = undefined;
     }
+  }
+
+  computation.deps.clear();
+}
 
-    if (dep.subscribers.size === 0) {
-      dep.singleSubscriber = undefined;
-    } else if (dep.subscribers.size === 1) {
-      dep.singleSubscriber = dep.subscribers.values().next().value;
+export function nextTrackingVersionFor(computation: ReactiveComputation): number {
+  const nextTrackingVersion = (computation.trackingVersion ?? 0) + 1;
+
+  if (Number.isSafeInteger(nextTrackingVersion)) {
+    return nextTrackingVersion;
+  }
+
+  for (const dep of computation.deps) {
+    if (dep.trackedBy === computation) {
+      dep.trackedVersion = undefined;
     }
   }
 
-  computation.deps.clear();
+  return 1;
 }
 
 export function trackIncrementalSource(
@@ -75,16 +109,9 @@ export function trackIncrementalSource(
     return;
   }
 
-  const previousSize = source.subscribers.size;
-  source.subscribers.add(computation);
+  addSourceSubscriber(source, computation);
   computation.deps.add(source);
   computation.trackingAddedDeps?.push(source);
-
-  if (previousSize === 0) {
-    source.singleSubscriber = computation;
-  } else if (source.subscribers.size > 1) {
-    source.singleSubscriber = undefined;
-  }
 }
 
 export function preserveIncrementalTracking(computation: ReactiveComputation): void {
@@ -122,7 +149,7 @@ export function cleanupUntrackedDeps(
       continue;
     }
 
-    if (!dep.subscribers.delete(computation)) {
+    if (!removeSourceSubscriber(dep, computation)) {
       continue;
     }
 
@@ -132,12 +159,6 @@ export function cleanupUntrackedDeps(
     }
 
     computation.deps.delete(dep);
-
-    if (dep.subscribers.size === 0) {
-      dep.singleSubscriber = undefined;
-    } else if (dep.subscribers.size === 1) {
-      dep.singleSubscriber = dep.subscribers.values().next().value;
-    }
   }
 }
 
@@ -149,7 +170,7 @@ export function cleanupAddedDeps(computation: ReactiveComputation): void {
   }
 
   for (const dep of addedDeps) {
-    if (!dep.subscribers.delete(computation)) {
+    if (!removeSourceSubscriber(dep, computation)) {
       continue;
     }
 
@@ -159,30 +180,23 @@ export function cleanupAddedDeps(computation: ReactiveComputation): void {
     }
 
     computation.deps.delete(dep);
-
-    if (dep.subscribers.size === 0) {
-      dep.singleSubscriber = undefined;
-    } else if (dep.subscribers.size === 1) {
-      dep.singleSubscriber = dep.subscribers.values().next().value;
-    }
   }
 }
 
 export function notifySubscribers(source: Source): void {
-  if (source.subscribers.size === 0) {
+  const subscribers = source.subscribers;
+
+  if (subscribers === null) {
     return;
   }
 
-  const cachedSingleSubscriber = source.singleSubscriber;
-  if (cachedSingleSubscriber !== undefined) {
-    if (cachedSingleSubscriber.disposed || cachedSingleSubscriber.queued) {
-      return;
-    }
-
+  if (!(subscribers instanceof Set)) {
     runtimeState.notificationDepth += 1;
 
     try {
-      cachedSingleSubscriber.markDirty();
+      if (!subscribers.disposed && !subscribers.queued) {
+        subscribers.markDirty();
+      }
     } finally {
       runtimeState.notificationDepth -= 1;
 
@@ -197,18 +211,14 @@ export function notifySubscribers(source: Source): void {
 
   try {
     const singleSubscriber =
-      source.subscribers.size === 1
-        ? source.subscribers.values().next().value
-        : undefined;
+      subscribers.size === 1 ? subscribers.values().next().value : undefined;
 
     if (singleSubscriber !== undefined) {
       if (!singleSubscriber.disposed && !singleSubscriber.queued) {
         singleSubscriber.markDirty();
       }
     } else {
-      const subscribers = orderedComputations(source.subscribers);
-
-      for (const subscriber of subscribers) {
+      for (const subscriber of orderedComputations(subscribers)) {
         if (!subscriber.disposed && !subscriber.queued) {
           subscriber.markDirty();
         }