rescript-relay 3.5.0 → 4.0.0

package/src/RescriptRelay_Fragment.bs.js

@@ -1,26 +1,24 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var React = require("react");
-var Caml_option = require("rescript/lib/js/caml_option.js");
-var ReactRelay = require("react-relay");
-var RescriptRelay_Internal = require("./RescriptRelay_Internal.bs.js");
-var Experimental = require("relay-runtime/experimental");
-var ResolverFragments = require("relay-runtime/lib/store/ResolverFragments");
+let React = require("react");
+let ReactRelay = require("react-relay");
+let Primitive_option = require("@rescript/runtime/lib/js/Primitive_option.js");
+let RescriptRelay_Internal = require("./RescriptRelay_Internal.bs.js");
+let Experimental = require("relay-runtime/experimental");
+let ResolverFragments = require("relay-runtime/lib/store/ResolverFragments");
 
 function useFragment(node, convertFragment, fRef) {
-  var __x = ReactRelay.useFragment(node, fRef);
-  return RescriptRelay_Internal.internal_useConvertedValue(convertFragment, __x);
+  return RescriptRelay_Internal.internal_useConvertedValue(convertFragment, ReactRelay.useFragment(node, fRef));
 }
 
 function useFragmentOpt(fRef, node, convertFragment) {
-  var data = ReactRelay.useFragment(node, fRef);
-  return React.useMemo((function () {
-                if (!(data == null)) {
-                  return Caml_option.some(convertFragment(data));
-                }
-                
-              }), [(data == null) ? undefined : Caml_option.some(data)]);
+  let data = ReactRelay.useFragment(node, fRef);
+  return React.useMemo(() => {
+    if (!(data == null)) {
+      return Primitive_option.some(convertFragment(data));
+    }
+  }, [(data == null) ? undefined : Primitive_option.some(data)]);
 }
 
 function readInlineData(node, convertFragment, fRef) {
@@ -31,85 +29,62 @@ function read(node, convertFragment, fRef) {
   return convertFragment(ResolverFragments.readFragment(node, fRef));
 }
 
-function internal_makeRefetchableFnOpts(fetchPolicy, onComplete, param) {
-  return {
-          fetchPolicy: fetchPolicy,
-          onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
-        };
-}
-
 function usePaginationFragment(node, fRef, convertFragment, convertRefetchVariables) {
-  var p = ReactRelay.usePaginationFragment(node, fRef);
-  var data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, p.data);
+  let p = ReactRelay.usePaginationFragment(node, fRef);
+  let data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, p.data);
   return {
-          data: data,
-          loadNext: React.useMemo((function () {
-                  return function (count, onComplete) {
-                    return p.loadNext(count, {
-                                onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
-                              });
-                  };
-                }), [p.loadNext]),
-          loadPrevious: React.useMemo((function () {
-                  return function (count, onComplete) {
-                    return p.loadPrevious(count, {
-                                onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
-                              });
-                  };
-                }), [p.loadPrevious]),
-          hasNext: p.hasNext,
-          hasPrevious: p.hasPrevious,
-          isLoadingNext: p.isLoadingNext,
-          isLoadingPrevious: p.isLoadingPrevious,
-          refetch: React.useMemo((function () {
-                  return function (variables, fetchPolicy, onComplete) {
-                    return p.refetch(RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(convertRefetchVariables(variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
-                  };
-                }), [p.refetch])
-        };
+    data: data,
+    loadNext: React.useMemo(() => ((count, onComplete) => p.loadNext(count, {
+      onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
+    })), [p.loadNext]),
+    loadPrevious: React.useMemo(() => ((count, onComplete) => p.loadPrevious(count, {
+      onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
+    })), [p.loadPrevious]),
+    hasNext: p.hasNext,
+    hasPrevious: p.hasPrevious,
+    isLoadingNext: p.isLoadingNext,
+    isLoadingPrevious: p.isLoadingPrevious,
+    refetch: React.useMemo(() => ((variables, fetchPolicy, onComplete) => p.refetch(RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(convertRefetchVariables(variables)), {
+      fetchPolicy: fetchPolicy,
+      onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
+    })), [p.refetch])
+  };
 }
 
 function usePrefetchableForwardPagination(node, fRef, convertEdges, convertFragment, convertRefetchVariables, bufferSize, initialSize, prefetchingLoadMoreOptions, minimumFetchSize) {
-  var p = ReactRelay.usePrefetchableForwardPaginationFragment(node, fRef, bufferSize, initialSize !== undefined ? Caml_option.valFromOption(initialSize) : undefined, prefetchingLoadMoreOptions !== undefined ? Caml_option.valFromOption(prefetchingLoadMoreOptions) : undefined, minimumFetchSize !== undefined ? Caml_option.valFromOption(minimumFetchSize) : undefined);
-  var data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, p.data);
-  var edges = RescriptRelay_Internal.internal_useConvertedValue(convertEdges, p.edges);
+  let p = ReactRelay.usePrefetchableForwardPaginationFragment(node, fRef, bufferSize, initialSize !== undefined ? Primitive_option.valFromOption(initialSize) : undefined, prefetchingLoadMoreOptions !== undefined ? Primitive_option.valFromOption(prefetchingLoadMoreOptions) : undefined, minimumFetchSize !== undefined ? Primitive_option.valFromOption(minimumFetchSize) : undefined);
+  let data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, p.data);
+  let edges = RescriptRelay_Internal.internal_useConvertedValue(convertEdges, p.edges);
   return {
-          data: data,
-          edges: edges,
-          loadNext: React.useMemo((function () {
-                  return function (count, onComplete) {
-                    return p.loadNext(count, {
-                                onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
-                              });
-                  };
-                }), [p.loadNext]),
-          hasNext: p.hasNext,
-          isLoadingNext: p.isLoadingNext,
-          refetch: React.useMemo((function () {
-                  return function (variables, fetchPolicy, onComplete) {
-                    return p.refetch(RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(convertRefetchVariables(variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
-                  };
-                }), [p.refetch])
-        };
+    data: data,
+    edges: edges,
+    loadNext: React.useMemo(() => ((count, onComplete) => p.loadNext(count, {
+      onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
+    })), [p.loadNext]),
+    hasNext: p.hasNext,
+    isLoadingNext: p.isLoadingNext,
+    refetch: React.useMemo(() => ((variables, fetchPolicy, onComplete) => p.refetch(RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(convertRefetchVariables(variables)), {
+      fetchPolicy: fetchPolicy,
+      onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
+    })), [p.refetch])
+  };
 }
 
 function useRefetchableFragment(node, convertFragment, convertRefetchVariables, fRef) {
-  var match = ReactRelay.useRefetchableFragment(node, fRef);
-  var refetchFn = match[1];
-  var data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, match[0]);
+  let match = ReactRelay.useRefetchableFragment(node, fRef);
+  let refetchFn = match[1];
+  let data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, match[0]);
   return [
-          data,
-          React.useMemo((function () {
-                  return function (variables, fetchPolicy, onComplete) {
-                    return refetchFn(RescriptRelay_Internal.internal_removeUndefinedAndConvertNullsRaw(convertRefetchVariables(variables)), internal_makeRefetchableFnOpts(fetchPolicy, onComplete, undefined));
-                  };
-                }), [refetchFn])
-        ];
+    data,
+    React.useMemo(() => ((variables, fetchPolicy, onComplete) => refetchFn(RescriptRelay_Internal.internal_removeUndefinedAndConvertNullsRaw(convertRefetchVariables(variables)), {
+      fetchPolicy: fetchPolicy,
+      onComplete: RescriptRelay_Internal.internal_nullableToOptionalExnHandler(onComplete)
+    })), [refetchFn])
+  ];
 }
 
 async function waitForFragmentData(environment, node, convertFragment, fRef) {
-  var fragmentData = await Experimental.waitForFragmentData(environment, node, fRef);
-  return convertFragment(fragmentData);
+  return convertFragment(await Experimental.waitForFragmentData(environment, node, fRef));
 }
 
 exports.useFragment = useFragment;

