solid-js 1.7.0-beta.0 → 1.7.0-beta.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2019 Ryan Carniato
+Copyright (c) 2016-2023 Ryan Carniato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/dev.cjs

@@ -461,6 +461,20 @@ function onCleanup(fn) {
   if (Owner === null) console.warn("cleanups created outside a `createRoot` or `render` will never be run");else if (Owner.cleanups === null) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   return fn;
 }
+function catchError(fn, handler) {
+  ERROR || (ERROR = Symbol("error"));
+  Owner = createComputation(undefined, undefined, true);
+  Owner.context = {
+    [ERROR]: [handler]
+  };
+  try {
+    return fn();
+  } catch (err) {
+    handleError(err);
+  } finally {
+    Owner = Owner.owner;
+  }
+}
 function onError(fn) {
   ERROR || (ERROR = Symbol("error"));
   if (Owner === null) console.warn("error handlers created outside a `createRoot` or `render` will never be run");else if (Owner.context === null) Owner.context = {
@@ -535,7 +549,8 @@ function devComponent(Comp, props) {
   c.props = props;
   c.observers = null;
   c.observerSlots = null;
-  c.componentName = Comp.name;
+  c.name = Comp.name;
+  c.component = Comp;
   updateComputation(c);
   return c.tValue !== undefined ? c.tValue : c.value;
 }
@@ -644,7 +659,7 @@ function writeSignal(node, value, isComp) {
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if ("_SOLID_DEV_") throw new Error("Potential Infinite Loop Detected.");
+          if (true) throw new Error("Potential Infinite Loop Detected.");
           throw new Error();
         }
       }, false);
@@ -689,7 +704,8 @@ function runComputation(node, value, time) {
         node.owned = null;
       }
     }
-    handleError(err);
+    node.updatedAt = time + 1;
+    return handleError(err);
   }
   if (!node.updatedAt || node.updatedAt <= time) {
     if (node.updatedAt != null && "observers" in node) {
@@ -870,7 +886,7 @@ function lookUpstream(node, ignore) {
     const source = node.sources[i];
     if (source.sources) {
       if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
-        if (source !== ignore) runTop(source);
+        if (source !== ignore && (!source.updatedAt || source.updatedAt < ExecCount)) runTop(source);
       } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookUpstream(source, ignore);
     }
   }
@@ -906,16 +922,16 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running && node.pure) {
     if (node.tOwned) {
-      for (i = 0; i < node.tOwned.length; i++) cleanNode(node.tOwned[i]);
+      for (i = node.tOwned.length - 1; i >= 0; i--) cleanNode(node.tOwned[i]);
       delete node.tOwned;
     }
     reset(node, true);
   } else if (node.owned) {
-    for (i = 0; i < node.owned.length; i++) cleanNode(node.owned[i]);
+    for (i = node.owned.length - 1; i >= 0; i--) cleanNode(node.owned[i]);
     node.owned = null;
   }
   if (node.cleanups) {
-    for (i = 0; i < node.cleanups.length; i++) node.cleanups[i]();
+    for (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;
@@ -1360,7 +1376,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
-      if ("_SOLID_DEV_") Object.assign(Comp, {
+      if (true) Object.assign(Comp, {
         [$DEVCOMP]: true
       });
       if (!ctx) return Comp(props);
@@ -1407,7 +1423,10 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? untrack(() => child(keyed ? c : () => props.when)) : child;
+      return fn ? untrack(() => child(keyed ? c : () => {
+        if (true && !untrack(condition)) console.warn("Accessing stale value from Show.");
+        return props.when;
+      })) : child;
     }
     return props.fallback;
   }, undefined, {
@@ -1438,7 +1457,10 @@ function Switch(props) {
     if (index < 0) return props.fallback;
     const c = cond.children;
     const fn = typeof c === "function" && c.length > 0;
-    return fn ? untrack(() => c(keyed ? when : () => cond.when)) : c;
+    return fn ? untrack(() => c(keyed ? when : () => {
+      if (true && untrack(evalConditions)[0] !== index) console.warn("Accessing stale value from Match.");
+      return cond.when;
+    })) : c;
   }, undefined, {
     name: "value"
   } );
@@ -1465,12 +1487,9 @@ function ErrorBoundary(props) {
     if (e = errored()) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      const res = typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
-      onError(setErrored);
-      return res;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
     }
-    onError(setErrored);
-    return props.children;
+    return catchError(() => props.children, setErrored);
   }, undefined, {
     name: "value"
   } );
