Skip to content

Commit c1ebe68

Browse files
zthzth
committed
fixes
1 parent fd247da commit c1ebe68

6 files changed

Lines changed: 178 additions & 163 deletions

File tree

‎packages/rescript-relay/rescript-relay-ppx/library/DeferredComp.ml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ open Util
66
let lazyExtension =
77
Extension.declare "relay.deferredComponent" Extension.Context.module_expr
88
(let open Ast_pattern in
9-
single_expr_payload
10-
(pexp_ident __
11-
||| map (pexp_construct __ none) ~f:(fun f ident ->
12-
f (Ldot (ident, "make")))))
9+
single_expr_payload
10+
(pexp_ident __
11+
||| map (pexp_construct __ none) ~f:(fun f ident ->
12+
f (Ldot (ident, "make")))))
1313
(fun ~loc ~path:_ ident ->
1414
match ident with
1515
| Ldot (Lident moduleName, "make") ->
@@ -30,7 +30,7 @@ let lazyExtension =
3030
chunk = [%e makeStringExpr ~loc moduleName];
3131
load = preload;
3232
}
33-
[@@live]]
33+
[@@live]]
3434
|> UncurriedUtils.wrapAsUncurriedFn ~arity:1;
3535
[%stri let make = React.lazy_ loadComponent];
3636
];

‎packages/rescript-relay/rescript-relay-ppx/library/Fragment.ml‎

