@angular/fire 7.6.0 → 16.0.0-canary.1350920

package/schematics/utils.js

@@ -3,20 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addIgnoreFiles = exports.addToNgModule = exports.addFixesToServer = exports.addEnvironmentEntry = exports.getFirebaseProjectNameFromFs = exports.getFirebaseProjectNameFromHost = exports.getProject = exports.getWorkspace = exports.shortAppId = exports.hasPrerenderOption = exports.isUniversalApp = void 0;
+exports.addIgnoreFiles = exports.featureToRules = exports.addFixesToServer = exports.addEnvironmentEntry = exports.getFirebaseProjectNameFromFs = exports.getFirebaseProjectNameFromHost = exports.getProject = exports.getWorkspace = exports.shortAppId = exports.hasPrerenderOption = exports.isUniversalApp = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const schematics_1 = require("@angular-devkit/schematics");
 const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
-const find_module_1 = require("@schematics/angular/utility/find-module");
 const common_1 = require("./common");
 const isUniversalApp = (project) => { var _a; return (_a = project.architect) === null || _a === void 0 ? void 0 : _a.server; };
 exports.isUniversalApp = isUniversalApp;
 const hasPrerenderOption = (project) => { var _a; return (_a = project.architect) === null || _a === void 0 ? void 0 : _a.prerender; };
 exports.hasPrerenderOption = hasPrerenderOption;
