before brwoser fix

Author: schmidt-sebastian

packages/firestore/rollup.config.es2017.js

@@ -67,6 +67,14 @@ const browserBuildPlugins = [
       {
         find: /(.*)\/platform\/platform(.*)/,
         replacement: '$1/platform_browser/browser_platform$2'
+      },
+      {
+        find: /(.*)\/platform\/random_bytes(.*)/,
+        replacement: '$1/platform_browser/browser_random_bytes$2'
+      },
+      {
+        find: /(.*)\/platform\/format_json(.*)/,
+        replacement: '$1/platform_browser/browser_format_json$2'
       }
     ]
   }),
@@ -117,6 +125,14 @@ const nodeBuildPlugins = [
       {
         find: /(.*)\/platform\/platform(.*)/,
         replacement: '$1/platform_node/node_platform$2'
+      },
+      {
+        find: /(.*)\/platform\/random_bytes(.*)/,
+        replacement: '$1/platform_node/node_random_bytes$2'
+      },
+      {
+        find: /(.*)\/platform\/format_json(.*)/,
+        replacement: '$1/platform_node/node_format_json$2'
       }
     ]
   }),

packages/firestore/rollup.config.lite.js

@@ -31,6 +31,14 @@ const defaultPlugins = [
       {
         find: /(.*)\/platform\/platform(.*)/,
         replacement: '$1/platform_node/node_platform$2'
+      },
+      {
+        find: /(.*)\/platform\/random_bytes(.*)/,
+        replacement: '$1/platform_node/node_random_bytes$2'
+      },
+      {
+        find: /(.*)\/platform\/format_json(.*)/,
+        replacement: '$1/platform_node/node_format_json$2'
       }
     ]
   }),

packages/firestore/src/model/collections.ts

@@ -22,6 +22,7 @@ import { SortedSet } from '../util/sorted_set';
 import { TargetId } from '../core/types';
 import { Document, MaybeDocument } from './document';
 import { DocumentKey } from './document_key';