@@ -1665,6 +1684,7 @@ exports.SuspenseList = SuspenseList;
 exports.Switch = Switch;
 exports.batch = batch;
 exports.cancelCallback = cancelCallback;
+exports.catchError = catchError;
 exports.children = children;
 exports.createComponent = createComponent;
 exports.createComputed = createComputed;

package/dist/dev.js

@@ -459,6 +459,20 @@ function onCleanup(fn) {
   if (Owner === null) console.warn("cleanups created outside a `createRoot` or `render` will never be run");else if (Owner.cleanups === null) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   return fn;
 }
+function catchError(fn, handler) {
+  ERROR || (ERROR = Symbol("error"));
+  Owner = createComputation(undefined, undefined, true);
+  Owner.context = {
+    [ERROR]: [handler]
+  };
+  try {
+    return fn();
+  } catch (err) {
+    handleError(err);
+  } finally {
+    Owner = Owner.owner;
+  }
+}
 function onError(fn) {
   ERROR || (ERROR = Symbol("error"));
   if (Owner === null) console.warn("error handlers created outside a `createRoot` or `render` will never be run");else if (Owner.context === null) Owner.context = {
@@ -533,7 +547,8 @@ function devComponent(Comp, props) {
   c.props = props;
   c.observers = null;
   c.observerSlots = null;
-  c.componentName = Comp.name;
+  c.name = Comp.name;
+  c.component = Comp;
   updateComputation(c);
   return c.tValue !== undefined ? c.tValue : c.value;
 }
@@ -642,7 +657,7 @@ function writeSignal(node, value, isComp) {
         }
         if (Updates.length > 10e5) {
           Updates = [];
-          if ("_SOLID_DEV_") throw new Error("Potential Infinite Loop Detected.");
+          if (true) throw new Error("Potential Infinite Loop Detected.");
           throw new Error();
         }
       }, false);
@@ -687,7 +702,8 @@ function runComputation(node, value, time) {
         node.owned = null;
       }
     }
