Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/relay
Submodule relay updated 7736 files
7 changes: 3 additions & 4 deletions packages/rescript-relay/__tests__/TestRelayUserResolver.res
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
/**
* @RelayResolver
*
* @onType User
* @fieldName fullName
* @relayField User.fullName: String
* @rootFragment TestRelayUserResolver
*
* A users full name.
Expand All @@ -19,3 +16,5 @@ module Fragment = %relay(`
let default = Fragment.makeRelayResolver(user => {
Some(`${user.firstName} ${user.lastName}`)
})

let fullName = default
4 changes: 2 additions & 2 deletions packages/rescript-relay/__tests__/Test_connections.res
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ module Test = {
<button
onClick={_ => {
addFriend(
~variables=AddFriendMutation.makeVariables(
~variables=TestConnections_AddFriendMutation_graphql.Types.makeVariables(
~connections={
open TestConnections_user_graphql
[user.__id->makeConnectionId(~beforeDate=makeDate(), ())]
[user.__id->makeConnectionId(~beforeDate=makeDate())]
},
~friendId="123",
),
Expand Down
6 changes: 3 additions & 3 deletions packages/rescript-relay/__tests__/Test_customScalars.res
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module Test = {
let query = {
Query.use(
~variables={
beforeDate: Some(Js.Date.fromFloat(1514764800000.)),
beforeDate: Js.Date.fromFloat(1514764800000.),
number: [2],
},
(),
Expand All @@ -37,9 +37,9 @@ module Test = {
</div>
<div>
{switch query.member {
| Some(#User(user)) =>
| Some(User(user)) =>
React.string("member createdAt: " ++ user.createdAt->Js.Date.getTime->Js.Float.toString)
| Some(#UnselectedUnionMember(_)) | None => React.null
| Some(UnselectedUnionMember(_)) | None => React.null
}}
</div>
</>
Expand Down
12 changes: 6 additions & 6 deletions packages/rescript-relay/__tests__/Test_fragment.res
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ module TestPlural = {
user.firstName ++
(" is " ++
switch user.onlineStatus {
| Some(#Online) => "online"
| Some(#Offline) => "offline"
| Some(Online) => "online"
| Some(Offline) => "offline"
| _ => "-"
}),
)}
Expand Down Expand Up @@ -96,9 +96,9 @@ module Test = {
let _justToCheckThingsWork = switch withUnsafeEnumOpt {
| Some(data) =>
switch data.onlineStatus {
| None | Some(#Online) => "Online"
| Some(#Offline) => "Offline"
| Some(#Idle) => "Idle"
| None | Some(Online) => "Online"
| Some(Offline) => "Offline"
| Some(Idle) => "Idle"
}
| None => ""
}
Expand All @@ -119,7 +119,7 @@ module Test = {
data.firstName ++
(" is " ++
switch data.onlineStatus {
| Some(#Online) => "online"
| Some(Online) => "online"
| _ => "-"
}),
)}
Expand Down
12 changes: 6 additions & 6 deletions packages/rescript-relay/__tests__/Test_fragment_required.res
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ module Test = {
React.string(
"Plain fragment: " ++
switch fragment.onlineStatus {
| #Online => "Online"
| #Idle => "Idle"
| #Offline => "Offline"
| Online => "Online"
| Idle => "Idle"
| Offline => "Offline"
| _ => "-"
},
)
Expand All @@ -77,9 +77,9 @@ module Test = {
| Some(user) =>
Some(
switch user.onlineStatus {
| #Online => "Online"
| #Idle => "Idle"
| #Offline => "Offline"
| Online => "Online"
| Idle => "Idle"
| Offline => "Offline"
| _ => "-"
},
)
Expand Down
34 changes: 15 additions & 19 deletions packages/rescript-relay/__tests__/Test_localPayload.res
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module ViaNodeInterface = %relay(`
query TestLocalPayloadViaNodeInterfaceQuery($id: ID!) @raw_response_type {
node(id: $id) {
... on User {
...TestLocalPayload_user
...TestLocalPayload_user @alias
}
}
}
Expand Down Expand Up @@ -77,21 +77,21 @@ module Test = {
->Belt.Option.getWithDefault([])
->Belt.Array.keepMap(v => v)
->Belt.Array.get(0) {
| Some(#Group({name, topMember})) =>
| Some(Group({name, topMember})) =>
`Group ${name}, top member: ${switch topMember {
| Some(#User({firstName})) => firstName
| Some(User({firstName})) => firstName
| _ => "-"
}}`
| Some(#User({firstName})) => `User ${firstName}`
| Some(User({firstName})) => `User ${firstName}`
| _ => "-"
}}`,
)}
</div>
<div>
{React.string(
`(singular) Member of: ${switch user.memberOfSingular {
| Some(#Group({name})) => `Group ${name}`
| Some(#User({firstName})) => `User ${firstName}`
| Some(Group({name})) => `Group ${name}`
| Some(User({firstName})) => `User ${firstName}`
| _ => "-"
}}`,
)}
Expand All @@ -104,16 +104,15 @@ module Test = {
~payload={
loggedInUser: {
id: data.loggedInUser.id,
localStatus: Some(#On),
onlineStatus: Some(#Online),
localStatus: Some(On),
onlineStatus: Some(Online),
firstName: "AnotherFirst",
avatarUrl: None,
memberOf: None,
memberOfSingular: Some(
#Group({
Group({
name: "Another Group",
id: "group-2",
__typename: #Group,
__isNode: #Group,
}),
),
Expand All @@ -128,33 +127,30 @@ module Test = {
~environment,
~variables={id: data.loggedInUser.id},
~payload={
node: Some({
node: Some(User({
id: data.loggedInUser.id,
localStatus: Some(#On),
localStatus: Some(On),
firstName: "AnotherFirst",
onlineStatus: Some(#Online),
onlineStatus: Some(Online),
avatarUrl: None,
__typename: #User,
memberOfSingular: None,
memberOf: Some([
Some(
#Group({
Group({
name: "Some Group",
__typename: #Group,
__isNode: #Group,
id: "group-1",
topMember: Some(
#User({
User({
firstName: "Some User",
id: "user-2",
__typename: #User,
__isNode: #User,
}),
),
}),
),
]),
}),
})),
},
)}>
{React.string("Update locally via Node interface")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ module RenderMe = {
let make = () => {
let query = Query.use(~variables=(), ~fetchPolicy=StoreOnly, ())

switch query.node {
| Some(user) => React.string("2: " ++ user.firstName)
| None => React.string("-")
}
switch query.node {
| Some(User(user)) => React.string("2: " ++ user.firstName)
| Some(UnselectedUnionMember(_)) => React.string("-")
| None => React.string("-")
}
}
}

Expand Down
Loading
Loading