Merge pull request #121 from jeddeloh/bucklescript-cleanup

Bucklescript cleanup

Author: jeddeloh

README.md

@@ -1,5 +1,3 @@
-> ⚠️ **NOTICE:** This package recently changed and is now published as `rescript-apollo-client`!
-
 <p align="center">
     <img src="assets/logo-mashup.svg" alt="Logo">
   	<br><br>

docs/4d54d076.3ea537c3.js

@@ -83,7 +83,7 @@ Sometimes multiple types were required to represent a single type in TypeScript.
 
 ### Binding to Methods
 
-Prefer T-first with `[@bs.send]`. Again, `externals` go under a `Js_` module with a `type t` and any types they reference should be `Js_.t` versions.
+Prefer T-first with `[@send]`. Again, `externals` go under a `Js_` module with a `type t` and any types they reference should be `Js_.t` versions.
 
 ### Binding to Objects
 
@@ -97,7 +97,7 @@ Prefer standard variants. `jsConverter` works great for ints, but otherwise use
 
 - Prefer T-first because that's the Reason community default
 - Hooks are T-last because that makes sense given their usage
-- ApolloClient methods are a Frankenstein T-first _and_ T-last because they want to maintain similarity with hooks api, but are also T-first due to [@bs.send] and T-first preference
+- ApolloClient methods are a Frankenstein T-first _and_ T-last because they want to maintain similarity with hooks api, but are also T-first due to [@send] and T-first preference
 
 ### Reasoning behind `Js_` modules
 
@@ -152,7 +152,7 @@ module TypeName = {
 +     optionalProp: option(bool),
 +   }
 
