solid-js 1.8.18 → 1.8.20

package/dist/dev.cjs

@@ -118,15 +118,27 @@ function workLoop(hasTimeRemaining, initialTime) {
 
 const sharedConfig = {
   context: undefined,
-  registry: undefined
+  registry: undefined,
+  done: false,
+  getContextId() {
+    return getContextId(this.context.count);
+  },
+  getNextContextId() {
+    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,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
+    id: sharedConfig.getNextContextId(),
     count: 0
   };
 }
@@ -285,9 +297,8 @@ function createResource(pSource, pFetcher, pOptions) {
     }),
     [state, setState] = createSignal(resolved ? "ready" : "unresolved");
   if (sharedConfig.context) {
-    id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    let v;
-    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
+    id = sharedConfig.getNextContextId();
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && sharedConfig.has(id)) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, error, key) {
     if (pr === p) {
@@ -578,7 +589,8 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  return Owner && Owner.context && Owner.context[context.id] !== undefined ? Owner.context[context.id] : context.defaultValue;
+  let value;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined ? value : context.defaultValue;
 }
 function children(fn) {
   const children = createMemo(fn);
@@ -1109,20 +1121,12 @@ function mapArray(list, mapFn, options = {}) {
   onCleanup(() => dispose(disposers));
   return () => {
     let newItems = list() || [],
+      newLen = newItems.length,
       i,
       j;
     newItems[$TRACK];
     return untrack(() => {
-      let newLen = newItems.length,
-        newIndices,
-        newIndicesNext,
-        temp,
-        tempdisposers,
-        tempIndexes,
-        start,
-        end,
-        newEnd,
-        item;
+      let newIndices, newIndicesNext, temp, tempdisposers, tempIndexes, start, end, newEnd, item;
       if (newLen === 0) {
         if (len !== 0) {
           dispose(disposers);
@@ -1214,10 +1218,11 @@ function indexArray(list, mapFn, options = {}) {
     i;
   onCleanup(() => dispose(disposers));
   return () => {
-    const newItems = list() || [];
+    const newItems = list() || [],
+      newLen = newItems.length;
     newItems[$TRACK];
     return untrack(() => {
-      if (newItems.length === 0) {
+      if (newLen === 0) {
         if (len !== 0) {
           dispose(disposers);
           disposers = [];
@@ -1243,7 +1248,7 @@ function indexArray(list, mapFn, options = {}) {
         mapped = [];
         len = 0;
       }
-      for (i = 0; i < newItems.length; i++) {
+      for (i = 0; i < newLen; i++) {
         if (i < items.length && items[i] !== newItems[i]) {
           signals[i](() => newItems[i]);
         } else if (i >= items.length) {
@@ -1253,7 +1258,7 @@ function indexArray(list, mapFn, options = {}) {
       for (; i < items.length; i++) {
         disposers[i]();
       }
-      len = signals.length = disposers.length = newItems.length;
+      len = signals.length = disposers.length = newLen;
       items = newItems.slice(0);
       return mapped = mapped.slice(0, len);
     });
@@ -1442,7 +1447,7 @@ function lazy(fn) {
       sharedConfig.count || (sharedConfig.count = 0);
       sharedConfig.count++;
       (p || (p = fn())).then(mod => {
-        setHydrateContext(ctx);
+        !sharedConfig.done && setHydrateContext(ctx);
         sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
@@ -1453,17 +1458,17 @@ function lazy(fn) {
       comp = s;
     }
     let Comp;
-    return createMemo(() => (Comp = comp()) && untrack(() => {
+    return createMemo(() => (Comp = comp()) ? untrack(() => {
       if (true) Object.assign(Comp, {
         [$DEVCOMP]: true
       });
-      if (!ctx) return Comp(props);
+      if (!ctx || sharedConfig.done) return Comp(props);
       const c = sharedConfig.context;
       setHydrateContext(ctx);
       const r = Comp(props);
       setHydrateContext(c);
       return r;
-    }));
+    }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   return wrap;
@@ -1471,7 +1476,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
+  return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
 const narrowedError = name => `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.` ;
@@ -1553,7 +1558,7 @@ function resetErrorBoundaries() {
 }
 function ErrorBoundary(props) {
   let err;
-  if (sharedConfig.context && sharedConfig.load) err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+  if (sharedConfig.context && sharedConfig.load) err = sharedConfig.load(sharedConfig.getContextId());
   const [errored, setErrored] = createSignal(err, {
     name: "errored"
   } );
@@ -1574,7 +1579,7 @@ function ErrorBoundary(props) {
 }
 
 const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;
-const SuspenseListContext = createContext();
+const SuspenseListContext = /* #__PURE__ */createContext();
 function SuspenseList(props) {
   let [wrapper, setWrapper] = createSignal(() => ({
       inFallback: false
@@ -1671,7 +1676,7 @@ function Suspense(props) {
     },
     owner = getOwner();
   if (sharedConfig.context && sharedConfig.load) {
-    const key = sharedConfig.context.id + sharedConfig.context.count;
+    const key = sharedConfig.getContextId();
     let ref = sharedConfig.load(key);
     if (ref) {
       if (typeof ref !== "object" || ref.status !== "success") p = ref;else sharedConfig.gather(key);
@@ -1728,7 +1733,7 @@ function Suspense(props) {
             dispose = disposer;
             if (ctx) {
               setHydrateContext({
-                id: ctx.id + "f",
+                id: ctx.id + "F",
                 count: 0
               });
               ctx = undefined;

package/dist/dev.js

@@ -118,15 +118,27 @@ function workLoop(hasTimeRemaining, initialTime) {
 
 const sharedConfig = {
   context: undefined,
-  registry: undefined
+  registry: undefined,
+  done: false,
+  getContextId() {
+    return getContextId(this.context.count);
+  },
+  getNextContextId() {
+    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,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
+    id: sharedConfig.getNextContextId(),
     count: 0
   };
 }
@@ -299,10 +311,9 @@ function createResource(pSource, pFetcher, pOptions) {
     }),
     [state, setState] = createSignal(resolved ? "ready" : "unresolved");
   if (sharedConfig.context) {
-    id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    let v;
+    id = sharedConfig.getNextContextId();
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;
-    else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
+    else if (sharedConfig.load && sharedConfig.has(id)) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, error, key) {
     if (pr === p) {
@@ -649,8 +660,9 @@ function createContext(defaultValue, options) {
   };
 }
 function useContext(context) {
-  return Owner && Owner.context && Owner.context[context.id] !== undefined
-    ? Owner.context[context.id]
+  let value;
+  return Owner && Owner.context && (value = Owner.context[context.id]) !== undefined
+    ? value
     : context.defaultValue;
 }
 function children(fn) {
@@ -1210,20 +1222,12 @@ function mapArray(list, mapFn, options = {}) {
   onCleanup(() => dispose(disposers));
   return () => {
     let newItems = list() || [],
+      newLen = newItems.length,
       i,
       j;
     newItems[$TRACK];
     return untrack(() => {
-      let newLen = newItems.length,
-        newIndices,
-        newIndicesNext,
-        temp,
-        tempdisposers,
-        tempIndexes,
-        start,
-        end,
-        newEnd,
-        item;
+      let newIndices, newIndicesNext, temp, tempdisposers, tempIndexes, start, end, newEnd, item;
       if (newLen === 0) {
         if (len !== 0) {
           dispose(disposers);
@@ -1322,10 +1326,11 @@ function indexArray(list, mapFn, options = {}) {
     i;
   onCleanup(() => dispose(disposers));
   return () => {
-    const newItems = list() || [];
+    const newItems = list() || [],
+      newLen = newItems.length;
     newItems[$TRACK];
     return untrack(() => {
-      if (newItems.length === 0) {
+      if (newLen === 0) {
         if (len !== 0) {
           dispose(disposers);
           disposers = [];
@@ -1351,7 +1356,7 @@ function indexArray(list, mapFn, options = {}) {
         mapped = [];
         len = 0;
       }
-      for (i = 0; i < newItems.length; i++) {
+      for (i = 0; i < newLen; i++) {
         if (i < items.length && items[i] !== newItems[i]) {
           signals[i](() => newItems[i]);
         } else if (i >= items.length) {
@@ -1361,7 +1366,7 @@ function indexArray(list, mapFn, options = {}) {
       for (; i < items.length; i++) {
         disposers[i]();
       }
-      len = signals.length = disposers.length = newItems.length;
+      len = signals.length = disposers.length = newLen;
       items = newItems.slice(0);
       return (mapped = mapped.slice(0, len));
     });
@@ -1573,7 +1578,7 @@ function lazy(fn) {
       sharedConfig.count || (sharedConfig.count = 0);
       sharedConfig.count++;
       (p || (p = fn())).then(mod => {
-        setHydrateContext(ctx);
+        !sharedConfig.done && setHydrateContext(ctx);
         sharedConfig.count--;
         set(() => mod.default);
         setHydrateContext();
@@ -1584,21 +1589,21 @@ function lazy(fn) {
       comp = s;
     }
     let Comp;
-    return createMemo(
-      () =>
-        (Comp = comp()) &&
-        untrack(() => {
-          if (true)
-            Object.assign(Comp, {
-              [$DEVCOMP]: true
-            });
-          if (!ctx) return Comp(props);
-          const c = sharedConfig.context;
-          setHydrateContext(ctx);
-          const r = Comp(props);
-          setHydrateContext(c);
-          return r;
-        })
+    return createMemo(() =>
+      (Comp = comp())
+        ? untrack(() => {
+            if (true)
+              Object.assign(Comp, {
+                [$DEVCOMP]: true
+              });
+            if (!ctx || sharedConfig.done) return Comp(props);
+            const c = sharedConfig.context;
+            setHydrateContext(ctx);
+            const r = Comp(props);
+            setHydrateContext(c);
+            return r;
+          })
+        : ""
     );
   };
   wrap.preload = () => p || ((p = fn()).then(mod => (comp = () => mod.default)), p);
@@ -1607,7 +1612,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
+  return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
 const narrowedError = name =>
@@ -1727,7 +1732,7 @@ function resetErrorBoundaries() {
 function ErrorBoundary(props) {
   let err;
   if (sharedConfig.context && sharedConfig.load)
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.getContextId());
   const [errored, setErrored] = createSignal(err, {
     name: "errored"
   });
@@ -1753,7 +1758,7 @@ function ErrorBoundary(props) {
 
 const suspenseListEquals = (a, b) =>
   a.showContent === b.showContent && a.showFallback === b.showFallback;
-const SuspenseListContext = createContext();
+const SuspenseListContext = /* #__PURE__ */ createContext();
 function SuspenseList(props) {
   let [wrapper, setWrapper] = createSignal(() => ({
       inFallback: false
@@ -1850,7 +1855,7 @@ function Suspense(props) {
     },
     owner = getOwner();
   if (sharedConfig.context && sharedConfig.load) {
-    const key = sharedConfig.context.id + sharedConfig.context.count;
+    const key = sharedConfig.getContextId();
     let ref = sharedConfig.load(key);
     if (ref) {
       if (typeof ref !== "object" || ref.status !== "success") p = ref;
@@ -1908,7 +1913,7 @@ function Suspense(props) {
             dispose = disposer;
             if (ctx) {
               setHydrateContext({
-                id: ctx.id + "f",
+                id: ctx.id + "F",
                 count: 0
               });
               ctx = undefined;

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

@@ -328,7 +328,23 @@ 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;
 }
@@ -336,15 +352,13 @@ 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) {
@@ -444,7 +458,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);
@@ -473,6 +487,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 +500,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;
@@ -504,6 +519,7 @@ function createResource(source, fetcher, options = {}) {
       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) {
@@ -528,7 +544,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, {
@@ -645,7 +668,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] ||
@@ -691,7 +714,7 @@ function Suspense(props) {
       setHydrateContext({
         ...ctx,
         count: 0,
-        id: ctx.id + "0-f",
+        id: ctx.id + "0F",
         noHydrate: true
       });
       const res = {
@@ -703,7 +726,7 @@ function Suspense(props) {
     setHydrateContext({
       ...ctx,
       count: 0,
-      id: ctx.id + "0-f"
+      id: ctx.id + "0F"
     });
     ctx.serialize(id, "$$f");
     return props.fallback;