Fix Issues with Derived Fields not Retriggering (#274)

* Revert "fix(store): improve performance by ~4x (#236)"

This reverts commit 4a8bdea.

* chore: add changeset

Author: crutchcorn

.changeset/common-shoes-mate.md

@@ -0,0 +1,5 @@
+---
+'@tanstack/store': patch
+---
+
+Fix Issues with Derived Fields not Retriggering

docs/reference/classes/Derived.md

@@ -95,7 +95,7 @@ Defined in: [derived.ts:68](https://github.com/TanStack/store/blob/main/packages
 checkIfRecalculationNeededDeeply(): void;
 ```
 
-Defined in: [derived.ts:178](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L178)
+Defined in: [derived.ts:162](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L162)
 
 #### Returns
 
@@ -141,7 +141,7 @@ prevVal: NonNullable<TState> | undefined;
 mount(): () => void;
 ```
 
-Defined in: [derived.ts:199](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L199)
+Defined in: [derived.ts:183](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L183)
 
 #### Returns
 
@@ -161,7 +161,7 @@ Defined in: [derived.ts:199](https://github.com/TanStack/store/blob/main/package
 recompute(): void;
 ```
 
-Defined in: [derived.ts:170](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L170)
+Defined in: [derived.ts:154](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L154)
 
 #### Returns
 
@@ -197,7 +197,7 @@ readonly (
 subscribe(listener): () => void;
 ```
 
-Defined in: [derived.ts:211](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L211)
+Defined in: [derived.ts:195](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L195)
 
 #### Parameters
 
@@ -223,7 +223,7 @@ Defined in: [derived.ts:211](https://github.com/TanStack/store/blob/main/package
 unregisterFromGraph(deps): void;
 ```
 
-Defined in: [derived.ts:147](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L147)
+Defined in: [derived.ts:134](https://github.com/TanStack/store/blob/main/packages/store/src/derived.ts#L134)
 
 #### Parameters
 

docs/reference/functions/batch.md

@@ -9,7 +9,7 @@ title: batch
 function batch(fn): void;
 ```
 
-Defined in: [scheduler.ts:133](https://github.com/TanStack/store/blob/main/packages/store/src/scheduler.ts#L133)
+Defined in: [scheduler.ts:142](https://github.com/TanStack/store/blob/main/packages/store/src/scheduler.ts#L142)
 
 ## Parameters
 

docs/reference/variables/storeToDerived.md

@@ -6,7 +6,7 @@ title: __storeToDerived
 # Variable: \_\_storeToDerived
 
 ```ts
-const __storeToDerived: WeakMap<Store<unknown, (cb) => unknown>, Derived<unknown, readonly any[]>[]>;
+const __storeToDerived: WeakMap<Store<unknown, (cb) => unknown>, Set<Derived<unknown, readonly any[]>>>;
 ```
 
 Defined in: [scheduler.ts:19](https://github.com/TanStack/store/blob/main/packages/store/src/scheduler.ts#L19)

packages/store/src/derived.ts

@@ -105,7 +105,6 @@ export class Derived<
   registerOnGraph(
     deps: ReadonlyArray<Derived<any> | Store<any>> = this.options.deps,
   ) {
-    const toSort = new Set<Array<Derived<unknown>>>()
     for (const dep of deps) {
       if (dep instanceof Derived) {
         // First register the intermediate derived value if it's not already registered
@@ -116,12 +115,10 @@ export class Derived<
         // Register the derived as related derived to the store
         let relatedLinkedDerivedVals = __storeToDerived.get(dep)
         if (!relatedLinkedDerivedVals) {
-          relatedLinkedDerivedVals = [this as never]
+          relatedLinkedDerivedVals = new Set()
           __storeToDerived.set(dep, relatedLinkedDerivedVals)
-        } else if (!relatedLinkedDerivedVals.includes(this as never)) {
-          relatedLinkedDerivedVals.push(this as never)
-          toSort.add(relatedLinkedDerivedVals)
         }
+        relatedLinkedDerivedVals.add(this as never)
 
         // Register the store as a related store to this derived
         let relatedStores = __derivedToStore.get(this as never)
@@ -132,16 +129,6 @@ export class Derived<
         relatedStores.add(dep)
       }
     }
-    for (const arr of toSort) {
-      // First sort deriveds by dependency order
-      arr.sort((a, b) => {
-        // If a depends on b, b should go first
-        if (a instanceof Derived && a.options.deps.includes(b)) return 1
-        // If b depends on a, a should go first
-        if (b instanceof Derived && b.options.deps.includes(a)) return -1
-        return 0
-      })
-    }
   }
 
   unregisterFromGraph(
@@ -153,10 +140,7 @@ export class Derived<
       } else if (dep instanceof Store) {
         const relatedLinkedDerivedVals = __storeToDerived.get(dep)
         if (relatedLinkedDerivedVals) {
-          relatedLinkedDerivedVals.splice(
-            relatedLinkedDerivedVals.indexOf(this as never),
-            1,
-          )
+          relatedLinkedDerivedVals.delete(this as never)
         }
 
         const relatedStores = __derivedToStore.get(this as never)

packages/store/src/scheduler.ts

@@ -1,4 +1,4 @@
-import type { Derived } from './derived'
+import { Derived } from './derived'
 import type { Store } from './store'
 
 /**
@@ -18,7 +18,7 @@ import type { Store } from './store'
  */
 export const __storeToDerived = new WeakMap<
   Store<unknown>,
-  Array<Derived<unknown>>
+  Set<Derived<unknown>>
 >()
 export const __derivedToStore = new WeakMap<
   Derived<unknown>,
@@ -35,8 +35,17 @@ const __pendingUpdates = new Set<Store<unknown>>()
 // Add a map to store initial values before batch
 const __initialBatchValues = new Map<Store<unknown>, unknown>()
 
-function __flush_internals(relatedVals: ReadonlyArray<Derived<unknown>>) {
-  for (const derived of relatedVals) {
+function __flush_internals(relatedVals: Set<Derived<unknown>>) {
+  // First sort deriveds by dependency order
+  const sorted = Array.from(relatedVals).sort((a, b) => {
+    // If a depends on b, b should go first
+    if (a instanceof Derived && a.options.deps.includes(b)) return 1
+    // If b depends on a, a should go first
+    if (b instanceof Derived && b.options.deps.includes(a)) return -1
+    return 0
+  })
+
+  for (const derived of sorted) {
     if (__depsThatHaveWrittenThisTick.current.includes(derived)) {
       continue
     }
@@ -48,7 +57,7 @@ function __flush_internals(relatedVals: ReadonlyArray<Derived<unknown>>) {
     if (stores) {
       for (const store of stores) {
         const relatedLinkedDerivedVals = __storeToDerived.get(store)
-        if (!relatedLinkedDerivedVals?.length) continue
+        if (!relatedLinkedDerivedVals) continue
         __flush_internals(relatedLinkedDerivedVals)
       }
     }