rescript-relay 0.0.0-unwind-ppx-8e367f1d → 0.0.0-version-3-fe1b653c

package/CHANGELOG.md

@@ -1,8 +1,45 @@
 # master
 
+## Breaking changes
+
+- Remove "top level node field" transform. Previously, a single selection on the top level `node` field (like `node(id: $id) { ... on User { id, name }}`) would skip the union mechanism and automatically collapse the generated types to `option<user>`. This has now changed and the top level node field behaves just like any union. Commit showing how this is migrated to in the tests: https://github.com/zth/rescript-relay/commit/9ce73196794dbc6eba435414fcff708e7c53df78
+- Enums are now (unboxed) regular variants rather than polyvariants. This is a large change, but we're going to provide some tools for easing the transition. Commit showing how this is migrated to in the tests: https://github.com/zth/rescript-relay/commit/9da425a3e65ce3e9403168af421522028424a4f0
+
+# 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).
+
+## Breaking changes
+
+- A trailing unit `()` arg is no longer needed in `Query.usePreloaded()`. What was previously `Query.usePreloaded(~queryRef, ())` is now just `Query.usePreloaded(~queryRef)`.
+
 ## Improvements
 
 - Add `@live` annotations to generated JSXv4 dynamic import compat modules, so they don't show up in dead code analysis (which they shouldn't).
+- Preparations under the hood for ReScript v11 + uncurried mode.
 
 # 1.1.1
 

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": "0.0.0-unwind-ppx-8e367f1d",
+  "version": "0.0.0-version-3-fe1b653c",
   "main": "src/RescriptRelay.res",
   "license": "MIT",
   "author": "Gabriel Nordeborn",
@@ -39,11 +39,10 @@
     "test:ci": "jest --ci --runInBand"
   },
   "devDependencies": {
-    "rescript": "^11.0.0-beta.1",
+    "@glennsl/rescript-fetch": "^0.2.0",
     "@rescript/react": "0.12.0-alpha.2",
     "@testing-library/jest-dom": "^5.16.3",
     "@testing-library/react": "^13.0.0-alpha.6",
-    "bs-fetch": "^0.5.0",
     "graphql-query-test-mock": "^0.12.1",
     "jest": "^27.2.4",
     "nock": "^11.7.0",
@@ -51,13 +50,14 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-relay": "15.0.0",
-    "relay-runtime": "15.0.0"
+    "relay-runtime": "15.0.0",
+    "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/postinstall.js

@@ -152,6 +152,10 @@ function removeInitialBinaries() {
     recursive: true,
     force: true,
   });
+  fs.rmSync(path.join(__dirname, "relay-compiler-win-x64"), {
+    recursive: true,
+    force: true,
+  });
 }
 
 switch (platform) {

package/src/ReactExperimental.res

@@ -4,12 +4,12 @@ external useDeferredValue: 'value => 'value = "useDeferredValue"
 @module("react")
 external useTransitionWithOptions: unit => (
   bool,
-  (. unit => unit, option<{"name": option<string>}>) => unit,
+  (unit => unit, option<{"name": option<string>}>) => unit,
 ) = "useTransition"
 
 let useTransition = () => {
   let (isPending, startTransition) = useTransitionWithOptions()
-  (isPending, React.useMemo1(() => cb => startTransition(. cb, None), [startTransition]))
+  (isPending, React.useMemo1(() => cb => startTransition(cb, None), [startTransition]))
 }
 
 module SuspenseList = {

package/src/ReactExperimental.resi

@@ -4,7 +4,7 @@ external useDeferredValue: 'value => 'value = "useDeferredValue"
 @module("react")
 external useTransitionWithOptions: unit => (
   bool,
-  (. unit => unit, option<{"name": option<string>}>) => unit,
+  (unit => unit, option<{"name": option<string>}>) => unit,
 ) = "useTransition"
 
 let useTransition: unit => (bool, (unit => unit) => unit)

package/src/RescriptRelay.bs.js

@@ -192,39 +192,11 @@ function useEnvironmentFromContext() {
       };
 }
 
-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, C.convertVariables(variables), {
                 fetchKey: fetchKey,
-                fetchPolicy: mapFetchPolicy(fetchPolicy),
+                fetchPolicy: fetchPolicy,
                 networkCacheConfig: networkCacheConfig
               });
   };
