Revert to usinng bs.deriving abstract for partialOperationContext. (#216

)
teamwalnut · Sep 10, 2020 · 5cf876f · 5cf876f
1 parent 33b7a27
commit 5cf876f
Show file tree

Hide file tree

Showing 6 changed files with 167 additions and 148 deletions.
diff --git a/src/Client.re b/src/Client.re
@@ -251,17 +251,19 @@ let executeQuery =
       (),
     );
   let parse = request##parse;
-  let optsJs: Types.partialOperationContext = {
-    additionalTypenames,
-    fetchOptions,
-    fetch,
-    requestPolicy: requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
-    url: Some(url->Belt.Option.getWithDefault(client.url)),
-    pollInterval,
-    meta,
-    suspense,
-    preferGetMethod,
-  };
+  let optsJs =
+    Types.partialOperationContext(
+      ~additionalTypenames?,
+      ~fetchOptions?,
+      ~fetch?,
+      ~requestPolicy=?requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
+      ~url?,
+      ~pollInterval?,
+      ~meta?,
+      ~suspense?,
+      ~preferGetMethod?,
+      (),
+    );
 
   executeQueryJs(~client, ~query=req, ~opts=optsJs, ())
   |> Wonka.map((. response) => urqlClientResponseToReason(~response, ~parse));
@@ -300,17 +302,19 @@ let executeMutation =
       (),
     );
   let parse = request##parse;
-  let optsJs: Types.partialOperationContext = {
-    additionalTypenames,
-    fetchOptions,
-    fetch,
-    requestPolicy: requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
-    url: Some(url->Belt.Option.getWithDefault(client.url)),
-    pollInterval,
-    meta,
-    suspense,
-    preferGetMethod,
-  };
+  let optsJs =
+    Types.partialOperationContext(
+      ~additionalTypenames?,
+      ~fetchOptions?,
+      ~fetch?,
+      ~requestPolicy=?requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
+      ~url?,
+      ~pollInterval?,
+      ~meta?,
+      ~suspense?,
+      ~preferGetMethod?,
+      (),
+    );
 
   executeMutationJs(~client, ~mutation=req, ~opts=optsJs, ())
   |> Wonka.map((. response) => urqlClientResponseToReason(~response, ~parse));
@@ -349,17 +353,19 @@ let executeSubscription =
       (),
     );
   let parse = request##parse;
-  let optsJs: Types.partialOperationContext = {
-    additionalTypenames,
-    fetchOptions,
-    fetch,
-    requestPolicy: requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
-    url: Some(url->Belt.Option.getWithDefault(client.url)),
-    pollInterval,
-    meta,
-    suspense,
-    preferGetMethod,
-  };
+  let optsJs =
+    Types.partialOperationContext(
+      ~additionalTypenames?,
+      ~fetchOptions?,
+      ~fetch?,
+      ~requestPolicy=?requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
+      ~url?,
+      ~pollInterval?,
+      ~meta?,
+      ~suspense?,
+      ~preferGetMethod?,
+      (),
+    );
 
   executeSubscriptionJs(~client, ~subscription=req, ~opts=optsJs, ())
   |> Wonka.map((. response) => urqlClientResponseToReason(~response, ~parse));

diff --git a/src/Types.re b/src/Types.re
@@ -46,16 +46,26 @@ type operationContext = {
   preferGetMethod: option(bool),
 };
 
+[@bs.deriving {abstract: light}]
 type partialOperationContext = {
-  additionalTypenames: option(array(string)),
-  fetch: option((string, Fetch.requestInit) => Js.Promise.t(Fetch.response)),
-  fetchOptions: option(Fetch.requestInit),
-  requestPolicy: option(string),
-  url: option(string),
-  pollInterval: option(int),
-  meta: option(operationDebugMeta),
-  suspense: option(bool),
-  preferGetMethod: option(bool),
+  [@bs.optional]
+  additionalTypenames: array(string),
+  [@bs.optional]
+  fetch: (string, Fetch.requestInit) => Js.Promise.t(Fetch.response),
+  [@bs.optional]
+  fetchOptions: Fetch.requestInit,
+  [@bs.optional]
+  requestPolicy: string,
+  [@bs.optional]
+  url: string,
+  [@bs.optional]
+  pollInterval: int,
+  [@bs.optional]
+  meta: operationDebugMeta,
+  [@bs.optional]
+  suspense: bool,
+  [@bs.optional]
+  preferGetMethod: bool,
 };
 
 /* The active GraphQL operation. */

diff --git a/src/Types.rei b/src/Types.rei
@@ -36,16 +36,26 @@ type operationContext = {
   preferGetMethod: option(bool),
 };
 
+[@bs.deriving {abstract: light}]
 type partialOperationContext = {
-  additionalTypenames: option(array(string)),
-  fetch: option((string, Fetch.requestInit) => Js.Promise.t(Fetch.response)),
-  fetchOptions: option(Fetch.requestInit),
-  requestPolicy: option(string),
-  url: option(string),
-  pollInterval: option(int),
-  meta: option(operationDebugMeta),
-  suspense: option(bool),
-  preferGetMethod: option(bool),
+  [@bs.optional]
+  additionalTypenames: array(string),
+  [@bs.optional]
+  fetch: (string, Fetch.requestInit) => Js.Promise.t(Fetch.response),
+  [@bs.optional]
+  fetchOptions: Fetch.requestInit,
+  [@bs.optional]
+  requestPolicy: string,
+  [@bs.optional]
+  url: string,
+  [@bs.optional]
+  pollInterval: int,
+  [@bs.optional]
+  meta: operationDebugMeta,
+  [@bs.optional]
+  suspense: bool,
+  [@bs.optional]
+  preferGetMethod: bool,
 };
 
 /* The active GraphQL operation. */

