Merge pull request #104 from angular/master

Create a new pull request by comparing changes

Author: GulajavaMinistudio

.github/workflows/test.yml

@@ -69,7 +69,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         node: ["12", "14", "16"]
         firebase: ["9"]
-        firebaseTools: ["9"]
+        firebaseTools: ["9", "10"]
         rxjs: ["6", "7"]
         ng: ["12", "13"]
         exclude:
@@ -147,7 +147,7 @@ jobs:
         os: [ ubuntu-latest ]
         node: ["14"]
         firebase: ["9", "canary", "next"]
-        firebaseTools: ["9"]
+        firebaseTools: ["9", "10"]
         rxjs: ["7"]
         ng: ["12", "13", "next"]
         exclude:

CHANGELOG.md

@@ -1,3 +1,16 @@
+<a name="7.2.1"></a>
+# [7.2.1](https://github.com/angular/angularfire/compare/7.2.0...7.2.1) (2022-02-10)
+
+### Bug Fixes
+
+* **compat:** Typescript 4.5 inference breaks the PromiseProxy ([#3144](https://github.com/angular/angularfire/issues/3144)) ([f61bc7d](https://github.com/angular/angularfire/commit/f61bc7d)), closes [#3090](https://github.com/angular/angularfire/issues/3090) [#3088](https://github.com/angular/angularfire/issues/3088)
+* **core:** Address bad arguments being passed to zone wrapper ([#3127](https://github.com/angular/angularfire/issues/3127)) ([8b693e4](https://github.com/angular/angularfire/commit/8b693e4))
+* **core:** Defensively catch Firebase isSupported calls ([#3146](https://github.com/angular/angularfire/issues/3146)) ([520930b](https://github.com/angular/angularfire/commit/520930b))
+* **schematic:** use oneOf rather than array types in the deploy schematic ([#3092](https://github.com/angular/angularfire/issues/3092)) ([058d624](https://github.com/angular/angularfire/commit/058d624))
+* **schematics:** Address ng add console lock up ([#3151](https://github.com/angular/angularfire/issues/3151)) ([4852c35](https://github.com/angular/angularfire/commit/4852c35)), closes [#3145](https://github.com/angular/angularfire/issues/3145) [#3121](https://github.com/angular/angularfire/issues/3121)
+
+
+
 <a name="7.2.0"></a>
 # [7.2.0](https://github.com/angular/angularfire/compare/7.1.1...7.2.0) (2021-11-11)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/fire",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "description": "The official Angular library for Firebase.",
   "private": true,
   "scripts": {

src/compat/proxy.ts

@@ -1,21 +1,21 @@
 import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 
-// tslint:disable:ban-types
-type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? K : never }[keyof T];
+type MyFunction = (...args: any[]) => any;
+type FunctionPropertyNames<T> = { [K in keyof T]: T[K] extends MyFunction ? K : never }[keyof T];
+type ReturnTypeOrNever<T> = T extends MyFunction ? ReturnType<T> : never;
+type ParametersOrNever<T> = T extends MyFunction ? Parameters<T> : never;
 type PromiseReturningFunctionPropertyNames<T> = {
-  [K in FunctionPropertyNames<T>]: ReturnType<T[K]> extends Promise<any> ? K : never
+  [K in FunctionPropertyNames<T>]: ReturnTypeOrNever<T[K]> extends Promise<any> ? K : never
 }[FunctionPropertyNames<T>];
 type NonPromiseReturningFunctionPropertyNames<T> = {
-  [K in FunctionPropertyNames<T>]: ReturnType<T[K]> extends Promise<any> ? never : K
+  [K in FunctionPropertyNames<T>]: ReturnTypeOrNever<T[K]> extends Promise<any> ? never : K
 }[FunctionPropertyNames<T>];
-type NonFunctionPropertyNames<T> = { [K in keyof T]: T[K] extends Function ? never : K }[keyof T];
-// tslint:enable:ban-types
+type NonFunctionPropertyNames<T> = { [K in keyof T]: T[K] extends MyFunction ? never : K }[keyof T];
 
 export type ɵPromiseProxy<T> = { [K in NonFunctionPropertyNames<T>]: Promise<T[K]> } &
-  { [K in NonPromiseReturningFunctionPropertyNames<T>]: (...args: Parameters<T[K]>) => Promise<ReturnType<T[K]>> } &
-  { [K in PromiseReturningFunctionPropertyNames<T>]: (...args: Parameters<T[K]>) => ReturnType<T[K]> };
-
+  { [K in NonPromiseReturningFunctionPropertyNames<T>]: (...args: ParametersOrNever<T[K]>) => Promise<ReturnTypeOrNever<T[K]>> } &
+  { [K in PromiseReturningFunctionPropertyNames<T>]: T[K] };
 
 // DEBUG quick debugger function for inline logging that typescript doesn't complain about
 //       wrote it for debugging the ɵlazySDKProxy, commenting out for now; should consider exposing a

src/core.ts

@@ -16,14 +16,20 @@ const isMessagingSupportedPromiseSymbol = '__angularfire_symbol__messagingIsSupp
 
 globalThis[isAnalyticsSupportedPromiseSymbol] ||= isAnalyticsSupported().then(it =>
   globalThis[isAnalyticsSupportedValueSymbol] = it
+).catch(() =>
+  globalThis[isAnalyticsSupportedValueSymbol] = false
 );
 
 globalThis[isMessagingSupportedPromiseSymbol] ||= isMessagingSupported().then(it =>
   globalThis[isMessagingSupportedValueSymbol] = it
+).catch(() =>
+  globalThis[isMessagingSupportedValueSymbol] = false
 );
 
 globalThis[isRemoteConfigSupportedPromiseSymbol] ||= isRemoteConfigSupported().then(it =>
   globalThis[isRemoteConfigSupportedValueSymbol] = it
+).catch(() =>
+  globalThis[isRemoteConfigSupportedValueSymbol] = false
 );
 
 const isSupportedError = (module: string) =>

src/schematics/deploy/schema.json

@@ -30,7 +30,7 @@
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "ssr": {
-      "type": ["boolean", "string"],
+      "oneOf": [{ "type": "boolean" }, { "type": "string" }],
       "description": "Should we attempt to deploy the function to Cloud Functions (true or 'cloud-functions') / Cloud Run ('cloud-run') or just Hosting (false)"
     },
     "prerender": {
@@ -54,7 +54,7 @@
       "description": "The name of the Cloud Function or Cloud Run serviceId to deploy SSR to"
     },
     "functionsNodeVersion": {
-      "type": ["number", "string"],
+      "oneOf": [{ "type": "number" }, { "type": "string" }],
       "description": "Version of Node.js to run Cloud Functions / Run on"
     },
     "region": {
@@ -82,12 +82,12 @@
           "description": "Set a CPU limit in Kubernetes cpu units."
         },
         "maxConcurrency": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "Set the maximum number of concurrent requests allowed per container instance. If concurrency is unspecified, any number of concurrent requests are allowed. To unset this field, provide the special value default."
         },
         "maxInstances": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "The maximum number of container instances of the Service to run. Use 'default' to unset the limit and use the platform default."
         },
@@ -97,7 +97,7 @@
           "description": "Set a memory limit. Ex: 1Gi, 512Mi."
         },
         "minInstances": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "The minimum number of container instances of the Service to run or 'default' to remove any minimum."
         },

src/schematics/setup/prompts.ts

@@ -24,8 +24,8 @@ const isSite = (elem: FirebaseHostingSite | fuzzy.FilterResult<FirebaseHostingSi
     return (elem as { original: FirebaseHostingSite }).original === undefined;
 };
 
-export const searchProjects = (promise: Promise<FirebaseProject[]>) =>
-    (_: any, input: string) => promise.then(projects => {
+export const searchProjects = (projects: FirebaseProject[]) =>
+    async (_: any, input: string) => {
         projects.unshift({
             projectId: NEW_OPTION,
             displayName: '[CREATE NEW PROJECT]'
@@ -47,10 +47,10 @@ export const searchProjects = (promise: Promise<FirebaseProject[]>) =>
                 value: original.projectId
             };
         });
-    });
+    };
 
-export const searchApps = (promise: Promise<FirebaseApp[]>) =>
-  (_: any, input: string) => promise.then(apps => {
+export const searchApps = (apps: FirebaseApp[]) =>
+  async (_: any, input: string) => {
     apps.unshift({
       appId: NEW_OPTION,
       displayName: '[CREATE NEW APP]',
@@ -72,10 +72,10 @@ export const searchApps = (promise: Promise<FirebaseApp[]>) =>
         value: shortAppId(original),
       };
     });
-  });
+  };
 
-export const searchSites = (promise: Promise<FirebaseHostingSite[]>) =>
-  (_: any, input: string) => promise.then(sites => {
+export const searchSites = (sites: FirebaseHostingSite[]) =>
+  async (_: any, input: string) => {
     sites.unshift({
       name: NEW_OPTION,
       defaultUrl: '[CREATE NEW SITE]',
@@ -97,7 +97,7 @@ export const searchSites = (promise: Promise<FirebaseHostingSite[]>) =>
         value: shortSiteName(original),
       };
     });
-  });
+  };
 
 
 type Prompt = <K extends string, U= unknown>(questions: { name: K, source: (...args) =>
@@ -146,7 +146,7 @@ export const userPrompt = async (options: {}): Promise<Record<string, any>> => {
 
 export const projectPrompt = async (defaultProject: string|undefined, options: {}) => {
   const firebaseTools = await getFirebaseTools();
-  const projects = firebaseTools.projects.list(options);
+  const projects = await firebaseTools.projects.list(options);
   const { projectId } = await autocomplete({
     type: 'autocomplete',
     name: 'projectId',
@@ -174,7 +174,7 @@ export const projectPrompt = async (defaultProject: string|undefined, options: {
 
 export const appPrompt = async ({ projectId: project }: FirebaseProject, defaultAppId: string|undefined, options: {}) => {
   const firebaseTools = await getFirebaseTools();
-  const apps = firebaseTools.apps.list('web', { ...options, project });
+  const apps = await firebaseTools.apps.list('web', { ...options, project });
   const { appId } = await autocomplete({
     type: 'autocomplete',
     name: 'appId',
@@ -196,7 +196,7 @@ export const appPrompt = async ({ projectId: project }: FirebaseProject, default
 
 export const sitePrompt = async ({ projectId: project }: FirebaseProject, options: {}) => {
   const firebaseTools = await getFirebaseTools();
-  const sites = firebaseTools.hosting.sites.list({ ...options, project }).then(it => {
+  const sites = await firebaseTools.hosting.sites.list({ ...options, project }).then(it => {
     if (it.sites.length === 0) {
       // newly created projects don't return their default site, stub one
       return [{
@@ -214,7 +214,7 @@ export const sitePrompt = async ({ projectId: project }: FirebaseProject, option
     name: 'siteName',
     source: searchSites(sites),
     message: 'Please select a hosting site:',
-    default: _ => sites.then(it => shortSiteName(it.find(it => it.type === DEFAULT_SITE_TYPE))),
+    default: _ => shortSiteName(sites.find(site => site.type === DEFAULT_SITE_TYPE)),
   });
   if (siteName === NEW_OPTION) {
     const { subdomain } = await inquirer.prompt({

src/zones.ts

@@ -145,14 +145,15 @@ const zoneWrapFn = (it: (...args: any[]) => any, macrotask: MacroTask|undefined)
   // function() is needed for the arguments object
   // tslint:disable-next-line:only-arrow-functions
   return function() {
+    const _arguments = arguments;
     if (macrotask) {
       setTimeout(() => {
         if (macrotask.state === 'scheduled') {
           macrotask.invoke();
         }
       }, 10);
     }
-    return run(() => it.apply(_this, arguments));
+    return run(() => it.apply(_this, _arguments));
   };
 };
 
@@ -161,18 +162,19 @@ export const ɵzoneWrap = <T= unknown>(it: T, blockUntilFirst: boolean): T => {
   // tslint:disable-next-line:only-arrow-functions
   return function() {
     let macrotask: MacroTask | undefined;
+    const _arguments = arguments;
     // if this is a callback function, e.g, onSnapshot, we should create a microtask and invoke it
     // only once one of the callback functions is tripped.
     for (let i = 0; i < arguments.length; i++) {
-      if (typeof arguments[i] === 'function') {
+      if (typeof _arguments[i] === 'function') {
         if (blockUntilFirst) {
           macrotask ||= run(() => Zone.current.scheduleMacroTask('firebaseZoneBlock', noop, {}, noop, noop));
         }
         // TODO create a microtask to track callback functions
-        arguments[i] = zoneWrapFn(arguments[i], macrotask);
+        _arguments[i] = zoneWrapFn(_arguments[i], macrotask);
       }
     }
-    const ret = runOutsideAngular(() => (it as any).apply(this, arguments));
+    const ret = runOutsideAngular(() => (it as any).apply(this, _arguments));
     if (!blockUntilFirst) {
       if (ret instanceof Observable) {
         const schedulers = getSchedulers();