+import { primitiveComparator } from '../util/misc';
 
 /** Miscellaneous collection types / constants. */
 export interface DocumentSizeEntry {
@@ -77,18 +78,8 @@ export function documentKeySet(...keys: DocumentKey[]): DocumentKeySet {
   return set;
 }
 
-export function foo<T>(left: T, right: T): number {
-  if (left < right) {
-    return -1;
-  }
-  if (left > right) {
-    return 1;
-  }
-  return 0;
-}
-
 export type TargetIdSet = SortedSet<TargetId>;
-const EMPTY_TARGET_ID_SET = new SortedSet<TargetId>(foo);
+const EMPTY_TARGET_ID_SET = new SortedSet<TargetId>(primitiveComparator);
 export function targetIdSet(): SortedSet<TargetId> {
   return EMPTY_TARGET_ID_SET;
 }

packages/firestore/src/model/document_key.ts

@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-//import { debugAssert } from '../util/assert';
+import { debugAssert } from '../util/assert';
 
 import { ResourcePath } from './path';
 
 export class DocumentKey {
   constructor(readonly path: ResourcePath) {
-    // debugAssert(
-    //   DocumentKey.isDocumentKey(path),
-    //   'Invalid DocumentKey with an odd number of segments: ' +
-    //     path.toArray().join('/')
-    // );
+    debugAssert(
+      DocumentKey.isDocumentKey(path),
+      'Invalid DocumentKey with an odd number of segments: ' +
+        path.toArray().join('/')
+    );
   }
 
   static fromName(name: string): DocumentKey {

packages/firestore/src/platform/format_json.ts

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as node from '../platform_node/node_format_json';
+import * as browser from '../platform_browser/browser_format_json';
+import { isNode } from '@firebase/util';
+
+/** Formats an object as a JSON string, suitable for logging. */
+export function formatJSON(value: unknown): string {
+  return isNode() ? node.formatJSON(value) : browser.formatJSON(value);
+}

packages/firestore/src/platform/platform.ts

@@ -52,11 +52,6 @@ export function newSerializer(databaseId: DatabaseId): JsonProtoSerializer {
     : browser.newSerializer(databaseId);
 }
 
-/** Formats an object as a JSON string, suitable for logging. */
-export function formatJSON(value: unknown): string {
-  return isNode() ? node.formatJSON(value) : browser.formatJSON(value);
-}
-
 /** Converts a Base64 encoded string to a binary string. */
 export function decodeBase64(encoded: string): string {
   return isNode() ? node.decodeBase64(encoded) : browser.decodeBase64(encoded);
@@ -67,15 +62,6 @@ export function encodeBase64(raw: string): string {
   return isNode() ? node.encodeBase64(raw) : browser.encodeBase64(raw);
 }
 
-/**
- * Generates `nBytes` of random bytes.
- *
- * If `nBytes < 0` , an error will be thrown.
- */
-export function randomBytes(nBytes: number): Uint8Array {
-  return isNode() ? node.randomBytes(nBytes) : browser.randomBytes(nBytes);
-}
-
 /** The Platform's 'window' implementation or null if not available. */
 export function getWindow(): Window | null {
   return isNode() ? node.getWindow() : browser.getWindow();

packages/firestore/src/platform/random_bytes.ts

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as node from '../platform_node/node_random_bytes';
+import * as browser from '../platform_browser/browser_random_bytes';
+import { isNode } from '@firebase/util';
+
+/**
+ * Generates `nBytes` of random bytes.
+ *
+ * If `nBytes < 0` , an error will be thrown.
+ */
+export function randomBytes(nBytes: number): Uint8Array {
+  return isNode() ? node.randomBytes(nBytes) : browser.randomBytes(nBytes);
+}

packages/firestore/src/platform_browser/browser_format_json.ts

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** Formats an object as a JSON string, suitable for logging. */
+export function formatJSON(value: unknown): string {
+  return JSON.stringify(value);
+}

packages/firestore/src/platform_browser/browser_platform.ts

@@ -50,11 +50,6 @@ export function newSerializer(databaseId: DatabaseId): JsonProtoSerializer {
   return new JsonProtoSerializer(databaseId, { useProto3Json: true });
 }
 
-/** Formats an object as a JSON string, suitable for logging. */
-export function formatJSON(value: unknown): string {
-  return JSON.stringify(value);
-}
-
 /** Converts a Base64 encoded string to a binary string. */
 export function decodeBase64(encoded: string): string {
   return atob(encoded);
@@ -65,30 +60,6 @@ export function encodeBase64(raw: string): string {
   return btoa(raw);
 }
 
-/**
- * Generates `nBytes` of random bytes.
- *
- * If `nBytes < 0` , an error will be thrown.
- */
-export function randomBytes(nBytes: number): Uint8Array {
-  debugAssert(nBytes >= 0, `Expecting non-negative nBytes, got: ${nBytes}`);
-
-  // Polyfills for IE and WebWorker by using `self` and `msCrypto` when `crypto` is not available.
-  const crypto =
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    typeof self !== 'undefined' && (self.crypto || (self as any)['msCrypto']);
-  const bytes = new Uint8Array(nBytes);
-  if (crypto) {
-    crypto.getRandomValues(bytes);
-  } else {
-    // Falls back to Math.random
-    for (let i = 0; i < nBytes; i++) {
-      bytes[i] = Math.floor(Math.random() * 256);
-    }
-  }
-  return bytes;
-}
-
 /** The Platform's 'window' implementation or null if not available. */
 export function getWindow(): Window | null {
   // `window` is not always available, e.g. in ReactNative and WebWorkers.

packages/firestore/src/platform_browser/browser_random_bytes.ts

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { debugAssert } from '../util/assert';
+
+/**
+ * Generates `nBytes` of random bytes.
+ *
+ * If `nBytes < 0` , an error will be thrown.
+ */
+export function randomBytes(nBytes: number): Uint8Array {
+  debugAssert(nBytes >= 0, `Expecting non-negative nBytes, got: ${nBytes}`);
+
+  // Polyfills for IE and WebWorker by using `self` and `msCrypto` when `crypto` is not available.
+  const crypto =
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    typeof self !== 'undefined' && (self.crypto || (self as any)['msCrypto']);
+  const bytes = new Uint8Array(nBytes);
+  if (crypto) {
+    crypto.getRandomValues(bytes);
+  } else {
+    // Falls back to Math.random
+    for (let i = 0; i < nBytes; i++) {
+      bytes[i] = Math.floor(Math.random() * 256);
+    }
+  }
+  return bytes;
+}

packages/firestore/src/platform_node/node_format_json.ts

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { inspect } from 'util';
+
+/** Formats an object as a JSON string, suitable for logging. */
+export function formatJSON(value: unknown): string {
+  // util.inspect() results in much more readable output than JSON.stringify()
+  return inspect(value, { depth: 100 });
+}

packages/firestore/src/platform_node/node_platform.ts

@@ -15,19 +15,15 @@
  * limitations under the License.
  */
 
-import { randomBytes as generateRandomBytes } from 'crypto';
-import { inspect } from 'util';
-
 import { DatabaseId, DatabaseInfo } from '../core/database_info';
 import { Connection } from '../remote/connection';
 import { JsonProtoSerializer } from '../remote/serializer';
 import { Code, FirestoreError } from '../util/error';
 import { ConnectivityMonitor } from '../remote/connectivity_monitor';
-import { NoopConnectivityMonitor } from './../remote/connectivity_monitor_noop';
+import { NoopConnectivityMonitor } from '../remote/connectivity_monitor_noop';
 
 import { GrpcConnection } from './grpc_connection';
 import { loadProtos } from './load_protos';
-import { debugAssert } from '../util/assert';
 
 // The exports in this class must match the exports in ../platform/platform
 // are bundled with the Node build using Rollup.
@@ -50,12 +46,6 @@ export function newSerializer(databaseId: DatabaseId): JsonProtoSerializer {
   return new JsonProtoSerializer(databaseId, { useProto3Json: false });
 }
 
-/** Formats an object as a JSON string, suitable for logging. */
-export function formatJSON(value: unknown): string {
-  // util.inspect() results in much more readable output than JSON.stringify()
-  return inspect(value, { depth: 100 });
-}
-
 /** Converts a Base64 encoded string to a binary string. */
 export function decodeBase64(encoded: string): string {
   // Node actually doesn't validate base64 strings.
@@ -74,16 +64,6 @@ export function encodeBase64(raw: string): string {
   return new Buffer(raw, 'binary').toString('base64');
 }
 
-/**
- * Generates `nBytes` of random bytes.
- *
- * If `nBytes < 0` , an error will be thrown.
- */
-export function randomBytes(nBytes: number): Uint8Array {
-  debugAssert(nBytes >= 0, `Expecting non-negative nBytes, got: ${nBytes}`);
-  return generateRandomBytes(nBytes);
-}
-
 /** The Platform's 'window' implementation or null if not available. */
 export function getWindow(): Window | null {
   if (process.env.USE_MOCK_PERSISTENCE === 'YES') {

packages/firestore/src/platform_node/node_random_bytes.ts

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { debugAssert } from '../util/assert';
+import { randomBytes as generateRandomBytes } from 'crypto';
+
+/**
+ * Generates `nBytes` of random bytes.
+ *
+ * If `nBytes < 0` , an error will be thrown.
+ */
+export function randomBytes(nBytes: number): Uint8Array {
+  debugAssert(nBytes >= 0, `Expecting non-negative nBytes, got: ${nBytes}`);
+  return generateRandomBytes(nBytes);
+}