diff --git a/README.md b/README.md
index b9f722c..678aac7 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Reason bindings for the official @apollo/react-hooks
yarn add reason-apollo-hooks reason-apollo @apollo/react-hooks
```
-Follow the installation instructions of [graphql_ppx](https://github.com/mhallin/graphql_ppx).
+Follow the installation instructions of [graphql_ppx_re](https://github.com/baransu/graphql_ppx_re).
Then update your bsconfig.json
@@ -36,9 +36,9 @@ let client =
ReasonApollo.createApolloClient(~link=httpLink, ~cache=inMemoryCache, ());
let app =
-
+
...
-
+
```
### Usage with reason-apollo
@@ -50,9 +50,9 @@ let client = ... // create Apollo client
ReactDOMRe.renderToElementWithId(
-
+
-
+
,
"root",
);
@@ -63,7 +63,9 @@ ReactDOMRe.renderToElementWithId(
## useQuery
```reason
-module UserQueryConfig = [%graphql {|
+open ApolloHooks
+
+module UserQuery = [%graphql {|
query UserQuery {
currentUser {
name
@@ -71,12 +73,10 @@ module UserQueryConfig = [%graphql {|
}
|}];
-module UserQuery = ReasonApolloHooks.Query.Make(UserQueryConfig);
-
[@react.component]
let make = () => {
/* Both variant and records available */
- let (simple, _full) = UserQuery.use();
+ let (simple, _full) = useQuery(UserQuery.definition);
{
@@ -98,7 +98,7 @@ Using the `full` record for more advanced cases
[@react.component]
let make = () => {
/* Both variant and records available */
- let (_simple, full) = UserQuery.use(());
+ let (_simple, full) = useQuery(UserQuery.definition);
{
@@ -117,33 +117,33 @@ let make = () => {
Using `fetchPolicy` to change interactions with the `apollo` cache, see [apollo docs](https://www.apollographql.com/docs/react/api/react-apollo/#optionsfetchpolicy).
```reason
-let (_simple, full) = UserQuery.use(~fetchPolicy=NetworkOnly, ());
+let (_simple, full) = useQuery(~fetchPolicy=NetworkOnly, UserQuery.definition);
```
Using `errorPolicy` to change how errors are handled, see [apollo docs](https://www.apollographql.com/docs/react/api/react-apollo/#optionserrorpolicy).
```reason
-let (simple, _full) = UserQuery.use(~errorPolicy=All, ());
+let (simple, _full) = useQuery(~errorPolicy=All, UserQuery.definition);
```
Using `skip` to skip query entirely, see [apollo docs](https://www.apollographql.com/docs/react/api/react-apollo/#configskip).
```reason
let (simple, _full) =
- UserQuery.use(
+ useQuery(
~skip=
- switch (val) {
+ switch (value) {
| None => true
| _ => false
},
- (),
+ UserQuery.definition,
);
```
## useMutation
```reason
-module ScreamMutationConfig = [%graphql {|
+module ScreamMutation = [%graphql {|
mutation ScreamMutation($screamLevel: Int!) {
scream(level: $screamLevel) {
error
@@ -151,17 +151,40 @@ module ScreamMutationConfig = [%graphql {|
}
|}];
-module ScreamMutation = ReasonApolloHooks.Mutation.Make(ScreamMutationConfig);
+[@react.component]
+let make = () => {
+ /* Both variant and records available */
+ let ( screamMutation, _simple, _full ) = useMutation(~variables=ScreamMutation.makeVariables(~screamLevel=10, ()), ScreamMutation.definition);
+ let scream = (_) => {
+ screamMutation()
+ |> Js.Promise.then_(result => {
+ switch(result) {
+ | Data(data) => ...
+ | Error(error) => ...
+ | NoData => ...
+ }
+ Js.Promise.resolve()
+ })
+ |> ignore
+ }
+
{"There are "
diff --git a/examples/persons/src/FilterByNameCache.re b/examples/persons/src/FilterByNameCache.re
index 9589ca8..05f8751 100644
--- a/examples/persons/src/FilterByNameCache.re
+++ b/examples/persons/src/FilterByNameCache.re
@@ -1,3 +1,5 @@
+open ApolloHooks;
+
/**
* Query response will be parsed using Config.parse from graphq_ppx before it is accessed in
* reason, but react-apollo will save it in cache in its original format, as a regular JS object,
@@ -8,7 +10,7 @@
* to serialize the parsed data back to its initial format, queries that will be updated manually
* in cache can't use any of those directive, unless you will take care of the serialization yourself.
*/
-module PersonsNameFilterConfig = [%graphql
+module PersonsNameFilterQuery = [%graphql
{|
query getPersonsWithName($name: String!) {
allPersons(filter: { name: $name } ) {
@@ -20,7 +22,7 @@ module PersonsNameFilterConfig = [%graphql
|}
];
-external cast: Js.Json.t => PersonsNameFilterConfig.t = "%identity";
+external cast: Js.Json.t => PersonsNameFilterQuery.t = "%identity";
type person = {
.
@@ -29,15 +31,12 @@ type person = {
"name": string,
};
-module PersonsNameFilterQuery =
- ReasonApolloHooks.Query.Make(PersonsNameFilterConfig);
-
/** example using cache */
module PersonsNameFilterReadQuery =
- ApolloClient.ReadQuery(PersonsNameFilterConfig);
+ ApolloClient.ReadQuery(PersonsNameFilterQuery);
module PersonsNameFilterWriteQuery =
- ApolloClient.WriteQuery(PersonsNameFilterConfig);
+ ApolloClient.WriteQuery(PersonsNameFilterQuery);
let updateFiltered = (person: person, name, filteredPersons: array(person)) =>
person##name === name
@@ -45,10 +44,8 @@ let updateFiltered = (person: person, name, filteredPersons: array(person)) =>
: filteredPersons->Belt.Array.keep(p => p##id !== person##id);
let updateCache = (client, person, name) => {
- let filterByNameQuery = PersonsNameFilterConfig.make(~name, ());
-
- let readQueryOptions =
- ReasonApolloHooks.Utils.toReadQueryOptions(filterByNameQuery);
+ let filterByNameQuery = PersonsNameFilterQuery.make(~name, ());
+ let readQueryOptions = toReadQueryOptions(filterByNameQuery);
// By default, apollo adds field __typename to the query and will use it
// to normalize data. Parsing the result with Config.parse will remove the field,
@@ -80,15 +77,15 @@ let updateCache = (client, person, name) => {
[@react.component]
let make = (~name) => {
- let getPersonsWithName = PersonsNameFilterConfig.make(~name, ());
-
let (simple, _full) =
- PersonsNameFilterQuery.use(~variables=getPersonsWithName##variables, ());
+ useQuery(
+ ~variables=PersonsNameFilterQuery.make(~name, ())##variables,
+ PersonsNameFilterQuery.definition,
+ );