firebase-tools 11.4.1 → 11.6.0

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");
@@ -291,13 +291,14 @@ async function listExtensions(publisherId) {
     return extensions;
 }
 exports.listExtensions = listExtensions;
-async function listExtensionVersions(ref, filter = "") {
+async function listExtensionVersions(ref, filter = "", showPrereleases = false) {
     const { publisherId, extensionId } = refs.parse(ref);
     const extensionVersions = [];
     const getNextPage = async (pageToken = "") => {
         const res = await apiClient.get(`/publishers/${publisherId}/extensions/${extensionId}/versions`, {
             queryParams: {
                 filter,
+                showPrereleases: String(showPrereleases),
                 pageSize: PAGE_SIZE_MAX,
                 pageToken,
             },

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");
+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.incrementPrereleaseVersion = 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("colorette");
 const ora = require("ora");
 const semver = require("semver");
 const { marked } = require("marked");
@@ -282,6 +282,33 @@ async function archiveAndUploadSource(extPath, bucketName) {
     const res = await (0, storage_1.uploadObject)(zippedSource, bucketName);
     return `/${res.bucket}/${res.object}`;
 }
+async function incrementPrereleaseVersion(ref, extensionVersion, stage) {
+    var _a;
+    const stageOptions = ["stable", "alpha", "beta", "rc"];
+    if (!stageOptions.includes(stage)) {
+        throw new error_1.FirebaseError(`--stage flag only supports the following values: ${stageOptions}`);
+    }
+    if (stage !== "stable") {
+        const version = semver.parse(extensionVersion);
+        if (version.prerelease.length > 0 || version.build.length > 0) {
+            throw new error_1.FirebaseError(`Cannot combine the --stage flag with a version with a prerelease annotation in extension.yaml.`);
+        }
+        let extensionVersions = [];
+        try {
+            extensionVersions = await (0, extensionsApi_1.listExtensionVersions)(ref, `id="${version.version}"`, true);
+        }
+        catch (e) {
+        }
+        const latestVersion = (_a = extensionVersions
+            .map((version) => semver.parse(version.spec.version))
+            .filter((version) => version.prerelease.length > 0 && version.prerelease[0] === stage)
+            .sort((v1, v2) => semver.compare(v1, v2))
+            .pop()) !== null && _a !== void 0 ? _a : `${version}-${stage}`;
+        return semver.inc(latestVersion, "prerelease", undefined, stage);
+    }
+    return extensionVersion;
+}
+exports.incrementPrereleaseVersion = incrementPrereleaseVersion;
 async function publishExtensionVersionFromLocalSource(args) {
     const extensionSpec = await (0, localHelper_1.getLocalExtensionSpec)(args.rootDirectory);
     if (extensionSpec.name !== args.extensionId) {
@@ -290,6 +317,7 @@ async function publishExtensionVersionFromLocalSource(args) {
     const subbedSpec = JSON.parse(JSON.stringify(extensionSpec));
     subbedSpec.params = substituteParams(extensionSpec.params || [], exports.AUTOPOULATED_PARAM_PLACEHOLDERS);
     validateSpec(subbedSpec);
+    extensionSpec.version = await incrementPrereleaseVersion(`${args.publisherId}/${args.extensionId}`, extensionSpec.version, args.stage);
     let extension;
     try {
         extension = await (0, extensionsApi_1.getExtension)(`${args.publisherId}/${args.extensionId}`);

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;

package/lib/functions/env.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadFirebaseEnvs = exports.loadUserEnvs = exports.writeUserEnvs = exports.hasUserEnvs = exports.parseStrict = exports.validateKey = exports.KeyValidationError = exports.parse = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const fs = require("fs");
 const path = require("path");
 const error_1 = require("../error");
@@ -173,7 +173,7 @@ function writeUserEnvs(toWrite, envOpts) {
         }
     }
     const mostSpecificEnv = path.join(functionsSource, envFiles[envFiles.length - 1]);
-    (0, utils_1.logBullet)(clc.cyan.bold("functions: ") + `Writing new parameter values to disk: ${mostSpecificEnv}`);
+    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) + `Writing new parameter values to disk: ${mostSpecificEnv}`);
     for (const k of Object.keys(toWrite)) {
         fs.appendFileSync(mostSpecificEnv, formatUserEnvForWrite(k, toWrite[k]));
     }
@@ -219,7 +219,7 @@ function loadUserEnvs({ functionsSource, projectId, projectAlias, isEmulator, })
             });
         }
     }
-    (0, utils_1.logBullet)(clc.cyan.bold("functions: ") + `Loaded environment variables from ${envFiles.join(", ")}.`);
+    (0, utils_1.logBullet)(clc.cyan(clc.bold("functions: ")) + `Loaded environment variables from ${envFiles.join(", ")}.`);
     return envs;
 }
 exports.loadUserEnvs = loadUserEnvs;

package/lib/functions/runtimeConfigExport.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDotenvFilename = exports.toDotenvFormat = exports.hydrateEnvs = exports.configToEnv = exports.convertKey = exports.hydrateConfigs = exports.getProjectInfos = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const env = require("./env");
 const functionsConfig = require("../functionsConfig");
 const error_1 = require("../error");

package/lib/functionsConfig.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseUnsetArgs = exports.parseSetArgs = exports.materializeAll = exports.materializeConfig = exports.setVariablesRecursive = exports.getFirebaseConfig = exports.getAppEngineLocation = exports.idsToVarName = exports.varNameToIds = exports.ensureApi = exports.RESERVED_NAMESPACES = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const api_1 = require("./api");
 const apiv2_1 = require("./apiv2");
 const ensureApiEnabled_1 = require("./ensureApiEnabled");

package/lib/functionsConfigClone.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionsConfigClone = void 0;
 const _ = require("lodash");
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("./error");
 const functionsConfig = require("./functionsConfig");
 const runtimeconfig = require("./gcp/runtimeconfig");

package/lib/functionsShellCommandAction.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.actionFunction = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const repl = require("repl");
 const _ = require("lodash");
 const request = require("request");

package/lib/gcp/cloudfunctions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.listFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.BLOCKING_LABEL = exports.CODEBASE_LABEL = exports.API_VERSION = void 0;
-const clc = require("cli-color");
+const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const backend = require("../deploy/functions/backend");
@@ -26,10 +26,10 @@ const BLOCKING_EVENT_TO_LABEL_KEY = {
 function functionsOpLogReject(funcName, type, err) {
     var _a, _b;
     if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode) === 429) {
-        utils.logWarning(`${clc.bold.yellow("functions:")} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
+        utils.logWarning(`${clc.bold(clc.yellow("functions:"))} got "Quota Exceeded" error while trying to ${type} ${funcName}. Waiting to retry...`);
     }
     else {
-        utils.logWarning(clc.bold.yellow("functions:") + " failed to " + type + " function " + funcName);
+        utils.logWarning(clc.bold(clc.yellow("functions:")) + " failed to " + type + " function " + funcName);
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${funcName}`, {
         original: err,
@@ -255,18 +255,20 @@ function endpointFromFunction(gcfFunction) {
     if (securityLevel) {
         endpoint.securityLevel = securityLevel;
     }
-    proto.copyIfPresent(endpoint, gcfFunction, "serviceAccountEmail", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
-    proto.renameIfPresent(endpoint, gcfFunction, "timeoutSeconds", "timeout", proto.secondsFromDuration);
+    proto.copyIfPresent(endpoint, gcfFunction, "minInstances", "maxInstances", "ingressSettings", "labels", "environmentVariables", "secretEnvironmentVariables", "sourceUploadUrl");
+    proto.renameIfPresent(endpoint, gcfFunction, "serviceAccount", "serviceAccountEmail");
+    proto.convertIfPresent(endpoint, gcfFunction, "availableMemoryMb", (raw) => raw);
+    proto.convertIfPresent(endpoint, gcfFunction, "timeoutSeconds", "timeout", (dur) => dur === null ? null : proto.secondsFromDuration(dur));
     if (gcfFunction.vpcConnector) {
         endpoint.vpc = { connector: gcfFunction.vpcConnector };
-        proto.renameIfPresent(endpoint.vpc, gcfFunction, "egressSettings", "vpcConnectorEgressSettings");
+        proto.convertIfPresent(endpoint.vpc, gcfFunction, "egressSettings", "vpcConnectorEgressSettings", (raw) => raw);
     }
     endpoint.codebase = ((_g = gcfFunction.labels) === null || _g === void 0 ? void 0 : _g[exports.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
     return endpoint;
 }
 exports.endpointFromFunction = endpointFromFunction;
 function functionFromEndpoint(endpoint, sourceUploadUrl) {
-    var _a;
+    var _a, _b;
     if (endpoint.platform !== "gcfv1") {
         throw new error_1.FirebaseError("Trying to create a v1 CloudFunction with v2 API. This should never happen");
     }
@@ -281,8 +283,13 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
         runtime: endpoint.runtime,
         dockerRegistry: "ARTIFACT_REGISTRY",
     };
-    proto.copyIfPresent(gcfFunction, endpoint, "labels");
+    if (typeof endpoint.labels !== "undefined") {
+        gcfFunction.labels = Object.assign({}, endpoint.labels);
+    }
     if (backend.isEventTriggered(endpoint)) {
+        if (!((_a = endpoint.eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.resource)) {
+            throw new error_1.FirebaseError("Cannot create v1 function from an eventTrigger without a resource");
+        }
         gcfFunction.eventTrigger = {
             eventType: endpoint.eventTrigger.eventType,
             resource: endpoint.eventTrigger.eventFilters.resource,
@@ -316,18 +323,24 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
             gcfFunction.httpsTrigger.securityLevel = endpoint.securityLevel;
         }
     }
-    proto.copyIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "availableMemoryMb", "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
-    proto.renameIfPresent(gcfFunction, endpoint, "timeout", "timeoutSeconds", proto.durationFromSeconds);
+    proto.copyIfPresent(gcfFunction, endpoint, "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
+    proto.renameIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "serviceAccount");
+    proto.convertIfPresent(gcfFunction, endpoint, "availableMemoryMb", (mem) => mem);
+    proto.convertIfPresent(gcfFunction, endpoint, "timeout", "timeoutSeconds", (sec) => sec ? proto.durationFromSeconds(sec) : null);
     if (endpoint.vpc) {
         proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnector", "connector");
         proto.renameIfPresent(gcfFunction, endpoint.vpc, "vpcConnectorEgressSettings", "egressSettings");
     }
+    else if (endpoint.vpc === null) {
+        gcfFunction.vpcConnector = null;
+        gcfFunction.vpcConnectorEgressSettings = null;
+    }
     const codebase = endpoint.codebase || projectConfig.DEFAULT_CODEBASE;
     if (codebase !== projectConfig.DEFAULT_CODEBASE) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [exports.CODEBASE_LABEL]: codebase });
     }
     else {
-        (_a = gcfFunction.labels) === null || _a === void 0 ? true : delete _a[exports.CODEBASE_LABEL];
+        (_b = gcfFunction.labels) === null || _b === void 0 ? true : delete _b[exports.CODEBASE_LABEL];
     }
     return gcfFunction;
 }