solid-js 1.7.9 → 1.7.11

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,13 +11,13 @@ 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 {
     for (const f of fns) f(error);
   } catch (e) {
-    handleError(e, (owner && owner.owner) || null);
+    handleError(e, owner && owner.owner || null);
   }
 }
 const UNOWNED = {
@@ -30,27 +30,24 @@ let Owner = null;
 function createOwner() {
   const o = {
     owner: Owner,
-    context: null,
+    context: Owner ? Owner.context : null,
     owned: null,
     cleanups: null
   };
   if (Owner) {
-    if (!Owner.owned) Owner.owned = [o];
-    else Owner.owned.push(o);
+    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,
-            owned: null,
-            cleanups: null
-          };
+    current = detachedOwner === undefined ? owner : detachedOwner,
+    root = fn.length === 0 ? UNOWNED : {
+      context: current ? current.context : null,
+      owner: current,
+      owned: null,
+      cleanups: null
+    };
   Owner = root;
   let result;
   try {
@@ -63,12 +60,9 @@ function createRoot(fn, detachedOwner) {
   return result;
 }
 function createSignal(value, options) {
-  return [
-    () => value,
-    v => {
-      return (value = typeof v === "function" ? v(value) : v);
-    }
-  ];
+  return [() => value, v => {
+    return value = typeof v === "function" ? v(value) : v;
+  }];
 }
 function createComputed(fn, value) {
   Owner = createOwner();
@@ -125,8 +119,7 @@ function on(deps, fn, options = {}) {
 function onMount(fn) {}
 function onCleanup(fn) {
   if (Owner) {
-    if (!Owner.cleanups) Owner.cleanups = [fn];
-    else Owner.cleanups.push(fn);
+    if (!Owner.cleanups) Owner.cleanups = [fn];else Owner.cleanups.push(fn);
   }
   return fn;
 }
@@ -141,14 +134,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 +148,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 +160,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;
@@ -204,13 +184,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 +200,7 @@ function createProvider(id) {
   return function provider(props) {
     return createMemo(() => {
       Owner.context = {
+        ...Owner.context,
         [id]: props.value
       };
       return children(() => props.children);
@@ -255,8 +229,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler =
-        typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
+      const handler = typeof observer === "function" ? observer : observer.next && observer.next.bind(observer);
       if (!handler) {
         return {
           unsubscribe() {}
@@ -285,7 +258,7 @@ function from(producer) {
   const [s, set] = createSignal(undefined);
   if ("subscribe" in producer) {
     const unsub = producer.subscribe(v => set(() => v));
-    onCleanup(() => ("unsubscribe" in unsub ? unsub.unsubscribe() : unsub()));
+    onCleanup(() => "unsubscribe" in unsub ? unsub.unsubscribe() : unsub());
   } else {
     const clean = producer(set);
     onCleanup(clean);
@@ -293,6 +266,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;
@@ -312,13 +310,11 @@ function setHydrateContext(context) {
   sharedConfig.context = context;
 }
 function nextHydrateContext() {
-  return sharedConfig.context
-    ? {
-        ...sharedConfig.context,
-        id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
-        count: 0
-      }
-    : undefined;
+  return sharedConfig.context ? {
+    ...sharedConfig.context,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
+    count: 0
+  } : undefined;
 }
 function createUniqueId() {
   const ctx = sharedConfig.context;
@@ -394,11 +390,7 @@ function Index(props) {
 }
 function Show(props) {
   let c;
-  return props.when
-    ? typeof (c = props.children) === "function"
-      ? c(props.keyed ? props.when : () => 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;
@@ -435,14 +427,11 @@ function ErrorBoundary(props) {
   }
   createMemo(() => {
     clean = Owner;
-    return catchError(
-      () => (res = props.children),
-      err => {
-        error = err;
-        !sync && ctx.replace("e" + id, displayFallback);
-        sync = true;
-      }
-    );
+    return catchError(() => res = props.children, err => {
+      error = err;
+      !sync && ctx.replace("e" + id, displayFallback);
+      sync = true;
+    });
   });
   if (error) return displayFallback();
   sync = false;
@@ -472,18 +461,14 @@ function createResource(source, fetcher, options = {}) {
   if (sharedConfig.context.async && options.ssrLoadFrom !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error)
-        resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
       return resource.ref;
     }
   }
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved =
-      options.ssrLoadFrom !== "initial" &&
-      sharedConfig.context.async &&
-      "data" in sharedConfig.context.resources[id];
+    const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -503,7 +488,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.async) return read.loading = !!(typeof source === "function" ? source() : source);
     if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
@@ -511,11 +496,9 @@ function createResource(source, fetcher, options = {}) {
     resourceContext = [];
     const lookup = typeof source === "function" ? source() : source;
     if (resourceContext.length) {
-      p = Promise.all(resourceContext).then(() =>
-        fetcher(source(), {
-          value
-        })
-      );
+      p = Promise.all(resourceContext).then(() => fetcher(source(), {
+        value
+      }));
     }
     resourceContext = null;
     if (!p) {
@@ -528,22 +511,20 @@ function createResource(source, fetcher, options = {}) {
       read.loading = true;
       read.state = "pending";
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
-      return p
-        .then(res => {
-          read.loading = false;
-          read.state = "ready";
-          ctx.resources[id].data = res;
-          p = null;
-          notifySuspense(contexts);
-          return res;
-        })
-        .catch(err => {
-          read.loading = false;
-          read.state = "errored";
-          read.error = error = castError(err);
-          p = null;
-          notifySuspense(contexts);
-        });
+      return p.then(res => {
+        read.loading = false;
+        read.state = "ready";
+        ctx.resources[id].data = res;
+        p = null;
+        notifySuspense(contexts);
+        return res;
+      }).catch(err => {
+        read.loading = false;
+        read.state = "errored";
+        read.error = error = castError(err);
+        p = null;
+        notifySuspense(contexts);
+      });
     }
     ctx.resources[id].data = p;
     if (ctx.writeResource) ctx.writeResource(id, p);
@@ -551,20 +532,17 @@ function createResource(source, fetcher, options = {}) {
     return ctx.resources[id].data;
   }
   if (options.ssrLoadFrom !== "initial") load();
-  return (resource.ref = [
-    read,
-    {
-      refetch: load,
-      mutate: v => (value = v)
-    }
-  ]);
+  return resource.ref = [read, {
+    refetch: load,
+    mutate: v => value = v
+  }];
 }
 function lazy(fn) {
   let p;
   let load = id => {
     if (!p) {
       p = fn();
-      p.then(mod => (p.resolved = mod.default));
+      p.then(mod => p.resolved = mod.default);
       if (id) sharedConfig.context.lazy[id] = p;
     }
     return p;
@@ -573,8 +551,7 @@ function lazy(fn) {
   const wrap = props => {
     const id = sharedConfig.context.id.slice(0, -1);
     let ref = sharedConfig.context.lazy[id];
-    if (ref) p = ref;
-    else load(id);
+    if (ref) p = ref;else load(id);
     if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
@@ -586,12 +563,10 @@ function lazy(fn) {
       contexts.add(ctx);
     }
     if (sharedConfig.context.async) {
-      sharedConfig.context.block(
-        p.then(() => {
-          track.loading = false;
-          notifySuspense(contexts);
-        })
-      );
+      sharedConfig.context.block(p.then(() => {
+        track.loading = false;
+        notifySuspense(contexts);
+      }));
     }
     return "";
   };
@@ -619,12 +594,9 @@ function startTransition(fn) {
   fn();
 }
 function useTransition() {
-  return [
-    () => false,
-    fn => {
-      fn();
-    }
-  ];
+  return [() => false, fn => {
+    fn();
+  }];
 }
 function SuspenseList(props) {
   return props.children;
@@ -634,17 +606,15 @@ function Suspense(props) {
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
   const o = createOwner();
-  const value =
-    ctx.suspense[id] ||
-    (ctx.suspense[id] = {
-      resources: new Map(),
-      completed: () => {
-        const res = runSuspense();
-        if (suspenseComplete(value)) {
-          done(resolveSSRNode(res));
-        }
+  const value = ctx.suspense[id] || (ctx.suspense[id] = {
+    resources: new Map(),
+    completed: () => {
+      const res = runSuspense();
+      if (suspenseComplete(value)) {
+        done(resolveSSRNode(res));
       }
-    });
+    }
+  });
   function suspenseError(err) {
     if (!done || !done(undefined, err)) {
       runWithOwner(o.owner, () => {
@@ -658,14 +628,12 @@ function Suspense(props) {
       count: 0
     });
     cleanNode(o);
-    return runWithOwner(o, () =>
-      createComponent(SuspenseContext.Provider, {
-        value,
-        get children() {
-          return catchError(() => props.children, suspenseError);
-        }
-      })
-    );
+    return runWithOwner(o, () => createComponent(SuspenseContext.Provider, {
+      value,
+      get children() {
+        return catchError(() => props.children, suspenseError);
+      }
+    }));
   }
   const res = runSuspense();
   if (suspenseComplete(value)) return res;
@@ -694,56 +662,4 @@ function Suspense(props) {
   }, suspenseError);
 }
 
-export {
-  $DEVCOMP,
-  $PROXY,
-  $TRACK,
-  DEV,
-  ErrorBoundary,
-  For,
-  Index,
-  Match,
-  Show,
-  Suspense,
-  SuspenseList,
-  Switch,
-  batch,
-  children,
-  createComponent,
-  createComputed,
-  createContext,
-  createDeferred,
-  createEffect,
-  createMemo,
-  createReaction,
-  createRenderEffect,
-  createResource,
-  createRoot,
-  createSelector,
-  createSignal,
-  createUniqueId,
-  enableExternalSource,
-  enableHydration,
-  enableScheduling,
-  equalFn,
-  from,
-  getListener,
-  getOwner,
-  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, catchError, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };