fixup! feat(core): allow synchronous values for stream Resources

JeanMeche · JeanMeche · commit 87a6c47f23b4 · 2026-04-08T09:36:26.000+02:00
diff --git a/packages/core/src/resource/resource.ts b/packages/core/src/resource/resource.ts
@@ -421,7 +421,7 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
       // The actual loading is run through `untracked` - only the request side of `resource` is
       // reactive. This avoids any confusion with signals tracking or not tracking depending on
       // which side of the `await` they are.
-      const stream = untracked(() => {
+      const loaderResult = untracked(() => {
         return this.loaderFn({
           params: extRequest.request as Exclude<R, undefined>,
           abortSignal,
@@ -435,30 +435,18 @@ export class ResourceImpl<T, R> extends BaseWritableResource<T> implements Resou
       // matches this load, then we should ignore this resolution.
       const shouldDiscard = () => abortSignal.aborted || untracked(this.extRequest) !== extRequest;
 
-      if (isSignal(stream)) {
-        if (shouldDiscard()) {
-          return;
-        }
-
-        this.state.set({
-          extRequest,
-          status: 'resolved',
-          previousStatus: 'resolved',
-          stream,
-        });
-      } else {
-        const resolvedStream = await stream;
-        if (shouldDiscard()) {
-          return;
-        }
+      const stream = isSignal(loaderResult) ? loaderResult : await loaderResult;
 
-        this.state.set({
-          extRequest,
-          status: 'resolved',
-          previousStatus: 'resolved',
-          stream: resolvedStream,
-        });
+      if (shouldDiscard()) {
+        return;
       }
+
+      this.state.set({
+        extRequest,
+        status: 'resolved',
+        previousStatus: 'resolved',
+        stream,
+      });
     } catch (err) {
       rethrowFatalErrors(err);
       if (abortSignal.aborted || untracked(this.extRequest) !== extRequest) {