Lines changed: 69 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ let make ~loc ~moduleName ~refetchableQueryName
2323
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
2424
[%e valFromGeneratedModule ["Internal"; "convertFragment"]]];
2525
];
26-
(match (!NonReactUtils.enabled, hasAutocodesplitDirective) with
26+
(match
27+
(NonReactUtils.enabled.contents, hasAutocodesplitDirective)
28+
with
2729
| true, _ -> []
2830
| false, true ->
2931
[
@@ -34,7 +36,7 @@ let make ~loc ~moduleName ~refetchableQueryName
3436
]
3537
| false, false -> []);
3638
[
37-
(if !NonReactUtils.enabled then
39+
(if NonReactUtils.enabled.contents then
3840
[%stri
3941
let waitForFragmentData ~environment fRef =
4042
RescriptRelay_FragmentNonReact.waitForFragmentData
@@ -51,7 +53,7 @@ let make ~loc ~moduleName ~refetchableQueryName
5153
(fRef |. [%e valFromGeneratedModule ["getFragmentRef"]])
5254
~node:[%e valFromGeneratedModule ["node"]]]);
5355
];
54-
(match (!NonReactUtils.enabled, hasInlineDirective) with
56+
(match (NonReactUtils.enabled.contents, hasInlineDirective) with
5557
| true, _ -> []
5658
| false, false ->
5759
[
@@ -81,88 +83,90 @@ let make ~loc ~moduleName ~refetchableQueryName
8183
| false ->
8284
[
8385
(if isPlural then
84-
(if !NonReactUtils.enabled then
85-
[%stri
86-
let readResolverFragment fRef :
87-
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
88-
let fRef =
89-
fRef
90-
|. RescriptRelay_Internal
91-
.internal_resolverFragmentRefsToFragmentRefsPlural
92-
in
93-
RescriptRelay_FragmentNonReact.read ~convertFragment
94-
~fRef:
95-
(fRef
96-
|. [%e valFromGeneratedModule ["getFragmentRef"]])
97-
~node:[%e valFromGeneratedModule ["node"]]]
98-
else
99-
[%stri
100-
let readResolverFragment fRef :
101-
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
102-
let fRef =
103-
fRef
104-
|. RescriptRelay_Internal
105-
.internal_resolverFragmentRefsToFragmentRefsPlural
106-
in
107-
RescriptRelay_Fragment.read ~convertFragment
108-
~fRef:
109-
(fRef
110-
|. [%e valFromGeneratedModule ["getFragmentRef"]])
111-
~node:[%e valFromGeneratedModule ["node"]]] )
86+
if NonReactUtils.enabled.contents then
87+
[%stri
88+
let readResolverFragment fRef :
89+
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
90+
let fRef =
91+
fRef
92+
|. RescriptRelay_Internal
93+
.internal_resolverFragmentRefsToFragmentRefsPlural
94+
in
95+
RescriptRelay_FragmentNonReact.read ~convertFragment
96+
~fRef:
97+
(fRef
98+
|. [%e valFromGeneratedModule ["getFragmentRef"]])
99+
~node:[%e valFromGeneratedModule ["node"]]]
100+
else
101+
[%stri
102+
let readResolverFragment fRef :
103+
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
104+
let fRef =
105+
fRef
106+
|. RescriptRelay_Internal
107+
.internal_resolverFragmentRefsToFragmentRefsPlural
108+
in
109+
RescriptRelay_Fragment.read ~convertFragment
110+
~fRef:
111+
(fRef
112+
|. [%e valFromGeneratedModule ["getFragmentRef"]])
113+
~node:[%e valFromGeneratedModule ["node"]]]
114+
else if NonReactUtils.enabled.contents then
115+
[%stri
116+
let readResolverFragment fRef :
117+
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
118+
let fRef =
119+
fRef
120+
|. RescriptRelay_Internal
121+
.internal_resolverFragmentRefsToFragmentRefs
122+
in
123+
RescriptRelay_FragmentNonReact.read ~convertFragment
124+
~fRef:
125+
(fRef
126+
|. [%e valFromGeneratedModule ["getFragmentRef"]])
127+
~node:[%e valFromGeneratedModule ["node"]]]
112128
else
113-
(if !NonReactUtils.enabled then
114-
[%stri
115-
let readResolverFragment fRef :
116-
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
117-
let fRef =
118-
fRef
119-
|. RescriptRelay_Internal
120-
.internal_resolverFragmentRefsToFragmentRefs
121-
in
122-
RescriptRelay_FragmentNonReact.read ~convertFragment
123-
~fRef:
124-
(fRef
125-
|. [%e valFromGeneratedModule ["getFragmentRef"]])
126-
~node:[%e valFromGeneratedModule ["node"]]]
127-
else
128-
[%stri
129-
let readResolverFragment fRef :
130-
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
131-
let fRef =
132-
fRef
133-
|. RescriptRelay_Internal
134-
.internal_resolverFragmentRefsToFragmentRefs
135-
in
136-
RescriptRelay_Fragment.read ~convertFragment
137-
~fRef:
138-
(fRef
139-
|. [%e valFromGeneratedModule ["getFragmentRef"]])
140-
~node:[%e valFromGeneratedModule ["node"]]]));
129+
[%stri
130+
let readResolverFragment fRef :
131+
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
132+
let fRef =
133+
fRef
134+
|. RescriptRelay_Internal
135+
.internal_resolverFragmentRefsToFragmentRefs
136+
in
137+
RescriptRelay_Fragment.read ~convertFragment
138+
~fRef:
139+
(fRef
140+
|. [%e valFromGeneratedModule ["getFragmentRef"]])
141+
~node:[%e valFromGeneratedModule ["node"]]]);
141142
]
142143
| true -> []);
143-
(match (!NonReactUtils.enabled, hasInlineDirective) with
144+
(match (NonReactUtils.enabled.contents, hasInlineDirective) with
144145
| true, _ -> []
145146
| false, true ->
146147
[
147-
(if !NonReactUtils.enabled then
148+
(if NonReactUtils.enabled.contents then
148149
[%stri
149150
let readInline fRef :
150151
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
151-
RescriptRelay_FragmentNonReact.readInlineData_ ~convertFragment
152+
RescriptRelay_FragmentNonReact.readInlineData_
153+
~convertFragment
152154
~fRef:
153-
(fRef |. [%e valFromGeneratedModule ["getFragmentRef"]])
155+
(fRef
156+
|. [%e valFromGeneratedModule ["getFragmentRef"]])
154157
~node:[%e valFromGeneratedModule ["node"]]]
155158
else
156159
[%stri
157160
let readInline fRef :
158161
[%t typeFromGeneratedModule ["Types"; "fragment"]] =
159162
RescriptRelay_Fragment.readInlineData ~convertFragment
160163
~fRef:
161-
(fRef |. [%e valFromGeneratedModule ["getFragmentRef"]])
164+
(fRef
165+
|. [%e valFromGeneratedModule ["getFragmentRef"]])
162166
~node:[%e valFromGeneratedModule ["node"]]]);
163167
]
164168
| false, false -> []);
165-
(match (!NonReactUtils.enabled, refetchableQueryName) with
169+
(match (NonReactUtils.enabled.contents, refetchableQueryName) with
166170
| true, _ | false, None -> []
167171
| false, Some refetchableQueryName -> (
168172
let typeFromRefetchableModule =

‎packages/rescript-relay/rescript-relay-ppx/library/Mutation.ml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,22 @@ let make ~loc ~moduleName =
3232
[%e
3333
valFromGeneratedModule
3434
["Internal"; "convertWrapRawResponse"]]];
35-
[%stri
36-
let commitMutation =
37-
(if !NonReactUtils.enabled then
35+
(if NonReactUtils.enabled.contents then
36+
[%stri
37+
let commitMutation =
3838
RescriptRelay_MutationNonReact.commitMutation
39-
else RescriptRelay_Mutation.commitMutation)
40-
~convertVariables ~convertResponse
41-
~convertWrapRawResponse
42-
~node:[%e valFromGeneratedModule ["node"]]];
39+
~convertVariables ~convertResponse
40+
~convertWrapRawResponse
41+
~node:[%e valFromGeneratedModule ["node"]]]
42+
else
43+
[%stri
44+
let commitMutation =
45+
RescriptRelay_Mutation.commitMutation ~convertVariables
46+
~convertResponse ~convertWrapRawResponse
47+
~node:[%e valFromGeneratedModule ["node"]]]);
4348
]
4449
@
45-
if not !NonReactUtils.enabled then
50+
if not NonReactUtils.enabled.contents then
4651
[
4752
[%stri
4853
let use =

0 commit comments

Comments
 (0)