firebase-tools 13.14.2 → 13.15.0

package/lib/bin/firebase.js

@@ -10,12 +10,10 @@ if (!semver.satisfies(nodeVersion, pkg.engines.node)) {
 }
 const updateNotifierPkg = require("update-notifier-cjs");
 const clc = require("colorette");
-const TerminalRenderer = require("marked-terminal");
+const marked_terminal_1 = require("marked-terminal");
 const updateNotifier = updateNotifierPkg({ pkg });
 const marked_1 = require("marked");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
+marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const node_path_1 = require("node:path");
 const triple_beam_1 = require("triple-beam");
 const stripAnsi = require("strip-ansi");

package/lib/commands/deploy.js

@@ -107,7 +107,13 @@ exports.command = new command_1.Command("deploy")
             await (0, requireHostingSite_1.requireHostingSite)(options);
         }
         catch (err) {
-            if (err === getDefaultHostingSite_1.errNoDefaultSite) {
+            const isPermissionError = err instanceof error_1.FirebaseError &&
+                err.original instanceof error_1.FirebaseError &&
+                err.original.status === 403;
+            if (isPermissionError) {
+                throw err;
+            }
+            else if (err === getDefaultHostingSite_1.errNoDefaultSite) {
                 createSite = true;
             }
         }

package/lib/commands/ext-configure.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
 const error_1 = require("../error");
@@ -19,9 +17,6 @@ const functional_1 = require("../functional");
 const paramHelper_1 = require("../extensions/paramHelper");
 const askUserForEventsConfig = require("../extensions/askUserForEventsConfig");
 const tos_1 = require("../extensions/tos");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 exports.command = new command_1.Command("ext:configure <extensionInstanceId>")
     .description("configure an existing extension instance")
     .withForce()
@@ -99,7 +94,7 @@ function infoImmutableParams(immutableParams, paramValues) {
         return;
     }
     const plural = immutableParams.length > 1;
-    utils.logLabeledWarning(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`The following param${plural ? "s are" : " is"} immutable and won't be changed:`));
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, `The following param${plural ? "s are" : " is"} immutable and won't be changed:`);
     for (const { param } of immutableParams) {
         logger_1.logger.info(`param: ${param}, value: ${paramValues[param]}`);
     }

package/lib/commands/ext-dev-init.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
+const marked_terminal_1 = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
 const config_1 = require("../config");
@@ -11,9 +11,7 @@ const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const npmDependencies = require("../init/features/functions/npm-dependencies");
 const templates_1 = require("../templates");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
+marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 function readCommonTemplates() {
     return {
         integrationTestFirebaseJsonTemplate: (0, templates_1.readTemplateSync)("extensions/integration-test.json"),

package/lib/commands/ext-dev-upload.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadExtensionAction = exports.command = void 0;
 const clc = require("colorette");
 const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
+const marked_terminal_1 = require("marked-terminal");
 const command_1 = require("../command");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const refs = require("../extensions/refs");
@@ -16,9 +16,7 @@ const utils = require("../utils");
 const publisherApi_1 = require("../extensions/publisherApi");
 const extensionsHelper_2 = require("../extensions/extensionsHelper");
 const projects_1 = require("../management/projects");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
+marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 exports.command = new command_1.Command("ext:dev:upload <extensionRef>")
     .description(`upload a new version of an extension`)
     .option(`-s, --stage <stage>`, `release stage (supports "alpha", "beta", "rc", and "stable")`)
@@ -79,9 +77,9 @@ async function uploadExtensionAction(extensionRef, options) {
         });
     }
     if (res) {
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`[Install Link](${(0, publishHelpers_1.consoleInstallLink)(res.ref)})`));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, await (0, marked_1.marked)(`[Install Link](${(0, publishHelpers_1.consoleInstallLink)(res.ref)})`));
         const version = res.ref.split("@")[1];
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`[View in Console](${utils.consoleUrl(projectId, `/publisher/extensions/${extensionId}/v/${version}`)})`));
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, await (0, marked_1.marked)(`[View in Console](${utils.consoleUrl(projectId, `/publisher/extensions/${extensionId}/v/${version}`)})`));
     }
     return res;
 }

package/lib/commands/ext-info.js

@@ -11,7 +11,7 @@ const logger_1 = require("../logger");
 const requirePermissions_1 = require("../requirePermissions");
 const utils = require("../utils");
 const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
+const marked_terminal_1 = require("marked-terminal");
 const FUNCTION_TYPE_REGEX = /\..+\.function/;
 exports.command = new command_1.Command("ext:info <extensionName>")
     .description("display information about an extension by name (extensionName@x.y.z for a specific version)")
@@ -108,10 +108,8 @@ exports.command = new command_1.Command("ext:info <extensionName>")
         logger_1.logger.info(lines.join("\n\n"));
     }
     else {
-        marked_1.marked.setOptions({
-            renderer: new TerminalRenderer(),
-        });
-        logger_1.logger.info((0, marked_1.marked)(lines.join("\n")));
+        marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
+        logger_1.logger.info(await (0, marked_1.marked)(lines.join("\n")));
         utils.logLabeledBullet(extensionsHelper_1.logPrefix, `to install this extension, type ` +
             clc.bold(`firebase ext:install ${extensionName} --project=YOUR_PROJECT`));
     }

