firebase-tools 11.4.0 → 11.5.0

package/lib/emulator/storage/metadata.js

@@ -287,15 +287,15 @@ class CloudStorageObjectMetadata {
 }
 exports.CloudStorageObjectMetadata = CloudStorageObjectMetadata;
 function toSerializedDate(d) {
-    const day = `${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, "0")}-${d
-        .getDate()
+    const day = `${d.getUTCFullYear()}-${(d.getUTCMonth() + 1).toString().padStart(2, "0")}-${d
+        .getUTCDate()
         .toString()
         .padStart(2, "0")}`;
-    const time = `${d.getHours().toString().padStart(2, "0")}:${d
-        .getMinutes()
+    const time = `${d.getUTCHours().toString().padStart(2, "0")}:${d
+        .getUTCMinutes()
         .toString()
-        .padStart(2, "0")}:${d.getSeconds().toString().padStart(2, "0")}.${d
-        .getMilliseconds()
+        .padStart(2, "0")}:${d.getUTCSeconds().toString().padStart(2, "0")}.${d
+        .getUTCMilliseconds()
         .toString()
         .padStart(3, "0")}`;
     return `${day}T${time}Z`;

package/lib/emulator/storage/multipart.js

@@ -23,7 +23,8 @@ function splitBufferByDelimiter(buffer, delimiter, maxResults = -1) {
     return bufferParts;
 }
 function parseMultipartRequestBody(boundaryId, body) {
-    const boundaryString = `--${boundaryId}`;
+    const cleanBoundaryId = boundaryId.replace(/^["'](.+(?=["']$))["']$/, "$1");
+    const boundaryString = `--${cleanBoundaryId}`;
     const bodyParts = splitBufferByDelimiter(body, boundaryString).map((buf) => {
         return Buffer.from(buf.slice(2));
     });
@@ -35,8 +36,8 @@ function parseMultipartRequestBody(boundaryId, body) {
 }
 function parseMultipartRequestBodyPart(bodyPart) {
     const sections = splitBufferByDelimiter(bodyPart, LINE_SEPARATOR, 3);
-    const contentTypeRaw = sections[0].toString();
-    if (!contentTypeRaw.startsWith("Content-Type: ")) {
+    const contentTypeRaw = sections[0].toString().toLowerCase();
+    if (!contentTypeRaw.startsWith("content-type: ")) {
         throw new Error(`Failed to parse multipart request body part. Missing content type.`);
     }
     const dataRaw = Buffer.from(sections[2]).slice(0, sections[2].byteLength - LINE_SEPARATOR.length);

package/lib/emulator/storage/persistence.js

@@ -4,9 +4,12 @@ exports.Persistence = void 0;
 const fs_1 = require("fs");
 const rimraf = require("rimraf");
 const fs = require("fs");
+const fse = require("fs-extra");
 const path = require("path");
+const uuid = require("uuid");
 class Persistence {
     constructor(dirPath) {
+        this._diskPathMap = new Map();
         this.reset(dirPath);
     }
     reset(dirPath) {
@@ -14,22 +17,18 @@ class Persistence {
         (0, fs_1.mkdirSync)(dirPath, {
             recursive: true,
         });
+        this._diskPathMap = new Map();
     }
     get dirPath() {
         return this._dirPath;
     }
     appendBytes(fileName, bytes) {
-        const filepath = this.getDiskPath(fileName);
-        let fd;
-        try {
-            fs.appendFileSync(filepath, bytes);
-            return filepath;
-        }
-        finally {
-            if (fd) {
-                (0, fs_1.closeSync)(fd);
-            }
+        if (!this._diskPathMap.has(fileName)) {
+            this._diskPathMap.set(fileName, this.generateNewDiskName());
         }
+        const filepath = this.getDiskPath(fileName);
+        fs.appendFileSync(filepath, bytes);
+        return filepath;
     }
     readBytes(fileName, size, fileOffset) {
         let fd;
@@ -55,6 +54,7 @@ class Persistence {
                 throw err;
             }
         }
+        this._diskPathMap.delete(fileName);
     }
     deleteAll() {
         return new Promise((resolve, reject) => {
@@ -63,16 +63,30 @@ class Persistence {
                     reject(err);
                 }
                 else {
+                    this._diskPathMap = new Map();
                     resolve();
                 }
             });
         });
     }
     renameFile(oldName, newName) {
-        (0, fs_1.renameSync)(this.getDiskPath(oldName), this.getDiskPath(newName));
+        const oldNameId = this.getDiskFileName(oldName);
+        this._diskPathMap.set(newName, oldNameId);
+        this._diskPathMap.delete(oldName);
     }
     getDiskPath(fileName) {
-        return path.join(this._dirPath, encodeURIComponent(fileName));
+        const shortenedDiskPath = this.getDiskFileName(fileName);
+        return path.join(this._dirPath, encodeURIComponent(shortenedDiskPath));
+    }
+    getDiskFileName(fileName) {
+        return this._diskPathMap.get(fileName);
+    }
+    copyFromExternalPath(sourcePath, newName) {
+        this._diskPathMap.set(newName, this.generateNewDiskName());
+        fse.copyFileSync(sourcePath, this.getDiskPath(newName));
+    }
+    generateNewDiskName() {
+        return uuid.v4();
     }
 }
 exports.Persistence = Persistence;

package/lib/emulator/storage/rules/runtime.js

@@ -199,6 +199,7 @@ class StorageRulesRuntime {
                 service: "firebase.storage",
                 path: opts.path,
                 method: opts.method,
+                delimiter: opts.delimiter,
                 variables: runtimeVariables,
             },
         };
@@ -293,7 +294,6 @@ function createRequestExpressionValue(opts) {
                 segments: opts.path
                     .split("/")
                     .filter((s) => s)
-                    .slice(3)
                     .map((simple) => ({
                     simple,
                 })),

package/lib/emulator/storage/rules/utils.js

@@ -5,13 +5,14 @@ const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 function getFirebaseRulesValidator(rulesetProvider) {
     return {
-        validate: async (path, bucketId, method, variableOverrides, authorization) => {
+        validate: async (path, bucketId, method, variableOverrides, authorization, delimiter) => {
             return await isPermitted({
                 ruleset: rulesetProvider(bucketId),
                 file: variableOverrides,
                 path,
                 method,
                 authorization,
+                delimiter,
             });
         },
     };
@@ -19,7 +20,7 @@ function getFirebaseRulesValidator(rulesetProvider) {
 exports.getFirebaseRulesValidator = getFirebaseRulesValidator;
 function getAdminOnlyFirebaseRulesValidator() {
     return {
-        validate: (_path, _bucketId, _method, _variableOverrides, _authorization) => {
+        validate: (_path, _bucketId, _method, _variableOverrides, _authorization, delimiter) => {
             return Promise.resolve(true);
         },
     };
@@ -42,6 +43,7 @@ async function isPermitted(opts) {
         path: opts.path,
         file: opts.file,
         token: opts.authorization ? opts.authorization.split(" ")[1] : undefined,
+        delimiter: opts.delimiter,
     });
     if (issues.exist()) {
         issues.all.forEach((warningOrError) => {

package/lib/emulator/types.js

@@ -56,6 +56,7 @@ exports.EMULATORS_SUPPORTED_BY_USE_EMULATOR = [
     Emulators.DATABASE,
     Emulators.FIRESTORE,
     Emulators.FUNCTIONS,
+    Emulators.STORAGE,
 ];
 exports.ALL_EMULATORS = [
     Emulators.HUB,

package/lib/ensureApiEnabled.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableApiURI = exports.ensure = exports.check = exports.POLL_SETTINGS = void 0;
-const cli_color_1 = require("cli-color");
+const colorette_1 = require("colorette");
 const track_1 = require("./track");
 const api_1 = require("./api");
 const apiv2_1 = require("./apiv2");
@@ -21,7 +21,7 @@ async function check(projectId, apiName, prefix, silent = false) {
     });
     const isEnabled = res.body.state === "ENABLED";
     if (isEnabled && !silent) {
-        utils.logLabeledSuccess(prefix, `required API ${(0, cli_color_1.bold)(apiName)} is enabled`);
+        utils.logLabeledSuccess(prefix, `required API ${(0, colorette_1.bold)(apiName)} is enabled`);
     }
     return isEnabled;
 }
@@ -34,7 +34,7 @@ async function enable(projectId, apiName) {
     }
     catch (err) {
         if ((0, error_1.isBillingError)(err)) {
-            throw new error_1.FirebaseError(`Your project ${(0, cli_color_1.bold)(projectId)} must be on the Blaze (pay-as-you-go) plan to complete this command. Required API ${(0, cli_color_1.bold)(apiName)} can't be enabled until the upgrade is complete. To upgrade, visit the following URL:
+            throw new error_1.FirebaseError(`Your project ${(0, colorette_1.bold)(projectId)} must be on the Blaze (pay-as-you-go) plan to complete this command. Required API ${(0, colorette_1.bold)(apiName)} can't be enabled until the upgrade is complete. To upgrade, visit the following URL:
 
 https://console.firebase.google.com/project/${projectId}/usage/details`);
         }
@@ -54,27 +54,27 @@ async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRe
         return;
     }
     if (!silent) {
-        utils.logLabeledBullet(prefix, `waiting for API ${(0, cli_color_1.bold)(apiName)} to activate...`);
+        utils.logLabeledBullet(prefix, `waiting for API ${(0, colorette_1.bold)(apiName)} to activate...`);
     }
     return pollCheckEnabled(projectId, apiName, prefix, silent, enablementRetries, pollRetries + 1);
 }
 async function enableApiWithRetries(projectId, apiName, prefix, silent, enablementRetries = 0) {
     if (enablementRetries > 1) {
-        throw new error_1.FirebaseError(`Timed out waiting for API ${(0, cli_color_1.bold)(apiName)} to enable. Please try again in a few minutes.`);
+        throw new error_1.FirebaseError(`Timed out waiting for API ${(0, colorette_1.bold)(apiName)} to enable. Please try again in a few minutes.`);
     }
     await enable(projectId, apiName);
     return pollCheckEnabled(projectId, apiName, prefix, silent, enablementRetries);
 }
 async function ensure(projectId, apiName, prefix, silent = false) {
     if (!silent) {
-        utils.logLabeledBullet(prefix, `ensuring required API ${(0, cli_color_1.bold)(apiName)} is enabled...`);
+        utils.logLabeledBullet(prefix, `ensuring required API ${(0, colorette_1.bold)(apiName)} is enabled...`);
     }
     const isEnabled = await check(projectId, apiName, prefix, silent);
     if (isEnabled) {
         return;
     }
     if (!silent) {
-        utils.logLabeledWarning(prefix, `missing required API ${(0, cli_color_1.bold)(apiName)}. Enabling now...`);
+        utils.logLabeledWarning(prefix, `missing required API ${(0, colorette_1.bold)(apiName)}. Enabling now...`);
     }
     return enableApiWithRetries(projectId, apiName, prefix, silent);
 }

package/lib/extensions/askUserForConsent.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptForPublisherTOS = exports.displayApis = exports.displayRoles = exports.retrieveRoleInfo = exports.formatDescription = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const error_1 = require("../error");

package/lib/extensions/askUserForEventsConfig.js

@@ -4,7 +4,7 @@ exports.askForEventArcLocation = exports.askShouldCollectEventsConfig = exports.
 const prompt_1 = require("../prompt");
 const extensionsApi = require("../extensions/extensionsApi");
 const utils = require("../utils");
-const clc = require("cli-color");
+const clc = require("colorette");
 const logger_1 = require("../logger");
 const { marked } = require("marked");
 function checkAllowedEventTypesResponse(response, validEvents) {

package/lib/extensions/askUserForParam.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInquirerDefault = exports.promptCreateSecret = exports.askForParam = exports.ask = exports.checkResponse = exports.SecretLocation = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const types_1 = require("./types");
 const secretManagerApi = require("../gcp/secretManager");

package/lib/extensions/changelog.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseChangelog = exports.getLocalChangelog = exports.breakingChangesInUpdate = exports.displayReleaseNotes = exports.getReleaseNotesForUpdate = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const path = require("path");
 const semver = require("semver");
@@ -39,7 +39,7 @@ function displayReleaseNotes(releaseNotes, fromVersion) {
     const table = new Table({ head: ["Version", "What's New"], style: { head: ["yellow", "bold"] } });
     for (const [version, note] of Object.entries(releaseNotes)) {
         if (breakingVersions.includes(version)) {
-            table.push([clc.yellow.bold(version), marked(note)]);
+            table.push([clc.yellow(clc.bold(version)), marked(note)]);
         }
         else {
             table.push([version, marked(note)]);

package/lib/extensions/checkProjectBilling.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enableBilling = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const opn = require("open");
 const cloudbilling = require("../gcp/cloudbilling");
 const error_1 = require("../error");
@@ -59,7 +59,7 @@ async function setUpBillingAccount(projectId) {
     logger_1.logger.info();
     logger_1.logger.info(`Extension require your project to be upgraded to the Blaze plan. Please visit the following link to add a billing account:`);
     logger_1.logger.info();
-    logger_1.logger.info(clc.bold.underline(billingURL));
+    logger_1.logger.info(clc.bold(clc.underline(billingURL)));
     logger_1.logger.info();
     const open = await prompt.promptOnce({
         name: "open-url",

package/lib/extensions/displayExtensionInfo.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printSourceDownloadLink = exports.displayUpdateChangesRequiringConfirmation = exports.displayUpdateChangesNoInput = exports.displayExtInfo = void 0;
-const _ = require("lodash");
-const clc = require("cli-color");
+exports.printSourceDownloadLink = exports.displayExtInfo = void 0;
+const clc = require("colorette");
 const { marked } = require("marked");
 const TerminalRenderer = require("marked-terminal");
 const utils = require("../utils");
@@ -12,8 +11,6 @@ const error_1 = require("../error");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-const additionColor = clc.green;
-const deletionColor = clc.red;
 function displayExtInfo(extensionName, publisher, spec, published = false) {
     const lines = [];
     lines.push(`**Name**: ${spec.displayName}`);
@@ -46,103 +43,6 @@ function displayExtInfo(extensionName, publisher, spec, published = false) {
     }
 }
 exports.displayExtInfo = displayExtInfo;
-function displayUpdateChangesNoInput(spec, newSpec) {
-    var _a, _b, _c, _d;
-    const lines = [];
-    if (spec.displayName !== newSpec.displayName) {
-        lines.push("", "**Name:**", deletionColor(`- ${spec.displayName}`), additionColor(`+ ${newSpec.displayName}`));
-    }
-    if (((_a = spec.author) === null || _a === void 0 ? void 0 : _a.authorName) !== ((_b = newSpec.author) === null || _b === void 0 ? void 0 : _b.authorName)) {
-        lines.push("", "**Author:**", deletionColor(`- ${(_c = spec.author) === null || _c === void 0 ? void 0 : _c.authorName}`), additionColor(`+ ${(_d = spec.author) === null || _d === void 0 ? void 0 : _d.authorName}`));
-    }
-    if (spec.description !== newSpec.description) {
-        lines.push("", "**Description:**", deletionColor(`- ${spec.description}`), additionColor(`+ ${newSpec.description}`));
-    }
-    if (spec.sourceUrl !== newSpec.sourceUrl) {
-        lines.push("", "**Source code:**", deletionColor(`- ${spec.sourceUrl}`), additionColor(`+ ${newSpec.sourceUrl}`));
-    }
-    if (spec.billingRequired && !newSpec.billingRequired) {
-        lines.push("", "**Billing is no longer required for this extension.**");
-    }
-    logger_1.logger.info(marked(lines.join("\n")));
-    return lines;
-}
-exports.displayUpdateChangesNoInput = displayUpdateChangesNoInput;
-async function displayUpdateChangesRequiringConfirmation(args) {
-    const equals = (a, b) => {
-        return _.isEqual(a, b);
-    };
-    if (args.spec.license !== args.newSpec.license) {
-        const message = "\n" +
-            "**License**\n" +
-            deletionColor(args.spec.license ? `- ${args.spec.license}\n` : "- None\n") +
-            additionColor(args.newSpec.license ? `+ ${args.newSpec.license}\n` : "+ None\n");
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'License'.");
-        }
-    }
-    const apisDiffDeletions = _.differenceWith(args.spec.apis, _.get(args.newSpec, "apis", []), equals);
-    const apisDiffAdditions = _.differenceWith(args.newSpec.apis, _.get(args.spec, "apis", []), equals);
-    if (apisDiffDeletions.length || apisDiffAdditions.length) {
-        let message = "\n**APIs:**\n";
-        apisDiffDeletions.forEach((api) => {
-            message += deletionColor(`- ${api.apiName} (${api.reason})\n`);
-        });
-        apisDiffAdditions.forEach((api) => {
-            message += additionColor(`+ ${api.apiName} (${api.reason})\n`);
-        });
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'APIs'.");
-        }
-    }
-    const resourcesDiffDeletions = _.differenceWith(args.spec.resources, _.get(args.newSpec, "resources", []), compareResources);
-    const resourcesDiffAdditions = _.differenceWith(args.newSpec.resources, _.get(args.spec, "resources", []), compareResources);
-    if (resourcesDiffDeletions.length || resourcesDiffAdditions.length) {
-        let message = "\n**Resources:**\n";
-        resourcesDiffDeletions.forEach((resource) => {
-            message += deletionColor(` - ${getResourceReadableName(resource)}`);
-        });
-        resourcesDiffAdditions.forEach((resource) => {
-            message += additionColor(`+ ${getResourceReadableName(resource)}`);
-        });
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'Resources'.");
-        }
-    }
-    const rolesDiffDeletions = _.differenceWith(args.spec.roles, _.get(args.newSpec, "roles", []), equals);
-    const rolesDiffAdditions = _.differenceWith(args.newSpec.roles, _.get(args.spec, "roles", []), equals);
-    if (rolesDiffDeletions.length || rolesDiffAdditions.length) {
-        let message = "\n**Permissions:**\n";
-        rolesDiffDeletions.forEach((role) => {
-            message += deletionColor(`- ${role.role} (${role.reason})\n`);
-        });
-        rolesDiffAdditions.forEach((role) => {
-            message += additionColor(`+ ${role.role} (${role.reason})\n`);
-        });
-        logger_1.logger.info(message);
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'Permissions'.");
-        }
-    }
-    if (!args.spec.billingRequired && args.newSpec.billingRequired) {
-        logger_1.logger.info("Billing is now required for the new version of this extension.");
-        if (!(await (0, extensionsHelper_1.confirm)({ nonInteractive: args.nonInteractive, force: args.force, default: true }))) {
-            throw new error_1.FirebaseError("Unable to update this extension instance without explicit consent for the change to 'BillingRequired'.");
-        }
-    }
-}
-exports.displayUpdateChangesRequiringConfirmation = displayUpdateChangesRequiringConfirmation;
-function compareResources(resource1, resource2) {
-    return resource1.name === resource2.name && resource1.type === resource2.type;
-}
-function getResourceReadableName(resource) {
-    return resource.type === "firebaseextensions.v1beta.function"
-        ? `${resource.name} (Cloud Function): ${resource.description}\n`
-        : `${resource.name} (${resource.type})\n`;
-}
 function printSourceDownloadLink(sourceDownloadUri) {
     const sourceDownloadMsg = `Want to review the source code that will be installed? Download it here: ${sourceDownloadUri}`;
     utils.logBullet(marked(sourceDownloadMsg));

package/lib/extensions/emulator/triggerHelper.js

@@ -12,8 +12,8 @@ function functionResourceToEmulatedTriggerDefintion(resource) {
         platform: "gcfv1",
     };
     const properties = resource.properties || {};
-    proto.renameIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
-    proto.renameIfPresent(etd, properties, "regions", "location", (str) => [str]);
+    proto.convertIfPresent(etd, properties, "timeoutSeconds", "timeout", proto.secondsFromDuration);
+    proto.convertIfPresent(etd, properties, "regions", "location", (str) => [str]);
     proto.copyIfPresent(etd, properties, "availableMemoryMb");
     if (properties.httpsTrigger) {
         etd.httpsTrigger = properties.httpsTrigger;

package/lib/extensions/extensionsApi.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtension = exports.deleteExtension = exports.unpublishExtension = exports.publishExtensionVersion = exports.undeprecateExtensionVersion = exports.deprecateExtensionVersion = exports.registerPublisherProfile = exports.getPublisherProfile = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = void 0;
 const yaml = require("js-yaml");
-const clc = require("cli-color");
+const clc = require("colorette");
 const { marked } = require("marked");
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");

package/lib/extensions/extensionsHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canonicalizeRefInput = exports.diagnoseAndFixProject = exports.confirm = exports.getSourceOrigin = exports.isLocalOrURLPath = exports.isLocalPath = exports.isUrlPath = exports.instanceIdExists = exports.promptForRepeatInstance = exports.promptForOfficialExtension = exports.displayReleaseNotes = exports.getPublisherProjectFromName = exports.createSourceFromLocation = exports.publishExtensionVersionFromLocalSource = exports.ensureExtensionsApiEnabled = exports.promptForValidInstanceId = exports.validateSpec = exports.validateCommandLineParams = exports.populateDefaultParams = exports.substituteParams = exports.getFirebaseProjectParams = exports.getDBInstanceFromURL = exports.resourceTypeToNiceName = exports.AUTOPOULATED_PARAM_PLACEHOLDERS = exports.EXTENSIONS_BUCKET_NAME = exports.URL_REGEX = exports.logPrefix = exports.SourceOrigin = exports.SpecParamType = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ora = require("ora");
 const semver = require("semver");
 const { marked } = require("marked");

package/lib/extensions/listExtensions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listExtensions = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const Table = require("cli-table");
 const extensionsApi_1 = require("./extensionsApi");
 const logger_1 = require("../logger");

package/lib/extensions/manifest.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.showPostDeprecationNotice = exports.readInstanceParam = exports.getInstanceRef = exports.getInstanceTarget = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeLocalSecrets = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const path = require("path");
 const refs = require("./refs");
 const config_1 = require("../config");

package/lib/extensions/metricsUtils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildMetricsTableRow = exports.parseBucket = exports.parseTimeseriesResponse = void 0;
 const semver = require("semver");
-const clc = require("cli-color");
+const clc = require("colorette");
 function parseTimeseriesResponse(series) {
     const ret = [];
     for (const s of series) {

package/lib/extensions/paramHelper.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readEnvFile = exports.promptForNewParams = exports.getParamsForUpdate = exports.getParams = exports.getParamsWithCurrentValuesAsDefaults = exports.setNewDefaults = exports.buildBindingOptionsWithBaseValue = exports.getBaseParamBindings = void 0;
 const path = require("path");
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const logger_1 = require("../logger");

package/lib/extensions/updateHelper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inferUpdateSource = exports.updateFromPublisherSource = exports.updateToVersionFromPublisherSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.displayChanges = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
-const clc = require("cli-color");
+exports.inferUpdateSource = exports.updateFromPublisherSource = exports.updateToVersionFromPublisherSource = exports.updateFromUrlSource = exports.updateFromLocalSource = exports.update = exports.warningUpdateToOtherSource = exports.getExistingSourceOrigin = void 0;
+const clc = require("colorette");
 const semver = require("semver");
 const { marked } = require("marked");
 const error_1 = require("../error");
@@ -52,12 +52,6 @@ function warningUpdateToOtherSource(sourceOrigin) {
     logger_1.logger.info(marked(warning));
 }
 exports.warningUpdateToOtherSource = warningUpdateToOtherSource;
-async function displayChanges(args) {
-    utils.logLabeledBullet("extensions", "This update contains the following changes:");
-    (0, displayExtensionInfo_1.displayUpdateChangesNoInput)(args.spec, args.newSpec);
-    await (0, displayExtensionInfo_1.displayUpdateChangesRequiringConfirmation)(args);
-}
-exports.displayChanges = displayChanges;
 async function update(updateOptions) {
     const { projectId, instanceId, source, extRef, params, canEmitEvents, allowedEventTypes, eventarcChannel, } = updateOptions;
     if (extRef) {
@@ -126,7 +120,7 @@ async function updateToVersionFromPublisherSource(projectId, instanceId, extVers
         source = await extensionsApi.getExtensionVersion(extVersionRef);
     }
     catch (err) {
-        throw new error_1.FirebaseError(`Could not find source '${clc.bold(extVersionRef)}' because (${clc.bold(version)}) is not a published version. To update, use the latest version of this extension (${clc.bold(extension.latestVersion)}).`);
+        throw new error_1.FirebaseError(`Could not find source '${clc.bold(extVersionRef)}' because (${clc.bold(version || "")}) is not a published version. To update, use the latest version of this extension (${clc.bold(extension.latestVersion || "")}).`);
     }
     showUpdateVersionInfo(instanceId, existingSpec.version, source.spec.version, extVersionRef);
     warningUpdateToOtherSource(extensionsHelper_1.SourceOrigin.PUBLISHED_EXTENSION);

package/lib/extensions/warnings.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.outOfBandChangesWarning = exports.paramsFlagDeprecationWarning = exports.displayWarningsForDeploy = exports.displayWarningPrompts = void 0;
 const { marked } = require("marked");
-const clc = require("cli-color");
+const clc = require("colorette");
 const types_1 = require("./types");
 const displayExtensionInfo_1 = require("./displayExtensionInfo");
 const extensionsHelper_1 = require("./extensionsHelper");
@@ -20,7 +20,7 @@ function displayEAPWarning({ publisherId, sourceDownloadUri, githubLink, }) {
     (0, displayExtensionInfo_1.printSourceDownloadLink)(sourceDownloadUri);
 }
 function displayExperimentalWarning() {
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`${clc.yellow.bold("Important")}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
+    utils.logLabeledBullet(extensionsHelper_1.logPrefix, marked(`${clc.yellow(clc.bold("Important"))}: This extension is ${clc.bold("experimental")} and may not be production-ready. Its functionality might change in backward-incompatible ways before its official release, or it may be discontinued.`));
 }
 async function displayWarningPrompts(publisherId, launchStage, extensionVersion) {
     const trustedPublishers = await (0, resolveSource_1.getTrustedPublishers)();

package/lib/fetchMOTD.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchMOTD = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const semver = require("semver");
 const apiv2_1 = require("./apiv2");
 const configstore_1 = require("./configstore");

package/lib/firestore/delete.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreDelete = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const ProgressBar = require("progress");
 const apiv2 = require("../apiv2");
 const firestore = require("../gcp/firestore");

package/lib/firestore/indexes.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirestoreIndexes = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 const validator = require("./validator");
@@ -345,7 +345,7 @@ class FirestoreIndexes {
             return result;
         }
         if (spec.indexes[0].collectionId) {
-            utils.logBullet(clc.bold.cyan("firestore:") +
+            utils.logBullet(clc.bold(clc.cyan("firestore:")) +
                 " your indexes indexes are specified in the v1beta1 API format. " +
                 "Please upgrade to the new index API format by running " +
                 clc.bold("firebase firestore:indexes") +

package/lib/firestore/validator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertEnum = exports.assertHasOneOf = exports.assertHas = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../error");
 function assertHas(obj, prop) {
     const objString = clc.cyan(JSON.stringify(obj));

package/lib/functional.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
+exports.nullsafeVisitor = exports.mapObject = exports.partition = exports.assertExhaustive = exports.zipIn = exports.zip = exports.reduceFlat = exports.flatten = exports.flattenArray = exports.flattenObject = void 0;
 function* flattenObject(obj) {
     function* helper(path, obj) {
         for (const [k, v] of Object.entries(obj)) {
@@ -63,3 +63,18 @@ function partition(arr, callbackFn) {
     }, [[], []]);
 }
 exports.partition = partition;
+function mapObject(input, transform) {
+    const result = {};
+    for (const [k, v] of Object.entries(input)) {
+        result[k] = transform(v);
+    }
+    return result;
+}
+exports.mapObject = mapObject;
+const nullsafeVisitor = (func, ...rest) => (first) => {
+    if (first === null) {
+        return null;
+    }
+    return func(first, ...rest);
+};
+exports.nullsafeVisitor = nullsafeVisitor;