solid-js 1.9.11 → 1.10.0-beta.0

package/dist/dev.cjs

@@ -159,11 +159,7 @@ let runEffects = runQueue;
 const STALE = 1;
 const PENDING = 2;
 const UNOWNED = {
-  owned: null,
-  cleanups: null,
-  context: null,
-  owner: null
-};
+  };
 const NO_INIT = {};
 var Owner = null;
 let Transition = null;
@@ -197,7 +193,7 @@ function createRoot(fn, detachedOwner) {
     },
     updateFn = unowned ? () => fn(() => {
       throw new Error("Dispose method must be an explicit argument to createRoot function");
-    })  : () => fn(() => untrack(() => cleanNode(root)));
+    })  : () => fn(() => untrack(() => cleanupRoot(root)));
   DevHooks.afterCreateOwner && DevHooks.afterCreateOwner(root);
   Owner = root;
   Listener = null;
@@ -213,7 +209,7 @@ function createSignal(value, options) {
   const s = {
     value,
     observers: null,
-    observerSlots: null,
+    observersTail: null,
     comparator: options.equals || undefined
   };
   {
@@ -267,7 +263,7 @@ function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
   const c = createComputation(fn, value, true, 0, options );
   c.observers = null;
-  c.observerSlots = null;
+  c.observersTail = null;
   c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
@@ -589,7 +585,7 @@ function devComponent(Comp, props) {
   }), undefined, true, 0);
   c.props = props;
   c.observers = null;
-  c.observerSlots = null;
+  c.observersTail = null;
   c.name = Comp.name;
   c.component = Comp;
   updateComputation(c);
@@ -667,25 +663,46 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
-    }
+    link(this, Listener);
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
   return this.value;
 }
