remove remote-config-types exp

Author: Feiyang1

.changeset/config.json

@@ -29,7 +29,6 @@
     "@firebase/performance-exp",
     "@firebase/performance-types-exp",
     "@firebase/remote-config-exp",
-    "@firebase/remote-config-types-exp",
     "@firebase/remote-config-compat",
     "firebase-exp",
     "@firebase/app-compat",

packages-exp/remote-config-exp/package.json

@@ -32,7 +32,6 @@
   "dependencies": {
     "@firebase/installations-exp": "0.0.900",
     "@firebase/logger": "0.2.6",
-    "@firebase/remote-config-types-exp": "0.0.900",
     "@firebase/util": "0.3.4",
     "@firebase/component": "0.1.21",
     "tslib": "^1.11.1"

packages-exp/remote-config-exp/src/api.ts

@@ -19,13 +19,13 @@ import { _getProvider, FirebaseApp } from '@firebase/app-exp';
 import {
   LogLevel as RemoteConfigLogLevel,
   RemoteConfig,
-  Value as ValueType
-} from '@firebase/remote-config-types-exp';
+  Value
+} from './public_types';
 import { RemoteConfigAbortSignal } from './client/remote_config_fetch_client';
 import { RC_COMPONENT_NAME } from './constants';
 import { ErrorCode, hasErrorCode } from './errors';
 import { RemoteConfig as RemoteConfigImpl } from './remote_config';
-import { Value } from './value';
+import { Value as ValueImpl } from './value';
 import { LogLevel as FirebaseLogLevel } from '@firebase/logger';
 
 /**
@@ -137,15 +137,15 @@ export async function fetchConfig(remoteConfig: RemoteConfig): Promise<void> {
  *
  * @public
  */
-export function getAll(remoteConfig: RemoteConfig): Record<string, ValueType> {
+export function getAll(remoteConfig: RemoteConfig): Record<string, Value> {
   const rc = remoteConfig as RemoteConfigImpl;
   return getAllKeys(
     rc._storageCache.getActiveConfig(),
     rc.defaultConfig
   ).reduce((allConfigs, key) => {
     allConfigs[key] = getValue(remoteConfig, key);
     return allConfigs;
-  }, {} as Record<string, ValueType>);
+  }, {} as Record<string, Value>);
 }
 
 /**
@@ -204,7 +204,7 @@ export function getString(remoteConfig: RemoteConfig, key: string): string {
  *
  * @public
  */
-export function getValue(remoteConfig: RemoteConfig, key: string): ValueType {
+export function getValue(remoteConfig: RemoteConfig, key: string): Value {
   const rc = remoteConfig as RemoteConfigImpl;
   if (!rc._isInitializationComplete) {
     rc._logger.debug(
@@ -214,15 +214,15 @@ export function getValue(remoteConfig: RemoteConfig, key: string): ValueType {
   }
   const activeConfig = rc._storageCache.getActiveConfig();
   if (activeConfig && activeConfig[key] !== undefined) {
-    return new Value('remote', activeConfig[key]);
+    return new ValueImpl('remote', activeConfig[key]);
   } else if (rc.defaultConfig && rc.defaultConfig[key] !== undefined) {
-    return new Value('default', String(rc.defaultConfig[key]));
+    return new ValueImpl('default', String(rc.defaultConfig[key]));
   }
   rc._logger.debug(
     `Returning static value for key "${key}".` +
       ' Define a default or remote value if this is unintentional.'
   );
-  return new Value('static');
+  return new ValueImpl('static');
 }
 
 /**
@@ -256,5 +256,3 @@ export function setLogLevel(
 function getAllKeys(obj1: {} = {}, obj2: {} = {}): string[] {
   return Object.keys({ ...obj1, ...obj2 });
 }
-
-export { RemoteConfig, ValueType, RemoteConfigLogLevel };

packages-exp/remote-config-exp/src/api2.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { RemoteConfig } from '@firebase/remote-config-types-exp';
+import { RemoteConfig } from './public_types';
 import { activate, fetchConfig } from './api';
 
 // This API is put in a separate file, so we can stub fetchConfig and activate in tests.

packages-exp/remote-config-types-exp/index.d.ts renamed to packages-exp/remote-config-exp/src/public_types.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 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-exp/remote-config-exp/src/register.ts

@@ -25,7 +25,7 @@ import {
   ComponentContainer
 } from '@firebase/component';
 import { Logger, LogLevel as FirebaseLogLevel } from '@firebase/logger';
-import { RemoteConfig } from '@firebase/remote-config-types-exp';
+import { RemoteConfig } from './public_types';
 import { name as packageName, version } from '../package.json';
 import { ensureInitialized } from './api';
 import { CachingClient } from './client/caching_client';

packages-exp/remote-config-exp/src/remote_config.ts

@@ -20,7 +20,7 @@ import {
   RemoteConfig as RemoteConfigType,
   FetchStatus,
   Settings
-} from '@firebase/remote-config-types-exp';
+} from './public_types';
 import { StorageCache } from './storage/storage_cache';
 import { RemoteConfigFetchClient } from './client/remote_config_fetch_client';
 import { Storage } from './storage/storage';

packages-exp/remote-config-exp/test/remote_config.test.ts

@@ -19,7 +19,7 @@ import { FirebaseApp } from '@firebase/app-exp';
 import {
   RemoteConfig as RemoteConfigType,
   LogLevel as RemoteConfigLogLevel
-} from '@firebase/remote-config-types-exp';
+} from '../src/public_types';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { StorageCache } from '../src/storage/storage_cache';