@uniflowed/graphql 0.1.0 → 0.3.0

package/index.js

@@ -19,6 +19,7 @@
 
 import type { FetchClient } from "@uniflowed/fetch";
 import { Environment, Network, Observable, RecordSource, Store } from "relay-runtime";
+import type { GraphQLResponse, RequestParameters, Variables } from "relay-runtime";
 
 export type { Environment } from "relay-runtime";
 
@@ -80,17 +81,16 @@ export function createEnvironment(options: EnvironmentOptions): Environment {
  * function and not one uf guesses at.
  */
 function fetchOperation(options: EnvironmentOptions) {
-  return async function run(operation: mixed, variables: mixed): Promise<mixed> {
-    const request = operation as $FlowFixMe;
+  return async function run(
+    request: RequestParameters,
+    variables: Variables,
+  ): Promise<GraphQLResponse> {
     // `raw` rather than `request`: a GraphQL endpoint answers 200 with an
     // `errors` array, so the status is not the outcome and the body has to be
     // read either way.
     const response = await options.fetch.raw(options.endpoint, {
       method: "POST",
-      headers: {
-        accept: "application/graphql-response+json, application/json",
-        ...(options.headers ?? {}),
-      },
+      headers: requestHeaders(options.headers),
       body: {
         query: request.text,
         variables,
@@ -110,4 +110,20 @@ function fetchOperation(options: EnvironmentOptions) {
   };
 }
 
+/**
+ * GraphQL's `accept`, then the caller's headers, which win on a clash — a
+ * gateway that wants a different media type says so.
+ */
+function requestHeaders(given: { readonly [string]: string } | void): { [string]: string } {
+  const headers: { [string]: string } = {
+    accept: "application/graphql-response+json, application/json",
+  };
+  if (given != null) {
+    for (const name of Object.keys(given)) {
+      headers[name] = given[name];
+    }
+  }
+  return headers;
+}
+
 export { Observable };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniflowed/graphql",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "The Relay environment, without the boilerplate, for the Unified Toolchain for Flow.",
   "type": "module",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "!*.test.js"
   ],
   "dependencies": {
-    "@uniflowed/fetch": "0.1.0"
+    "@uniflowed/fetch": "0.3.0"
   },
   "peerDependencies": {
     "relay-runtime": ">=20"