firebase-tools 12.6.2 → 12.7.0

package/lib/commands/emulators-exec.js

@@ -12,6 +12,7 @@ exports.command = new command_1.Command("emulators:exec <script>")
     .option(commandUtils.FLAG_INSPECT_FUNCTIONS, commandUtils.DESC_INSPECT_FUNCTIONS)
     .option(commandUtils.FLAG_IMPORT, commandUtils.DESC_IMPORT)
     .option(commandUtils.FLAG_EXPORT_ON_EXIT, commandUtils.DESC_EXPORT_ON_EXIT)
+    .option(commandUtils.FLAG_VERBOSITY, commandUtils.DESC_VERBOSITY)
     .option(commandUtils.FLAG_UI, commandUtils.DESC_UI)
     .action((script, options) => {
     return Promise.race([(0, commandUtils_1.shutdownWhenKilled)(options), (0, commandUtils_1.emulatorExec)(script, options)]);

package/lib/commands/emulators-start.js

@@ -22,6 +22,7 @@ exports.command = new command_1.Command("emulators:start")
     .option(commandUtils.FLAG_INSPECT_FUNCTIONS, commandUtils.DESC_INSPECT_FUNCTIONS)
     .option(commandUtils.FLAG_IMPORT, commandUtils.DESC_IMPORT)
     .option(commandUtils.FLAG_EXPORT_ON_EXIT, commandUtils.DESC_EXPORT_ON_EXIT)
+    .option(commandUtils.FLAG_VERBOSITY, commandUtils.DESC_VERBOSITY)
     .action((options) => {
     const killSignalPromise = commandUtils.shutdownWhenKilled(options);
     return Promise.race([

package/lib/commands/firestore-databases-create.js

@@ -13,6 +13,7 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
     .description("Create a database in your Firebase project.")
     .option("--location <locationId>", "Region to create database, for example 'nam5'. Run 'firebase firestore:locations' to get a list of eligible locations. (required)")
     .option("--delete-protection <deleteProtectionState>", "Whether or not to prevent deletion of database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'")
+    .option("--point-in-time-recovery <enablement>", "Whether to enable the PITR feature on this database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'")
     .before(requirePermissions_1.requirePermissions, ["datastore.databases.create"])
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
     .action(async (database, options) => {
@@ -31,7 +32,16 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
     const deleteProtectionState = options.deleteProtection === types.DatabaseDeleteProtectionStateOption.ENABLED
         ? types.DatabaseDeleteProtectionState.ENABLED
         : types.DatabaseDeleteProtectionState.DISABLED;
-    const databaseResp = await api.createDatabase(options.project, database, options.location, type, deleteProtectionState);
+    if (options.pointInTimeRecovery &&
+        options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.ENABLED &&
+        options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.DISABLED) {
+        logger_1.logger.error("Invalid value for flag --point-in-time-recovery. See firebase firestore:databases:create --help for more info.");
+        return;
+    }
+    const pointInTimeRecoveryEnablement = options.pointInTimeRecovery === types.PointInTimeRecoveryEnablementOption.ENABLED
+        ? types.PointInTimeRecoveryEnablement.ENABLED
+        : types.PointInTimeRecoveryEnablement.DISABLED;
+    const databaseResp = await api.createDatabase(options.project, database, options.location, type, deleteProtectionState, pointInTimeRecoveryEnablement);
     if (options.json) {
         logger_1.logger.info(JSON.stringify(databaseResp, undefined, 2));
     }

package/lib/commands/firestore-databases-update.js

@@ -13,11 +13,12 @@ exports.command = new command_1.Command("firestore:databases:update <database>")
     .description("Update a database in your Firebase project. Must specify at least one property to update.")
     .option("--json", "Prints raw json response of the create API call if specified")
     .option("--delete-protection <deleteProtectionState>", "Whether or not to prevent deletion of database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'")
+    .option("--point-in-time-recovery <enablement>", "Whether to enable the PITR feature on this database, for example 'ENABLED' or 'DISABLED'. Default is 'DISABLED'")
     .before(requirePermissions_1.requirePermissions, ["datastore.databases.update"])
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
     .action(async (database, options) => {
     const api = new fsi.FirestoreApi();
-    if (!options.type && !options.deleteProtection) {
+    if (!options.type && !options.deleteProtection && !options.pointInTimeRecovery) {
         logger_1.logger.error("Missing properties to update. See firebase firestore:databases:update --help for more info.");
         return;
     }
@@ -31,7 +32,16 @@ exports.command = new command_1.Command("firestore:databases:update <database>")
     const deleteProtectionState = options.deleteProtection === types.DatabaseDeleteProtectionStateOption.ENABLED
         ? types.DatabaseDeleteProtectionState.ENABLED
         : types.DatabaseDeleteProtectionState.DISABLED;
-    const databaseResp = await api.updateDatabase(options.project, database, type, deleteProtectionState);
+    if (options.pointInTimeRecovery &&
+        options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.ENABLED &&
+        options.pointInTimeRecovery !== types.PointInTimeRecoveryEnablementOption.DISABLED) {
+        logger_1.logger.error("Invalid value for flag --point-in-time-recovery. See firebase firestore:databases:update --help for more info.");
+        return;
+    }
+    const pointInTimeRecoveryEnablement = options.pointInTimeRecovery === types.PointInTimeRecoveryEnablementOption.ENABLED
+        ? types.PointInTimeRecoveryEnablement.ENABLED
+        : types.PointInTimeRecoveryEnablement.DISABLED;
+    const databaseResp = await api.updateDatabase(options.project, database, type, deleteProtectionState, pointInTimeRecoveryEnablement);
     if (options.json) {
         logger_1.logger.info(JSON.stringify(databaseResp, undefined, 2));
     }

package/lib/commands/init.js

@@ -69,9 +69,9 @@ const choices = [
         checked: false,
     },
 ];
-if ((0, experiments_1.isEnabled)("frameworks")) {
+if ((0, experiments_1.isEnabled)("internalframeworks")) {
     choices.push({
-        value: "frameworks",
+        value: "internalframeworks",
         name: "Frameworks: Get started with Frameworks projects.",
         checked: false,
     });
@@ -79,7 +79,7 @@ if ((0, experiments_1.isEnabled)("frameworks")) {
 const featureNames = choices.map((choice) => choice.value);
 const DESCRIPTION = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 
-This command will create or update 'firebase.json' and '.firebaserc' configuration files in the current directory. 
+This command will create or update 'firebase.json' and '.firebaserc' configuration files in the current directory.
 
 To initialize a specific Firebase feature, run 'firebase init [feature]'. Valid features are:
 ${[...featureNames]

package/lib/deploy/functions/build.js

@@ -8,6 +8,7 @@ const params = require("./params");
 const error_1 = require("../../error");
 const functional_1 = require("../../functional");
 const env_1 = require("../../functions/env");
+const cel_1 = require("./cel");
 function empty() {
     return {
         requiredAPIs: [],
@@ -176,9 +177,22 @@ function toBackend(build, paramValues) {
         if (!bdEndpoint.region) {
             regions = [api.functionsDefaultRegion];
         }
-        else {
+        else if (Array.isArray(bdEndpoint.region)) {
             regions = params.resolveList(bdEndpoint.region, paramValues);
         }
+        else {
+            try {
+                regions = params.resolveList(bdEndpoint.region, paramValues);
+            }
+            catch (err) {
+                if (err instanceof cel_1.ExprParseError) {
+                    regions = [params.resolveString(bdEndpoint.region, paramValues)];
+                }
+                else {
+                    throw err;
+                }
+            }
+        }
         for (const region of regions) {
             const trigger = discoverTrigger(bdEndpoint, region, r);
             if (typeof bdEndpoint.platform === "undefined") {
@@ -203,10 +217,11 @@ function toBackend(build, paramValues) {
             r.resolveInts(bkEndpoint, bdEndpoint, "timeoutSeconds", "maxInstances", "minInstances", "concurrency");
             proto.convertIfPresent(bkEndpoint, bdEndpoint, "cpu", (0, functional_1.nullsafeVisitor)((cpu) => (cpu === "gcf_gen1" ? cpu : r.resolveInt(cpu))));
             if (bdEndpoint.vpc) {
+                bdEndpoint.vpc.connector = params.resolveString(bdEndpoint.vpc.connector, paramValues);
                 if (bdEndpoint.vpc.connector && !bdEndpoint.vpc.connector.includes("/")) {
                     bdEndpoint.vpc.connector = `projects/${bdEndpoint.project}/locations/${region}/connectors/${bdEndpoint.vpc.connector}`;
                 }
-                bkEndpoint.vpc = { connector: params.resolveString(bdEndpoint.vpc.connector, paramValues) };
+                bkEndpoint.vpc = { connector: bdEndpoint.vpc.connector };
                 proto.copyIfPresent(bkEndpoint.vpc, bdEndpoint.vpc, "egressSettings");
             }
             else if (bdEndpoint.vpc === null) {

package/lib/emulator/commandUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JAVA_DEPRECATION_WARNING = exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = exports.checkJavaMajorVersion = exports.emulatorExec = exports.getListenOverview = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DEFAULT_CONFIG = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
+exports.JAVA_DEPRECATION_WARNING = exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = exports.checkJavaMajorVersion = exports.emulatorExec = exports.getListenOverview = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DEFAULT_CONFIG = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.DESC_VERBOSITY = exports.FLAG_VERBOSITY = exports.FLAG_VERBOSITY_NAME = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
 const clc = require("colorette");
 const childProcess = require("child_process");
 const controller = require("../emulator/controller");
@@ -37,6 +37,9 @@ exports.DESC_EXPORT_ON_EXIT = "automatically export emulator data (emulators:exp
 exports.EXPORT_ON_EXIT_USAGE_ERROR = `"${exports.FLAG_EXPORT_ON_EXIT_NAME}" must be used with "${exports.FLAG_IMPORT}"` +
     ` or provide a dir directly to "${exports.FLAG_EXPORT_ON_EXIT}"`;
 exports.EXPORT_ON_EXIT_CWD_DANGER = `"${exports.FLAG_EXPORT_ON_EXIT_NAME}" must not point to the current directory or parents. Please choose a new/dedicated directory for exports.`;
+exports.FLAG_VERBOSITY_NAME = "--log-verbosity";
+exports.FLAG_VERBOSITY = `${exports.FLAG_VERBOSITY_NAME} <verbosity>`;
+exports.DESC_VERBOSITY = "One of: DEBUG, INFO, QUIET, SILENT. ";
 exports.FLAG_UI = "--ui";
 exports.DESC_UI = "run the Emulator UI";
 exports.FLAG_TEST_CONFIG = "--test-config <firebase.json file>";

package/lib/emulator/controller.js

@@ -170,6 +170,9 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             throw new error_1.FirebaseError(commandUtils_1.JAVA_DEPRECATION_WARNING);
         }
     }
+    if (options.logVerbosity) {
+        emulatorLogger_1.EmulatorLogger.setVerbosity(emulatorLogger_1.Verbosity[options.logVerbosity]);
+    }
     const hubLogger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.HUB);
     hubLogger.logLabeled("BULLET", "emulators", `Starting emulators: ${targets.join(", ")}`);
     const projectId = (0, projectUtils_1.getProjectId)(options) || "";

package/lib/emulator/emulatorLogger.js

@@ -21,12 +21,16 @@ var Verbosity;
     Verbosity[Verbosity["DEBUG"] = 0] = "DEBUG";
     Verbosity[Verbosity["INFO"] = 1] = "INFO";
     Verbosity[Verbosity["QUIET"] = 2] = "QUIET";
+    Verbosity[Verbosity["SILENT"] = 3] = "SILENT";
 })(Verbosity = exports.Verbosity || (exports.Verbosity = {}));
 class EmulatorLogger {
     constructor(name, data = {}) {
         this.name = name;
         this.data = data;
     }
+    static setVerbosity(verbosity) {
+        EmulatorLogger.verbosity = verbosity;
+    }
     static forEmulator(emulator) {
         return new EmulatorLogger(emulator, {
             metadata: {

package/lib/emulator/functionsEmulator.js

@@ -82,7 +82,7 @@ class FunctionsEmulator {
         this.multicastTriggers = {};
         this.blockingFunctionsConfig = {};
         this.debugMode = false;
-        emulatorLogger_1.EmulatorLogger.verbosity = this.args.quiet ? emulatorLogger_1.Verbosity.QUIET : emulatorLogger_1.Verbosity.DEBUG;
+        emulatorLogger_1.EmulatorLogger.setVerbosity(this.args.quiet ? emulatorLogger_1.Verbosity.QUIET : emulatorLogger_1.Verbosity.DEBUG);
         if (this.args.debugPort) {
             this.args.disabledRuntimeFeatures = this.args.disabledRuntimeFeatures || {};
             this.args.disabledRuntimeFeatures.timeout = true;

package/lib/experiments.js

@@ -72,7 +72,7 @@ exports.ALL_EXPERIMENTS = experiments({
             "These commands are not meant for public consumption and may break or disappear " +
             "without a notice.",
     },
-    frameworks: {
+    internalframeworks: {
         shortDescription: "Allow CLI option for Frameworks",
         default: true,
         public: false,

package/lib/firestore/api-types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DatabaseDeleteProtectionState = exports.DatabaseDeleteProtectionStateOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.QueryScope = exports.Mode = void 0;
+exports.PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablementOption = exports.DatabaseDeleteProtectionState = exports.DatabaseDeleteProtectionStateOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.QueryScope = exports.Mode = void 0;
 var Mode;
 (function (Mode) {
     Mode["ASCENDING"] = "ASCENDING";
@@ -48,3 +48,13 @@ var DatabaseDeleteProtectionState;
     DatabaseDeleteProtectionState["ENABLED"] = "DELETE_PROTECTION_ENABLED";
     DatabaseDeleteProtectionState["DISABLED"] = "DELETE_PROTECTION_DISABLED";
 })(DatabaseDeleteProtectionState = exports.DatabaseDeleteProtectionState || (exports.DatabaseDeleteProtectionState = {}));
+var PointInTimeRecoveryEnablementOption;
+(function (PointInTimeRecoveryEnablementOption) {
+    PointInTimeRecoveryEnablementOption["ENABLED"] = "ENABLED";
+    PointInTimeRecoveryEnablementOption["DISABLED"] = "DISABLED";
+})(PointInTimeRecoveryEnablementOption = exports.PointInTimeRecoveryEnablementOption || (exports.PointInTimeRecoveryEnablementOption = {}));
+var PointInTimeRecoveryEnablement;
+(function (PointInTimeRecoveryEnablement) {
+    PointInTimeRecoveryEnablement["ENABLED"] = "POINT_IN_TIME_RECOVERY_ENABLED";
+    PointInTimeRecoveryEnablement["DISABLED"] = "POINT_IN_TIME_RECOVERY_DISABLED";
+})(PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablement || (exports.PointInTimeRecoveryEnablement = {}));

package/lib/firestore/api.js

@@ -214,7 +214,7 @@ class FirestoreApi {
             head: ["Field", "Value"],
             colWidths: [25, Math.max(50, 5 + database.name.length)],
         });
-        table.push(["Name", clc.yellow(database.name)], ["Create Time", clc.yellow(database.createTime)], ["Last Update Time", clc.yellow(database.updateTime)], ["Type", clc.yellow(database.type)], ["Location", clc.yellow(database.locationId)], ["Delete Protection State", clc.yellow(database.deleteProtectionState)]);
+        table.push(["Name", clc.yellow(database.name)], ["Create Time", clc.yellow(database.createTime)], ["Last Update Time", clc.yellow(database.updateTime)], ["Type", clc.yellow(database.type)], ["Location", clc.yellow(database.locationId)], ["Delete Protection State", clc.yellow(database.deleteProtectionState)], ["Point In Time Recovery", clc.yellow(database.pointInTimeRecoveryEnablement)], ["Earliest Version Time", clc.yellow(database.earliestVersionTime)], ["Version Retention Period", clc.yellow(database.versionRetentionPeriod)]);
         logger_1.logger.info(table.toString());
     }
     prettyPrintLocations(locations) {
@@ -469,12 +469,13 @@ class FirestoreApi {
         }
         return database;
     }
-    async createDatabase(project, databaseId, locationId, type, deleteProtectionState) {
+    async createDatabase(project, databaseId, locationId, type, deleteProtectionState, pointInTimeRecoveryEnablement) {
         const url = `/projects/${project}/databases`;
         const payload = {
             type,
             locationId,
             deleteProtectionState,
+            pointInTimeRecoveryEnablement,
         };
         const options = { queryParams: { databaseId: databaseId } };
         const res = await this.apiClient.post(url, payload, options);
@@ -484,11 +485,12 @@ class FirestoreApi {
         }
         return database;
     }
-    async updateDatabase(project, databaseId, type, deleteProtectionState) {
+    async updateDatabase(project, databaseId, type, deleteProtectionState, pointInTimeRecoveryEnablement) {
         const url = `/projects/${project}/databases/${databaseId}`;
         const payload = {
             type,
             deleteProtectionState,
+            pointInTimeRecoveryEnablement,
         };
         const res = await this.apiClient.patch(url, payload);
         const database = res.body.response;

package/lib/gcp/firestore.js

@@ -7,7 +7,7 @@ const logger_1 = require("../logger");
 const apiClient = new apiv2_1.Client({
     auth: true,
     apiVersion: "v1",
-    urlPrefix: api_1.firestoreOriginOrEmulator,
+    urlPrefix: api_1.firestoreOrigin,
 });
 async function getDatabase(project, database) {
     const url = `projects/${project}/databases/${database}`;

package/lib/init/index.js

@@ -20,8 +20,8 @@ const featureFns = new Map([
     ["remoteconfig", features.remoteconfig],
     ["hosting:github", features.hostingGithub],
 ]);
-if ((0, experiments_1.isEnabled)("frameworks")) {
-    featureFns.set("frameworks", features.frameworks);
+if ((0, experiments_1.isEnabled)("internalframeworks")) {
+    featureFns.set("internalframeworks", features.frameworks);
 }
 async function init(setup, config, options) {
     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.6.2",
+  "version": "12.7.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {