refactor resource handling: replace read.loading with _loading to avoid variable conflicts and restructure resource handling logic in createResource

Author: dennev

.changeset/moody-clowns-vanish.md

@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+replace `read.loading` with `_loading` to avoid variable conflicts and restructure resource handling logic in `createResource`

packages/solid/src/server/rendering.ts

@@ -450,34 +450,48 @@ export function createResource<T, S>(
       return resource.ref;
     }
   }
-  const read = () => {
+  const prepareResource = () => {
     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) {
+    if (!resolved && _loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
-        ctx.resources.set(id, read);
+        ctx.resources.set(id, { loading: _loading, error: read.error });
         contexts.add(ctx);
       }
     }
-    return resolved ? sharedConfig.context!.resources[id].data : value;
+    return resolved;
+  };
+  const read = () => {
+    return prepareResource() ? sharedConfig.context!.resources[id].data : value;
   };
-  read.loading = false;
+  const loading = () => {
+    prepareResource();
+    return _loading;
+  };
+  let _loading = false;
   read.error = undefined as any;
   read.state = "initialValue" in options ? "ready" : "unresolved";
-  Object.defineProperty(read, "latest", {
-    get() {
-      return read();
+  Object.defineProperties(read, {
+    latest: {
+      get() {
+        return read();
+      }
+    },
+    loading: {
+      get() {
+        return loading();
+      }
     }
   });
   function load() {
     const ctx = sharedConfig.context!;
     if (!ctx.async)
-      return (read.loading = !!(typeof source === "function" ? (source as () => S)() : source));
+      return (_loading = !!(typeof source === "function" ? (source as () => S)() : source));
     if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
@@ -495,19 +509,19 @@ export function createResource<T, S>(
       p = (fetcher as ResourceFetcher<S, T>)(lookup, { value });
     }
     if (p != undefined && typeof p === "object" && "then" in p) {
-      read.loading = true;
+      _loading = true;
       read.state = "pending";
       p = p
         .then(res => {
-          read.loading = false;
+          _loading = false;
           read.state = "ready";
           ctx.resources[id].data = res;
           p = null;
           notifySuspense(contexts);
           return res;
         })
         .catch(err => {
-          read.loading = false;
+          _loading = false;
           read.state = "errored";
           read.error = error = castError(err);
           p = null;