update version (next)

.changeset/pre.json

@@ -7,6 +7,7 @@
   "changesets": [
     "beige-donuts-attend",
     "five-weeks-talk",
-    "tough-grapes-hug"
+    "tough-grapes-hug",
+    "warm-tomatoes-wonder"
   ]
 }

CHANGELOG.md

@@ -1,5 +1,11 @@
 # @labdigital/react-query-opal
 
+## 2.0.0-next.3
+
+### Major Changes
+
+- 3dc1d79: Internal refactor to better support persisted operations / trusted documents
+
 ## 1.5.0-next.2
 
 ### Patch Changes

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@labdigital/graphql-fetcher",
-	"version": "1.5.0-next.2",
+	"version": "2.0.0-next.3",
 	"description": "Custom fetcher for react-query to use with @labdigital/node-federated-token",
 	"type": "module",
 	"main": "./dist/index.cjs",

src/client.test.ts

@@ -56,10 +56,12 @@ describe("gqlClientFetch", () => {
 				body: JSON.stringify({
 					query: query,
 					variables: { myVar: "baz" },
-					extensions: { persistedQuery: {
-						version: 1,
-						sha256Hash: await createSha256(query.toString()),
-					}},
+					extensions: {
+						persistedQuery: {
+							version: 1,
+							sha256Hash: await createSha256(query.toString()),
+						},
+					},
 				}),
 				// Method was post:
 				method: "POST",
@@ -242,10 +244,12 @@ describe("gqlClientFetch", () => {
 				body: JSON.stringify({
 					query: query,
 					variables: { myVar: "baz" },
-					extensions: { persistedQuery: {
-						version: 1,
-						sha256Hash: await createSha256(query.toString()),
-					}},
+					extensions: {
+						persistedQuery: {
+							version: 1,
+							sha256Hash: await createSha256(query.toString()),
+						},
+					},
 				}),
 				// Method was post:
 				method: "POST",

src/client.ts

@@ -41,7 +41,7 @@ type Options = {
 	 */
 	defaultHeaders?: Headers | Record<string, string>;
 
-	mode?: ModeFlags
+	mode?: ModeFlags;
 
 	/**
 	 * Function to customize creating the documentId from a query

src/helpers.ts

@@ -56,14 +56,14 @@ export interface NextFetchRequestConfig {
 }
 
 export const pruneObject = <T>(object: T): Partial<T> => {
-	const data: Record<string, unknown> = {}
+	const data: Record<string, unknown> = {};
 	for (const key in object) {
 		if (isNotEmpty(object[key])) {
 			data[key] = object[key];
 		}
 	}
 	return JSON.parse(JSON.stringify(data ?? null));
-}
+};
 
 const isNotEmpty = (value: unknown) => value && Object.keys(value).length > 0;
 

src/request.test.ts

@@ -18,49 +18,42 @@ it.each(["both", "document", "persistent"])(
 			documentId: "123",
 		} as GraphQLRequest<Record<string, unknown>>);
 
-		const result: Record<string, unknown> = {}
+		const result: Record<string, unknown> = {};
 		data.forEach((value, key) => {
-			result[key] = value
-		})
+			result[key] = value;
+		});
 
 		switch (mode) {
 			case "both": {
-				expect(result).toStrictEqual(
-					{
-						documentId: "123",
-						op: "hello",
-						variables: '{"name":"world"}',
-						extensions: '{"persistedQuery":{"version":1,"sha256Hash":"123"}}',
-					},
-				);
+				expect(result).toStrictEqual({
+					documentId: "123",
+					op: "hello",
+					variables: '{"name":"world"}',
+					extensions: '{"persistedQuery":{"version":1,"sha256Hash":"123"}}',
+				});
 				break;
 			}
 			case "persisted": {
-				expect(result).toStrictEqual(
-					{
-						documentId: "123",
-						op: "hello",
-						variables: '{"name":"world"}',
-						extensions: '{"persistedQuery":{"version":1,"sha256Hash":"123"}}',
-					}
-				);
+				expect(result).toStrictEqual({
+					documentId: "123",
+					op: "hello",
+					variables: '{"name":"world"}',
+					extensions: '{"persistedQuery":{"version":1,"sha256Hash":"123"}}',
+				});
 				break;
 			}
 			case "document": {
-				expect(result).toStrictEqual(
-					{
-						op: "hello",
-						variables: '{"name":"world"}',
-						extensions: '{"persistedQuery":{"version":1,"sha256Hash":"123"}}',
-					}
-				);
+				expect(result).toStrictEqual({
+					op: "hello",
+					variables: '{"name":"world"}',
+					extensions: '{"persistedQuery":{"version":1,"sha256Hash":"123"}}',
+				});
 				break;
 			}
 		}
 	},
 );
 
-
 it.each(["both", "document", "persistent"])(
 	"createRequestURL - minimal mode=%s",
 	(mode) => {
@@ -72,39 +65,32 @@ it.each(["both", "document", "persistent"])(
 			documentId: "123",
 		} as GraphQLRequest<Record<string, unknown>>);
 
-		const result: Record<string, unknown> = {}
+		const result: Record<string, unknown> = {};
 		data.forEach((value, key) => {
-			result[key] = value
-		})
+			result[key] = value;
+		});
 
 		switch (mode) {
 			case "both": {
-				expect(result).toStrictEqual(
-					{
-						documentId: "123",
-						op: "hello",
-					},
-				);
+				expect(result).toStrictEqual({
+					documentId: "123",
+					op: "hello",
+				});
 				break;
 			}
 			case "persisted": {
-				expect(result).toStrictEqual(
-					{
-						documentId: "123",
-						op: "hello",
-					}
-				);
+				expect(result).toStrictEqual({
+					documentId: "123",
+					op: "hello",
+				});
 				break;
 			}
 			case "document": {
-				expect(result).toStrictEqual(
-					{
-						op: "hello",
-					}
-				);
+				expect(result).toStrictEqual({
+					op: "hello",
+				});
 				break;
 			}
 		}
 	},
 );
-

src/server.test.ts

@@ -82,10 +82,12 @@ describe("gqlServerFetch", () => {
 				body: JSON.stringify({
 					query: query.toString(),
 					variables: { myVar: "baz" },
-					extensions: { persistedQuery: {
-						version: 1,
-						sha256Hash: await createSha256(query.toString()),
-					}},
+					extensions: {
+						persistedQuery: {
+							version: 1,
+							sha256Hash: await createSha256(query.toString()),
+						},
+					},
 				}),
 				headers: new Headers({
 					"Content-Type": "application/json",
@@ -118,10 +120,12 @@ describe("gqlServerFetch", () => {
 				body: JSON.stringify({
 					query: queryMutation.toString(),
 					variables: { myVar: "baz" },
-					extensions: { persistedQuery: {
-						version: 1,
-						sha256Hash: await createSha256(queryMutation.toString()),
-					}},
+					extensions: {
+						persistedQuery: {
+							version: 1,
+							sha256Hash: await createSha256(queryMutation.toString()),
+						},
+					},
 				}),
 				headers: new Headers({
 					"Content-Type": "application/json",
@@ -199,7 +203,7 @@ describe("gqlServerFetch", () => {
 				}),
 				cache: "force-cache",
 				next: { revalidate: 900 },
-				signal: expect.any(AbortSignal)
+				signal: expect.any(AbortSignal),
 			},
 		);
 	});
@@ -218,18 +222,21 @@ describe("gqlServerFetch", () => {
 
 		expect(gqlResponse).toEqual(response);
 		expect(mockedFetch).toHaveBeenCalledTimes(1);
-		expect(mockedFetch).toHaveBeenCalledWith("https://localhost/graphql?op=myQuery", {
-			method: "POST", // <- Note that when caching is disabled, the method is 'POST'
-			body: JSON.stringify({
-				query: query.toString(),
-				variables: { myVar: "baz" },
-			}),
-			headers: new Headers({
-				"Content-Type": "application/json",
-			}),
-			cache: "no-store",
-			signal: expect.any(AbortSignal),
-		});
+		expect(mockedFetch).toHaveBeenCalledWith(
+			"https://localhost/graphql?op=myQuery",
+			{
+				method: "POST", // <- Note that when caching is disabled, the method is 'POST'
+				body: JSON.stringify({
+					query: query.toString(),
+					variables: { myVar: "baz" },
+				}),
+				headers: new Headers({
+					"Content-Type": "application/json",
+				}),
+				cache: "no-store",
+				signal: expect.any(AbortSignal),
+			},
+		);
 	});
 
 	// This seems as if we test fetch itself but we're actually testing whether the fetcher properly propagates the fetch errors to the package consumers

src/server.ts

@@ -146,7 +146,7 @@ export const initServerFetcher =
 				} catch (err: unknown) {
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
-						message: err instanceof Error ? err.message : String(err)
+						message: err instanceof Error ? err.message : String(err),
 					});
 					throw err;
 				}
@@ -168,7 +168,12 @@ export const initServerFetcher =
 				if (!isPersistedQuery(request) && hasPersistedQueryError(response)) {
 					// If the cached query doesn't exist, fall back to POST request and
 					// let the server cache it.
-					response = await gqlPost(url, request, { cache, next }, requestOptions);
+					response = await gqlPost(
+						url,
+						request,
+						{ cache, next },
+						requestOptions,
+					);
 				}
 
 				span.end();
@@ -227,10 +232,15 @@ const gqlPersistedQuery = async <TVariables>(
  * @param response Fetch response object
  * @returns GraphQL response body
  */
-const parseResponse = async (request: GraphQLRequest<unknown>, response: Response) => {
+const parseResponse = async (
+	request: GraphQLRequest<unknown>,
+	response: Response,
+) => {
 	invariant(
 		response.ok,
-		errorMessage(`Response for ${request.operationName} errored: ${response.status} ${response.statusText}`),
+		errorMessage(
+			`Response for ${request.operationName} errored: ${response.status} ${response.statusText}`,
+		),
 	);
 
 	return await response.json();