rescript-relay 0.0.0-cli-61b2cdf6 → 0.0.0-next-af0f6500

package/src/RescriptRelay.res

@@ -11,7 +11,7 @@ type subscriptionNode<'node>
 type fragmentRefs<'fragments>
 
 type dataId
-type recordSourceRecords
+type recordSourceRecords = Js.Json.t
 type uploadables
 
 external dataIdToString: dataId => string = "%identity"
@@ -31,14 +31,40 @@ external generateUniqueClientID: unit => dataId = "generateUniqueClientID"
 external isClientID: dataId => bool = "isClientID"
 
 type featureFlags = {
+  @as("DELAY_CLEANUP_OF_PENDING_PRELOAD_QUERIES")
+  mutable delayCleanupOfPendingPreloadQueries: bool,
+  @as("ENABLE_CLIENT_EDGES")
+  mutable enableClientEdges: bool,
   @as("ENABLE_VARIABLE_CONNECTION_KEY")
   mutable enableVariableConnectionKey: bool,
   @as("ENABLE_PARTIAL_RENDERING_DEFAULT")
   mutable enablePartialRenderingDefault: bool,
-  @as("ENABLE_RELAY_CONTAINERS_SUSPENSE")
-  mutable enableRelayContainersSuspense: bool,
-  @as("ENABLE_PRECISE_TYPE_REFINEMENT")
-  mutable enablePrecisTypeRefinement: bool,
+  @as("ENABLE_REACT_FLIGHT_COMPONENT_FIELD")
+  mutable enableReactFlightComponentField: bool,
+  @as("ENABLE_RELAY_RESOLVERS")
+  mutable enableRelayResolvers: bool,
+  @as("ENABLE_GETFRAGMENTIDENTIFIER_OPTIMIZATION")
+  mutable enableGetFragmentIdentifierOptimization: bool,
+  @as("ENABLE_FRIENDLY_QUERY_NAME_GQL_URL")
+  mutable enableFriendlyQueryNameGqlUrl: bool,
+  @as("ENABLE_LOAD_QUERY_REQUEST_DEDUPING")
+  mutable enableLoadQueryRequestDeduping: bool,
+  @as("ENABLE_DO_NOT_WRAP_LIVE_QUERY")
+  mutable enableDoNotWrapLiveQuery: bool,
+  @as("ENABLE_NOTIFY_SUBSCRIPTION")
+  mutable enableNotifySubscription: bool,
+  @as("ENABLE_CONTAINERS_SUBSCRIBE_ON_COMMIT")
+  mutable enableContainersSubscribeOnCommit: bool,
+  @as("ENABLE_QUERY_RENDERER_OFFSCREEN_SUPPORT")
+  mutable enableQueryRendererOffscreenSupport: bool,
+  @as("MAX_DATA_ID_LENGTH")
+  mutable maxDataIdLength: option<int>,
+  @as("REFACTOR_SUSPENSE_RESOURCE")
+  mutable refactorSuspenseResource: bool,
+  @as("STRING_INTERN_LEVEL")
+  mutable stringInternLevel: int,
+  @as("USE_REACT_CACHE")
+  mutable useReactCache: bool,
 }
 
 @module("relay-runtime")
