From 538560ebde64870f88a3c620d03b4af11da82263 Mon Sep 17 00:00:00 2001 From: Jaap Frolich Date: Fri, 23 Sep 2022 15:09:31 +0200 Subject: [PATCH] use Js.Array2 (#285) --- rescript-runtime/graphql_ppx_runtime.ml | 27 +- .../expected/apollo/compile/interface.re.txt | 16 +- .../expected/apollo/generate/comment.re.txt | 52 +- .../generate/explicit_object_record.re.txt | 120 ++- .../apollo/generate/extensions.re.txt | 121 ++- .../apollo/generate/fragmentDefinition.re.txt | 228 +++-- .../apollo/generate/fragmentInFragment.re.txt | 64 +- .../generate/fragmentOnInterface.re.txt | 32 +- .../generate/fragmentvariableinput.re.txt | 76 +- .../expected/apollo/generate/interface.re.txt | 873 +++++++++--------- .../expected/apollo/generate/lists.re.txt | 60 +- .../expected/apollo/generate/listsArgs.re.txt | 48 +- .../apollo/generate/listsInput.re.txt | 48 +- .../expected/apollo/generate/mutation.re.txt | 112 ++- .../apollo/generate/nonrecursiveInput.re.txt | 104 +-- .../generate/omitFutureValueEnum.re.txt | 332 ++++--- .../apollo/generate/tagged_template.re.txt | 60 +- .../expected/apollo/generate/variant.re.txt | 2 +- .../expected/records/compile/interface.re.txt | 16 +- .../expected/records/generate/comment.re.txt | 52 +- .../generate/explicit_object_record.re.txt | 120 ++- .../records/generate/extensions.re.txt | 121 ++- .../generate/fragmentDefinition.re.txt | 216 ++--- .../generate/fragmentInFragment.re.txt | 64 +- .../generate/fragmentOnInterface.re.txt | 32 +- .../generate/fragmentvariableinput.re.txt | 60 +- .../records/generate/interface.re.txt | 784 ++++++++-------- .../expected/records/generate/lists.re.txt | 60 +- .../records/generate/listsArgs.re.txt | 48 +- .../records/generate/listsInput.re.txt | 48 +- .../expected/records/generate/mutation.re.txt | 89 +- .../records/generate/nonrecursiveInput.re.txt | 104 +-- .../generate/omitFutureValueEnum.re.txt | 263 +++--- .../records/generate/tagged_template.re.txt | 60 +- .../expected/records/generate/variant.re.txt | 2 +- .../template/compile/interface.re.txt | 16 +- .../expected/template/generate/comment.re.txt | 52 +- .../generate/explicit_object_record.re.txt | 120 ++- .../template/generate/extensions.re.txt | 121 ++- .../generate/fragmentDefinition.re.txt | 216 ++--- .../generate/fragmentInFragment.re.txt | 64 +- .../generate/fragmentOnInterface.re.txt | 32 +- .../generate/fragmentvariableinput.re.txt | 60 +- .../template/generate/interface.re.txt | 784 ++++++++-------- .../expected/template/generate/lists.re.txt | 60 +- .../template/generate/listsArgs.re.txt | 48 +- .../template/generate/listsInput.re.txt | 48 +- .../template/generate/mutation.re.txt | 89 +- .../generate/nonrecursiveInput.re.txt | 104 +-- .../generate/omitFutureValueEnum.re.txt | 263 +++--- .../template/generate/tagged_template.re.txt | 60 +- .../expected/template/generate/variant.re.txt | 2 +- snapshot_tests/utilities/GraphQL_PPX.ml | 30 +- src/ppx/output_parser.ml | 13 +- src/ppx/output_serializer.ml | 14 +- 55 files changed, 3210 insertions(+), 3500 deletions(-) diff --git a/rescript-runtime/graphql_ppx_runtime.ml b/rescript-runtime/graphql_ppx_runtime.ml index 248320a5..0df5dd38 100644 --- a/rescript-runtime/graphql_ppx_runtime.ml +++ b/rescript-runtime/graphql_ppx_runtime.ml @@ -18,24 +18,21 @@ let rec deepMerge (json1 : Js.Json.t) (json2 : Js.Json.t) = with | (_, true, _), (_, true, _) -> (Obj.magic - (Js.Array.mapi - (fun el1 idx -> - let el2 = Js.Array.unsafe_get (Obj.magic json2) idx in - match Js.typeof el2 = "object" with - | true -> deepMerge el1 el2 - | false -> el2) - (Obj.magic json1)) + (Js.Array2.mapi (Obj.magic json1) (fun el1 idx -> + let el2 = Js.Array2.unsafe_get (Obj.magic json2) idx in + match Js.typeof el2 = "object" with + | true -> deepMerge el1 el2 + | false -> el2)) : Js.Json.t) | (false, false, true), (false, false, true) -> let obj1 = clone (Obj.magic json1) in let obj2 = Obj.magic json2 in - Js.Dict.keys obj2 - |> Js.Array.forEach (fun key -> - let existingVal = (Js.Dict.unsafeGet obj1 key : Js.Json.t) in - let newVal = (Js.Dict.unsafeGet obj2 key : Js.Json.t) in - Js.Dict.set obj1 key - (match Js.typeof existingVal <> "object" with - | true -> newVal - | false -> Obj.magic (deepMerge existingVal newVal))); + Js.Array2.forEach (Js.Dict.keys obj2) (fun key -> + let existingVal = (Js.Dict.unsafeGet obj1 key : Js.Json.t) in + let newVal = (Js.Dict.unsafeGet obj2 key : Js.Json.t) in + Js.Dict.set obj1 key + (match Js.typeof existingVal <> "object" with + | true -> newVal + | false -> Obj.magic (deepMerge existingVal newVal))); Obj.magic obj1 | (_, _, _), (_, _, _) -> json2 diff --git a/snapshot_tests/operations/expected/apollo/compile/interface.re.txt b/snapshot_tests/operations/expected/apollo/compile/interface.re.txt index 57a154dd..07b79a20 100644 --- a/snapshot_tests/operations/expected/apollo/compile/interface.re.txt +++ b/snapshot_tests/operations/expected/apollo/compile/interface.re.txt @@ -285,22 +285,22 @@ function parse$3(value) { function serialize$3(value) { var value$1 = value.users; var users = value$1.map(function (value) { - var value$1 = value.id; - var value$2 = value.__typename; - var value$3 = value.fragment; + var value$1 = value.fragment; var tmp; - if (value$3.NAME === "AdminUser") { - var value$4 = value$3.VAL.id; + if (value$1.NAME === "AdminUser") { + var value$2 = value$1.VAL.id; tmp = { __typename: "AdminUser", - id: value$4 + id: value$2 }; } else { tmp = {}; } + var value$3 = value.id; + var value$4 = value.__typename; return [tmp].reduce(deepMerge, { - __typename: value$2, - id: value$1 + __typename: value$4, + id: value$3 }); }); return { diff --git a/snapshot_tests/operations/expected/apollo/generate/comment.re.txt b/snapshot_tests/operations/expected/apollo/generate/comment.re.txt index 7d75b6f7..0f7f5f9d 100644 --- a/snapshot_tests/operations/expected/apollo/generate/comment.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/comment.re.txt @@ -141,18 +141,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -203,23 +201,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, diff --git a/snapshot_tests/operations/expected/apollo/generate/explicit_object_record.re.txt b/snapshot_tests/operations/expected/apollo/generate/explicit_object_record.re.txt index d9f441cc..e3b3d475 100644 --- a/snapshot_tests/operations/expected/apollo/generate/explicit_object_record.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/explicit_object_record.re.txt @@ -90,13 +90,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -104,23 +103,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -136,23 +134,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -161,13 +158,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -270,13 +266,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -284,23 +279,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -316,23 +310,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -341,13 +334,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/apollo/generate/extensions.re.txt b/snapshot_tests/operations/expected/apollo/generate/extensions.re.txt index c5b3fdf8..7983f058 100644 --- a/snapshot_tests/operations/expected/apollo/generate/extensions.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/extensions.re.txt @@ -152,13 +152,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -166,24 +165,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => - Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -199,23 +196,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -224,13 +220,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -336,13 +331,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -350,23 +344,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -382,23 +375,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -407,13 +399,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/apollo/generate/fragmentDefinition.re.txt b/snapshot_tests/operations/expected/apollo/generate/fragmentDefinition.re.txt index 6aff5bde..f7904967 100644 --- a/snapshot_tests/operations/expected/apollo/generate/fragmentDefinition.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/fragmentDefinition.re.txt @@ -75,13 +75,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -89,7 +88,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -102,7 +101,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -111,13 +110,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -188,7 +186,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -201,7 +199,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -274,13 +272,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -295,13 +292,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -356,13 +352,12 @@ module InlineListFragment = { switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -370,7 +365,7 @@ module InlineListFragment = { nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -383,7 +378,7 @@ module InlineListFragment = { let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -392,13 +387,12 @@ module InlineListFragment = { switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -452,13 +446,12 @@ module Wrapper = { switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -466,7 +459,7 @@ module Wrapper = { nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -479,7 +472,7 @@ module Wrapper = { let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -488,13 +481,12 @@ module Wrapper = { switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -678,13 +670,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -730,13 +721,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -774,7 +764,16 @@ function back to the original JSON compatible data */ let value = (value: t).l4; ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InlineListFragment.serialize( + (value: t_l4).inlineListFragment, + ), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -783,13 +782,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -804,15 +802,6 @@ function back to the original JSON compatible data */ }; }, ): Js.Json.t, - [| - ( - Obj.magic( - InlineListFragment.serialize( - (value: t_l4).inlineListFragment, - ), - ): Js.Json.t - ), - |], ), ): Raw.t_l4 ); @@ -821,7 +810,15 @@ function back to the original JSON compatible data */ let value = (value: t).l3; ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic(ListFragment.serialize((value: t_l3).frag1)): Js.Json.t + ), + ( + Obj.magic(ListFragment.serialize((value: t_l3).frag2)): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -830,13 +827,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -851,14 +847,6 @@ function back to the original JSON compatible data */ }; }, ): Js.Json.t, - [| - ( - Obj.magic(ListFragment.serialize((value: t_l3).frag1)): Js.Json.t - ), - ( - Obj.magic(ListFragment.serialize((value: t_l3).frag2)): Js.Json.t - ), - |], ), ): Raw.t_l3 ); @@ -867,7 +855,15 @@ function back to the original JSON compatible data */ let value = (value: t).l2; ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic(ListFragment.serialize((value: t_l2).frag1)): Js.Json.t + ), + ( + Obj.magic(ListFragment.serialize((value: t_l2).frag2)): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -878,14 +874,6 @@ function back to the original JSON compatible data */ {"__typename": __typename}; }, ): Js.Json.t, - [| - ( - Obj.magic(ListFragment.serialize((value: t_l2).frag1)): Js.Json.t - ), - ( - Obj.magic(ListFragment.serialize((value: t_l2).frag2)): Js.Json.t - ), - |], ), ): Raw.t_l2 ); diff --git a/snapshot_tests/operations/expected/apollo/generate/fragmentInFragment.re.txt b/snapshot_tests/operations/expected/apollo/generate/fragmentInFragment.re.txt index 0831f40c..bc216655 100644 --- a/snapshot_tests/operations/expected/apollo/generate/fragmentInFragment.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/fragmentInFragment.re.txt @@ -71,13 +71,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -92,13 +91,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -173,13 +171,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -194,7 +191,12 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic(ListFragment.serialize((value: t).listFragment)): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -203,13 +205,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -224,11 +225,6 @@ function back to the original JSON-compatible data */ }; }, ): Js.Json.t, - [| - ( - Obj.magic(ListFragment.serialize((value: t).listFragment)): Js.Json.t - ), - |], ), ): Raw.t ); diff --git a/snapshot_tests/operations/expected/apollo/generate/fragmentOnInterface.re.txt b/snapshot_tests/operations/expected/apollo/generate/fragmentOnInterface.re.txt index d134e6c5..6ce870de 100644 --- a/snapshot_tests/operations/expected/apollo/generate/fragmentOnInterface.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/fragmentOnInterface.re.txt @@ -158,7 +158,14 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InterfaceFragment.serialize((value: t).interfaceFragment), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -169,13 +176,6 @@ function back to the original JSON-compatible data */ {"id": id}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InterfaceFragment.serialize((value: t).interfaceFragment), - ): Js.Json.t - ), - |], ), ): Raw.t ); @@ -251,7 +251,14 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InterfaceFragment.serialize((value: t).interfaceFragment), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -266,13 +273,6 @@ function back to the original JSON-compatible data */ {"__typename": __typename, "id": id}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InterfaceFragment.serialize((value: t).interfaceFragment), - ): Js.Json.t - ), - |], ), ): Raw.t ); diff --git a/snapshot_tests/operations/expected/apollo/generate/fragmentvariableinput.re.txt b/snapshot_tests/operations/expected/apollo/generate/fragmentvariableinput.re.txt index bdf25081..2a589fd7 100644 --- a/snapshot_tests/operations/expected/apollo/generate/fragmentvariableinput.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/fragmentvariableinput.re.txt @@ -82,25 +82,24 @@ function back to the original JSON-compatible data */ }, reposts: { let value = (value: Raw.t).reposts; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => - Some( - { - __typename: { - let value = (value: Raw.t_reposts).__typename; - value; - }, - id: { - let value = (value: Raw.t_reposts).id; - value; - }, - }: t_reposts, - ) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => + Some( + { + __typename: { + let value = (value: Raw.t_reposts).__typename; + value; + }, + id: { + let value = (value: Raw.t_reposts).id; + value; + }, + }: t_reposts, + ) + | None => None + } + ); }, }: t ); @@ -109,26 +108,25 @@ function back to the original JSON-compatible data */ { let reposts = { let value = (value: t).reposts; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => - Js.Nullable.return( - { - let id = { - let value = (value: t_reposts).id; - value; - } - and __typename = { - let value = (value: t_reposts).__typename; - value; - }; - {__typename, id}; - }: Raw.t_reposts, - ) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => + Js.Nullable.return( + { + let id = { + let value = (value: t_reposts).id; + value; + } + and __typename = { + let value = (value: t_reposts).__typename; + value; + }; + {__typename, id}; + }: Raw.t_reposts, + ) + | None => Js.Nullable.null + } + ); } and __typename = { let value = (value: t).__typename; diff --git a/snapshot_tests/operations/expected/apollo/generate/interface.re.txt b/snapshot_tests/operations/expected/apollo/generate/interface.re.txt index f36f4510..c9bd7848 100644 --- a/snapshot_tests/operations/expected/apollo/generate/interface.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/interface.re.txt @@ -106,72 +106,72 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map(value => - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AnonymousUser" => - `AnonymousUser( - { - let value: Raw.t_users_User_AnonymousUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AnonymousUser). - __typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AnonymousUser).id; - value; - }, - anonymousId: { - let value = - (value: Raw.t_users_User_AnonymousUser). - anonymousId; - value; - }, - }: t_users_User_AnonymousUser - ); - }, - ) - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser).__typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - name: { - let value = - (value: Raw.t_users_User_AdminUser).name; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - ); + Js.Array2.map( + value, + value => { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AnonymousUser" => + `AnonymousUser( + { + let value: Raw.t_users_User_AnonymousUser = + Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AnonymousUser). + __typename; + value; + }, + id: { + let value = + (value: Raw.t_users_User_AnonymousUser).id; + value; + }, + anonymousId: { + let value = + (value: Raw.t_users_User_AnonymousUser). + anonymousId; + value; + }, + }: t_users_User_AnonymousUser + ); + }, + ) + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser).__typename; + value; + }, + id: { + let value = (value: Raw.t_users_User_AdminUser).id; + value; + }, + name: { + let value = + (value: Raw.t_users_User_AdminUser).name; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + ); }, }: t ); @@ -180,55 +180,53 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map(value => - switch (value) { - | `AnonymousUser(value) => ( - Obj.magic( - { - let anonymousId = { - let value = - (value: t_users_User_AnonymousUser).anonymousId; - value; - } - and id = { - let value = (value: t_users_User_AnonymousUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AnonymousUser).__typename; - value; - }; - {__typename: "AnonymousUser", id, anonymousId}; - }: Raw.t_users_User_AnonymousUser, - ): Raw.t_users_User - ) - | `AdminUser(value) => ( - Obj.magic( - { - let name = { - let value = (value: t_users_User_AdminUser).name; - value; - } - and id = { - let value = (value: t_users_User_AdminUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser).__typename; - value; - }; - {__typename: "AdminUser", id, name}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - } - ); + Js.Array2.map(value, value => + switch (value) { + | `AnonymousUser(value) => ( + Obj.magic( + { + let anonymousId = { + let value = + (value: t_users_User_AnonymousUser).anonymousId; + value; + } + and id = { + let value = (value: t_users_User_AnonymousUser).id; + value; + } + and __typename = { + let value = + (value: t_users_User_AnonymousUser).__typename; + value; + }; + {__typename: "AnonymousUser", id, anonymousId}; + }: Raw.t_users_User_AnonymousUser, + ): Raw.t_users_User + ) + | `AdminUser(value) => ( + Obj.magic( + { + let name = { + let value = (value: t_users_User_AdminUser).name; + value; + } + and id = { + let value = (value: t_users_User_AdminUser).id; + value; + } + and __typename = { + let value = (value: t_users_User_AdminUser).__typename; + value; + }; + {__typename: "AdminUser", id, name}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + } + ); }; {users: users}; }: Raw.t @@ -301,39 +299,39 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map(value => - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser).__typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - ); + Js.Array2.map( + value, + value => { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser).__typename; + value; + }, + id: { + let value = (value: Raw.t_users_User_AdminUser).id; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + ); }, }: t ); @@ -342,30 +340,28 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map(value => - switch (value) { - | `AdminUser(value) => ( - Obj.magic( - { - let id = { - let value = (value: t_users_User_AdminUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser).__typename; - value; - }; - {__typename: "AdminUser", id}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - } - ); + Js.Array2.map(value, value => + switch (value) { + | `AdminUser(value) => ( + Obj.magic( + { + let id = { + let value = (value: t_users_User_AdminUser).id; + value; + } + and __typename = { + let value = (value: t_users_User_AdminUser).__typename; + value; + }; + {__typename: "AdminUser", id}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + } + ); }; {users: users}; }: Raw.t @@ -466,74 +462,73 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - fragment: { - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AnonymousUser" => - `AnonymousUser( - { - let value: Raw.t_users_User_AnonymousUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AnonymousUser). - __typename; - value; - }, - anonymousId: { - let value = - (value: Raw.t_users_User_AnonymousUser). - anonymousId; - value; - }, - }: t_users_User_AnonymousUser - ); - }, - ) - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser). - __typename; - value; - }, - name: { - let value = - (value: Raw.t_users_User_AdminUser).name; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - }, - id: { - let value = - Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + fragment: { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AnonymousUser" => + `AnonymousUser( + { + let value: Raw.t_users_User_AnonymousUser = + Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AnonymousUser). + __typename; + value; + }, + anonymousId: { + let value = + (value: Raw.t_users_User_AnonymousUser). + anonymousId; + value; + }, + }: t_users_User_AnonymousUser + ); + }, + ) + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = + Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser). + __typename; + value; + }, + name: { + let value = + (value: Raw.t_users_User_AdminUser).name; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + id: { + let value = + Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); + value; + }, + }: t_users + ) + ); }, }: t ); @@ -542,79 +537,75 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic( - { - let id = { - let value = (value: t_users).id; - value; - }; - {"id": id}; - }, - ): Js.Json.t, - [| - { - let value = (value: t_users).fragment; - ( - Obj.magic( - switch (value) { - | `AnonymousUser(value) => ( - Obj.magic( - { - let anonymousId = { - let value = - (value: t_users_User_AnonymousUser). - anonymousId; - value; - } - and __typename = { - let value = - (value: t_users_User_AnonymousUser). - __typename; - value; - }; - { - __typename: "AnonymousUser", - anonymousId, - }; - }: Raw.t_users_User_AnonymousUser, - ): Raw.t_users_User - ) - | `AdminUser(value) => ( - Obj.magic( - { - let name = { - let value = - (value: t_users_User_AdminUser).name; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser). - __typename; - value; - }; - {__typename: "AdminUser", name}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - }, - ): Js.Json.t - ); - }, - |], - ), - ): Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + Obj.magic( + Js.Array2.reduce( + [| + { + let value = (value: t_users).fragment; + ( + Obj.magic( + switch (value) { + | `AnonymousUser(value) => ( + Obj.magic( + { + let anonymousId = { + let value = + (value: t_users_User_AnonymousUser). + anonymousId; + value; + } + and __typename = { + let value = + (value: t_users_User_AnonymousUser). + __typename; + value; + }; + {__typename: "AnonymousUser", anonymousId}; + }: Raw.t_users_User_AnonymousUser, + ): Raw.t_users_User + ) + | `AdminUser(value) => ( + Obj.magic( + { + let name = { + let value = + (value: t_users_User_AdminUser).name; + value; + } + and __typename = { + let value = + (value: t_users_User_AdminUser). + __typename; + value; + }; + {__typename: "AdminUser", name}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + }, + ): Js.Json.t + ); + }, + |], + Graphql_ppx_runtime.deepMerge, + Obj.magic( + { + let id = { + let value = (value: t_users).id; + value; + }; + {"id": id}; + }, + ): Js.Json.t, + ), + ): Raw.t_users + ) + ); }; {users: users}; }: Raw.t @@ -699,58 +690,57 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - fragment: { - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser). - __typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - }, - __typename: { - let value = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - value; - }, - id: { - let value = - Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + fragment: { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = + Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser). + __typename; + value; + }, + id: { + let value = + (value: Raw.t_users_User_AdminUser).id; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + __typename: { + let value = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + value; + }, + id: { + let value = + Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); + value; + }, + }: t_users + ) + ); }, }: t ); @@ -759,61 +749,60 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic( - { - let id = { - let value = (value: t_users).id; - value; - } - and __typename = { - let value = (value: t_users).__typename; - value; - }; - {"__typename": __typename, "id": id}; - }, - ): Js.Json.t, - [| - { - let value = (value: t_users).fragment; - ( - Obj.magic( - switch (value) { - | `AdminUser(value) => ( - Obj.magic( - { - let id = { - let value = - (value: t_users_User_AdminUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser). - __typename; - value; - }; - {__typename: "AdminUser", id}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - }, - ): Js.Json.t - ); - }, - |], - ), - ): Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + Obj.magic( + Js.Array2.reduce( + [| + { + let value = (value: t_users).fragment; + ( + Obj.magic( + switch (value) { + | `AdminUser(value) => ( + Obj.magic( + { + let id = { + let value = + (value: t_users_User_AdminUser).id; + value; + } + and __typename = { + let value = + (value: t_users_User_AdminUser). + __typename; + value; + }; + {__typename: "AdminUser", id}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + }, + ): Js.Json.t + ); + }, + |], + Graphql_ppx_runtime.deepMerge, + Obj.magic( + { + let id = { + let value = (value: t_users).id; + value; + } + and __typename = { + let value = (value: t_users).__typename; + value; + }; + {"__typename": __typename, "id": id}; + }, + ): Js.Json.t, + ), + ): Raw.t_users + ) + ); }; {users: users}; }: Raw.t @@ -864,17 +853,16 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - id: { - let value = (value: Raw.t_users).id; - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + id: { + let value = (value: Raw.t_users).id; + value; + }, + }: t_users + ) + ); }, }: t ); @@ -883,18 +871,17 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - { - let id = { - let value = (value: t_users).id; - value; - }; - {id: id}; - }: Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + let id = { + let value = (value: t_users).id; + value; + }; + {id: id}; + }: Raw.t_users + ) + ); }; {users: users}; }: Raw.t diff --git a/snapshot_tests/operations/expected/apollo/generate/lists.re.txt b/snapshot_tests/operations/expected/apollo/generate/lists.re.txt index 44dcf1d5..444fc993 100644 --- a/snapshot_tests/operations/expected/apollo/generate/lists.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/lists.re.txt @@ -90,13 +90,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -104,23 +103,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -136,23 +134,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -161,13 +158,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/apollo/generate/listsArgs.re.txt b/snapshot_tests/operations/expected/apollo/generate/listsArgs.re.txt index fdeca039..0579da2d 100644 --- a/snapshot_tests/operations/expected/apollo/generate/listsArgs.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/listsArgs.re.txt @@ -103,18 +103,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -131,7 +129,7 @@ function back to the original JSON compatible data */ | None => Js.Nullable.undefined | Some(b) => Js.Nullable.return( - (a => Js.Array.map(b => (a => a)(b), a))(b), + (a => Js.Array2.map(a, b => (a => a)(b)))(b), ) } )( @@ -140,24 +138,22 @@ function back to the original JSON compatible data */ nonNullableOfNullable: ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( (inp: t_variables).nonNullableOfNullable, ), nonNullableOfNonNullable: - (a => Js.Array.map(b => (a => a)(b), a))( + (a => Js.Array2.map(a, b => (a => a)(b)))( (inp: t_variables).nonNullableOfNonNullable, ), }; diff --git a/snapshot_tests/operations/expected/apollo/generate/listsInput.re.txt b/snapshot_tests/operations/expected/apollo/generate/listsInput.re.txt index 36e74c91..611202b4 100644 --- a/snapshot_tests/operations/expected/apollo/generate/listsInput.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/listsInput.re.txt @@ -115,18 +115,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -143,7 +141,7 @@ function back to the original JSON compatible data */ | None => Js.Nullable.undefined | Some(b) => Js.Nullable.return( - (a => Js.Array.map(b => (a => a)(b), a))(b), + (a => Js.Array2.map(a, b => (a => a)(b)))(b), ) } )( @@ -152,24 +150,22 @@ function back to the original JSON compatible data */ nonNullableOfNullable: ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( (inp: t_variables_ListsInput).nonNullableOfNullable, ), nonNullableOfNonNullable: - (a => Js.Array.map(b => (a => a)(b), a))( + (a => Js.Array2.map(a, b => (a => a)(b)))( (inp: t_variables_ListsInput).nonNullableOfNonNullable, ), }; diff --git a/snapshot_tests/operations/expected/apollo/generate/mutation.re.txt b/snapshot_tests/operations/expected/apollo/generate/mutation.re.txt index 4120fc26..d07a8d7d 100644 --- a/snapshot_tests/operations/expected/apollo/generate/mutation.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/mutation.re.txt @@ -153,35 +153,33 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - __typename: { - let value = - (value: Raw.t_mutationWithError_errors). - __typename; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | other => `FutureAddedValue(other) - }; - }, - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + __typename: { + let value = + (value: Raw.t_mutationWithError_errors). + __typename; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | other => `FutureAddedValue(other) + }; + }, + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -203,35 +201,33 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let message = { - let value = - (value: t_mutationWithError_errors).message; - value; - } - and field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - | `FutureAddedValue(other) => other - }; - } - and __typename = { - let value = - (value: t_mutationWithError_errors). - __typename; - value; - }; - {__typename, field, message}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let message = { + let value = + (value: t_mutationWithError_errors).message; + value; + } + and field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + | `FutureAddedValue(other) => other + }; + } + and __typename = { + let value = + (value: t_mutationWithError_errors).__typename; + value; + }; + {__typename, field, message}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/apollo/generate/nonrecursiveInput.re.txt b/snapshot_tests/operations/expected/apollo/generate/nonrecursiveInput.re.txt index b2b6ba7d..0ecd12c9 100644 --- a/snapshot_tests/operations/expected/apollo/generate/nonrecursiveInput.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/nonrecursiveInput.re.txt @@ -141,18 +141,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -203,23 +201,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, @@ -446,18 +440,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -508,23 +500,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, diff --git a/snapshot_tests/operations/expected/apollo/generate/omitFutureValueEnum.re.txt b/snapshot_tests/operations/expected/apollo/generate/omitFutureValueEnum.re.txt index 4245dc53..bde355a3 100644 --- a/snapshot_tests/operations/expected/apollo/generate/omitFutureValueEnum.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/omitFutureValueEnum.re.txt @@ -112,35 +112,33 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - __typename: { - let value = - (value: Raw.t_mutationWithError_errors). - __typename; - value; - }, - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | other => `FutureAddedValue(other) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + __typename: { + let value = + (value: Raw.t_mutationWithError_errors). + __typename; + value; + }, + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | other => `FutureAddedValue(other) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -162,35 +160,33 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - | `FutureAddedValue(other) => other - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - } - and __typename = { - let value = - (value: t_mutationWithError_errors). - __typename; - value; - }; - {__typename, message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + | `FutureAddedValue(other) => other + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + } + and __typename = { + let value = + (value: t_mutationWithError_errors).__typename; + value; + }; + {__typename, message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; @@ -299,35 +295,33 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - __typename: { - let value = - (value: Raw.t_mutationWithError_errors). - __typename; - value; - }, - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | _ => raise(Not_found) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + __typename: { + let value = + (value: Raw.t_mutationWithError_errors). + __typename; + value; + }, + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | _ => raise(Not_found) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -349,34 +343,32 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - } - and __typename = { - let value = - (value: t_mutationWithError_errors). - __typename; - value; - }; - {__typename, message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + } + and __typename = { + let value = + (value: t_mutationWithError_errors).__typename; + value; + }; + {__typename, message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; @@ -485,35 +477,33 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - __typename: { - let value = - (value: Raw.t_mutationWithError_errors). - __typename; - value; - }, - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | _ => raise(Not_found) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + __typename: { + let value = + (value: Raw.t_mutationWithError_errors). + __typename; + value; + }, + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | _ => raise(Not_found) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -535,34 +525,32 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - } - and __typename = { - let value = - (value: t_mutationWithError_errors). - __typename; - value; - }; - {__typename, message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + } + and __typename = { + let value = + (value: t_mutationWithError_errors).__typename; + value; + }; + {__typename, message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/apollo/generate/tagged_template.re.txt b/snapshot_tests/operations/expected/apollo/generate/tagged_template.re.txt index e2bbfd88..90d096ee 100644 --- a/snapshot_tests/operations/expected/apollo/generate/tagged_template.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/tagged_template.re.txt @@ -1563,13 +1563,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -1577,7 +1576,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -1590,7 +1589,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -1599,13 +1598,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -1866,13 +1864,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -1880,7 +1877,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -1893,7 +1890,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -1902,13 +1899,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/apollo/generate/variant.re.txt b/snapshot_tests/operations/expected/apollo/generate/variant.re.txt index 5a7eb2d6..a06f6428 100644 --- a/snapshot_tests/operations/expected/apollo/generate/variant.re.txt +++ b/snapshot_tests/operations/expected/apollo/generate/variant.re.txt @@ -170,7 +170,7 @@ function back to the original JSON compatible data */ switch (Js.Json.decodeNull(temp)) { | None => let value = temp; - `BaseTypeList(value |> Js.Array.map(value => value)); + `BaseTypeList(Js.Array2.map(value, value => value)); | Some(_) => let temp = Js.Dict.unsafeGet(Obj.magic(value), "dog"); switch (Js.Json.decodeNull(temp)) { diff --git a/snapshot_tests/operations/expected/records/compile/interface.re.txt b/snapshot_tests/operations/expected/records/compile/interface.re.txt index 0da97079..5834e630 100644 --- a/snapshot_tests/operations/expected/records/compile/interface.re.txt +++ b/snapshot_tests/operations/expected/records/compile/interface.re.txt @@ -281,22 +281,22 @@ function parse$3(value) { function serialize$3(value) { var value$1 = value.users; var users = value$1.map(function (value) { - var value$1 = value.id; - var value$2 = value.__typename; - var value$3 = value.fragment; + var value$1 = value.fragment; var tmp; - if (value$3.NAME === "AdminUser") { - var value$4 = value$3.VAL.id; + if (value$1.NAME === "AdminUser") { + var value$2 = value$1.VAL.id; tmp = { __typename: "AdminUser", - id: value$4 + id: value$2 }; } else { tmp = {}; } + var value$3 = value.id; + var value$4 = value.__typename; return [tmp].reduce(deepMerge, { - __typename: value$2, - id: value$1 + __typename: value$4, + id: value$3 }); }); return { diff --git a/snapshot_tests/operations/expected/records/generate/comment.re.txt b/snapshot_tests/operations/expected/records/generate/comment.re.txt index 7d75b6f7..0f7f5f9d 100644 --- a/snapshot_tests/operations/expected/records/generate/comment.re.txt +++ b/snapshot_tests/operations/expected/records/generate/comment.re.txt @@ -141,18 +141,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -203,23 +201,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, diff --git a/snapshot_tests/operations/expected/records/generate/explicit_object_record.re.txt b/snapshot_tests/operations/expected/records/generate/explicit_object_record.re.txt index 8be3de53..9c7af6f7 100644 --- a/snapshot_tests/operations/expected/records/generate/explicit_object_record.re.txt +++ b/snapshot_tests/operations/expected/records/generate/explicit_object_record.re.txt @@ -82,13 +82,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -96,23 +95,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -128,23 +126,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -153,13 +150,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -249,13 +245,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -263,23 +258,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -295,23 +289,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -320,13 +313,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/records/generate/extensions.re.txt b/snapshot_tests/operations/expected/records/generate/extensions.re.txt index 206b756b..ba4b0b64 100644 --- a/snapshot_tests/operations/expected/records/generate/extensions.re.txt +++ b/snapshot_tests/operations/expected/records/generate/extensions.re.txt @@ -142,13 +142,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -156,24 +155,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => - Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -189,23 +186,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -214,13 +210,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -313,13 +308,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -327,23 +321,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -359,23 +352,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -384,13 +376,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/records/generate/fragmentDefinition.re.txt b/snapshot_tests/operations/expected/records/generate/fragmentDefinition.re.txt index e8512d2e..a7524a8e 100644 --- a/snapshot_tests/operations/expected/records/generate/fragmentDefinition.re.txt +++ b/snapshot_tests/operations/expected/records/generate/fragmentDefinition.re.txt @@ -67,13 +67,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -81,7 +80,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -94,7 +93,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -103,13 +102,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -160,7 +158,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -173,7 +171,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; }; @@ -226,13 +224,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -247,13 +244,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -298,13 +294,12 @@ module InlineListFragment = { switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -312,7 +307,7 @@ module InlineListFragment = { nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -325,7 +320,7 @@ module InlineListFragment = { let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -334,13 +329,12 @@ module InlineListFragment = { switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -384,13 +378,12 @@ module Wrapper = { switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -398,7 +391,7 @@ module Wrapper = { nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -411,7 +404,7 @@ module Wrapper = { let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -420,13 +413,12 @@ module Wrapper = { switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -586,13 +578,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -631,13 +622,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -675,7 +665,16 @@ function back to the original JSON compatible data */ let value = (value: t).l4; ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InlineListFragment.serialize( + (value: t_l4).inlineListFragment, + ), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -684,13 +683,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -698,15 +696,6 @@ function back to the original JSON compatible data */ {"nullableOfNullable": nullableOfNullable}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InlineListFragment.serialize( - (value: t_l4).inlineListFragment, - ), - ): Js.Json.t - ), - |], ), ): Raw.t_l4 ); @@ -715,7 +704,15 @@ function back to the original JSON compatible data */ let value = (value: t).l3; ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic(ListFragment.serialize((value: t_l3).frag1)): Js.Json.t + ), + ( + Obj.magic(ListFragment.serialize((value: t_l3).frag2)): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -724,13 +721,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -738,14 +734,6 @@ function back to the original JSON compatible data */ {"nullableOfNullable": nullableOfNullable}; }, ): Js.Json.t, - [| - ( - Obj.magic(ListFragment.serialize((value: t_l3).frag1)): Js.Json.t - ), - ( - Obj.magic(ListFragment.serialize((value: t_l3).frag2)): Js.Json.t - ), - |], ), ): Raw.t_l3 ); @@ -754,9 +742,7 @@ function back to the original JSON compatible data */ let value = (value: t).l2; ( Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic(Js.Dict.empty): Js.Json.t, + Js.Array2.reduce( [| ( Obj.magic(ListFragment.serialize((value: t_l2).frag1)): Js.Json.t @@ -765,6 +751,8 @@ function back to the original JSON compatible data */ Obj.magic(ListFragment.serialize((value: t_l2).frag2)): Js.Json.t ), |], + Graphql_ppx_runtime.deepMerge, + Obj.magic(Js.Dict.empty): Js.Json.t, ), ): Raw.t_l2 ); diff --git a/snapshot_tests/operations/expected/records/generate/fragmentInFragment.re.txt b/snapshot_tests/operations/expected/records/generate/fragmentInFragment.re.txt index e0263f3e..bec8de2d 100644 --- a/snapshot_tests/operations/expected/records/generate/fragmentInFragment.re.txt +++ b/snapshot_tests/operations/expected/records/generate/fragmentInFragment.re.txt @@ -59,13 +59,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -80,13 +79,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -150,13 +148,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -171,7 +168,12 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic(ListFragment.serialize((value: t).listFragment)): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -180,13 +182,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -194,11 +195,6 @@ function back to the original JSON-compatible data */ {"nullableOfNullable": nullableOfNullable}; }, ): Js.Json.t, - [| - ( - Obj.magic(ListFragment.serialize((value: t).listFragment)): Js.Json.t - ), - |], ), ): Raw.t ); diff --git a/snapshot_tests/operations/expected/records/generate/fragmentOnInterface.re.txt b/snapshot_tests/operations/expected/records/generate/fragmentOnInterface.re.txt index 253e2df0..afcd363c 100644 --- a/snapshot_tests/operations/expected/records/generate/fragmentOnInterface.re.txt +++ b/snapshot_tests/operations/expected/records/generate/fragmentOnInterface.re.txt @@ -158,7 +158,14 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InterfaceFragment.serialize((value: t).interfaceFragment), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -169,13 +176,6 @@ function back to the original JSON-compatible data */ {"id": id}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InterfaceFragment.serialize((value: t).interfaceFragment), - ): Js.Json.t - ), - |], ), ): Raw.t ); @@ -244,7 +244,14 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InterfaceFragment.serialize((value: t).interfaceFragment), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -255,13 +262,6 @@ function back to the original JSON-compatible data */ {"id": id}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InterfaceFragment.serialize((value: t).interfaceFragment), - ): Js.Json.t - ), - |], ), ): Raw.t ); diff --git a/snapshot_tests/operations/expected/records/generate/fragmentvariableinput.re.txt b/snapshot_tests/operations/expected/records/generate/fragmentvariableinput.re.txt index a808b62c..d7e148a0 100644 --- a/snapshot_tests/operations/expected/records/generate/fragmentvariableinput.re.txt +++ b/snapshot_tests/operations/expected/records/generate/fragmentvariableinput.re.txt @@ -54,21 +54,20 @@ function back to the original JSON-compatible data */ { reposts: { let value = (value: Raw.t).reposts; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => - Some( - { - id: { - let value = (value: Raw.t_reposts).id; - value; - }, - }: t_reposts, - ) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => + Some( + { + id: { + let value = (value: Raw.t_reposts).id; + value; + }, + }: t_reposts, + ) + | None => None + } + ); }, }: t ); @@ -77,22 +76,21 @@ function back to the original JSON-compatible data */ { let reposts = { let value = (value: t).reposts; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => - Js.Nullable.return( - { - let id = { - let value = (value: t_reposts).id; - value; - }; - {id: id}; - }: Raw.t_reposts, - ) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => + Js.Nullable.return( + { + let id = { + let value = (value: t_reposts).id; + value; + }; + {id: id}; + }: Raw.t_reposts, + ) + | None => Js.Nullable.null + } + ); }; {reposts: reposts}; }: Raw.t diff --git a/snapshot_tests/operations/expected/records/generate/interface.re.txt b/snapshot_tests/operations/expected/records/generate/interface.re.txt index 5772eb36..fbc29f47 100644 --- a/snapshot_tests/operations/expected/records/generate/interface.re.txt +++ b/snapshot_tests/operations/expected/records/generate/interface.re.txt @@ -102,61 +102,61 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map(value => - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AnonymousUser" => - `AnonymousUser( - { - let value: Raw.t_users_User_AnonymousUser = - Obj.magic(value); - ( - { - id: { - let value = - (value: Raw.t_users_User_AnonymousUser).id; - value; - }, - anonymousId: { - let value = - (value: Raw.t_users_User_AnonymousUser). - anonymousId; - value; - }, - }: t_users_User_AnonymousUser - ); - }, - ) - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - name: { - let value = - (value: Raw.t_users_User_AdminUser).name; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - ); + Js.Array2.map( + value, + value => { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AnonymousUser" => + `AnonymousUser( + { + let value: Raw.t_users_User_AnonymousUser = + Obj.magic(value); + ( + { + id: { + let value = + (value: Raw.t_users_User_AnonymousUser).id; + value; + }, + anonymousId: { + let value = + (value: Raw.t_users_User_AnonymousUser). + anonymousId; + value; + }, + }: t_users_User_AnonymousUser + ); + }, + ) + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = Obj.magic(value); + ( + { + id: { + let value = (value: Raw.t_users_User_AdminUser).id; + value; + }, + name: { + let value = + (value: Raw.t_users_User_AdminUser).name; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + ); }, }: t ); @@ -165,45 +165,44 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map(value => - switch (value) { - | `AnonymousUser(value) => ( - Obj.magic( - { - let anonymousId = { - let value = - (value: t_users_User_AnonymousUser).anonymousId; - value; - } - and id = { - let value = (value: t_users_User_AnonymousUser).id; - value; - }; - {__typename: "AnonymousUser", id, anonymousId}; - }: Raw.t_users_User_AnonymousUser, - ): Raw.t_users_User - ) - | `AdminUser(value) => ( - Obj.magic( - { - let name = { - let value = (value: t_users_User_AdminUser).name; - value; - } - and id = { - let value = (value: t_users_User_AdminUser).id; - value; - }; - {__typename: "AdminUser", id, name}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - } - ); + Js.Array2.map(value, value => + switch (value) { + | `AnonymousUser(value) => ( + Obj.magic( + { + let anonymousId = { + let value = + (value: t_users_User_AnonymousUser).anonymousId; + value; + } + and id = { + let value = (value: t_users_User_AnonymousUser).id; + value; + }; + {__typename: "AnonymousUser", id, anonymousId}; + }: Raw.t_users_User_AnonymousUser, + ): Raw.t_users_User + ) + | `AdminUser(value) => ( + Obj.magic( + { + let name = { + let value = (value: t_users_User_AdminUser).name; + value; + } + and id = { + let value = (value: t_users_User_AdminUser).id; + value; + }; + {__typename: "AdminUser", id, name}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + } + ); }; {users: users}; }: Raw.t @@ -276,39 +275,39 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map(value => - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser).__typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - ); + Js.Array2.map( + value, + value => { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser).__typename; + value; + }, + id: { + let value = (value: Raw.t_users_User_AdminUser).id; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + ); }, }: t ); @@ -317,30 +316,28 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map(value => - switch (value) { - | `AdminUser(value) => ( - Obj.magic( - { - let id = { - let value = (value: t_users_User_AdminUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser).__typename; - value; - }; - {__typename: "AdminUser", id}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - } - ); + Js.Array2.map(value, value => + switch (value) { + | `AdminUser(value) => ( + Obj.magic( + { + let id = { + let value = (value: t_users_User_AdminUser).id; + value; + } + and __typename = { + let value = (value: t_users_User_AdminUser).__typename; + value; + }; + {__typename: "AdminUser", id}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + } + ); }; {users: users}; }: Raw.t @@ -429,62 +426,61 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - fragment: { - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AnonymousUser" => - `AnonymousUser( - { - let value: Raw.t_users_User_AnonymousUser = - Obj.magic(value); - ( - { - anonymousId: { - let value = - (value: Raw.t_users_User_AnonymousUser). - anonymousId; - value; - }, - }: t_users_User_AnonymousUser - ); - }, - ) - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - name: { - let value = - (value: Raw.t_users_User_AdminUser).name; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - }, - id: { - let value = - Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + fragment: { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AnonymousUser" => + `AnonymousUser( + { + let value: Raw.t_users_User_AnonymousUser = + Obj.magic(value); + ( + { + anonymousId: { + let value = + (value: Raw.t_users_User_AnonymousUser). + anonymousId; + value; + }, + }: t_users_User_AnonymousUser + ); + }, + ) + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = + Obj.magic(value); + ( + { + name: { + let value = + (value: Raw.t_users_User_AdminUser).name; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + id: { + let value = + Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); + value; + }, + }: t_users + ) + ); }, }: t ); @@ -493,67 +489,63 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic( - { - let id = { - let value = (value: t_users).id; - value; - }; - {"id": id}; - }, - ): Js.Json.t, - [| - { - let value = (value: t_users).fragment; - ( - Obj.magic( - switch (value) { - | `AnonymousUser(value) => ( - Obj.magic( - { - let anonymousId = { - let value = - (value: t_users_User_AnonymousUser). - anonymousId; - value; - }; - { - __typename: "AnonymousUser", - anonymousId, - }; - }: Raw.t_users_User_AnonymousUser, - ): Raw.t_users_User - ) - | `AdminUser(value) => ( - Obj.magic( - { - let name = { - let value = - (value: t_users_User_AdminUser).name; - value; - }; - {__typename: "AdminUser", name}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - }, - ): Js.Json.t - ); - }, - |], - ), - ): Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + Obj.magic( + Js.Array2.reduce( + [| + { + let value = (value: t_users).fragment; + ( + Obj.magic( + switch (value) { + | `AnonymousUser(value) => ( + Obj.magic( + { + let anonymousId = { + let value = + (value: t_users_User_AnonymousUser). + anonymousId; + value; + }; + {__typename: "AnonymousUser", anonymousId}; + }: Raw.t_users_User_AnonymousUser, + ): Raw.t_users_User + ) + | `AdminUser(value) => ( + Obj.magic( + { + let name = { + let value = + (value: t_users_User_AdminUser).name; + value; + }; + {__typename: "AdminUser", name}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + }, + ): Js.Json.t + ); + }, + |], + Graphql_ppx_runtime.deepMerge, + Obj.magic( + { + let id = { + let value = (value: t_users).id; + value; + }; + {"id": id}; + }, + ): Js.Json.t, + ), + ): Raw.t_users + ) + ); }; {users: users}; }: Raw.t @@ -638,58 +630,57 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - fragment: { - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser). - __typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - }, - __typename: { - let value = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - value; - }, - id: { - let value = - Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + fragment: { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = + Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser). + __typename; + value; + }, + id: { + let value = + (value: Raw.t_users_User_AdminUser).id; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + __typename: { + let value = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + value; + }, + id: { + let value = + Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); + value; + }, + }: t_users + ) + ); }, }: t ); @@ -698,61 +689,60 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic( - { - let id = { - let value = (value: t_users).id; - value; - } - and __typename = { - let value = (value: t_users).__typename; - value; - }; - {"__typename": __typename, "id": id}; - }, - ): Js.Json.t, - [| - { - let value = (value: t_users).fragment; - ( - Obj.magic( - switch (value) { - | `AdminUser(value) => ( - Obj.magic( - { - let id = { - let value = - (value: t_users_User_AdminUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser). - __typename; - value; - }; - {__typename: "AdminUser", id}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - }, - ): Js.Json.t - ); - }, - |], - ), - ): Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + Obj.magic( + Js.Array2.reduce( + [| + { + let value = (value: t_users).fragment; + ( + Obj.magic( + switch (value) { + | `AdminUser(value) => ( + Obj.magic( + { + let id = { + let value = + (value: t_users_User_AdminUser).id; + value; + } + and __typename = { + let value = + (value: t_users_User_AdminUser). + __typename; + value; + }; + {__typename: "AdminUser", id}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + }, + ): Js.Json.t + ); + }, + |], + Graphql_ppx_runtime.deepMerge, + Obj.magic( + { + let id = { + let value = (value: t_users).id; + value; + } + and __typename = { + let value = (value: t_users).__typename; + value; + }; + {"__typename": __typename, "id": id}; + }, + ): Js.Json.t, + ), + ): Raw.t_users + ) + ); }; {users: users}; }: Raw.t @@ -803,17 +793,16 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - id: { - let value = (value: Raw.t_users).id; - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + id: { + let value = (value: Raw.t_users).id; + value; + }, + }: t_users + ) + ); }, }: t ); @@ -822,18 +811,17 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - { - let id = { - let value = (value: t_users).id; - value; - }; - {id: id}; - }: Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + let id = { + let value = (value: t_users).id; + value; + }; + {id: id}; + }: Raw.t_users + ) + ); }; {users: users}; }: Raw.t diff --git a/snapshot_tests/operations/expected/records/generate/lists.re.txt b/snapshot_tests/operations/expected/records/generate/lists.re.txt index 1bad9f03..da8898a9 100644 --- a/snapshot_tests/operations/expected/records/generate/lists.re.txt +++ b/snapshot_tests/operations/expected/records/generate/lists.re.txt @@ -82,13 +82,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -96,23 +95,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -128,23 +126,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -153,13 +150,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/records/generate/listsArgs.re.txt b/snapshot_tests/operations/expected/records/generate/listsArgs.re.txt index fdeca039..0579da2d 100644 --- a/snapshot_tests/operations/expected/records/generate/listsArgs.re.txt +++ b/snapshot_tests/operations/expected/records/generate/listsArgs.re.txt @@ -103,18 +103,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -131,7 +129,7 @@ function back to the original JSON compatible data */ | None => Js.Nullable.undefined | Some(b) => Js.Nullable.return( - (a => Js.Array.map(b => (a => a)(b), a))(b), + (a => Js.Array2.map(a, b => (a => a)(b)))(b), ) } )( @@ -140,24 +138,22 @@ function back to the original JSON compatible data */ nonNullableOfNullable: ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( (inp: t_variables).nonNullableOfNullable, ), nonNullableOfNonNullable: - (a => Js.Array.map(b => (a => a)(b), a))( + (a => Js.Array2.map(a, b => (a => a)(b)))( (inp: t_variables).nonNullableOfNonNullable, ), }; diff --git a/snapshot_tests/operations/expected/records/generate/listsInput.re.txt b/snapshot_tests/operations/expected/records/generate/listsInput.re.txt index 36e74c91..611202b4 100644 --- a/snapshot_tests/operations/expected/records/generate/listsInput.re.txt +++ b/snapshot_tests/operations/expected/records/generate/listsInput.re.txt @@ -115,18 +115,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -143,7 +141,7 @@ function back to the original JSON compatible data */ | None => Js.Nullable.undefined | Some(b) => Js.Nullable.return( - (a => Js.Array.map(b => (a => a)(b), a))(b), + (a => Js.Array2.map(a, b => (a => a)(b)))(b), ) } )( @@ -152,24 +150,22 @@ function back to the original JSON compatible data */ nonNullableOfNullable: ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( (inp: t_variables_ListsInput).nonNullableOfNullable, ), nonNullableOfNonNullable: - (a => Js.Array.map(b => (a => a)(b), a))( + (a => Js.Array2.map(a, b => (a => a)(b)))( (inp: t_variables_ListsInput).nonNullableOfNonNullable, ), }; diff --git a/snapshot_tests/operations/expected/records/generate/mutation.re.txt b/snapshot_tests/operations/expected/records/generate/mutation.re.txt index 01a6f89a..af628784 100644 --- a/snapshot_tests/operations/expected/records/generate/mutation.re.txt +++ b/snapshot_tests/operations/expected/records/generate/mutation.re.txt @@ -124,29 +124,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | other => `FutureAddedValue(other) - }; - }, - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | other => `FutureAddedValue(other) + }; + }, + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -168,29 +166,28 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let message = { - let value = - (value: t_mutationWithError_errors).message; - value; - } - and field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - | `FutureAddedValue(other) => other - }; - }; - {field, message}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let message = { + let value = + (value: t_mutationWithError_errors).message; + value; + } + and field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + | `FutureAddedValue(other) => other + }; + }; + {field, message}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/records/generate/nonrecursiveInput.re.txt b/snapshot_tests/operations/expected/records/generate/nonrecursiveInput.re.txt index b2b6ba7d..0ecd12c9 100644 --- a/snapshot_tests/operations/expected/records/generate/nonrecursiveInput.re.txt +++ b/snapshot_tests/operations/expected/records/generate/nonrecursiveInput.re.txt @@ -141,18 +141,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -203,23 +201,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, @@ -446,18 +440,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -508,23 +500,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, diff --git a/snapshot_tests/operations/expected/records/generate/omitFutureValueEnum.re.txt b/snapshot_tests/operations/expected/records/generate/omitFutureValueEnum.re.txt index 1c7953d9..af4716e6 100644 --- a/snapshot_tests/operations/expected/records/generate/omitFutureValueEnum.re.txt +++ b/snapshot_tests/operations/expected/records/generate/omitFutureValueEnum.re.txt @@ -100,29 +100,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | other => `FutureAddedValue(other) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | other => `FutureAddedValue(other) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -144,29 +142,28 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - | `FutureAddedValue(other) => other - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - }; - {message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + | `FutureAddedValue(other) => other + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + }; + {message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; @@ -259,29 +256,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | _ => raise(Not_found) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | _ => raise(Not_found) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -303,28 +298,27 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - }; - {message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + }; + {message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; @@ -417,29 +411,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | _ => raise(Not_found) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | _ => raise(Not_found) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -461,28 +453,27 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - }; - {message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + }; + {message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/records/generate/tagged_template.re.txt b/snapshot_tests/operations/expected/records/generate/tagged_template.re.txt index 8a167956..34066369 100644 --- a/snapshot_tests/operations/expected/records/generate/tagged_template.re.txt +++ b/snapshot_tests/operations/expected/records/generate/tagged_template.re.txt @@ -1477,13 +1477,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -1491,7 +1490,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -1504,7 +1503,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -1513,13 +1512,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -1768,13 +1766,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -1782,7 +1779,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -1795,7 +1792,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -1804,13 +1801,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/records/generate/variant.re.txt b/snapshot_tests/operations/expected/records/generate/variant.re.txt index c1edd9a1..71283ecf 100644 --- a/snapshot_tests/operations/expected/records/generate/variant.re.txt +++ b/snapshot_tests/operations/expected/records/generate/variant.re.txt @@ -154,7 +154,7 @@ function back to the original JSON compatible data */ switch (Js.Json.decodeNull(temp)) { | None => let value = temp; - `BaseTypeList(value |> Js.Array.map(value => value)); + `BaseTypeList(Js.Array2.map(value, value => value)); | Some(_) => let temp = Js.Dict.unsafeGet(Obj.magic(value), "dog"); switch (Js.Json.decodeNull(temp)) { diff --git a/snapshot_tests/operations/expected/template/compile/interface.re.txt b/snapshot_tests/operations/expected/template/compile/interface.re.txt index aa9e6ba8..848e3f3a 100644 --- a/snapshot_tests/operations/expected/template/compile/interface.re.txt +++ b/snapshot_tests/operations/expected/template/compile/interface.re.txt @@ -338,22 +338,22 @@ function parse$3(value) { function serialize$3(value) { var value$1 = value.users; var users = value$1.map(function (value) { - var value$1 = value.id; - var value$2 = value.__typename; - var value$3 = value.fragment; + var value$1 = value.fragment; var tmp; - if (value$3.NAME === "AdminUser") { - var value$4 = value$3.VAL.id; + if (value$1.NAME === "AdminUser") { + var value$2 = value$1.VAL.id; tmp = { __typename: "AdminUser", - id: value$4 + id: value$2 }; } else { tmp = {}; } + var value$3 = value.id; + var value$4 = value.__typename; return [tmp].reduce(deepMerge, { - __typename: value$2, - id: value$1 + __typename: value$4, + id: value$3 }); }); return { diff --git a/snapshot_tests/operations/expected/template/generate/comment.re.txt b/snapshot_tests/operations/expected/template/generate/comment.re.txt index 0c683c60..2a1ac981 100644 --- a/snapshot_tests/operations/expected/template/generate/comment.re.txt +++ b/snapshot_tests/operations/expected/template/generate/comment.re.txt @@ -143,18 +143,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -205,23 +203,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, diff --git a/snapshot_tests/operations/expected/template/generate/explicit_object_record.re.txt b/snapshot_tests/operations/expected/template/generate/explicit_object_record.re.txt index 7159938a..cfc4987e 100644 --- a/snapshot_tests/operations/expected/template/generate/explicit_object_record.re.txt +++ b/snapshot_tests/operations/expected/template/generate/explicit_object_record.re.txt @@ -84,13 +84,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -98,23 +97,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -130,23 +128,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -155,13 +152,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -253,13 +249,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -267,23 +262,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -299,23 +293,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -324,13 +317,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/template/generate/extensions.re.txt b/snapshot_tests/operations/expected/template/generate/extensions.re.txt index 8f0f3085..682fe0af 100644 --- a/snapshot_tests/operations/expected/template/generate/extensions.re.txt +++ b/snapshot_tests/operations/expected/template/generate/extensions.re.txt @@ -144,13 +144,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -158,24 +157,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => - Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -191,23 +188,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -216,13 +212,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -317,13 +312,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -331,23 +325,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -363,23 +356,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -388,13 +380,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/template/generate/fragmentDefinition.re.txt b/snapshot_tests/operations/expected/template/generate/fragmentDefinition.re.txt index 295b0117..b745b739 100644 --- a/snapshot_tests/operations/expected/template/generate/fragmentDefinition.re.txt +++ b/snapshot_tests/operations/expected/template/generate/fragmentDefinition.re.txt @@ -69,13 +69,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -83,7 +82,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -96,7 +95,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -105,13 +104,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -164,7 +162,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -177,7 +175,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; }; @@ -232,13 +230,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -253,13 +250,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -306,13 +302,12 @@ module InlineListFragment = { switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -320,7 +315,7 @@ module InlineListFragment = { nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -333,7 +328,7 @@ module InlineListFragment = { let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -342,13 +337,12 @@ module InlineListFragment = { switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -394,13 +388,12 @@ module Wrapper = { switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -408,7 +401,7 @@ module Wrapper = { nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -421,7 +414,7 @@ module Wrapper = { let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -430,13 +423,12 @@ module Wrapper = { switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -595,13 +587,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -640,13 +631,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -684,7 +674,16 @@ function back to the original JSON compatible data */ let value = (value: t).l4; ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InlineListFragment.serialize( + (value: t_l4).inlineListFragment, + ), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -693,13 +692,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -707,15 +705,6 @@ function back to the original JSON compatible data */ {"nullableOfNullable": nullableOfNullable}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InlineListFragment.serialize( - (value: t_l4).inlineListFragment, - ), - ): Js.Json.t - ), - |], ), ): Raw.t_l4 ); @@ -724,7 +713,15 @@ function back to the original JSON compatible data */ let value = (value: t).l3; ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic(ListFragment.serialize((value: t_l3).frag1)): Js.Json.t + ), + ( + Obj.magic(ListFragment.serialize((value: t_l3).frag2)): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -733,13 +730,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -747,14 +743,6 @@ function back to the original JSON compatible data */ {"nullableOfNullable": nullableOfNullable}; }, ): Js.Json.t, - [| - ( - Obj.magic(ListFragment.serialize((value: t_l3).frag1)): Js.Json.t - ), - ( - Obj.magic(ListFragment.serialize((value: t_l3).frag2)): Js.Json.t - ), - |], ), ): Raw.t_l3 ); @@ -763,9 +751,7 @@ function back to the original JSON compatible data */ let value = (value: t).l2; ( Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic(Js.Dict.empty): Js.Json.t, + Js.Array2.reduce( [| ( Obj.magic(ListFragment.serialize((value: t_l2).frag1)): Js.Json.t @@ -774,6 +760,8 @@ function back to the original JSON compatible data */ Obj.magic(ListFragment.serialize((value: t_l2).frag2)): Js.Json.t ), |], + Graphql_ppx_runtime.deepMerge, + Obj.magic(Js.Dict.empty): Js.Json.t, ), ): Raw.t_l2 ); diff --git a/snapshot_tests/operations/expected/template/generate/fragmentInFragment.re.txt b/snapshot_tests/operations/expected/template/generate/fragmentInFragment.re.txt index 37eafb8f..45c262d4 100644 --- a/snapshot_tests/operations/expected/template/generate/fragmentInFragment.re.txt +++ b/snapshot_tests/operations/expected/template/generate/fragmentInFragment.re.txt @@ -61,13 +61,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -82,13 +81,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -155,13 +153,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -176,7 +173,12 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic(ListFragment.serialize((value: t).listFragment)): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -185,13 +187,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -199,11 +200,6 @@ function back to the original JSON-compatible data */ {"nullableOfNullable": nullableOfNullable}; }, ): Js.Json.t, - [| - ( - Obj.magic(ListFragment.serialize((value: t).listFragment)): Js.Json.t - ), - |], ), ): Raw.t ); diff --git a/snapshot_tests/operations/expected/template/generate/fragmentOnInterface.re.txt b/snapshot_tests/operations/expected/template/generate/fragmentOnInterface.re.txt index 0eacee35..2fd4247b 100644 --- a/snapshot_tests/operations/expected/template/generate/fragmentOnInterface.re.txt +++ b/snapshot_tests/operations/expected/template/generate/fragmentOnInterface.re.txt @@ -163,7 +163,14 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InterfaceFragment.serialize((value: t).interfaceFragment), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -174,13 +181,6 @@ function back to the original JSON-compatible data */ {"id": id}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InterfaceFragment.serialize((value: t).interfaceFragment), - ): Js.Json.t - ), - |], ), ): Raw.t ); @@ -252,7 +252,14 @@ function back to the original JSON-compatible data */ let serialize: t => Raw.t = (value) => ( Obj.magic( - Js.Array.reduce( + Js.Array2.reduce( + [| + ( + Obj.magic( + InterfaceFragment.serialize((value: t).interfaceFragment), + ): Js.Json.t + ), + |], Graphql_ppx_runtime.deepMerge, Obj.magic( { @@ -263,13 +270,6 @@ function back to the original JSON-compatible data */ {"id": id}; }, ): Js.Json.t, - [| - ( - Obj.magic( - InterfaceFragment.serialize((value: t).interfaceFragment), - ): Js.Json.t - ), - |], ), ): Raw.t ); diff --git a/snapshot_tests/operations/expected/template/generate/fragmentvariableinput.re.txt b/snapshot_tests/operations/expected/template/generate/fragmentvariableinput.re.txt index b2f3ec64..43c8d4b3 100644 --- a/snapshot_tests/operations/expected/template/generate/fragmentvariableinput.re.txt +++ b/snapshot_tests/operations/expected/template/generate/fragmentvariableinput.re.txt @@ -56,21 +56,20 @@ function back to the original JSON-compatible data */ { reposts: { let value = (value: Raw.t).reposts; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => - Some( - { - id: { - let value = (value: Raw.t_reposts).id; - value; - }, - }: t_reposts, - ) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => + Some( + { + id: { + let value = (value: Raw.t_reposts).id; + value; + }, + }: t_reposts, + ) + | None => None + } + ); }, }: t ); @@ -79,22 +78,21 @@ function back to the original JSON-compatible data */ { let reposts = { let value = (value: t).reposts; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => - Js.Nullable.return( - { - let id = { - let value = (value: t_reposts).id; - value; - }; - {id: id}; - }: Raw.t_reposts, - ) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => + Js.Nullable.return( + { + let id = { + let value = (value: t_reposts).id; + value; + }; + {id: id}; + }: Raw.t_reposts, + ) + | None => Js.Nullable.null + } + ); }; {reposts: reposts}; }: Raw.t diff --git a/snapshot_tests/operations/expected/template/generate/interface.re.txt b/snapshot_tests/operations/expected/template/generate/interface.re.txt index ffc1e3b9..97c51bde 100644 --- a/snapshot_tests/operations/expected/template/generate/interface.re.txt +++ b/snapshot_tests/operations/expected/template/generate/interface.re.txt @@ -104,61 +104,61 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map(value => - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AnonymousUser" => - `AnonymousUser( - { - let value: Raw.t_users_User_AnonymousUser = - Obj.magic(value); - ( - { - id: { - let value = - (value: Raw.t_users_User_AnonymousUser).id; - value; - }, - anonymousId: { - let value = - (value: Raw.t_users_User_AnonymousUser). - anonymousId; - value; - }, - }: t_users_User_AnonymousUser - ); - }, - ) - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - name: { - let value = - (value: Raw.t_users_User_AdminUser).name; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - ); + Js.Array2.map( + value, + value => { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AnonymousUser" => + `AnonymousUser( + { + let value: Raw.t_users_User_AnonymousUser = + Obj.magic(value); + ( + { + id: { + let value = + (value: Raw.t_users_User_AnonymousUser).id; + value; + }, + anonymousId: { + let value = + (value: Raw.t_users_User_AnonymousUser). + anonymousId; + value; + }, + }: t_users_User_AnonymousUser + ); + }, + ) + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = Obj.magic(value); + ( + { + id: { + let value = (value: Raw.t_users_User_AdminUser).id; + value; + }, + name: { + let value = + (value: Raw.t_users_User_AdminUser).name; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + ); }, }: t ); @@ -167,45 +167,44 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map(value => - switch (value) { - | `AnonymousUser(value) => ( - Obj.magic( - { - let anonymousId = { - let value = - (value: t_users_User_AnonymousUser).anonymousId; - value; - } - and id = { - let value = (value: t_users_User_AnonymousUser).id; - value; - }; - {__typename: "AnonymousUser", id, anonymousId}; - }: Raw.t_users_User_AnonymousUser, - ): Raw.t_users_User - ) - | `AdminUser(value) => ( - Obj.magic( - { - let name = { - let value = (value: t_users_User_AdminUser).name; - value; - } - and id = { - let value = (value: t_users_User_AdminUser).id; - value; - }; - {__typename: "AdminUser", id, name}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - } - ); + Js.Array2.map(value, value => + switch (value) { + | `AnonymousUser(value) => ( + Obj.magic( + { + let anonymousId = { + let value = + (value: t_users_User_AnonymousUser).anonymousId; + value; + } + and id = { + let value = (value: t_users_User_AnonymousUser).id; + value; + }; + {__typename: "AnonymousUser", id, anonymousId}; + }: Raw.t_users_User_AnonymousUser, + ): Raw.t_users_User + ) + | `AdminUser(value) => ( + Obj.magic( + { + let name = { + let value = (value: t_users_User_AdminUser).name; + value; + } + and id = { + let value = (value: t_users_User_AdminUser).id; + value; + }; + {__typename: "AdminUser", id, name}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + } + ); }; {users: users}; }: Raw.t @@ -280,39 +279,39 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map(value => - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser).__typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - ); + Js.Array2.map( + value, + value => { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser).__typename; + value; + }, + id: { + let value = (value: Raw.t_users_User_AdminUser).id; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + ); }, }: t ); @@ -321,30 +320,28 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map(value => - switch (value) { - | `AdminUser(value) => ( - Obj.magic( - { - let id = { - let value = (value: t_users_User_AdminUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser).__typename; - value; - }; - {__typename: "AdminUser", id}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - } - ); + Js.Array2.map(value, value => + switch (value) { + | `AdminUser(value) => ( + Obj.magic( + { + let id = { + let value = (value: t_users_User_AdminUser).id; + value; + } + and __typename = { + let value = (value: t_users_User_AdminUser).__typename; + value; + }; + {__typename: "AdminUser", id}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + } + ); }; {users: users}; }: Raw.t @@ -435,62 +432,61 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - fragment: { - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AnonymousUser" => - `AnonymousUser( - { - let value: Raw.t_users_User_AnonymousUser = - Obj.magic(value); - ( - { - anonymousId: { - let value = - (value: Raw.t_users_User_AnonymousUser). - anonymousId; - value; - }, - }: t_users_User_AnonymousUser - ); - }, - ) - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - name: { - let value = - (value: Raw.t_users_User_AdminUser).name; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - }, - id: { - let value = - Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + fragment: { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AnonymousUser" => + `AnonymousUser( + { + let value: Raw.t_users_User_AnonymousUser = + Obj.magic(value); + ( + { + anonymousId: { + let value = + (value: Raw.t_users_User_AnonymousUser). + anonymousId; + value; + }, + }: t_users_User_AnonymousUser + ); + }, + ) + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = + Obj.magic(value); + ( + { + name: { + let value = + (value: Raw.t_users_User_AdminUser).name; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + id: { + let value = + Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); + value; + }, + }: t_users + ) + ); }, }: t ); @@ -499,67 +495,63 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic( - { - let id = { - let value = (value: t_users).id; - value; - }; - {"id": id}; - }, - ): Js.Json.t, - [| - { - let value = (value: t_users).fragment; - ( - Obj.magic( - switch (value) { - | `AnonymousUser(value) => ( - Obj.magic( - { - let anonymousId = { - let value = - (value: t_users_User_AnonymousUser). - anonymousId; - value; - }; - { - __typename: "AnonymousUser", - anonymousId, - }; - }: Raw.t_users_User_AnonymousUser, - ): Raw.t_users_User - ) - | `AdminUser(value) => ( - Obj.magic( - { - let name = { - let value = - (value: t_users_User_AdminUser).name; - value; - }; - {__typename: "AdminUser", name}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - }, - ): Js.Json.t - ); - }, - |], - ), - ): Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + Obj.magic( + Js.Array2.reduce( + [| + { + let value = (value: t_users).fragment; + ( + Obj.magic( + switch (value) { + | `AnonymousUser(value) => ( + Obj.magic( + { + let anonymousId = { + let value = + (value: t_users_User_AnonymousUser). + anonymousId; + value; + }; + {__typename: "AnonymousUser", anonymousId}; + }: Raw.t_users_User_AnonymousUser, + ): Raw.t_users_User + ) + | `AdminUser(value) => ( + Obj.magic( + { + let name = { + let value = + (value: t_users_User_AdminUser).name; + value; + }; + {__typename: "AdminUser", name}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + }, + ): Js.Json.t + ); + }, + |], + Graphql_ppx_runtime.deepMerge, + Obj.magic( + { + let id = { + let value = (value: t_users).id; + value; + }; + {"id": id}; + }, + ): Js.Json.t, + ), + ): Raw.t_users + ) + ); }; {users: users}; }: Raw.t @@ -646,58 +638,57 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - fragment: { - let typename: string = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - ( - switch (typename) { - | "AdminUser" => - `AdminUser( - { - let value: Raw.t_users_User_AdminUser = - Obj.magic(value); - ( - { - __typename: { - let value = - (value: Raw.t_users_User_AdminUser). - __typename; - value; - }, - id: { - let value = - (value: Raw.t_users_User_AdminUser).id; - value; - }, - }: t_users_User_AdminUser - ); - }, - ) - | _ => `UnspecifiedFragment(typename) - }: t_users_User - ); - }, - __typename: { - let value = - Obj.magic( - Js.Dict.unsafeGet(Obj.magic(value), "__typename"), - ); - value; - }, - id: { - let value = - Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + fragment: { + let typename: string = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + ( + switch (typename) { + | "AdminUser" => + `AdminUser( + { + let value: Raw.t_users_User_AdminUser = + Obj.magic(value); + ( + { + __typename: { + let value = + (value: Raw.t_users_User_AdminUser). + __typename; + value; + }, + id: { + let value = + (value: Raw.t_users_User_AdminUser).id; + value; + }, + }: t_users_User_AdminUser + ); + }, + ) + | _ => `UnspecifiedFragment(typename) + }: t_users_User + ); + }, + __typename: { + let value = + Obj.magic( + Js.Dict.unsafeGet(Obj.magic(value), "__typename"), + ); + value; + }, + id: { + let value = + Obj.magic(Js.Dict.unsafeGet(Obj.magic(value), "id")); + value; + }, + }: t_users + ) + ); }, }: t ); @@ -706,61 +697,60 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - Obj.magic( - Js.Array.reduce( - Graphql_ppx_runtime.deepMerge, - Obj.magic( - { - let id = { - let value = (value: t_users).id; - value; - } - and __typename = { - let value = (value: t_users).__typename; - value; - }; - {"__typename": __typename, "id": id}; - }, - ): Js.Json.t, - [| - { - let value = (value: t_users).fragment; - ( - Obj.magic( - switch (value) { - | `AdminUser(value) => ( - Obj.magic( - { - let id = { - let value = - (value: t_users_User_AdminUser).id; - value; - } - and __typename = { - let value = - (value: t_users_User_AdminUser). - __typename; - value; - }; - {__typename: "AdminUser", id}; - }: Raw.t_users_User_AdminUser, - ): Raw.t_users_User - ) - | `UnspecifiedFragment(_) => ( - Obj.magic(Js.Dict.empty()): Raw.t_users_User - ) - }, - ): Js.Json.t - ); - }, - |], - ), - ): Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + Obj.magic( + Js.Array2.reduce( + [| + { + let value = (value: t_users).fragment; + ( + Obj.magic( + switch (value) { + | `AdminUser(value) => ( + Obj.magic( + { + let id = { + let value = + (value: t_users_User_AdminUser).id; + value; + } + and __typename = { + let value = + (value: t_users_User_AdminUser). + __typename; + value; + }; + {__typename: "AdminUser", id}; + }: Raw.t_users_User_AdminUser, + ): Raw.t_users_User + ) + | `UnspecifiedFragment(_) => ( + Obj.magic(Js.Dict.empty()): Raw.t_users_User + ) + }, + ): Js.Json.t + ); + }, + |], + Graphql_ppx_runtime.deepMerge, + Obj.magic( + { + let id = { + let value = (value: t_users).id; + value; + } + and __typename = { + let value = (value: t_users).__typename; + value; + }; + {"__typename": __typename, "id": id}; + }, + ): Js.Json.t, + ), + ): Raw.t_users + ) + ); }; {users: users}; }: Raw.t @@ -813,17 +803,16 @@ function back to the original JSON compatible data */ { users: { let value = (value: Raw.t).users; - value - |> Js.Array.map((value) => - ( - { - id: { - let value = (value: Raw.t_users).id; - value; - }, - }: t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + id: { + let value = (value: Raw.t_users).id; + value; + }, + }: t_users + ) + ); }, }: t ); @@ -832,18 +821,17 @@ function back to the original JSON compatible data */ { let users = { let value = (value: t).users; - value - |> Js.Array.map((value) => - ( - { - let id = { - let value = (value: t_users).id; - value; - }; - {id: id}; - }: Raw.t_users - ) - ); + Js.Array2.map(value, (value) => + ( + { + let id = { + let value = (value: t_users).id; + value; + }; + {id: id}; + }: Raw.t_users + ) + ); }; {users: users}; }: Raw.t diff --git a/snapshot_tests/operations/expected/template/generate/lists.re.txt b/snapshot_tests/operations/expected/template/generate/lists.re.txt index 59354bea..d2face3c 100644 --- a/snapshot_tests/operations/expected/template/generate/lists.re.txt +++ b/snapshot_tests/operations/expected/template/generate/lists.re.txt @@ -84,13 +84,12 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -98,23 +97,22 @@ function back to the original JSON compatible data */ nullableOfNonNullable: { let value = (value: Raw.t_lists).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, nonNullableOfNullable: { let value = (value: Raw.t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ); + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ); }, nonNullableOfNonNullable: { let value = (value: Raw.t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); }, }: t_lists ); @@ -130,23 +128,22 @@ function back to the original JSON compatible data */ { let nonNullableOfNonNullable = { let value = (value: t_lists).nonNullableOfNonNullable; - value |> Js.Array.map(value => value); + Js.Array2.map(value, value => value); } and nonNullableOfNullable = { let value = (value: t_lists).nonNullableOfNullable; - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ); + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ); } and nullableOfNonNullable = { let value = (value: t_lists).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -155,13 +152,12 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/template/generate/listsArgs.re.txt b/snapshot_tests/operations/expected/template/generate/listsArgs.re.txt index cbdc7ad3..5df6ee64 100644 --- a/snapshot_tests/operations/expected/template/generate/listsArgs.re.txt +++ b/snapshot_tests/operations/expected/template/generate/listsArgs.re.txt @@ -105,18 +105,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -133,7 +131,7 @@ function back to the original JSON compatible data */ | None => Js.Nullable.undefined | Some(b) => Js.Nullable.return( - (a => Js.Array.map(b => (a => a)(b), a))(b), + (a => Js.Array2.map(a, b => (a => a)(b)))(b), ) } )( @@ -142,24 +140,22 @@ function back to the original JSON compatible data */ nonNullableOfNullable: ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( (inp: t_variables).nonNullableOfNullable, ), nonNullableOfNonNullable: - (a => Js.Array.map(b => (a => a)(b), a))( + (a => Js.Array2.map(a, b => (a => a)(b)))( (inp: t_variables).nonNullableOfNonNullable, ), }; diff --git a/snapshot_tests/operations/expected/template/generate/listsInput.re.txt b/snapshot_tests/operations/expected/template/generate/listsInput.re.txt index 5cc63a3e..ecf8972d 100644 --- a/snapshot_tests/operations/expected/template/generate/listsInput.re.txt +++ b/snapshot_tests/operations/expected/template/generate/listsInput.re.txt @@ -117,18 +117,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -145,7 +143,7 @@ function back to the original JSON compatible data */ | None => Js.Nullable.undefined | Some(b) => Js.Nullable.return( - (a => Js.Array.map(b => (a => a)(b), a))(b), + (a => Js.Array2.map(a, b => (a => a)(b)))(b), ) } )( @@ -154,24 +152,22 @@ function back to the original JSON compatible data */ nonNullableOfNullable: ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( (inp: t_variables_ListsInput).nonNullableOfNullable, ), nonNullableOfNonNullable: - (a => Js.Array.map(b => (a => a)(b), a))( + (a => Js.Array2.map(a, b => (a => a)(b)))( (inp: t_variables_ListsInput).nonNullableOfNonNullable, ), }; diff --git a/snapshot_tests/operations/expected/template/generate/mutation.re.txt b/snapshot_tests/operations/expected/template/generate/mutation.re.txt index 157e92ef..418808dd 100644 --- a/snapshot_tests/operations/expected/template/generate/mutation.re.txt +++ b/snapshot_tests/operations/expected/template/generate/mutation.re.txt @@ -126,29 +126,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | other => `FutureAddedValue(other) - }; - }, - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | other => `FutureAddedValue(other) + }; + }, + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -170,29 +168,28 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let message = { - let value = - (value: t_mutationWithError_errors).message; - value; - } - and field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - | `FutureAddedValue(other) => other - }; - }; - {field, message}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let message = { + let value = + (value: t_mutationWithError_errors).message; + value; + } + and field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + | `FutureAddedValue(other) => other + }; + }; + {field, message}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/template/generate/nonrecursiveInput.re.txt b/snapshot_tests/operations/expected/template/generate/nonrecursiveInput.re.txt index 3df78919..542ca75a 100644 --- a/snapshot_tests/operations/expected/template/generate/nonrecursiveInput.re.txt +++ b/snapshot_tests/operations/expected/template/generate/nonrecursiveInput.re.txt @@ -143,18 +143,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -205,23 +203,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, @@ -450,18 +444,16 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => Js.Nullable.return((a => a)(b)) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => Js.Nullable.return((a => a)(b)) + } + )( + b, + ) ) )( b, @@ -512,23 +504,19 @@ function back to the original JSON compatible data */ Js.Nullable.return( ( a => - Js.Array.map( - b => - ( - a => - switch (a) { - | None => Js.Nullable.undefined - | Some(b) => - Js.Nullable.return( - (a => serializeInputObjectEmbeddedInput(a))( - b, - ), - ) - } - )( - b, - ), - a, + Js.Array2.map(a, b => + ( + a => + switch (a) { + | None => Js.Nullable.undefined + | Some(b) => + Js.Nullable.return( + (a => serializeInputObjectEmbeddedInput(a))(b), + ) + } + )( + b, + ) ) )( b, diff --git a/snapshot_tests/operations/expected/template/generate/omitFutureValueEnum.re.txt b/snapshot_tests/operations/expected/template/generate/omitFutureValueEnum.re.txt index c9dc59d0..67d4606e 100644 --- a/snapshot_tests/operations/expected/template/generate/omitFutureValueEnum.re.txt +++ b/snapshot_tests/operations/expected/template/generate/omitFutureValueEnum.re.txt @@ -102,29 +102,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | other => `FutureAddedValue(other) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | other => `FutureAddedValue(other) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -146,29 +144,28 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - | `FutureAddedValue(other) => other - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - }; - {message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + | `FutureAddedValue(other) => other + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + }; + {message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; @@ -263,29 +260,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | _ => raise(Not_found) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | _ => raise(Not_found) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -307,28 +302,27 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - }; - {message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + }; + {message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; @@ -423,29 +417,27 @@ function back to the original JSON compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map((value) => - ( - { - message: { - let value = - (value: Raw.t_mutationWithError_errors). - message; - value; - }, - field: { - let value = - (value: Raw.t_mutationWithError_errors).field; - switch ((Obj.magic(value): string)) { - | "FIRST" => `FIRST - | "SECOND" => `SECOND - | "THIRD" => `THIRD - | _ => raise(Not_found) - }; - }, - }: t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + message: { + let value = + (value: Raw.t_mutationWithError_errors).message; + value; + }, + field: { + let value = + (value: Raw.t_mutationWithError_errors).field; + switch ((Obj.magic(value): string)) { + | "FIRST" => `FIRST + | "SECOND" => `SECOND + | "THIRD" => `THIRD + | _ => raise(Not_found) + }; + }, + }: t_mutationWithError_errors + ) + ), ) | None => None }; @@ -467,28 +459,27 @@ function back to the original JSON compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map((value) => - ( - { - let field = { - let value = - (value: t_mutationWithError_errors).field; - switch (value) { - | `FIRST => "FIRST" - | `SECOND => "SECOND" - | `THIRD => "THIRD" - }; - } - and message = { - let value = - (value: t_mutationWithError_errors).message; - value; - }; - {message, field}; - }: Raw.t_mutationWithError_errors - ) - ), + Js.Array2.map(value, (value) => + ( + { + let field = { + let value = + (value: t_mutationWithError_errors).field; + switch (value) { + | `FIRST => "FIRST" + | `SECOND => "SECOND" + | `THIRD => "THIRD" + }; + } + and message = { + let value = + (value: t_mutationWithError_errors).message; + value; + }; + {message, field}; + }: Raw.t_mutationWithError_errors + ) + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/template/generate/tagged_template.re.txt b/snapshot_tests/operations/expected/template/generate/tagged_template.re.txt index b084d892..a142bf04 100644 --- a/snapshot_tests/operations/expected/template/generate/tagged_template.re.txt +++ b/snapshot_tests/operations/expected/template/generate/tagged_template.re.txt @@ -1477,13 +1477,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -1491,7 +1490,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -1504,7 +1503,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -1513,13 +1512,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; @@ -1768,13 +1766,12 @@ function back to the original JSON-compatible data */ switch (Js.toOption(value)) { | Some(value) => Some( - value - |> Js.Array.map(value => - switch (Js.toOption(value)) { - | Some(value) => Some(value) - | None => None - } - ), + Js.Array2.map(value, value => + switch (Js.toOption(value)) { + | Some(value) => Some(value) + | None => None + } + ), ) | None => None }; @@ -1782,7 +1779,7 @@ function back to the original JSON-compatible data */ nullableOfNonNullable: { let value = (value: Raw.t).nullableOfNonNullable; switch (Js.toOption(value)) { - | Some(value) => Some(value |> Js.Array.map(value => value)) + | Some(value) => Some(Js.Array2.map(value, value => value)) | None => None }; }, @@ -1795,7 +1792,7 @@ function back to the original JSON-compatible data */ let value = (value: t).nullableOfNonNullable; switch (value) { | Some(value) => - Js.Nullable.return(value |> Js.Array.map(value => value)) + Js.Nullable.return(Js.Array2.map(value, value => value)) | None => Js.Nullable.null }; } @@ -1804,13 +1801,12 @@ function back to the original JSON-compatible data */ switch (value) { | Some(value) => Js.Nullable.return( - value - |> Js.Array.map(value => - switch (value) { - | Some(value) => Js.Nullable.return(value) - | None => Js.Nullable.null - } - ), + Js.Array2.map(value, value => + switch (value) { + | Some(value) => Js.Nullable.return(value) + | None => Js.Nullable.null + } + ), ) | None => Js.Nullable.null }; diff --git a/snapshot_tests/operations/expected/template/generate/variant.re.txt b/snapshot_tests/operations/expected/template/generate/variant.re.txt index e40d1c0c..526cfc2b 100644 --- a/snapshot_tests/operations/expected/template/generate/variant.re.txt +++ b/snapshot_tests/operations/expected/template/generate/variant.re.txt @@ -156,7 +156,7 @@ function back to the original JSON compatible data */ switch (Js.Json.decodeNull(temp)) { | None => let value = temp; - `BaseTypeList(value |> Js.Array.map(value => value)); + `BaseTypeList(Js.Array2.map(value, value => value)); | Some(_) => let temp = Js.Dict.unsafeGet(Obj.magic(value), "dog"); switch (Js.Json.decodeNull(temp)) { diff --git a/snapshot_tests/utilities/GraphQL_PPX.ml b/snapshot_tests/utilities/GraphQL_PPX.ml index b5e37872..0df5dd38 100644 --- a/snapshot_tests/utilities/GraphQL_PPX.ml +++ b/snapshot_tests/utilities/GraphQL_PPX.ml @@ -1,3 +1,6 @@ +let assign_typename : Js.Json.t -> string -> Js.Json.t = + [%raw {| (obj, typename) => { obj.__typename = typename; return obj } |}] + [%%private let clone = (fun a -> @@ -15,24 +18,21 @@ let rec deepMerge (json1 : Js.Json.t) (json2 : Js.Json.t) = with | (_, true, _), (_, true, _) -> (Obj.magic - (Js.Array.mapi - (fun el1 idx -> - let el2 = Js.Array.unsafe_get (Obj.magic json2) idx in - match Js.typeof el2 = "object" with - | true -> deepMerge el1 el2 - | false -> el2) - (Obj.magic json1)) + (Js.Array2.mapi (Obj.magic json1) (fun el1 idx -> + let el2 = Js.Array2.unsafe_get (Obj.magic json2) idx in + match Js.typeof el2 = "object" with + | true -> deepMerge el1 el2 + | false -> el2)) : Js.Json.t) | (false, false, true), (false, false, true) -> let obj1 = clone (Obj.magic json1) in let obj2 = Obj.magic json2 in - Js.Dict.keys obj2 - |> Js.Array.forEach (fun key -> - let existingVal = (Js.Dict.unsafeGet obj1 key : Js.Json.t) in - let newVal = (Js.Dict.unsafeGet obj2 key : Js.Json.t) in - Js.Dict.set obj1 key - (match Js.typeof existingVal <> "object" with - | true -> newVal - | false -> Obj.magic (deepMerge existingVal newVal))); + Js.Array2.forEach (Js.Dict.keys obj2) (fun key -> + let existingVal = (Js.Dict.unsafeGet obj1 key : Js.Json.t) in + let newVal = (Js.Dict.unsafeGet obj2 key : Js.Json.t) in + Js.Dict.set obj1 key + (match Js.typeof existingVal <> "object" with + | true -> newVal + | false -> Obj.magic (deepMerge existingVal newVal))); Obj.magic obj1 | (_, _, _), (_, _, _) -> json2 diff --git a/src/ppx/output_parser.ml b/src/ppx/output_parser.ml index 163f2ca5..a618ab07 100644 --- a/src/ppx/output_parser.ml +++ b/src/ppx/output_parser.ml @@ -113,8 +113,7 @@ let generate_fragment_parse_fun config loc name arguments definition = |> List.map (fun (arg_name, type_, _span, type_span) -> ( Labelled arg_name, Ast_helper.Exp.variant - ~loc: - (config.map_loc type_span |> Output_utils.conv_loc) + ~loc:(config.map_loc type_span |> Output_utils.conv_loc) type_ None )) in Ast_helper.Exp.apply @@ -123,9 +122,8 @@ let generate_fragment_parse_fun config loc name arguments definition = (List.append labeled_args [ ( Labelled "fragmentName", - Ast_helper.Exp.variant - ~loc:(loc |> Output_utils.conv_loc) - name None ); + Ast_helper.Exp.variant ~loc:(loc |> Output_utils.conv_loc) name None + ); ( Nolabel, match config.native with | true -> @@ -180,9 +178,8 @@ and generate_array_decoder config loc inner path definition = [@metaloc loc] | false -> [%expr - value - |> Js.Array.map (fun value -> - [%e generate_parser config path definition inner])] + Js.Array2.map value (fun value -> + [%e generate_parser config path definition inner])] [@metaloc loc] and generate_custom_decoder config loc ident inner path definition = diff --git a/src/ppx/output_serializer.ml b/src/ppx/output_serializer.ml index 1188939a..105c414d 100644 --- a/src/ppx/output_serializer.ml +++ b/src/ppx/output_serializer.ml @@ -92,7 +92,7 @@ let rec serialize_type = function `List (Array.map (fun b -> [%e serialize_type inner] b) a |> Array.to_list)] | false -> - [%expr fun a -> Js.Array.map (fun b -> [%e serialize_type inner] b) a]) + [%expr fun a -> Js.Array2.map a (fun b -> [%e serialize_type inner] b)]) | Type (Object _) -> [%expr fun v -> None] | Type (Union _) -> [%expr fun v -> None] | Type (Interface _) -> [%expr fun v -> None] @@ -367,9 +367,8 @@ and generate_array_encoder config loc inner path definition = [@metaloc loc] | false -> [%expr - value - |> Js.Array.map (fun value -> - [%e generate_serializer config path definition None inner])] + Js.Array2.map value (fun value -> + [%e generate_serializer config path definition None inner])] [@metaloc loc] and generate_poly_enum_encoder loc enum_meta omit_future_value = @@ -572,9 +571,10 @@ and generate_object_encoder config loc _name fields path definition | false -> [%expr (Obj.magic - (Js.Array.reduce Graphql_ppx_runtime.deepMerge - (Obj.magic [%e do_obj_constructor ()] : Js.Json.t) - [%e fields |> Ast_helper.Exp.array]) + (Js.Array2.reduce + [%e fields |> Ast_helper.Exp.array] + Graphql_ppx_runtime.deepMerge + (Obj.magic [%e do_obj_constructor ()] : Js.Json.t)) : [%t base_type_name ("Raw." ^ generate_type_name path)])] in match is_opaque with