Use RescriptCore.Dict types/mapValues instead of Js and autoformat

jeddeloh · Jan 6, 2025 · d7b27f0 · d7b27f0
1 parent fe398bc
commit d7b27f0
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 24 deletions.
diff --git a/src/@apollo/client/cache/inmemory/ApolloClient__Cache_InMemory_Policies.res b/src/@apollo/client/cache/inmemory/ApolloClient__Cache_InMemory_Policies.res
@@ -69,7 +69,7 @@ module TypePolicy = {
       queryType: option<bool>,
       mutationType: option<bool>,
       subscriptionType: option<bool>,
-      fields: option<Js.Dict.t<FieldsUnion.t>>,
+      fields: option<RescriptCore.Dict.t<FieldsUnion.t>>,
     }
   }
 
@@ -92,7 +92,7 @@ module TypePolicy = {
     fields: option<t_fields>,
   }
 
-  let toJs: (. t) => Js_.t = (. t) => {
+  let toJs: t => Js_.t = t => {
     keyFields: t.keyFields->Belt.Option.map(KeyArgs.toJs),
     queryType: t.queryType,
     mutationType: t.mutationType,
@@ -114,7 +114,7 @@ module TypePolicy = {
           fieldReadFunction->FieldReadFunction.toJs->Js_.FieldsUnion.fieldReadFunction
         },
       ))
-      ->Js.Dict.fromArray
+      ->RescriptCore.Dict.fromArray
     ),
   }
 
@@ -139,19 +139,21 @@ module TypePolicies = {
     // export declare type TypePolicies = {
     //     [__typename: string]: TypePolicy;
     // };
-    type t = Js.Dict.t<TypePolicy.Js_.t>
+    type t = RescriptCore.Dict.t<TypePolicy.Js_.t>
   }
 
   type typename = string
 
   type t = array<(typename, TypePolicy.t)>
 
   let toJs: t => Js_.t = t =>
