Address PR comments

Author: hsubox76

packages-exp/functions-exp/package.json

@@ -37,8 +37,6 @@
   },
   "devDependencies": {
     "@firebase/app-exp": "0.0.800",
-    "@firebase/messaging": "0.6.16",
-    "@firebase/util":  "0.2.47",
     "rollup": "2.7.6",
     "rollup-plugin-typescript2": "0.27.0",
     "typescript": "3.8.3"
@@ -53,9 +51,11 @@
   },
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@firebase/component": "0.1.12",
+    "@firebase/component": "0.1.13",
     "@firebase/functions-types-exp": "0.0.800",
+    "@firebase/messaging": "0.6.17",
     "@firebase/messaging-types": "0.4.5",
+    "@firebase/util": "0.2.48",
     "isomorphic-fetch": "2.2.1",
     "tslib": "1.11.1"
   },
@@ -65,4 +65,4 @@
     ],
     "reportDir": "./coverage/node"
   }
-}
+}

packages-exp/functions-exp/src/api.ts

@@ -17,7 +17,7 @@
 
 import { _getProvider } from '@firebase/app-exp';
 import { FirebaseApp } from '@firebase/app-types-exp';
-import { FUNCTIONS_TYPE } from './config';
+import { FUNCTIONS_TYPE } from './constants';
 
 import { Provider } from '@firebase/component';
 import {

packages-exp/functions-exp/src/callable.test.ts

@@ -34,6 +34,7 @@ import {
 } from '@firebase/auth-interop-types';
 import { makeFakeApp, createTestService } from '../test/utils';
 import { httpsCallable } from './service';
+import { FUNCTIONS_TYPE } from './constants';
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 export const TEST_PROJECT = require('../../../config/project.json');
@@ -51,7 +52,7 @@ async function expectError(
     await promise;
   } catch (e) {
     failed = true;
-    expect(e.code).to.equal(code);
+    expect(e.code).to.equal(`${FUNCTIONS_TYPE}/${code}`);
     expect(e.message).to.equal(message);
     expect(e.details).to.deep.equal(details);
   }

packages-exp/functions-exp/src/config.ts

@@ -23,11 +23,7 @@ import {
   ComponentContainer,
   InstanceFactory
 } from '@firebase/component';
-
-/**
- * Type constant for Firebase Functions.
- */
-export const FUNCTIONS_TYPE = 'functions';
+import { FUNCTIONS_TYPE } from './constants';
 
 export const DEFAULT_REGION = 'us-central1';
 

packages-exp/functions-exp/src/constants.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.
+ */
+
+/**
+ * Type constant for Firebase Functions.
+ */
+export const FUNCTIONS_TYPE = 'functions';

packages-exp/functions-exp/src/error.ts

@@ -19,6 +19,7 @@ import { FunctionsErrorCode } from '@firebase/functions-types-exp';
 import { decode } from './serializer';
 import { HttpResponseBody } from './service';
 import { FirebaseError } from '@firebase/util';
+import { FUNCTIONS_TYPE } from './constants';
 
 /**
  * Standard error codes for different ways a request can fail, as defined by:
@@ -57,14 +58,14 @@ export class FunctionsError extends FirebaseError {
      * A standard error code that will be returned to the client. This also
      * determines the HTTP status code of the response, as defined in code.proto.
      */
-    readonly code: FunctionsErrorCode,
+    code: FunctionsErrorCode,
     message?: string,
     /**
      * Extra data to be converted to JSON and included in the error response.
      */
     readonly details?: unknown
   ) {
-    super(code, message || '');
+    super(`${FUNCTIONS_TYPE}/${code}`, message || '');
   }
 }
 

packages-exp/functions-exp/src/service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseApp, _FirebaseService } from '@firebase/app-types-exp';
 import {
   HttpsCallable,
   HttpsCallableResult,
@@ -70,7 +70,7 @@ function failAfter(millis: number): Promise<never> {
  * The main class for the Firebase Functions SDK.
  * @internal
  */
-export class FunctionsService {
+export class FunctionsService implements _FirebaseService {
   readonly contextProvider: ContextProvider;
   emulatorOrigin: string | null = null;
   cancelAllRequests: Promise<void>;
@@ -95,11 +95,9 @@ export class FunctionsService {
     });
   }
 
-  INTERNAL = {
-    delete: (): Promise<void> => {
-      return this.deleteService();
-    }
-  };
+  delete(): Promise<void> {
+    return this.deleteService();
+  }
 
   /**
    * Returns the URL for a callable with the given name.

packages/util/src/errors.ts

@@ -66,7 +66,8 @@ export interface StringLike {
 }
 
 export interface ErrorData {
-  [key: string]: StringLike | undefined;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string]: any;
 }
 
 export interface FirebaseError extends Error, ErrorData {

scripts/exp/update-internal-dep-versions.js

@@ -0,0 +1,47 @@
+/**
+ * @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.
+ */
+
+const { projectRoot } = require('../utils');
+const { mapPkgNameToPkgJson } = require('../release/utils/workspace');
+const { argv } = require('yargs');
+const fs = require('mz/fs');
+
+async function updateField(pkg, fieldName) {
+  const field = pkg[fieldName];
+  for (const depName in field) {
+    if (!depName.includes('@firebase')) continue;
+    const depJson = await mapPkgNameToPkgJson(depName);
+    if (!depJson.version) continue;
+    field[depName] = depJson.version;
+  }
+  return { ...pkg, [fieldName]: field };
+}
+
+async function updateInternalDepVersions() {
+  const fileName = argv.file;
+  if (!fileName) return;
+  const pkg = require(`${projectRoot}/${fileName}`);
+  let newPkg = await updateField(pkg, 'devDependencies');
+  newPkg = await updateField(newPkg, 'dependencies');
+  await fs.writeFile(
+    `${projectRoot}/${fileName}`,
+    JSON.stringify(newPkg, null, 2),
+    { encoding: 'utf-8' }
+  );
+}
+
+updateInternalDepVersions();

yarn.lock

@@ -897,6 +897,13 @@
   dependencies:
     semver "^6.2.0"
 
+"@grpc/grpc-js@^1.0.0":
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.0.5.tgz#09948c0810e62828fdd61455b2eb13d7879888b0"
+  integrity sha512-Hm+xOiqAhcpT9RYM8lc15dbQD7aQurM7ZU8ulmulepiPlN7iwBXXwP3vSBUimoFoApRqz7pSIisXU8pZaCB4og==
+  dependencies:
+    semver "^6.2.0"
+
 "@grpc/proto-loader@^0.5.0", "@grpc/proto-loader@^0.5.1":
   version "0.5.4"
   resolved "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.5.4.tgz#038a3820540f621eeb1b05d81fbedfb045e14de0"