Fix isNumber implementation

Author: MarkDuckworth

packages/firestore/src/lite-api/pipeline.ts

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import { isNumber } from 'util';
-
 import {
   Pipeline as ProtoPipeline,
   Stage as ProtoStage
@@ -29,7 +27,7 @@ import {
   selectablesToMap,
   vectorToExpr
 } from '../util/pipeline_util';
-import { isString } from '../util/types';
+import { isNumber, isString } from '../util/types';
 
 import { Firestore } from './database';
 import {
@@ -544,10 +542,15 @@ export class Pipeline implements ProtoSerializable<ProtoPipeline> {
   offset(options: OffsetStageOptions): Pipeline;
   offset(offsetOrOptions: number | OffsetStageOptions): Pipeline {
     // Process argument union(s) from method overloads
-    const options = isNumber(offsetOrOptions) ? {} : offsetOrOptions;
-    const offset: number = isNumber(offsetOrOptions)
-      ? offsetOrOptions
-      : offsetOrOptions.offset;
+    let options: {};
+    let offset: number;
+    if (isNumber(offsetOrOptions)) {
+      options = {};
+      offset = offsetOrOptions;
+    } else {
+      options = offsetOrOptions;
+      offset = offsetOrOptions.offset;
+    }
 
     // Create stage object
     const stage = new Offset(offset, options);

packages/firestore/src/util/types.ts

@@ -37,6 +37,10 @@ export function isNegativeZero(value: number): boolean {
   return value === 0 && 1 / value === 1 / -0;
 }
 
+export function isNumber(value: unknown): value is number {
+  return typeof value === 'number';
+}
+
 /**
  * Returns whether a value is an integer and in the safe integer range
  * @param value - The value to test for being an integer and in the safe range

packages/firestore/test/integration/api/pipeline.test.ts

@@ -2823,8 +2823,7 @@ apiDescribe.only('Pipelines', persistence => {
         });
       });
 
-      // TODO re-enabled on fix of b/446938511
-      it.skip('array contains any', async () => {
+      it('array contains any', async () => {
         const snapshot = await execute(
           firestore
             .pipeline()
@@ -3984,6 +3983,7 @@ apiDescribe.only('Pipelines', persistence => {
   describe('stage options', () => {
     describe('forceIndex', () => {
       // SKIP: requires pre-existing index
+      // eslint-disable-next-line no-restricted-properties
       it.skip('Collection Stage', async () => {
         const snapshot = await execute(
           firestore.pipeline().collection({
@@ -3995,6 +3995,7 @@ apiDescribe.only('Pipelines', persistence => {
       });
 
       // SKIP: requires pre-existing index
+      // eslint-disable-next-line no-restricted-properties
       it.skip('CollectionGroup Stage', async () => {
         const snapshot = await execute(
           firestore.pipeline().collectionGroup({