-
Notifications
You must be signed in to change notification settings - Fork 0
/
0001-getVarialbes-new-approach.patch
336 lines (316 loc) · 10.5 KB
/
0001-getVarialbes-new-approach.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
From ea95b65e56e4bff9598b5904ac54986e2f9aacb4 Mon Sep 17 00:00:00 2001
From: Bo Chen <bo.chen@kindredgroup.com>
Date: Thu, 8 Jun 2017 12:27:39 +1000
Subject: [PATCH] getVarialbes() new approach
---
.../environment/RelayCombinedEnvironmentTypes.js | 5 ++
.../environment/RelayFragmentSpecResolver.js | 21 ++++++
.../modern/ReactRelayRefetchContainer.js | 12 +---
packages/react-relay/modern/ReactRelayTypes.js | 1 +
.../__tests__/ReactRelayRefetchContainer-test.js | 84 +++++++++++++++++++++-
.../store/RelayModernFragmentSpecResolver.js | 21 ++++++
6 files changed, 132 insertions(+), 12 deletions(-)
diff --git a/packages/react-relay/classic/environment/RelayCombinedEnvironmentTypes.js b/packages/react-relay/classic/environment/RelayCombinedEnvironmentTypes.js
index 7919fece..c930425c 100644
--- a/packages/react-relay/classic/environment/RelayCombinedEnvironmentTypes.js
+++ b/packages/react-relay/classic/environment/RelayCombinedEnvironmentTypes.js
@@ -115,6 +115,11 @@ export interface FragmentSpecResolver {
* `resolve()` to get the updated results.
*/
setVariables(variables: Variables): void,
+
+ /**
+ * get the variables that currently being used
+ */
+ getVariables(): Variables,
}
export type CFragmentMap<TFragment> = {[key: string]: TFragment};
diff --git a/packages/react-relay/classic/environment/RelayFragmentSpecResolver.js b/packages/react-relay/classic/environment/RelayFragmentSpecResolver.js
index 8d6c29b6..e05d7497 100644
--- a/packages/react-relay/classic/environment/RelayFragmentSpecResolver.js
+++ b/packages/react-relay/classic/environment/RelayFragmentSpecResolver.js
@@ -167,6 +167,16 @@ class RelayFragmentSpecResolver implements FragmentSpecResolver {
this._stale = true;
}
+ getVariables(): Variables {
+ let variables = {};
+ forEachObject(this._resolvers, resolver => {
+ if (resolver) {
+ Object.assign(variables, resolver.getVariables());
+ }
+ });
+ return variables;
+ }
+
_onChange = (): void => {
this._stale = true;
this._callback();
@@ -234,6 +244,10 @@ class SelectorResolver {
this.setSelector(selector);
}
+ getVariables(): Variables {
+ return this._selector.variables;
+ }
+
_onChange = (snapshot: Snapshot): void => {
this._data = snapshot.data;
this._callback();
@@ -312,6 +326,13 @@ class SelectorListResolver {
this._stale = true;
}
+ getVariables(): Variables {
+ if (this._resolvers.length > 0 ) {
+ return this._resolvers[0].getVariables();
+ }
+ return {};
+ }
+
_onChange = (data: ?Object): void => {
this._stale = true;
this._callback();
diff --git a/packages/react-relay/modern/ReactRelayRefetchContainer.js b/packages/react-relay/modern/ReactRelayRefetchContainer.js
index 88d8dc40..152a5baa 100644
--- a/packages/react-relay/modern/ReactRelayRefetchContainer.js
+++ b/packages/react-relay/modern/ReactRelayRefetchContainer.js
@@ -184,6 +184,7 @@ function createContainerWithFragments<TBase: ReactClass<*>>(
return {
environment: relay.environment,
refetch: this._refetch,
+ getVariables: this._getFragmentVariables,
};
}
@@ -197,15 +198,8 @@ function createContainerWithFragments<TBase: ReactClass<*>>(
this.setState({data: this._resolver.resolve()}, profiler.stop);
};
- _getFragmentVariables(): Variables {
- const {
- getVariablesFromObject,
- } = this.context.relay.environment.unstable_internal;
- return getVariablesFromObject(
- this.context.relay.variables,
- fragments,
- this.props,
- );
+ _getFragmentVariables = (): Variables => {
+ return this._resolver.getVariables();
}
_refetch = (
diff --git a/packages/react-relay/modern/ReactRelayTypes.js b/packages/react-relay/modern/ReactRelayTypes.js
index 7159f846..310bf5f7 100644
--- a/packages/react-relay/modern/ReactRelayTypes.js
+++ b/packages/react-relay/modern/ReactRelayTypes.js
@@ -45,6 +45,7 @@ export type RelayRefetchProp = RelayProp & {
callback: ?(error: ?Error) => void,
options?: RefetchOptions,
) => Disposable,
+ getVariables: Variables,
};
export type RefetchOptions = {
diff --git a/packages/react-relay/modern/__tests__/ReactRelayRefetchContainer-test.js b/packages/react-relay/modern/__tests__/ReactRelayRefetchContainer-test.js
index 9f9ad21f..59b4925e 100644
--- a/packages/react-relay/modern/__tests__/ReactRelayRefetchContainer-test.js
+++ b/packages/react-relay/modern/__tests__/ReactRelayRefetchContainer-test.js
@@ -29,9 +29,11 @@ describe('ReactRelayRefetchContainer', () => {
let TestContainer;
let UserFragment;
let UserQuery;
+ let RefetchQuery;
let environment;
let refetch;
+ let getVariables;
let render;
let variables;
let ContextGetter;
@@ -82,7 +84,7 @@ describe('ReactRelayRefetchContainer', () => {
jest.addMatchers(RelayModernTestUtils.matchers);
environment = createMockEnvironment();
- ({UserFragment, UserQuery} = environment.mock.compile(
+ ({UserFragment, UserQuery, RefetchQuery} = environment.mock.compile(
`
query UserQuery(
$id: ID!
@@ -98,6 +100,14 @@ describe('ReactRelayRefetchContainer', () => {
id
name @include(if: $cond)
}
+
+ query RefetchQuery(
+ $id: ID!, $cond: Boolean!
+ ) {
+ node(id: $id) {
+ ...UserFragment @arguments(cond: $cond)
+ }
+ }
`,
));
@@ -118,6 +128,7 @@ describe('ReactRelayRefetchContainer', () => {
render = jest.fn(props => {
refetch = props.relay.refetch;
+ getVariables = props.relay.getVariables;
return <ContextGetter />;
});
variables = {};
@@ -180,6 +191,7 @@ describe('ReactRelayRefetchContainer', () => {
relay: {
environment: jasmine.any(Object),
refetch: jasmine.any(Function),
+ getVariables: jasmine.any(Function),
},
user: null,
});
@@ -199,6 +211,7 @@ describe('ReactRelayRefetchContainer', () => {
relay: {
environment: jasmine.any(Object),
refetch: jasmine.any(Function),
+ getVariables: jasmine.any(Function),
},
user: null,
});
@@ -238,6 +251,7 @@ describe('ReactRelayRefetchContainer', () => {
relay: {
environment: jasmine.any(Object),
refetch: jasmine.any(Function),
+ getVariables: jasmine.any(Function),
},
});
// Subscribes for updates
@@ -295,6 +309,7 @@ describe('ReactRelayRefetchContainer', () => {
relay: {
environment: jasmine.any(Object),
refetch: jasmine.any(Function),
+ getVariables: jasmine.any(Function),
},
});
});
@@ -333,6 +348,7 @@ describe('ReactRelayRefetchContainer', () => {
relay: {
environment: jasmine.any(Object),
refetch: jasmine.any(Function),
+ getVariables: jasmine.any(Function),
},
});
// Container subscribes for updates on new props
@@ -378,6 +394,7 @@ describe('ReactRelayRefetchContainer', () => {
relay: {
environment: jasmine.any(Object),
refetch: jasmine.any(Function),
+ getVariables: jasmine.any(Function),
},
});
// Container subscribes for updates on new props
@@ -802,9 +819,70 @@ describe('ReactRelayRefetchContainer', () => {
updateVariables
);
- expect(relayContext.environment).toBe(environment);
+ expect(relayContext.environment).toBe(environment);
expect(relayContext.variables).toEqual(updateVariables);
});
- });
+ });
+
+
+ describe('getVarialbes()', () => {
+ let instance;
+ let references;
+
+ beforeEach(() => {
+ TestContainer = ReactRelayRefetchContainer.createContainer(
+ TestComponent,
+ {
+ user: () => UserFragment,
+ },
+ RefetchQuery,
+ );
+ references = [];
+ environment.retain = () => {
+ const dispose = jest.fn();
+ const ref = {dispose};
+ references.push(ref);
+ return ref;
+ };
+ const userPointer = environment.lookup({
+ dataID: ROOT_ID,
+ node: UserQuery.fragment,
+ variables: {id: '4'},
+ }).data.node;
+ instance = ReactTestRenderer.create(
+ <ContextSetter environment={environment} variables={variables}>
+ <TestContainer user={userPointer} />
+ </ContextSetter>,
+ );
+ });
+
+ it.only('getVariables() should return the correct value', async () => {
+ expect.assertions(2);
+ let fragmentVariables = getVariables();
+ expect(fragmentVariables).toEqual({
+ cond: true
+ });
+ const callback = jest.fn();
+ variables = {
+ cond: false,
+ id: '4',
+ };
+ refetch(variables, null, callback);
+ await environment.mock.resolve(RefetchQuery, {
+ data: {
+ node: {
+ id: '4',
+ __typename: 'User',
+ },
+ },
+ });
+ fragmentVariables = getVariables();
+ expect(fragmentVariables).toEqual({
+ id: 4,
+ cond: false
+ });
+ });
+ });
+
});
diff --git a/packages/relay-runtime/store/RelayModernFragmentSpecResolver.js b/packages/relay-runtime/store/RelayModernFragmentSpecResolver.js
index 37e0d479..0558fd10 100644
--- a/packages/relay-runtime/store/RelayModernFragmentSpecResolver.js
+++ b/packages/relay-runtime/store/RelayModernFragmentSpecResolver.js
@@ -177,6 +177,16 @@ class RelayModernFragmentSpecResolver implements FragmentSpecResolver {
this._stale = true;
}
+ getVariables(): Variables {
+ let variables = {};
+ forEachObject(this._resolvers, resolver => {
+ if (resolver) {
+ Object.assign(variables, resolver.getVariables());
+ }
+ });
+ return variables;
+ }
+
_onChange = (): void => {
this._stale = true;
this._callback();
@@ -239,6 +249,10 @@ class SelectorResolver {
this.setSelector(selector);
}
+ getVariables(): Variables {
+ return this._selector.variables;
+ }
+
_onChange = (snapshot: Snapshot): void => {
this._data = snapshot.data;
this._callback();
@@ -317,6 +331,13 @@ class SelectorListResolver {
this._stale = true;
}
+ getVariables(): Variables {
+ if (this._resolvers.length > 0 ) {
+ return this._resolvers[0].getVariables();
+ }
+ return {};
+ }
+
_onChange = (data: ?Object): void => {
this._stale = true;
this._callback();
--
2.12.2.windows.1