Merge pull request #155 from illusionalsagacity/rescript-format

Formats the source code

Author: jeddeloh

.github/workflows/tests.yml

@@ -16,7 +16,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: "12"
+          node-version: "18"
           registry-url: "https://registry.npmjs.org"
       - run: npm install
+      - run: npm run format:ci
       - run: npm run build

package.json

@@ -16,15 +16,16 @@
   "scripts": {
     "build": "rescript build -with-deps",
     "clean": "rescript clean",
+    "format:ci": "rescript format -check -all",
     "start": "rescript build -with-deps -w",
     "test": "jest"
   },
   "devDependencies": {
     "@apollo/client": "^3.5.0",
-    "@reasonml-community/graphql-ppx": "^1.0.0",
+    "@reasonml-community/graphql-ppx": "1.2.4-1345e061.0",
     "@rescript/react": "~0.11.0",
     "rescript": "~10.1.2",
-    "graphql": "^14.0.0",
+    "graphql": "^15.0.0",
     "jest": "26.5.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

src/@apollo/client/cache/core/ApolloClient__Cache_Core_Cache.res

@@ -186,11 +186,11 @@ module ApolloCache = {
       js
       ->Js_.readFragment(
         ~options={
-          id: id,
+          id,
           fragment: Fragment.query,
-          fragmentName: fragmentName,
-          optimistic: optimistic,
-          canonizeResults: canonizeResults,
+          fragmentName,
+          optimistic,
+          canonizeResults,
         },
         ~optimistic?,
         (),
@@ -218,11 +218,11 @@ module ApolloCache = {
       ->Js_.readQuery(
         ~options=DataProxy.ReadQueryOptions.toJs(
           {
-            id: id,
+            id,
             query: Operation.query,
-            variables: variables,
-            optimistic: optimistic,
-            canonizeResults: canonizeResults,
+            variables,
+            optimistic,
+            canonizeResults,
           },
           ~mapJsVariables,
           ~serializeVariables=Operation.serializeVariables,
@@ -247,12 +247,12 @@ module ApolloCache = {
       js->Js_.writeFragment(
         ~options=DataProxy.WriteFragmentOptions.toJs(
           {
-            broadcast: broadcast,
-            data: data,
-            id: id,
+            broadcast,
+            data,
+            id,
             fragment: Fragment.query,
-            fragmentName: fragmentName,
-            overwrite: overwrite,
+            fragmentName,
+            overwrite,
           },
           ~serialize=Fragment.serialize,
         ),
@@ -275,12 +275,12 @@ module ApolloCache = {
       js->Js_.writeQuery(
         ~options=DataProxy.WriteQueryOptions.toJs(
           {
-            broadcast: broadcast,
-            data: data,
-            id: id,
+            broadcast,
+            data,
+            id,
             query: Operation.query,
-            variables: variables,
-            overwrite: overwrite,
+            variables,
+            overwrite,
           },
           ~mapJsVariables,
           ~serialize=Operation.serialize,
@@ -307,25 +307,27 @@ module ApolloCache = {
       let safeParse = Utils.safeParse(Operation.parse)
 
       js
-      ->Js_.updateQuery(~options=DataProxy.UpdateQueryOptions.toJs(
-        {
-          optimistic: optimistic,
-          canonizeResults: canonizeResults,
-          broadcast: broadcast,
-          id: id,
-          query: Operation.query,
-          variables: variables,
-          overwrite: overwrite,
-        },
-        ~mapJsVariables,
-        ~serializeVariables=Operation.serializeVariables,
-      ), ~update=jsData =>
-        jsData
-        ->Js.nullToOption
-        ->Belt.Option.map(Operation.parse)
-        ->update
-        ->Belt.Option.map(Operation.serialize)
-        ->Js.Nullable.fromOption
+      ->Js_.updateQuery(
+        ~options=DataProxy.UpdateQueryOptions.toJs(
+          {
+            optimistic,
+            canonizeResults,
+            broadcast,
+            id,
+            query: Operation.query,
+            variables,
+            overwrite,
+          },
+          ~mapJsVariables,
+          ~serializeVariables=Operation.serializeVariables,
+        ),
+        ~update=jsData =>
+          jsData
+          ->Js.nullToOption
+          ->Belt.Option.map(Operation.parse)
+          ->update
+          ->Belt.Option.map(Operation.serialize)
+          ->Js.Nullable.fromOption,
       )
       ->Js.toOption
       ->Belt.Option.map(safeParse)
@@ -346,21 +348,23 @@ module ApolloCache = {
       let safeParse = Utils.safeParse(Fragment.parse)
 
       js
-      ->Js_.updateFragment(~options=DataProxy.UpdateFragmentOptions.toJs({
-        optimistic: optimistic,
-        canonizeResults: canonizeResults,
-        broadcast: broadcast,
-        id: id,
-        fragment: Fragment.query,
-        fragmentName: fragmentName,
-        overwrite: overwrite,
-      }), ~update=jsData =>
-        jsData
-        ->Js.nullToOption
-        ->Belt.Option.map(Fragment.parse)
-        ->update
-        ->Belt.Option.map(Fragment.serialize)
-        ->Js.Nullable.fromOption
+      ->Js_.updateFragment(
+        ~options=DataProxy.UpdateFragmentOptions.toJs({
+          optimistic,
+          canonizeResults,
+          broadcast,
+          id,
+          fragment: Fragment.query,
+          fragmentName,
+          overwrite,
+        }),
+        ~update=jsData =>
+          jsData
+          ->Js.nullToOption
+          ->Belt.Option.map(Fragment.parse)
+          ->update
+          ->Belt.Option.map(Fragment.serialize)
+          ->Js.Nullable.fromOption,
       )
       ->Js.toOption
       ->Belt.Option.map(safeParse)
@@ -369,12 +373,12 @@ module ApolloCache = {
     preserveJsPropsAndContext(
       js,
       {
-        readFragment: readFragment,
-        readQuery: readQuery,
-        writeFragment: writeFragment,
-        writeQuery: writeQuery,
-        updateFragment: updateFragment,
-        updateQuery: updateQuery,
+        readFragment,
+        readQuery,
+        writeFragment,
+        writeQuery,
+        updateFragment,
+        updateQuery,
       },
     )
   }

src/@apollo/client/cache/inmemory/ApolloClient__Cache_InMemory_Policies.res

@@ -126,11 +126,11 @@ module TypePolicy = {
     ~subscriptionType: bool=?,
     unit,
   ) => t = (~fields=?, ~keyFields=?, ~mutationType=?, ~queryType=?, ~subscriptionType=?, ()) => {
-    fields: fields,
-    keyFields: keyFields,
-    mutationType: mutationType,
-    queryType: queryType,
-    subscriptionType: subscriptionType,
+    fields,
+    keyFields,
+    mutationType,
+    queryType,
+    subscriptionType,
   }
 }