-+   [@bs.new] [@bs.module "someModule"]
++   [@new] [@module "someModule"]
 +   external make = (make_options('jsData)) => t = "someClass";
   }
 
@@ -193,7 +193,7 @@ module TypeName = {
       optionalProp: option(bool),
 +     reusedType: ReusedType.Js_.t
     }
-    [@bs.new] [@bs.module "someModule"]
+    [@new] [@module "someModule"]
     external make = (make_options('jsData)) => t = "someClass";
   }
 
@@ -239,7 +239,7 @@ module TypeName = {
       optionalProp: option(bool),
       reusedType: ReusedType.Js_.t
     }
-    [@bs.new] [@bs.module "someModule"]
+    [@new] [@module "someModule"]
     external make = (make_options('jsData)) => t = "someClass";
   }
 

docs/docs/contributing/index.html

@@ -36,7 +36,7 @@ module ApolloCache = {
     type reference
 
     // readFragment<FragmentType, TVariables = any>(options: DataProxy.Fragment<TVariables>, optimistic?: boolean): FragmentType | null;
-    @bs.send
+    @send
     external readFragment: (
       t<'tSerialized>,
       ~options: DataProxy.Fragment.Js_.t,
@@ -45,22 +45,22 @@ module ApolloCache = {
     ) => Js.nullable<'jsData> = "readFragment"
 
     // readQuery<QueryType, TVariables = any>(options: DataProxy.Query<TVariables>, optimistic?: boolean): QueryType | null;
-    @bs.send
+    @send
     external readQuery: (
       t<'tSerialized>,
       ~options: DataProxy.Query.Js_.t<'jsVariables>,
       ~optimistic: option<bool>,
     ) => Js.nullable<'jsData> = "readQuery"
 
     // writeFragment<TData = any, TVariables = any>(options: Cache.WriteFragmentOptions<TData, TVariables>): Reference | undefined;
-    @bs.send
+    @send
     external writeFragment: (
       t<'tSerialized>,
       ~options: DataProxy.WriteFragmentOptions.Js_.t<'jsData, 'jsVariables>,
     ) => option<reference> = "writeFragment"
 
     // writeQuery<TData = any, TVariables = any>(options: Cache.WriteQueryOptions<TData, TVariables>): Reference | undefined;
-    @bs.send
+    @send
     external writeQuery: (
       t<'tSerialized>,
       ~options: DataProxy.WriteQueryOptions.Js_.t<'jsData, 'jsVariables>,
@@ -70,15 +70,15 @@ module ApolloCache = {
   type reference = Js_.reference
 
   type t<'tSerialized> = {
-    @bs.as("rescript_readFragment")
+    @as("rescript_readFragment")
     readFragment: 'data. (
       ~fragment: module(Fragment with type t = 'data),
       ~id: string,
       ~optimistic: bool=?,
       ~fragmentName: string=?,
       unit,
     ) => option<Types.parseResult<'data>>,
-    @bs.as("rescript_readQuery")
+    @as("rescript_readQuery")
     readQuery: 'data 'variables 'jsVariables. (
       ~query: module(Operation with
         type t = 'data
@@ -90,7 +90,7 @@ module ApolloCache = {
       ~optimistic: bool=?,
       'variables,
     ) => option<Types.parseResult<'data>>,
-    @bs.as("rescript_writeFragment")
+    @as("rescript_writeFragment")
     writeFragment: 'data. (
       ~fragment: module(Fragment with type t = 'data),
       ~data: 'data,
@@ -99,7 +99,7 @@ module ApolloCache = {
       ~fragmentName: string=?,
       unit,
     ) => option<reference>,
-    @bs.as("rescript_writeQuery")
+    @as("rescript_writeQuery")
     writeQuery: 'data 'variables 'jsVariables. (
       ~query: module(Operation with
         type t = 'data
@@ -115,7 +115,7 @@ module ApolloCache = {
   }
 
   let preserveJsPropsAndContext: (Js_.t<'a>, t<'a>) => t<'a> = (js, t) =>
-    %bs.raw(`
+    %raw(`
           function (js, t) {
             return Object.assign(js, t)
           }

documentationWebsite/docs/contributing.md

@@ -12,18 +12,18 @@ module InMemoryCacheConfig = {
     //     typePolicies?: TypePolicies;
     // }
     // NOTE: Using deriving abstract here because passing properties that are undefined has effects
-    @bs.deriving(abstract)
+    @deriving(abstract)
     type t = {
-      @bs.optional
+      @optional
       resultCaching: bool,
-      @bs.optional
+      @optional
       possibleTypes: PossibleTypesMap.Js_.t,
-      @bs.optional
+      @optional
       typePolicies: TypePolicies.Js_.t,
       // ...extends ApolloReducerConfig
-      @bs.optional
+      @optional
       dataIdFromObject: KeyFieldsFunction.Js_.t,
-      @bs.optional
+      @optional
       addTypename: bool,
     }
   }
@@ -67,7 +67,7 @@ module Js_ = {
   // }
   type t = ApolloCache.Js_.t<Js.Json.t>
 
-  @bs.module("@apollo/client") @bs.new
+  @module("@apollo/client") @new
   external make: InMemoryCacheConfig.Js_.t => t = "InMemoryCache"
 }
 

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

@@ -39,7 +39,7 @@ module KeyFieldsFunction = {
 }
 
 // export declare const defaultDataIdFromObject: KeyFieldsFunction;
-@bs.module("@apollo/client")
+@module("@apollo/client")
 external defaultDataIdFromObject: KeyFieldsFunction.t = "defaultDataIdFromObject"
 
 module TypePolicy = {

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

@@ -49,12 +49,12 @@ module FieldFunctionOptions = {
       storage: Js.nullable<StorageType.Js_.t>,
       cache: ApolloCache.t<Js.Json.t>, // Non-Js_ ApolloCache is correct here
     }
-    @bs.send external canRead: t => CanReadFunction.Js_.t = "canRead"
-    @bs.send
+    @send external canRead: t => CanReadFunction.Js_.t = "canRead"
+    @send
     external mergeObjects: (t, ~existing: Js.Json.t, ~incoming: Js.Json.t) => option<Js.Json.t> =
       "canRead"
-    @bs.send external readField: t => ReadFieldFunction.Js_.t = "readField"
-    @bs.send
+    @send external readField: t => ReadFieldFunction.Js_.t = "readField"
+    @send
     external toReference: t => ToReferenceFunction.t = "toReference"
   }
 

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

@@ -7,7 +7,7 @@ module ReactiveVar = {
 }
 
 module Js_ = {
-  @bs.module("@apollo/client")
+  @module("@apollo/client")
   external makeVar: 'value => ReactiveVar.Js_.t<'value> = "makeVar"
 }