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/silver-cases-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"solid-relay": patch
---

fix!: drop support for async preloaded queries
20 changes: 6 additions & 14 deletions src/primitives/createPreloadedQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
__internal,
getRequest,
} from "relay-runtime";
import { createResource } from "solid-js";
import invariant from "tiny-invariant";
import { useRelayEnvironment } from "../RelayEnvironment";
import type { PreloadedQuery } from "../loadQuery";
Expand All @@ -13,31 +12,24 @@
import type { DataStore } from "../utils/dataStore";
import { createLazyLoadQueryInternal } from "./createLazyLoadQuery";

type MaybePromise<T> = T | Promise<T>;

export function createPreloadedQuery<TQuery extends OperationType>(
query: GraphQLTaggedNode,
preloadedQuery: MaybeAccessor<MaybePromise<PreloadedQuery<TQuery>>>,
preloadedQuery: MaybeAccessor<PreloadedQuery<TQuery>>,

Check warning on line 17 in src/primitives/createPreloadedQuery.ts

View check run for this annotation

Codecov / codecov/patch

src/primitives/createPreloadedQuery.ts#L17

Added line #L17 was not covered by tests
): DataStore<TQuery["response"]> {
const environment = useRelayEnvironment();
const [maybePreloaded] = createResource(
() => access(preloadedQuery),
(v) => v,
);
const operation = createMemoOperationDescriptor(
query,
() => maybePreloaded.latest?.variables,
() => maybePreloaded.latest?.networkCacheConfig ?? undefined,
() => access(preloadedQuery).variables,
() => access(preloadedQuery).networkCacheConfig ?? undefined,

Check warning on line 23 in src/primitives/createPreloadedQuery.ts

View check run for this annotation

Codecov / codecov/patch

src/primitives/createPreloadedQuery.ts#L22-L23

Added lines #L22 - L23 were not covered by tests
);

return createLazyLoadQueryInternal({
query: operation,
fragment: () => getRequest(query).fragment,
fetchKey: () => maybePreloaded.latest?.fetchKey,
fetchPolicy: () => maybePreloaded.latest?.fetchPolicy,
fetchKey: () => access(preloadedQuery).fetchKey,
fetchPolicy: () => access(preloadedQuery).fetchPolicy,

Check warning on line 30 in src/primitives/createPreloadedQuery.ts

View check run for this annotation

Codecov / codecov/patch

src/primitives/createPreloadedQuery.ts#L29-L30

Added lines #L29 - L30 were not covered by tests
fetchObservable: () => {
const preloaded = maybePreloaded.latest;
if (!preloaded) return;
const preloaded = access(preloadedQuery);

Check warning on line 32 in src/primitives/createPreloadedQuery.ts

View check run for this annotation

Codecov / codecov/patch

src/primitives/createPreloadedQuery.ts#L32

Added line #L32 was not covered by tests

invariant(
preloaded.controls == null || !preloaded.controls?.value.isDisposed(),
Expand Down