-    t->Belt.Array.map(((key, policy)) => (key, TypePolicy.toJs(. policy)))->Js.Dict.fromArray
+    t
+    ->Belt.Array.map(((key, policy)) => (key, TypePolicy.toJs(policy)))
+    ->RescriptCore.Dict.fromArray
 }
 
 module PossibleTypesMap = {
-  type t = Js.Dict.t<array<string>>
+  type t = RescriptCore.Dict.t<array<string>>
   module Js_ = {
     // export declare type PossibleTypesMap = {
     //     [supertype: string]: string[];

diff --git a/src/@apollo/client/cache/inmemory/ApolloClient__Cache_InMemory_Policies_FieldPolicy.res b/src/@apollo/client/cache/inmemory/ApolloClient__Cache_InMemory_Policies_FieldPolicy.res
@@ -5,7 +5,7 @@ module ReadFieldFunction = ApolloClient__Cache_Core_Types_Common.ReadFieldFuncti
 module ToReferenceFunction = ApolloClient__Cache_Core_Types_Common.ToReferenceFunction
 
 module StorageType = {
-  type t = Js.Dict.t<Js.Json.t>
+  type t = RescriptCore.Dict.t<Js.Json.t>
   module Js_ = {
     type t = t
   }
@@ -30,11 +30,11 @@ module FieldFunctionOptions = {
     //     mergeObjects<T extends StoreObject | Reference>(existing: T, incoming: T): T | undefined;
     // }
     type t = {
-      args: Js.nullable<Js.Dict.t<Js.Json.t>>,
+      args: Js.nullable<RescriptCore.Dict.t<Js.Json.t>>,
       fieldName: string,
       storeFieldName: string,
       field: Js.nullable<FieldNode.t>,
-      variables: option<Js.Dict.t<Js.Json.t>>,
+      variables: option<RescriptCore.Dict.t<Js.Json.t>>,
       isReference: bool,
       toReference: unimplemented,
       readField: unimplemented,
@@ -52,11 +52,11 @@ module FieldFunctionOptions = {
   }
 
   type t = {
-    args: Js.nullable<Js.Dict.t<Js.Json.t>>,
+    args: Js.nullable<RescriptCore.Dict.t<Js.Json.t>>,
     fieldName: string,
     storeFieldName: string,
     field: Js.nullable<FieldNode.t>,
-    variables: option<Js.Dict.t<Js.Json.t>>,
+    variables: option<RescriptCore.Dict.t<Js.Json.t>>,
     isReference: bool,
     toReference: unimplemented,
     storage: Js.nullable<StorageType.t>,

diff --git a/src/@apollo/client/core/ApolloClient__Core_ApolloClient.res b/src/@apollo/client/core/ApolloClient__Core_ApolloClient.res
@@ -200,7 +200,7 @@ module ApolloClientOptions = {
     type t = {
       uri: option<UriFunction.Js_.t>,
       credentials: option<string>,
-      headers: option<Js.Dict.t<string>>,
+      headers: option<RescriptCore.Dict.t<string>>,
       link: option<ApolloLink.Js_.t>,
       cache: ApolloCache.t<Js.Json.t>, // Non-Js_ ApolloCache is correct here
       ssrForceFetchDelay: option<int>,
@@ -220,7 +220,7 @@ module ApolloClientOptions = {
   type t = {
     uri: option<UriFunction.t>,
     credentials: option<string>,
-    headers: option<Js.Dict.t<string>>,
+    headers: option<RescriptCore.Dict.t<string>>,
     link: option<ApolloLink.t>,
     cache: ApolloCache.t<Js.Json.t>,
     ssrForceFetchDelay: option<int>,
@@ -574,7 +574,7 @@ let preserveJsPropsAndContext: (Js_.t, t) => t = %raw(`
 let make: (
   ~uri: UriFunction.t=?,
   ~credentials: string=?,
-  ~headers: Js.Dict.t<string>=?,
+  ~headers: RescriptCore.Dict.t<string>=?,
   ~link: ApolloLink.t=?,
   ~cache: ApolloCache.t<Js.Json.t>,
   ~ssrForceFetchDelay: int=?,

diff --git a/src/@apollo/client/core/ApolloClient__Core_Types.res b/src/@apollo/client/core/ApolloClient__Core_Types.res
@@ -169,20 +169,17 @@ module MutationQueryReducersMap = {
     // }> = {
     //     [queryName: string]: MutationQueryReducer<T>;
     // };
-    type t<'jsData> = Js.Dict.t<MutationQueryReducer.Js_.t<'jsData>>
+    type t<'jsData> = RescriptCore.Dict.t<MutationQueryReducer.Js_.t<'jsData>>
   }
 
-  type t<'data> = Js.Dict.t<MutationQueryReducer.t<'data>>
+  type t<'data> = RescriptCore.Dict.t<MutationQueryReducer.t<'data>>
 
   let toJs: (t<'data>, ~safeParse: Types.safeParse<'data, 'jsData>) => Js_.t<'jsData> = (
     t,
     ~safeParse,
   ) =>
-    Js.Dict.map(
-      mutationQueryReducer => (json, options) =>
-        mutationQueryReducer->MutationQueryReducer.toJs(~safeParse, json, options),
-      t,
-    )
+    RescriptCore.Dict.mapValues(t, mutationQueryReducer => (json, options) =>
+      mutationQueryReducer->MutationQueryReducer.toJs(~safeParse, json, options))
 }
 
 module Resolvers = {
@@ -192,7 +189,7 @@ module Resolvers = {
     //         [field: string]: Resolver;
     //     };
     // }
-    type t = Js.Dict.t<Js.Dict.t<Resolver.Js_.t>>
+    type t = RescriptCore.Dict.t<RescriptCore.Dict.t<Resolver.Js_.t>>
   }
   type t = Js_.t
 }
diff --git a/src/@apollo/client/utilities/graphql/ApolloClient__Utilities_Graphql_Fragments.res b/src/@apollo/client/utilities/graphql/ApolloClient__Utilities_Graphql_Fragments.res
@@ -2,7 +2,7 @@ module FragmentDefinitionNode = ApolloClient__Graphql.Language.Ast.FragmentDefin
 
 module FragmentMap = {
   module Js_ = {
-    type t = Js.Dict.t<FragmentDefinitionNode.t>
+    type t = RescriptCore.Dict.t<FragmentDefinitionNode.t>
   }
 
   type t = Js_.t

diff --git a/src/graphql/error/ApolloClient__Graphql_Error_GraphQLError.res b/src/graphql/error/ApolloClient__Graphql_Error_GraphQLError.res
@@ -31,5 +31,5 @@ type t = {
   source: option<Source.t>,
   position: option<array<int>>,
   originalError: Js.nullable<Js.Exn.t>,
-  extensions: option<Js.Dict.t<Js.Json.t>>,
+  extensions: option<RescriptCore.Dict.t<Js.Json.t>>,
 }