Review

Author: schmidt-sebastian

packages/firestore/src/platform/base64.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,51 +17,39 @@
 
 import { isNode, isReactNative } from '@firebase/util';
 
-import {
-  decodeBase64 as nodeDecodeBase64,
-  encodeBase64 as nodeEncodeBase64,
-  isBase64Available as nodeIsBase64Available
-} from './node/base64';
-import {
-  decodeBase64 as rnDecodeBase64,
-  encodeBase64 as rnEncodeBase64,
-  isBase64Available as rnIsBase64Available
-} from './rn/base64';
-import {
-  decodeBase64 as browserDecodeBase64,
-  encodeBase64 as browserEncodeBase64,
-  isBase64Available as browserIsBase64Available
-} from './browser/base64';
+import * as node from './node/base64';
+import * as rn from './rn/base64';
+import * as browser from './browser/base64';
 
 /** Converts a Base64 encoded string to a binary string. */
 export function decodeBase64(encoded: string): string {
   if (isNode()) {
-    return nodeDecodeBase64(encoded);
+    return node.decodeBase64(encoded);
   } else if (isReactNative()) {
-    return rnDecodeBase64(encoded);
+    return rn.decodeBase64(encoded);
   } else {
-    return browserDecodeBase64(encoded);
+    return browser.decodeBase64(encoded);
   }
 }
 
 /** Converts a binary string to a Base64 encoded string. */
 export function encodeBase64(raw: string): string {
   if (isNode()) {
-    return nodeEncodeBase64(raw);
+    return node.encodeBase64(raw);
   } else if (isReactNative()) {
-    return rnEncodeBase64(raw);
+    return rn.encodeBase64(raw);
   } else {
-    return browserEncodeBase64(raw);
+    return browser.encodeBase64(raw);
   }
 }
 
 /** True if and only if the Base64 conversion functions are available. */
 export function isBase64Available(): boolean {
   if (isNode()) {
-    return nodeIsBase64Available();
+    return node.isBase64Available();
   } else if (isReactNative()) {
-    return rnIsBase64Available();
+    return rn.isBase64Available();
   } else {
-    return browserIsBase64Available();
+    return browser.isBase64Available();
   }
 }

packages/firestore/src/platform/connection.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,38 +16,29 @@
  */
 
 import { isNode, isReactNative } from '@firebase/util';
-import {
-  newConnectivityMonitor as nodeNewConnectivityMonitor,
-  newConnection as nodeNewConnection
-} from './node/connection';
-import {
-  newConnectivityMonitor as rnNewConnectivityMonitor,
-  newConnection as rnNewConnection
-} from './rn/connection';
-import {
-  newConnectivityMonitor as browserNewConnectivityMonitor,
-  newConnection as browserNewConnection
-} from './browser/connection';
+import * as node from './node/connection';
+import * as rn from './rn/connection';
+import * as browser from './browser/connection';
 import { ConnectivityMonitor } from '../remote/connectivity_monitor';
 import { DatabaseInfo } from '../core/database_info';
 import { Connection } from '../remote/connection';
 
 export function newConnectivityMonitor(): ConnectivityMonitor {
   if (isNode()) {
-    return nodeNewConnectivityMonitor();
+    return node.newConnectivityMonitor();
   } else if (isReactNative()) {
-    return rnNewConnectivityMonitor();
+    return rn.newConnectivityMonitor();
   } else {
-    return browserNewConnectivityMonitor();
+    return browser.newConnectivityMonitor();
   }
 }
 
 export function newConnection(databaseInfo: DatabaseInfo): Promise<Connection> {
   if (isNode()) {
-    return nodeNewConnection(databaseInfo);
+    return node.newConnection(databaseInfo);
   } else if (isReactNative()) {
-    return rnNewConnection(databaseInfo);
+    return rn.newConnection(databaseInfo);
   } else {
-    return browserNewConnection(databaseInfo);
+    return browser.newConnection(databaseInfo);
   }
 }

packages/firestore/src/platform/dom.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,37 +16,28 @@
  */
 
 import { isNode, isReactNative } from '@firebase/util';
