solid-js 1.7.9 → 1.7.10

package/dist/dev.cjs

@@ -166,6 +166,7 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
     owner = Owner,
     unowned = fn.length === 0,
+    current = detachedOwner === undefined ? owner : detachedOwner,
     root = unowned ? {
       owned: null,
       cleanups: null,
@@ -174,8 +175,8 @@ function createRoot(fn, detachedOwner) {
     }  : {
       owned: null,
       cleanups: null,
-      context: null,
-      owner: detachedOwner === undefined ? owner : detachedOwner
+      context: current ? current.context : null,
+      owner: current
     },
     updateFn = unowned ? () => fn(() => {
       throw new Error("Dispose method must be an explicit argument to createRoot function");
@@ -221,7 +222,7 @@ function createRenderEffect(fn, value, options) {
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
   const c = createComputation(fn, value, false, STALE, options ),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   if (!options || !options.render) c.user = true;
   Effects ? Effects.push(c) : updateComputation(c);
@@ -232,7 +233,7 @@ function createReaction(onInvalidate, options) {
       fn ? fn() : untrack(onInvalidate);
       fn = undefined;
     }, undefined, false, 0, options ),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   c.user = true;
   return tracking => {
@@ -313,7 +314,7 @@ function createResource(pSource, pFetcher, pOptions) {
     }, false);
   }
   function read() {
-    const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
+    const c = SuspenseContext && useContext(SuspenseContext),
       v = value(),
       err = error();
     if (err !== undefined && !pr) throw err;
@@ -468,6 +469,7 @@ function catchError(fn, handler) {
   ERROR || (ERROR = Symbol("error"));
   Owner = createComputation(undefined, undefined, true);
   Owner.context = {
+    ...Owner.context,
     [ERROR]: [handler]
   };
   if (Transition && Transition.running) Transition.sources.add(Owner);
@@ -479,12 +481,6 @@ function catchError(fn, handler) {
     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 = {
-    [ERROR]: [fn]
-  };else if (!Owner.context[ERROR]) Owner.context[ERROR] = [fn];else Owner.context[ERROR].push(fn);
-}
 function getListener() {
   return Listener;
 }
@@ -572,8 +568,7 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  let ctx;
-  return (ctx = lookup(Owner, context.id)) !== undefined ? ctx : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
 }
 function children(fn) {
   const children = createMemo(fn);
@@ -732,7 +727,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     cleanups: null,
     value: init,
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     pure
   };
   if (Transition && Transition.running) {
@@ -951,7 +946,6 @@ function cleanNode(node) {
     node.cleanups = null;
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
-  node.context = null;
   delete node.sourceMap;
 }
 function reset(node, top) {
@@ -977,7 +971,7 @@ function runErrors(err, fns, owner) {
   }
 }
 function handleError(err, owner = Owner) {
-  const fns = ERROR && lookup(owner, ERROR);
+  const fns = ERROR && owner && owner.context && owner.context[ERROR];
   const error = castError(err);
   if (!fns) throw error;
   if (Effects) Effects.push({
@@ -987,9 +981,6 @@ function handleError(err, owner = Owner) {
     state: STALE
   });else runErrors(error, fns, owner);
 }
-function lookup(owner, key) {
-  return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
-}
 function resolveChildren(children) {
   if (typeof children === "function" && !children.length) return resolveChildren(children());
   if (Array.isArray(children)) {
@@ -1007,6 +998,7 @@ function createProvider(id, options) {
     let res;
     createRenderEffect(() => res = untrack(() => {
       Owner.context = {
+        ...Owner.context,
         [id]: props.value
       };
       return children(() => props.children);
@@ -1014,6 +1006,30 @@ function createProvider(id, options) {
     return res;
   };
 }
+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[ERROR]) {
+    Owner.context = {
+      ...Owner.context,
+      [ERROR]: [fn]
+    };
+    mutateContext(Owner, ERROR, [fn]);
+  } else Owner.context[ERROR].push(fn);
+}
+function mutateContext(o, key, value) {
+  if (o.owned) {
+    for (let i = 0; i < o.owned.length; i++) {
+      if (o.owned[i].context === o.context) mutateContext(o.owned[i], key, value);
+      if (!o.owned[i].context) {
+        o.owned[i].context = o.context;
+        mutateContext(o.owned[i], key, value);
+      } else if (!o.owned[i].context[key]) {
+        o.owned[i].context[key] = value;
+        mutateContext(o.owned[i], key, value);
+      }
+    }
+  }
+}
 
 function observable(input) {
   return {

package/dist/dev.js

@@ -166,6 +166,7 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
     owner = Owner,
     unowned = fn.length === 0,
+    current = detachedOwner === undefined ? owner : detachedOwner,
     root = unowned
       ? {
           owned: null,
@@ -176,8 +177,8 @@ function createRoot(fn, detachedOwner) {
       : {
           owned: null,
           cleanups: null,
-          context: null,
-          owner: detachedOwner === undefined ? owner : detachedOwner
+          context: current ? current.context : null,
+          owner: current
         },
     updateFn = unowned
       ? () =>
@@ -229,7 +230,7 @@ function createRenderEffect(fn, value, options) {
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
   const c = createComputation(fn, value, false, STALE, options),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   if (!options || !options.render) c.user = true;
   Effects ? Effects.push(c) : updateComputation(c);
@@ -246,7 +247,7 @@ function createReaction(onInvalidate, options) {
       0,
       options
     ),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   c.user = true;
   return tracking => {
@@ -331,7 +332,7 @@ function createResource(pSource, pFetcher, pOptions) {
     }, false);
   }
   function read() {
-    const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
+    const c = SuspenseContext && useContext(SuspenseContext),
       v = value(),
       err = error();
     if (err !== undefined && !pr) throw err;
@@ -524,6 +525,7 @@ function catchError(fn, handler) {
   ERROR || (ERROR = Symbol("error"));
   Owner = createComputation(undefined, undefined, true);
   Owner.context = {
+    ...Owner.context,
     [ERROR]: [handler]
   };
   if (Transition && Transition.running) Transition.sources.add(Owner);
@@ -535,17 +537,6 @@ function catchError(fn, handler) {
     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 = {
-      [ERROR]: [fn]
-    };
-  else if (!Owner.context[ERROR]) Owner.context[ERROR] = [fn];
-  else Owner.context[ERROR].push(fn);
-}
 function getListener() {
   return Listener;
 }
@@ -642,8 +633,9 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  let ctx;
-  return (ctx = lookup(Owner, context.id)) !== undefined ? ctx : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined
+    ? Owner.context[context.id]
+    : context.defaultValue;
 }
 function children(fn) {
   const children = createMemo(fn);
@@ -810,7 +802,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     cleanups: null,
     value: init,
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     pure
   };
   if (Transition && Transition.running) {
@@ -1042,7 +1034,6 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running) node.tState = 0;
   else node.state = 0;
-  node.context = null;
   delete node.sourceMap;
 }
 function reset(node, top) {
@@ -1068,7 +1059,7 @@ function runErrors(err, fns, owner) {
   }
 }
 function handleError(err, owner = Owner) {
-  const fns = ERROR && lookup(owner, ERROR);
+  const fns = ERROR && owner && owner.context && owner.context[ERROR];
   const error = castError(err);
   if (!fns) throw error;
   if (Effects)
@@ -1080,13 +1071,6 @@ function handleError(err, owner = Owner) {
     });
   else runErrors(error, fns, owner);
 }
-function lookup(owner, key) {
-  return owner
-    ? owner.context && owner.context[key] !== undefined
-      ? owner.context[key]
-      : lookup(owner.owner, key)
-    : undefined;
-}
 function resolveChildren(children) {
   if (typeof children === "function" && !children.length) return resolveChildren(children());
   if (Array.isArray(children)) {
@@ -1106,6 +1090,7 @@ function createProvider(id, options) {
       () =>
         (res = untrack(() => {
           Owner.context = {
+            ...Owner.context,
             [id]: props.value
           };
           return children(() => props.children);
@@ -1116,6 +1101,32 @@ function createProvider(id, options) {
     return res;
   };
 }
+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[ERROR]) {
+    Owner.context = {
+      ...Owner.context,
+      [ERROR]: [fn]
+    };
+    mutateContext(Owner, ERROR, [fn]);
+  } else Owner.context[ERROR].push(fn);
+}
+function mutateContext(o, key, value) {
+  if (o.owned) {
+    for (let i = 0; i < o.owned.length; i++) {
+      if (o.owned[i].context === o.context) mutateContext(o.owned[i], key, value);
+      if (!o.owned[i].context) {
+        o.owned[i].context = o.context;
+        mutateContext(o.owned[i], key, value);
+      } else if (!o.owned[i].context[key]) {
+        o.owned[i].context[key] = value;
+        mutateContext(o.owned[i], key, value);
+      }
+    }
+  }
+}
 
 function observable(input) {
   return {

package/dist/server.cjs

@@ -13,7 +13,7 @@ function castError(err) {
   });
 }
 function handleError(err, owner = Owner) {
-  const fns = lookup(owner, ERROR);
+  const fns = owner && owner.context && owner.context[ERROR];
   const error = castError(err);
   if (!fns) throw error;
   try {
@@ -32,7 +32,7 @@ let Owner = null;
 function createOwner() {
   const o = {
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     owned: null,
     cleanups: null
   };
@@ -43,9 +43,10 @@ function createOwner() {
 }
 function createRoot(fn, detachedOwner) {
   const owner = Owner,
+    current = detachedOwner === undefined ? owner : detachedOwner,
     root = fn.length === 0 ? UNOWNED : {
-      context: null,
-      owner: detachedOwner === undefined ? owner : detachedOwner,
+      context: current ? current.context : null,
+      owner: current,
       owned: null,
       cleanups: null
     };
@@ -135,14 +136,12 @@ function cleanNode(node) {
   }
 }
 function catchError(fn, handler) {
-  Owner = {
-    owner: Owner,
-    context: {
-      [ERROR]: [handler]
-    },
-    owned: null,
-    cleanups: null
+  const owner = createOwner();
+  owner.context = {
+    ...owner.context,
+    [ERROR]: [handler]
   };
+  Owner = owner;
   try {
     return fn();
   } catch (err) {
@@ -151,13 +150,6 @@ function catchError(fn, handler) {
     Owner = Owner.owner;
   }
 }
-function onError(fn) {
-  if (Owner) {
-    if (Owner.context === null) Owner.context = {
-      [ERROR]: [fn]
-    };else if (!Owner.context[ERROR]) Owner.context[ERROR] = [fn];else Owner.context[ERROR].push(fn);
-  }
-}
 function getListener() {
   return null;
 }
@@ -170,8 +162,7 @@ function createContext(defaultValue) {
   };
 }
 function useContext(context) {
-  let ctx;
-  return (ctx = lookup(Owner, context.id)) !== undefined ? ctx : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
 }
 function getOwner() {
   return Owner;
@@ -195,9 +186,6 @@ function runWithOwner(o, fn) {
     Owner = prev;
   }
 }
-function lookup(owner, key) {
-  return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
-}
 function resolveChildren(children) {
   if (typeof children === "function" && !children.length) return resolveChildren(children());
   if (Array.isArray(children)) {
@@ -214,6 +202,7 @@ function createProvider(id) {
   return function provider(props) {
     return createMemo(() => {
       Owner.context = {
+        ...Owner.context,
         [id]: props.value
       };
       return children(() => props.children);
@@ -279,6 +268,31 @@ function from(producer) {
   return s;
 }
 function enableExternalSource(factory) {}
+function onError(fn) {
+  if (Owner) {
+    if (Owner.context === null || !Owner.context[ERROR]) {
+      Owner.context = {
+        ...Owner.context,
+        [ERROR]: [fn]
+      };
+      mutateContext(Owner, ERROR, [fn]);
+    } else Owner.context[ERROR].push(fn);
+  }
+}
+function mutateContext(o, key, value) {
+  if (o.owned) {
+    for (let i = 0; i < o.owned.length; i++) {
+      if (o.owned[i].context === o.context) mutateContext(o.owned[i], key, value);
+      if (!o.owned[i].context) {
+        o.owned[i].context = o.context;
+        mutateContext(o.owned[i], key, value);
+      } else if (!o.owned[i].context[key]) {
+        o.owned[i].context[key] = value;
+        mutateContext(o.owned[i], key, value);
+      }
+    }
+  }
+}
 
 function resolveSSRNode(node) {
   const t = typeof node;
@@ -663,6 +677,7 @@ exports.Suspense = Suspense;
 exports.SuspenseList = SuspenseList;
 exports.Switch = Switch;
 exports.batch = batch;
+exports.catchError = catchError;
 exports.children = children;
 exports.createComponent = createComponent;
 exports.createComputed = createComputed;

package/dist/server.js

@@ -11,7 +11,7 @@ function castError(err) {
   });
 }
 function handleError(err, owner = Owner) {
-  const fns = lookup(owner, ERROR);
+  const fns = owner && owner.context && owner.context[ERROR];
   const error = castError(err);
   if (!fns) throw error;
   try {
@@ -30,7 +30,7 @@ let Owner = null;
 function createOwner() {
   const o = {
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     owned: null,
     cleanups: null
   };
@@ -42,12 +42,13 @@ function createOwner() {
 }
 function createRoot(fn, detachedOwner) {
   const owner = Owner,
+    current = detachedOwner === undefined ? owner : detachedOwner,
     root =
       fn.length === 0
         ? UNOWNED
         : {
-            context: null,
-            owner: detachedOwner === undefined ? owner : detachedOwner,
+            context: current ? current.context : null,
+            owner: current,
             owned: null,
             cleanups: null
           };
@@ -141,14 +142,12 @@ function cleanNode(node) {
   }
 }
 function catchError(fn, handler) {
-  Owner = {
-    owner: Owner,
-    context: {
-      [ERROR]: [handler]
-    },
-    owned: null,
-    cleanups: null
+  const owner = createOwner();
+  owner.context = {
+    ...owner.context,
+    [ERROR]: [handler]
   };
+  Owner = owner;
   try {
     return fn();
   } catch (err) {
@@ -157,16 +156,6 @@ function catchError(fn, handler) {
     Owner = Owner.owner;
   }
 }
-function onError(fn) {
-  if (Owner) {
-    if (Owner.context === null)
-      Owner.context = {
-        [ERROR]: [fn]
-      };
-    else if (!Owner.context[ERROR]) Owner.context[ERROR] = [fn];
-    else Owner.context[ERROR].push(fn);
-  }
-}
 function getListener() {
   return null;
 }
@@ -179,8 +168,9 @@ function createContext(defaultValue) {
   };
 }
 function useContext(context) {
-  let ctx;
-  return (ctx = lookup(Owner, context.id)) !== undefined ? ctx : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined
+    ? Owner.context[context.id]
+    : context.defaultValue;
 }
 function getOwner() {
   return Owner;
@@ -204,13 +194,6 @@ function runWithOwner(o, fn) {
     Owner = prev;
   }
 }
-function lookup(owner, key) {
-  return owner
-    ? owner.context && owner.context[key] !== undefined
-      ? owner.context[key]
-      : lookup(owner.owner, key)
-    : undefined;
-}
 function resolveChildren(children) {
   if (typeof children === "function" && !children.length) return resolveChildren(children());
   if (Array.isArray(children)) {
@@ -227,6 +210,7 @@ function createProvider(id) {
   return function provider(props) {
     return createMemo(() => {
       Owner.context = {
+        ...Owner.context,
         [id]: props.value
       };
       return children(() => props.children);
@@ -293,6 +277,31 @@ function from(producer) {
   return s;
 }
 function enableExternalSource(factory) {}
+function onError(fn) {
+  if (Owner) {
+    if (Owner.context === null || !Owner.context[ERROR]) {
+      Owner.context = {
+        ...Owner.context,
+        [ERROR]: [fn]
+      };
+      mutateContext(Owner, ERROR, [fn]);
+    } else Owner.context[ERROR].push(fn);
+  }
+}
+function mutateContext(o, key, value) {
+  if (o.owned) {
+    for (let i = 0; i < o.owned.length; i++) {
+      if (o.owned[i].context === o.context) mutateContext(o.owned[i], key, value);
+      if (!o.owned[i].context) {
+        o.owned[i].context = o.context;
+        mutateContext(o.owned[i], key, value);
+      } else if (!o.owned[i].context[key]) {
+        o.owned[i].context[key] = value;
+        mutateContext(o.owned[i], key, value);
+      }
+    }
+  }
+}
 
 function resolveSSRNode(node) {
   const t = typeof node;
@@ -708,6 +717,7 @@ export {
   SuspenseList,
   Switch,
   batch,
+  catchError,
   children,
   createComponent,
   createComputed,

package/dist/solid.cjs

@@ -162,11 +162,12 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
     owner = Owner,
     unowned = fn.length === 0,
+    current = detachedOwner === undefined ? owner : detachedOwner,
     root = unowned ? UNOWNED : {
       owned: null,
       cleanups: null,
-      context: null,
-      owner: detachedOwner === undefined ? owner : detachedOwner
+      context: current ? current.context : null,
+      owner: current
     },
     updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
   Owner = root;
@@ -205,7 +206,7 @@ function createRenderEffect(fn, value, options) {
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
   const c = createComputation(fn, value, false, STALE),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   if (!options || !options.render) c.user = true;
   Effects ? Effects.push(c) : updateComputation(c);
@@ -216,7 +217,7 @@ function createReaction(onInvalidate, options) {
       fn ? fn() : untrack(onInvalidate);
       fn = undefined;
     }, undefined, false, 0),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   c.user = true;
   return tracking => {
@@ -297,7 +298,7 @@ function createResource(pSource, pFetcher, pOptions) {
     }, false);
   }
   function read() {
-    const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
+    const c = SuspenseContext && useContext(SuspenseContext),
       v = value(),
       err = error();
     if (err !== undefined && !pr) throw err;
@@ -452,6 +453,7 @@ function catchError(fn, handler) {
   ERROR || (ERROR = Symbol("error"));
   Owner = createComputation(undefined, undefined, true);
   Owner.context = {
+    ...Owner.context,
     [ERROR]: [handler]
   };
   if (Transition && Transition.running) Transition.sources.add(Owner);
@@ -463,12 +465,6 @@ function catchError(fn, handler) {
     Owner = Owner.owner;
   }
 }
-function onError(fn) {
-  ERROR || (ERROR = Symbol("error"));
-  if (Owner === null) ;else if (Owner.context === null) Owner.context = {
-    [ERROR]: [fn]
-  };else if (!Owner.context[ERROR]) Owner.context[ERROR] = [fn];else Owner.context[ERROR].push(fn);
-}
 function getListener() {
   return Listener;
 }
@@ -536,8 +532,7 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  let ctx;
-  return (ctx = lookup(Owner, context.id)) !== undefined ? ctx : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
 }
 function children(fn) {
   const children = createMemo(fn);
@@ -694,7 +689,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     cleanups: null,
     value: init,
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     pure
   };
   if (Transition && Transition.running) {
@@ -911,7 +906,6 @@ function cleanNode(node) {
     node.cleanups = null;
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
-  node.context = null;
 }
 function reset(node, top) {
   if (!top) {
@@ -936,7 +930,7 @@ function runErrors(err, fns, owner) {
   }
 }
 function handleError(err, owner = Owner) {
-  const fns = ERROR && lookup(owner, ERROR);
+  const fns = ERROR && owner && owner.context && owner.context[ERROR];
   const error = castError(err);
   if (!fns) throw error;
   if (Effects) Effects.push({
@@ -946,9 +940,6 @@ function handleError(err, owner = Owner) {
     state: STALE
   });else runErrors(error, fns, owner);
 }
-function lookup(owner, key) {
-  return owner ? owner.context && owner.context[key] !== undefined ? owner.context[key] : lookup(owner.owner, key) : undefined;
-}
 function resolveChildren(children) {
   if (typeof children === "function" && !children.length) return resolveChildren(children());
   if (Array.isArray(children)) {
@@ -966,6 +957,7 @@ function createProvider(id, options) {
     let res;
     createRenderEffect(() => res = untrack(() => {
       Owner.context = {
+        ...Owner.context,
         [id]: props.value
       };
       return children(() => props.children);
@@ -973,6 +965,30 @@ function createProvider(id, options) {
     return res;
   };
 }
+function onError(fn) {
+  ERROR || (ERROR = Symbol("error"));
+  if (Owner === null) ;else if (Owner.context === null || !Owner.context[ERROR]) {
+    Owner.context = {
+      ...Owner.context,
+      [ERROR]: [fn]
+    };
+    mutateContext(Owner, ERROR, [fn]);
+  } else Owner.context[ERROR].push(fn);
+}
+function mutateContext(o, key, value) {
+  if (o.owned) {
+    for (let i = 0; i < o.owned.length; i++) {
+      if (o.owned[i].context === o.context) mutateContext(o.owned[i], key, value);
+      if (!o.owned[i].context) {
+        o.owned[i].context = o.context;
+        mutateContext(o.owned[i], key, value);
+      } else if (!o.owned[i].context[key]) {
+        o.owned[i].context[key] = value;
+        mutateContext(o.owned[i], key, value);
+      }
+    }
+  }
+}
 
 function observable(input) {
   return {

package/dist/solid.js

@@ -162,13 +162,14 @@ function createRoot(fn, detachedOwner) {
   const listener = Listener,
     owner = Owner,
     unowned = fn.length === 0,
+    current = detachedOwner === undefined ? owner : detachedOwner,
     root = unowned
       ? UNOWNED
       : {
           owned: null,
           cleanups: null,
-          context: null,
-          owner: detachedOwner === undefined ? owner : detachedOwner
+          context: current ? current.context : null,
+          owner: current
         },
     updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
   Owner = root;
@@ -210,7 +211,7 @@ function createRenderEffect(fn, value, options) {
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
   const c = createComputation(fn, value, false, STALE),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   if (!options || !options.render) c.user = true;
   Effects ? Effects.push(c) : updateComputation(c);
@@ -226,7 +227,7 @@ function createReaction(onInvalidate, options) {
       false,
       0
     ),
-    s = SuspenseContext && lookup(Owner, SuspenseContext.id);
+    s = SuspenseContext && useContext(SuspenseContext);
   if (s) c.suspense = s;
   c.user = true;
   return tracking => {
@@ -311,7 +312,7 @@ function createResource(pSource, pFetcher, pOptions) {
     }, false);
   }
   function read() {
-    const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
+    const c = SuspenseContext && useContext(SuspenseContext),
       v = value(),
       err = error();
     if (err !== undefined && !pr) throw err;
@@ -502,6 +503,7 @@ function catchError(fn, handler) {
   ERROR || (ERROR = Symbol("error"));
   Owner = createComputation(undefined, undefined, true);
   Owner.context = {
+    ...Owner.context,
     [ERROR]: [handler]
   };
   if (Transition && Transition.running) Transition.sources.add(Owner);
@@ -513,16 +515,6 @@ function catchError(fn, handler) {
     Owner = Owner.owner;
   }
 }
-function onError(fn) {
-  ERROR || (ERROR = Symbol("error"));
-  if (Owner === null);
-  else if (Owner.context === null)
-    Owner.context = {
-      [ERROR]: [fn]
-    };
-  else if (!Owner.context[ERROR]) Owner.context[ERROR] = [fn];
-  else Owner.context[ERROR].push(fn);
-}
 function getListener() {
   return Listener;
 }
@@ -592,8 +584,9 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  let ctx;
-  return (ctx = lookup(Owner, context.id)) !== undefined ? ctx : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined
+    ? Owner.context[context.id]
+    : context.defaultValue;
 }
 function children(fn) {
   const children = createMemo(fn);
@@ -758,7 +751,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     cleanups: null,
     value: init,
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     pure
   };
   if (Transition && Transition.running) {
@@ -986,7 +979,6 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running) node.tState = 0;
   else node.state = 0;
-  node.context = null;
 }
 function reset(node, top) {
   if (!top) {
@@ -1011,7 +1003,7 @@ function runErrors(err, fns, owner) {
   }
 }
 function handleError(err, owner = Owner) {
-  const fns = ERROR && lookup(owner, ERROR);
+  const fns = ERROR && owner && owner.context && owner.context[ERROR];
   const error = castError(err);
   if (!fns) throw error;
   if (Effects)
@@ -1023,13 +1015,6 @@ function handleError(err, owner = Owner) {
     });
   else runErrors(error, fns, owner);
 }
-function lookup(owner, key) {
-  return owner
-    ? owner.context && owner.context[key] !== undefined
-      ? owner.context[key]
-      : lookup(owner.owner, key)
-    : undefined;
-}
 function resolveChildren(children) {
   if (typeof children === "function" && !children.length) return resolveChildren(children());
   if (Array.isArray(children)) {
@@ -1049,6 +1034,7 @@ function createProvider(id, options) {
       () =>
         (res = untrack(() => {
           Owner.context = {
+            ...Owner.context,
             [id]: props.value
           };
           return children(() => props.children);
@@ -1058,6 +1044,31 @@ function createProvider(id, options) {
     return res;
   };
 }
+function onError(fn) {
+  ERROR || (ERROR = Symbol("error"));
+  if (Owner === null);
+  else if (Owner.context === null || !Owner.context[ERROR]) {
+    Owner.context = {
+      ...Owner.context,
+      [ERROR]: [fn]
+    };
+    mutateContext(Owner, ERROR, [fn]);
+  } else Owner.context[ERROR].push(fn);
+}
+function mutateContext(o, key, value) {
+  if (o.owned) {
+    for (let i = 0; i < o.owned.length; i++) {
+      if (o.owned[i].context === o.context) mutateContext(o.owned[i], key, value);
+      if (!o.owned[i].context) {
+        o.owned[i].context = o.context;
+        mutateContext(o.owned[i], key, value);
+      } else if (!o.owned[i].context[key]) {
+        o.owned[i].context[key] = value;
+        mutateContext(o.owned[i], key, value);
+      }
+    }
+  }
+}
 
 function observable(input) {
   return {

package/package.json

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

package/store/dist/dev.cjs

@@ -4,7 +4,8 @@ var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
   $NODE = Symbol("store-node"),
-  $HAS = Symbol("store-has");
+  $HAS = Symbol("store-has"),
+  $SELF = Symbol("store-self");
 const DevHooks = {
   onStoreNodeUpdate: null
 };
@@ -82,7 +83,7 @@ function proxyDescriptor$1(target, property) {
   return desc;
 }
 function trackSelf(target) {
-  solidJs.getListener() && getNode(getNodes(target, $NODE), "_")();
+  solidJs.getListener() && getNode(getNodes(target, $NODE), $SELF)();
 }
 function ownKeys(target) {
   trackSelf(target);
@@ -141,7 +142,7 @@ function setProperty(state, property, value, deleting = false) {
     for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
     (node = getNode(nodes, "length", len)) && node.$(state.length);
   }
-  (node = nodes._) && node.$();
+  (node = nodes[$SELF]) && node.$();
 }
 function mergeStoreNode(state, value) {
   const keys = Object.keys(value);

package/store/dist/dev.js

@@ -2,7 +2,8 @@ import { DEV as DEV$1, $PROXY, $TRACK, getListener, batch, createSignal } from "
 
 const $RAW = Symbol("store-raw"),
   $NODE = Symbol("store-node"),
-  $HAS = Symbol("store-has");
+  $HAS = Symbol("store-has"),
+  $SELF = Symbol("store-self");
 const DevHooks = {
   onStoreNodeUpdate: null
 };
@@ -91,7 +92,7 @@ function proxyDescriptor$1(target, property) {
   return desc;
 }
 function trackSelf(target) {
-  getListener() && getNode(getNodes(target, $NODE), "_")();
+  getListener() && getNode(getNodes(target, $NODE), $SELF)();
 }
 function ownKeys(target) {
   trackSelf(target);
@@ -163,7 +164,7 @@ function setProperty(state, property, value, deleting = false) {
     for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
     (node = getNode(nodes, "length", len)) && node.$(state.length);
   }
-  (node = nodes._) && node.$();
+  (node = nodes[$SELF]) && node.$();
 }
 function mergeStoreNode(state, value) {
   const keys = Object.keys(value);

package/store/dist/store.cjs

@@ -4,7 +4,8 @@ var solidJs = require('solid-js');
 
 const $RAW = Symbol("store-raw"),
   $NODE = Symbol("store-node"),
-  $HAS = Symbol("store-has");
+  $HAS = Symbol("store-has"),
+  $SELF = Symbol("store-self");
 function wrap$1(value) {
   let p = value[solidJs.$PROXY];
   if (!p) {
@@ -79,7 +80,7 @@ function proxyDescriptor$1(target, property) {
   return desc;
 }
 function trackSelf(target) {
-  solidJs.getListener() && getNode(getNodes(target, $NODE), "_")();
+  solidJs.getListener() && getNode(getNodes(target, $NODE), $SELF)();
 }
 function ownKeys(target) {
   trackSelf(target);
@@ -135,7 +136,7 @@ function setProperty(state, property, value, deleting = false) {
     for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
     (node = getNode(nodes, "length", len)) && node.$(state.length);
   }
-  (node = nodes._) && node.$();
+  (node = nodes[$SELF]) && node.$();
 }
 function mergeStoreNode(state, value) {
   const keys = Object.keys(value);

package/store/dist/store.js

@@ -2,7 +2,8 @@ import { $PROXY, $TRACK, getListener, batch, createSignal } from "solid-js";
 
 const $RAW = Symbol("store-raw"),
   $NODE = Symbol("store-node"),
-  $HAS = Symbol("store-has");
+  $HAS = Symbol("store-has"),
+  $SELF = Symbol("store-self");
 function wrap$1(value) {
   let p = value[$PROXY];
   if (!p) {
@@ -88,7 +89,7 @@ function proxyDescriptor$1(target, property) {
   return desc;
 }
 function trackSelf(target) {
-  getListener() && getNode(getNodes(target, $NODE), "_")();
+  getListener() && getNode(getNodes(target, $NODE), $SELF)();
 }
 function ownKeys(target) {
   trackSelf(target);
@@ -157,7 +158,7 @@ function setProperty(state, property, value, deleting = false) {
     for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
     (node = getNode(nodes, "length", len)) && node.$(state.length);
   }
-  (node = nodes._) && node.$();
+  (node = nodes[$SELF]) && node.$();
 }
 function mergeStoreNode(state, value) {
   const keys = Object.keys(value);

package/store/types/store.d.ts

@@ -1,4 +1,7 @@
-export declare const $RAW: unique symbol, $NODE: unique symbol, $HAS: unique symbol;
+export declare const $RAW: unique symbol,
+  $NODE: unique symbol,
+  $HAS: unique symbol,
+  $SELF: unique symbol;
 export declare const DevHooks: {
   onStoreNodeUpdate: OnStoreNodeUpdate | null;
 };

package/types/index.d.ts

@@ -3,6 +3,7 @@ export {
   $PROXY,
   $TRACK,
   batch,
+  catchError,
   children,
   createComputed,
   createContext,
@@ -23,7 +24,6 @@ export {
   on,
   onCleanup,
   onError,
-  catchError,
   onMount,
   runWithOwner,
   startTransition,
@@ -36,6 +36,7 @@ export type {
   AccessorArray,
   ChildrenReturn,
   Context,
+  ContextProviderComponent,
   EffectFunction,
   EffectOptions,
   InitializedResource,
@@ -46,6 +47,8 @@ export type {
   OnEffectFunction,
   OnOptions,
   Owner,
+  ResolvedChildren,
+  ResolvedJSXElement,
   Resource,
   ResourceActions,
   ResourceFetcher,

package/types/reactive/signal.d.ts

@@ -536,16 +536,6 @@ export declare function onCleanup<T extends () => any>(fn: T): T;
  * @description https://www.solidjs.com/docs/latest/api#catcherror
  */
 export declare function catchError<T>(fn: () => T, handler: (err: Error) => void): T | undefined;
-/**
- * @deprecated since version 1.7.0 and will be removed in next major - use catchError instead
- * onError - run an effect whenever an error is thrown within the context of the child scopes
- * @param fn an error handler that receives the error
- *
- * * If the error is thrown again inside the error handler, it will trigger the next available parent handler
- *
- * @description https://www.solidjs.com/docs/latest/api#onerror
- */
-export declare function onError(fn: (err: Error) => void): void;
 export declare function getListener(): Computation<any, any> | null;
 export declare function getOwner(): Owner | null;
 export declare function runWithOwner<T>(o: typeof Owner, fn: () => T): T | undefined;
@@ -653,4 +643,14 @@ export declare function writeSignal(
   value: any,
   isComp?: boolean
 ): any;
+/**
+ * @deprecated since version 1.7.0 and will be removed in next major - use catchError instead
+ * onError - run an effect whenever an error is thrown within the context of the child scopes
+ * @param fn an error handler that receives the error
+ *
+ * * If the error is thrown again inside the error handler, it will trigger the next available parent handler
+ *
+ * @description https://www.solidjs.com/docs/latest/api#onerror
+ */
+export declare function onError(fn: (err: Error) => void): void;
 export {};

package/types/server/index.d.ts

@@ -1,4 +1,5 @@
 export {
+  catchError,
   createRoot,
   createSignal,
   createComputed,

package/types/server/reactive.d.ts

@@ -51,10 +51,6 @@ export declare function onMount(fn: () => void): void;
 export declare function onCleanup(fn: () => void): () => void;
 export declare function cleanNode(node: Owner): void;
 export declare function catchError<T>(fn: () => T, handler: (err: Error) => void): T | undefined;
-/**
- * @deprecated since version 1.7.0 and will be removed in next major - use catchError instead
- */
-export declare function onError(fn: (err: Error) => void): void;
 export declare function getListener(): null;
 export interface Context<T> {
   id: symbol;
@@ -69,7 +65,6 @@ type ChildrenReturn = Accessor<any> & {
 };
 export declare function children(fn: () => any): ChildrenReturn;
 export declare function runWithOwner<T>(o: typeof Owner, fn: () => T): T | undefined;
-export declare function lookup(owner: Owner | null, key: symbol | string): any;
 export interface Task {
   id: number;
   fn: ((didTimeout: boolean) => void) | null;
@@ -115,4 +110,8 @@ export declare function from<T>(
       }
 ): Accessor<T>;
 export declare function enableExternalSource(factory: any): void;
+/**
+ * @deprecated since version 1.7.0 and will be removed in next major - use catchError instead
+ */
+export declare function onError(fn: (err: Error) => void): void;
 export {};

package/web/dist/server.cjs

@@ -215,14 +215,17 @@ function renderToStream(code, options = {}) {
       });
     },
     pipeTo(w) {
-      Promise.allSettled(blockingResources).then(() => {
+      return Promise.allSettled(blockingResources).then(() => {
         doShell();
         const encoder = new TextEncoder();
         const writer = w.getWriter();
+        let resolve;
+        const p = new Promise(r => resolve = r);
         writable = {
           end() {
             writer.releaseLock();
             w.close();
+            resolve();
           }
         };
         buffer = {
@@ -233,6 +236,7 @@ function renderToStream(code, options = {}) {
         buffer.write(tmp);
         firstFlushed = true;
         if (completed) writable.end();else setTimeout(checkEnd);
+        return p;
       });
     }
   };

package/web/dist/server.js

@@ -264,14 +264,17 @@ function renderToStream(code, options = {}) {
       });
     },
     pipeTo(w) {
-      Promise.allSettled(blockingResources).then(() => {
+      return Promise.allSettled(blockingResources).then(() => {
         doShell();
         const encoder = new TextEncoder();
         const writer = w.getWriter();
+        let resolve;
+        const p = new Promise(r => (resolve = r));
         writable = {
           end() {
             writer.releaseLock();
             w.close();
+            resolve();
           }
         };
         buffer = {
@@ -283,6 +286,7 @@ function renderToStream(code, options = {}) {
         firstFlushed = true;
         if (completed) writable.end();
         else setTimeout(checkEnd);
+        return p;
       });
     }
   };

package/web/types/server.d.ts

@@ -23,7 +23,7 @@ export function renderToStream<T>(
   }
 ): {
   pipe: (writable: { write: (v: string) => void }) => void;
-  pipeTo: (writable: WritableStream) => void;
+  pipeTo: (writable: WritableStream) => Promise<void>;
 };
 
 export function HydrationScript(props: { nonce?: string; eventNames?: string[] }): JSX.Element;