-const shortAppId = (app) => (app === null || app === void 0 ? void 0 : app.appId) && app.appId.split('/').pop();
+const shortAppId = (app) => { var _a; return (_a = app === null || app === void 0 ? void 0 : app.appId) === null || _a === void 0 ? void 0 : _a.split('/').pop(); };
 exports.shortAppId = shortAppId;
 function getWorkspace(host) {
     const path = '/angular.json';
@@ -61,9 +61,9 @@ function getFirebaseProjectNameFromHost(host, target) {
 }
 exports.getFirebaseProjectNameFromHost = getFirebaseProjectNameFromHost;
 function getFirebaseProjectNameFromFs(root, target) {
-    const path = path_1.join(root, '.firebaserc');
+    const path = (0, path_1.join)(root, '.firebaserc');
     try {
-        const buffer = fs_1.readFileSync(path);
+        const buffer = (0, fs_1.readFileSync)(path);
         const rc = JSON.parse(buffer.toString());
         return projectFromRc(rc, target);
     }
@@ -87,25 +87,25 @@ function addEnvironmentEntry(host, filePath, data) {
             throw new schematics_1.SchematicsException(`Cannot read ${filePath}`);
         }
         const sourceFile = typescript_1.default.createSourceFile(filePath, buffer.toString('utf-8'), typescript_1.default.ScriptTarget.Latest, true);
-        const envIdentifier = ast_utils_1.findNode(sourceFile, typescript_1.default.SyntaxKind.Identifier, 'environment');
-        if (!envIdentifier || !envIdentifier.parent) {
+        const envIdentifier = (0, ast_utils_1.findNode)(sourceFile, typescript_1.default.SyntaxKind.Identifier, 'environment');
+        if (!(envIdentifier === null || envIdentifier === void 0 ? void 0 : envIdentifier.parent)) {
             throw new schematics_1.SchematicsException(`Cannot find 'environment' identifier in ${filePath}`);
         }
         const envObjectLiteral = envIdentifier.parent.getChildren().find(({ kind }) => kind === typescript_1.default.SyntaxKind.ObjectLiteralExpression);
         if (!envObjectLiteral) {
             throw new schematics_1.SchematicsException(`${filePath} is not in the expected format`);
         }
-        const firebaseIdentifier = ast_utils_1.findNode(envObjectLiteral, typescript_1.default.SyntaxKind.Identifier, 'firebase');
+        const firebaseIdentifier = (0, ast_utils_1.findNode)(envObjectLiteral, typescript_1.default.SyntaxKind.Identifier, 'firebase');
         const recorder = host.beginUpdate(filePath);
-        if (firebaseIdentifier && firebaseIdentifier.parent) {
+        if (firebaseIdentifier === null || firebaseIdentifier === void 0 ? void 0 : firebaseIdentifier.parent) {
             const change = new change_1.ReplaceChange(filePath, firebaseIdentifier.parent.pos, firebaseIdentifier.parent.getFullText(), data);
-            change_1.applyToUpdateRecorder(recorder, [change]);
+            (0, change_1.applyToUpdateRecorder)(recorder, [change]);
         }
         else {
             const openBracketToken = envObjectLiteral.getChildren().find(({ kind }) => kind === typescript_1.default.SyntaxKind.OpenBraceToken);
             if (openBracketToken) {
                 const change = new change_1.InsertChange(filePath, openBracketToken.end, `${data},`);
-                change_1.applyToUpdateRecorder(recorder, [change]);
+                (0, change_1.applyToUpdateRecorder)(recorder, [change]);
             }
             else {
                 throw new schematics_1.SchematicsException(`${filePath} is not in the expected format`);
@@ -120,7 +120,7 @@ function addEnvironmentEntry(host, filePath, data) {
     return host;
 }
 exports.addEnvironmentEntry = addEnvironmentEntry;
-function addFixesToServer(host, options) {
+function addFixesToServer(host) {
     const serverPath = `/server.ts`;
     if (!host.exists(serverPath)) {
         return host;
@@ -132,70 +132,86 @@ function addFixesToServer(host, options) {
     const sourceText = text.toString('utf-8');
     const addZonePatch = !sourceText.includes('import \'zone.js/dist/zone-patch-rxjs\';');
     if (addZonePatch) {
-        common_1.overwriteIfExists(host, serverPath, sourceText.replace('import \'zone.js/dist/zone-node\';', `import 'zone.js/dist/zone-node';
+        (0, common_1.overwriteIfExists)(host, serverPath, sourceText.replace('import \'zone.js/dist/zone-node\';', `import 'zone.js/dist/zone-node';
 ${addZonePatch ? 'import \'zone.js/dist/zone-patch-rxjs\';' : ''}`));
     }
     return host;
 }
 exports.addFixesToServer = addFixesToServer;
-function addToNgModule(host, options) {
-    const modulePath = `/${options.sourcePath}/app/app.module.ts`;
-    if (!host.exists(modulePath)) {
-        throw new Error(`Specified module path ${modulePath} does not exist`);
-    }
-    const text = host.read(modulePath);
-    if (text === null) {
-        throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-    }
-    const sourceText = text.toString('utf-8');
-    const source = typescript_1.default.createSourceFile(modulePath, sourceText, typescript_1.default.ScriptTarget.Latest, true);
-    const environmentsPath = find_module_1.buildRelativePath(modulePath, `/${options.sourcePath}/environments/environment`);
-    const changes = [];
-    if (!ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideFirebaseApp')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['initializeApp', 'provideFirebaseApp'], '@angular/fire/app'), ast_utils_1.insertImport(source, modulePath, 'environment', environmentsPath), ...ast_utils_1.addImportToModule(source, modulePath, `provideFirebaseApp(() => initializeApp(environment.firebase))`, null));
-    }
-    if (options.features.includes(2) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideAnalytics')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideAnalytics', 'getAnalytics', 'ScreenTrackingService', 'UserTrackingService'], '@angular/fire/analytics'), ...ast_utils_1.addImportToModule(source, modulePath, `provideAnalytics(() => getAnalytics())`, null), ...ast_utils_1.addProviderToModule(source, modulePath, ['ScreenTrackingService', 'UserTrackingService'], null));
-    }
-    if (options.features.includes(1) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideAuth')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideAuth', 'getAuth'], '@angular/fire/auth'), ...ast_utils_1.addImportToModule(source, modulePath, `provideAuth(() => getAuth())`, null));
-    }
-    if (options.features.includes(3) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideDatabase')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideDatabase', 'getDatabase'], '@angular/fire/database'), ...ast_utils_1.addImportToModule(source, modulePath, `provideDatabase(() => getDatabase())`, null));
-    }
-    if (options.features.includes(7) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideFirestore')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideFirestore', 'getFirestore'], '@angular/fire/firestore'), ...ast_utils_1.addImportToModule(source, modulePath, `provideFirestore(() => getFirestore())`, null));
-    }
-    if (options.features.includes(4) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideFunctions')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideFunctions', 'getFunctions'], '@angular/fire/functions'), ...ast_utils_1.addImportToModule(source, modulePath, `provideFunctions(() => getFunctions())`, null));
-    }
-    if (options.features.includes(5) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideMessaging')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideMessaging', 'getMessaging'], '@angular/fire/messaging'), ...ast_utils_1.addImportToModule(source, modulePath, `provideMessaging(() => getMessaging())`, null));
-    }
-    if (options.features.includes(6) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'providePerformance')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['providePerformance', 'getPerformance'], '@angular/fire/performance'), ...ast_utils_1.addImportToModule(source, modulePath, `providePerformance(() => getPerformance())`, null));
-    }
-    if (options.features.includes(9) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideRemoteConfig')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideRemoteConfig', 'getRemoteConfig'], '@angular/fire/remote-config'), ...ast_utils_1.addImportToModule(source, modulePath, `provideRemoteConfig(() => getRemoteConfig())`, null));
-    }
-    if (options.features.includes(8) &&
-        !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideStorage')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideStorage', 'getStorage'], '@angular/fire/storage'), ...ast_utils_1.addImportToModule(source, modulePath, `provideStorage(() => getStorage())`, null));
-    }
-    const recorder = host.beginUpdate(modulePath);
-    change_1.applyToUpdateRecorder(recorder, changes);
-    host.commitUpdate(recorder);
-    return host;
+function featureToRules(features, projectName) {
+    return features.map(feature => {
+        switch (feature) {
+            case 3:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('initializeAppCheck', '@angular/fire/app-check');
+                    external('ReCaptchaEnterpriseProvider', '@angular/fire/app-check');
+                    return code `${external('provideAppCheck', '@angular/fire/app-check')}(() => {
+  // TODO get a reCAPTCHA Enterprise here https://console.cloud.google.com/security/recaptcha?project=_
+  const provider = new ReCaptchaEnterpriseProvider(/* reCAPTCHA Enterprise site key */);
+  return initializeAppCheck(undefined, { provider, isTokenAutoRefreshEnabled: true });
+})`;
+                });
+            case 2:
+                return (0, schematics_1.chain)([
+                    (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                        external('getAnalytics', '@angular/fire/analytics');
+                        return code `${external('provideAnalytics', '@angular/fire/analytics')}(() => getAnalytics())`;
+                    }),
+                    (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                        return code `${external('ScreenTrackingService', '@angular/fire/analytics')}`;
+                    }),
+                    ...(features.includes(1) ? [
+                        (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                            return code `${external('UserTrackingService', '@angular/fire/analytics')}`;
+                        })
+                    ] : []),
+                ]);
+            case 1:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getAuth', '@angular/fire/auth');
+                    return code `${external('provideAuth', '@angular/fire/auth')}(() => getAuth())`;
+                });
+            case 4:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getDatabase', '@angular/fire/database');
+                    return code `${external('provideDatabase', '@angular/fire/database')}(() => getDatabase())`;
+                });
+            case 8:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getFirestore', '@angular/fire/firestore');
+                    return code `${external('provideFirestore', '@angular/fire/firestore')}(() => getFirestore())`;
+                });
+            case 5:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getFunctions', '@angular/fire/functions');
+                    return code `${external('provideFunctions', '@angular/fire/functions')}(() => getFunctions())`;
+                });
+            case 6:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getMessaging', '@angular/fire/messaging');
+                    return code `${external('provideMessaging', '@angular/fire/messaging')}(() => getMessaging())`;
+                });
+            case 7:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getPerformance', '@angular/fire/performance');
+                    return code `${external('providePerformance', '@angular/fire/performance')}(() => getPerformance())`;
+                });
+            case 9:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getStorage', '@angular/fire/storage');
+                    return code `${external('provideStorage', '@angular/fire/storage')}(() => getStorage())`;
+                });
+            case 10:
+                return (0, utility_1.addRootImport)(projectName, ({ code, external }) => {
+                    external('getRemoteConfig', '@angular/fire/remote-config');
+                    return code `${external('provideRemoteConfig', '@angular/fire/remote-config')}(() => getRemoteConfig())`;
+                });
+            default:
+                return undefined;
+        }
+    }).filter((it) => !!it);
 }
-exports.addToNgModule = addToNgModule;
+exports.featureToRules = featureToRules;
 const addIgnoreFiles = (host) => {
     const path = '/.gitignore';
     if (!host.exists(path)) {
@@ -207,7 +223,7 @@ const addIgnoreFiles = (host) => {
     }
     const content = buffer.toString();
     if (!content.includes('# Firebase')) {
-        common_1.overwriteIfExists(host, path, content.concat(`
+        (0, common_1.overwriteIfExists)(host, path, content.concat(`
 # Firebase
 .firebase
 *-debug.log

package/storage/storage.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 { FirebaseStorage } from 'firebase/storage';
 import { Storage } from './storage';
-import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare const PROVIDED_STORAGE_INSTANCES: InjectionToken<Storage[]>;
 export declare function defaultStorageInstanceFactory(provided: FirebaseStorage[] | undefined, defaultApp: FirebaseApp): Storage;

package/analytics/package.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/package.schema.json",
-  "main": "../bundles/angular-fire-analytics.umd.js",
-  "module": "../fesm2015/angular-fire-analytics.js",
-  "es2015": "../fesm2015/angular-fire-analytics.js",
-  "esm2015": "../esm2015/analytics/angular-fire-analytics.js",
-  "fesm2015": "../fesm2015/angular-fire-analytics.js",
-  "typings": "angular-fire-analytics.d.ts",
-  "sideEffects": false,
-  "name": "@angular/fire/analytics"
-}

package/app/package.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/package.schema.json",
-  "main": "../bundles/angular-fire-app.umd.js",
-  "module": "../fesm2015/angular-fire-app.js",
-  "es2015": "../fesm2015/angular-fire-app.js",
-  "esm2015": "../esm2015/app/angular-fire-app.js",
-  "fesm2015": "../fesm2015/angular-fire-app.js",
-  "typings": "angular-fire-app.d.ts",
-  "sideEffects": false,
-  "name": "@angular/fire/app"
-}

package/app-check/package.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/package.schema.json",
-  "main": "../bundles/angular-fire-app-check.umd.js",
-  "module": "../fesm2015/angular-fire-app-check.js",
-  "es2015": "../fesm2015/angular-fire-app-check.js",
-  "esm2015": "../esm2015/app-check/angular-fire-app-check.js",
-  "fesm2015": "../fesm2015/angular-fire-app-check.js",
-  "typings": "angular-fire-app-check.d.ts",
-  "sideEffects": false,
-  "name": "@angular/fire/app-check"
-}

package/auth/package.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/package.schema.json",
-  "main": "../bundles/angular-fire-auth.umd.js",
-  "module": "../fesm2015/angular-fire-auth.js",
-  "es2015": "../fesm2015/angular-fire-auth.js",
-  "esm2015": "../esm2015/auth/angular-fire-auth.js",
-  "fesm2015": "../fesm2015/angular-fire-auth.js",
-  "typings": "angular-fire-auth.d.ts",
-  "sideEffects": false,
-  "name": "@angular/fire/auth"
-}

package/auth-guard/package.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "../../node_modules/ng-packagr/package.schema.json",
-  "main": "../bundles/angular-fire-auth-guard.umd.js",
-  "module": "../fesm2015/angular-fire-auth-guard.js",
-  "es2015": "../fesm2015/angular-fire-auth-guard.js",
-  "esm2015": "../esm2015/auth-guard/angular-fire-auth-guard.js",
-  "fesm2015": "../fesm2015/angular-fire-auth-guard.js",
-  "typings": "angular-fire-auth-guard.d.ts",
-  "sideEffects": false,
-  "name": "@angular/fire/auth-guard"
-}