solid-js 1.4.3 → 1.4.6

package/dist/dev.cjs

@@ -161,17 +161,24 @@ let rootCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
-  if (owner) root.name = `${owner.name}-r${rootCount++}`;
+  },
+        updateFn = unowned ? () => fn(() => {
+    throw new Error("Dispose method must be an explicit argument to createRoot function");
+  })  : () => fn(() => cleanNode(root));
+  {
+    if (owner) root.name = `${owner.name}-r${rootCount++}`;
+    globalThis._$afterCreateRoot && globalThis._$afterCreateRoot(root);
+  }
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -802,10 +809,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
+    if (!Updates) Effects = null;
     handleError(err);
-  } finally {
-    Updates = null;
-    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -824,14 +829,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      for (const d of disposed) cleanNode(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]);
@@ -840,7 +847,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -946,6 +953,7 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
   node.context = null;
+  delete node.sourceMap;
 }
 function reset(node, top) {
   if (!top) {
@@ -959,7 +967,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1442,27 +1450,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1475,31 +1480,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);
@@ -1528,7 +1534,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1561,7 +1567,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1571,7 +1577,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/dist/dev.js

@@ -157,17 +157,24 @@ let rootCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
-  if (owner) root.name = `${owner.name}-r${rootCount++}`;
+  },
+        updateFn = unowned ? () => fn(() => {
+    throw new Error("Dispose method must be an explicit argument to createRoot function");
+  })  : () => fn(() => cleanNode(root));
+  {
+    if (owner) root.name = `${owner.name}-r${rootCount++}`;
+    globalThis._$afterCreateRoot && globalThis._$afterCreateRoot(root);
+  }
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -798,10 +805,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
+    if (!Updates) Effects = null;
     handleError(err);
-  } finally {
-    Updates = null;
-    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -820,14 +825,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      for (const d of disposed) cleanNode(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]);
@@ -836,7 +843,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -942,6 +949,7 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
   node.context = null;
+  delete node.sourceMap;
 }
 function reset(node, top) {
   if (!top) {
@@ -955,7 +963,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1438,27 +1446,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1471,31 +1476,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);
@@ -1524,7 +1530,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1557,7 +1563,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1567,7 +1573,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/dist/solid.cjs

@@ -160,16 +160,18 @@ let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !false ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
+  },
+        updateFn = unowned ? fn : () => fn(() => cleanNode(root));
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -745,10 +747,8 @@ function runUpdates(fn, init) {
     completeUpdates(wait);
     return res;
   } catch (err) {
+    if (!Updates) Effects = null;
     handleError(err);
-  } finally {
-    Updates = null;
-    if (!wait) Effects = null;
   }
 }
 function completeUpdates(wait) {
@@ -767,14 +767,16 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
+    const disposed = Transition.disposed;
     res = Transition.resolve;
-    Effects.forEach(e => {
+    for (const e of Effects) {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
-    });
+    }
     Transition = null;
     batch(() => {
-      sources.forEach(v => {
+      for (const d of disposed) cleanNode(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]);
@@ -783,7 +785,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -901,7 +903,7 @@ function reset(node, top) {
 function handleError(err) {
   const fns = ERROR && lookup(Owner, ERROR);
   if (!fns) throw err;
-  fns.forEach(f => f(err));
+  for (const f of fns) f(err);
 }
 function lookup(owner, key) {
   return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
@@ -1357,27 +1359,24 @@ function ErrorBoundary(props) {
 
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let index = 0,
-      suspenseSetter,
-      showContent,
-      showFallback;
+  let suspenseSetter, showContent, showFallback;
   const listContext = useContext(SuspenseListContext);
   if (listContext) {
     const [inFallback, setFallback] = createSignal(false);
     suspenseSetter = setFallback;
     [showContent, showFallback] = listContext.register(inFallback);
   }
-  const registry = [],
+  const [registry, setRegistry] = createSignal([]),
         comp = createComponent(SuspenseListContext.Provider, {
     value: {
       register: inFallback => {
         const [showingContent, showContent] = createSignal(false),
               [showingFallback, showFallback] = createSignal(false);
-        registry[index++] = {
+        setRegistry(registry => [...registry, {
           inFallback,
           showContent,
           showFallback
-        };
+        }]);
         return [showingContent, showingFallback];
       }
     },
@@ -1390,31 +1389,32 @@ function SuspenseList(props) {
           tail = props.tail,
           visibleContent = showContent ? showContent() : true,
           visibleFallback = showFallback ? showFallback() : true,
+          reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = registry.every(i => !i.inFallback());
+      const all = reg.every(i => !i.inFallback());
       suspenseSetter && suspenseSetter(!all);
-      registry.forEach(i => {
+      reg.forEach(i => {
         i.showContent(all && visibleContent);
         i.showFallback(visibleFallback);
       });
       return;
     }
     let stop = false;
-    for (let i = 0, len = registry.length; i < len; i++) {
+    for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = registry[n].inFallback();
+            s = reg[n].inFallback();
       if (!stop && !s) {
-        registry[n].showContent(visibleContent);
-        registry[n].showFallback(visibleFallback);
+        reg[n].showContent(visibleContent);
+        reg[n].showFallback(visibleFallback);
       } else {
         const next = !stop;
         if (next && suspenseSetter) suspenseSetter(true);
         if (!tail || next && tail === "collapsed") {
-          registry[n].showFallback(visibleFallback);
-        } else registry[n].showFallback(false);
+          reg[n].showFallback(visibleFallback);
+        } else reg[n].showFallback(false);
         stop = true;
-        registry[n].showContent(next);
+        reg[n].showContent(next);
       }
     }
     if (!stop && suspenseSetter) suspenseSetter(false);
@@ -1443,7 +1443,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1476,7 +1476,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1486,7 +1486,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {