fix #1917, fix #1918 error handling with serialization

.changeset/spotty-rings-try.md

@@ -0,0 +1,6 @@
+---
+"babel-preset-solid": patch
+"solid-js": patch
+---
+
+fix #1917, fix #1918 error handling with serialization

package.json

@@ -34,21 +34,21 @@
     "@rollup/plugin-replace": "^5.0.2",
     "@types/node": "^18.11.19",
     "@vitest/coverage-c8": "^0.29.7",
-    "babel-plugin-jsx-dom-expressions": "^0.37.0",
+    "babel-plugin-jsx-dom-expressions": "^0.37.2",
     "coveralls": "^3.1.1",
     "csstype": "^3.1.0",
-    "dom-expressions": "0.37.1",
-    "hyper-dom-expressions": "0.37.1",
+    "dom-expressions": "0.37.3",
+    "hyper-dom-expressions": "0.37.3",
     "jsdom": "^21.1.1",
-    "lit-dom-expressions": "0.37.1",
+    "lit-dom-expressions": "0.37.3",
     "ncp": "^2.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
     "rollup": "^3.7.5",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-copy": "^3.4.0",
-    "seroval": "^0.10.4",
+    "seroval": "^0.11.6",
     "simple-git-hooks": "^2.8.1",
     "symlink-dir": "^5.0.1",
     "tsconfig-replace-paths": "^0.0.11",

packages/babel-preset-solid/package.json

@@ -14,7 +14,7 @@
     "test": "node test.js"
   },
   "dependencies": {
-    "babel-plugin-jsx-dom-expressions": "^0.37.0"
+    "babel-plugin-jsx-dom-expressions": "^0.37.2"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0"

packages/solid/package.json

@@ -227,6 +227,6 @@
   ],
   "dependencies": {
     "csstype": "^3.1.0",
-    "seroval": "^0.10.4"
+    "seroval": "^0.11.6"
   }
 }

packages/solid/src/reactive/signal.ts

@@ -620,8 +620,7 @@ export function createResource<T, S, R>(
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue as T;
-    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: Promise<T> | null, v: T | undefined, error?: any, key?: S) {
     if (pr === p) {
@@ -693,6 +692,11 @@ export function createResource<T, S, R>(
       loadEnd(pr, p, undefined, lookup);
       return p;
     }
+    if ("value" in p) {
+      if ((p as any).status === "success") loadEnd(pr, p.value as T, undefined, lookup);
+      else loadEnd(pr, undefined, undefined, lookup);
+      return p;
+    }
     pr = p;
     scheduled = true;
     queueMicrotask(() => (scheduled = false));

packages/solid/src/server/rendering.ts

@@ -424,8 +424,7 @@ export function createResource<T, S>(
     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";
@@ -440,7 +439,10 @@ export function createResource<T, S>(
           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);
@@ -592,7 +594,10 @@ export function Suspense(props: { fallback?: string; children: string }) {
   const res = runSuspense();
 
   // never suspended
-  if (suspenseComplete(value)) return res;
+  if (suspenseComplete(value)) {
+    delete ctx.suspense[id];
+    return res;
+  }
 
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   return catchError(() => {