Skip to content

Commit 96ffdd1

Browse files
committed
Renamed function
1 parent ffd9222 commit 96ffdd1

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

common/api-review/util.api.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,11 @@ export function ordinal(i: number): string;
346346
// @public (undocumented)
347347
export type PartialObserver<T> = Partial<Observer<T>>;
348348

349+
// Warning: (ae-internal-missing-underscore) The name "promiseWithTimeout" should be prefixed with an underscore because the declaration is marked as @internal
350+
//
351+
// @internal
352+
export function promiseWithTimeout<T>(promise: Promise<T>, timeInMS?: number): Promise<T>;
353+
349354
// Warning: (ae-missing-release-tag) "querystring" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
350355
//
351356
// @public
@@ -417,11 +422,6 @@ export interface Subscribe<T> {
417422
(observer: PartialObserver<T>): Unsubscribe;
418423
}
419424

420-
// Warning: (ae-missing-release-tag) "timeoutResolve" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
421-
//
422-
// @public
423-
export function timeoutResolve<T>(promise: Promise<T>, timeInMS?: number): Promise<T>;
424-
425425
// Warning: (ae-missing-release-tag) "Unsubscribe" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
426426
//
427427
// @public (undocumented)

packages/database-compat/test/query.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
import { timeoutResolve } from '@firebase/util';
18+
import { promiseWithTimeout } from '@firebase/util';
1919
import { expect, use } from 'chai';
2020
import chaiAsPromised from 'chai-as-promised';
2121
import * as _ from 'lodash';
@@ -3227,7 +3227,7 @@ describe('Query Tests', () => {
32273227
const node = getRandomNode() as Reference;
32283228
node.database.goOffline();
32293229
try {
3230-
const getPromise = timeoutResolve(node.get());
3230+
const getPromise = promiseWithTimeout(node.get());
32313231
await expect(getPromise).to.eventually.be.rejected;
32323232
} finally {
32333233
node.database.goOnline();

packages/database/test/exp/integration.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
import { initializeApp, deleteApp } from '@firebase/app';
19-
import { Deferred, timeoutResolve } from '@firebase/util';
19+
import { Deferred, promiseWithTimeout } from '@firebase/util';
2020
import { expect, use } from 'chai';
2121
import chaiAsPromised from 'chai-as-promised';
2222

@@ -275,10 +275,10 @@ describe('Database@exp Tests', () => {
275275
};
276276
await set(r, initial);
277277
goOffline(db);
278-
const getValue = timeoutResolve(get(r));
278+
const getValue = promiseWithTimeout(get(r));
279279
expect(getValue).to.be.rejectedWith('timeout!');
280280
goOnline(db);
281-
const deferredTimeout2 = await timeoutResolve(get(r));
281+
const deferredTimeout2 = await promiseWithTimeout(get(r));
282282
expect(deferredTimeout2.val()).to.deep.equal(initial);
283283
});
284284

packages/util/src/promise.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
import { Deferred } from "./deferred";
1919

20-
/*
21-
Rejects if the given promise doesn't resolve in timeInMS milliseconds.
22-
@internal
23-
*/
24-
export function timeoutResolve<T>(promise: Promise<T>, timeInMS = 2000) {
20+
/**
21+
* Rejects if the given promise doesn't resolve in timeInMS milliseconds.
22+
* @internal
23+
*/
24+
export function promiseWithTimeout<T>(promise: Promise<T>, timeInMS = 2000): Promise<T> {
2525
const deferredPromise = new Deferred<T>();
2626
setTimeout(() => deferredPromise.reject('timeout!'), timeInMS);
2727
promise.then(deferredPromise.resolve, deferredPromise.reject);

0 commit comments

Comments
 (0)