+function link(source, observer) {
+  const prevSource = observer.sourcesTail;
+  if (prevSource !== null && prevSource.source === source) {
+    return;
+  }
+  const nextSource = prevSource !== null ? prevSource.nextSource : observer.sources;
+  const time = observer.relinkTime;
+  if (nextSource !== null && nextSource.source === source) {
+    nextSource.version = time;
+    observer.sourcesTail = nextSource;
+    return;
+  }
+  const prevObserver = source.observersTail;
+  if (prevObserver !== null && prevObserver.version === observer.relinkTime && prevObserver.observer === observer) {
+    return;
+  }
+  const newLink = observer.sourcesTail = source.observersTail = {
+    source: source,
+    observer: observer,
+    nextSource: nextSource,
+    prevObserver: prevObserver,
+    nextObserver: null,
+    version: time
+  };
+  if (prevSource !== null) {
+    prevSource.nextSource = newLink;
+  } else {
+    observer.sources = newLink;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = newLink;
+  } else {
+    source.observers = newLink;
+  }
+}
 function writeSignal(node, value, isComp) {
   let current = Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value;
   if (!node.comparator || !node.comparator(current, value)) {
@@ -697,10 +714,11 @@ function writeSignal(node, value, isComp) {
       }
       if (!TransitionRunning) node.value = value;
     } else node.value = value;
-    if (node.observers && node.observers.length) {
+    if (node.observers && node.observers) {
       runUpdates(() => {
-        for (let i = 0; i < node.observers.length; i += 1) {
-          const o = node.observers[i];
+        for (let link = node.observers; link !== null; link = link.nextObserver) {
+          const o = link.observer;
+          if (link.version < o.relinkTime) continue;
           const TransitionRunning = Transition && Transition.running;
           if (TransitionRunning && Transition.disposed.has(o)) continue;
           if (TransitionRunning ? !o.tState : !o.state) {
@@ -721,9 +739,12 @@ function writeSignal(node, value, isComp) {
 }
 function updateComputation(node) {
   if (!node.fn) return;
-  cleanNode(node);
+  node.sourcesTail = null;
+  node.relinkTime = ExecCount;
+  cleanupRoot(node);
   const time = ExecCount;
   runComputation(node, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, time);
+  afterComputation(node);
   if (Transition && !Transition.running && Transition.sources.has(node)) {
     queueMicrotask(() => {
       runUpdates(() => {
@@ -746,11 +767,11 @@ function runComputation(node, value, time) {
     if (node.pure) {
       if (Transition && Transition.running) {
         node.tState = STALE;
-        node.tOwned && node.tOwned.forEach(cleanNode);
+        node.tOwned && node.tOwned.forEach(destroyNode);
         node.tOwned = undefined;
       } else {
         node.state = STALE;
-        node.owned && node.owned.forEach(cleanNode);
+        node.owned && node.owned.forEach(destroyNode);
         node.owned = null;
       }
     }
@@ -777,10 +798,11 @@ function createComputation(fn, init, pure, state = STALE, options) {
     updatedAt: null,
     owned: null,
     sources: null,
-    sourceSlots: null,
+    sourcesTail: null,
     cleanups: null,
     value: init,
     owner: Owner,
+    relinkTime: 0,
     context: Owner ? Owner.context : null,
     pure
   };
@@ -876,11 +898,11 @@ function completeUpdates(wait) {
       }
       Transition = null;
       runUpdates(() => {
-        for (const d of disposed) cleanNode(d);
+        for (const d of disposed) destroyNode(d);
         for (const v of sources) {
           v.value = v.tValue;
           if (v.owned) {
-            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
+            for (let i = 0, len = v.owned.length; i < len; i++) destroyNode(v.owned[i]);
           }
           if (v.tOwned) v.owned = v.tOwned;
           delete v.tValue;
@@ -947,8 +969,8 @@ function runUserEffects(queue) {
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
-  for (let i = 0; i < node.sources.length; i += 1) {
-    const source = node.sources[i];
+  for (let link = node.sources; link !== null; link = link.nextSource) {
+    const source = link.source;
     if (source.sources) {
       const state = runningTransition ? source.tState : source.state;
       if (state === STALE) {
@@ -959,8 +981,9 @@ function lookUpstream(node, ignore) {
 }
 function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
-  for (let i = 0; i < node.observers.length; i += 1) {
-    const o = node.observers[i];
+  for (let link = node.observers; link !== null; link = link.nextObserver) {
+    const o = link.observer;
+    if (link.version < o.relinkTime) continue;
     if (runningTransition ? !o.tState : !o.state) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
@@ -968,41 +991,65 @@ function markDownstream(node) {
     }
   }
 }
-function cleanNode(node) {
+function cleanupRoot(node) {
   let i;
-  if (node.sources) {
-    while (node.sources.length) {
-      const source = node.sources.pop(),
-        index = node.sourceSlots.pop(),
-        obs = source.observers;
-      if (obs && obs.length) {
-        const n = obs.pop(),
-          s = source.observerSlots.pop();
-        if (index < obs.length) {
-          n.sourceSlots[s] = index;
-          obs[index] = n;
-          source.observerSlots[index] = s;
-        }
-      }
-    }
-  }
   if (node.tOwned) {
-    for (i = node.tOwned.length - 1; i >= 0; i--) cleanNode(node.tOwned[i]);
+    for (i = node.tOwned.length - 1; i >= 0; i--) destroyNode(node.tOwned[i]);
     delete node.tOwned;
   }
   if (Transition && Transition.running && node.pure) {
     reset(node, true);
   } else if (node.owned) {
-    for (i = node.owned.length - 1; i >= 0; i--) cleanNode(node.owned[i]);
+    for (i = node.owned.length - 1; i >= 0; i--) destroyNode(node.owned[i]);
     node.owned = null;
   }
   if (node.cleanups) {
-    for (i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
+    for (let i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
     node.cleanups = null;
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
   delete node.sourceMap;
 }
+function afterComputation(node) {
+  const sourcesTail = node.sourcesTail;
+  let toRemove = sourcesTail !== null ? sourcesTail.nextSource : node.sources;
+  if (toRemove !== null) {
+    do {
+      toRemove = unlinkFromObservers(toRemove);
+    } while (toRemove !== null);
+    if (sourcesTail !== null) {
+      sourcesTail.nextSource = null;
+    } else {
+      node.sources = null;
+    }
+  }
+}
+function unlinkFromObservers(link) {
+  const source = link.source;
+  const nextSource = link.nextSource;
+  const nextObserver = link.nextObserver;
+  const prevObserver = link.prevObserver;
+  if (nextObserver !== null) {
+    nextObserver.prevObserver = prevObserver;
+  } else {
+    source.observersTail = prevObserver;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = nextObserver;
+  } else {
+    source.observers = nextObserver;
+  }
+  return nextSource;
+}
+function destroyNode(node) {
+  let link = node.sources;
+  while (link) {
+    link = unlinkFromObservers(link);
+  }
+  node.sources = null;
+  node.sourcesTail = null;
+  cleanupRoot(node);
+}
 function reset(node, top) {
   if (!top) {
     node.tState = 0;
@@ -1033,6 +1080,7 @@ function handleError(err, owner = Owner) {
     fn() {
       runErrors(error, fns, owner);
     },
+    sources: null,
     state: STALE
   });else runErrors(error, fns, owner);
 }

package/dist/dev.js

@@ -157,11 +157,7 @@ let runEffects = runQueue;
 const STALE = 1;
 const PENDING = 2;
 const UNOWNED = {
-  owned: null,
-  cleanups: null,
-  context: null,
-  owner: null
-};
+  };
 const NO_INIT = {};
 var Owner = null;
 let Transition = null;
@@ -195,7 +191,7 @@ function createRoot(fn, detachedOwner) {
     },
     updateFn = unowned ? () => fn(() => {
       throw new Error("Dispose method must be an explicit argument to createRoot function");
-    })  : () => fn(() => untrack(() => cleanNode(root)));
+    })  : () => fn(() => untrack(() => cleanupRoot(root)));
   DevHooks.afterCreateOwner && DevHooks.afterCreateOwner(root);
   Owner = root;
   Listener = null;
@@ -211,7 +207,7 @@ function createSignal(value, options) {
   const s = {
     value,
     observers: null,
-    observerSlots: null,
+    observersTail: null,
     comparator: options.equals || undefined
   };
   {
@@ -265,7 +261,7 @@ function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
   const c = createComputation(fn, value, true, 0, options );
   c.observers = null;
-  c.observerSlots = null;
+  c.observersTail = null;
   c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
@@ -587,7 +583,7 @@ function devComponent(Comp, props) {
   }), undefined, true, 0);
   c.props = props;
   c.observers = null;
-  c.observerSlots = null;
+  c.observersTail = null;
   c.name = Comp.name;
   c.component = Comp;
   updateComputation(c);
@@ -665,25 +661,46 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
-    }
+    link(this, Listener);
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
   return this.value;
 }
+function link(source, observer) {
+  const prevSource = observer.sourcesTail;
+  if (prevSource !== null && prevSource.source === source) {
+    return;
+  }
+  const nextSource = prevSource !== null ? prevSource.nextSource : observer.sources;
+  const time = observer.relinkTime;
+  if (nextSource !== null && nextSource.source === source) {
+    nextSource.version = time;
+    observer.sourcesTail = nextSource;
+    return;
+  }
+  const prevObserver = source.observersTail;
+  if (prevObserver !== null && prevObserver.version === observer.relinkTime && prevObserver.observer === observer) {
+    return;
+  }
+  const newLink = observer.sourcesTail = source.observersTail = {
+    source: source,
+    observer: observer,
+    nextSource: nextSource,
+    prevObserver: prevObserver,
+    nextObserver: null,
+    version: time
+  };
+  if (prevSource !== null) {
+    prevSource.nextSource = newLink;
+  } else {
+    observer.sources = newLink;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = newLink;
+  } else {
+    source.observers = newLink;
+  }
+}
 function writeSignal(node, value, isComp) {
   let current = Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value;
   if (!node.comparator || !node.comparator(current, value)) {
@@ -695,10 +712,11 @@ function writeSignal(node, value, isComp) {
       }
       if (!TransitionRunning) node.value = value;
     } else node.value = value;
-    if (node.observers && node.observers.length) {
+    if (node.observers && node.observers) {
       runUpdates(() => {
-        for (let i = 0; i < node.observers.length; i += 1) {
-          const o = node.observers[i];
+        for (let link = node.observers; link !== null; link = link.nextObserver) {
+          const o = link.observer;
+          if (link.version < o.relinkTime) continue;
           const TransitionRunning = Transition && Transition.running;
           if (TransitionRunning && Transition.disposed.has(o)) continue;
           if (TransitionRunning ? !o.tState : !o.state) {
@@ -719,9 +737,12 @@ function writeSignal(node, value, isComp) {
 }
 function updateComputation(node) {
   if (!node.fn) return;
-  cleanNode(node);
+  node.sourcesTail = null;
+  node.relinkTime = ExecCount;
+  cleanupRoot(node);
   const time = ExecCount;
   runComputation(node, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, time);
+  afterComputation(node);
   if (Transition && !Transition.running && Transition.sources.has(node)) {
     queueMicrotask(() => {
       runUpdates(() => {
@@ -744,11 +765,11 @@ function runComputation(node, value, time) {
     if (node.pure) {
       if (Transition && Transition.running) {
         node.tState = STALE;
-        node.tOwned && node.tOwned.forEach(cleanNode);
+        node.tOwned && node.tOwned.forEach(destroyNode);
         node.tOwned = undefined;
       } else {
         node.state = STALE;
-        node.owned && node.owned.forEach(cleanNode);
+        node.owned && node.owned.forEach(destroyNode);
         node.owned = null;
       }
     }
@@ -775,10 +796,11 @@ function createComputation(fn, init, pure, state = STALE, options) {
     updatedAt: null,
     owned: null,
     sources: null,
-    sourceSlots: null,
+    sourcesTail: null,
     cleanups: null,
     value: init,
     owner: Owner,
+    relinkTime: 0,
     context: Owner ? Owner.context : null,
     pure
   };
@@ -874,11 +896,11 @@ function completeUpdates(wait) {
       }
       Transition = null;
       runUpdates(() => {
-        for (const d of disposed) cleanNode(d);
+        for (const d of disposed) destroyNode(d);
         for (const v of sources) {
           v.value = v.tValue;
           if (v.owned) {
-            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
+            for (let i = 0, len = v.owned.length; i < len; i++) destroyNode(v.owned[i]);
           }
           if (v.tOwned) v.owned = v.tOwned;
           delete v.tValue;
@@ -945,8 +967,8 @@ function runUserEffects(queue) {
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
-  for (let i = 0; i < node.sources.length; i += 1) {
-    const source = node.sources[i];
+  for (let link = node.sources; link !== null; link = link.nextSource) {
+    const source = link.source;
     if (source.sources) {
       const state = runningTransition ? source.tState : source.state;
       if (state === STALE) {
@@ -957,8 +979,9 @@ function lookUpstream(node, ignore) {
 }
 function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
-  for (let i = 0; i < node.observers.length; i += 1) {
-    const o = node.observers[i];
+  for (let link = node.observers; link !== null; link = link.nextObserver) {
+    const o = link.observer;
+    if (link.version < o.relinkTime) continue;
     if (runningTransition ? !o.tState : !o.state) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
@@ -966,41 +989,65 @@ function markDownstream(node) {
     }
   }
 }
-function cleanNode(node) {
+function cleanupRoot(node) {
   let i;
-  if (node.sources) {
-    while (node.sources.length) {
-      const source = node.sources.pop(),
-        index = node.sourceSlots.pop(),
-        obs = source.observers;
-      if (obs && obs.length) {
-        const n = obs.pop(),
-          s = source.observerSlots.pop();
-        if (index < obs.length) {
-          n.sourceSlots[s] = index;
-          obs[index] = n;
-          source.observerSlots[index] = s;
-        }
-      }
-    }
-  }
   if (node.tOwned) {
-    for (i = node.tOwned.length - 1; i >= 0; i--) cleanNode(node.tOwned[i]);
+    for (i = node.tOwned.length - 1; i >= 0; i--) destroyNode(node.tOwned[i]);
     delete node.tOwned;
   }
   if (Transition && Transition.running && node.pure) {
     reset(node, true);
   } else if (node.owned) {
-    for (i = node.owned.length - 1; i >= 0; i--) cleanNode(node.owned[i]);
+    for (i = node.owned.length - 1; i >= 0; i--) destroyNode(node.owned[i]);
     node.owned = null;
   }
   if (node.cleanups) {
-    for (i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
+    for (let i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
     node.cleanups = null;
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
   delete node.sourceMap;
 }
+function afterComputation(node) {
+  const sourcesTail = node.sourcesTail;
+  let toRemove = sourcesTail !== null ? sourcesTail.nextSource : node.sources;
+  if (toRemove !== null) {
+    do {
+      toRemove = unlinkFromObservers(toRemove);
+    } while (toRemove !== null);
+    if (sourcesTail !== null) {
+      sourcesTail.nextSource = null;
+    } else {
+      node.sources = null;
+    }
+  }
+}
+function unlinkFromObservers(link) {
+  const source = link.source;
+  const nextSource = link.nextSource;
+  const nextObserver = link.nextObserver;
+  const prevObserver = link.prevObserver;
+  if (nextObserver !== null) {
+    nextObserver.prevObserver = prevObserver;
+  } else {
+    source.observersTail = prevObserver;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = nextObserver;
+  } else {
+    source.observers = nextObserver;
+  }
+  return nextSource;
+}
+function destroyNode(node) {
+  let link = node.sources;
+  while (link) {
+    link = unlinkFromObservers(link);
+  }
+  node.sources = null;
+  node.sourcesTail = null;
+  cleanupRoot(node);
+}
 function reset(node, top) {
   if (!top) {
     node.tState = 0;
@@ -1031,6 +1078,7 @@ function handleError(err, owner = Owner) {
     fn() {
       runErrors(error, fns, owner);
     },
+    sources: null,
     state: STALE
   });else runErrors(error, fns, owner);
 }

package/dist/solid.cjs

@@ -184,7 +184,7 @@ function createRoot(fn, detachedOwner) {
       context: current ? current.context : null,
       owner: current
     },
-    updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
+    updateFn = unowned ? fn : () => fn(() => untrack(() => cleanupRoot(root)));
   Owner = root;
   Listener = null;
   try {
@@ -199,7 +199,7 @@ function createSignal(value, options) {
   const s = {
     value,
     observers: null,
-    observerSlots: null,
+    observersTail: null,
     comparator: options.equals || undefined
   };
   const setter = value => {
@@ -244,7 +244,7 @@ function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
   const c = createComputation(fn, value, true, 0);
   c.observers = null;
-  c.observerSlots = null;
+  c.observersTail = null;
   c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
@@ -620,25 +620,46 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
-    }
+    link(this, Listener);
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
   return this.value;
 }
+function link(source, observer) {
+  const prevSource = observer.sourcesTail;
+  if (prevSource !== null && prevSource.source === source) {
+    return;
+  }
+  const nextSource = prevSource !== null ? prevSource.nextSource : observer.sources;
+  const time = observer.relinkTime;
+  if (nextSource !== null && nextSource.source === source) {
+    nextSource.version = time;
+    observer.sourcesTail = nextSource;
+    return;
+  }
+  const prevObserver = source.observersTail;
+  if (prevObserver !== null && prevObserver.version === observer.relinkTime && prevObserver.observer === observer) {
+    return;
+  }
+  const newLink = observer.sourcesTail = source.observersTail = {
+    source: source,
+    observer: observer,
+    nextSource: nextSource,
+    prevObserver: prevObserver,
+    nextObserver: null,
+    version: time
+  };
+  if (prevSource !== null) {
+    prevSource.nextSource = newLink;
+  } else {
+    observer.sources = newLink;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = newLink;
+  } else {
+    source.observers = newLink;
+  }
+}
 function writeSignal(node, value, isComp) {
   let current = Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value;
   if (!node.comparator || !node.comparator(current, value)) {
@@ -650,10 +671,11 @@ function writeSignal(node, value, isComp) {
       }
       if (!TransitionRunning) node.value = value;
     } else node.value = value;
-    if (node.observers && node.observers.length) {
+    if (node.observers && node.observers) {
       runUpdates(() => {
-        for (let i = 0; i < node.observers.length; i += 1) {
-          const o = node.observers[i];
+        for (let link = node.observers; link !== null; link = link.nextObserver) {
+          const o = link.observer;
+          if (link.version < o.relinkTime) continue;
           const TransitionRunning = Transition && Transition.running;
           if (TransitionRunning && Transition.disposed.has(o)) continue;
           if (TransitionRunning ? !o.tState : !o.state) {
@@ -674,9 +696,12 @@ function writeSignal(node, value, isComp) {
 }
 function updateComputation(node) {
   if (!node.fn) return;
-  cleanNode(node);
+  node.sourcesTail = null;
+  node.relinkTime = ExecCount;
+  cleanupRoot(node);
   const time = ExecCount;
   runComputation(node, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, time);
+  afterComputation(node);
   if (Transition && !Transition.running && Transition.sources.has(node)) {
     queueMicrotask(() => {
       runUpdates(() => {
@@ -699,11 +724,11 @@ function runComputation(node, value, time) {
     if (node.pure) {
       if (Transition && Transition.running) {
         node.tState = STALE;
-        node.tOwned && node.tOwned.forEach(cleanNode);
+        node.tOwned && node.tOwned.forEach(destroyNode);
         node.tOwned = undefined;
       } else {
         node.state = STALE;
-        node.owned && node.owned.forEach(cleanNode);
+        node.owned && node.owned.forEach(destroyNode);
         node.owned = null;
       }
     }
@@ -730,10 +755,11 @@ function createComputation(fn, init, pure, state = STALE, options) {
     updatedAt: null,
     owned: null,
     sources: null,
-    sourceSlots: null,
+    sourcesTail: null,
     cleanups: null,
     value: init,
     owner: Owner,
+    relinkTime: 0,
     context: Owner ? Owner.context : null,
     pure
   };
@@ -827,11 +853,11 @@ function completeUpdates(wait) {
       }
       Transition = null;
       runUpdates(() => {
-        for (const d of disposed) cleanNode(d);
+        for (const d of disposed) destroyNode(d);
         for (const v of sources) {
           v.value = v.tValue;
           if (v.owned) {
-            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
+            for (let i = 0, len = v.owned.length; i < len; i++) destroyNode(v.owned[i]);
           }
           if (v.tOwned) v.owned = v.tOwned;
           delete v.tValue;
@@ -898,8 +924,8 @@ function runUserEffects(queue) {
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
-  for (let i = 0; i < node.sources.length; i += 1) {
-    const source = node.sources[i];
+  for (let link = node.sources; link !== null; link = link.nextSource) {
+    const source = link.source;
     if (source.sources) {
       const state = runningTransition ? source.tState : source.state;
       if (state === STALE) {
@@ -910,8 +936,9 @@ function lookUpstream(node, ignore) {
 }
 function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
-  for (let i = 0; i < node.observers.length; i += 1) {
-    const o = node.observers[i];
+  for (let link = node.observers; link !== null; link = link.nextObserver) {
+    const o = link.observer;
+    if (link.version < o.relinkTime) continue;
     if (runningTransition ? !o.tState : !o.state) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
@@ -919,40 +946,64 @@ function markDownstream(node) {
     }
   }
 }
-function cleanNode(node) {
+function cleanupRoot(node) {
   let i;
-  if (node.sources) {
-    while (node.sources.length) {
-      const source = node.sources.pop(),
-        index = node.sourceSlots.pop(),
-        obs = source.observers;
-      if (obs && obs.length) {
-        const n = obs.pop(),
-          s = source.observerSlots.pop();
-        if (index < obs.length) {
-          n.sourceSlots[s] = index;
-          obs[index] = n;
-          source.observerSlots[index] = s;
-        }
-      }
-    }
-  }
   if (node.tOwned) {
-    for (i = node.tOwned.length - 1; i >= 0; i--) cleanNode(node.tOwned[i]);
+    for (i = node.tOwned.length - 1; i >= 0; i--) destroyNode(node.tOwned[i]);
     delete node.tOwned;
   }
   if (Transition && Transition.running && node.pure) {
     reset(node, true);
   } else if (node.owned) {
-    for (i = node.owned.length - 1; i >= 0; i--) cleanNode(node.owned[i]);
+    for (i = node.owned.length - 1; i >= 0; i--) destroyNode(node.owned[i]);
     node.owned = null;
   }
   if (node.cleanups) {
-    for (i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
+    for (let i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
     node.cleanups = null;
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
 }
+function afterComputation(node) {
+  const sourcesTail = node.sourcesTail;
+  let toRemove = sourcesTail !== null ? sourcesTail.nextSource : node.sources;
+  if (toRemove !== null) {
+    do {
+      toRemove = unlinkFromObservers(toRemove);
+    } while (toRemove !== null);
+    if (sourcesTail !== null) {
+      sourcesTail.nextSource = null;
+    } else {
+      node.sources = null;
+    }
+  }
+}
+function unlinkFromObservers(link) {
+  const source = link.source;
+  const nextSource = link.nextSource;
+  const nextObserver = link.nextObserver;
+  const prevObserver = link.prevObserver;
+  if (nextObserver !== null) {
+    nextObserver.prevObserver = prevObserver;
+  } else {
+    source.observersTail = prevObserver;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = nextObserver;
+  } else {
+    source.observers = nextObserver;
+  }
+  return nextSource;
+}
+function destroyNode(node) {
+  let link = node.sources;
+  while (link) {
+    link = unlinkFromObservers(link);
+  }
+  node.sources = null;
+  node.sourcesTail = null;
+  cleanupRoot(node);
+}
 function reset(node, top) {
   if (!top) {
     node.tState = 0;
@@ -983,6 +1034,7 @@ function handleError(err, owner = Owner) {
     fn() {
       runErrors(error, fns, owner);
     },
+    sources: null,
     state: STALE
   });else runErrors(error, fns, owner);
 }

package/dist/solid.js

@@ -182,7 +182,7 @@ function createRoot(fn, detachedOwner) {
       context: current ? current.context : null,
       owner: current
     },
-    updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
+    updateFn = unowned ? fn : () => fn(() => untrack(() => cleanupRoot(root)));
   Owner = root;
   Listener = null;
   try {
@@ -197,7 +197,7 @@ function createSignal(value, options) {
   const s = {
     value,
     observers: null,
-    observerSlots: null,
+    observersTail: null,
     comparator: options.equals || undefined
   };
   const setter = value => {
@@ -242,7 +242,7 @@ function createMemo(fn, value, options) {
   options = options ? Object.assign({}, signalOptions, options) : signalOptions;
   const c = createComputation(fn, value, true, 0);
   c.observers = null;
-  c.observerSlots = null;
+  c.observersTail = null;
   c.comparator = options.equals || undefined;
   if (Scheduler && Transition && Transition.running) {
     c.tState = STALE;
@@ -618,25 +618,46 @@ function readSignal() {
     }
   }
   if (Listener) {
-    const sSlot = this.observers ? this.observers.length : 0;
-    if (!Listener.sources) {
-      Listener.sources = [this];
-      Listener.sourceSlots = [sSlot];
-    } else {
-      Listener.sources.push(this);
-      Listener.sourceSlots.push(sSlot);
-    }
-    if (!this.observers) {
-      this.observers = [Listener];
-      this.observerSlots = [Listener.sources.length - 1];
-    } else {
-      this.observers.push(Listener);
-      this.observerSlots.push(Listener.sources.length - 1);
-    }
+    link(this, Listener);
   }
   if (runningTransition && Transition.sources.has(this)) return this.tValue;
   return this.value;
 }
+function link(source, observer) {
+  const prevSource = observer.sourcesTail;
+  if (prevSource !== null && prevSource.source === source) {
+    return;
+  }
+  const nextSource = prevSource !== null ? prevSource.nextSource : observer.sources;
+  const time = observer.relinkTime;
+  if (nextSource !== null && nextSource.source === source) {
+    nextSource.version = time;
+    observer.sourcesTail = nextSource;
+    return;
+  }
+  const prevObserver = source.observersTail;
+  if (prevObserver !== null && prevObserver.version === observer.relinkTime && prevObserver.observer === observer) {
+    return;
+  }
+  const newLink = observer.sourcesTail = source.observersTail = {
+    source: source,
+    observer: observer,
+    nextSource: nextSource,
+    prevObserver: prevObserver,
+    nextObserver: null,
+    version: time
+  };
+  if (prevSource !== null) {
+    prevSource.nextSource = newLink;
+  } else {
+    observer.sources = newLink;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = newLink;
+  } else {
+    source.observers = newLink;
+  }
+}
 function writeSignal(node, value, isComp) {
   let current = Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value;
   if (!node.comparator || !node.comparator(current, value)) {
@@ -648,10 +669,11 @@ function writeSignal(node, value, isComp) {
       }
       if (!TransitionRunning) node.value = value;
     } else node.value = value;
-    if (node.observers && node.observers.length) {
+    if (node.observers && node.observers) {
       runUpdates(() => {
-        for (let i = 0; i < node.observers.length; i += 1) {
-          const o = node.observers[i];
+        for (let link = node.observers; link !== null; link = link.nextObserver) {
+          const o = link.observer;
+          if (link.version < o.relinkTime) continue;
           const TransitionRunning = Transition && Transition.running;
           if (TransitionRunning && Transition.disposed.has(o)) continue;
           if (TransitionRunning ? !o.tState : !o.state) {
@@ -672,9 +694,12 @@ function writeSignal(node, value, isComp) {
 }
 function updateComputation(node) {
   if (!node.fn) return;
-  cleanNode(node);
+  node.sourcesTail = null;
+  node.relinkTime = ExecCount;
+  cleanupRoot(node);
   const time = ExecCount;
   runComputation(node, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value, time);
+  afterComputation(node);
   if (Transition && !Transition.running && Transition.sources.has(node)) {
     queueMicrotask(() => {
       runUpdates(() => {
@@ -697,11 +722,11 @@ function runComputation(node, value, time) {
     if (node.pure) {
       if (Transition && Transition.running) {
         node.tState = STALE;
-        node.tOwned && node.tOwned.forEach(cleanNode);
+        node.tOwned && node.tOwned.forEach(destroyNode);
         node.tOwned = undefined;
       } else {
         node.state = STALE;
-        node.owned && node.owned.forEach(cleanNode);
+        node.owned && node.owned.forEach(destroyNode);
         node.owned = null;
       }
     }
@@ -728,10 +753,11 @@ function createComputation(fn, init, pure, state = STALE, options) {
     updatedAt: null,
     owned: null,
     sources: null,
-    sourceSlots: null,
+    sourcesTail: null,
     cleanups: null,
     value: init,
     owner: Owner,
+    relinkTime: 0,
     context: Owner ? Owner.context : null,
     pure
   };
@@ -825,11 +851,11 @@ function completeUpdates(wait) {
       }
       Transition = null;
       runUpdates(() => {
-        for (const d of disposed) cleanNode(d);
+        for (const d of disposed) destroyNode(d);
         for (const v of sources) {
           v.value = v.tValue;
           if (v.owned) {
-            for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]);
+            for (let i = 0, len = v.owned.length; i < len; i++) destroyNode(v.owned[i]);
           }
           if (v.tOwned) v.owned = v.tOwned;
           delete v.tValue;
@@ -896,8 +922,8 @@ function runUserEffects(queue) {
 function lookUpstream(node, ignore) {
   const runningTransition = Transition && Transition.running;
   if (runningTransition) node.tState = 0;else node.state = 0;
-  for (let i = 0; i < node.sources.length; i += 1) {
-    const source = node.sources[i];
+  for (let link = node.sources; link !== null; link = link.nextSource) {
+    const source = link.source;
     if (source.sources) {
       const state = runningTransition ? source.tState : source.state;
       if (state === STALE) {
@@ -908,8 +934,9 @@ function lookUpstream(node, ignore) {
 }
 function markDownstream(node) {
   const runningTransition = Transition && Transition.running;
-  for (let i = 0; i < node.observers.length; i += 1) {
-    const o = node.observers[i];
+  for (let link = node.observers; link !== null; link = link.nextObserver) {
+    const o = link.observer;
+    if (link.version < o.relinkTime) continue;
     if (runningTransition ? !o.tState : !o.state) {
       if (runningTransition) o.tState = PENDING;else o.state = PENDING;
       if (o.pure) Updates.push(o);else Effects.push(o);
@@ -917,40 +944,64 @@ function markDownstream(node) {
     }
   }
 }
-function cleanNode(node) {
+function cleanupRoot(node) {
   let i;
-  if (node.sources) {
-    while (node.sources.length) {
-      const source = node.sources.pop(),
-        index = node.sourceSlots.pop(),
-        obs = source.observers;
-      if (obs && obs.length) {
-        const n = obs.pop(),
-          s = source.observerSlots.pop();
-        if (index < obs.length) {
-          n.sourceSlots[s] = index;
-          obs[index] = n;
-          source.observerSlots[index] = s;
-        }
-      }
-    }
-  }
   if (node.tOwned) {
-    for (i = node.tOwned.length - 1; i >= 0; i--) cleanNode(node.tOwned[i]);
+    for (i = node.tOwned.length - 1; i >= 0; i--) destroyNode(node.tOwned[i]);
     delete node.tOwned;
   }
   if (Transition && Transition.running && node.pure) {
     reset(node, true);
   } else if (node.owned) {
-    for (i = node.owned.length - 1; i >= 0; i--) cleanNode(node.owned[i]);
+    for (i = node.owned.length - 1; i >= 0; i--) destroyNode(node.owned[i]);
     node.owned = null;
   }
   if (node.cleanups) {
-    for (i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
+    for (let i = node.cleanups.length - 1; i >= 0; i--) node.cleanups[i]();
     node.cleanups = null;
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
 }
+function afterComputation(node) {
+  const sourcesTail = node.sourcesTail;
+  let toRemove = sourcesTail !== null ? sourcesTail.nextSource : node.sources;
+  if (toRemove !== null) {
+    do {
+      toRemove = unlinkFromObservers(toRemove);
+    } while (toRemove !== null);
+    if (sourcesTail !== null) {
+      sourcesTail.nextSource = null;
+    } else {
+      node.sources = null;
+    }
+  }
+}
+function unlinkFromObservers(link) {
+  const source = link.source;
+  const nextSource = link.nextSource;
+  const nextObserver = link.nextObserver;
+  const prevObserver = link.prevObserver;
+  if (nextObserver !== null) {
+    nextObserver.prevObserver = prevObserver;
+  } else {
+    source.observersTail = prevObserver;
+  }
+  if (prevObserver !== null) {
+    prevObserver.nextObserver = nextObserver;
+  } else {
+    source.observers = nextObserver;
+  }
+  return nextSource;
+}
+function destroyNode(node) {
+  let link = node.sources;
+  while (link) {
+    link = unlinkFromObservers(link);
+  }
+  node.sources = null;
+  node.sourcesTail = null;
+  cleanupRoot(node);
+}
 function reset(node, top) {
   if (!top) {
     node.tState = 0;
@@ -981,6 +1032,7 @@ function handleError(err, owner = Owner) {
     fn() {
       runErrors(error, fns, owner);
     },
+    sources: null,
     state: STALE
   });else runErrors(error, fns, owner);
 }

package/h/dist/h.js

@@ -1,4 +1,4 @@
-import { spread, assign, insert, createComponent, dynamicProperty, SVGElements } from 'solid-js/web';
+import { SVGElements, dynamicProperty, createComponent, insert, assign, spread } from 'solid-js/web';
 
 const $ELEMENT = Symbol("hyper-element");
 function createHyperScript(r) {

package/html/dist/html.cjs

@@ -64,7 +64,7 @@ function parseTag(tag) {
 }
 function pushTextNode(list, html, start) {
   const end = html.indexOf('<', start);
-  const content = html.slice(start, end === -1 ? undefined : end);
+  const content = html.slice(start, end === -1 ? void 0 : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'text',
@@ -83,7 +83,7 @@ function pushCommentNode(list, tag) {
 }
 function parse(html) {
   const result = [];
-  let current = undefined;
+  let current = void 0;
   let level = -1;
   const arr = [];
   const byTag = {};
@@ -92,7 +92,7 @@ function parse(html) {
     const isComment = tag.slice(0, 4) === '<!--';
     const start = index + tag.length;
     const nextChar = html.charAt(start);
-    let parent = undefined;
+    let parent = void 0;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);

package/html/dist/html.js

@@ -1,4 +1,4 @@
-import { effect, style, insert, untrack, spread, createComponent, delegateEvents, classList, mergeProps, dynamicProperty, setAttribute, setAttributeNS, addEventListener, Aliases, getPropAlias, Properties, ChildProperties, DelegatedEvents, SVGElements, SVGNamespace } from 'solid-js/web';
+import { SVGNamespace, SVGElements, DelegatedEvents, ChildProperties, Properties, getPropAlias, Aliases, addEventListener, setAttributeNS, setAttribute, dynamicProperty, mergeProps, classList, delegateEvents, createComponent, spread, untrack, insert, style, effect } from 'solid-js/web';
 
 const tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
 const attrRE = /(?:\s(?<boolean>[^/\s><=]+?)(?=[\s/>]))|(?:(?<name>\S+?)(?:\s*=\s*(?:(['"])(?<quotedValue>[\s\S]*?)\3|(?<unquotedValue>[^\s>]+))))/g;
@@ -62,7 +62,7 @@ function parseTag(tag) {
 }
 function pushTextNode(list, html, start) {
   const end = html.indexOf('<', start);
-  const content = html.slice(start, end === -1 ? undefined : end);
+  const content = html.slice(start, end === -1 ? void 0 : end);
   if (!/^\s*$/.test(content)) {
     list.push({
       type: 'text',
@@ -81,7 +81,7 @@ function pushCommentNode(list, tag) {
 }
 function parse(html) {
   const result = [];
-  let current = undefined;
+  let current = void 0;
   let level = -1;
   const arr = [];
   const byTag = {};
@@ -90,7 +90,7 @@ function parse(html) {
     const isComment = tag.slice(0, 4) === '<!--';
     const start = index + tag.length;
     const nextChar = html.charAt(start);
-    let parent = undefined;
+    let parent = void 0;
     if (isOpen && !isComment) {
       level++;
       current = parseTag(tag);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.9.11",
+  "version": "1.10.0-beta.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/store/dist/dev.js

@@ -1,4 +1,4 @@
-import { DEV as DEV$1, $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
+import { $PROXY, DEV as DEV$1, batch, $TRACK, getListener, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
   $NODE = Symbol("store-node"),

package/store/dist/store.js

@@ -1,4 +1,4 @@
-import { $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
+import { batch, $PROXY, $TRACK, getListener, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
   $NODE = Symbol("store-node"),

package/types/reactive/signal.d.ts

@@ -48,8 +48,8 @@ export interface SourceMapValue {
 }
 export interface SignalState<T> extends SourceMapValue {
     value: T;
-    observers: Computation<any>[] | null;
-    observerSlots: number[] | null;
+    observers: ReactiveLink | null;
+    observersTail: ReactiveLink | null;
     tValue?: T;
     comparator?: (prev: T, next: T) => boolean;
     internal?: true;
@@ -62,15 +62,24 @@ export interface Owner {
     sourceMap?: SourceMapValue[];
     name?: string;
 }
+interface ReactiveLink {
+    source: SignalState<unknown> | Memo<any>;
+    observer: Computation<any>;
+    nextSource: ReactiveLink | null;
+    prevObserver: ReactiveLink | null;
+    nextObserver: ReactiveLink | null;
+    version: number;
+}
 export interface Computation<Init, Next extends Init = Init> extends Owner {
     fn: EffectFunction<Init, Next>;
     state: ComputationState;
     tState?: ComputationState;
-    sources: SignalState<Next>[] | null;
-    sourceSlots: number[] | null;
+    sources: ReactiveLink | null;
+    sourcesTail: ReactiveLink | null;
     value?: Init;
     updatedAt: number | null;
     pure: boolean;
+    relinkTime: number;
     user?: boolean;
     suspense?: SuspenseContextType;
 }

package/universal/dist/dev.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, mergeProps, createComponent, untrack } from 'solid-js';
+import { createMemo, createComponent, createRenderEffect, mergeProps, untrack, createRoot } from 'solid-js';
 
 const memo = fn => createMemo(() => fn());
 

package/universal/dist/universal.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, mergeProps, createComponent, untrack } from 'solid-js';
+import { createMemo, createComponent, createRenderEffect, mergeProps, untrack, createRoot } from 'solid-js';
 
 const memo = fn => createMemo(() => fn());
 

package/web/dist/dev.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, untrack, sharedConfig, enableHydration, getOwner, createEffect, runWithOwner, createSignal, onCleanup, $DEVCOMP, splitProps } from 'solid-js';
+import { createMemo, sharedConfig, createRenderEffect, createRoot, untrack, splitProps, getOwner, createEffect, runWithOwner, createSignal, onCleanup, $DEVCOMP, enableHydration } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps, untrack } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "alpha",

package/web/dist/server.js

@@ -1,6 +1,6 @@
 import { createMemo, sharedConfig, createRoot, splitProps } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps, untrack } from 'solid-js';
-import { Feature, Serializer, getCrossReferenceHeader } from 'seroval';
+import { Serializer, Feature, getCrossReferenceHeader } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
 const booleans = ["allowfullscreen", "async", "alpha",

package/web/dist/web.js

@@ -1,4 +1,4 @@
-import { createMemo, createRoot, createRenderEffect, untrack, sharedConfig, enableHydration, getOwner, createEffect, runWithOwner, createSignal, onCleanup, splitProps } from 'solid-js';
+import { createMemo, sharedConfig, createRenderEffect, createRoot, untrack, splitProps, getOwner, createEffect, runWithOwner, createSignal, onCleanup, enableHydration } from 'solid-js';
 export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, createRenderEffect as effect, getOwner, mergeProps, untrack } from 'solid-js';
 
 const booleans = ["allowfullscreen", "async", "alpha",