diff --git a/src/hooks/UseMutation.re b/src/hooks/UseMutation.re
@@ -43,8 +43,6 @@ let useMutation = (~request) => {
   let variables = request##variables;
   let parse = request##parse;
 
-  let client = UseClient.useClient();
-
   let (stateJs, executeMutationJs) = useMutationJs(query);
 
   let state =
@@ -54,7 +52,7 @@ let useMutation = (~request) => {
     );
 
   let executeMutation =
-    React.useMemo3(
+    React.useMemo2(
       (
         (),
         ~additionalTypenames=?,
@@ -68,22 +66,24 @@ let useMutation = (~request) => {
         ~preferGetMethod=?,
         (),
       ) => {
-        let ctx: Types.partialOperationContext = {
-          additionalTypenames,
-          fetchOptions,
-          fetch,
-          requestPolicy:
-            requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
-          url: Some(url->Belt.Option.getWithDefault(client.url)),
-          pollInterval,
-          meta,
-          suspense,
-          preferGetMethod,
-        };
+        let ctx =
+          Types.partialOperationContext(
+            ~additionalTypenames?,
+            ~fetchOptions?,
+            ~fetch?,
+            ~url?,
+            ~requestPolicy=?
+              requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
+            ~pollInterval?,
+            ~meta?,
+            ~suspense?,
+            ~preferGetMethod?,
+            (),
+          );
 
         executeMutationJs(variables, ctx);
       },
-      (executeMutationJs, variables, client),
+      (executeMutationJs, variables),
     );
 
   (state, executeMutation);
@@ -102,8 +102,6 @@ let useDynamicMutation = definition => {
   let (parse, query, composeVariables) = definition;
   let (stateJs, executeMutationJs) = useMutationJs(query);
 
-  let client = UseClient.useClient();
-
   let state =
     React.useMemo2(
       () => Types.urqlResponseToReason(~response=stateJs, ~parse),
@@ -122,17 +120,20 @@ let useDynamicMutation = definition => {
         ~suspense=?,
         ~preferGetMethod=?,
       ) => {
-    let ctx: Types.partialOperationContext = {
-      additionalTypenames,
-      fetchOptions,
-      fetch,
-      requestPolicy: requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
-      url: Some(url->Belt.Option.getWithDefault(client.url)),
-      pollInterval,
-      meta,
-      suspense,
-      preferGetMethod,
-    };
+    let ctx =
+      Types.partialOperationContext(
+        ~additionalTypenames?,
+        ~fetchOptions?,
+        ~fetch?,
+        ~url?,
+        ~requestPolicy=?
+          requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
+        ~pollInterval?,
+        ~meta?,
+        ~suspense?,
+        ~preferGetMethod?,
+        (),
+      );
 
     composeVariables(variables => executeMutationJs(variables, ctx));
   };

diff --git a/src/hooks/UseQuery.re b/src/hooks/UseQuery.re
@@ -36,9 +36,8 @@ external useQueryJs: useQueryArgsJs => useQueryResponseJs = "useQuery";
 
 // reason-react does not provide a binding of sufficient arity for our memoization needs
 [@bs.module "react"]
-external useMemo10:
-  ([@bs.uncurry] (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j)) =>
-  'any =
+external useMemo9:
+  ([@bs.uncurry] (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i)) => 'any =
   "useMemo";
 
 let useQuery =
@@ -65,31 +64,26 @@ let useQuery =
       [|requestPolicy|],
     );
 
-  let client = UseClient.useClient();
-
   let context =
-    useMemo10(
-      () => {
-        let c: Types.partialOperationContext = {
-          additionalTypenames,
-          fetchOptions,
-          fetch,
-          url: Some(url->Belt.Option.getWithDefault(client.url)),
-          requestPolicy: rp,
-          pollInterval,
-          meta,
-          suspense,
-          preferGetMethod,
-        };
-
-        c;
-      },
+    useMemo9(
+      () =>
+        Types.partialOperationContext(
+          ~additionalTypenames?,
+          ~fetchOptions?,
+          ~fetch?,
+          ~url?,
+          ~requestPolicy=?rp,
+          ~pollInterval?,
+          ~meta?,
+          ~suspense?,
+          ~preferGetMethod?,
+          (),
+        ),
       (
         additionalTypenames,
         fetchOptions,
         fetch,
         url,
-        client,
         rp,
         pollInterval,
         meta,
@@ -128,18 +122,20 @@ let useQuery =
         ~preferGetMethod=?,
         (),
       ) => {
-        let ctx: Types.partialOperationContext = {
-          additionalTypenames,
-          fetchOptions,
-          fetch,
-          url,
-          requestPolicy:
-            requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
-          pollInterval,
-          meta,
-          suspense,
-          preferGetMethod,
-        };
+        let ctx =
+          Types.partialOperationContext(
+            ~additionalTypenames?,
+            ~fetchOptions?,
+            ~fetch?,
+            ~url?,
+            ~requestPolicy=?
+              requestPolicy->Belt.Option.map(Types.requestPolicyToJs),
+            ~pollInterval?,
+            ~meta?,
+            ~suspense?,
+            ~preferGetMethod?,
+            (),
+          );
 
         executeQueryJs(ctx);
       },