solid-js 1.8.1 → 1.8.3

package/dist/dev.cjs

@@ -286,7 +286,7 @@ function createResource(pSource, pFetcher, pOptions) {
   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 = isPromise(v) && "value" in v ? v.value : v;
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
   }
   function loadEnd(p, v, error, key) {
     if (pr === p) {
@@ -352,6 +352,10 @@ function createResource(pSource, pFetcher, pOptions) {
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
+    if ("value" in p) {
+      if (p.status === "success") loadEnd(pr, p.value, undefined, lookup);else loadEnd(pr, undefined, undefined, lookup);
+      return p;
+    }
     pr = p;
     scheduled = true;
     queueMicrotask(() => scheduled = false);
@@ -1660,7 +1664,7 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref && (typeof ref !== "object" || !("value" in ref))) p = ref;
+    if (ref && (typeof ref !== "object" || ref.status !== 'success')) p = ref;
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false

package/dist/dev.js

@@ -301,8 +301,7 @@ function createResource(pSource, pFetcher, pOptions) {
     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 = isPromise(v) && "value" in v ? v.value : v;
+    else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
   }
   function loadEnd(p, v, error, key) {
     if (pr === p) {
@@ -377,6 +376,11 @@ function createResource(pSource, pFetcher, pOptions) {
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
+    if ("value" in p) {
+      if (p.status === "success") loadEnd(pr, p.value, undefined, lookup);
+      else loadEnd(pr, undefined, undefined, lookup);
+      return p;
+    }
     pr = p;
     scheduled = true;
     queueMicrotask(() => (scheduled = false));
@@ -1837,7 +1841,7 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref && (typeof ref !== "object" || !("value" in ref))) p = ref;
+    if (ref && (typeof ref !== "object" || ref.status !== "success")) p = ref;
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false

package/dist/server.cjs

@@ -220,11 +220,19 @@ function requestCallback(fn, options) {
 function mapArray(list, mapFn, options = {}) {
   const items = list();
   let s = [];
-  if (items.length) {
+  if (items && items.length) {
     for (let i = 0, len = items.length; i < len; i++) s.push(mapFn(items[i], () => i));
   } else if (options.fallback) s = [options.fallback()];
   return () => s;
 }
+function indexArray(list, mapFn, options = {}) {
+  const items = list();
+  let s = [];
+  if (items && items.length) {
+    for (let i = 0, len = items.length; i < len; i++) s.push(mapFn(() => items[i], i));
+  } else if (options.fallback) s = [options.fallback()];
+  return () => s;
+}
 function observable(input) {
   return {
     subscribe(observer) {
@@ -513,8 +521,7 @@ function createResource(source, fetcher, options = {}) {
     if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       read.state = "pending";
-      if (ctx.serialize) ctx.serialize(id, p, options.deferStream);
-      return p.then(res => {
+      p = p.then(res => {
         read.loading = false;
         read.state = "ready";
         ctx.resources[id].data = res;
@@ -527,7 +534,10 @@ function createResource(source, fetcher, options = {}) {
         read.error = error = castError(err);
         p = null;
         notifySuspense(contexts);
+        throw error;
       });
+      if (ctx.serialize) ctx.serialize(id, p, options.deferStream);
+      return p;
     }
     ctx.resources[id].data = p;
     if (ctx.serialize) ctx.serialize(id, p);
@@ -639,7 +649,10 @@ function Suspense(props) {
     }));
   }
   const res = runSuspense();
-  if (suspenseComplete(value)) return res;
+  if (suspenseComplete(value)) {
+    delete ctx.suspense[id];
+    return res;
+  }
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   return catchError(() => {
     if (ctx.async) {
@@ -700,6 +713,7 @@ exports.equalFn = equalFn;
 exports.from = from;
 exports.getListener = getListener;
 exports.getOwner = getOwner;
+exports.indexArray = indexArray;
 exports.lazy = lazy;
 exports.mapArray = mapArray;
 exports.mergeProps = mergeProps;

package/dist/server.js

@@ -228,11 +228,19 @@ function requestCallback(fn, options) {
 function mapArray(list, mapFn, options = {}) {
   const items = list();
   let s = [];
-  if (items.length) {
+  if (items && items.length) {
     for (let i = 0, len = items.length; i < len; i++) s.push(mapFn(items[i], () => i));
   } else if (options.fallback) s = [options.fallback()];
   return () => s;
 }
+function indexArray(list, mapFn, options = {}) {
+  const items = list();
+  let s = [];
+  if (items && items.length) {
+    for (let i = 0, len = items.length; i < len; i++) s.push(mapFn(() => items[i], i));
+  } else if (options.fallback) s = [options.fallback()];
+  return () => s;
+}
 function observable(input) {
   return {
     subscribe(observer) {
@@ -537,8 +545,7 @@ function createResource(source, fetcher, options = {}) {
     if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       read.state = "pending";
-      if (ctx.serialize) ctx.serialize(id, p, options.deferStream);
-      return p
+      p = p
         .then(res => {
           read.loading = false;
           read.state = "ready";
@@ -553,7 +560,10 @@ function createResource(source, fetcher, options = {}) {
           read.error = error = castError(err);
           p = null;
           notifySuspense(contexts);
+          throw error;
         });
+      if (ctx.serialize) ctx.serialize(id, p, options.deferStream);
+      return p;
     }
     ctx.resources[id].data = p;
     if (ctx.serialize) ctx.serialize(id, p);
@@ -678,7 +688,10 @@ function Suspense(props) {
     );
   }
   const res = runSuspense();
-  if (suspenseComplete(value)) return res;
+  if (suspenseComplete(value)) {
+    delete ctx.suspense[id];
+    return res;
+  }
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   return catchError(() => {
     if (ctx.async) {
@@ -740,6 +753,7 @@ export {
   from,
   getListener,
   getOwner,
+  indexArray,
   lazy,
   mapArray,
   mergeProps,

package/dist/solid.cjs

@@ -270,7 +270,7 @@ function createResource(pSource, pFetcher, pOptions) {
   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 = isPromise(v) && "value" in v ? v.value : v;
+    if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
   }
   function loadEnd(p, v, error, key) {
     if (pr === p) {
@@ -336,6 +336,10 @@ function createResource(pSource, pFetcher, pOptions) {
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
+    if ("value" in p) {
+      if (p.status === "success") loadEnd(pr, p.value, undefined, lookup);else loadEnd(pr, undefined, undefined, lookup);
+      return p;
+    }
     pr = p;
     scheduled = true;
     queueMicrotask(() => scheduled = false);
@@ -1598,7 +1602,7 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref && (typeof ref !== "object" || !("value" in ref))) p = ref;
+    if (ref && (typeof ref !== "object" || ref.status !== 'success')) p = ref;
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false

package/dist/solid.js

@@ -281,8 +281,7 @@ function createResource(pSource, pFetcher, pOptions) {
     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 = isPromise(v) && "value" in v ? v.value : v;
+    else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v;
   }
   function loadEnd(p, v, error, key) {
     if (pr === p) {
@@ -357,6 +356,11 @@ function createResource(pSource, pFetcher, pOptions) {
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
+    if ("value" in p) {
+      if (p.status === "success") loadEnd(pr, p.value, undefined, lookup);
+      else loadEnd(pr, undefined, undefined, lookup);
+      return p;
+    }
     pr = p;
     scheduled = true;
     queueMicrotask(() => (scheduled = false));
@@ -1748,7 +1752,7 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref && (typeof ref !== "object" || !("value" in ref))) p = ref;
+    if (ref && (typeof ref !== "object" || ref.status !== "success")) p = ref;
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -206,7 +206,7 @@
   ],
   "dependencies": {
     "csstype": "^3.1.0",
-    "seroval": "^0.10.4"
+    "seroval": "^0.11.6"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",

package/types/render/hydration.d.ts

@@ -1,4 +1,4 @@
-import { Computation } from "../reactive/signal";
+import { Computation } from "../reactive/signal.js";
 export type HydrationContext = {
   id: string;
   count: number;

package/types/server/index.d.ts

@@ -24,6 +24,7 @@ export {
   equalFn,
   requestCallback,
   mapArray,
+  indexArray,
   observable,
   from,
   $PROXY,

package/types/server/reactive.d.ts

@@ -79,10 +79,17 @@ export declare function requestCallback(
 ): Task;
 export declare function cancelCallback(task: Task): void;
 export declare function mapArray<T, U>(
-  list: () => T[],
-  mapFn: (v: T, i: () => number) => U,
+  list: Accessor<readonly T[] | undefined | null | false>,
+  mapFn: (v: T, i: Accessor<number>) => U,
   options?: {
-    fallback?: () => any;
+    fallback?: Accessor<any>;
+  }
+): () => U[];
+export declare function indexArray<T, U>(
+  list: Accessor<readonly T[] | undefined | null | false>,
+  mapFn: (v: Accessor<T>, i: number) => U,
+  options?: {
+    fallback?: Accessor<any>;
   }
 ): () => U[];
 export type ObservableObserver<T> =

package/web/dist/server.cjs

@@ -207,7 +207,7 @@ function renderToStream(code, options = {}) {
             } else {
               buffer.write(`<template id="${key}">${value !== undefined ? value : " "}</template>`);
               pushTask(`$df("${key}")${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
-              resolve(true);
+              error ? reject(error) : resolve(true);
               scriptFlushed = true;
             }
           }

package/web/dist/server.js

@@ -239,7 +239,7 @@ function renderToStream(code, options = {}) {
             } else {
               buffer.write(`<template id="${key}">${value !== undefined ? value : " "}</template>`);
               pushTask(`$df("${key}")${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
-              resolve(true);
+              error ? reject(error) : resolve(true);
               scriptFlushed = true;
             }
           }