solid-js 1.7.9 → 1.7.11

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);
@@ -550,7 +545,7 @@ function children(fn) {
 }
 let SuspenseContext;
 function getSuspenseContext() {
-  return SuspenseContext || (SuspenseContext = createContext({}));
+  return SuspenseContext || (SuspenseContext = createContext());
 }
 function enableExternalSource(factory) {
   if (ExternalSourceFactory) {
@@ -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 {