Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/thirty-parks-fall.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"solid-relay": patch
---

fix: consistently handle loading states across primitives
2 changes: 1 addition & 1 deletion src/primitives/createFragment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type FragmentResult<T> =
| {
data: undefined;
error: undefined;
pending: true;
pending: boolean;
};

/**
Expand Down
69 changes: 41 additions & 28 deletions src/primitives/createLazyLoadQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ type QueryResult<T> =
| {
data: undefined;
error: undefined;
pending: true;
pending: boolean;
};

/**
Expand Down Expand Up @@ -254,7 +254,7 @@ export function createLazyLoadQueryInternal<TQuery extends OperationType>(params
{
data: undefined,
error: undefined,
pending: true,
pending: false,
},
Comment thread
XiNiHa marked this conversation as resolved.
() => cacheEntry()?.resource,
);
Expand All @@ -263,34 +263,47 @@ export function createLazyLoadQueryInternal<TQuery extends OperationType>(params
batch(() => {
setResult("data", undefined);
setResult("error", undefined);
setResult("pending", true);
});
setResult("pending", false);

const operation = params.query();
const env = environment();
if (!operation || !env) return;
const operation = params.query();
const env = environment();
if (!operation || !env) return;

const fragmentSubscription = observeFragment(
env,
params.fragment(),
getQueryRef(operation),
).subscribe({
next(state) {
batch(() => {
if (state.state === "ok") {
setResult("error", undefined);
setResult("pending", false);
setResult("data", reconcile(cleanSnapshot(state.value), { key: "__id", merge: true }));
} else if (state.state === "error") {
setResult("data", undefined);
setResult("error", state.error);
setResult("pending", false);
}
});
},
});
onCleanup(() => {
fragmentSubscription.unsubscribe();
setResult("pending", true);
Comment thread
XiNiHa marked this conversation as resolved.

const fragmentSubscription = observeFragment(
env,
params.fragment(),
getQueryRef(operation),
).subscribe({
next(state) {
batch(() => {
switch (state.state) {
case "ok":
setResult("error", undefined);
setResult("pending", false);
setResult(
"data",
reconcile(cleanSnapshot(state.value), { key: "__id", merge: true }),
);
break;
case "error":
setResult("data", undefined);
setResult("error", state.error);
setResult("pending", false);
break;
case "loading":
setResult("data", undefined);
setResult("error", undefined);
setResult("pending", true);
break;
}
});
},
});
onCleanup(() => {
fragmentSubscription.unsubscribe();
});
});
});

Expand Down
Loading