-import {
-  getWindow as nodeGetWindow,
-  getDocument as nodeGetDocument
-} from './node/dom';
-import {
-  getWindow as rnGetWindow,
-  getDocument as rnGetDocument
-} from './rn/dom';
-import {
-  getWindow as browserGetWindow,
-  getDocument as browserGetDocument
-} from './browser/dom';
+import * as node from './node/dom';
+import * as rn from './rn/dom';
+import * as browser from './browser/dom';
 
 /** The Platform's 'window' implementation or null if not available. */
 export function getWindow(): Window | null {
   if (isNode()) {
-    return nodeGetWindow();
+    return node.getWindow();
   } else if (isReactNative()) {
-    return rnGetWindow();
+    return rn.getWindow();
   } else {
-    return browserGetWindow();
+    return browser.getWindow();
   }
 }
 
 /** The Platform's 'document' implementation or null if not available. */
 export function getDocument(): Document | null {
   if (isNode()) {
-    return nodeGetDocument();
+    return node.getDocument();
   } else if (isReactNative()) {
-    return rnGetDocument();
+    return rn.getDocument();
   } else {
-    return browserGetDocument();
+    return browser.getDocument();
   }
 }

packages/firestore/src/platform/format_json.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
  */
 
 import { isNode, isReactNative } from '@firebase/util';
-import { formatJSON as nodeFormatJSON } from './node/format_json';
-import { formatJSON as rnFormatJSON } from './rn/format_json';
-import { formatJSON as browserFormatJSON } from './browser/format_json';
+import * as node from './node/format_json';
+import * as rn from './rn/format_json';
+import * as browser from './browser/format_json';
 
 /** Formats an object as a JSON string, suitable for logging. */
 export function formatJSON(value: unknown): string {
   if (isNode()) {
-    return nodeFormatJSON(value);
+    return node.formatJSON(value);
   } else if (isReactNative()) {
-    return rnFormatJSON(value);
+    return rn.formatJSON(value);
   } else {
-    return browserFormatJSON(value);
+    return browser.formatJSON(value);
   }
 }

packages/firestore/src/platform/node/load_protos.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packages/firestore/src/platform/random_bytes.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
  */
 
 import { isNode, isReactNative } from '@firebase/util';
-import { randomBytes as nodeRandomBytes } from './node/random_bytes';
-import { randomBytes as rnRandomBytes } from './rn/random_bytes';
-import { randomBytes as browserRandomBytes } from './browser/random_bytes';
+import * as node from './node/random_bytes';
+import * as rn from './rn/random_bytes';
+import * as browser from './browser/random_bytes';
 
 /**
  * Generates `nBytes` of random bytes.
@@ -27,10 +27,10 @@ import { randomBytes as browserRandomBytes } from './browser/random_bytes';
  */
 export function randomBytes(nBytes: number): Uint8Array {
   if (isNode()) {
-    return nodeRandomBytes(nBytes);
+    return node.randomBytes(nBytes);
   } else if (isReactNative()) {
-    return rnRandomBytes(nBytes);
+    return rn.randomBytes(nBytes);
   } else {
-    return browserRandomBytes(nBytes);
+    return browser.randomBytes(nBytes);
   }
 }

packages/firestore/src/platform/serializer.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google LLC
+ * Copyright 2020 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,18 @@
  */
 
 import { isNode, isReactNative } from '@firebase/util';
-import { newSerializer as nodeNewSerializer } from './node/serializer';
-import { newSerializer as rnNewSerializer } from './rn/serializer';
-import { newSerializer as browserNewSerializer } from './browser/serializer';
+import * as node from './node/serializer';
+import * as rn from './rn/serializer';
+import * as browser from './browser/serializer';
 import { DatabaseId } from '../core/database_info';
 import { JsonProtoSerializer } from '../remote/serializer';
 
 export function newSerializer(databaseId: DatabaseId): JsonProtoSerializer {
   if (isNode()) {
-    return nodeNewSerializer(databaseId);
+    return node.newSerializer(databaseId);
   } else if (isReactNative()) {
-    return rnNewSerializer(databaseId);
+    return rn.newSerializer(databaseId);
   } else {
-    return browserNewSerializer(databaseId);
+    return browser.newSerializer(databaseId);
   }
 }