solid-js 1.8.18 → 1.8.19

package/dist/server.cjs

@@ -319,21 +319,34 @@ function resolveSSRNode(node) {
   if (t === "function") return resolveSSRNode(node());
   return String(node);
 }
-const sharedConfig = {};
+const sharedConfig = {
+  context: undefined,
+  getContextId() {
+    if (!this.context) throw new Error(`getContextId cannot be used under non-hydrating context`);
+    return getContextId(this.context.count);
+  },
+  getNextContextId() {
+    if (!this.context) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    return getContextId(this.context.count++);
+  }
+};
+function getContextId(count) {
+  const num = String(count),
+    len = num.length - 1;
+  return sharedConfig.context.id + (len ? String.fromCharCode(96 + len) : "") + num;
+}
 function setHydrateContext(context) {
   sharedConfig.context = context;
 }
 function nextHydrateContext() {
   return sharedConfig.context ? {
     ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
+    id: sharedConfig.getNextContextId(),
     count: 0
   } : undefined;
 }
 function createUniqueId() {
-  const ctx = sharedConfig.context;
-  if (!ctx) throw new Error(`createUniqueId cannot be used under non-hydrating context`);
-  return `${ctx.id}${ctx.count++}`;
+  return sharedConfig.getNextContextId();
 }
 function createComponent(Comp, props) {
   if (sharedConfig.context && !sharedConfig.context.noHydrate) {
@@ -429,7 +442,7 @@ function ErrorBoundary(props) {
     clean,
     sync = true;
   const ctx = sharedConfig.context;
-  const id = ctx.id + ctx.count;
+  const id = sharedConfig.getContextId();
   function displayFallback() {
     cleanNode(clean);
     ctx.serialize(id, error);
@@ -455,6 +468,7 @@ function ErrorBoundary(props) {
   };
 }
 const SuspenseContext = createContext();
+let resourceContext = null;
 function createResource(source, fetcher, options = {}) {
   if (arguments.length === 2) {
     if (typeof fetcher === "object") {
@@ -467,7 +481,7 @@ function createResource(source, fetcher, options = {}) {
     source = true;
   }
   const contexts = new Set();
-  const id = sharedConfig.context.id + sharedConfig.context.count++;
+  const id = sharedConfig.getNextContextId();
   let resource = {};
   let value = options.storage ? options.storage(options.initialValue)[0]() : options.initialValue;
   let p;
@@ -482,6 +496,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
+    if (!resolved && resourceContext) resourceContext.push(id);
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -506,7 +521,14 @@ function createResource(source, fetcher, options = {}) {
       value = ctx.resources[id].data;
       return;
     }
-    const lookup = typeof source === "function" ? source() : source;
+    let lookup;
+    try {
+      resourceContext = [];
+      lookup = typeof source === "function" ? source() : source;
+      if (resourceContext.length) return;
+    } finally {
+      resourceContext = null;
+    }
     if (!p) {
       if (lookup == null || lookup === false) return;
       p = fetcher(lookup, {
@@ -612,7 +634,7 @@ function SuspenseList(props) {
 function Suspense(props) {
   let done;
   const ctx = sharedConfig.context;
-  const id = ctx.id + ctx.count;
+  const id = sharedConfig.getContextId();
   const o = createOwner();
   const value = ctx.suspense[id] || (ctx.suspense[id] = {
     resources: new Map(),
@@ -654,7 +676,7 @@ function Suspense(props) {
       setHydrateContext({
         ...ctx,
         count: 0,
-        id: ctx.id + "0-f",
+        id: ctx.id + "0F",
         noHydrate: true
       });
       const res = {
@@ -666,7 +688,7 @@ function Suspense(props) {
     setHydrateContext({
       ...ctx,
       count: 0,
-      id: ctx.id + "0-f"
+      id: ctx.id + "0F"
     });
     ctx.serialize(id, "$$f");
     return props.fallback;

package/dist/server.js

@@ -17,7 +17,7 @@ function handleError(err, owner = Owner) {
   try {
     for (const f of fns) f(error);
   } catch (e) {
-    handleError(e, (owner && owner.owner) || null);
+    handleError(e, owner && owner.owner || null);
   }
 }
 const UNOWNED = {
@@ -35,23 +35,19 @@ function createOwner() {
     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,
     current = detachedOwner === undefined ? owner : detachedOwner,
-    root =
-      fn.length === 0
-        ? UNOWNED
-        : {
-            context: current ? current.context : null,
-            owner: current,
-            owned: null,
-            cleanups: null
-          };
+    root = fn.length === 0 ? UNOWNED : {
+      context: current ? current.context : null,
+      owner: current,
+      owned: null,
+      cleanups: null
+    };
   Owner = root;
   let result;
   try {
@@ -64,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();
@@ -126,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;
 }
@@ -168,9 +160,7 @@ function createContext(defaultValue) {
   };
 }
 function useContext(context) {
-  return Owner && Owner.context && Owner.context[context.id] !== undefined
-    ? Owner.context[context.id]
-    : context.defaultValue;
+  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
 }
 function getOwner() {
   return Owner;
@@ -247,8 +237,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() {}
@@ -277,7 +266,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);
@@ -320,7 +309,7 @@ function resolveSSRNode(node) {
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
       if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
-      mapped += resolveSSRNode((prev = node[i]));
+      mapped += resolveSSRNode(prev = node[i]);
     }
     return mapped;
   }
@@ -328,23 +317,34 @@ function resolveSSRNode(node) {
   if (t === "function") return resolveSSRNode(node());
   return String(node);
 }
-const sharedConfig = {};
+const sharedConfig = {
+  context: undefined,
+  getContextId() {
+    if (!this.context) throw new Error(`getContextId cannot be used under non-hydrating context`);
+    return getContextId(this.context.count);
+  },
+  getNextContextId() {
+    if (!this.context) throw new Error(`getNextContextId cannot be used under non-hydrating context`);
+    return getContextId(this.context.count++);
+  }
+};
+function getContextId(count) {
+  const num = String(count),
+    len = num.length - 1;
+  return sharedConfig.context.id + (len ? String.fromCharCode(96 + len) : "") + num;
+}
 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.getNextContextId(),
+    count: 0
+  } : undefined;
 }
 function createUniqueId() {
-  const ctx = sharedConfig.context;
-  if (!ctx) throw new Error(`createUniqueId cannot be used under non-hydrating context`);
-  return `${ctx.id}${ctx.count++}`;
+  return sharedConfig.getNextContextId();
 }
 function createComponent(Comp, props) {
   if (sharedConfig.context && !sharedConfig.context.noHydrate) {
@@ -416,11 +416,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;
@@ -444,7 +440,7 @@ function ErrorBoundary(props) {
     clean,
     sync = true;
   const ctx = sharedConfig.context;
-  const id = ctx.id + ctx.count;
+  const id = sharedConfig.getContextId();
   function displayFallback() {
     cleanNode(clean);
     ctx.serialize(id, error);
@@ -457,14 +453,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;
@@ -473,6 +466,7 @@ function ErrorBoundary(props) {
   };
 }
 const SuspenseContext = createContext();
+let resourceContext = null;
 function createResource(source, fetcher, options = {}) {
   if (arguments.length === 2) {
     if (typeof fetcher === "object") {
@@ -485,7 +479,7 @@ function createResource(source, fetcher, options = {}) {
     source = true;
   }
   const contexts = new Set();
-  const id = sharedConfig.context.id + sharedConfig.context.count++;
+  const id = sharedConfig.getNextContextId();
   let resource = {};
   let value = options.storage ? options.storage(options.initialValue)[0]() : options.initialValue;
   let p;
@@ -493,17 +487,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;
-    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 && resourceContext) resourceContext.push(id);
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -523,12 +514,19 @@ 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;
     }
-    const lookup = typeof source === "function" ? source() : source;
+    let lookup;
+    try {
+      resourceContext = [];
+      lookup = typeof source === "function" ? source() : source;
+      if (resourceContext.length) return;
+    } finally {
+      resourceContext = null;
+    }
     if (!p) {
       if (lookup == null || lookup === false) return;
       p = fetcher(lookup, {
@@ -538,23 +536,21 @@ function createResource(source, fetcher, options = {}) {
     if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       read.state = "pending";
-      p = 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);
-          throw error;
-        });
+      p = 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);
+        throw error;
+      });
       if (ctx.serialize) ctx.serialize(id, p, options.deferStream);
       return p;
     }
@@ -564,20 +560,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;
@@ -586,8 +579,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 = {
@@ -599,12 +591,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 "";
   };
@@ -632,12 +622,9 @@ function startTransition(fn) {
   fn();
 }
 function useTransition() {
-  return [
-    () => false,
-    fn => {
-      fn();
-    }
-  ];
+  return [() => false, fn => {
+    fn();
+  }];
 }
 function SuspenseList(props) {
   return props.children;
@@ -645,19 +632,17 @@ function SuspenseList(props) {
 function Suspense(props) {
   let done;
   const ctx = sharedConfig.context;
-  const id = ctx.id + ctx.count;
+  const id = sharedConfig.getContextId();
   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, () => {
@@ -671,14 +656,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)) {
@@ -691,7 +674,7 @@ function Suspense(props) {
       setHydrateContext({
         ...ctx,
         count: 0,
-        id: ctx.id + "0-f",
+        id: ctx.id + "0F",
         noHydrate: true
       });
       const res = {
@@ -703,65 +686,11 @@ function Suspense(props) {
     setHydrateContext({
       ...ctx,
       count: 0,
-      id: ctx.id + "0-f"
+      id: ctx.id + "0F"
     });
     ctx.serialize(id, "$$f");
     return props.fallback;
   }, suspenseError);
 }
 
-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,
-  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, 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 };