package/src/RescriptRelay_Fragment.res

@@ -15,14 +15,11 @@ let useFragment = (~node, ~convertFragment: 'fragment => 'fragment, ~fRef) => {
                      User @inline {...}`) and then use `Fragment.readInline`. \
                      This will allow you to get the fragment data, but outside \
                      of React's render.*/
-  (
-    useFragment_(node, fRef)
-    ->(RescriptRelay_Internal.internal_useConvertedValue(convertFragment, _))
-  )
+  (useFragment_(node, fRef)->RescriptRelay_Internal.internal_useConvertedValue(convertFragment, _))
 }
 
 @module("react-relay")
-external useFragmentOpt_: (fragmentNode<'node>, option<'fragmentRef>) => Js.Nullable.t<'fragment> =
+external useFragmentOpt_: (fragmentNode<'node>, option<'fragmentRef>) => Nullable.t<'fragment> =
   "useFragment"
 
 let useFragmentOpt = (~fRef, ~node, ~convertFragment: 'fragment => 'fragment) => {
@@ -33,7 +30,7 @@ let useFragmentOpt = (~fRef, ~node, ~convertFragment: 'fragment => 'fragment) =>
                      back. Useful for scenarios where you don't have the \
                      fragmentRefs yet.*/
   let data =
-    useFragmentOpt_(node, fRef)->Js.Nullable.toOption
+    useFragmentOpt_(node, fRef)->Nullable.toOption
   React.useMemo1(() => {
     switch data {
     | Some(data) => Some(convertFragment(data))
@@ -64,16 +61,16 @@ let read = (~node, ~convertFragment: 'fragment => 'fragment, ~fRef) => {
 
 type refetchableFnOpts = {
   fetchPolicy?: fetchPolicy,
-  onComplete?: Js.Nullable.t<Js.Exn.t> => unit,
+  onComplete?: Nullable.t<JsExn.t> => unit,
 }
 
 let internal_makeRefetchableFnOpts = (~fetchPolicy=?, ~onComplete=?, ()) => {
   ?fetchPolicy,
-  onComplete: ?onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler,
+  onComplete: ?(onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler),
 }
 
-type paginationLoadMoreOptions = {onComplete?: Js.Nullable.t<Js.Exn.t> => unit}
-type paginationLoadMoreFn = (~count: int, ~onComplete: option<Js.Exn.t> => unit=?) => Disposable.t
+type paginationLoadMoreOptions = {onComplete?: Nullable.t<JsExn.t> => unit}
+type paginationLoadMoreFn = (~count: int, ~onComplete: option<JsExn.t> => unit=?) => Disposable.t
 type paginationFragmentReturnRaw<'fragment, 'refetchVariables> = {
   data: 'fragment,
   loadNext: (int, paginationLoadMoreOptions) => Disposable.t,
@@ -95,7 +92,7 @@ type paginationFragmentReturn<'fragment, 'refetchVariables> = {
   refetch: (
     ~variables: 'refetchVariables,
     ~fetchPolicy: fetchPolicy=?,
-    ~onComplete: option<Js.Exn.t> => unit=?,
+    ~onComplete: option<JsExn.t> => unit=?,
   ) => Disposable.t,
 }
 
@@ -116,30 +113,36 @@ let usePaginationFragment = (
   let data = RescriptRelay_Internal.internal_useConvertedValue(convertFragment, p.data)
   {
     data,
-    loadNext: React.useMemo1(() => (~count, ~onComplete=?) => {
-      p.loadNext(
-        count,
-        {onComplete: ?onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler},
-      )
-    }, [p.loadNext]),
-    loadPrevious: React.useMemo1(() => (~count, ~onComplete=?) => {
-      p.loadPrevious(
-        count,
-        {onComplete: ?onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler},
-      )
-    }, [p.loadPrevious]),
+    loadNext: React.useMemo1(() =>
+      (~count, ~onComplete=?) => {
+        p.loadNext(
+          count,
+          {onComplete: ?(onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler)},
+        )
+      }
+    , [p.loadNext]),
+    loadPrevious: React.useMemo1(() =>
+      (~count, ~onComplete=?) => {
+        p.loadPrevious(
+          count,
+          {onComplete: ?(onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler)},
+        )
+      }
+    , [p.loadPrevious]),
     hasNext: p.hasNext,
     hasPrevious: p.hasPrevious,
     isLoadingNext: p.isLoadingNext,
     isLoadingPrevious: p.isLoadingPrevious,
-    refetch: React.useMemo1(() => (~variables, ~fetchPolicy=?, ~onComplete=?) => {
-      p.refetch(
-        RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(
-          variables->convertRefetchVariables,
-        ),
-        internal_makeRefetchableFnOpts(~onComplete?, ~fetchPolicy?, ()),
-      )
-    }, [p.refetch]),
+    refetch: React.useMemo1(() =>
+      (~variables, ~fetchPolicy=?, ~onComplete=?) => {
+        p.refetch(
+          RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(
+            variables->convertRefetchVariables,
+          ),
+          internal_makeRefetchableFnOpts(~onComplete?, ~fetchPolicy?, ()),
+        )
+      }
+    , [p.refetch]),
   }
 }
 
@@ -160,7 +163,7 @@ type prefetchableForwardPaginationFragmentReturn<'fragment, 'edges, 'refetchVari
   refetch: (
     ~variables: 'refetchVariables,
     ~fetchPolicy: fetchPolicy=?,
-    ~onComplete: option<Js.Exn.t> => unit=?,
+    ~onComplete: option<JsExn.t> => unit=?,
   ) => Disposable.t,
 }
 
@@ -200,22 +203,26 @@ let usePrefetchableForwardPagination = (
   {
     data,
     edges,
-    loadNext: React.useMemo1(() => (~count, ~onComplete=?) => {
-      p.loadNext(
-        count,
-        {onComplete: ?onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler},
-      )
-    }, [p.loadNext]),
+    loadNext: React.useMemo1(() =>
+      (~count, ~onComplete=?) => {
+        p.loadNext(
+          count,
+          {onComplete: ?(onComplete->RescriptRelay_Internal.internal_nullableToOptionalExnHandler)},
+        )
+      }
+    , [p.loadNext]),
     hasNext: p.hasNext,
     isLoadingNext: p.isLoadingNext,
-    refetch: React.useMemo1(() => (~variables, ~fetchPolicy=?, ~onComplete=?) => {
-      p.refetch(
-        RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(
-          variables->convertRefetchVariables,
-        ),
-        internal_makeRefetchableFnOpts(~onComplete?, ~fetchPolicy?, ()),
-      )
-    }, [p.refetch]),
+    refetch: React.useMemo1(() =>
+      (~variables, ~fetchPolicy=?, ~onComplete=?) => {
+        p.refetch(
+          RescriptRelay_Internal.internal_cleanObjectFromUndefinedRaw(
+            variables->convertRefetchVariables,
+          ),
+          internal_makeRefetchableFnOpts(~onComplete?, ~fetchPolicy?, ()),
+        )
+      }
+    , [p.refetch]),
   }
 }
 
@@ -247,13 +254,14 @@ let useRefetchableFragment = (
   (
     data,
     React.useMemo1(
-      () => (~variables: 'refetchVariables, ~fetchPolicy=?, ~onComplete=?) =>
-        refetchFn(
-          RescriptRelay_Internal.internal_removeUndefinedAndConvertNullsRaw(
-            variables->convertRefetchVariables,
+      () =>
+        (~variables: 'refetchVariables, ~fetchPolicy=?, ~onComplete=?) =>
+          refetchFn(
+            RescriptRelay_Internal.internal_removeUndefinedAndConvertNullsRaw(
+              variables->convertRefetchVariables,
+            ),
+            internal_makeRefetchableFnOpts(~fetchPolicy?, ~onComplete?, ()),
           ),
-          internal_makeRefetchableFnOpts(~fetchPolicy?, ~onComplete?, ()),
-        ),
       [refetchFn],
     ),
   )

package/src/RescriptRelay_Fragment.resi

@@ -24,9 +24,9 @@ let read: (
   ~fRef: 'b,
 ) => 'fragment
 
-type paginationLoadMoreOptions = {onComplete?: Js.Nullable.t<Js.Exn.t> => unit}
+type paginationLoadMoreOptions = {onComplete?: Nullable.t<JsExn.t> => unit}
 
-type paginationLoadMoreFn = (~count: int, ~onComplete: option<Js.Exn.t> => unit=?) => Disposable.t
+type paginationLoadMoreFn = (~count: int, ~onComplete: option<JsExn.t> => unit=?) => Disposable.t
 
 type paginationFragmentReturn<'fragment, 'refetchVariables> = {
   data: 'fragment,
@@ -39,7 +39,7 @@ type paginationFragmentReturn<'fragment, 'refetchVariables> = {
   refetch: (
     ~variables: 'refetchVariables,
     ~fetchPolicy: fetchPolicy=?,
-    ~onComplete: option<Js.Exn.t> => unit=?,
+    ~onComplete: option<JsExn.t> => unit=?,
   ) => Disposable.t,
 }
 
@@ -59,7 +59,7 @@ type prefetchableForwardPaginationFragmentReturn<'fragment, 'edges, 'refetchVari
   refetch: (
     ~variables: 'refetchVariables,
     ~fetchPolicy: fetchPolicy=?,
-    ~onComplete: option<Js.Exn.t> => unit=?,
+    ~onComplete: option<JsExn.t> => unit=?,
   ) => Disposable.t,
 }
 
@@ -85,7 +85,7 @@ let useRefetchableFragment: (
   (
     ~variables: 'refetchVariables,
     ~fetchPolicy: fetchPolicy=?,
-    ~onComplete: option<Js.Exn.t> => unit=?,
+    ~onComplete: option<JsExn.t> => unit=?,
   ) => Disposable.t,
 )
 

package/src/RescriptRelay_Internal.bs.js

@@ -1,74 +1,65 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-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");
+let React = require("react");
+let Stdlib_Array = require("@rescript/runtime/lib/js/Stdlib_Array.js");
+let Stdlib_Option = require("@rescript/runtime/lib/js/Stdlib_Option.js");
+let Primitive_object = require("@rescript/runtime/lib/js/Primitive_object.js");
+let Primitive_option = require("@rescript/runtime/lib/js/Primitive_option.js");
 
 function internal_keepMapFieldsRaw(record, f) {
-  return Belt_Option.map(record, (function (obj) {
-                return Js_dict.fromArray(Belt_Array.keepMap(Js_dict.entries(obj), f));
-              }));
+  return Stdlib_Option.map(record, obj => Object.fromEntries(Stdlib_Array.filterMap(Object.entries(obj), f)));
 }
 
 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)
-                  ];
-          }
-          
-        }));
+  let v = internal_keepMapFieldsRaw(record, param => {
+    let value = param[1];
+    if (value !== undefined) {
+      return [
+        param[0],
+        Primitive_option.valFromOption(value)
+      ];
+    }
+  });
   if (v !== undefined) {
-    return Caml_option.valFromOption(v);
+    return Primitive_option.valFromOption(v);
   } else {
     return {};
   }
 }
 
 function internal_removeUndefinedAndConvertNullsRaw(record) {
-  return internal_keepMapFieldsRaw(record, (function (param) {
-                var value = param[1];
-                var key = param[0];
-                var match = Caml_obj.equal(value, Caml_option.some(undefined));
-                if (value !== undefined) {
-                  return [
-                          key,
-                          Caml_option.valFromOption(value)
-                        ];
-                } else if (match) {
-                  return [
-                          key,
-                          null
-                        ];
-                } else {
-                  return ;
-                }
-              }));
+  return internal_keepMapFieldsRaw(record, param => {
+    let value = param[1];
+    let key = param[0];
+    let match = Primitive_object.equal(value, Primitive_option.some(undefined));
+    if (value !== undefined) {
+      return [
+        key,
+        Primitive_option.valFromOption(value)
+      ];
+    } else if (match) {
+      return [
+        key,
+        null
+      ];
+    } else {
+      return;
+    }
+  });
 }
 
 function internal_useConvertedValue(convert, v) {
-  return React.useMemo((function () {
-                return convert(v);
-              }), [v]);
+  return React.useMemo(() => convert(v), [v]);
 }
 
 function internal_nullableToOptionalExnHandler(x) {
   if (x !== undefined) {
-    return (function (maybeExn) {
-              return x((maybeExn == null) ? undefined : Caml_option.some(maybeExn));
-            });
+    return maybeExn => x((maybeExn == null) ? undefined : Primitive_option.some(maybeExn));
   }
-  
 }
 
-var unwrapUnion = (function unwrapUnion(union, members) {
+let unwrapUnion = (function unwrapUnion(union, members) {
     if (union != null && members.indexOf(union.__typename) === -1) { 
       return Object.assign({}, union, {__typename: "__unselected"});
     }
@@ -80,7 +71,7 @@ function wrapUnion(union) {
   return union;
 }
 
-var applyCodesplitMetadata = (function applyCodesplitMetadata(node, meta) {
+let applyCodesplitMetadata = (function applyCodesplitMetadata(node, meta) {
     if (node != null && node.params != null) {
       let metadata = node.params.metadata;
       if (metadata == null) {

package/src/RescriptRelay_Internal.res

@@ -1,7 +1,7 @@
 let internal_keepMapFieldsRaw = (record, f) =>
   record
   ->Obj.magic
-  ->Belt.Option.map(obj => obj->Js.Dict.entries->Belt.Array.keepMap(f)->Js.Dict.fromArray)
+  ->Option.map(obj => obj->Dict.toArray->Array.filterMap(f)->Dict.fromArray)
   ->Obj.magic
 
 // we need to do this until we can use @obj on record types
@@ -20,8 +20,8 @@ let internal_cleanObjectFromUndefinedRaw = record =>
 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))
+    | (Some(value), _) => Some((key, Nullable.make(value)))
+    | (_, true) => Some((key, Nullable.null))
     | (None, _) => None
     }
   })
@@ -31,7 +31,7 @@ let internal_useConvertedValue = (convert, v) => React.useMemo1(() => convert(v)
 let internal_nullableToOptionalExnHandler = x =>
   switch x {
   | None => None
-  | Some(handler) => Some(maybeExn => maybeExn->Js.Nullable.toOption->handler)
+  | Some(handler) => Some(maybeExn => maybeExn->Nullable.toOption->handler)
   }
 
 @live @unboxed type rec arg = Arg(_): arg
@@ -56,7 +56,7 @@ external internal_resolverFragmentRefsToFragmentRefsPlural: RescriptRelay.resolv
   'a,
 > => array<RescriptRelay.fragmentRefs<'a>> = "%identity"
 
-let applyCodesplitMetadata: ('node, array<(string, dict<Js.Json.t> => unit)>) => 'node = %raw(`
+let applyCodesplitMetadata: ('node, array<(string, dict<JSON.t> => unit)>) => 'node = %raw(`
   function applyCodesplitMetadata(node, meta) {
     if (node != null && node.params != null) {
       let metadata = node.params.metadata;

package/src/RescriptRelay_Internal.resi

@@ -1,9 +1,7 @@
 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,
->
+let internal_nullableToOptionalExnHandler: option<option<'b> => 'a> => option<Nullable.t<'b> => 'a>
 @live @unboxed type rec arg = Arg(_): arg
 
 let unwrapUnion: ('a, array<string>) => 'a
@@ -17,4 +15,4 @@ external internal_resolverFragmentRefsToFragmentRefsPlural: RescriptRelay.resolv
   'a,
 > => array<RescriptRelay.fragmentRefs<'a>> = "%identity"
 
-let applyCodesplitMetadata: ('node, array<(string, dict<Js.Json.t> => unit)>) => 'node
+let applyCodesplitMetadata: ('node, array<(string, dict<JSON.t> => unit)>) => 'node