@@ -276,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

@@ -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"
 
@@ -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

@@ -4,7 +4,6 @@
 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) {
@@ -28,7 +27,7 @@ function readInlineData(node, convertFragment, fRef) {
 
 function internal_makeRefetchableFnOpts(fetchPolicy, onComplete, param) {
   return {
-          fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy),
+          fetchPolicy: fetchPolicy,
           onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
         };
 }

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_Mutation.bs.js

@@ -12,7 +12,7 @@ function commitMutation(convertVariables, node, convertResponse, convertWrapRawR
                 mutation: node,
                 variables: convertVariables(variables),
                 onCompleted: onCompleted !== undefined ? (function (res, err) {
-                      onCompleted(convertResponse(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,
@@ -35,7 +35,7 @@ function useMutation(convertVariables, node, convertResponse, convertWrapRawResp
                       return mutate({
                                   onError: onError,
                                   onCompleted: onCompleted !== undefined ? (function (res, err) {
-                                        onCompleted(convertResponse(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,

package/src/RescriptRelay_Mutation.res

@@ -17,7 +17,7 @@ type commitMutationConfigRaw<'m, 'variables, 'response, 'rawResponse> = {
   mutation: mutationNode<'m>,
   variables: 'variables,
   onCompleted?: ('response, Js.Nullable.t<array<mutationError>>) => unit,
-  onError?: Js.Nullable.t<mutationError> => unit,
+  onError?: mutationError => unit,
   optimisticResponse?: 'rawResponse,
   optimisticUpdater?: optimisticUpdaterFn,
   updater?: updaterFn<'response>,
@@ -25,7 +25,7 @@ type commitMutationConfigRaw<'m, 'variables, 'response, 'rawResponse> = {
 }
 
 type useMutationConfigRaw<'m, 'variables, 'response, 'rawResponse> = {
-  onError?: Js.Nullable.t<mutationError> => unit,
+  onError?: mutationError => unit,
   onCompleted?: ('response, Js.Nullable.t<array<mutationError>>) => unit,
   onUnsubscribe?: unit => unit,
   optimisticResponse?: 'rawResponse,
@@ -77,7 +77,7 @@ let commitMutation = (
       {
         mutation: node,
         onCompleted: ?switch onCompleted {
-        | Some(cb) => Some((res, err) => cb(res->convertResponse, err))
+        | Some(cb) => Some((res, err) => cb(res->convertResponse, err->Js.Nullable.toOption))
         | None => None
         },
         ?onError,
@@ -124,7 +124,7 @@ let useMutation = (
         ) => {
           mutate({
             onCompleted: ?switch onCompleted {
-            | Some(cb) => Some((res, err) => cb(res->convertResponse, err))
+            | Some(cb) => Some((res, err) => cb(res->convertResponse, err->Js.Nullable.toOption))
             | None => None
             },
             ?onError,

package/src/RescriptRelay_Mutation.resi

@@ -28,8 +28,8 @@ let commitMutation: (
   ~optimisticUpdater: optimisticUpdaterFn=?,
   ~optimisticResponse: 'rawResponse=?,
   ~updater: (RecordSourceSelectorProxy.t, 'response) => unit=?,
-  ~onCompleted: ('response, Js.Nullable.t<array<mutationError>>) => unit=?,
-  ~onError: Js.Nullable.t<mutationError> => unit=?,
+  ~onCompleted: ('response, option<array<mutationError>>) => unit=?,
+  ~onError: mutationError => unit=?,
   ~uploadables: uploadables=?,
   unit,
 ) => Disposable.t
@@ -45,8 +45,8 @@ let useMutation: (
     ~optimisticUpdater: optimisticUpdaterFn=?,
     ~optimisticResponse: 'rawResponse=?,
     ~updater: (RecordSourceSelectorProxy.t, 'response) => unit=?,
-    ~onCompleted: ('response, Js.Nullable.t<array<mutationError>>) => unit=?,
-    ~onError: Js.Nullable.t<mutationError> => unit=?,
+    ~onCompleted: ('response, option<array<mutationError>>) => unit=?,
+    ~onError: mutationError => unit=?,
     ~uploadables: uploadables=?,
     unit,
   ) => Disposable.t,

package/src/RescriptRelay_Query.bs.js

@@ -5,7 +5,6 @@ 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");
 
@@ -13,7 +12,7 @@ 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: RescriptRelay.mapFetchPolicy(fetchPolicy),
+          fetchPolicy: fetchPolicy,
           networkCacheConfig: networkCacheConfig
         });
     return RescriptRelay_Internal.internal_useConvertedValue(convertResponse, __x);
@@ -27,7 +26,7 @@ function useLoader(convertVariables, node, mkQueryRef) {
     var loadQuery = React.useMemo((function () {
             return function (variables, fetchPolicy, networkCacheConfig, param) {
               loadQueryFn(convertVariables(variables), {
-                    fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy),
+                    fetchPolicy: fetchPolicy,
                     networkCacheConfig: networkCacheConfig
                   });
             };
@@ -51,7 +50,7 @@ function $$fetch(node, convertResponse, convertVariables) {
   return function (environment, variables, onResult, networkCacheConfig, fetchPolicy, param) {
     ReactRelay.fetchQuery(environment, node, convertVariables(variables), {
             networkCacheConfig: networkCacheConfig,
-            fetchPolicy: RescriptRelay.mapFetchPolicy(fetchPolicy)
+            fetchPolicy: fetchPolicy
           }).subscribe({
           next: (function (res) {
               onResult({
@@ -73,7 +72,7 @@ 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: RescriptRelay.mapFetchPolicy(fetchPolicy)
+                      fetchPolicy: fetchPolicy
                     }).toPromise(), (function (res) {
                   return Promise.resolve(convertResponse(res));
                 }));

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/utils.js

@@ -118,8 +118,6 @@ function traverse(
     var shouldConvertUnion =
       typeof instructions["u"] === "string" && !!converters[instructions["u"]];
 
-    var isTopLevelNodeField = typeof instructions["tnf"] === "string";
-
     /**
      * Handle arrays
      */
@@ -219,21 +217,6 @@ function traverse(
         continue;
       }
 
-      if (isTopLevelNodeField) {
-        // If this is a top level node field we should try and convert, ensure
-        // it conforms to the desired shape (has the correct typename). If not,
-        // null it and return right away.
-        if (
-          v == null ||
-          !v.hasOwnProperty("__typename") ||
-          v.__typename !== instructions["tnf"]
-        ) {
-          newObj = getNewObj(newObj, currentObj);
-          newObj[key] = nullableValue;
-          return newObj;
-        }
-      }
-
       if (shouldConvertEnum) {
         newObj = getNewObj(newObj, currentObj);
         newObj[key] = converters[instructions["e"]](v);

package/src/utils.mjs

@@ -118,8 +118,6 @@ function traverse(
     var shouldConvertUnion =
       typeof instructions["u"] === "string" && !!converters[instructions["u"]];
 
-    var isTopLevelNodeField = typeof instructions["tnf"] === "string";
-
     /**
      * Handle arrays
      */
@@ -219,21 +217,6 @@ function traverse(
         continue;
       }
 
-      if (isTopLevelNodeField) {
-        // If this is a top level node field we should try and convert, ensure
-        // it conforms to the desired shape (has the correct typename). If not,
-        // null it and return right away.
-        if (
-          v == null ||
-          !v.hasOwnProperty("__typename") ||
-          v.__typename !== instructions["tnf"]
-        ) {
-          newObj = getNewObj(newObj, currentObj);
-          newObj[key] = nullableValue;
-          return newObj;
-        }
-      }
-
       if (shouldConvertEnum) {
         newObj = getNewObj(newObj, currentObj);
         newObj[key] = converters[instructions["e"]](v);