package/lib/commands/ext-install.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const clc = require("colorette");
-const marked_1 = require("marked");
 const semver = require("semver");
-const TerminalRenderer = require("marked-terminal");
 const displayExtensionInfo_1 = require("../extensions/displayExtensionInfo");
 const askUserForEventsConfig = require("../extensions/askUserForEventsConfig");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
@@ -25,9 +23,6 @@ const track_1 = require("../track");
 const prompt_1 = require("../prompt");
 const manifest = require("../extensions/manifest");
 const tos_1 = require("../extensions/tos");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 exports.command = new command_1.Command("ext:install [extensionRef]")
     .description("add an uploaded extension to firebase.json if [publisherId/extensionId] is provided;" +
     "or, add a local extension if [localPath] is provided")

package/lib/commands/ext-uninstall.js

@@ -1,17 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const requirePermissions_1 = require("../requirePermissions");
 const utils_1 = require("../utils");
 const manifest = require("../extensions/manifest");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 exports.command = new command_1.Command("ext:uninstall <extensionInstanceId>")
     .description("uninstall an extension that is installed in your Firebase project by instance ID")
     .option("--local", "deprecated")

package/lib/commands/ext-update.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const clc = require("colorette");
-const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
 const error_1 = require("../error");
@@ -20,9 +18,6 @@ const prompt_1 = require("../prompt");
 const manifest = require("../extensions/manifest");
 const askUserForEventsConfig = require("../extensions/askUserForEventsConfig");
 const tos_1 = require("../extensions/tos");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 exports.command = new command_1.Command("ext:update <extensionInstanceId> [updateSource]")
     .description("update an existing extension instance to the latest version, or to a specific version if provided")
     .before(requirePermissions_1.requirePermissions, [

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

@@ -16,6 +16,9 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
     .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'")
+    .option("-k, --kms-key-name <kmsKeyName>", "The resource ID of a Cloud KMS key. If set, the database created will be a " +
+    "Customer-managed Encryption Key (CMEK) database encrypted with this key. " +
+    "This feature is allowlist only in initial launch.")
     .before(requirePermissions_1.requirePermissions, ["datastore.databases.create"])
     .before(commandUtils_1.warnEmulatorNotSupported, types_1.Emulators.FIRESTORE)
     .action(async (database, options) => {
@@ -42,7 +45,22 @@ exports.command = new command_1.Command("firestore:databases:create <database>")
     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);
+    let cmekConfig;
+    if (options.kmsKeyName) {
+        cmekConfig = {
+            kmsKeyName: options.kmsKeyName,
+        };
+    }
+    const createDatabaseReq = {
+        project: options.project,
+        databaseId: database,
+        locationId: options.location,
+        type,
+        deleteProtectionState,
+        pointInTimeRecoveryEnablement,
+        cmekConfig,
+    };
+    const databaseResp = await api.createDatabase(createDatabaseReq);
     if (options.json) {
         logger_1.logger.info(JSON.stringify(databaseResp, undefined, 2));
     }

package/lib/commands/functions-secrets-set.js

@@ -54,12 +54,15 @@ exports.command = new command_1.Command("functions:secrets:set <KEY>")
     (0, utils_1.logBullet)(`${endpointsToUpdate.length} functions are using stale version of secret ${secret.name}:\n\t` +
         endpointsToUpdate.map((e) => `${e.id}(${e.region})`).join("\n\t"));
     if (!options.force) {
-        const confirm = await (0, prompt_1.promptOnce)({
-            name: "redeploy",
-            type: "confirm",
-            default: true,
-            message: `Do you want to re-deploy the functions and destroy the stale version of secret ${secret.name}?`,
-        }, options);
+        let confirm = false;
+        if (!options.nonInteractive) {
+            confirm = await (0, prompt_1.promptOnce)({
+                name: "redeploy",
+                type: "confirm",
+                default: true,
+                message: `Do you want to re-deploy the functions and destroy the stale version of secret ${secret.name}?`,
+            }, options);
+        }
         if (!confirm) {
             (0, utils_1.logBullet)("Please deploy your functions for the change to take effect by running:\n\t" +
                 clc.bold("firebase deploy --only functions"));

package/lib/commands/hosting-channel-create.js

@@ -65,7 +65,7 @@ exports.command = new command_1.Command("hosting:channel:create [channelId]")
         await (0, api_1.addAuthDomains)(projectId, [channel.url]);
     }
     catch (e) {
-        (0, utils_1.logLabeledWarning)(LOG_TAG, (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
+        (0, utils_1.logLabeledWarning)(LOG_TAG, await (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
         logger_1.logger.debug("[hosting] unable to add auth domain", e);
     }
     logger_1.logger.info();

package/lib/commands/hosting-channel-delete.js

@@ -39,7 +39,7 @@ exports.command = new command_1.Command("hosting:channel:delete <channelId>")
             await (0, api_1.removeAuthDomain)(projectId, channel.url);
         }
         catch (e) {
-            (0, utils_1.logLabeledWarning)("hosting:channel", (0, marked_1.marked)(`Unable to remove channel domain from Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
+            (0, utils_1.logLabeledWarning)("hosting:channel", await (0, marked_1.marked)(`Unable to remove channel domain from Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
             logger_1.logger.debug("[hosting] unable to remove auth domain", e);
         }
     }

package/lib/commands/hosting-channel-deploy.js

@@ -133,7 +133,7 @@ async function syncAuthState(projectId, sites) {
         logger_1.logger.debug("[hosting] added auth domain for urls", urlNames);
     }
     catch (e) {
-        (0, utils_1.logLabeledWarning)(LOG_TAG, (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
+        (0, utils_1.logLabeledWarning)(LOG_TAG, await (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${(0, utils_1.consoleUrl)(projectId, "/authentication/providers")}`));
         logger_1.logger.debug("[hosting] unable to add auth domain", e);
     }
     try {

package/lib/commands/hosting-clone.js

@@ -8,7 +8,6 @@ const error_1 = require("../error");
 const api_1 = require("../hosting/api");
 const utils = require("../utils");
 const requireAuth_1 = require("../requireAuth");
-const marked_1 = require("marked");
 const logger_1 = require("../logger");
 exports.command = new command_1.Command("hosting:clone <source> <targetChannel>")
     .description("clone a version from one site to another")
@@ -68,7 +67,7 @@ For example, to copy the content for a site \`my-site\` from a preview channel \
             await (0, api_1.addAuthDomains)(tProjectId, [tChannel.url]);
         }
         catch (e) {
-            utils.logLabeledWarning("hosting:clone", (0, marked_1.marked)(`Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${utils.consoleUrl(targetSiteId, "/authentication/providers")}`));
+            utils.logLabeledWarning("hosting:clone", `Unable to add channel domain to Firebase Auth. Visit the Firebase Console at ${utils.consoleUrl(targetSiteId, "/authentication/providers")}`);
             logger_1.logger.debug("[hosting] unable to add auth domain", e);
         }
     }

package/lib/dataconnect/fileUtils.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
+exports.getPlatformFromFolder = exports.pickService = exports.readGQLFiles = exports.readConnectorYaml = exports.readDataConnectYaml = exports.readFirebaseJson = void 0;
 const fs = require("fs-extra");
 const path = require("path");
 const error_1 = require("../error");
+const types_1 = require("./types");
 const utils_1 = require("../utils");
 const load_1 = require("./load");
 function readFirebaseJson(config) {
@@ -92,3 +93,23 @@ async function pickService(projectId, config, serviceId) {
     return serviceInfo;
 }
 exports.pickService = pickService;
+const WEB_INDICATORS = ["package.json", "package-lock.json", "node_modules"];
+const IOS_INDICATORS = ["info.plist", "podfile", "package.swift"];
+const ANDROID_INDICATORS = ["androidmanifest.xml", "build.gradle"];
+const IOS_INDICATORS_2 = [".xcworkspace", ".xcodeproj"];
+async function getPlatformFromFolder(dirPath) {
+    const fileNames = await fs.readdir(dirPath);
+    for (const fileName of fileNames) {
+        const cleanedFileName = fileName.toLowerCase();
+        if (WEB_INDICATORS.some((indicator) => indicator === cleanedFileName))
+            return types_1.Platform.WEB;
+        if (ANDROID_INDICATORS.some((indicator) => indicator === cleanedFileName))
+            return types_1.Platform.ANDROID;
+        if (IOS_INDICATORS.some((indicator) => indicator === cleanedFileName))
+            return types_1.Platform.IOS;
+        if (IOS_INDICATORS_2.some((indicator) => cleanedFileName.endsWith(indicator)))
+            return types_1.Platform.IOS;
+    }
+    return types_1.Platform.UNDETERMINED;
+}
+exports.getPlatformFromFolder = getPlatformFromFolder;

package/lib/dataconnect/types.js

@@ -1,12 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDatasource = exports.requiresVector = exports.SCHEMA_ID = void 0;
+exports.toDatasource = exports.Platform = exports.requiresVector = exports.SCHEMA_ID = void 0;
 exports.SCHEMA_ID = "main";
 function requiresVector(dm) {
     var _a, _b, _c, _d;
     return (_d = (_c = (_b = (_a = dm === null || dm === void 0 ? void 0 : dm.primaryDataSource) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.requiredExtensions) === null || _c === void 0 ? void 0 : _c.includes("vector")) !== null && _d !== void 0 ? _d : false;
 }
 exports.requiresVector = requiresVector;
+var Platform;
+(function (Platform) {
+    Platform["ANDROID"] = "ANDROID";
+    Platform["WEB"] = "WEB";
+    Platform["IOS"] = "IOS";
+    Platform["UNDETERMINED"] = "UNDETERMINED";
+})(Platform = exports.Platform || (exports.Platform = {}));
 function toDatasource(projectId, locationId, ds) {
     if (ds.postgresql) {
         return {

package/lib/emulator/dataconnectEmulator.js

@@ -53,6 +53,8 @@ class DataConnectEmulator {
                 auto_download: this.args.auto_download,
                 listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
                 config_dir: resolvedConfigDir,
+                enable_output_schema_extensions: true,
+                enable_output_generated_sdk: true,
             });
             this.usingExistingEmulator = false;
         }

package/lib/emulator/downloadableEmulators.js

@@ -46,20 +46,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.3.1",
-            expectedSize: 24175424,
-            expectedChecksum: "9ce1ee2ed6994ca62df6dfef3fdece62",
+            version: "1.3.2",
+            expectedSize: 24195840,
+            expectedChecksum: "b60f4501c657bec4dc8df3f3ec7ab3fd",
         }
         : process.platform === "win32"
             ? {
-                version: "1.3.1",
-                expectedSize: 24587264,
-                expectedChecksum: "1d31fd26506cfc9b822fdb8e8834d14c",
+                version: "1.3.2",
+                expectedSize: 24610304,
+                expectedChecksum: "37d5e08f4df5e07b41160b8f2fd90135",
             }
             : {
-                version: "1.3.1",
-                expectedSize: 24088728,
-                expectedChecksum: "223f7eebde618ba92788579dd35fec43",
+                version: "1.3.2",
+                expectedSize: 24109208,
+                expectedChecksum: "52b09c69bc9a3a84b01a3a7311817229",
             },
 };
 exports.DownloadDetails = {
@@ -243,9 +243,8 @@ const Commands = {
         optionalArgs: [
             "listen",
             "config_dir",
-            "disable_sdk_generation",
-            "resolvers_emulator",
-            "rpc_retry_count",
+            "enable_output_schema_extensions",
+            "enable_output_generated_sdk",
         ],
         joinArgs: true,
         shell: false,

package/lib/extensions/askUserForParam.js

@@ -122,7 +122,7 @@ async function askForParam(args) {
     let secretLocations = [];
     const description = paramSpec.description || "";
     const label = paramSpec.label.trim();
-    logger_1.logger.info(`\n${clc.bold(label)}${clc.bold(paramSpec.required ? "" : " (Optional)")}: ${(0, marked_1.marked)(description).trim()}`);
+    logger_1.logger.info(`\n${clc.bold(label)}${clc.bold(paramSpec.required ? "" : " (Optional)")}: ${(await (0, marked_1.marked)(description)).trim()}`);
     while (!valid) {
         switch (paramSpec.type) {
             case types_1.ParamType.SELECT:

package/lib/extensions/change-log.js

@@ -5,16 +5,14 @@ const clc = require("colorette");
 const marked_1 = require("marked");
 const path = require("path");
 const semver = require("semver");
-const TerminalRenderer = require("marked-terminal");
+const marked_terminal_1 = require("marked-terminal");
 const Table = require("cli-table");
 const extensionsApi_1 = require("./extensionsApi");
 const localHelper_1 = require("./localHelper");
 const logger_1 = require("../logger");
 const refs = require("./refs");
 const utils_1 = require("../utils");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
+marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const EXTENSIONS_CHANGELOG = "CHANGELOG.md";
 const VERSION_LINE_REGEX = /##.+?(\d+\.\d+\.\d+(?:-((\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(\d+|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?).*/;
 async function getReleaseNotesForUpdate(args) {

package/lib/extensions/displayExtensionInfo.js

@@ -2,18 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retrieveRoleInfo = exports.displayResources = exports.displayEvents = exports.displayExternalServices = exports.displayExtensionVersionInfo = void 0;
 const clc = require("colorette");
-const marked_1 = require("marked");
 const semver = require("semver");
-const TerminalRenderer = require("marked-terminal");
 const path = require("path");
 const refs = require("../extensions/refs");
 const logger_1 = require("../logger");
 const types_1 = require("./types");
 const iam = require("../gcp/iam");
 const secretsUtils_1 = require("./secretsUtils");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 const TASKS_ROLE = "cloudtasks.enqueuer";
 const TASKS_API = "cloudtasks.googleapis.com";
 async function displayExtensionVersionInfo(args) {

package/lib/extensions/extensionsHelper.js

@@ -9,11 +9,9 @@ const fs = require("fs-extra");
 const node_fetch_1 = require("node-fetch");
 const path = require("path");
 const marked_1 = require("marked");
+const marked_terminal_1 = require("marked-terminal");
 const unzip_1 = require("./../unzip");
-const TerminalRenderer = require("marked-terminal");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
+marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 const api_1 = require("../api");
 const archiveDirectory_1 = require("../archiveDirectory");
 const utils_1 = require("./utils");
@@ -417,12 +415,12 @@ function validateReleaseNotes(rootDirectory, newVersion, extension) {
     catch (err) {
         throw new error_1.FirebaseError("No CHANGELOG.md file found. " +
             "Please create one and add an entry for this version. " +
-            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details."));
+            "See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details.");
     }
     if (!notes && !semver.prerelease(newVersion) && extension) {
         throw new error_1.FirebaseError(`No entry for version ${newVersion} found in CHANGELOG.md. ` +
             "Please add one so users know what has changed in this version. " +
-            (0, marked_1.marked)("See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details."));
+            "See https://firebase.google.com/docs/extensions/publishers/user-documentation#writing-changelog for more details.");
     }
     return notes;
 }
@@ -701,7 +699,7 @@ async function uploadExtensionVersionFromLocalSource(args) {
 }
 exports.uploadExtensionVersionFromLocalSource = uploadExtensionVersionFromLocalSource;
 function getMissingPublisherError(publisherId) {
-    return new error_1.FirebaseError((0, marked_1.marked)(`Couldn't find publisher ID '${clc.bold(publisherId)}'. Please ensure that you have registered this ID. For step-by-step instructions on getting started as a publisher, see https://firebase.google.com/docs/extensions/publishers/get-started.`));
+    return new error_1.FirebaseError(`Couldn't find publisher ID '${clc.bold(publisherId)}'. Please ensure that you have registered this ID. For step-by-step instructions on getting started as a publisher, see https://firebase.google.com/docs/extensions/publishers/get-started.`);
 }
 exports.getMissingPublisherError = getMissingPublisherError;
 async function createSourceFromLocation(projectId, sourceUri) {

package/lib/extensions/provisioningHelper.js

@@ -64,7 +64,7 @@ async function checkProducts(projectId, usedProducts) {
                     "without server-side code.\n";
             errorMessage += `   https://console.firebase.google.com/project/${projectId}/authentication/users`;
         }
-        throw new error_1.FirebaseError((0, marked_1.marked)(errorMessage), { exit: 2 });
+        throw new error_1.FirebaseError(await (0, marked_1.marked)(errorMessage), { exit: 2 });
     }
 }
 function getUsedProducts(spec) {

package/lib/extensions/updateHelper.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inferUpdateSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
 const clc = require("colorette");
 const semver = require("semver");
-const marked_1 = require("marked");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const extensionsApi = require("./extensionsApi");
@@ -47,7 +46,7 @@ function warningUpdateToOtherSource(sourceOrigin) {
         targetText = "URL";
     }
     const warning = `All the instance's resources and logic will be overwritten to use the source code and files from the ${targetText}.\n`;
-    logger_1.logger.info((0, marked_1.marked)(warning));
+    logger_1.logger.info(warning);
 }
 exports.warningUpdateToOtherSource = warningUpdateToOtherSource;
 async function update(updateOptions) {

package/lib/extensions/warnings.js

@@ -2,11 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.outOfBandChangesWarning = exports.displayWarningsForDeploy = void 0;
 const clc = require("colorette");
-const TerminalRenderer = require("marked-terminal");
-const marked_1 = require("marked");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
 const extensionsHelper_1 = require("./extensionsHelper");
 const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
 const planner_1 = require("../deploy/extensions/planner");
@@ -29,9 +24,9 @@ async function displayWarningsForDeploy(instancesToCreate) {
     const unpublishedExtensions = uploadedExtensionInstances.filter((i) => { var _a, _b; return ((_b = (_a = i.extensionVersion) === null || _a === void 0 ? void 0 : _a.listing) === null || _b === void 0 ? void 0 : _b.state) !== "APPROVED"; });
     if (unpublishedExtensions.length) {
         const humanReadableList = unpublishedExtensions.map(toListEntry).join("\n");
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, (0, marked_1.marked)(`The following extension versions have not been published to the Firebase Extensions Hub:\n${humanReadableList}\n.` +
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `The following extension versions have not been published to the Firebase Extensions Hub:\n${humanReadableList}\n.` +
             "Unpublished extensions have not been reviewed by " +
-            "Firebase. Please make sure you trust the extension publisher before installing this extension.", { gfm: false }));
+            "Firebase. Please make sure you trust the extension publisher before installing this extension.");
     }
     return unpublishedExtensions.length > 0;
 }

package/lib/firestore/api.js

@@ -420,15 +420,16 @@ class FirestoreApi {
         }
         return database;
     }
-    async createDatabase(project, databaseId, locationId, type, deleteProtectionState, pointInTimeRecoveryEnablement) {
-        const url = `/projects/${project}/databases`;
+    async createDatabase(req) {
+        const url = `/projects/${req.project}/databases`;
         const payload = {
-            type,
-            locationId,
-            deleteProtectionState,
-            pointInTimeRecoveryEnablement,
+            locationId: req.locationId,
+            type: req.type,
+            deleteProtectionState: req.deleteProtectionState,
+            pointInTimeRecoveryEnablement: req.pointInTimeRecoveryEnablement,
+            cmekConfig: req.cmekConfig,
         };
-        const options = { queryParams: { databaseId: databaseId } };
+        const options = { queryParams: { databaseId: req.databaseId } };
         const res = await this.apiClient.post(url, payload, options);
         const database = res.body.response;
         if (!database) {

package/lib/firestore/pretty-print.js

@@ -33,13 +33,33 @@ class PrettyPrint {
         logger_1.logger.info(table.toString());
     }
     prettyPrintDatabase(database) {
+        let colValueWidth = Math.max(50, 5 + database.name.length);
+        if (database.cmekConfig) {
+            colValueWidth = Math.max(140, 20 + database.cmekConfig.kmsKeyName.length);
+        }
         const table = new Table({
             head: ["Field", "Value"],
-            colWidths: [25, Math.max(50, 5 + database.name.length)],
+            colWidths: [30, colValueWidth],
         });
         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)]);
+        if (database.cmekConfig) {
+            table.push(["KMS Key Name", clc.yellow(database.cmekConfig.kmsKeyName)]);
+            if (database.cmekConfig.activeKeyVersion) {
+                table.push([
+                    "Active Key Versions",
+                    clc.yellow(this.prettyStringArray(database.cmekConfig.activeKeyVersion)),
+                ]);
+            }
+        }
         logger_1.logger.info(table.toString());
     }
+    prettyStringArray(stringArray) {
+        let result = "";
+        stringArray.forEach((str) => {
+            result += `${str}\n`;
+        });
+        return result;
+    }
     prettyPrintBackups(backups) {
         if (backups.length === 0) {
             logger_1.logger.info("No backups found.");

package/lib/firestore/pretty-print.test.js

@@ -51,3 +51,11 @@ describe("firebaseConsoleDatabaseUrl", () => {
         (0, chai_1.expect)(printer.firebaseConsoleDatabaseUrl("example-project", "(default)")).to.equal("https://console.firebase.google.com/project/example-project/firestore/databases/-default-/data");
     });
 });
+describe("prettyStringArray", () => {
+    it("should correctly print an array of strings", () => {
+        (0, chai_1.expect)(printer.prettyStringArray(["kms-key-1", "kms-key-2"])).to.equal("kms-key-1\nkms-key-2\n");
+    });
+    it("should print nothing if the array is empty", () => {
+        (0, chai_1.expect)(printer.prettyStringArray([])).to.equal("");
+    });
+});

package/lib/init/features/dataconnect/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.actuate = exports.doSetup = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
 const prompt_1 = require("../../../prompt");
@@ -20,7 +20,7 @@ const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/sche
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
 const MUTATIONS_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/mutations.gql");
 const defaultConnector = {
-    id: "default-connector",
+    id: "default",
     files: [
         {
             path: "queries.gql",
@@ -33,6 +33,13 @@ const defaultConnector = {
     ],
 };
 async function doSetup(setup, config) {
+    const info = await askQuestions(setup, config);
+    await actuate(setup, config, info);
+    logger_1.logger.info("");
+    (0, utils_1.logSuccess)(`If you'd like to generate an SDK for your new connector, run ${clc.bold("firebase init dataconnect:sdk")}`);
+}
+exports.doSetup = doSetup;
+async function askQuestions(setup, config) {
     var _a, _b, _c;
     let info = {
         serviceId: "",
@@ -43,6 +50,7 @@ async function doSetup(setup, config) {
         isNewDatabase: false,
         connectors: [defaultConnector],
         schemaGql: [],
+        shouldProvisionCSQL: false,
     };
     info = await promptForService(setup, info);
     if (info.cloudSqlInstanceId === "") {
@@ -59,13 +67,17 @@ async function doSetup(setup, config) {
         default: defaultConnectionString,
     });
     setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
-    await writeFiles(config, info);
-    if (setup.projectId &&
+    info.shouldProvisionCSQL = !!(setup.projectId &&
         (info.isNewInstance || info.isNewDatabase) &&
         (await (0, prompt_1.confirm)({
             message: "Would you like to provision your CloudSQL instance and database now? This will take a few minutes.",
             default: true,
-        }))) {
+        })));
+    return info;
+}
+async function actuate(setup, config, info) {
+    await writeFiles(config, info);
+    if (setup.projectId && info.shouldProvisionCSQL) {
         await (0, provisionCloudSql_1.provisionCloudSql)({
             projectId: setup.projectId,
             locationId: info.locationId,
@@ -75,12 +87,11 @@ async function doSetup(setup, config) {
             waitForCreation: false,
         });
     }
-    logger_1.logger.info("");
-    (0, utils_1.logSuccess)(`If you'd like to generate an SDK for your new connector, run ${clc.bold("firebase init dataconnect:sdk")}`);
 }
-exports.doSetup = doSetup;
+exports.actuate = actuate;
 async function writeFiles(config, info) {
     const dir = config.get("dataconnect.source") || "dataconnect";
+    console.log(dir);
     const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorIds: info.connectors.map((c) => `"./${c.id}"`).join(", ") }));
     config.set("dataconnect", { source: dir });
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);

package/lib/init/features/dataconnect/sdk.js

@@ -10,6 +10,7 @@ const load_1 = require("../../../dataconnect/load");
 const logger_1 = require("../../../logger");
 const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
 const error_1 = require("../../../error");
+const lodash_1 = require("lodash");
 const IOS = "ios";
 const WEB = "web";
 const ANDROID = "android";
@@ -40,15 +41,21 @@ async function askQuestions(setup, config) {
         type: "list",
         choices: connectorChoices,
     });
-    const platforms = await (0, prompt_1.promptOnce)({
-        message: "Which platforms do you want to set up a generated SDK for?",
-        type: "checkbox",
-        choices: [
-            { name: "iOS (Swift)", value: IOS },
-            { name: "Web (JavaScript)", value: WEB },
-            { name: "Androd (Kotlin)", value: ANDROID },
-        ],
-    });
+    let platforms = [];
+    while (!platforms.length) {
+        platforms = await (0, prompt_1.promptOnce)({
+            message: "Which platforms do you want to set up a generated SDK for?",
+            type: "checkbox",
+            choices: [
+                { name: "iOS (Swift)", value: IOS },
+                { name: "Web (JavaScript)", value: WEB },
+                { name: "Androd (Kotlin)", value: ANDROID },
+            ],
+        });
+        if (!platforms.length) {
+            logger_1.logger.info("You must pick at least one platform.");
+        }
+    }
     const newConnectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
     if (!newConnectorYaml.generate) {
         newConnectorYaml.generate = {};
@@ -58,9 +65,10 @@ async function askQuestions(setup, config) {
             message: `What directory do you want to write your Swift SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
             type: "input",
             default: ((_a = newConnectorYaml.generate.swiftSdk) === null || _a === void 0 ? void 0 : _a.outputDir) ||
-                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/swift-sdk`,
+                `./../gensdk/${newConnectorYaml.connectorId}/swift-sdk`,
         });
-        const swiftSdk = { outputDir };
+        const pkg = (0, lodash_1.camelCase)(newConnectorYaml.connectorId);
+        const swiftSdk = { outputDir, package: pkg };
         newConnectorYaml.generate.swiftSdk = swiftSdk;
     }
     if (platforms.includes(WEB)) {
@@ -68,13 +76,9 @@ async function askQuestions(setup, config) {
             message: `What directory do you want to write your JavaScript SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
             type: "input",
             default: ((_b = newConnectorYaml.generate.javascriptSdk) === null || _b === void 0 ? void 0 : _b.outputDir) ||
-                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/javascript-sdk`,
-        });
-        const pkg = await (0, prompt_1.promptOnce)({
-            message: "What package name do you want to use for your JavaScript SDK?",
-            type: "input",
-            default: (_d = (_c = newConnectorYaml.generate.javascriptSdk) === null || _c === void 0 ? void 0 : _c.package) !== null && _d !== void 0 ? _d : `@firebasegen/${connectorInfo.connectorYaml.connectorId}`,
+                `./../gensdk/${newConnectorYaml.connectorId}/javascript-sdk`,
         });
+        const pkg = (_d = (_c = newConnectorYaml.generate.javascriptSdk) === null || _c === void 0 ? void 0 : _c.package) !== null && _d !== void 0 ? _d : `@firebasegen/${connectorInfo.connectorYaml.connectorId}`;
         const packageJSONDir = await (0, prompt_1.promptOnce)({
             message: "Which directory contains the package.json that you would like to add the JavaScript SDK dependency to? (Leave blank to skip)",
             type: "input",
@@ -94,13 +98,9 @@ async function askQuestions(setup, config) {
             message: `What directory do you want to write your Kotlin SDK code to? (If not absolute, path will be relative to '${connectorInfo.directory}')`,
             type: "input",
             default: ((_f = newConnectorYaml.generate.kotlinSdk) === null || _f === void 0 ? void 0 : _f.outputDir) ||
-                `./../.dataconnect/generated/${newConnectorYaml.connectorId}/kotlin-sdk/src/main/kotlin/${newConnectorYaml.connectorId}`,
-        });
-        const pkg = await (0, prompt_1.promptOnce)({
-            message: "What package name do you want to use for your Kotlin SDK?",
-            type: "input",
-            default: (_h = (_g = newConnectorYaml.generate.kotlinSdk) === null || _g === void 0 ? void 0 : _g.package) !== null && _h !== void 0 ? _h : `com.google.firebase.dataconnect.connectors.${connectorInfo.connectorYaml.connectorId}`,
+                `./../gensdk/${newConnectorYaml.connectorId}/kotlin-sdk`,
         });
+        const pkg = (_h = (_g = newConnectorYaml.generate.kotlinSdk) === null || _g === void 0 ? void 0 : _g.package) !== null && _h !== void 0 ? _h : `connectors.${(0, lodash_1.snakeCase)(connectorInfo.connectorYaml.connectorId)}`;
         const kotlinSdk = {
             outputDir,
             package: pkg,

package/lib/rulesDeploy.js

@@ -71,12 +71,13 @@ class RulesDeploy {
             if (await (0, resourceManager_1.serviceAccountHasRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true)) {
                 return;
             }
-            const addRole = await (0, prompt_1.promptOnce)({
-                type: "confirm",
-                name: "rulesRole",
-                message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
-                default: true,
-            }, this.options);
+            const addRole = this.options.force ||
+                (await (0, prompt_1.promptOnce)({
+                    type: "confirm",
+                    name: "rulesRole",
+                    message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
+                    default: true,
+                }, this.options));
             if (addRole) {
                 await (0, resourceManager_1.addServiceAccountToRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true);
                 utils.logLabeledBullet(RulesetType[this.type], "updated service account for cross-service rules...");
@@ -118,12 +119,13 @@ class RulesDeploy {
             utils.logLabeledBullet(RulesetType[this.type], "quota exceeded error while uploading rules");
             const history = await gcp.rules.listAllRulesets(this.options.project);
             if (history.length > RULESET_COUNT_LIMIT) {
-                const confirm = await (0, prompt_1.promptOnce)({
-                    type: "confirm",
-                    name: "force",
-                    message: `You have ${history.length} rules, do you want to delete the oldest ${RULESETS_TO_GC} to free up space?`,
-                    default: false,
-                }, this.options);
+                const confirm = this.options.force ||
+                    (await (0, prompt_1.promptOnce)({
+                        type: "confirm",
+                        name: "force",
+                        message: `You have ${history.length} rules, do you want to delete the oldest ${RULESETS_TO_GC} to free up space?`,
+                        default: false,
+                    }, this.options));
                 if (confirm) {
                     const releases = await gcp.rules.listAllReleases(this.options.project);
                     const unreleased = history.filter((ruleset) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.14.2",
+  "version": "13.15.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -94,8 +94,8 @@
     "leven": "^3.1.0",
     "libsodium-wrappers": "^0.7.10",
     "lodash": "^4.17.21",
-    "marked": "^4.0.14",
-    "marked-terminal": "^5.1.1",
+    "marked": "^13.0.2",
+    "marked-terminal": "^7.0.0",
     "mime": "^2.5.2",
     "minimatch": "^3.0.4",
     "morgan": "^1.10.0",

package/lib/extensions/billingMigrationHelper.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayNode10CreateBillingNotice = exports.displayNode10UpdateBillingNotice = void 0;
-const marked_1 = require("marked");
-const TerminalRenderer = require("marked-terminal");
-const error_1 = require("../error");
-const extensionsHelper_1 = require("./extensionsHelper");
-const prompt_1 = require("../prompt");
-const utils = require("../utils");
-const utils_1 = require("./utils");
-marked_1.marked.setOptions({
-    renderer: new TerminalRenderer(),
-});
-const urlPricingExamples = "https://cloud.google.com/functions/pricing#pricing_examples";
-const urlFAQ = "https://firebase.google.com/support/faq/#extensions-pricing";
-const billingMsgUpdate = "This update includes an upgrade to Node.js 10 from Node.js 8, which is no" +
-    " longer maintained. Starting with this update, you will be charged a" +
-    " small amount (typically around $0.01/month) for the Firebase resources" +
-    " required by this extension (even if it is not used), in addition to any" +
-    " charges associated with its usage.\n\n" +
-    `See pricing examples: **[${urlPricingExamples}](${urlPricingExamples})**\n` +
-    `See the FAQ: **[${urlFAQ}](${urlFAQ})**\n`;
-const billingMsgCreate = "You will be charged around $0.01/month for the Firebase resources" +
-    " required by this extension (even if it is not used). Additionally," +
-    " using this extension will contribute to your project's overall usage" +
-    " level of Firebase services. However, you'll only be charged for usage" +
-    " that exceeds Firebase's free tier for those services.\n\n" +
-    `See pricing examples: **[${urlPricingExamples}](${urlPricingExamples})**\n` +
-    `See the FAQ: **[${urlFAQ}](${urlFAQ})**\n`;
-const defaultSpecVersion = "v1beta";
-const defaultRuntimes = {
-    v1beta: "nodejs8",
-};
-function hasRuntime(spec, runtime) {
-    const specVersion = spec.specVersion || defaultSpecVersion;
-    const defaultRuntime = defaultRuntimes[specVersion];
-    const resources = spec.resources || [];
-    return resources.some((r) => runtime === ((0, utils_1.getResourceRuntime)(r) || defaultRuntime));
-}
-function displayNode10UpdateBillingNotice(curSpec, newSpec) {
-    if (hasRuntime(curSpec, "nodejs8") && hasRuntime(newSpec, "nodejs10")) {
-        utils.logLabeledWarning(extensionsHelper_1.logPrefix, (0, marked_1.marked)(billingMsgUpdate));
-    }
-}
-exports.displayNode10UpdateBillingNotice = displayNode10UpdateBillingNotice;
-async function displayNode10CreateBillingNotice(spec, prompt) {
-    if (hasRuntime(spec, "nodejs10")) {
-        utils.logLabeledWarning(extensionsHelper_1.logPrefix, (0, marked_1.marked)(billingMsgCreate));
-        if (prompt) {
-            const continueUpdate = await (0, prompt_1.promptOnce)({
-                type: "confirm",
-                message: "Do you wish to continue?",
-                default: true,
-            });
-            if (!continueUpdate) {
-                throw new error_1.FirebaseError(`Cancelled.`, { exit: 2 });
-            }
-        }
-    }
-}
-exports.displayNode10CreateBillingNotice = displayNode10CreateBillingNotice;