Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix-uncurried-fragment-signature #297

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+6,958 −7,061
Draft

Fix-uncurried-fragment-signature #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221889c
re-run tests
illusionalsagacity Oct 9, 2024
018f8e1
fix: wrap fragment parse & serialize as uncurried
illusionalsagacity Oct 8, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ _esy
.merlin
node_modules
_build
_opam
_release
*.byte
*.native
Expand Down
18 changes: 9 additions & 9 deletions snapshot_tests/operations/expected/apollo/generate/argNamedQuery.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ argNamedQuery(query: $query)
}
{argNamedQuery: argNamedQuery}
}
let serializeVariables: t_variables => Raw.t_variables = inp => {
query: (a => a)((inp: t_variables).query),
}
let serializeVariables: t_variables => Raw.t_variables = (
inp => {query: (a => a)((inp: t_variables).query)}: t_variables => Raw.t_variables
)
let makeVariables = (~query, ()): t_variables => {query: query}
external unsafe_fromJson: Js.Json.t => Raw.t = "%identity"
external toJson: Raw.t => Js.Json.t = "%identity"
Expand Down Expand Up @@ -95,9 +95,9 @@ argNamedQuery(query: $query)
}
{argNamedQuery: argNamedQuery}
}
let serializeVariables: t_variables => Raw.t_variables = inp => {
query: (a => a)((inp: t_variables).query),
}
let serializeVariables: t_variables => Raw.t_variables = (
inp => {query: (a => a)((inp: t_variables).query)}: t_variables => Raw.t_variables
)
let makeVariables = (~query, ()): t_variables => {query: query}
external unsafe_fromJson: Js.Json.t => Raw.t = "%identity"
external toJson: Raw.t => Js.Json.t = "%identity"
Expand Down Expand Up @@ -147,9 +147,9 @@ argNamedQuery(query: $query)
}
{argNamedQuery: argNamedQuery}
}
let serializeVariables: t_variables => Raw.t_variables = inp => {
query: (a => a)((inp: t_variables).query),
}
let serializeVariables: t_variables => Raw.t_variables = (
inp => {query: (a => a)((inp: t_variables).query)}: t_variables => Raw.t_variables
)
let makeVariables = (~query, ()): t_variables => {query: query}
external unsafe_fromJson: Js.Json.t => Raw.t = "%identity"
external toJson: Raw.t => Js.Json.t = "%identity"
Expand Down
184 changes: 95 additions & 89 deletions snapshot_tests/operations/expected/apollo/generate/comment.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,95 +90,101 @@ nonrecursiveInput(arg: $arg)
}
{nonrecursiveInput: nonrecursiveInput}
}
let rec serializeVariables: t_variables => Raw.t_variables = inp => {
arg: (a => serializeInputObjectNonrecursiveInput(a))((inp: t_variables).arg),
}
and serializeInputObjectNonrecursiveInput: t_variables_NonrecursiveInput => Raw.t_variables_NonrecursiveInput = inp => {
nonNullableField: (a => a)((inp: t_variables_NonrecursiveInput).nonNullableField),
nullableArray: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return(
(
a =>
Js.Array2.map(a, b =>
(
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)(b)
)
)(b),
)
}
)((inp: t_variables_NonrecursiveInput).nullableArray),
field: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables_NonrecursiveInput).field),
enum: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return(
(
a =>
switch a {
| #FIRST => "FIRST"
| #SECOND => "SECOND"
| #THIRD => "THIRD"
}
)(b),
)
}
)((inp: t_variables_NonrecursiveInput).enum),
embeddedInput: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return(
(
a =>
Js.Array2.map(a, b =>
(
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return((a => serializeInputObjectEmbeddedInput(a))(b))
}
)(b)
)
)(b),
)
}
)((inp: t_variables_NonrecursiveInput).embeddedInput),
custom: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables_NonrecursiveInput).custom),
}
and serializeInputObjectEmbeddedInput: t_variables_EmbeddedInput => Raw.t_variables_EmbeddedInput = inp => {
field: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables_EmbeddedInput).field),
}
let rec serializeVariables: t_variables => Raw.t_variables = (
inp => {
arg: (a => serializeInputObjectNonrecursiveInput(a))((inp: t_variables).arg),
}: t_variables => Raw.t_variables
)
and serializeInputObjectNonrecursiveInput: t_variables_NonrecursiveInput => Raw.t_variables_NonrecursiveInput = (
inp => {
nonNullableField: (a => a)((inp: t_variables_NonrecursiveInput).nonNullableField),
nullableArray: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return(
(
a =>
Js.Array2.map(a, b =>
(
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)(b)
)
)(b),
)
}
)((inp: t_variables_NonrecursiveInput).nullableArray),
field: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables_NonrecursiveInput).field),
enum: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return(
(
a =>
switch a {
| #FIRST => "FIRST"
| #SECOND => "SECOND"
| #THIRD => "THIRD"
}
)(b),
)
}
)((inp: t_variables_NonrecursiveInput).enum),
embeddedInput: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return(
(
a =>
Js.Array2.map(a, b =>
(
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) =>
Js.Nullable.return((a => serializeInputObjectEmbeddedInput(a))(b))
}
)(b)
)
)(b),
)
}
)((inp: t_variables_NonrecursiveInput).embeddedInput),
custom: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables_NonrecursiveInput).custom),
}: t_variables_NonrecursiveInput => Raw.t_variables_NonrecursiveInput
)
and serializeInputObjectEmbeddedInput: t_variables_EmbeddedInput => Raw.t_variables_EmbeddedInput = (
inp => {
field: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables_EmbeddedInput).field),
}: t_variables_EmbeddedInput => Raw.t_variables_EmbeddedInput
)
let makeVariables = (~arg, ()): t_variables => {arg: arg}
and makeInputObjectNonrecursiveInput = (
~nonNullableField,
Expand Down
22 changes: 12 additions & 10 deletions snapshot_tests/operations/expected/apollo/generate/customScalars.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,18 @@ nonNullable
}
{customScalarField: customScalarField}
}
let serializeVariables: t_variables => Raw.t_variables = inp => {
opt: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables).opt),
req: (a => a)((inp: t_variables).req),
}
let serializeVariables: t_variables => Raw.t_variables = (
inp => {
opt: (
a =>
switch a {
| None => Js.Nullable.undefined
| Some(b) => Js.Nullable.return((a => a)(b))
}
)((inp: t_variables).opt),
req: (a => a)((inp: t_variables).req),
}: t_variables => Raw.t_variables
)
let makeVariables = (~opt=?, ~req, ()): t_variables => {opt, req}
external unsafe_fromJson: Js.Json.t => Raw.t = "%identity"
external toJson: Raw.t => Js.Json.t = "%identity"
Expand Down
34 changes: 19 additions & 15 deletions snapshot_tests/operations/expected/apollo/generate/customTypes.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,25 @@ module NullableString = {
| Red
| Green
| Blue
let parse: option<string> => t = color =>
switch color {
| Some("green") => Green
| Some("blue") => Blue
| Some("red") => Red
| Some(_)
| None =>
Red
}
let serialize: t => option<string> = color =>
switch color {
| Red => Some("red")
| Green => Some("green")
| Blue => Some("blue")
}
let parse: option<string> => t = (
color =>
switch color {
| Some("green") => Green
| Some("blue") => Blue
| Some("red") => Red
| Some(_)
| None =>
Red
}: option<string> => t
)
let serialize: t => option<string> = (
color =>
switch color {
| Red => Some("red")
| Green => Some("green")
| Blue => Some("blue")
}: t => option<string>
)
}

module DateTime = {
Expand Down
22 changes: 12 additions & 10 deletions snapshot_tests/operations/expected/apollo/generate/enumInput.res.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,18 @@ enumInput(arg: $arg)
}
{enumInput: enumInput}
}
let serializeVariables: t_variables => Raw.t_variables = inp => {
arg: (
a =>
switch a {
| #FIRST => "FIRST"
| #SECOND => "SECOND"
| #THIRD => "THIRD"
}
)((inp: t_variables).arg),
}
let serializeVariables: t_variables => Raw.t_variables = (
inp => {
arg: (
a =>
switch a {
| #FIRST => "FIRST"
| #SECOND => "SECOND"
| #THIRD => "THIRD"
}
)((inp: t_variables).arg),
}: t_variables => Raw.t_variables
)
let makeVariables = (~arg, ()): t_variables => {arg: arg}
external unsafe_fromJson: Js.Json.t => Raw.t = "%identity"
external toJson: Raw.t => Js.Json.t = "%identity"
Expand Down
Loading