solid-js 1.4.2 → 1.4.5

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;
@@ -824,14 +831,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 +849,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -946,6 +955,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 +969,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;
@@ -1415,24 +1425,25 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1441,27 +1452,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];
       }
     },
@@ -1474,31 +1482,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);
@@ -1527,7 +1536,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) {
@@ -1560,7 +1569,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,
@@ -1570,7 +1579,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;
@@ -820,14 +827,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 +845,7 @@ function completeUpdates(wait) {
         delete v.tValue;
         delete v.tOwned;
         v.tState = 0;
-      });
+      }
       setTransPending(false);
     });
   }
@@ -942,6 +951,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 +965,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;
@@ -1411,24 +1421,25 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1437,27 +1448,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];
       }
     },
@@ -1470,31 +1478,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);
@@ -1523,7 +1532,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) {
@@ -1556,7 +1565,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,
@@ -1566,7 +1575,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/server.cjs

@@ -258,8 +258,9 @@ function createComponent(Comp, props) {
 function mergeProps(...sources) {
   const target = {};
   for (let i = 0; i < sources.length; i++) {
-    const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-    Object.defineProperties(target, descriptors);
+    let source = sources[i];
+    if (typeof source === "function") source = source();
+    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
   }
   return target;
 }
@@ -314,14 +315,16 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+const NoErrors = {};
 function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
-  let error, res;
+  let error = NoErrors,
+      res;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
   onError(err => error = err);
   createMemo(() => res = props.children);
-  if (error) {
+  if (error !== NoErrors) {
     ctx.writeResource(id, error, true);
     setHydrateContext({ ...ctx,
       count: 0
@@ -360,7 +363,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
+    const resolved = sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -380,7 +383,7 @@ function createResource(source, fetcher, options = {}) {
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
-    if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
+    if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
     }

package/dist/server.js

@@ -254,8 +254,9 @@ function createComponent(Comp, props) {
 function mergeProps(...sources) {
   const target = {};
   for (let i = 0; i < sources.length; i++) {
-    const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-    Object.defineProperties(target, descriptors);
+    let source = sources[i];
+    if (typeof source === "function") source = source();
+    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
   }
   return target;
 }
@@ -310,14 +311,16 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+const NoErrors = {};
 function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
-  let error, res;
+  let error = NoErrors,
+      res;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
   onError(err => error = err);
   createMemo(() => res = props.children);
-  if (error) {
+  if (error !== NoErrors) {
     ctx.writeResource(id, error, true);
     setHydrateContext({ ...ctx,
       count: 0
@@ -356,7 +359,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
+    const resolved = sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -376,7 +379,7 @@ function createResource(source, fetcher, options = {}) {
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
-    if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
+    if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
     }