Fix platform logging for exp packages (#4740)

Author: hsubox76

packages-exp/app-exp/src/constants.ts

@@ -21,17 +21,21 @@ import { name as analyticsCompatName } from '../../../packages-exp/analytics-com
 import { name as analyticsName } from '../../../packages-exp/analytics-exp/package.json';
 import { name as authName } from '../../../packages-exp/auth-exp/package.json';
 import { name as authCompatName } from '../../../packages-exp/auth-compat-exp/package.json';
-import { name as databaseName } from '../../../packages/database/package.json';
+import { name as databaseName } from '../../../packages/database/exp/package.json';
 import { name as functionsName } from '../../../packages-exp/functions-exp/package.json';
 import { name as functionsCompatName } from '../../../packages-exp/functions-compat/package.json';
 import { name as installationsName } from '../../../packages-exp/installations-exp/package.json';
 import { name as installationsCompatName } from '../../../packages-exp/installations-compat/package.json';
 import { name as messagingName } from '../../../packages-exp/messaging-exp/package.json';
+import { name as messagingCompatName } from '../../../packages-exp/messaging-compat/package.json';
 import { name as performanceName } from '../../../packages-exp/performance-exp/package.json';
+import { name as performanceCompatName } from '../../../packages-exp/performance-compat/package.json';
 import { name as remoteConfigName } from '../../../packages-exp/remote-config-exp/package.json';
 import { name as remoteConfigCompatName } from '../../../packages-exp/remote-config-compat/package.json';
 import { name as storageName } from '../../../packages/storage/package.json';
-import { name as firestoreName } from '../../../packages/firestore/package.json';
+import { name as storageCompatName } from '../../../packages/storage/compat/package.json';
+import { name as firestoreName } from '../../../packages/firestore/exp/package.json';
+import { name as firestoreCompatName } from '../../../packages/firestore/compat/package.json';
 import { name as packageName } from '../../../packages-exp/firebase-exp/package.json';
 
 /**
@@ -54,11 +58,15 @@ export const PLATFORM_LOG_STRING = {
   [installationsName]: 'fire-iid',
   [installationsCompatName]: 'fire-iid-compat',
   [messagingName]: 'fire-fcm',
+  [messagingCompatName]: 'fire-fcm-compat',
   [performanceName]: 'fire-perf',
+  [performanceCompatName]: 'fire-perf-compat',
   [remoteConfigName]: 'fire-rc',
   [remoteConfigCompatName]: 'fire-rc-compat',
   [storageName]: 'fire-gcs',
+  [storageCompatName]: 'fire-gcs-compat',
   [firestoreName]: 'fire-fst',
+  [firestoreCompatName]: 'fire-fst-compat',
   'fire-js': 'fire-js', // Platform identifier for JS SDK.
   [packageName]: 'fire-js-all'
 } as const;

packages-exp/auth-compat-exp/index.ts

@@ -27,7 +27,7 @@ import {
 } from '@firebase/component';
 
 import * as types from '@firebase/auth-types';
-import { version } from './package.json';
+import { name, version } from './package.json';
 import { Auth } from './src/auth';
 import { Persistence } from './src/persistence';
 import { PhoneAuthProvider as CompatAuthProvider } from './src/phone_auth_provider';
@@ -117,7 +117,7 @@ function registerAuthCompat(instance: _FirebaseNamespace): void {
       .setMultipleInstances(false)
   );
 
-  instance.registerVersion('auth-compat', version);
+  instance.registerVersion(name, version);
 }
 
 registerAuthCompat(firebase as _FirebaseNamespace);

packages-exp/auth-exp/src/core/auth/register.ts

@@ -22,7 +22,7 @@ import {
   InstantiationMode
 } from '@firebase/component';
 
-import { version } from '../../../package.json';
+import { name, version } from '../../../package.json';
 import { AuthErrorCode } from '../errors';
 import { _assert } from '../util/assert';
 import { _getClientVersion, ClientPlatform } from '../util/version';
@@ -122,9 +122,5 @@ export function registerAuth(clientPlatform: ClientPlatform): void {
     ).setInstantiationMode(InstantiationMode.EXPLICIT)
   );
 
-  registerVersion(
-    _ComponentName.AUTH,
-    version,
-    getVersionForPlatform(clientPlatform)
-  );
+  registerVersion(name, version, getVersionForPlatform(clientPlatform));
 }

packages/database/exp/index.node.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2021 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 { registerDatabase } from './register';
+
+export { getDatabase, ServerValue } from '../src/exp/Database';
+export { enableLogging } from '../src/core/util/util';
+
+registerDatabase('node');

packages/database/exp/index.ts

@@ -15,35 +15,9 @@
  * limitations under the License.
  */
 
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { _registerComponent, registerVersion } from '@firebase/app-exp';
-import { Component, ComponentType } from '@firebase/component';
-
-import { version } from '../package.json';
-import { FirebaseDatabase } from '../src/exp/Database';
+import { registerDatabase } from './register';
 
 export { getDatabase, ServerValue } from '../src/exp/Database';
 export { enableLogging } from '../src/core/util/util';
 
-declare module '@firebase/component' {
-  interface NameServiceMapping {
-    'database-exp': FirebaseDatabase;
-  }
-}
-
-function registerDatabase(): void {
-  _registerComponent(
-    new Component(
-      'database-exp',
-      (container, { instanceIdentifier: url }) => {
-        const app = container.getProvider('app-exp').getImmediate()!;
-        const authProvider = container.getProvider('auth-internal');
-        return new FirebaseDatabase(app, authProvider, url);
-      },
-      ComponentType.PUBLIC
-    ).setMultipleInstances(true)
-  );
-  registerVersion('database-exp', version, 'node');
-}
-
 registerDatabase();

packages/database/exp/register.ts

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2021 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.
+ */
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { _registerComponent, registerVersion } from '@firebase/app-exp';
+import { Component, ComponentType } from '@firebase/component';
+
+import { name, version } from '../package.json';
+import { FirebaseDatabase } from '../src/exp/Database';
+
+export { getDatabase, ServerValue } from '../src/exp/Database';
+export { enableLogging } from '../src/core/util/util';
+
+declare module '@firebase/component' {
+  interface NameServiceMapping {
+    'database-exp': FirebaseDatabase;
+  }
+}
+
+export function registerDatabase(variant?: string): void {
+  _registerComponent(
+    new Component(
+      'database-exp',
+      (container, { instanceIdentifier: url }) => {
+        const app = container.getProvider('app-exp').getImmediate()!;
+        const authProvider = container.getProvider('auth-internal');
+        return new FirebaseDatabase(app, authProvider, url);
+      },
+      ComponentType.PUBLIC
+    ).setMultipleInstances(true)
+  );
+  registerVersion(name, version, variant);
+}

packages/database/rollup.config.exp.js

@@ -53,7 +53,7 @@ const es5Builds = [
    * Node.js Build
    */
   {
-    input: 'exp/index.ts',
+    input: 'exp/index.node.ts',
     output: [
       { file: path.resolve('exp', expPkg.main), format: 'cjs', sourcemap: true }
     ],

packages/firestore/compat/index.node.ts

@@ -19,11 +19,11 @@
 import firebase from '@firebase/app-compat';
 import { FirebaseNamespace } from '@firebase/app-types';
 
-import { name, version } from '../package.json';
 import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
+import { name, version } from './package.json';
 
 /**
  * Registers the main Firestore Node build with the components framework.

packages/firestore/compat/index.rn.ts

@@ -19,11 +19,11 @@
 import firebase from '@firebase/app-compat';
 import { FirebaseNamespace } from '@firebase/app-types';
 
-import { name, version } from '../package.json';
 import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
+import { name, version } from './package.json';
 
 /**
  * Registers the main Firestore ReactNative build with the components framework.

packages/firestore/compat/index.ts

@@ -20,11 +20,11 @@ import firebase from '@firebase/app-compat';
 import { FirebaseNamespace } from '@firebase/app-types';
 import * as types from '@firebase/firestore-types';
 
-import { name, version } from '../package.json';
 import { Firestore, IndexedDbPersistenceProvider } from '../src/api/database';
 
 import { registerBundle } from './bundle';
 import { configureForFirebase } from './config';
+import { name, version } from './package.json';
 
 import '../register-module';
 

packages/firestore/exp/api.ts

@@ -0,0 +1,131 @@
+/**
+ * @license
+ * Copyright 2021 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.
+ */
+
+export { FieldPath, documentId } from '../src/exp/field_path';
+
+export {
+  FirebaseFirestore,
+  initializeFirestore,
+  getFirestore,
+  enableIndexedDbPersistence,
+  enableMultiTabIndexedDbPersistence,
+  clearIndexedDbPersistence,
+  waitForPendingWrites,
+  disableNetwork,
+  enableNetwork,
+  terminate,
+  useFirestoreEmulator,
+  loadBundle,
+  namedQuery,
+  ensureFirestoreConfigured
+} from '../src/exp/database';
+
+export {
+  LoadBundleTask,
+  LoadBundleTaskProgress,
+  TaskState
+} from '../src/exp/bundle';
+
+export { Settings, PersistenceSettings } from '../src/exp/settings';
+
+export {
+  DocumentChange,
+  DocumentSnapshot,
+  QueryDocumentSnapshot,
+  QuerySnapshot,
+  snapshotEqual,
+  SnapshotOptions,
+  FirestoreDataConverter,
+  DocumentChangeType,
+  SnapshotMetadata
+} from '../src/exp/snapshot';
+
+export {
+  DocumentReference,
+  CollectionReference,
+  Query,
+  doc,
+  collection,
+  collectionGroup,
+  SetOptions,
+  DocumentData,
+  UpdateData,
+  refEqual,
+  queryEqual
+} from '../src/exp/reference';
+
+export {
+  endAt,
+  endBefore,
+  startAt,
+  startAfter,
+  limit,
+  limitToLast,
+  where,
+  orderBy,
+  query,
+  QueryConstraint,
+  QueryConstraintType,
+  OrderByDirection,
+  WhereFilterOp
+} from '../src/exp/query';
+
+export { Unsubscribe, SnapshotListenOptions } from '../src/exp/reference_impl';
+
+export { runTransaction, Transaction } from '../src/exp/transaction';
+
+export {
+  getDoc,
+  getDocFromCache,
+  getDocFromServer,
+  getDocs,
+  getDocsFromCache,
+  getDocsFromServer,
+  onSnapshot,
+  onSnapshotsInSync,
+  setDoc,
+  updateDoc,
+  deleteDoc,
+  addDoc,
+  executeWrite
+} from '../src/exp/reference_impl';
+
+export { FieldValue } from '../src/exp/field_value';
+
+export {
+  increment,
+  arrayRemove,
+  arrayUnion,
+  serverTimestamp,
+  deleteField
+} from '../src/exp/field_value_impl';
+
+export { setLogLevel, LogLevelString as LogLevel } from '../src/util/log';
+
+export { Bytes } from '../src/exp/bytes';
+
+export { WriteBatch, writeBatch } from '../src/exp/write_batch';
+
+export { GeoPoint } from '../src/exp/geo_point';
+
+export { Timestamp } from '../src/exp/timestamp';
+
+export { CACHE_SIZE_UNLIMITED } from '../src/exp/database';
+
+export { FirestoreErrorCode, FirestoreError } from '../src/util/error';
+
+export { AbstractUserDataWriter } from '../src/lite/user_data_writer';

packages/firestore/exp/index.node.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2021 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 { registerFirestore } from './register';
+
+registerFirestore('node');
+
+export * from './api';