@@ -140,6 +166,10 @@ module RecordProxy = {
   external setLinkedRecord: (t, ~record: t, ~name: string, ~arguments: arguments=?, unit) => t =
     "setLinkedRecord"
 
+  // `setLinkedRecord` can't be used for "deleting" linked record fields.
+  // It throws an error if anything besides `record` is received:
+  // https://github.com/facebook/relay/blob/bd2e4173ef726804b2ed4e76d88a7bcc1753c496/packages/relay-runtime/mutations/RelayRecordProxy.js#L92
+  // However, `setValue` can be used for this purpose instead.
   @send
   external setLinkedRecordToUndefined: (
     t,
@@ -147,7 +177,7 @@ module RecordProxy = {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecord"
+  ) => t = "setValue"
 
   @send
   external setLinkedRecordToNull: (
@@ -156,7 +186,7 @@ module RecordProxy = {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecord"
+  ) => t = "setValue"
 
   @send
   external setLinkedRecords: (
@@ -167,6 +197,10 @@ module RecordProxy = {
     unit,
   ) => t = "setLinkedRecords"
 
+  // `setLinkedRecords` can't be used for "deleting" linked records.
+  // It throws an error if anything besides an array of `records` is received:
+  // https://github.com/facebook/relay/blob/bd2e4173ef726804b2ed4e76d88a7bcc1753c496/packages/relay-runtime/mutations/RelayRecordProxy.js#L140
+  // However, `setValue` can be used for this purpose instead.
   @send
   external setLinkedRecordsToUndefined: (
     t,
@@ -174,7 +208,7 @@ module RecordProxy = {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecords"
+  ) => t = "setValue"
 
   @send
   external setLinkedRecordsToNull: (
@@ -183,7 +217,7 @@ module RecordProxy = {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecords"
+  ) => t = "setValue"
 
   @send
   external setValueToUndefined: (
@@ -371,12 +405,16 @@ module MissingFieldHandler = {
 }
 
 // This handler below enables automatic resolution of all cached items through the Node interface
-let nodeInterfaceMissingFieldHandler = MissingFieldHandler.makeLinkedMissingFieldHandler(
-  (field, record, args, _store) =>
-    switch (Js.Nullable.toOption(record), field["name"], Js.Nullable.toOption(args["id"])) {
-    | (Some(record), "node", argsId) when record["__typename"] == storeRootType => argsId
-    | _ => None
-    },
+let nodeInterfaceMissingFieldHandler = MissingFieldHandler.makeLinkedMissingFieldHandler((
+  field,
+  record,
+  args,
+  _store,
+) =>
+  switch (Js.Nullable.toOption(record), field["name"], Js.Nullable.toOption(args["id"])) {
+  | (Some(record), "node", argsId) if record["__typename"] == storeRootType => argsId
+  | _ => None
+  }
 )
 
 module ConnectionHandler = {
@@ -443,9 +481,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,
   }
 
@@ -453,11 +491,11 @@ module Observable = {
 
   @obj
   external makeObserver: (
-    ~start: subscription => unit=?,
-    ~next: 'response => unit=?,
-    ~error: Js.Exn.t => unit=?,
-    ~complete: unit => unit=?,
-    ~unsubscribe: subscription => unit=?,
+    ~start: @uncurry subscription => unit=?,
+    ~next: @uncurry 'response => unit=?,
+    ~error: @uncurry Js.Exn.t => unit=?,
+    ~complete: @uncurry unit => unit=?,
+    ~unsubscribe: @uncurry subscription => unit=?,
     unit,
   ) => observer<'response> = ""
 
@@ -467,7 +505,7 @@ module Observable = {
   @send
   external subscribe: (t<'response>, observer<'response>) => subscription = "subscribe"
 
-  @send external toPromise: t<'t> => Promise.t<'t> = "toPromise"
+  @send external toPromise: t<'t> => Js.Promise.t<'t> = "toPromise"
 }
 
 module Network = {
@@ -542,6 +580,20 @@ module Store = {
 
   @send external getSource: t => RecordSource.t = "getSource"
   @send external publish: (t, RecordSource.t) => unit = "publish"
+  @send external holdGC: t => unit = "holdGC"
+}
+
+module RequiredFieldLogger = {
+  type kind = [#"missing_field.log" | #"missing_field.throw"]
+
+  type arg = {"kind": kind, "owner": string, "fieldPath": string}
+
+  type js = arg => unit
+
+  type t = (~kind: kind, ~owner: string, ~fieldPath: string) => unit
+
+  let toJs: t => js = (f, arg) =>
+    f(~kind=arg["kind"], ~owner=arg["owner"], ~fieldPath=arg["fieldPath"])
 }
 
 module Environment = {
@@ -556,6 +608,10 @@ module Environment = {
     @optional
     treatMissingFieldsAsNull: bool,
     missingFieldHandlers: array<MissingFieldHandler.t>,
+    @optional
+    requiredFieldLogger: RequiredFieldLogger.js,
+    @optional
+    isServer: bool,
   }
 
   @module("relay-runtime") @new
@@ -567,6 +623,8 @@ module Environment = {
     ~getDataID=?,
     ~treatMissingFieldsAsNull=?,
     ~missingFieldHandlers=?,
+    ~requiredFieldLogger=?,
+    ~isServer=?,
     (),
   ) =>
     make(
@@ -579,6 +637,8 @@ module Environment = {
         | Some(handlers) => handlers->Belt.Array.concat([nodeInterfaceMissingFieldHandler])
         | None => [nodeInterfaceMissingFieldHandler]
         },
+        ~requiredFieldLogger=?requiredFieldLogger->Belt.Option.map(RequiredFieldLogger.toJs),
+        ~isServer?,
         (),
       ),
     )
@@ -596,15 +656,16 @@ module Context = {
 
   @module("react-relay")
   external context: React.Context.t<option<contextShape>> = "ReactRelayContext"
-  let provider = React.Context.provider(context)
 
   module Provider = {
     @react.component
-    let make = (~environment: Environment.t, ~children) =>
+    let make = (~environment: Environment.t, ~children) => {
+      let provider = React.Context.provider(context)
       React.createElement(
         provider,
         {"value": Some({"environment": environment}), "children": children},
       )
+    }
   }
 }
 
@@ -656,7 +717,7 @@ type loadQueryConfig = {
   networkCacheConfig: option<cacheConfig>,
 }
 
-@module("react-relay/hooks")
+@module("react-relay")
 external loadQuery: (Environment.t, queryNode<'a>, 'variables, loadQueryConfig) => 'queryResponse =
   "loadQuery"
 
@@ -705,18 +766,16 @@ module MakeLoadQuery = (C: MakeLoadQueryConfig) => {
   }
 
   let queryRefToPromise = token => {
-    let (promise, resolve) = Promise.pending()
-
-    switch token->queryRefToObservable {
-    | None => resolve(Error())
-    | Some(o) =>
-      let _: Observable.subscription = o->{
-        open Observable
-        subscribe(makeObserver(~complete=() => resolve(Ok()), ()))
+    Js.Promise.make((~resolve, ~reject as _) => {
+      switch token->queryRefToObservable {
+      | None => resolve(. Error())
+      | Some(o) =>
+        let _: Observable.subscription = o->{
+          open Observable
+          subscribe(makeObserver(~complete=() => resolve(. Ok()), ()))
+        }
       }
-    }
-
-    promise
+    })
   }
 }
 
@@ -730,6 +789,6 @@ external commitLocalUpdate: (
   ~updater: RecordSourceSelectorProxy.t => unit,
 ) => unit = "commitLocalUpdate"
 
-@module("react-relay/hooks")
+@module("react-relay")
 external useSubscribeToInvalidationState: (array<dataId>, unit => unit) => Disposable.t =
   "useSubscribeToInvalidationState"

package/src/RescriptRelay.resi

@@ -3,14 +3,12 @@
 )
 type arguments
 
-@ocaml.doc(
-  "Abstract type for uploadables.
+@ocaml.doc("Abstract type for uploadables.
 
 ### Constructing an `uploadables`
 Use `makeUploadable`: `makeUploadable({ \"someFile\": theFileYouWantToUpload })` to construct an `uploadables`, and then pass it to your mutation via the `uploadables` prop.
 
-Please note that you'll need to handle _sending_ the uploadables to your server yourself in the network layer. [Here's an example](https://github.com/facebook/relay/issues/1844#issuecomment-316893590) in regular JS that you can adapt to ReScript as you need/want."
-)
+Please note that you'll need to handle _sending_ the uploadables to your server yourself in the network layer. [Here's an example](https://github.com/facebook/relay/issues/1844#issuecomment-316893590) in regular JS that you can adapt to ReScript as you need/want.")
 type uploadables
 
 @ocaml.doc(
@@ -55,12 +53,10 @@ external dataIdToString: dataId => string = "%identity"
 @ocaml.doc("Turns a `string` into a `dataId`.")
 external makeDataId: string => dataId = "%identity"
 
-@ocaml.doc(
-  "Construct an `arguments` object for use with certain Relay store APIs.
+@ocaml.doc("Construct an `arguments` object for use with certain Relay store APIs.
 
 ### Usage
-Use it like this: `makeArguments({ \"someArgument\": someValue, \"anotherArgument\": anotherValue })`. Notice the \"\" surrounding the property names - these are important and tells ReScript that we want this to be a JS object."
-)
+Use it like this: `makeArguments({ \"someArgument\": someValue, \"anotherArgument\": anotherValue })`. Notice the \"\" surrounding the property names - these are important and tells ReScript that we want this to be a JS object.")
 external makeArguments: {..} => arguments = "%identity"
 
 @ocaml.doc(
@@ -94,14 +90,40 @@ external isClientID: dataId => bool = "isClientID"
   "Relay feature flags. Mutate this record as soon as your application boots to enable/disable features."
 )
 type featureFlags = {
+  @as("DELAY_CLEANUP_OF_PENDING_PRELOAD_QUERIES")
+  mutable delayCleanupOfPendingPreloadQueries: bool,
+  @as("ENABLE_CLIENT_EDGES")
+  mutable enableClientEdges: bool,
   @as("ENABLE_VARIABLE_CONNECTION_KEY")
   mutable enableVariableConnectionKey: bool,
   @as("ENABLE_PARTIAL_RENDERING_DEFAULT")
   mutable enablePartialRenderingDefault: bool,
-  @as("ENABLE_RELAY_CONTAINERS_SUSPENSE")
-  mutable enableRelayContainersSuspense: bool,
-  @as("ENABLE_PRECISE_TYPE_REFINEMENT")
-  mutable enablePrecisTypeRefinement: bool,
+  @as("ENABLE_REACT_FLIGHT_COMPONENT_FIELD")
+  mutable enableReactFlightComponentField: bool,
+  @as("ENABLE_RELAY_RESOLVERS")
+  mutable enableRelayResolvers: bool,
+  @as("ENABLE_GETFRAGMENTIDENTIFIER_OPTIMIZATION")
+  mutable enableGetFragmentIdentifierOptimization: bool,
+  @as("ENABLE_FRIENDLY_QUERY_NAME_GQL_URL")
+  mutable enableFriendlyQueryNameGqlUrl: bool,
+  @as("ENABLE_LOAD_QUERY_REQUEST_DEDUPING")
+  mutable enableLoadQueryRequestDeduping: bool,
+  @as("ENABLE_DO_NOT_WRAP_LIVE_QUERY")
+  mutable enableDoNotWrapLiveQuery: bool,
+  @as("ENABLE_NOTIFY_SUBSCRIPTION")
+  mutable enableNotifySubscription: bool,
+  @as("ENABLE_CONTAINERS_SUBSCRIBE_ON_COMMIT")
+  mutable enableContainersSubscribeOnCommit: bool,
+  @as("ENABLE_QUERY_RENDERER_OFFSCREEN_SUPPORT")
+  mutable enableQueryRendererOffscreenSupport: bool,
+  @as("MAX_DATA_ID_LENGTH")
+  mutable maxDataIdLength: option<int>,
+  @as("REFACTOR_SUSPENSE_RESOURCE")
+  mutable refactorSuspenseResource: bool,
+  @as("STRING_INTERN_LEVEL")
+  mutable stringInternLevel: int,
+  @as("USE_REACT_CACHE")
+  mutable useReactCache: bool,
 }
 
 @ocaml.doc(
@@ -110,12 +132,10 @@ type featureFlags = {
 @module("relay-runtime")
 external relayFeatureFlags: featureFlags = "RelayFeatureFlags"
 
-@ocaml.doc(
-  "An abstract type representing all records in the store serialized to JSON in a way that you can use to re-hydrate the store. 
+@ocaml.doc("Representing all records in the store serialized to JSON in a way that you can use to re-hydrate the store. 
 
-See `RecordSource.toJSON` for how to produce it."
-)
-type recordSourceRecords
+See `RecordSource.toJSON` for how to produce it.")
+type recordSourceRecords = Js.Json.t
 
 @ocaml.doc(
   "The `dataId` for the Relay store's root. Useful when for example referencing the `parentID` of a connection that's on the store root."
@@ -325,7 +345,7 @@ module RecordProxy: {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecord"
+  ) => t = "setValue"
 
   @ocaml.doc("Sets this linked record to `null`.") @send
   external setLinkedRecordToNull: (
@@ -334,7 +354,7 @@ module RecordProxy: {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecord"
+  ) => t = "setValue"
 
   @ocaml.doc(
     "Sets the field holding these linked records to `undefined` (meaning Relay will treat it as missing data)."
@@ -346,7 +366,7 @@ module RecordProxy: {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecords"
+  ) => t = "setValue"
 
   @ocaml.doc("Sets the field holding these linked records to `null`.") @send
   external setLinkedRecordsToNull: (
@@ -355,15 +375,13 @@ module RecordProxy: {
     ~name: string,
     ~arguments: arguments=?,
     unit,
-  ) => t = "setLinkedRecords"
+  ) => t = "setValue"
 
-  @ocaml.doc(
-    "Invalidates this record.
+  @ocaml.doc("Invalidates this record.
 
 Invalidating a record means that the _next_ time Relay evaluates this record, it'll be treated as missing.
 
-_Beware_ that this doesn't mean that queries using this record will refetch immediately. Rather, it'll happen the next time the query _renders_. Have a look at `useSubscribeToInvalidationState`, that'll allow you to subscribe to whenever records are invalidated, if you're looking for a way to refetch immediately as something invalidates."
-  )
+_Beware_ that this doesn't mean that queries using this record will refetch immediately. Rather, it'll happen the next time the query _renders_. Have a look at `useSubscribeToInvalidationState`, that'll allow you to subscribe to whenever records are invalidated, if you're looking for a way to refetch immediately as something invalidates.")
   @send
   external invalidateRecord: t => unit = "invalidateRecord"
 }
@@ -426,11 +444,9 @@ module ReadOnlyRecordSourceProxy: {
   external getRoot: t => RecordProxy.t = "getRoot"
 }
 
-@ocaml.doc(
-  "A missing field handler, which is a way of teaching Relay more about the relations in your schema, so it can fulfill more things from the cache. Read more [in this section of the Relay docs](https://relay.dev/docs/guided-tour/reusing-cached-data/filling-in-missing-data/).
+@ocaml.doc("A missing field handler, which is a way of teaching Relay more about the relations in your schema, so it can fulfill more things from the cache. Read more [in this section of the Relay docs](https://relay.dev/docs/guided-tour/reusing-cached-data/filling-in-missing-data/).
 
-Feed a list of missing field handlers into `Environment.make` if you want to use them."
-)
+Feed a list of missing field handlers into `Environment.make` if you want to use them.")
 module MissingFieldHandler: {
   @@ocaml.warning("-30")
 
@@ -607,9 +623,9 @@ module Observable: {
 
   @ocaml.doc("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,
   }
 
@@ -624,10 +640,10 @@ module Observable: {
 
   @ocaml.doc("Create an observer.") @obj
   external makeObserver: (
-    ~start: subscription => unit=?,
-    ~next: 'response => unit=?,
-    ~error: Js.Exn.t => unit=?,
-    ~complete: unit => unit=?,
+    ~start: @uncurry subscription => unit=?,
+    ~next: @uncurry 'response => unit=?,
+    ~error: @uncurry Js.Exn.t => unit=?,
+    ~complete: @uncurry unit => unit=?,
     ~unsubscribe: subscription => unit=?,
     unit,
   ) => observer<'response> = ""
@@ -646,7 +662,7 @@ module Observable: {
     "Turns an `Observable` into a promise. _Beware_ that reading the response in the resulting promise is currently _not safe_ due to some internals of how ReScript Relay works. This will be resolved in the future."
   )
   @send
-  external toPromise: t<'t> => Promise.t<'t> = "toPromise"
+  external toPromise: t<'t> => Js.Promise.t<'t> = "toPromise"
 }
 
 @ocaml.doc("Represents the network layer.")
@@ -737,7 +753,7 @@ module Store: {
     ~source: RecordSource.t,
     ~gcReleaseBufferSize: /* `gcReleaseBufferSize` controls how many queries are allowed to be cached by default. Increase this to increase the size of the cache. */
     int=?,
-    ~queryCacheExpirationTime: int /* `queryCacheExpirationTime` sets a TTL (time to live) for all queries. If that time passes, the data is considered stale and is evicted from the store. Default is no TTL. */=?,
+    ~queryCacheExpirationTime: int=? /* `queryCacheExpirationTime` sets a TTL (time to live) for all queries. If that time passes, the data is considered stale and is evicted from the store. Default is no TTL. */,
     unit,
   ) => t
 
@@ -749,6 +765,12 @@ module Store: {
   )
   @send
   external publish: (t, RecordSource.t) => unit = "publish"
+
+  @ocaml.doc(
+    "Informes the store to stop its normal garbage collection processes. This prevents data being lost between calling relay's `fetchQuery` any serialization process (eg: toJSON)"
+  )
+  @send
+  external holdGC: t => unit = "holdGC"
 }
 
 @ocaml.doc("Internal, do not use.")
@@ -764,6 +786,18 @@ module Disposable: {
   @ocaml.doc("Dispose the `Disposable`.") @send external dispose: t => unit = "dispose"
 }
 
+@ocaml.doc(
+  "A required field logger, which gets called when a field annotated with the @required directive was missing from the response"
+)
+module RequiredFieldLogger: {
+  type kind = [#"missing_field.log" | #"missing_field.throw"]
+
+  @ocaml.doc(
+    "A required field logger, which gets called when a field annotated with the @required directive was missing from the response"
+  )
+  type t = (~kind: kind, ~owner: string, ~fieldPath: string) => unit
+}
+
 @ocaml.doc(
   "Module representing the environment, which you'll need to use and pass to various functions. Takes a few configuration options like store and network layer."
 )
@@ -781,6 +815,8 @@ module Environment: {
     ) => string=?,
     ~treatMissingFieldsAsNull: bool=?,
     ~missingFieldHandlers: array<MissingFieldHandler.t>=?,
+    ~requiredFieldLogger: RequiredFieldLogger.t=?,
+    ~isServer: bool=?,
     unit,
   ) => t
 
@@ -790,10 +826,8 @@ module Environment: {
   @ocaml.doc("Given an `operationDescriptor`, commits the corresponding payload.") @send
   external commitPayload: (t, operationDescriptor, 'payload) => unit = "commitPayload"
 
-  @ocaml.doc(
-    "Given an `operationDescriptor`, retains the corresponding operation so any data referenced by it isn't garbage collected.
-You should use the generated `Query.retain` function on your queries instead of using this directly."
-  )
+  @ocaml.doc("Given an `operationDescriptor`, retains the corresponding operation so any data referenced by it isn't garbage collected.
+You should use the generated `Query.retain` function on your queries instead of using this directly.")
   @send
   external retain: (t, operationDescriptor) => Disposable.t = "retain"
 }
@@ -864,7 +898,7 @@ external commitLocalUpdate: (
 @ocaml.doc(
   "Allows you to subscribe to when a record, connection, or even the store itself is invalidated, and then react to that."
 )
-@module("react-relay/hooks")
+@module("react-relay")
 external useSubscribeToInvalidationState: (array<dataId>, unit => unit) => Disposable.t =
   "useSubscribeToInvalidationState"
 
@@ -897,5 +931,5 @@ module MakeLoadQuery: (C: MakeLoadQueryConfig) =>
   ) => C.loadedQueryRef
 
   let queryRefToObservable: C.loadedQueryRef => option<Observable.t<C.response>>
-  let queryRefToPromise: C.loadedQueryRef => Promise.t<Belt.Result.t<unit, unit>>
+  let queryRefToPromise: C.loadedQueryRef => Js.Promise.t<Belt.Result.t<unit, unit>>
 }

package/src/RescriptRelay_Internal.bs.js

@@ -3,23 +3,56 @@
 
 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");
+var Belt_Array = require("rescript/lib/js/belt_Array.js");
+var Belt_Option = require("rescript/lib/js/belt_Option.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
 
-var internal_cleanObjectFromUndefinedRaw = (function (obj) {
-    if (!obj) {
-      return obj;
-    }
-
-    var newObj = {};
+function internal_keepMapFieldsRaw(record, f) {
+  return Belt_Option.map(record, (function (obj) {
+                return Js_dict.fromArray(Belt_Array.keepMap(Js_dict.entries(obj), f));
+              }));
+}
 
-    Object.keys(obj).forEach(function(key) {
-      if (typeof obj[key] !== 'undefined') {
-        newObj[key] = obj[key];
-      }
-    });
+function internal_cleanObjectFromUndefinedRaw(record) {
+  var v = internal_keepMapFieldsRaw(record, (function (param) {
+          var value = param[1];
+          if (value !== undefined) {
+            return [
+                    param[0],
+                    Caml_option.valFromOption(value)
+                  ];
+          }
+          
+        }));
+  if (v !== undefined) {
+    return Caml_option.valFromOption(v);
+  } else {
+    return {};
+  }
+}
 
-    return newObj;
-  });
+function internal_removeUndefinedAndConvertNullsRaw(record) {
+  return internal_keepMapFieldsRaw(record, (function (param) {
+                var value = param[1];
+                var key = param[0];
+                var match = Caml_obj.caml_equal(value, Caml_option.some(undefined));
+                if (value !== undefined) {
+                  return [
+                          key,
+                          Caml_option.valFromOption(value)
+                        ];
+                } else if (match) {
+                  return [
+                          key,
+                          null
+                        ];
+                } else {
+                  return ;
+                }
+              }));
+}
 
 function internal_useConvertedValue(convert, v) {
   return React.useMemo((function () {
@@ -38,5 +71,6 @@ function internal_nullableToOptionalExnHandler(x) {
 
 exports.internal_useConvertedValue = internal_useConvertedValue;
 exports.internal_cleanObjectFromUndefinedRaw = internal_cleanObjectFromUndefinedRaw;
+exports.internal_removeUndefinedAndConvertNullsRaw = internal_removeUndefinedAndConvertNullsRaw;
 exports.internal_nullableToOptionalExnHandler = internal_nullableToOptionalExnHandler;
 /* react Not a pure module */

package/src/RescriptRelay_Internal.res

@@ -1,23 +1,30 @@
-// We occasionally have to remove undefined keys from objects, something I haven't figured out how to do with pure BuckleScript
-let internal_cleanObjectFromUndefinedRaw = %raw(
-  `
-  function (obj) {
-    if (!obj) {
-      return obj;
-    }
-
-    var newObj = {};
-
-    Object.keys(obj).forEach(function(key) {
-      if (typeof obj[key] !== 'undefined') {
-        newObj[key] = obj[key];
-      }
-    });
+let internal_keepMapFieldsRaw = (record, f) =>
+  record
+  ->Obj.magic
+  ->Belt.Option.map(obj => obj->Js.Dict.entries->Belt.Array.keepMap(f)->Js.Dict.fromArray)
+  ->Obj.magic
 
-    return newObj;
+// we need to do this until we can use @obj on record types
+// see https://github.com/rescript-lang/rescript-compiler/pull/5253
+let internal_cleanObjectFromUndefinedRaw = record =>
+  switch internal_keepMapFieldsRaw(record, ((key, value)) => {
+    switch value {
+    | Some(value) => Some((key, value))
+    | None => None
+    }
+  }) {
+  | None => /* Relay expects an empty object, not undefined */ %raw(json`{}`)
+  | Some(v) => v
   }
-`
-)
+
+let internal_removeUndefinedAndConvertNullsRaw = record =>
+  internal_keepMapFieldsRaw(record, ((key, value)) => {
+    switch (value, value == Some(None)) {
+    | (Some(value), _) => Some((key, Js.Nullable.return(value)))
+    | (_, true) => Some((key, Js.Nullable.null))
+    | (None, _) => None
+    }
+  })
 
 let internal_useConvertedValue = (convert, v) => React.useMemo1(() => convert(v), [v])
 

package/src/RescriptRelay_Internal.resi

@@ -1,5 +1,6 @@
 let internal_useConvertedValue: ('a => 'a, 'a) => 'a
 let internal_cleanObjectFromUndefinedRaw: 't => 't
+let internal_removeUndefinedAndConvertNullsRaw: 't => 't
 let internal_nullableToOptionalExnHandler: option<option<'b> => 'a> => option<
   Js.Nullable.t<'b> => 'a,
 >