Cleanup

Author: schmidt-sebastian

packages/firestore/karma.conf.js

@@ -18,7 +18,7 @@
 const karmaBase = require('../../config/karma.base');
 const { argv } = require('yargs');
 
-module.exports = function (config) {
+module.exports = function(config) {
   const karmaConfig = Object.assign({}, karmaBase, {
     // files to load into karma
     files: getTestFiles(argv),

packages/firestore/lite/test/bootstrap.ts

@@ -24,7 +24,7 @@ import '../register';
  * https://github.com/webpack-contrib/karma-webpack#alternative-usage
  */
 
-process.env.TEST_PLATFORM = 'node-lite';
+process.env.TEST_PLATFORM = 'browser-lite';
 
 // 'context()' definition requires additional dependency on webpack-env package.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/firestore/package.json

@@ -63,7 +63,6 @@
     "@firebase/webchannel-wrapper": "0.2.41",
     "@grpc/grpc-js": "^1.0.0",
     "@grpc/proto-loader": "^0.5.0",
-    "axios": "^0.19.2",
     "node-fetch": "2.6.0",
     "tslib": "^1.11.1"
   },

packages/firestore/rollup.config.lite.js

@@ -111,7 +111,10 @@ const allBuilds = [
       format: 'es',
       sourcemap: true
     },
-    plugins: [alias(util.generateAliasConfig('browser_lite')), ...browserPlugins],
+    plugins: [
+      alias(util.generateAliasConfig('browser_lite')),
+      ...browserPlugins
+    ],
     external: util.resolveBrowserExterns,
     treeshake: {
       moduleSideEffects: false

packages/firestore/rollup.shared.js

@@ -29,7 +29,7 @@ const pkg = require('./package.json');
  * references to platform-specific files with implementations for the provided
  * target platform.
  */
-exports.generateAliasConfig = function (platform) {
+exports.generateAliasConfig = function(platform) {
   return {
     entries: [
       {
@@ -47,12 +47,12 @@ const browserDeps = Object.keys(
 const nodeDeps = [...browserDeps, 'util', 'path'];
 
 /** Resolves the external dependencies for the browser build. */
-exports.resolveBrowserExterns = function (id) {
+exports.resolveBrowserExterns = function(id) {
   return browserDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
 };
 
 /** Resolves the external dependencies for the Node build. */
-exports.resolveNodeExterns = function (id) {
+exports.resolveNodeExterns = function(id) {
   return nodeDeps.some(dep => id === dep || id.startsWith(`${dep}/`));
 };
 

packages/firestore/src/local/simple_db.ts

@@ -218,7 +218,10 @@ export class SimpleDb {
   static getIOSVersion(ua: string): number {
     const iOSVersionRegex = ua.match(/i(?:phone|pad|pod) os ([\d_]+)/i);
     const version = iOSVersionRegex
-      ? iOSVersionRegex[1].split('_').slice(0, 2).join('.')
+      ? iOSVersionRegex[1]
+          .split('_')
+          .slice(0, 2)
+          .join('.')
       : '-1';
     return Number(version);
   }
@@ -228,7 +231,10 @@ export class SimpleDb {
   static getAndroidVersion(ua: string): number {
     const androidVersionRegex = ua.match(/Android ([\d.]+)/i);
     const version = androidVersionRegex
-      ? androidVersionRegex[1].split('.').slice(0, 2).join('.')
+      ? androidVersionRegex[1]
+          .split('.')
+          .slice(0, 2)
+          .join('.')
       : '-1';
     return Number(version);
   }

packages/firestore/src/platform/browser/webchannel_connection.ts

@@ -130,13 +130,13 @@ export class WebChannelConnection extends RestConnection {
             default:
               fail(
                 'RPC "' +
-                rpcName +
-                '" failed with unanticipated ' +
-                'webchannel error ' +
-                xhr.getLastErrorCode() +
-                ': ' +
-                xhr.getLastError() +
-                ', giving up.'
+                  rpcName +
+                  '" failed with unanticipated ' +
+                  'webchannel error ' +
+                  xhr.getLastErrorCode() +
+                  ': ' +
+                  xhr.getLastError() +
+                  ', giving up.'
               );
           }
         } finally {
@@ -148,7 +148,7 @@ export class WebChannelConnection extends RestConnection {
       xhr.send(url, 'POST', requestString, headers, XHR_TIMEOUT_SECS);
     });
   }
-  
+
   openStream<Req, Resp>(
     rpcName: string,
     token: Token | null

packages/firestore/src/platform/browser_lite/fetch_connection.ts

@@ -18,13 +18,24 @@
 import { Token } from '../../api/credentials';
 import { Stream } from '../../remote/connection';
 import { mapCodeFromHttpStatus } from '../../remote/rpc_error';
-import { FirestoreError } from '../../util/error'; 
+import { FirestoreError } from '../../util/error';
 import { StringMap } from '../../util/types';
 import { RestConnection } from '../../remote/rest_connection';
-import {DatabaseInfo} from "../../core/database_info";
+import { DatabaseInfo } from '../../core/database_info';
 
+/**
+ * A Rest-based connection that relies on the native HTTP stack
+ * (e.g. `fetch` or a polyfill).
+ */
 export class FetchConnection extends RestConnection {
-  constructor(databaseInfo: DatabaseInfo, private readonly fetchImpl: typeof fetch) {
+  /**
+   * @param databaseInfo The connection info.
+   * @param fetchImpl `fetch` or a Polyfill that implements the fetch API.
+   */
+  constructor(
+    databaseInfo: DatabaseInfo,
+    private readonly fetchImpl: typeof fetch
+  ) {
     super(databaseInfo);
   }
 
@@ -56,14 +67,14 @@ export class FetchConnection extends RestConnection {
         'Request failed with error: ' + err.statusText
       );
     }
-    
+
     if (!response.ok) {
       throw new FirestoreError(
         mapCodeFromHttpStatus(response.status),
         'Request failed with error: ' + response.statusText
       );
     }
-    
+
     return response.json();
   }
 }

packages/firestore/src/platform/browser_lite/serializer.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-/** Return the Platform-specific serializer monitor. */
 import { JsonProtoSerializer } from '../../remote/serializer';
 import { DatabaseId } from '../../core/database_info';
 

packages/firestore/src/platform/connection.ts

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ConnectivityMonitor} from "../remote/connectivity_monitor";
-import {DatabaseInfo} from "../core/database_info";
-import {Connection} from "../remote/connection";
+import { ConnectivityMonitor } from '../remote/connectivity_monitor';
+import { DatabaseInfo } from '../core/database_info';
+import { Connection } from '../remote/connection';
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports

packages/firestore/src/platform/format_json.ts

@@ -17,7 +17,8 @@
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/format_json`);
+const platform = require(`./${process.env.TEST_PLATFORM ??
+  'node'}/format_json`);
 
 /** Formats an object as a JSON string, suitable for logging. */
 export function formatJSON(value: unknown): string {

packages/firestore/src/platform/node_lite/connection.ts

@@ -17,9 +17,9 @@
 
 import * as nodeFetch from 'node-fetch';
 
-import {FetchConnection} from "../browser_lite/fetch_connection";
-import {DatabaseInfo} from "../../core/database_info";
-import {Connection} from "../../remote/connection";
+import { FetchConnection } from '../browser_lite/fetch_connection';
+import { DatabaseInfo } from '../../core/database_info';
+import { Connection } from '../../remote/connection';
 
 export { newConnectivityMonitor } from '../browser/connection';
 

packages/firestore/src/platform/random_bytes.ts

@@ -17,13 +17,14 @@
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/random_bytes`);
+const platform = require(`./${process.env.TEST_PLATFORM ??
+  'node'}/random_bytes`);
 
 /**
  * Generates `nBytes` of random bytes.
  *
  * If `nBytes < 0` , an error will be thrown.
  */
 export function randomBytes(nBytes: number): Uint8Array {
-    return platform.randomBytes(nBytes);
+  return platform.randomBytes(nBytes);
 }

packages/firestore/src/platform/serializer.ts

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {DatabaseId} from "../core/database_info";
-import {JsonProtoSerializer} from "../remote/serializer";
+import { DatabaseId } from '../core/database_info';
+import { JsonProtoSerializer } from '../remote/serializer';
 
 // This file is only used under ts-node.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const platform = require(`./${process.env.TEST_PLATFORM ?? 'node'}/serializer`);
 
 export function newSerializer(databaseId: DatabaseId): JsonProtoSerializer {
-    return platform.newSerializer(databaseId);
+  return platform.newSerializer(databaseId);
 }

packages/firestore/src/remote/rest_connection.ts

@@ -27,9 +27,9 @@ import { Indexable } from '../util/misc';
 
 const LOG_TAG = 'RestConnection';
 
-/** 
- * Maps RPC names to the corresponding REST endpoint name. 
- * 
+/**
+ * Maps RPC names to the corresponding REST endpoint name.
+ *
  * We use array notation to avoid mangling.
  */
 const RPC_NAME_URL_MAPPING: StringMap = {};
@@ -92,7 +92,15 @@ export abstract class RestConnection implements Connection {
         return response;
       },
       (err: FirestoreError) => {
-        logWarn(LOG_TAG, `${rpcName} failed with error: `, err.message, 'url: ', url, 'request:', req);
+        logWarn(
+          LOG_TAG,
+          `${rpcName} failed with error: `,
+          err.message,
+          'url: ',
+          url,
+          'request:',
+          req
+        );
         throw err;
       }
     );
@@ -107,7 +115,7 @@ export abstract class RestConnection implements Connection {
     // can just use the normal invoke() method.
     return this.invokeRPC<Req, Resp[]>(rpcName, request, token);
   }
-  
+
   abstract openStream<Req, Resp>(
     rpcName: string,
     token: Token | null

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

@@ -76,7 +76,12 @@ apiDescribe('Database batch writes', (persistence: boolean) => {
     return integrationHelpers.withTestDoc(persistence, doc => {
       return doc
         .set({ foo: 'bar' })
-        .then(() => doc.firestore.batch().update(doc, { baz: 42 }).commit())
+        .then(() =>
+          doc.firestore
+            .batch()
+            .update(doc, { baz: 42 })
+            .commit()
+        )
         .then(() => doc.get())
         .then(snapshot => {
           expect(snapshot.exists).to.equal(true);
@@ -121,7 +126,12 @@ apiDescribe('Database batch writes', (persistence: boolean) => {
         .then(snapshot => {
           expect(snapshot.exists).to.equal(true);
         })
-        .then(() => doc.firestore.batch().delete(doc).commit())
+        .then(() =>
+          doc.firestore
+            .batch()
+            .delete(doc)
+            .commit()
+        )
         .then(() => doc.get())
         .then(snapshot => {
           expect(snapshot.exists).to.equal(false);

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

@@ -48,7 +48,10 @@ apiDescribe('Cursors', (persistence: boolean) => {
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([{ v: 'a' }, { v: 'b' }]);
           const lastDoc = docs.docs[docs.docs.length - 1];
-          return coll.limit(3).startAfter(lastDoc).get();
+          return coll
+            .limit(3)
+            .startAfter(lastDoc)
+            .get();
         })
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([
@@ -57,12 +60,18 @@ apiDescribe('Cursors', (persistence: boolean) => {
             { v: 'e' }
           ]);
           const lastDoc = docs.docs[docs.docs.length - 1];
-          return coll.limit(1).startAfter(lastDoc).get();
+          return coll
+            .limit(1)
+            .startAfter(lastDoc)
+            .get();
         })
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([{ v: 'f' }]);
           const lastDoc = docs.docs[docs.docs.length - 1];
-          return coll.limit(3).startAfter(lastDoc).get();
+          return coll
+            .limit(3)
+            .startAfter(lastDoc)
+            .get();
         })
         .then(docs => {
           expect(toDataArray(docs)).to.deep.equal([]);

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

@@ -660,10 +660,16 @@ apiDescribe('Database', (persistence: boolean) => {
     it('inequality same as first orderBy works.', () => {
       return withTestCollection(persistence, {}, async coll => {
         expect(() =>
-          coll.where('x', '>', 32).orderBy('x').orderBy('y')
+          coll
+            .where('x', '>', 32)
+            .orderBy('x')
+            .orderBy('y')
         ).not.to.throw();
         expect(() =>
-          coll.orderBy('x').where('x', '>', 32).orderBy('y')
+          coll
+            .orderBy('x')
+            .where('x', '>', 32)
+            .orderBy('y')
         ).not.to.throw();
       });
     });