rescript-relay 1.2.0 → 2.0.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # master
 
+# 2.0.0-alpha.1
+
+## Improvements
+
+- `%relay.deferredComponent` now works with uncurried mode.
+
+# 2.0.0-alpha.0
+
+First alpha of the `2.x` series of releases. `2.x` focuses on compat with ReScript `v11`, including uncurried mode.
+
+### Uncurried mode
+
+You can activate uncurried mode with `RescriptRelay` by setting `"uncurried": true` in your `bsconfig.json`, and then ensuring that you pass `-uncurried` to `rescript-relay/ppx` in `ppx-flags`: `"ppx-flags": [["rescript-relay/ppx", "-uncurried"]]`.
+
+## Upgrade versions
+
+- `rescript` to `>=11.0.0-beta.0`
+- `@rescript/react` to `>=0.12.0-alpha.2`
+
+## Improvements
+
+- Leverage variant's new `string` representation + `@as()` to get rid of `mapFetchPolicy`. This was internal so it should not affect you as an end user.
+
 # 1.2.0
 
 This release mainly makes preparations under the hood for the upcoming `2.0` (ReScript v11 + uncurried mode support) and `3.0` (lots of changes, full uncurried mode only).

package/README.md

@@ -98,6 +98,14 @@ let make = () => {
 
 ```
 
+## Note about versioning
+
+There's plenty of work ongoing to bring RescriptRelay to full ReScript v11 support, including uncurried mode. Here's the versioning scheme that'll be followed going forward:
+
+- 1.x will receive critical bug fixes etc, but new features won't be added
+- 2.x will soon ship, and it'll focus on compatibility with ReScript v11, and uncurried mode (uncurried mode will be optional). This is intended to make the transition to v11+ smooth
+- 3.x will also soon ship, and that'll fully embrace uncurried mode (no curried mode available), and add a bunch of new stuff + change existing APIs to make them better and more ergonomic
+
 ## Examples
 
 - A general example showcasing most available features: https://github.com/zth/rescript-relay/tree/master/example

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript-relay",
-  "version": "1.2.0",
+  "version": "2.0.0-alpha.1",
   "main": "src/RescriptRelay.res",
   "license": "MIT",
   "author": "Gabriel Nordeborn",
@@ -51,13 +51,13 @@
     "react-dom": "18.2.0",
     "react-relay": "15.0.0",
     "relay-runtime": "15.0.0",
-    "rescript": "^11.0.0-beta.1"
+    "rescript": "^11.0.0-beta.2"
   },
   "peerDependencies": {
-    "@rescript/react": "*",
+    "@rescript/react": "^0.12.0-alpha.2 || next",
     "react-relay": ">=15.0.0",
     "relay-runtime": "*",
-    "rescript": ">=10.1.0"
+    "rescript": "^11.0.0-alpha.0 || next"
   },
   "dependencies": {
     "detect-libc": "^2.0.1"

package/src/ReactExperimental.bs.js

@@ -3,14 +3,14 @@
 
 var React = require("react");
 
-function useTransition(param) {
+function useTransition() {
   var match = React.useTransition();
   var startTransition = match[1];
   return [
           match[0],
-          React.useMemo((function (param) {
+          React.useMemo((function () {
                   return function (cb) {
-                    return startTransition(cb, undefined);
+                    startTransition(cb, undefined);
                   };
                 }), [startTransition])
         ];

package/src/RescriptRelay.bs.js

@@ -1,7 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var React = require("react");
 var Utils = require("./utils");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
@@ -130,8 +129,10 @@ var Store = {
   make: make
 };
 
-function toJs(f, arg) {
-  Curry._3(f, arg.kind, arg.owner, arg.fieldPath);
+function toJs(f) {
+  return function (arg) {
+    f(arg.kind, arg.owner, arg.fieldPath);
+  };
 }
 
 function make$1(network, store, getDataID, treatMissingFieldsAsNull, missingFieldHandlers, requiredFieldLogger, isServer, param) {
@@ -180,7 +181,7 @@ var Context = {
 
 var EnvironmentNotFoundInContext = /* @__PURE__ */Caml_exceptions.create("RescriptRelay.EnvironmentNotFoundInContext");
 
-function useEnvironmentFromContext(param) {
+function useEnvironmentFromContext() {
   var context = React.useContext(ReactRelay.ReactRelayContext);
   if (context !== undefined) {
     return Caml_option.valFromOption(context).environment;
@@ -191,39 +192,11 @@ function useEnvironmentFromContext(param) {
       };
 }
 
-function mapFetchPolicy(x) {
-  if (x === undefined) {
-    return ;
-  }
-  switch (x) {
-    case "StoreOnly" :
-        return "store-only";
-    case "StoreOrNetwork" :
-        return "store-or-network";
-    case "StoreAndNetwork" :
-        return "store-and-network";
-    case "NetworkOnly" :
-        return "network-only";
-    
-  }
-}
-
-function mapFetchQueryFetchPolicy(x) {
-  if (x !== undefined) {
-    if (x === "NetworkOnly") {
-      return "network-only";
-    } else {
-      return "store-or-network";
-    }
-  }
-  
-}
-
 function MakeLoadQuery(C) {
   var load = function (environment, variables, fetchPolicy, fetchKey, networkCacheConfig, param) {
-    return ReactRelay.loadQuery(environment, C.query, Curry._1(C.convertVariables, variables), {
+    return ReactRelay.loadQuery(environment, C.query, C.convertVariables(variables), {
                 fetchKey: fetchKey,
-                fetchPolicy: mapFetchPolicy(fetchPolicy),
+                fetchPolicy: fetchPolicy,
                 networkCacheConfig: networkCacheConfig
               });
   };
@@ -235,7 +208,7 @@ function MakeLoadQuery(C) {
                   var o = queryRefToObservable(token);
                   if (o !== undefined) {
                     Caml_option.valFromOption(o).subscribe({
-                          complete: (function (param) {
+                          complete: (function () {
                               resolve({
                                     TAG: "Ok",
                                     _0: undefined
@@ -275,8 +248,6 @@ exports.Store = Store;
 exports.Disposable = Disposable;
 exports.RequiredFieldLogger = RequiredFieldLogger;
 exports.Environment = Environment;
-exports.mapFetchPolicy = mapFetchPolicy;
-exports.mapFetchQueryFetchPolicy = mapFetchQueryFetchPolicy;
 exports.Context = Context;
 exports.EnvironmentNotFoundInContext = EnvironmentNotFoundInContext;
 exports.useEnvironmentFromContext = useEnvironmentFromContext;

package/src/RescriptRelay.res

@@ -482,9 +482,9 @@ module Observable = {
   }
 
   type sink<'response> = {
-    next: (. 'response) => unit,
-    error: (. Js.Exn.t) => unit,
-    complete: (. unit) => unit,
+    next: 'response => unit,
+    error: Js.Exn.t => unit,
+    complete: unit => unit,
     closed: bool,
   }
 
@@ -492,11 +492,11 @@ module Observable = {
 
   @obj
   external makeObserver: (
-    ~start: @uncurry subscription => unit=?,
-    ~next: @uncurry 'response => unit=?,
-    ~error: @uncurry Js.Exn.t => unit=?,
-    ~complete: @uncurry unit => unit=?,
-    ~unsubscribe: @uncurry subscription => unit=?,
+    ~start: subscription => unit=?,
+    ~next: 'response => unit=?,
+    ~error: Js.Exn.t => unit=?,
+    ~complete: unit => unit=?,
+    ~unsubscribe: subscription => unit=?,
     unit,
   ) => observer<'response> = ""
 
@@ -681,39 +681,23 @@ let useEnvironmentFromContext = () => {
 }
 
 type fetchPolicy =
-  | StoreOnly
-  | StoreOrNetwork
-  | StoreAndNetwork
-  | NetworkOnly
-
-let mapFetchPolicy = x =>
-  switch x {
-  | Some(StoreOnly) => Some("store-only")
-  | Some(StoreOrNetwork) => Some("store-or-network")
-  | Some(StoreAndNetwork) => Some("store-and-network")
-  | Some(NetworkOnly) => Some("network-only")
-  | None => None
-  }
+  | @as("store-only") StoreOnly
+  | @as("store-or-network") StoreOrNetwork
+  | @as("store-and-network") StoreAndNetwork
+  | @as("network-only") NetworkOnly
 
 type fetchQueryFetchPolicy =
-  | NetworkOnly
-  | StoreOrNetwork
-
-let mapFetchQueryFetchPolicy = x =>
-  switch x {
-  | Some(StoreOrNetwork) => Some("store-or-network")
-  | Some(NetworkOnly) => Some("network-only")
-  | None => None
-  }
+  | @as("network-only") NetworkOnly
+  | @as("store-or-network") StoreOrNetwork
 
 type fetchQueryOptions = {
-  networkCacheConfig: option<cacheConfig>,
-  fetchPolicy: option<string>,
+  networkCacheConfig?: cacheConfig,
+  fetchPolicy?: fetchPolicy,
 }
 
 type loadQueryConfig = {
   fetchKey: option<string>,
-  fetchPolicy: option<string>,
+  fetchPolicy: option<fetchPolicy>,
   networkCacheConfig: option<cacheConfig>,
 }
 
@@ -752,7 +736,7 @@ module MakeLoadQuery = (C: MakeLoadQueryConfig) => {
       variables->C.convertVariables,
       {
         fetchKey,
-        fetchPolicy: fetchPolicy->mapFetchPolicy,
+        fetchPolicy,
         networkCacheConfig,
       },
     )
@@ -768,10 +752,10 @@ module MakeLoadQuery = (C: MakeLoadQueryConfig) => {
   let queryRefToPromise = token => {
     Js.Promise.make((~resolve, ~reject as _) => {
       switch token->queryRefToObservable {
-      | None => resolve(. Error())
+      | None => resolve(Error())
       | Some(o) =>
         open Observable
-        let _: subscription = o->subscribe(makeObserver(~complete=() => resolve(. Ok()), ()))
+        let _: subscription = o->subscribe(makeObserver(~complete=() => resolve(Ok()), ()))
       }
     })
   }

package/src/RescriptRelay.resi

@@ -132,7 +132,7 @@ module RecordProxy: {
   @send
   external copyFieldsFrom: (t, ~sourceRecord: t) => unit = "copyFieldsFrom"
 
-  /**Gets the \`dataId\` for a particular record.*/
+  /**Gets the `dataId` for a particular record.*/
   @send
   external getDataId: t => dataId = "getDataID"
 
@@ -577,9 +577,9 @@ module Observable: {
 
   /**This sink can be used to give the observable new data.*/
   type sink<'response> = {
-    next: (. 'response) => unit,
-    error: (. Js.Exn.t) => unit,
-    complete: (. unit) => unit,
+    next: 'response => unit,
+    error: Js.Exn.t => unit,
+    complete: unit => unit,
     closed: bool,
   }
 
@@ -595,10 +595,10 @@ module Observable: {
   /**Create an observer.*/
   @obj
   external makeObserver: (
-    ~start: @uncurry subscription => unit=?,
-    ~next: @uncurry 'response => unit=?,
-    ~error: @uncurry Js.Exn.t => unit=?,
-    ~complete: @uncurry unit => unit=?,
+    ~start: subscription => unit=?,
+    ~next: 'response => unit=?,
+    ~error: Js.Exn.t => unit=?,
+    ~complete: unit => unit=?,
     ~unsubscribe: subscription => unit=?,
     unit,
   ) => observer<'response> = ""
@@ -771,21 +771,27 @@ You should use the generated `Query.retain` function on your queries instead of
 
 /**fetchPolicy controls how you want Relay to resolve your data.*/
 type fetchPolicy =
-  | StoreOnly /* Resolve only from the store */
-  | StoreOrNetwork /* Resolve from the store if all data is there, otherwise make a network request */
-  | StoreAndNetwork /* Like StoreOrNetwork, but always make a request regardless of if the data was there initially or not */
-  | NetworkOnly /* Always make a request, regardless of what's in the store */
-
-/**Internal, do not use.*/
-let mapFetchPolicy: option<fetchPolicy> => option<string>
+  | /** will only reuse locally cached data, and will never send a network request to fetch the query. In this case, the responsibility of fetching the query falls to the caller, but this policy could also be used to read and operate on data that is entirely local. */
+  @as("store-only")
+  StoreOnly
+  | /** (default) will reuse locally cached data, and will only send a network request if any data for the query is missing or stale. If the query is fully cached, a network request will not be made.*/
+  @as("store-or-network")
+  StoreOrNetwork
+  | /** will reuse locally cached data and will always send a network request, regardless of whether any data was missing or stale in the store. */
+  @as("store-and-network")
+  StoreAndNetwork
+  | /** will not reuse locally cached data, and will always send a network request to fetch the query, ignoring any data that might be locally cached and whether it's missing or stale. */
+  @as("network-only")
+  NetworkOnly
 
 /**The fetch policies allowed for fetching a query outside of React's render (as in `Query.fetch`).*/
 type fetchQueryFetchPolicy =
-  | NetworkOnly
-  | StoreOrNetwork
-
-/**Internal, do not use.*/
-let mapFetchQueryFetchPolicy: option<fetchQueryFetchPolicy> => option<string>
+  | /** will not reuse locally cached data, and will always send a network request to fetch the query, ignoring any data that might be locally cached and whether it's missing or stale. */
+  @as("network-only")
+  NetworkOnly
+  | /** (default) will reuse locally cached data, and will only send a network request if any data for the query is missing or stale. If the query is fully cached, a network request will not be made.*/
+  @as("store-or-network")
+  StoreOrNetwork
 
 /**An error from a mutation.*/
 type mutationError = {message: string}
@@ -835,8 +841,8 @@ external useSubscribeToInvalidationState: (array<dataId>, unit => unit) => Dispo
 
 /**Options valid when fetching a query outside of React's render method (like when using `Query.fetch`).*/
 type fetchQueryOptions = {
-  networkCacheConfig: option<cacheConfig>,
-  fetchPolicy: option<string>,
+  networkCacheConfig?: cacheConfig,
+  fetchPolicy?: fetchPolicy,
 }
 
 module type MakeLoadQueryConfig = {

package/src/RescriptRelay_Fragment.bs.js

@@ -1,34 +1,33 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var React = require("react");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var ReactRelay = require("react-relay");
-var RescriptRelay = require("./RescriptRelay.bs.js");
 var RescriptRelay_Internal = require("./RescriptRelay_Internal.bs.js");
 
 function useFragment(node, convertFragment, fRef) {
-  return RescriptRelay_Internal.internal_useConvertedValue(convertFragment, ReactRelay.useFragment(node, fRef));
+  var __x = ReactRelay.useFragment(node, fRef);
+  return RescriptRelay_Internal.internal_useConvertedValue(convertFragment, __x);
 }
 
 function useFragmentOpt(fRef, node, convertFragment) {
   var data = ReactRelay.useFragment(node, fRef);
-  return React.useMemo((function (param) {
+  return React.useMemo((function () {
                 if (!(data == null)) {
-                  return Caml_option.some(Curry._1(convertFragment, data));
+                  return Caml_option.some(convertFragment(data));
                 }
                 
               }), [(data == null) ? undefined : Caml_option.some(data)]);
 }
 
 function readInlineData(node, convertFragment, fRef) {
-  return Curry._1(convertFragment, ReactRelay.readInlineData(node, fRef));
+  return convertFragment(ReactRelay.readInlineData(node, fRef));
 }
 
 function internal_makeRefetchableFnOpts(fetchPolicy, onComplete, param) {
   return {
-          fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy),
+          fetchPolicy: fetchPolicy,
           onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
         };
 }
@@ -38,16 +37,16 @@ function usePaginationFragment(node, fRef, convertFragment, convertRefetchVariab
   var data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, p.data);
   return {
           data: data,
-          loadNext: React.useMemo((function (param) {
+          loadNext: React.useMemo((function () {
                   return function (count, onComplete, param) {
-                    return Curry._2(p.loadNext, count, {
+                    return p.loadNext(count, {
                                 onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
                               });
                   };
                 }), [p.loadNext]),
-          loadPrevious: React.useMemo((function (param) {
+          loadPrevious: React.useMemo((function () {
                   return function (count, onComplete, param) {
-                    return Curry._2(p.loadPrevious, count, {
+                    return p.loadPrevious(count, {
                                 onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
                               });
                   };
@@ -56,9 +55,9 @@ function usePaginationFragment(node, fRef, convertFragment, convertRefetchVariab
           hasPrevious: p.hasPrevious,
           isLoadingNext: p.isLoadingNext,
           isLoadingPrevious: p.isLoadingPrevious,
-          refetch: React.useMemo((function (param) {
+          refetch: React.useMemo((function () {
                   return function (variables, fetchPolicy, onComplete, param) {
-                    return Curry._2(p.refetch, RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(Curry._1(convertRefetchVariables, variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
+                    return p.refetch(RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(convertRefetchVariables(variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
                   };
                 }), [p.refetch])
         };
@@ -69,25 +68,25 @@ function useBlockingPaginationFragment(node, fRef, convertFragment, convertRefet
   var data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, p.data);
   return {
           data: data,
-          loadNext: React.useMemo((function (param) {
+          loadNext: React.useMemo((function () {
                   return function (count, onComplete, param) {
-                    return Curry._2(p.loadNext, count, {
+                    return p.loadNext(count, {
                                 onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
                               });
                   };
                 }), [p.loadNext]),
-          loadPrevious: React.useMemo((function (param) {
+          loadPrevious: React.useMemo((function () {
                   return function (count, onComplete, param) {
-                    return Curry._2(p.loadPrevious, count, {
+                    return p.loadPrevious(count, {
                                 onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
                               });
                   };
                 }), [p.loadPrevious]),
           hasNext: p.hasNext,
           hasPrevious: p.hasPrevious,
-          refetch: React.useMemo((function (param) {
+          refetch: React.useMemo((function () {
                   return function (variables, fetchPolicy, onComplete, param) {
-                    return Curry._2(p.refetch, RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(Curry._1(convertRefetchVariables, variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
+                    return p.refetch(RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(convertRefetchVariables(variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
                   };
                 }), [p.refetch])
         };
@@ -99,9 +98,9 @@ function useRefetchableFragment(node, convertFragment, convertRefetchVariables,
   var data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, match[0]);
   return [
           data,
-          React.useMemo((function (param) {
+          React.useMemo((function () {
                   return function (variables, fetchPolicy, onComplete, param) {
-                    return Curry._2(refetchFn, RescriptRelay_Internal.internal_removeUndefinedAndConvertNullsRaw(Curry._1(convertRefetchVariables, variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
+                    return refetchFn(RescriptRelay_Internal.internal_removeUndefinedAndConvertNullsRaw(convertRefetchVariables(variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
                   };
                 }), [refetchFn])
         ];

package/src/RescriptRelay_Fragment.res

@@ -53,12 +53,12 @@ let readInlineData = (~node, ~convertFragment: 'fragment => 'fragment, ~fRef) =>
 }
 
 type refetchableFnOpts = {
-  fetchPolicy?: string,
+  fetchPolicy?: fetchPolicy,
   onComplete?: Js.Nullable.t<Js.Exn.t> => unit,
 }
 
 let internal_makeRefetchableFnOpts = (~fetchPolicy=?, ~onComplete=?, ()) => {
-  fetchPolicy: ?fetchPolicy->mapFetchPolicy,
+  ?fetchPolicy,
   onComplete: ?onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler,
 }
 

package/src/RescriptRelay_Internal.bs.js

@@ -1,7 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var React = require("react");
 var Js_dict = require("rescript/lib/js/js_dict.js");
 var Caml_obj = require("rescript/lib/js/caml_obj.js");
@@ -55,15 +54,15 @@ function internal_removeUndefinedAndConvertNullsRaw(record) {
 }
 
 function internal_useConvertedValue(convert, v) {
-  return React.useMemo((function (param) {
-                return Curry._1(convert, v);
+  return React.useMemo((function () {
+                return convert(v);
               }), [v]);
 }
 
 function internal_nullableToOptionalExnHandler(x) {
   if (x !== undefined) {
     return (function (maybeExn) {
-              return Curry._1(x, (maybeExn == null) ? undefined : Caml_option.some(maybeExn));
+              return x((maybeExn == null) ? undefined : Caml_option.some(maybeExn));
             });
   }
   

package/src/RescriptRelay_Mutation.bs.js

@@ -1,52 +1,55 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var React = require("react");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var ReactRelay = require("react-relay");
 var RelayRuntime = require("relay-runtime");
 
-function commitMutation(convertVariables, node, convertResponse, convertWrapRawResponse, environment, variables, optimisticUpdater, optimisticResponse, updater, onCompleted, onError, uploadables, param) {
-  return RelayRuntime.commitMutation(environment, {
-              mutation: node,
-              variables: Curry._1(convertVariables, variables),
-              onCompleted: onCompleted !== undefined ? (function (res, err) {
-                    Curry._2(onCompleted, Curry._1(convertResponse, res), (err == null) ? undefined : Caml_option.some(err));
-                  }) : undefined,
-              onError: onError,
-              optimisticResponse: optimisticResponse !== undefined ? Caml_option.some(Curry._1(convertWrapRawResponse, Caml_option.valFromOption(optimisticResponse))) : undefined,
-              optimisticUpdater: optimisticUpdater,
-              updater: updater !== undefined ? (function (store, response) {
-                    Curry._2(updater, store, Curry._1(convertResponse, response));
-                  }) : undefined,
-              uploadables: uploadables
-            });
+function commitMutation(convertVariables, node, convertResponse, convertWrapRawResponse) {
+  return function (environment, variables, optimisticUpdater, optimisticResponse, updater, onCompleted, onError, uploadables, param) {
+    return RelayRuntime.commitMutation(environment, {
+                mutation: node,
+                variables: convertVariables(variables),
+                onCompleted: onCompleted !== undefined ? (function (res, err) {
+                      onCompleted(convertResponse(res), (err == null) ? undefined : Caml_option.some(err));
+                    }) : undefined,
+                onError: onError,
+                optimisticResponse: optimisticResponse !== undefined ? Caml_option.some(convertWrapRawResponse(Caml_option.valFromOption(optimisticResponse))) : undefined,
+                optimisticUpdater: optimisticUpdater,
+                updater: updater !== undefined ? (function (store, response) {
+                      updater(store, convertResponse(response));
+                    }) : undefined,
+                uploadables: uploadables
+              });
+  };
 }
 
-function useMutation(convertVariables, node, convertResponse, convertWrapRawResponse, param) {
-  var match = ReactRelay.useMutation(node);
-  var mutate = match[0];
-  return [
-          React.useMemo((function (param) {
-                  return function (variables, optimisticUpdater, optimisticResponse, updater, onCompleted, onError, uploadables, param) {
-                    return Curry._1(mutate, {
-                                onError: onError,
-                                onCompleted: onCompleted !== undefined ? (function (res, err) {
-                                      Curry._2(onCompleted, Curry._1(convertResponse, res), (err == null) ? undefined : Caml_option.some(err));
-                                    }) : undefined,
-                                optimisticResponse: optimisticResponse !== undefined ? Caml_option.some(Curry._1(convertWrapRawResponse, Caml_option.valFromOption(optimisticResponse))) : undefined,
-                                optimisticUpdater: optimisticUpdater,
-                                updater: updater !== undefined ? (function (store, response) {
-                                      Curry._2(updater, store, Curry._1(convertResponse, response));
-                                    }) : undefined,
-                                variables: Curry._1(convertVariables, variables),
-                                uploadables: uploadables
-                              });
-                  };
-                }), [mutate]),
-          match[1]
-        ];
+function useMutation(convertVariables, node, convertResponse, convertWrapRawResponse) {
+  return function () {
+    var match = ReactRelay.useMutation(node);
+    var mutate = match[0];
+    return [
+            React.useMemo((function () {
+                    return function (variables, optimisticUpdater, optimisticResponse, updater, onCompleted, onError, uploadables, param) {
+                      return mutate({
+                                  onError: onError,
+                                  onCompleted: onCompleted !== undefined ? (function (res, err) {
+                                        onCompleted(convertResponse(res), (err == null) ? undefined : Caml_option.some(err));
+                                      }) : undefined,
+                                  optimisticResponse: optimisticResponse !== undefined ? Caml_option.some(convertWrapRawResponse(Caml_option.valFromOption(optimisticResponse))) : undefined,
+                                  optimisticUpdater: optimisticUpdater,
+                                  updater: updater !== undefined ? (function (store, response) {
+                                        updater(store, convertResponse(response));
+                                      }) : undefined,
+                                  variables: convertVariables(variables),
+                                  uploadables: uploadables
+                                });
+                    };
+                  }), [mutate]),
+            match[1]
+          ];
+  };
 }
 
 exports.commitMutation = commitMutation;

package/src/RescriptRelay_Query.bs.js

@@ -1,80 +1,94 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var React = require("react");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 var Js_promise2 = require("rescript/lib/js/js_promise2.js");
 var ReactRelay = require("react-relay");
-var RescriptRelay = require("./RescriptRelay.bs.js");
 var RelayRuntime = require("relay-runtime");
 var RescriptRelay_Internal = require("./RescriptRelay_Internal.bs.js");
 
-function useQuery(convertVariables, node, convertResponse, variables, fetchPolicy, fetchKey, networkCacheConfig, param) {
-  return RescriptRelay_Internal.internal_useConvertedValue(convertResponse, ReactRelay.useLazyLoadQuery(node, RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(Curry._1(convertVariables, variables)), {
-                  fetchKey: fetchKey,
-                  fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy),
-                  networkCacheConfig: networkCacheConfig
-                }));
+function useQuery(convertVariables, node, convertResponse) {
+  return function (variables, fetchPolicy, fetchKey, networkCacheConfig, param) {
+    var __x = ReactRelay.useLazyLoadQuery(node, RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(convertVariables(variables)), {
+          fetchKey: fetchKey,
+          fetchPolicy: fetchPolicy,
+          networkCacheConfig: networkCacheConfig
+        });
+    return RescriptRelay_Internal.internal_useConvertedValue(convertResponse, __x);
+  };
 }
 
-function useLoader(convertVariables, node, mkQueryRef, param) {
-  var match = ReactRelay.useQueryLoader(node);
-  var loadQueryFn = match[1];
-  var loadQuery = React.useMemo((function (param) {
-          return function (variables, fetchPolicy, networkCacheConfig, param) {
-            return Curry._2(loadQueryFn, Curry._1(convertVariables, variables), {
-                        fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy),
-                        networkCacheConfig: networkCacheConfig
-                      });
-          };
-        }), [loadQueryFn]);
-  return [
-          Curry._1(mkQueryRef, Caml_option.nullable_to_opt(match[0])),
-          loadQuery,
-          match[2]
-        ];
+function useLoader(convertVariables, node, mkQueryRef) {
+  return function () {
+    var match = ReactRelay.useQueryLoader(node);
+    var loadQueryFn = match[1];
+    var loadQuery = React.useMemo((function () {
+            return function (variables, fetchPolicy, networkCacheConfig, param) {
+              loadQueryFn(convertVariables(variables), {
+                    fetchPolicy: fetchPolicy,
+                    networkCacheConfig: networkCacheConfig
+                  });
+            };
+          }), [loadQueryFn]);
+    return [
+            mkQueryRef(Caml_option.nullable_to_opt(match[0])),
+            loadQuery,
+            match[2]
+          ];
+  };
 }
 
-function usePreloaded(node, convertResponse, mkQueryRef, queryRef) {
-  return RescriptRelay_Internal.internal_useConvertedValue(convertResponse, ReactRelay.usePreloadedQuery(node, Curry._1(mkQueryRef, queryRef)));
+function usePreloaded(node, convertResponse, mkQueryRef) {
+  return function (queryRef) {
+    var __x = ReactRelay.usePreloadedQuery(node, mkQueryRef(queryRef));
+    return RescriptRelay_Internal.internal_useConvertedValue(convertResponse, __x);
+  };
 }
 
-function $$fetch(node, convertResponse, convertVariables, environment, variables, onResult, networkCacheConfig, fetchPolicy, param) {
-  ReactRelay.fetchQuery(environment, node, Curry._1(convertVariables, variables), {
-          networkCacheConfig: networkCacheConfig,
-          fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy)
-        }).subscribe({
-        next: (function (res) {
-            Curry._1(onResult, {
-                  TAG: "Ok",
-                  _0: Curry._1(convertResponse, res)
-                });
-          }),
-        error: (function (err) {
-            Curry._1(onResult, {
-                  TAG: "Error",
-                  _0: err
-                });
-          })
-      });
+function $$fetch(node, convertResponse, convertVariables) {
+  return function (environment, variables, onResult, networkCacheConfig, fetchPolicy, param) {
+    ReactRelay.fetchQuery(environment, node, convertVariables(variables), {
+            networkCacheConfig: networkCacheConfig,
+            fetchPolicy: fetchPolicy
+          }).subscribe({
+          next: (function (res) {
+              onResult({
+                    TAG: "Ok",
+                    _0: convertResponse(res)
+                  });
+            }),
+          error: (function (err) {
+              onResult({
+                    TAG: "Error",
+                    _0: err
+                  });
+            })
+        });
+  };
 }
 
-function fetchPromised(node, convertResponse, convertVariables, environment, variables, networkCacheConfig, fetchPolicy, param) {
-  return Js_promise2.then(ReactRelay.fetchQuery(environment, node, Curry._1(convertVariables, variables), {
-                    networkCacheConfig: networkCacheConfig,
-                    fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy)
-                  }).toPromise(), (function (res) {
-                return Promise.resolve(Curry._1(convertResponse, res));
-              }));
+function fetchPromised(node, convertResponse, convertVariables) {
+  return function (environment, variables, networkCacheConfig, fetchPolicy, param) {
+    return Js_promise2.then(ReactRelay.fetchQuery(environment, node, convertVariables(variables), {
+                      networkCacheConfig: networkCacheConfig,
+                      fetchPolicy: fetchPolicy
+                    }).toPromise(), (function (res) {
+                  return Promise.resolve(convertResponse(res));
+                }));
+  };
 }
 
-function retain(node, convertVariables, environment, variables) {
-  return environment.retain(RelayRuntime.createOperationDescriptor(node, Curry._1(convertVariables, variables)));
+function retain(node, convertVariables) {
+  return function (environment, variables) {
+    return environment.retain(RelayRuntime.createOperationDescriptor(node, convertVariables(variables)));
+  };
 }
 
-function commitLocalPayload(node, convertVariables, convertWrapRawResponse, environment, variables, payload) {
-  environment.commitPayload(RelayRuntime.createOperationDescriptor(node, Curry._1(convertVariables, variables)), Curry._1(convertWrapRawResponse, payload));
+function commitLocalPayload(node, convertVariables, convertWrapRawResponse) {
+  return function (environment, variables, payload) {
+    environment.commitPayload(RelayRuntime.createOperationDescriptor(node, convertVariables(variables)), convertWrapRawResponse(payload));
+  };
 }
 
 exports.useQuery = useQuery;

package/src/RescriptRelay_Query.res

@@ -2,7 +2,7 @@ open RescriptRelay
 
 type useQueryConfig = {
   fetchKey?: string,
-  fetchPolicy?: string,
+  fetchPolicy?: fetchPolicy,
   networkCacheConfig?: cacheConfig,
 }
 
@@ -28,7 +28,7 @@ let useQuery = (
       RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(variables->convertVariables),
       {
         ?fetchKey,
-        fetchPolicy: ?fetchPolicy->mapFetchPolicy,
+        ?fetchPolicy,
         ?networkCacheConfig,
       },
     )->(RescriptRelay_Internal.internal_useConvertedValue(convertResponse, _))
@@ -36,7 +36,7 @@ let useQuery = (
 }
 
 type useQueryLoaderOptions = {
-  fetchPolicy?: string,
+  fetchPolicy?: fetchPolicy,
   networkCacheConfig?: cacheConfig,
 }
 
@@ -56,10 +56,7 @@ let useLoader = (
     let (nullableQueryRef, loadQueryFn, disposableFn) = useQueryLoader(node)
     let loadQuery = React.useMemo1(
       () => (~variables, ~fetchPolicy=?, ~networkCacheConfig=?, ()) =>
-        loadQueryFn(
-          variables->convertVariables,
-          {fetchPolicy: ?fetchPolicy->mapFetchPolicy, ?networkCacheConfig},
-        ),
+        loadQueryFn(variables->convertVariables, {?fetchPolicy, ?networkCacheConfig}),
       [loadQueryFn],
     )
     (nullableQueryRef->Js.Nullable.toOption->mkQueryRef, loadQuery, disposableFn)
@@ -117,7 +114,7 @@ let fetch = (
       environment,
       node,
       variables->convertVariables,
-      Some({networkCacheConfig, fetchPolicy: fetchPolicy->mapFetchPolicy}),
+      Some({?networkCacheConfig, ?fetchPolicy}),
     )
     ->subscribe(
       makeObserver(
@@ -147,7 +144,7 @@ let fetchPromised = (
       environment,
       node,
       variables->convertVariables,
-      Some({networkCacheConfig, fetchPolicy: fetchPolicy->mapFetchPolicy}),
+      Some({?networkCacheConfig, ?fetchPolicy}),
     )
     ->Observable.toPromise
     ->Js.Promise2.then(res => res->convertResponse->Js.Promise2.resolve)

package/src/RescriptRelay_RelayResolvers.bs.js

@@ -1,12 +1,11 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var ResolverFragments = require("relay-runtime/lib/store/ResolverFragments");
 
 function makeRelayResolver(node, convertFragment, resolver) {
   return function (fRef) {
-    return Curry._1(resolver, Curry._1(convertFragment, ResolverFragments.readFragment(node, fRef)));
+    return resolver(convertFragment(ResolverFragments.readFragment(node, fRef)));
   };
 }
 

package/src/RescriptRelay_Subscriptions.bs.js

@@ -1,22 +1,23 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var RelayRuntime = require("relay-runtime");
 
-function subscribe(node, convertVariables, convertResponse, environment, variables, onCompleted, onError, onNext, updater, param) {
-  return RelayRuntime.requestSubscription(environment, {
-              subscription: node,
-              variables: Curry._1(convertVariables, variables),
-              onCompleted: onCompleted,
-              onError: onError,
-              onNext: onNext !== undefined ? (function (response) {
-                    Curry._1(onNext, Curry._1(convertResponse, response));
-                  }) : undefined,
-              updater: updater !== undefined ? (function (store, response) {
-                    Curry._2(updater, store, Curry._1(convertResponse, response));
-                  }) : undefined
-            });
+function subscribe(node, convertVariables, convertResponse) {
+  return function (environment, variables, onCompleted, onError, onNext, updater, param) {
+    return RelayRuntime.requestSubscription(environment, {
+                subscription: node,
+                variables: convertVariables(variables),
+                onCompleted: onCompleted,
+                onError: onError,
+                onNext: onNext !== undefined ? (function (response) {
+                      onNext(convertResponse(response));
+                    }) : undefined,
+                updater: updater !== undefined ? (function (store, response) {
+                      updater(store, convertResponse(response));
+                    }) : undefined
+              });
+  };
 }
 
 exports.subscribe = subscribe;