@angular/fire 16.0.0-canary.596e208 → 16.0.0-canary.78407bc

package/firestore/firebase.d.ts

@@ -1,22 +1,32 @@
 export * from 'firebase/firestore';
-import { addDoc as _addDoc, arrayRemove as _arrayRemove, arrayUnion as _arrayUnion, clearIndexedDbPersistence as _clearIndexedDbPersistence, collection as _collection, collectionGroup as _collectionGroup, connectFirestoreEmulator as _connectFirestoreEmulator, deleteDoc as _deleteDoc, deleteField as _deleteField, disableNetwork as _disableNetwork, doc as _doc, documentId as _documentId, enableIndexedDbPersistence as _enableIndexedDbPersistence, enableMultiTabIndexedDbPersistence as _enableMultiTabIndexedDbPersistence, enableNetwork as _enableNetwork, endAt as _endAt, endBefore as _endBefore, getDoc as _getDoc, getDocFromCache as _getDocFromCache, getDocFromServer as _getDocFromServer, getDocs as _getDocs, getDocsFromCache as _getDocsFromCache, getDocsFromServer as _getDocsFromServer, getFirestore as _getFirestore, increment as _increment, initializeFirestore as _initializeFirestore, limit as _limit, limitToLast as _limitToLast, loadBundle as _loadBundle, namedQuery as _namedQuery, onSnapshot as _onSnapshot, onSnapshotsInSync as _onSnapshotsInSync, orderBy as _orderBy, query as _query, queryEqual as _queryEqual, refEqual as _refEqual, runTransaction as _runTransaction, serverTimestamp as _serverTimestamp, setDoc as _setDoc, setLogLevel as _setLogLevel, snapshotEqual as _snapshotEqual, startAfter as _startAfter, startAt as _startAt, terminate as _terminate, updateDoc as _updateDoc, waitForPendingWrites as _waitForPendingWrites, where as _where, writeBatch as _writeBatch } from 'firebase/firestore';
+import { addDoc as _addDoc, aggregateFieldEqual as _aggregateFieldEqual, aggregateQuerySnapshotEqual as _aggregateQuerySnapshotEqual, and as _and, arrayRemove as _arrayRemove, arrayUnion as _arrayUnion, average as _average, clearIndexedDbPersistence as _clearIndexedDbPersistence, collection as _collection, collectionGroup as _collectionGroup, connectFirestoreEmulator as _connectFirestoreEmulator, count as _count, deleteAllPersistentCacheIndexes as _deleteAllPersistentCacheIndexes, deleteDoc as _deleteDoc, deleteField as _deleteField, disableNetwork as _disableNetwork, disablePersistentCacheIndexAutoCreation as _disablePersistentCacheIndexAutoCreation, doc as _doc, documentId as _documentId, enableIndexedDbPersistence as _enableIndexedDbPersistence, enableMultiTabIndexedDbPersistence as _enableMultiTabIndexedDbPersistence, enableNetwork as _enableNetwork, enablePersistentCacheIndexAutoCreation as _enablePersistentCacheIndexAutoCreation, endAt as _endAt, endBefore as _endBefore, getAggregateFromServer as _getAggregateFromServer, getCountFromServer as _getCountFromServer, getDoc as _getDoc, getDocFromCache as _getDocFromCache, getDocFromServer as _getDocFromServer, getDocs as _getDocs, getDocsFromCache as _getDocsFromCache, getDocsFromServer as _getDocsFromServer, getFirestore as _getFirestore, getPersistentCacheIndexManager as _getPersistentCacheIndexManager, increment as _increment, initializeFirestore as _initializeFirestore, limit as _limit, limitToLast as _limitToLast, loadBundle as _loadBundle, memoryEagerGarbageCollector as _memoryEagerGarbageCollector, memoryLocalCache as _memoryLocalCache, memoryLruGarbageCollector as _memoryLruGarbageCollector, namedQuery as _namedQuery, onSnapshot as _onSnapshot, onSnapshotsInSync as _onSnapshotsInSync, or as _or, orderBy as _orderBy, persistentLocalCache as _persistentLocalCache, persistentMultipleTabManager as _persistentMultipleTabManager, persistentSingleTabManager as _persistentSingleTabManager, query as _query, queryEqual as _queryEqual, refEqual as _refEqual, runTransaction as _runTransaction, serverTimestamp as _serverTimestamp, setDoc as _setDoc, setIndexConfiguration as _setIndexConfiguration, setLogLevel as _setLogLevel, snapshotEqual as _snapshotEqual, startAfter as _startAfter, startAt as _startAt, sum as _sum, terminate as _terminate, updateDoc as _updateDoc, waitForPendingWrites as _waitForPendingWrites, where as _where, writeBatch as _writeBatch } from 'firebase/firestore';
 export declare const addDoc: typeof _addDoc;
