Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[Relay] don't use the reserved word "await" as a method name #678

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/legacy/store/GraphQLQueryRunner.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ function runQueries(
);
}

RelayTaskScheduler.await(() => {
RelayTaskScheduler.enqueue(() => {
var forceIndex = fetchMode === DliteFetchModeConstants.FETCH_MODE_REFETCH ?
generateForceIndex() : null;

Expand Down
4 changes: 2 additions & 2 deletions src/store/RelayGarbageCollection.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ function scheduler(run: () => boolean): void {
}
// This is effectively a (possibly async) `while` loop
if (hasNext) {
RelayTaskScheduler.await(runIteration);
RelayTaskScheduler.enqueue(runIteration);
}
};
RelayTaskScheduler.await(runIteration);
RelayTaskScheduler.enqueue(runIteration);
}

module.exports = RelayGarbageCollection;
2 changes: 1 addition & 1 deletion src/store/RelayPendingQueryTracker.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class PendingFetch {
): void {
this._fetchedSubtractedQuery = true;

RelayTaskScheduler.await(() => {
RelayTaskScheduler.enqueue(() => {
var response = result.response;
invariant(
response && typeof response === 'object',
Expand Down
6 changes: 3 additions & 3 deletions src/tools/RelayTaskScheduler.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var RelayTaskScheduler = {
* Otherwise, the returned promise will be resolved with the return value of
* the last callback. For example:
*
* RelayTaskScheduler.await(
* RelayTaskScheduler.enqueue(
* function() {
* return 'foo';
* },
Expand All @@ -76,7 +76,7 @@ var RelayTaskScheduler = {
* }
* );
*
* RelayTaskScheduler.await(
* RelayTaskScheduler.enqueue(
* function() {
* return 'foo';
* },
Expand All @@ -91,7 +91,7 @@ var RelayTaskScheduler = {
* );

*/
await: function(...callbacks: Array<(value: any) => any>): Promise<any> {
enqueue: function(...callbacks: Array<(value: any) => any>): Promise<any> {
var promise = new Promise((resolve, reject) => {
var nextIndex = 0;
var error = null;
Expand Down
36 changes: 18 additions & 18 deletions src/tools/__tests__/RelayTaskScheduler-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('RelayTaskScheduler', () => {
describe('default scheduler', () => {
it('resolves to undefined when no callbacks are supplied', () => {
var mockFunction = jest.genMockFunction();
RelayTaskScheduler.await().then(mockFunction);
RelayTaskScheduler.enqueue().then(mockFunction);

jest.runAllTimers();

Expand All @@ -36,7 +36,7 @@ describe('RelayTaskScheduler', () => {

it('immediately invokes tasks', () => {
var mockFunction = jest.genMockFunction();
RelayTaskScheduler.await(mockFunction);
RelayTaskScheduler.enqueue(mockFunction);

jest.runAllTimers();

Expand All @@ -46,9 +46,9 @@ describe('RelayTaskScheduler', () => {
it('invokes multiple awaited tasks in order', () => {
var mockOrdering = [];

RelayTaskScheduler.await(() => mockOrdering.push('foo'));
RelayTaskScheduler.await(() => mockOrdering.push('bar'));
RelayTaskScheduler.await(() => mockOrdering.push('baz'));
RelayTaskScheduler.enqueue(() => mockOrdering.push('foo'));
RelayTaskScheduler.enqueue(() => mockOrdering.push('bar'));
RelayTaskScheduler.enqueue(() => mockOrdering.push('baz'));

jest.runAllTimers();

Expand All @@ -58,12 +58,12 @@ describe('RelayTaskScheduler', () => {
it('awaits tasks awaited by other tasks contiguously', () => {
var mockOrdering = [];

RelayTaskScheduler.await(() => {
RelayTaskScheduler.enqueue(() => {
mockOrdering.push('foo');
RelayTaskScheduler.await(() => mockOrdering.push('bar'));
RelayTaskScheduler.enqueue(() => mockOrdering.push('bar'));
});
// Although `baz` is enqueued before `bar`, `bar` should execute first.
RelayTaskScheduler.await(() => mockOrdering.push('baz'));
RelayTaskScheduler.enqueue(() => mockOrdering.push('baz'));

jest.runAllTimers();

Expand All @@ -72,7 +72,7 @@ describe('RelayTaskScheduler', () => {

it('resolves to the task\'s return value', () => {
var mockFunction = jest.genMockFunction();
RelayTaskScheduler.await(() => 42).then(mockFunction);
RelayTaskScheduler.enqueue(() => 42).then(mockFunction);

jest.runAllTimers();

Expand All @@ -82,7 +82,7 @@ describe('RelayTaskScheduler', () => {
it('forwards return values for multiple callbacks', () => {
var mockOrdering = [];

RelayTaskScheduler.await(
RelayTaskScheduler.enqueue(
() => {
mockOrdering.push('foo');
return 'bar';
Expand All @@ -107,7 +107,7 @@ describe('RelayTaskScheduler', () => {
var mockCallback = jest.genMockFunction();
var mockFailureCallback = jest.genMockFunction();

RelayTaskScheduler.await(
RelayTaskScheduler.enqueue(
() => 'foo',
() => { throw mockError; },
mockCallback,
Expand All @@ -125,11 +125,11 @@ describe('RelayTaskScheduler', () => {
var mockFailureCallback = jest.genMockFunction();
var mockSuccessCallback = jest.genMockFunction();

RelayTaskScheduler.await(
RelayTaskScheduler.enqueue(
() => { throw mockError; },
).catch(mockFailureCallback);

RelayTaskScheduler.await(
RelayTaskScheduler.enqueue(
mockCallback,
).then(mockSuccessCallback);

Expand All @@ -156,7 +156,7 @@ describe('RelayTaskScheduler', () => {
RelayTaskScheduler.injectScheduler(mockScheduler);

var mockFunction = jest.genMockFunction();
RelayTaskScheduler.await(mockFunction);
RelayTaskScheduler.enqueue(mockFunction);

jest.runAllTimers();

Expand All @@ -173,11 +173,11 @@ describe('RelayTaskScheduler', () => {

var mockOrdering = [];

RelayTaskScheduler.await(() => {
RelayTaskScheduler.enqueue(() => {
mockOrdering.push('foo');
RelayTaskScheduler.await(() => mockOrdering.push('bar'));
RelayTaskScheduler.enqueue(() => mockOrdering.push('bar'));
});
RelayTaskScheduler.await(() => mockOrdering.push('baz'));
RelayTaskScheduler.enqueue(() => mockOrdering.push('baz'));

jest.runAllTimers();

Expand Down Expand Up @@ -206,7 +206,7 @@ describe('RelayTaskScheduler', () => {
RelayTaskScheduler.injectScheduler(mockScheduler);

var mockFunction = jest.genMockFunction();
RelayTaskScheduler.await(mockFunction);
RelayTaskScheduler.enqueue(mockFunction);

jest.runAllTimers();

Expand Down