remove object makers, and leverage optional fields for input objects …

…and variables

packages/rescript-relay/__tests__/ProvidedVariables.res

@@ -3,13 +3,14 @@ module Bool = {
 }
 
 module InputC = {
-  open RelaySchemaAssets_graphql
-  let get = () => make_InputC(~intStr=123, ~recursiveC=make_InputC(~intStr=234, ()), ())
+  let get = (): RelaySchemaAssets_graphql.input_InputC => {
+    intStr: 123,
+    recursiveC: {intStr: 234},
+  }
 }
 
 module InputCArr = {
-  open RelaySchemaAssets_graphql
-  let get = () => Some([make_InputC(~intStr=123, ())])
+  let get = (): option<array<RelaySchemaAssets_graphql.input_InputC>> => Some([{intStr: 123}])
 }
 
 module IntStr = {

packages/rescript-relay/__tests__/Test_connections.res

@@ -142,13 +142,13 @@ module Test = {
       <button
         onClick={_ => {
           addFriend(
-            ~variables=AddFriendMutation.makeVariables(
-              ~connections={
+            ~variables={
+              connections: {
                 open TestConnections_user_graphql
                 [user.__id->makeConnectionId(~beforeDate=makeDate(), ())]
               },
-              ~friendId="123",
-            ),
+              friendId: "123",
+            },
             (),
           )->RescriptRelay.Disposable.ignore
         }}>

packages/rescript-relay/__tests__/Test_customScalars.res

@@ -21,7 +21,7 @@ module Test = {
     let query = {
       Query.use(
         ~variables={
-          beforeDate: Some(Js.Date.fromFloat(1514764800000.)),
+          beforeDate: Js.Date.fromFloat(1514764800000.),
           number: [2],
         },
         (),

packages/rescript-relay/__tests__/Test_mutation.res

@@ -115,7 +115,7 @@ module Test = {
         onClick={_ => {
           let _ = {
             open Mutation
-            commitMutation(~environment, ~variables=makeVariables(~onlineStatus=Idle), ())
+            commitMutation(~environment, ~variables={onlineStatus: Idle}, ())
           }
         }}>
         {React.string("Change online status")}
@@ -125,14 +125,14 @@ module Test = {
           open MutationWithOnlyFragment
           commitMutation(
             ~environment,
-            ~variables=makeVariables(~onlineStatus=Idle),
-            ~optimisticResponse=makeOptimisticResponse(
-              ~setOnlineStatus=make_rawResponse_setOnlineStatus(
-                ~user=make_rawResponse_setOnlineStatus_user(
-                  ~id=data.id,
-                  ~firstName=data.firstName,
-                  ~lastName=data.lastName,
-                  ~memberOf=[
+            ~variables={onlineStatus: Idle},
+            ~optimisticResponse={
+              setOnlineStatus: Some({
+                user: Some({
+                  id: data.id,
+                  firstName: data.firstName,
+                  lastName: data.lastName,
+                  memberOf: Some([
                     Some(
                       #User({
                         __typename: #User,
@@ -141,14 +141,11 @@ module Test = {
                         __isNode: #User,
                       }),
                     ),
-                  ],
-                  ~onlineStatus=Idle,
-                  (),
-                ),
-                (),
-              ),
-              (),
-            ),
+                  ]),
+                  onlineStatus: Some(Idle),
+                }),
+              }),
+            },
             (),
           )->RescriptRelay.Disposable.ignore
         }}>
@@ -159,7 +156,7 @@ module Test = {
           open MutationWithInlineFragment
           commitMutation(
             ~environment,
-            ~variables=makeVariables(~onlineStatus=Idle),
+            ~variables={onlineStatus: Idle},
             ~onCompleted=(response, _) => {
               setInlineStatus(_ => "completed")
               switch response {
@@ -183,10 +180,7 @@ module Test = {
       </button>
       <button
         onClick={_ => {
-          let _ = {
-            open Mutation
-            mutate(~variables=makeVariables(~onlineStatus=Idle), ())
-          }
+          mutate(~variables={onlineStatus: Idle}, ())->RescriptRelay.Disposable.ignore
         }}>
         {React.string(isMutating ? "Mutating..." : "Change online status via useMutation hook")}
       </button>
@@ -196,25 +190,22 @@ module Test = {
             open ComplexMutation
             commitMutation(
               ~environment,
-              ~variables=makeVariables(
+              ~variables={
                 // The "mess" below is to try and provoke a test failure if
                 // recursive conversion would be broken.
-                ~input=make_setOnlineStatusInput(
-                  ~onlineStatus=Idle,
-                  ~someJsonValue,
-                  ~recursed=make_recursiveSetOnlineStatusInput(
-                    ~someValue=100,
-                    ~setOnlineStatus=make_setOnlineStatusInput(
-                      ~onlineStatus=Online,
-                      ~someJsonValue,
-                      ~recursed=make_recursiveSetOnlineStatusInput(~someValue=100, ()),
-                      (),
-                    ),
-                    (),
-                  ),
-                  (),
-                ),
-              ),
+                input: {
+                  onlineStatus: Idle,
+                  someJsonValue,
+                  recursed: {
+                    someValue: 100,
+                    setOnlineStatus: {
+                      onlineStatus: Online,
+                      someJsonValue,
+                      recursed: {someValue: 100},
+                    },
+                  },
+                },
+              },
               (),
             )
           }
@@ -227,21 +218,18 @@ module Test = {
             open Mutation
             commitMutation(
               ~environment,
-              ~variables=makeVariables(~onlineStatus=Idle),
-              ~optimisticResponse=makeOptimisticResponse(
-                ~setOnlineStatus=make_rawResponse_setOnlineStatus(
-                  ~user=make_rawResponse_setOnlineStatus_user(
-                    ~id=data.id,
-                    ~__id=data.id->RescriptRelay.makeDataId,
-                    ~onlineStatus=Idle,
-                    ~firstName=data.firstName,
-                    ~lastName=data.lastName,
-                    (),
-                  ),
-                  (),
-                ),
-                (),
-              ),
+              ~variables={onlineStatus: Idle},
+              ~optimisticResponse={
+                setOnlineStatus: Some({
+                  user: Some({
+                    id: data.id,
+                    __id: Some(data.id->RescriptRelay.makeDataId),
+                    onlineStatus: Some(Idle),
+                    firstName: data.firstName,
+                    lastName: data.lastName,
+                  }),
+                }),
+              },
               (),
             )
           }

packages/rescript-relay/__tests__/Test_query.res

@@ -71,7 +71,7 @@ module Test = {
       | _ => []
       }
 
-    let query = Query.use(~variables={status: status}, ())
+    let query = Query.use(~variables={status: ?status}, ())
     let users = collectUsers(query)
 
     <div>
@@ -100,13 +100,13 @@ module Test = {
       <button
         onClick={_ =>
           setQueryRefFromModule(_ => Some(
-            TestQuery_graphql.load(~environment, ~variables={status: Some(Idle)}, ()),
+            TestQuery_graphql.load(~environment, ~variables={status: Idle}, ()),
           ))}>
         {React.string("Test preloaded from raw module")}
       </button>
       <button
         onClick={_ => {
-          let queryRef = TestQuery_graphql.load(~environment, ~variables={status: Some(Idle)}, ())
+          let queryRef = TestQuery_graphql.load(~environment, ~variables={status: Idle}, ())
 
           let _ = queryRef->TestQuery_graphql.queryRefToPromise->(Js.Promise.then_(res => {
                 switch res {
@@ -125,7 +125,7 @@ module Test = {
         onClick={_ =>
           Query.fetch(
             ~environment,
-            ~variables={status: Some(Online)},
+            ~variables={status: Online},
             ~onResult=x =>
               switch x {
               | Ok(res) => setFetchedResult(_ => Some(collectUsers(res)))
@@ -138,7 +138,7 @@ module Test = {
       <button
         onClick={_ => {
           let _ =
-            Query.fetchPromised(~environment, ~variables={status: Some(Online)}, ())->(
+            Query.fetchPromised(~environment, ~variables={status: Online}, ())->(
               Js.Promise.then_(res => {
                 setFetchedResult(_ => Some(collectUsers(res)))
                 Js.Promise.resolve()
@@ -147,7 +147,7 @@ module Test = {
         }}>
         {React.string("Test fetch promised")}
       </button>
-      <button onClick={_ => loadQuery(~variables={status: Some(Idle)}, ())}>
+      <button onClick={_ => loadQuery(~variables={status: Idle}, ())}>
         {React.string("Test query loader")}
       </button>
       {hasWaitedForPreload ? <div> {React.string("Has waited for preload")} </div> : React.null}

packages/rescript-relay/__tests__/Test_queryInputObjects.res

@@ -7,10 +7,7 @@ module Query = %relay(`
 module Test = {
   @react.component
   let make = () => {
-    let data = Query.use(
-      ~variables=Query.makeVariables(~input=Query.make_searchInput(~id=123, ~someOtherId=1.5, ())),
-      (),
-    )
+    let data = Query.use(~variables={input: {id: 123, someOtherId: 1.5}}, ())
 
     <div>
       {switch data.search {

packages/rescript-relay/__tests__/Test_refetchingInNode.res

@@ -62,7 +62,7 @@ module UserDisplayer = {
 module Test = {
   @react.component
   let make = () => {
-    let query = Query.use(~variables={userId: "user-1", friendsOnlineStatuses: Some([Online])}, ())
+    let query = Query.use(~variables={userId: "user-1", friendsOnlineStatuses: [Online]}, ())
 
     switch query.node {
     | Some(#User(user)) => <UserDisplayer queryRef=user.fragmentRefs />