+export declare const aggregateFieldEqual: typeof _aggregateFieldEqual;
+export declare const aggregateQuerySnapshotEqual: typeof _aggregateQuerySnapshotEqual;
+export declare const and: typeof _and;
 export declare const arrayRemove: typeof _arrayRemove;
 export declare const arrayUnion: typeof _arrayUnion;
+export declare const average: typeof _average;
 export declare const clearIndexedDbPersistence: typeof _clearIndexedDbPersistence;
 export declare const collection: typeof _collection;
 export declare const collectionGroup: typeof _collectionGroup;
 export declare const connectFirestoreEmulator: typeof _connectFirestoreEmulator;
+export declare const count: typeof _count;
+export declare const deleteAllPersistentCacheIndexes: typeof _deleteAllPersistentCacheIndexes;
 export declare const deleteDoc: typeof _deleteDoc;
 export declare const deleteField: typeof _deleteField;
 export declare const disableNetwork: typeof _disableNetwork;
+export declare const disablePersistentCacheIndexAutoCreation: typeof _disablePersistentCacheIndexAutoCreation;
 export declare const doc: typeof _doc;
 export declare const documentId: typeof _documentId;
 export declare const enableIndexedDbPersistence: typeof _enableIndexedDbPersistence;
 export declare const enableMultiTabIndexedDbPersistence: typeof _enableMultiTabIndexedDbPersistence;
 export declare const enableNetwork: typeof _enableNetwork;
+export declare const enablePersistentCacheIndexAutoCreation: typeof _enablePersistentCacheIndexAutoCreation;
 export declare const endAt: typeof _endAt;
 export declare const endBefore: typeof _endBefore;
+export declare const getAggregateFromServer: typeof _getAggregateFromServer;
+export declare const getCountFromServer: typeof _getCountFromServer;
 export declare const getDoc: typeof _getDoc;
 export declare const getDocFromCache: typeof _getDocFromCache;
 export declare const getDocFromServer: typeof _getDocFromServer;
@@ -24,25 +34,35 @@ export declare const getDocs: typeof _getDocs;
 export declare const getDocsFromCache: typeof _getDocsFromCache;
 export declare const getDocsFromServer: typeof _getDocsFromServer;
 export declare const getFirestore: typeof _getFirestore;
+export declare const getPersistentCacheIndexManager: typeof _getPersistentCacheIndexManager;
 export declare const increment: typeof _increment;
 export declare const initializeFirestore: typeof _initializeFirestore;
 export declare const limit: typeof _limit;
 export declare const limitToLast: typeof _limitToLast;
 export declare const loadBundle: typeof _loadBundle;
+export declare const memoryEagerGarbageCollector: typeof _memoryEagerGarbageCollector;
+export declare const memoryLocalCache: typeof _memoryLocalCache;
+export declare const memoryLruGarbageCollector: typeof _memoryLruGarbageCollector;
 export declare const namedQuery: typeof _namedQuery;
 export declare const onSnapshot: typeof _onSnapshot;
 export declare const onSnapshotsInSync: typeof _onSnapshotsInSync;
+export declare const or: typeof _or;
 export declare const orderBy: typeof _orderBy;
+export declare const persistentLocalCache: typeof _persistentLocalCache;
+export declare const persistentMultipleTabManager: typeof _persistentMultipleTabManager;
+export declare const persistentSingleTabManager: typeof _persistentSingleTabManager;
 export declare const query: typeof _query;
 export declare const queryEqual: typeof _queryEqual;
 export declare const refEqual: typeof _refEqual;
 export declare const runTransaction: typeof _runTransaction;
 export declare const serverTimestamp: typeof _serverTimestamp;
 export declare const setDoc: typeof _setDoc;
