solid-js 1.8.18 → 1.8.20

package/dist/solid.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
   };
 }
@@ -267,9 +279,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) {
@@ -540,7 +551,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);
@@ -1066,20 +1078,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);
@@ -1169,10 +1173,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 = [];
@@ -1198,7 +1203,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) {
@@ -1208,7 +1213,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);
     });
@@ -1395,7 +1400,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();
@@ -1406,15 +1411,15 @@ function lazy(fn) {
       comp = s;
     }
     let Comp;
-    return createMemo(() => (Comp = comp()) && untrack(() => {
+    return createMemo(() => (Comp = comp()) ? untrack(() => {
       if (false) ;
-      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;
@@ -1422,7 +1427,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 => `Stale read from <${name}>.`;
@@ -1494,7 +1499,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, undefined);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
@@ -1510,7 +1515,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
@@ -1607,7 +1612,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);
@@ -1664,7 +1669,7 @@ function Suspense(props) {
             dispose = disposer;
             if (ctx) {
               setHydrateContext({
-                id: ctx.id + "f",
+                id: ctx.id + "F",
                 count: 0
               });
               ctx = undefined;

package/dist/solid.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
   };
 }
@@ -277,10 +289,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) {
@@ -598,8 +609,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) {
@@ -1150,20 +1162,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);
@@ -1260,10 +1264,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 = [];
@@ -1289,7 +1294,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) {
@@ -1299,7 +1304,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));
     });
@@ -1509,7 +1514,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();
@@ -1520,18 +1525,18 @@ function lazy(fn) {
       comp = s;
     }
     let Comp;
-    return createMemo(
-      () =>
-        (Comp = comp()) &&
-        untrack(() => {
-          if (false);
-          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 (false);
+            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);
@@ -1540,7 +1545,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 => `Stale read from <${name}>.`;
@@ -1641,7 +1646,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, undefined);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
@@ -1662,7 +1667,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
@@ -1759,7 +1764,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;
@@ -1817,7 +1822,7 @@ function Suspense(props) {
             dispose = disposer;
             if (ctx) {
               setHydrateContext({
-                id: ctx.id + "f",
+                id: ctx.id + "F",
                 count: 0
               });
               ctx = undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.8.18",
+  "version": "1.8.20",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -219,8 +219,8 @@
   ],
   "dependencies": {
     "csstype": "^3.1.0",
-    "seroval": "^1.0.4",
-    "seroval-plugins": "^1.0.3"
+    "seroval": "^1.1.0",
+    "seroval-plugins": "^1.1.0"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",