string_of_int} className="person">
{React.string("Id: ")}
- {React.string(person##id)}
+ {person##id |> string_of_int |> React.string}
{React.string("Name: ")}
diff --git a/examples/persons/src/Root.re b/examples/persons/src/Root.re
index 302fdc2..d5c3ac0 100644
--- a/examples/persons/src/Root.re
+++ b/examples/persons/src/Root.re
@@ -21,7 +21,10 @@ let make = () => {
let editPersonUpdate = (client, mutationResult) => {
let data =
mutationResult##data
- ->Belt.Option.flatMap(result => result##updatePerson);
+ ->Belt.Option.flatMap(result => result##update_persons)
+ ->Belt.Option.flatMap(update_persons =>
+ update_persons##returning->Belt.Array.get(0)
+ );
switch (data) {
| Some(person) =>
FilterByNameCache.updateCache(client, person, filterName)
@@ -110,4 +113,4 @@ let make = () => {
}}
;
-};
\ No newline at end of file
+};
diff --git a/examples/persons/src/SubscribeToMore.re b/examples/persons/src/SubscribeToMore.re
index 8cd54f2..54d535a 100644
--- a/examples/persons/src/SubscribeToMore.re
+++ b/examples/persons/src/SubscribeToMore.re
@@ -1,7 +1,7 @@
module GetAllPersons = [%graphql
{|
query getAllPersons {
- allPersons {
+ persons {
id
name
}
@@ -14,11 +14,9 @@ module GetAllPersons = [%graphql
module NewPerson = [%graphql
{|
subscription {
- Person {
- node {
- id
- name
- }
+ persons {
+ id
+ name
}
}
|}
@@ -27,26 +25,19 @@ module NewPerson = [%graphql
// Defining those types and "%identity" converters below allows us to
// write the updateQuery in pure Reason and avoid bs.raw alltogether
type person = {
- id: string,
+ __typename: string,
+ id: int,
name: string,
};
-type allPersons = {
+type persons = {
__typename: string,
- allPersons: array(person),
+ persons: array(person),
};
-type subscriptionNode = {node: person};
-
-[@bs.deriving abstract]
-type newPerson = {
- [@bs.as "Person"]
- person: subscriptionNode,
-};
-
-external resultToJson: allPersons => Js.Json.t = "%identity";
-external toPrevResult: Js.Json.t => Js.Nullable.t(allPersons) = "%identity";
-external toSubscriptionData: Js.Json.t => Js.Nullable.t(newPerson) =
+external resultToJson: persons => Js.Json.t = "%identity";
+external toPrevResult: Js.Json.t => Js.Nullable.t(persons) = "%identity";
+external toSubscriptionData: Js.Json.t => Js.Nullable.t(persons) =
"%identity";
[@react.component]
@@ -63,23 +54,26 @@ let make = () => {
subscribe(
~document=newPersonDocument,
~updateQuery=
- (maybePrevResult, maybeSubscriptionPayload) =>
- switch (
- maybePrevResult |> toPrevResult |> Js.Nullable.toOption,
- maybeSubscriptionPayload##subscriptionData##data
+ (maybePrevResult, maybeSubscriptionPayload) => {
+ let prevResultOption =
+ maybePrevResult |> toPrevResult |> Js.Nullable.toOption;
+ let subscriptionDataData =
+ maybeSubscriptionPayload##subscriptionData##data;
+ let subscriptionDataOption =
+ subscriptionDataData
|> toSubscriptionData
- |> Js.Nullable.toOption,
- ) {
+ |> Js.Nullable.toOption;
+
+ switch (prevResultOption, subscriptionDataOption) {
| (Some(prev), Some(newData)) =>
{
...prev, // NOTE: This only works with BuckleScript 7
- allPersons:
- prev.allPersons
- ->Belt.Array.concat([|newData->personGet.node|]),
+ persons: newData.persons,
}
->resultToJson
| _ => maybePrevResult
- },
+ };
+ },
(),
);
@@ -92,13 +86,13 @@ let make = () => {
{switch (simple) {
| Loading =>
{React.string("Loading...")}
| Data(data) =>
- data##allPersons
+ data##persons
->Belt.Array.reverse
->Belt.Array.map(person =>
-
+
string_of_int} className="person">
{React.string("Id: ")}
- {React.string(person##id)}
+ {React.string(person##id |> string_of_int)}
diff --git a/examples/persons/src/fragments/FilterByAgeFragment.re b/examples/persons/src/fragments/FilterByAgeFragment.re
index 5a92f67..0b2c1ed 100644
--- a/examples/persons/src/fragments/FilterByAgeFragment.re
+++ b/examples/persons/src/fragments/FilterByAgeFragment.re
@@ -4,7 +4,7 @@ open ApolloHooks;
module PersonsOlderThanQuery = [%graphql
{|
query getPersonsOlderThan($age: Int!) {
- allPersons(filter: { age_gte: $age } ) {
+ persons(where: { age: { _gt: $age } } ) {
...PersonFragment.Person
}
}
@@ -25,7 +25,7 @@ let make = (~age) => {
| Data(data) =>
{"There are "
- ++ (data##allPersons->Belt.Array.length |> string_of_int)
+ ++ (data##persons->Belt.Array.length |> string_of_int)
++ " people older than "
++ string_of_int(age)
|> React.string}
diff --git a/examples/persons/src/fragments/Fragments.re b/examples/persons/src/fragments/Fragments.re
index 831f481..b4460da 100644
--- a/examples/persons/src/fragments/Fragments.re
+++ b/examples/persons/src/fragments/Fragments.re
@@ -25,7 +25,7 @@
// ```
module PersonFragment = [%graphql
{|
- fragment person on Person {
+ fragment person on persons {
id
name
age
@@ -34,15 +34,15 @@ module PersonFragment = [%graphql
];
module PersonIdFragment = [%graphql
{|
- fragment person on Person {
+ fragment person on persons {
id
}
|}
];
module PersonAgeFragment = [%graphql
{|
- fragment person on Person {
+ fragment person on persons {
age
}
|}
-];
\ No newline at end of file
+];
diff --git a/examples/persons/src/fragments/LoadMoreFragments.re b/examples/persons/src/fragments/LoadMoreFragments.re
index ed22955..710d2bc 100644
--- a/examples/persons/src/fragments/LoadMoreFragments.re
+++ b/examples/persons/src/fragments/LoadMoreFragments.re
@@ -1,7 +1,7 @@
module GetAllPersonsQuery = [%graphql
{|
query getAllPersons($skip: Int!, $first: Int!) {
- allPersons(skip: $skip, first: $first) {
+ persons(offset: $skip, limit: $first) {
...Fragments.PersonFragment.Person
}
}
@@ -23,7 +23,7 @@ let make = () => {
let handleLoadMore = _ => {
let skip =
switch (full) {
- | {data: Some(data)} => data##allPersons->Belt.Array.length
+ | {data: Some(data)} => data##persons->Belt.Array.length
| _ => 0
};
@@ -36,7 +36,7 @@ let make = () => {
if (!fetchMoreResult) return prevResult;
return {
...fetchMoreResult,
- allPersons: prevResult.allPersons.concat(fetchMoreResult.allPersons)
+ persons: prevResult.persons.concat(fetchMoreResult.persons)
};
}
|}
@@ -51,7 +51,7 @@ let make = () => {
| {loading: true, data: None} =>
{React.string("Loading...")}
| {data: Some(data)} =>
<>
-
+