+export declare const setIndexConfiguration: typeof _setIndexConfiguration;
 export declare const setLogLevel: typeof _setLogLevel;
 export declare const snapshotEqual: typeof _snapshotEqual;
 export declare const startAfter: typeof _startAfter;
 export declare const startAt: typeof _startAt;
+export declare const sum: typeof _sum;
 export declare const terminate: typeof _terminate;
 export declare const updateDoc: typeof _updateDoc;
 export declare const waitForPendingWrites: typeof _waitForPendingWrites;

package/firestore/firestore.module.d.ts

@@ -1,7 +1,7 @@
-import { NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
+import { InjectionToken, Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { FirebaseApp } from '@angular/fire/app';
 import { Firestore as FirebaseFirestore } from 'firebase/firestore';
 import { Firestore } from './firestore';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare const PROVIDED_FIRESTORE_INSTANCES: InjectionToken<Firestore[]>;
 export declare function defaultFirestoreInstanceFactory(provided: FirebaseFirestore[] | undefined, defaultApp: FirebaseApp): Firestore;

package/firestore/lite/firebase.d.ts

@@ -1,17 +1,24 @@
 export * from 'firebase/firestore/lite';
-import { addDoc as _addDoc, arrayRemove as _arrayRemove, arrayUnion as _arrayUnion, collection as _collection, collectionGroup as _collectionGroup, connectFirestoreEmulator as _connectFirestoreEmulator, deleteDoc as _deleteDoc, deleteField as _deleteField, doc as _doc, documentId as _documentId, endAt as _endAt, endBefore as _endBefore, getDoc as _getDoc, getDocs as _getDocs, getFirestore as _getFirestore, increment as _increment, initializeFirestore as _initializeFirestore, limit as _limit, limitToLast as _limitToLast, orderBy as _orderBy, query as _query, queryEqual as _queryEqual, refEqual as _refEqual, runTransaction as _runTransaction, serverTimestamp as _serverTimestamp, setDoc as _setDoc, setLogLevel as _setLogLevel, snapshotEqual as _snapshotEqual, startAfter as _startAfter, startAt as _startAt, terminate as _terminate, updateDoc as _updateDoc, where as _where, writeBatch as _writeBatch } from 'firebase/firestore/lite';
+import { addDoc as _addDoc, aggregateFieldEqual as _aggregateFieldEqual, aggregateQuerySnapshotEqual as _aggregateQuerySnapshotEqual, and as _and, arrayRemove as _arrayRemove, arrayUnion as _arrayUnion, average as _average, collection as _collection, collectionGroup as _collectionGroup, connectFirestoreEmulator as _connectFirestoreEmulator, count as _count, deleteDoc as _deleteDoc, deleteField as _deleteField, doc as _doc, documentId as _documentId, endAt as _endAt, endBefore as _endBefore, getAggregate as _getAggregate, getCount as _getCount, getDoc as _getDoc, getDocs as _getDocs, getFirestore as _getFirestore, increment as _increment, initializeFirestore as _initializeFirestore, limit as _limit, limitToLast as _limitToLast, or as _or, orderBy as _orderBy, query as _query, queryEqual as _queryEqual, refEqual as _refEqual, runTransaction as _runTransaction, serverTimestamp as _serverTimestamp, setDoc as _setDoc, setLogLevel as _setLogLevel, snapshotEqual as _snapshotEqual, startAfter as _startAfter, startAt as _startAt, sum as _sum, terminate as _terminate, updateDoc as _updateDoc, where as _where, writeBatch as _writeBatch } from 'firebase/firestore/lite';
 export declare const addDoc: typeof _addDoc;
+export declare const aggregateFieldEqual: typeof _aggregateFieldEqual;
+export declare const aggregateQuerySnapshotEqual: typeof _aggregateQuerySnapshotEqual;
+export declare const and: typeof _and;
 export declare const arrayRemove: typeof _arrayRemove;
 export declare const arrayUnion: typeof _arrayUnion;
+export declare const average: typeof _average;
 export declare const collection: typeof _collection;
 export declare const collectionGroup: typeof _collectionGroup;
 export declare const connectFirestoreEmulator: typeof _connectFirestoreEmulator;
+export declare const count: typeof _count;
 export declare const deleteDoc: typeof _deleteDoc;
 export declare const deleteField: typeof _deleteField;
 export declare const doc: typeof _doc;
 export declare const documentId: typeof _documentId;
 export declare const endAt: typeof _endAt;
 export declare const endBefore: typeof _endBefore;
+export declare const getAggregate: typeof _getAggregate;
+export declare const getCount: typeof _getCount;
 export declare const getDoc: typeof _getDoc;
 export declare const getDocs: typeof _getDocs;
 export declare const getFirestore: typeof _getFirestore;
@@ -19,6 +26,7 @@ export declare const increment: typeof _increment;
 export declare const initializeFirestore: typeof _initializeFirestore;
 export declare const limit: typeof _limit;
 export declare const limitToLast: typeof _limitToLast;
+export declare const or: typeof _or;
 export declare const orderBy: typeof _orderBy;
 export declare const query: typeof _query;
 export declare const queryEqual: typeof _queryEqual;
@@ -30,6 +38,7 @@ export declare const setLogLevel: typeof _setLogLevel;
 export declare const snapshotEqual: typeof _snapshotEqual;
 export declare const startAfter: typeof _startAfter;
 export declare const startAt: typeof _startAt;
+export declare const sum: typeof _sum;
 export declare const terminate: typeof _terminate;
 export declare const updateDoc: typeof _updateDoc;
 export declare const where: typeof _where;

package/firestore/lite/lite.module.d.ts

@@ -1,7 +1,7 @@
-import { NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
+import { InjectionToken, Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { FirebaseApp } from '@angular/fire/app';
 import { Firestore as FirebaseFirestore } from 'firebase/firestore/lite';
 import { Firestore } from './lite';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare const PROVIDED_FIRESTORE_INSTANCES: InjectionToken<Firestore[]>;
 export declare function defaultFirestoreInstanceFactory(provided: FirebaseFirestore[] | undefined, defaultApp: FirebaseApp): Firestore;

package/firestore/lite/rxfire.d.ts

@@ -1,6 +1,8 @@
-import { collection as _collection, collectionData as _collectionData, doc as _doc, docData as _docData, snapToData as _snapToData, fromRef as _fromRef } from 'rxfire/firestore/lite';
+import { collection as _collection, collectionData as _collectionData, collectionCountSnap as _collectionCountSnap, collectionCount as _collectionCount, doc as _doc, docData as _docData, snapToData as _snapToData, fromRef as _fromRef } from 'rxfire/firestore/lite';
 export declare const collectionSnapshots: typeof _collection;
 export declare const collectionData: typeof _collectionData;
+export declare const collectionCountSnap: typeof _collectionCountSnap;
+export declare const collectionCount: typeof _collectionCount;
 export declare const docSnapshots: typeof _doc;
 export declare const docData: typeof _docData;
 export declare const snapToData: typeof _snapToData;

package/firestore/rxfire.d.ts

@@ -1,12 +1,12 @@
-import { collectionChanges as _collectionChanges, collection as _collection, sortedChanges as _sortedChanges, auditTrail as _auditTrail, collectionData as _collectionData, doc as _doc, docData as _docData, snapToData as _snapToData, fromRef as _fromRef, collectionCount as _collectionCount, collectionCountSnap as _collectionCountSnap } from 'rxfire/firestore';
+import { collectionChanges as _collectionChanges, collection as _collection, sortedChanges as _sortedChanges, auditTrail as _auditTrail, collectionData as _collectionData, collectionCountSnap as _collectionCountSnap, collectionCount as _collectionCount, doc as _doc, docData as _docData, snapToData as _snapToData, fromRef as _fromRef } from 'rxfire/firestore';
 export declare const collectionChanges: typeof _collectionChanges;
 export declare const collectionSnapshots: typeof _collection;
 export declare const sortedChanges: typeof _sortedChanges;
 export declare const auditTrail: typeof _auditTrail;
 export declare const collectionData: typeof _collectionData;
+export declare const collectionCountSnap: typeof _collectionCountSnap;
+export declare const collectionCount: typeof _collectionCount;
 export declare const docSnapshots: typeof _doc;
 export declare const docData: typeof _docData;
 export declare const snapToData: typeof _snapToData;
 export declare const fromRef: typeof _fromRef;
-export declare const collectionCount: typeof _collectionCount;
-export declare const collectionCountSnap: typeof _collectionCountSnap;

package/functions/functions.module.d.ts

@@ -1,7 +1,7 @@
-import { NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
+import { InjectionToken, Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { FirebaseApp } from '@angular/fire/app';
 import { Functions as FirebaseFunctions } from 'firebase/functions';
 import { Functions } from './functions';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare const PROVIDED_FUNCTIONS_INSTANCES: InjectionToken<Functions[]>;
 export declare function defaultFunctionsInstanceFactory(provided: FirebaseFunctions[] | undefined, defaultApp: FirebaseApp): Functions;

package/messaging/messaging.module.d.ts

@@ -1,7 +1,7 @@
-import { NgZone, ModuleWithProviders, Injector } from '@angular/core';
+import { Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { FirebaseApp } from '@angular/fire/app';
 import { Messaging as FirebaseMessaging } from 'firebase/messaging';
 import { Messaging } from './messaging';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare function defaultMessagingInstanceFactory(provided: FirebaseMessaging[] | undefined, defaultApp: FirebaseApp): Messaging;
 export declare function messagingInstanceFactory(fn: (injector: Injector) => FirebaseMessaging): (zone: NgZone, injector: Injector) => Messaging;

package/package.json

@@ -1,8 +1,8 @@
 {
   "$schema": "../node_modules/ng-packagr/package.schema.json",
   "name": "@angular/fire",
-  "version": "16.0.0-canary.596e208",
-  "description": "The official Angular library for Firebase.",
+  "version": "16.0.0-canary.78407bc",
+  "description": "Angular + Firebase = ❤️",
   "schematics": "./schematics/collection.json",
   "builders": "./schematics/builders.json",
   "keywords": [
@@ -23,12 +23,12 @@
   "author": "angular,firebase",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/common": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@angular/platform-browser": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "rxjs": "~6.6.0 || ^7.0.0",
-    "firebase-tools": "^9.9.0 || ^10.0.0 || ^11.0.0 || ^12.0.0"
+    "@angular/common": "^16.0.0",
+    "@angular/core": "^16.0.0",
+    "@angular/platform-browser": "^16.0.0",
+    "@angular/platform-browser-dynamic": "^16.0.0",
+    "rxjs": "^6.5.3 || ^7.4.0",
+    "firebase-tools": "^12.0.0"
   },
   "peerDependenciesMeta": {
     "firebase-tools": {
@@ -36,10 +36,10 @@
     }
   },
   "dependencies": {
-    "firebase": "^9.8.0",
-    "rxfire": "^6.0.0",
-    "@angular-devkit/schematics": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
-    "@schematics/angular": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
+    "firebase": "^10.5.0",
+    "rxfire": "^6.0.5",
+    "@angular-devkit/schematics": "^16.0.0",
+    "@schematics/angular": "^16.0.0",
     "tslib": "^2.0.0",
     "fuzzy": "^0.1.3",
     "inquirer-autocomplete-prompt": "^1.0.1",

package/performance/performance.module.d.ts

@@ -1,7 +1,7 @@
-import { NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
+import { InjectionToken, Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { FirebaseApp } from '@angular/fire/app';
 import { FirebasePerformance } from 'firebase/performance';
 import { Performance } from './performance';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare const PROVIDED_PERFORMANCE_INSTANCES: InjectionToken<Performance[]>;
 export declare function defaultPerformanceInstanceFactory(provided: FirebasePerformance[] | undefined, defaultApp: FirebaseApp, platform: Object): Performance;

package/remote-config/remote-config.module.d.ts

@@ -1,7 +1,7 @@
-import { NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
+import { InjectionToken, Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { FirebaseApp } from '@angular/fire/app';
 import { RemoteConfig as FirebaseRemoteConfig } from 'firebase/remote-config';
 import { RemoteConfig } from './remote-config';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare const PROVIDED_REMOTE_CONFIG_INSTANCES: InjectionToken<RemoteConfig[]>;
 export declare function defaultRemoteConfigInstanceFactory(provided: FirebaseRemoteConfig[] | undefined, defaultApp: FirebaseApp): RemoteConfig;

package/schematics/add/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
 const common_1 = require("../common");
 const versions_json_1 = require("../versions.json");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const ngAdd = (options) => (tree, context) => {
     (0, common_1.addDependencies)(tree, versions_json_1.peerDependencies, context);
     const npmInstallTaskId = context.addTask(new tasks_1.NodePackageInstallTask());

package/schematics/add/schema.json

@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "$id": "angular-fire-ng-add",
+    "title": "AngularFire ng-add",
+    "type": "object",
+    "properties": {
+      "project": {
+        "type": "string",
+        "description": "The name of the project.",
+        "$default": {
+          "$source": "projectName"
+        }
+      }
+    },
+    "required": []
+  }

package/schematics/builders.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "builders": {
+    "deploy": {
+      "implementation": "./deploy/builder",
+      "schema": "./deploy/schema.json",
+      "description": "Deploy builder"
+    }
+  }
+}

package/schematics/collection.json

@@ -0,0 +1,15 @@
+{
+  "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "ng-add": {
+      "description": "Add firebase deploy schematic",
+      "factory": "./add#ngAdd",
+      "schema": "./add/schema.json"
+    },
+    "ng-add-setup-project": {
+      "description": "Setup ng deploy",
+      "factory": "./setup#ngAddSetupProject",
+      "schema": "./setup/schema.json"
+    }
+  }
+}

package/schematics/common.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependencies = exports.safeReadJSON = exports.generateFirebaseRc = exports.overwriteIfExists = exports.stringifyFormatted = exports.shortSiteName = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const semver = __importStar(require("semver"));
-const shortSiteName = (site) => (site === null || site === void 0 ? void 0 : site.name) && site.name.split('/').pop();
+const shortSiteName = (site) => { var _a; return (_a = site === null || site === void 0 ? void 0 : site.name) === null || _a === void 0 ? void 0 : _a.split('/').pop(); };
 exports.shortSiteName = shortSiteName;
 const stringifyFormatted = (obj) => JSON.stringify(obj, null, 2);
 exports.stringifyFormatted = stringifyFormatted;

package/schematics/deploy/actions.js

@@ -36,19 +36,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployToCloudRun = exports.deployToFunction = void 0;
-const architect_1 = require("@angular-devkit/architect");
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
-const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const child_process_1 = require("child_process");
-const functions_templates_1 = require("./functions-templates");
-const semver_1 = require("semver");
-const open_1 = __importDefault(require("open"));
+const architect_1 = require("@angular-devkit/architect");
 const schematics_1 = require("@angular-devkit/schematics");
-const versions_json_1 = require("../versions.json");
-const winston = __importStar(require("winston"));
-const triple_beam_1 = __importDefault(require("triple-beam"));
+const fs_extra_1 = require("fs-extra");
 const inquirer = __importStar(require("inquirer"));
+const open_1 = __importDefault(require("open"));
+const semver_1 = require("semver");
+const triple_beam_1 = __importDefault(require("triple-beam"));
+const winston = __importStar(require("winston"));
+const versions_json_1 = require("../versions.json");
+const functions_templates_1 = require("./functions-templates");
 const DEFAULT_EMULATOR_PORT = 5000;
 const DEFAULT_EMULATOR_HOST = 'localhost';
 const DEFAULT_CLOUD_RUN_OPTIONS = {
@@ -85,7 +85,7 @@ const spawnAsync = (command, options) => __awaiter(void 0, void 0, void 0, funct
         });
     });
 });
-const escapeRegExp = (str) => str.replace(/[\-\[\]\/{}()*+?.\\^$|]/g, '\\$&');
+const escapeRegExp = (str) => str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
 const moveSync = (src, dest) => {
     (0, fs_extra_1.copySync)(src, dest);
     (0, fs_extra_1.removeSync)(src);
@@ -128,7 +128,7 @@ const defaultFsHost = {
     existsSync: fs_1.existsSync,
 };
 const findPackageVersion = (packageManager, name) => {
-    const match = (0, child_process_1.execSync)(`${packageManager} list ${name}`).toString().match(`[^|\s]${escapeRegExp(name)}[@| ][^\s]+(\s.+)?$`);
+    const match = (0, child_process_1.execSync)(`${packageManager} list ${name}`).toString().match(`[^|s]${escapeRegExp(name)}[@| ][^s]+(s.+)?$`);
     return match ? match[0].split(new RegExp(`${escapeRegExp(name)}[@| ]`))[1].split(/\s/)[0] : null;
 };
 const getPackageJson = (context, workspaceRoot, options, main) => {

package/schematics/deploy/builder.js

@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const architect_1 = require("@angular-devkit/architect");
-const actions_1 = __importDefault(require("./actions"));
-const utils_1 = require("../utils");
 const firebaseTools_1 = require("../firebaseTools");
+const utils_1 = require("../utils");
+const actions_1 = __importDefault(require("./actions"));
 exports.default = (0, architect_1.createBuilder)((options, context) => __awaiter(void 0, void 0, void 0, function* () {
     if (!context.target) {
         throw new Error('Cannot deploy the application without a target');

package/schematics/deploy/schema.json

@@ -0,0 +1,119 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "FirebaseDeploySchema",
+  "title": "Firebase Deploy",
+  "description": "Ng Deploy target options for Firebase.",
+  "properties": {
+    "buildTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "browserTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "prerenderTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "serverTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "universalBuildTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "ssr": {
+      "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": {
+      "type": "boolean",
+      "description": "Prerender before deploy?"
+    },
+    "firebaseProject": {
+      "type": "string",
+      "description": "The Firebase project name or project alias to use when deploying"
+    },
+    "target": {
+      "type": "string",
+      "description": "The Firebase hosting target in firebase.json for multi-site"
+    },
+    "firebaseHostingSite": {
+      "type": "string",
+      "description": "The Firebase Hosting site to deploy to"
+    },
+    "functionName": {
+      "type": "string",
+      "description": "The name of the Cloud Function or Cloud Run serviceId to deploy SSR to"
+    },
+    "functionsNodeVersion": {
+      "oneOf": [{ "type": "number" }, { "type": "string" }],
+      "description": "Version of Node.js to run Cloud Functions / Run on"
+    },
+    "CF3v2": {
+      "type": "boolean",
+      "description": "Generation of the Functions product to run on"
+    },
+    "region": {
+      "type": "string",
+      "description": "The region to deploy Cloud Functions or Cloud Run to"
+    },
+    "outputPath": {
+      "type": "string",
+      "description": "Where to output the deploy artifacts"
+    },
+    "functionsRuntimeOptions": {
+      "type": "object",
+      "description": "Runtime options for Cloud Functions, if deploying to Cloud Functions"
+    },
+    "preview": {
+      "type": "boolean",
+      "description": "Do not deploy the application, just set up the Firebase Function in the project output directory. Can be used for testing the Firebase Function with `firebase serve`."
+    },
+    "cloudRunOptions": {
+      "type": "object",
+      "description": "Options passed to Cloud Run, if deploying to Cloud Run.",
+      "properties": {
+        "cpus": {
+          "type": "number",
+          "description": "Set a CPU limit in Kubernetes cpu units."
+        },
+        "maxConcurrency": {
+          "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": {
+          "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."
+        },
+        "memory": {
+          "type": "string",
+          "pattern": "^\\d+(G|M)i$",
+          "description": "Set a memory limit. Ex: 1Gi, 512Mi."
+        },
+        "minInstances": {
+          "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."
+        },
+        "timeout": {
+          "type": "number",
+          "description": "Set the maximum request execution time (timeout) in seconds."
+        },
+        "vpcConnector": {
+          "type": "string",
+          "description": "Set a VPC connector for this resource."
+        }
+      }
+    }
+  }
+}

package/schematics/migration.json

@@ -0,0 +1,15 @@
+{
+    "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+    "schematics": {
+        "migration-v7": {
+            "version": "7.0.0",
+            "description": "Update @angular/fire to v7",
+            "factory": "./update/v7#ngUpdate"
+        },
+        "ng-post-upgate": {
+            "description": "Print out results after ng-update",
+            "factory": "./update#ngPostUpdate",
+            "private": true
+        }
+    }
+}

package/schematics/setup/index.js

@@ -10,15 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupFirebase = exports.generateFirebaseJson = exports.ngAddSetupProject = exports.setupProject = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const common_1 = require("../common");
+const firebaseTools_1 = require("../firebaseTools");
 const utils_1 = require("../utils");
 const prompts_1 = require("./prompts");
-const firebaseTools_1 = require("../firebaseTools");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const common_1 = require("../common");
-;
 const setupProject = (tree, context, features, config) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const { path: workspacePath, workspace } = (0, utils_1.getWorkspace)(tree);
@@ -28,7 +27,7 @@ const setupProject = (tree, context, features, config) => __awaiter(void 0, void
     const featuresToImport = features.filter(it => it !== 0);
     if (featuresToImport.length > 0) {
         (0, utils_1.addToNgModule)(tree, { features: featuresToImport, sourcePath });
-        (0, utils_1.addFixesToServer)(tree, { features: featuresToImport, sourcePath });
+        (0, utils_1.addFixesToServer)(tree);
     }
     if (config.sdkConfig) {
         const source = `

package/schematics/setup/prompts.js

@@ -35,10 +35,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectTypePrompt = exports.sitePrompt = exports.appPrompt = exports.projectPrompt = exports.userPrompt = exports.featuresPrompt = exports.searchSites = exports.searchApps = exports.searchProjects = void 0;
 const fuzzy = __importStar(require("fuzzy"));
 const inquirer = __importStar(require("inquirer"));
+const common_1 = require("../common");
+const firebaseTools_1 = require("../firebaseTools");
 const interfaces_1 = require("../interfaces");
 const utils_1 = require("../utils");
-const firebaseTools_1 = require("../firebaseTools");
-const common_1 = require("../common");
 inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
 const NEW_OPTION = '~~angularfire-new~~';
 const DEFAULT_SITE_TYPE = 'DEFAULT_SITE';
@@ -190,7 +190,7 @@ const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, voi
         });
         return yield firebaseTools.projects.create(projectId, { account: options.account, displayName, nonInteractive: true });
     }
-    return (yield projects).find(it => it.projectId === projectId);
+    return (projects).find(it => it.projectId === projectId);
 });
 exports.projectPrompt = projectPrompt;
 const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(void 0, void 0, void 0, function* () {
@@ -209,10 +209,9 @@ const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(v
             name: 'displayName',
             message: 'What would you like to call your app?',
         });
-        ;
         return yield firebaseTools.apps.create('web', displayName, Object.assign(Object.assign({}, options), { nonInteractive: true, project }));
     }
-    return (yield apps).find(it => (0, utils_1.shortAppId)(it) === appId);
+    return (apps).find(it => (0, utils_1.shortAppId)(it) === appId);
 });
 exports.appPrompt = appPrompt;
 const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0, void 0, function* () {
@@ -245,7 +244,7 @@ const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0
         });
         return yield firebaseTools.hosting.sites.create(subdomain, Object.assign(Object.assign({}, options), { nonInteractive: true, project }));
     }
-    return (yield sites).find(it => (0, common_1.shortSiteName)(it) === siteName);
+    return (sites).find(it => (0, common_1.shortSiteName)(it) === siteName);
 });
 exports.sitePrompt = sitePrompt;
 const DEFAULT_REGION = 'us-central1';

package/schematics/setup/schema.json

@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "$id": "angular-fire-ng-add",
+    "title": "AngularFire ng-add",
+    "type": "object",
+    "properties": {
+      "project": {
+        "type": "string",
+        "description": "The name of the project.",
+        "$default": {
+          "$source": "projectName"
+        }
+      }
+    },
+    "required": []
+  }

package/schematics/update/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngPostUpdate = void 0;
-const ngPostUpdate = () => (host, context) => {
+const ngPostUpdate = () => (host, _context) => {
     return host;
 };
 exports.ngPostUpdate = ngPostUpdate;