-    handleError(err);
+    node.updatedAt = time + 1;
+    return handleError(err);
   }
   if (!node.updatedAt || node.updatedAt <= time) {
     if (node.updatedAt != null && "observers" in node) {
@@ -868,7 +884,7 @@ function lookUpstream(node, ignore) {
     const source = node.sources[i];
     if (source.sources) {
       if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
-        if (source !== ignore) runTop(source);
+        if (source !== ignore && (!source.updatedAt || source.updatedAt < ExecCount)) runTop(source);
       } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookUpstream(source, ignore);
     }
   }
@@ -904,16 +920,16 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running && node.pure) {
     if (node.tOwned) {
-      for (i = 0; i < node.tOwned.length; i++) cleanNode(node.tOwned[i]);
+      for (i = node.tOwned.length - 1; i >= 0; i--) cleanNode(node.tOwned[i]);
       delete node.tOwned;
     }
     reset(node, true);
   } else if (node.owned) {
-    for (i = 0; i < node.owned.length; i++) cleanNode(node.owned[i]);
+    for (i = node.owned.length - 1; i >= 0; i--) cleanNode(node.owned[i]);
     node.owned = null;
   }
   if (node.cleanups) {
-    for (i = 0; i < node.cleanups.length; i++) node.cleanups[i]();
+    for (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;
@@ -1358,7 +1374,7 @@ function lazy(fn) {
     }
     let Comp;
     return createMemo(() => (Comp = comp()) && untrack(() => {
-      if ("_SOLID_DEV_") Object.assign(Comp, {
+      if (true) Object.assign(Comp, {
         [$DEVCOMP]: true
       });
       if (!ctx) return Comp(props);
@@ -1405,7 +1421,10 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? untrack(() => child(keyed ? c : () => props.when)) : child;
+      return fn ? untrack(() => child(keyed ? c : () => {
+        if (true && !untrack(condition)) console.warn("Accessing stale value from Show.");
+        return props.when;
+      })) : child;
     }
     return props.fallback;
   }, undefined, {
@@ -1436,7 +1455,10 @@ function Switch(props) {
     if (index < 0) return props.fallback;
     const c = cond.children;
     const fn = typeof c === "function" && c.length > 0;
-    return fn ? untrack(() => c(keyed ? when : () => cond.when)) : c;
+    return fn ? untrack(() => c(keyed ? when : () => {
+      if (true && untrack(evalConditions)[0] !== index) console.warn("Accessing stale value from Match.");
+      return cond.when;
+    })) : c;
   }, undefined, {
     name: "value"
   } );
@@ -1463,12 +1485,9 @@ function ErrorBoundary(props) {
     if (e = errored()) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      const res = typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
-      onError(setErrored);
-      return res;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored())) : f;
     }
-    onError(setErrored);
-    return props.children;
+    return catchError(() => props.children, setErrored);
   }, undefined, {
     name: "value"
   } );
@@ -1650,4 +1669,4 @@ if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-export { $DEVCOMP, $PROXY, $TRACK, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, $TRACK, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, catchError, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -6,7 +6,6 @@ const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = undefined;
 const ERROR = Symbol("error");
-const BRANCH = Symbol("branch");
 function castError(err) {
   if (err instanceof Error) return err;
   return new Error(typeof err === "string" ? err : "Unknown error", {
@@ -21,19 +20,35 @@ function handleError(err) {
 }
 const UNOWNED = {
   context: null,
-  owner: null
+  owner: null,
+  owned: null,
+  cleanups: null
 };
 let Owner = null;
+function createOwner() {
+  const o = {
+    owner: Owner,
+    context: null,
+    owned: null,
+    cleanups: null
+  };
+  if (Owner) {
+    if (!Owner.owned) Owner.owned = [o];else Owner.owned.push(o);
+  }
+  return o;
+}
 function createRoot(fn, detachedOwner) {
   const owner = Owner,
     root = fn.length === 0 ? UNOWNED : {
       context: null,
-      owner: detachedOwner === undefined ? owner : detachedOwner
+      owner: detachedOwner === undefined ? owner : detachedOwner,
+      owned: null,
+      cleanups: null
     };
   Owner = root;
   let result;
   try {
-    result = fn(() => {});
+    result = fn(fn.length === 0 ? () => {} : () => cleanNode(root));
   } catch (err) {
     handleError(err);
   } finally {
@@ -47,10 +62,7 @@ function createSignal(value, options) {
   }];
 }
 function createComputed(fn, value) {
-  Owner = {
-    owner: Owner,
-    context: null
-  };
+  Owner = createOwner();
   try {
     fn(value);
   } catch (err) {
@@ -67,10 +79,7 @@ function createReaction(fn) {
   };
 }
 function createMemo(fn, value) {
-  Owner = {
-    owner: Owner,
-    context: null
-  };
+  Owner = createOwner();
   let v;
   try {
     v = fn(value);
@@ -106,16 +115,36 @@ function on(deps, fn, options = {}) {
 }
 function onMount(fn) {}
 function onCleanup(fn) {
-  let node;
-  if (Owner && (node = lookup(Owner, BRANCH))) {
-    if (!node.cleanups) node.cleanups = [fn];else node.cleanups.push(fn);
+  if (Owner) {
+    if (!Owner.cleanups) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   }
   return fn;
 }
 function cleanNode(node) {
+  if (node.owned) {
+    for (let i = 0; i < node.owned.length; i++) cleanNode(node.owned[i]);
+    node.owned = null;
+  }
   if (node.cleanups) {
     for (let i = 0; i < node.cleanups.length; i++) node.cleanups[i]();
-    node.cleanups = undefined;
+    node.cleanups = null;
+  }
+}
+function catchError(fn, handler) {
+  Owner = {
+    owner: Owner,
+    context: {
+      [ERROR]: [handler]
+    },
+    owned: null,
+    cleanups: null
+  };
+  try {
+    return fn();
+  } catch (err) {
+    handleError(err);
+  } finally {
+    Owner = Owner.owner;
   }
 }
 function onError(fn) {
@@ -345,7 +374,7 @@ function Index(props) {
 }
 function Show(props) {
   let c;
-  return props.when ? typeof (c = props.children) === "function" ? c(props.when) : c : props.fallback || "";
+  return props.when ? typeof (c = props.children) === "function" ? c(props.keyed ? props.when : () => props.when) : c : props.fallback || "";
 }
 function Switch(props) {
   let conditions = props.children;
@@ -354,7 +383,7 @@ function Switch(props) {
     const w = conditions[i].when;
     if (w) {
       const c = conditions[i].children;
-      return typeof c === "function" ? c(w) : c;
+      return typeof c === "function" ? c(conditions[i].keyed ? w : () => w) : c;
     }
   }
   return props.fallback || "";
@@ -380,17 +409,13 @@ function ErrorBoundary(props) {
     const f = props.fallback;
     return typeof f === "function" && f.length ? f(error, () => {}) : f;
   }
-  onError(err => {
-    error = err;
-    !sync && ctx.replace("e" + id, displayFallback);
-    sync = true;
-  });
-  onCleanup(() => cleanNode(clean));
   createMemo(() => {
-    Owner.context = {
-      [BRANCH]: clean = {}
-    };
-    return res = props.children;
+    clean = Owner;
+    return catchError(() => res = props.children, err => {
+      error = err;
+      !sync && ctx.replace("e" + id, displayFallback);
+      sync = true;
+    });
   });
   if (error) return displayFallback();
   sync = false;
@@ -439,7 +464,7 @@ function createResource(source, fetcher, options = {}) {
   };
   read.loading = false;
   read.error = undefined;
-  read.state = "initialValue" in options ? "resolved" : "unresolved";
+  read.state = "initialValue" in options ? "ready" : "unresolved";
   Object.defineProperty(read, "latest", {
     get() {
       return read();
@@ -472,7 +497,7 @@ function createResource(source, fetcher, options = {}) {
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
         read.loading = false;
-        read.state = "resolved";
+        read.state = "ready";
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
@@ -562,15 +587,9 @@ function SuspenseList(props) {
 }
 function Suspense(props) {
   let done;
-  let clean;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
-  const o = Owner;
-  if (o) {
-    if (o.context) o.context[BRANCH] = clean = {};else o.context = {
-      [BRANCH]: clean = {}
-    };
-  }
+  const o = createOwner();
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
     completed: () => {
@@ -580,51 +599,51 @@ function Suspense(props) {
       }
     }
   });
+  function suspenseError(err) {
+    if (!done || !done(undefined, err)) {
+      if (o) runWithOwner(o.owner, () => {
+        throw err;
+      });else throw err;
+    }
+  }
   function runSuspense() {
     setHydrateContext({
       ...ctx,
       count: 0
     });
-    return runWithOwner(o, () => {
-      return createComponent(SuspenseContext.Provider, {
-        value,
-        get children() {
-          clean && cleanNode(clean);
-          return props.children;
-        }
-      });
-    });
+    o && cleanNode(o);
+    return runWithOwner(o, () => createComponent(SuspenseContext.Provider, {
+      value,
+      get children() {
+        return catchError(() => props.children, suspenseError);
+      }
+    }));
   }
   const res = runSuspense();
   if (suspenseComplete(value)) return res;
-  onError(err => {
-    if (!done || !done(undefined, err)) {
-      if (o) runWithOwner(o.owner, () => {
-        throw err;
-      });else throw err;
-    }
-  });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
-  if (ctx.async) {
+  return catchError(() => {
+    if (ctx.async) {
+      setHydrateContext({
+        ...ctx,
+        count: 0,
+        id: ctx.id + "0-f",
+        noHydrate: true
+      });
+      const res = {
+        t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
+      };
+      setHydrateContext(ctx);
+      return res;
+    }
     setHydrateContext({
       ...ctx,
       count: 0,
-      id: ctx.id + "0.f",
-      noHydrate: true
+      id: ctx.id + "0-f"
     });
-    const res = {
-      t: `<template id="pl-${id}"></template>${resolveSSRNode(props.fallback)}<!pl-${id}>`
-    };
-    setHydrateContext(ctx);
-    return res;
-  }
-  setHydrateContext({
-    ...ctx,
-    count: 0,
-    id: ctx.id + "0.f"
-  });
-  ctx.writeResource(id, "$$f");
-  return props.fallback;
+    ctx.writeResource(id, "$$f");
+    return props.fallback;
+  }, suspenseError);
 }
 
 exports.$DEVCOMP = $DEVCOMP;