firebase-tools 15.1.0 → 15.2.0

package/lib/deploy/extensions/deploy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploy = void 0;
+exports.deploy = deploy;
 const tasks = require("./tasks");
 const queue_1 = require("../../throttler/queue");
 const error_1 = require("../../error");
@@ -10,13 +10,12 @@ const provisioningHelper_1 = require("../../extensions/provisioningHelper");
 const secrets_1 = require("./secrets");
 const validate_1 = require("./validate");
 async function deploy(context, options, payload) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, validate_1.checkBilling)(projectId, options.nonInteractive);
     await (0, provisioningHelper_1.bulkCheckProductsProvisioned)(projectId, [
-        ...((_a = payload.instancesToCreate) !== null && _a !== void 0 ? _a : []),
-        ...((_b = payload.instancesToUpdate) !== null && _b !== void 0 ? _b : []),
-        ...((_c = payload.instancesToConfigure) !== null && _c !== void 0 ? _c : []),
+        ...(payload.instancesToCreate ?? []),
+        ...(payload.instancesToUpdate ?? []),
+        ...(payload.instancesToConfigure ?? []),
     ]);
     if (context.have) {
         await (0, secrets_1.handleSecretParams)(payload, context.have, options.nonInteractive);
@@ -27,15 +26,15 @@ async function deploy(context, options, payload) {
         concurrency: 5,
         handler: tasks.extensionsDeploymentHandler(errorHandler),
     });
-    for (const create of (_e = (_d = payload.instancesToCreate) === null || _d === void 0 ? void 0 : _d.filter((i) => !!i.ref)) !== null && _e !== void 0 ? _e : []) {
+    for (const create of payload.instancesToCreate?.filter((i) => !!i.ref) ?? []) {
         const task = tasks.createExtensionInstanceTask(projectId, create, true);
         void validationQueue.run(task);
     }
-    for (const update of (_g = (_f = payload.instancesToUpdate) === null || _f === void 0 ? void 0 : _f.filter((i) => !!i.ref)) !== null && _g !== void 0 ? _g : []) {
+    for (const update of payload.instancesToUpdate?.filter((i) => !!i.ref) ?? []) {
         const task = tasks.updateExtensionInstanceTask(projectId, update, true);
         void validationQueue.run(task);
     }
-    for (const configure of (_j = (_h = payload.instancesToConfigure) === null || _h === void 0 ? void 0 : _h.filter((i) => !!i.ref)) !== null && _j !== void 0 ? _j : []) {
+    for (const configure of payload.instancesToConfigure?.filter((i) => !!i.ref) ?? []) {
         const task = tasks.configureExtensionInstanceTask(projectId, configure, true);
         void validationQueue.run(task);
     }
@@ -48,4 +47,3 @@ async function deploy(context, options, payload) {
         throw new error_1.FirebaseError(`Extensions deployment failed validation. No changes have been made to the Extension instances on ${projectId}`);
     }
 }
-exports.deploy = deploy;

package/lib/deploy/extensions/deploymentSummary.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deletesSummary = exports.configuresSummary = exports.updatesSummary = exports.createsSummary = exports.humanReadable = void 0;
+exports.humanReadable = void 0;
+exports.createsSummary = createsSummary;
+exports.updatesSummary = updatesSummary;
+exports.configuresSummary = configuresSummary;
+exports.deletesSummary = deletesSummary;
 const clc = require("colorette");
 const refs = require("../../extensions/refs");
 const humanReadable = (dep) => `${clc.bold(dep.instanceId)} (${dep.ref ? `${refs.toExtensionVersionRef(dep.ref)}` : `Installed from local source`})`;
 exports.humanReadable = humanReadable;
 const humanReadableUpdate = (from, to) => {
-    var _a;
     if (from.ref &&
         to.ref &&
         from.ref.publisherId === to.ref.publisherId &&
         from.ref.extensionId === to.ref.extensionId) {
-        return `\t${clc.bold(from.instanceId)} (${refs.toExtensionVersionRef(from.ref)} => ${((_a = to.ref) === null || _a === void 0 ? void 0 : _a.version) || ""})`;
+        return `\t${clc.bold(from.instanceId)} (${refs.toExtensionVersionRef(from.ref)} => ${to.ref?.version || ""})`;
     }
     else {
         const fromRef = from.ref
@@ -27,7 +30,6 @@ function createsSummary(toCreate) {
         ? `The following extension instances will be created:\n${instancesToCreate}\n`
         : "";
 }
-exports.createsSummary = createsSummary;
 function updatesSummary(toUpdate, have) {
     const instancesToUpdate = toUpdate
         .map((to) => {
@@ -42,14 +44,12 @@ function updatesSummary(toUpdate, have) {
         ? `The following extension instances will be updated:\n${instancesToUpdate}\n`
         : "";
 }
-exports.updatesSummary = updatesSummary;
 function configuresSummary(toConfigure) {
     const instancesToConfigure = toConfigure.map((s) => `\t${(0, exports.humanReadable)(s)}`).join("\n");
     return toConfigure.length
         ? `The following extension instances will be configured:\n${instancesToConfigure}\n`
         : "";
 }
-exports.configuresSummary = configuresSummary;
 function deletesSummary(toDelete, isDynamic) {
     const instancesToDelete = toDelete.map((s) => `\t${(0, exports.humanReadable)(s)}`).join("\n");
     const definedLocation = isDynamic ? "your local source code" : "'firebase.json'";
@@ -57,4 +57,3 @@ function deletesSummary(toDelete, isDynamic) {
         ? `The following extension instances are found in your project but do not exist in ${definedLocation}:\n${instancesToDelete}\n`
         : "";
 }
-exports.deletesSummary = deletesSummary;

package/lib/deploy/extensions/planner.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveVersion = exports.want = exports.wantDynamic = exports.have = exports.haveDynamic = exports.getExtensionSpec = exports.getExtension = exports.getExtensionVersion = void 0;
+exports.getExtensionVersion = getExtensionVersion;
+exports.getExtension = getExtension;
+exports.getExtensionSpec = getExtensionSpec;
+exports.haveDynamic = haveDynamic;
+exports.have = have;
+exports.wantDynamic = wantDynamic;
+exports.want = want;
+exports.resolveVersion = resolveVersion;
 const semver = require("semver");
 const extensionsApi = require("../../extensions/extensionsApi");
 const refs = require("../../extensions/refs");
@@ -21,7 +28,6 @@ async function getExtensionVersion(i) {
     }
     return i.extensionVersion;
 }
-exports.getExtensionVersion = getExtensionVersion;
 async function getExtension(i) {
     if (!i.ref) {
         throw new error_1.FirebaseError(`Can't get Extension for ${i.instanceId} because it has no ref`);
@@ -31,7 +37,6 @@ async function getExtension(i) {
     }
     return i.extension;
 }
-exports.getExtension = getExtension;
 async function getExtensionSpec(i) {
     if (!i.extensionSpec) {
         if (i.ref) {
@@ -51,12 +56,10 @@ async function getExtensionSpec(i) {
     }
     return i.extensionSpec;
 }
-exports.getExtensionSpec = getExtensionSpec;
 async function haveDynamic(projectId) {
     return (await extensionsApi.listInstances(projectId))
-        .filter((i) => { var _a; return ((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"; })
+        .filter((i) => i.labels?.createdBy === "SDK")
         .map((i) => {
-        var _a;
         const instanceId = i.name.split("/").pop();
         if (!instanceId) {
             throw new error_1.FirebaseError(`Internal error getting instanceId from ${i.name}`);
@@ -64,7 +67,7 @@ async function haveDynamic(projectId) {
         const dep = {
             instanceId,
             params: i.config.params,
-            systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
+            systemParams: i.config.systemParams ?? {},
             allowedEventTypes: i.config.allowedEventTypes,
             eventarcChannel: i.config.eventarcChannel,
             etag: i.etag,
@@ -78,12 +81,10 @@ async function haveDynamic(projectId) {
         return dep;
     });
 }
-exports.haveDynamic = haveDynamic;
 async function have(projectId) {
     return (await extensionsApi.listInstances(projectId))
-        .filter((i) => { var _a; return !(((_a = i.labels) === null || _a === void 0 ? void 0 : _a.createdBy) === "SDK"); })
+        .filter((i) => !(i.labels?.createdBy === "SDK"))
         .map((i) => {
-        var _a;
         const instanceId = i.name.split("/").pop();
         if (!instanceId) {
             throw new error_1.FirebaseError(`Internal error getting instanceId from ${i.name}`);
@@ -91,7 +92,7 @@ async function have(projectId) {
         const dep = {
             instanceId,
             params: i.config.params,
-            systemParams: (_a = i.config.systemParams) !== null && _a !== void 0 ? _a : {},
+            systemParams: i.config.systemParams ?? {},
             allowedEventTypes: i.config.allowedEventTypes,
             eventarcChannel: i.config.eventarcChannel,
             etag: i.etag,
@@ -107,7 +108,6 @@ async function have(projectId) {
         return dep;
     });
 }
-exports.have = have;
 async function wantDynamic(args) {
     const instanceSpecs = [];
     const errors = [];
@@ -156,7 +156,6 @@ async function wantDynamic(args) {
     }
     return instanceSpecs;
 }
-exports.wantDynamic = wantDynamic;
 async function want(args) {
     const instanceSpecs = [];
     const errors = [];
@@ -217,20 +216,19 @@ async function want(args) {
     }
     return instanceSpecs;
 }
-exports.want = want;
 async function resolveVersion(ref, extension) {
     const extensionRef = refs.toExtensionRef(ref);
-    if (!ref.version && (extension === null || extension === void 0 ? void 0 : extension.latestApprovedVersion)) {
+    if (!ref.version && extension?.latestApprovedVersion) {
         return extension.latestApprovedVersion;
     }
     if (ref.version === "latest-approved") {
-        if (!(extension === null || extension === void 0 ? void 0 : extension.latestApprovedVersion)) {
+        if (!extension?.latestApprovedVersion) {
             throw new error_1.FirebaseError(`${extensionRef} has not been published to Extensions Hub (https://extensions.dev). To install it, you must specify the version you want to install.`);
         }
         return extension.latestApprovedVersion;
     }
     if (!ref.version || ref.version === "latest") {
-        if (!(extension === null || extension === void 0 ? void 0 : extension.latestVersion)) {
+        if (!extension?.latestVersion) {
             throw new error_1.FirebaseError(`${extensionRef} has no stable non-deprecated versions. If you wish to install a prerelease version, you must specify the version you want to install.`);
         }
         return extension.latestVersion;
@@ -245,4 +243,3 @@ async function resolveVersion(ref, extension) {
     }
     return maxSatisfying;
 }
-exports.resolveVersion = resolveVersion;

package/lib/deploy/extensions/prepare.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepare = exports.prepareDynamicExtensions = void 0;
+exports.prepareDynamicExtensions = prepareDynamicExtensions;
+exports.prepare = prepare;
 const planner = require("./planner");
 const deploymentSummary = require("./deploymentSummary");
 const prompt = require("../../prompt");
@@ -29,7 +30,6 @@ const isConfigure = (dep) => (test) => {
     return dep.instanceId === test.instanceId && refs.equal(dep.ref, test.ref);
 };
 async function prepareHelper(context, options, payload, wantExtensions, haveExtensions, isDynamic) {
-    var _a, _b;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     context.want = wantExtensions;
     context.have = haveExtensions;
@@ -50,18 +50,18 @@ async function prepareHelper(context, options, payload, wantExtensions, haveExte
             }
         }
     }
-    const usingSecrets = await Promise.all((_a = context.want) === null || _a === void 0 ? void 0 : _a.map(secrets_1.checkSpecForSecrets));
+    const usingSecrets = await Promise.all(context.want?.map(secrets_1.checkSpecForSecrets));
     if (usingSecrets.some((i) => i)) {
         await (0, secretsUtils_1.ensureSecretManagerApiEnabled)(options);
     }
-    const usingV2Functions = await Promise.all((_b = context.want) === null || _b === void 0 ? void 0 : _b.map(v2FunctionHelper_1.checkSpecForV2Functions));
+    const usingV2Functions = await Promise.all(context.want?.map(v2FunctionHelper_1.checkSpecForV2Functions));
     if (usingV2Functions) {
         await (0, v2FunctionHelper_1.ensureNecessaryV2ApisAndRoles)(options);
     }
-    payload.instancesToCreate = context.want.filter((i) => { var _a; return !((_a = context.have) === null || _a === void 0 ? void 0 : _a.some(matchesInstanceId(i))); });
-    payload.instancesToConfigure = context.want.filter((i) => { var _a; return (_a = context.have) === null || _a === void 0 ? void 0 : _a.some(isConfigure(i)); });
-    payload.instancesToUpdate = context.want.filter((i) => { var _a; return (_a = context.have) === null || _a === void 0 ? void 0 : _a.some(isUpdate(i)); });
-    payload.instancesToDelete = context.have.filter((i) => { var _a; return !((_a = context.want) === null || _a === void 0 ? void 0 : _a.some(matchesInstanceId(i))); });
+    payload.instancesToCreate = context.want.filter((i) => !context.have?.some(matchesInstanceId(i)));
+    payload.instancesToConfigure = context.want.filter((i) => context.have?.some(isConfigure(i)));
+    payload.instancesToUpdate = context.want.filter((i) => context.have?.some(isUpdate(i)));
+    payload.instancesToDelete = context.have.filter((i) => !context.want?.some(matchesInstanceId(i)));
     if (await (0, warnings_1.displayWarningsForDeploy)(payload.instancesToCreate)) {
         if (!(await prompt.confirm({
             message: `Do you wish to continue deploying these extension instances?`,
@@ -126,7 +126,7 @@ async function prepareDynamicExtensions(context, options, payload, builds) {
     await (0, extensionsHelper_1.ensureExtensionsApiEnabled)(options);
     await (0, requirePermissions_1.requirePermissions)(options, ["firebaseextensions.instances.list"]);
     let haveExtensions = await planner.haveDynamic(projectId);
-    haveExtensions = haveExtensions.filter((e) => { var _a; return (0, common_1.extensionMatchesAnyFilter)((_a = e.labels) === null || _a === void 0 ? void 0 : _a.codebase, e.instanceId, filters); });
+    haveExtensions = haveExtensions.filter((e) => (0, common_1.extensionMatchesAnyFilter)(e.labels?.codebase, e.instanceId, filters));
     if (Object.keys(extensions).length === 0 && haveExtensions.length === 0) {
         return;
     }
@@ -137,7 +137,6 @@ async function prepareDynamicExtensions(context, options, payload, builds) {
     });
     return prepareHelper(context, options, payload, dynamicWant, haveExtensions, true);
 }
-exports.prepareDynamicExtensions = prepareDynamicExtensions;
 async function prepare(context, options, payload) {
     context.extensionsStartTime = Date.now();
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -156,4 +155,3 @@ async function prepare(context, options, payload) {
     const haveExtensions = await planner.have(projectId);
     return prepareHelper(context, options, payload, wantExtensions, haveExtensions, false);
 }
-exports.prepare = prepare;

package/lib/deploy/extensions/release.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.release = void 0;
+exports.release = release;
 const queue_1 = require("../../throttler/queue");
 const tasks = require("./tasks");
 const planner = require("./planner");
@@ -10,7 +10,6 @@ const projectUtils_1 = require("../../projectUtils");
 const etags_1 = require("../../extensions/etags");
 const track_1 = require("../../track");
 async function release(context, options, payload) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     if (!payload.instancesToCreate &&
         !payload.instancesToUpdate &&
         !payload.instancesToConfigure &&
@@ -24,19 +23,19 @@ async function release(context, options, payload) {
         concurrency: 5,
         handler: tasks.extensionsDeploymentHandler(errorHandler),
     });
-    for (const inst of (_a = payload.instancesToConfigure) !== null && _a !== void 0 ? _a : []) {
+    for (const inst of payload.instancesToConfigure ?? []) {
         const task = tasks.configureExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
-    for (const inst of (_b = payload.instancesToDelete) !== null && _b !== void 0 ? _b : []) {
+    for (const inst of payload.instancesToDelete ?? []) {
         const task = tasks.deleteExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
-    for (const inst of (_c = payload.instancesToCreate) !== null && _c !== void 0 ? _c : []) {
+    for (const inst of payload.instancesToCreate ?? []) {
         const task = tasks.createExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
-    for (const inst of (_d = payload.instancesToUpdate) !== null && _d !== void 0 ? _d : []) {
+    for (const inst of payload.instancesToUpdate ?? []) {
         const task = tasks.updateExtensionInstanceTask(projectId, inst);
         void deploymentQueue.run(task);
     }
@@ -46,11 +45,11 @@ async function release(context, options, payload) {
     await deploymentPromise;
     const duration = context.extensionsStartTime ? Date.now() - context.extensionsStartTime : 1;
     await (0, track_1.trackGA4)("extensions_deploy", {
-        extension_instance_created: (_f = (_e = payload.instancesToCreate) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0,
-        extension_instance_updated: (_h = (_g = payload.instancesToUpdate) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0,
-        extension_instance_configured: (_k = (_j = payload.instancesToConfigure) === null || _j === void 0 ? void 0 : _j.length) !== null && _k !== void 0 ? _k : 0,
-        extension_instance_deleted: (_m = (_l = payload.instancesToDelete) === null || _l === void 0 ? void 0 : _l.length) !== null && _m !== void 0 ? _m : 0,
-        errors: (_o = errorHandler.errors.length) !== null && _o !== void 0 ? _o : 0,
+        extension_instance_created: payload.instancesToCreate?.length ?? 0,
+        extension_instance_updated: payload.instancesToUpdate?.length ?? 0,
+        extension_instance_configured: payload.instancesToConfigure?.length ?? 0,
+        extension_instance_deleted: payload.instancesToDelete?.length ?? 0,
+        errors: errorHandler.errors.length ?? 0,
         interactive: options.nonInteractive ? "false" : "true",
     }, duration);
     const have = await planner.have(projectId);
@@ -61,4 +60,3 @@ async function release(context, options, payload) {
         throw new error_1.FirebaseError(`Extensions deployment failed.`);
     }
 }
-exports.release = release;

package/lib/deploy/extensions/secrets.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkSpecForSecrets = exports.handleSecretParams = void 0;
+exports.handleSecretParams = handleSecretParams;
+exports.checkSpecForSecrets = checkSpecForSecrets;
 const clc = require("colorette");
 const secretUtils = require("../../extensions/secretsUtils");
 const secretManager = require("../../gcp/secretManager");
@@ -11,14 +12,13 @@ const error_1 = require("../../error");
 const logger_1 = require("../../logger");
 const utils_1 = require("../../utils");
 async function handleSecretParams(payload, have, nonInteractive) {
-    var _a, _b, _c;
-    for (const i of (_a = payload.instancesToCreate) !== null && _a !== void 0 ? _a : []) {
+    for (const i of payload.instancesToCreate ?? []) {
         if (await checkSpecForSecrets(i)) {
             (0, utils_1.logLabeledBullet)("extensions", `Verifying secret params for ${clc.bold(i.instanceId)}`);
             await handleSecretsCreateInstance(i, nonInteractive);
         }
     }
-    const updates = [...((_b = payload.instancesToUpdate) !== null && _b !== void 0 ? _b : []), ...((_c = payload.instancesToConfigure) !== null && _c !== void 0 ? _c : [])];
+    const updates = [...(payload.instancesToUpdate ?? []), ...(payload.instancesToConfigure ?? [])];
     for (const i of updates) {
         if (await checkSpecForSecrets(i)) {
             (0, utils_1.logLabeledBullet)("extensions", `Verifying secret params for ${clc.bold(i.instanceId)}`);
@@ -27,12 +27,10 @@ async function handleSecretParams(payload, have, nonInteractive) {
         }
     }
 }
-exports.handleSecretParams = handleSecretParams;
 async function checkSpecForSecrets(i) {
     const extensionSpec = await (0, planner_1.getExtensionSpec)(i);
     return secretUtils.usesSecrets(extensionSpec);
 }
-exports.checkSpecForSecrets = checkSpecForSecrets;
 const secretsInSpec = (spec) => {
     return spec.params.filter((p) => p.type === types_1.ParamType.SECRET);
 };
@@ -49,8 +47,8 @@ async function handleSecretsUpdateInstance(i, prevSpec, nonInteractive) {
     const secretParams = secretsInSpec(extensionVersion.spec);
     for (const s of secretParams) {
         const prevParam = prevExtensionVersion.spec.params.find((p) => p.param === s.param);
-        if ((prevParam === null || prevParam === void 0 ? void 0 : prevParam.type) === types_1.ParamType.SECRET && prevSpec.params[prevParam === null || prevParam === void 0 ? void 0 : prevParam.param]) {
-            await handleSecretParamForUpdate(s, i, prevSpec.params[prevParam === null || prevParam === void 0 ? void 0 : prevParam.param], nonInteractive);
+        if (prevParam?.type === types_1.ParamType.SECRET && prevSpec.params[prevParam?.param]) {
+            await handleSecretParamForUpdate(s, i, prevSpec.params[prevParam?.param], nonInteractive);
         }
         else {
             await handleSecretParamForCreate(s, i, nonInteractive);
@@ -58,7 +56,6 @@ async function handleSecretsUpdateInstance(i, prevSpec, nonInteractive) {
     }
 }
 async function handleSecretParamForCreate(secretParam, i, nonInteractive) {
-    var _a;
     const providedValue = i.params[secretParam.param];
     if (!providedValue) {
         return;
@@ -83,8 +80,8 @@ async function handleSecretParamForCreate(secretParam, i, nonInteractive) {
             `projects/${projectId}/secrets/${secretName} exists, but version ${version} does not. ` +
             `See more information about this secret at ${secretManager.secretManagerConsoleUri(projectId)}`);
     }
-    if (!!((_a = secretInfo === null || secretInfo === void 0 ? void 0 : secretInfo.secret) === null || _a === void 0 ? void 0 : _a.labels) &&
-        !!(secretInfo === null || secretInfo === void 0 ? void 0 : secretInfo.secret.labels[secretUtils.SECRET_LABEL]) &&
+    if (!!secretInfo?.secret?.labels &&
+        !!secretInfo?.secret.labels[secretUtils.SECRET_LABEL] &&
         secretInfo.secret.labels[secretUtils.SECRET_LABEL] !== i.instanceId) {
         throw new error_1.FirebaseError(`${clc.bold(i.instanceId)}: Found '${providedValue}' for secret param ${secretParam.param}. ` +
             `projects/${projectId}/secrets/${secretName} is managed by a different extension instance (${secretInfo.secret.labels[secretUtils.SECRET_LABEL]}), so reusing it here can lead to unexpected behavior. ` +

package/lib/deploy/extensions/tasks.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteExtensionInstanceTask = exports.configureExtensionInstanceTask = exports.updateExtensionInstanceTask = exports.createExtensionInstanceTask = exports.extensionsDeploymentHandler = void 0;
+exports.extensionsDeploymentHandler = extensionsDeploymentHandler;
+exports.createExtensionInstanceTask = createExtensionInstanceTask;
+exports.updateExtensionInstanceTask = updateExtensionInstanceTask;
+exports.configureExtensionInstanceTask = configureExtensionInstanceTask;
+exports.deleteExtensionInstanceTask = deleteExtensionInstanceTask;
 const clc = require("colorette");
 const error_1 = require("../../error");
 const extensionsApi = require("../../extensions/extensionsApi");
@@ -11,7 +15,6 @@ const error_2 = require("../../error");
 const isRetryable = (err) => err.status === 429 || err.status === 409;
 function extensionsDeploymentHandler(errorHandler) {
     return async (task) => {
-        var _a, _b, _c, _d;
         let result;
         try {
             result = await task.run();
@@ -20,12 +23,11 @@ function extensionsDeploymentHandler(errorHandler) {
             if (isRetryable(err)) {
                 throw err;
             }
-            errorHandler.record(task.spec.instanceId, task.type, (_d = (_c = (_b = (_a = err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : err);
+            errorHandler.record(task.spec.instanceId, task.type, err.context?.body?.error?.message ?? err);
         }
         return result;
     };
 }
-exports.extensionsDeploymentHandler = extensionsDeploymentHandler;
 function createExtensionInstanceTask(projectId, instanceSpec, validateOnly = false) {
     const run = async () => {
         if (!validateOnly) {
@@ -68,7 +70,6 @@ function createExtensionInstanceTask(projectId, instanceSpec, validateOnly = fal
         type: "create",
     };
 }
-exports.createExtensionInstanceTask = createExtensionInstanceTask;
 function updateExtensionInstanceTask(projectId, instanceSpec, validateOnly = false) {
     const run = async () => {
         if (!validateOnly) {
@@ -113,7 +114,6 @@ function updateExtensionInstanceTask(projectId, instanceSpec, validateOnly = fal
         type: "update",
     };
 }
-exports.updateExtensionInstanceTask = updateExtensionInstanceTask;
 function configureExtensionInstanceTask(projectId, instanceSpec, validateOnly = false) {
     const run = async () => {
         if (!validateOnly) {
@@ -146,7 +146,6 @@ function configureExtensionInstanceTask(projectId, instanceSpec, validateOnly =
         type: "configure",
     };
 }
-exports.configureExtensionInstanceTask = configureExtensionInstanceTask;
 function deleteExtensionInstanceTask(projectId, instanceSpec) {
     const run = async () => {
         utils.logLabeledBullet("extensions", `Deleting ${clc.bold(instanceSpec.instanceId)} extension instance`);
@@ -160,7 +159,6 @@ function deleteExtensionInstanceTask(projectId, instanceSpec) {
         type: "delete",
     };
 }
-exports.deleteExtensionInstanceTask = deleteExtensionInstanceTask;
 function printSuccess(instanceId, type, validateOnly) {
     const action = validateOnly ? `validated ${type} for` : `${type}d`;
     utils.logSuccess(clc.bold(clc.green("extensions")) + ` Successfully ${action} ${instanceId}`);

package/lib/deploy/extensions/v2FunctionHelper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureNecessaryV2ApisAndRoles = exports.checkSpecForV2Functions = void 0;
+exports.checkSpecForV2Functions = checkSpecForV2Functions;
+exports.ensureNecessaryV2ApisAndRoles = ensureNecessaryV2ApisAndRoles;
 const getProjectNumber_1 = require("../../getProjectNumber");
 const resourceManager = require("../../gcp/resourceManager");
 const logger_1 = require("../../logger");
@@ -15,13 +16,11 @@ async function checkSpecForV2Functions(i) {
     const extensionSpec = await planner.getExtensionSpec(i);
     return extensionSpec.resources.some((r) => r.type === "firebaseextensions.v1beta.v2function");
 }
-exports.checkSpecForV2Functions = checkSpecForV2Functions;
 async function ensureNecessaryV2ApisAndRoles(options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.computeOrigin)(), "extensions", options.markdown);
     await ensureComputeP4SARole(projectId);
 }
-exports.ensureNecessaryV2ApisAndRoles = ensureNecessaryV2ApisAndRoles;
 async function ensureComputeP4SARole(projectId) {
     const projectNumber = await (0, getProjectNumber_1.getProjectNumber)({ projectId });
     const saEmail = await (0, computeEngine_1.getDefaultServiceAccount)(projectNumber);

package/lib/deploy/extensions/validate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkBilling = void 0;
+exports.checkBilling = checkBilling;
 const cloudbilling_1 = require("../../gcp/cloudbilling");
 const checkProjectBilling_1 = require("../../extensions/checkProjectBilling");
 const error_1 = require("../../error");
@@ -14,4 +14,3 @@ async function checkBilling(projectId, nonInteractive) {
         await (0, checkProjectBilling_1.enableBilling)(projectId);
     }
 }
-exports.checkBilling = checkBilling;

package/lib/deploy/firestore/deploy.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const clc = require("colorette");
 const api_1 = require("../../firestore/api");
 const logger_1 = require("../../logger");
@@ -7,19 +8,17 @@ const utils = require("../../utils");
 const rulesDeploy_1 = require("../../rulesDeploy");
 const utils_1 = require("../../utils");
 async function deployRules(context) {
-    var _a;
-    const rulesDeploy = (_a = context === null || context === void 0 ? void 0 : context.firestore) === null || _a === void 0 ? void 0 : _a.rulesDeploy;
+    const rulesDeploy = context?.firestore?.rulesDeploy;
     if (!context.firestoreRules || !rulesDeploy) {
         return;
     }
     await rulesDeploy.createRulesets(rulesDeploy_1.RulesetServiceType.CLOUD_FIRESTORE);
 }
 async function deployIndexes(context, options) {
-    var _a;
     if (!context.firestoreIndexes) {
         return;
     }
-    const indexesContext = (_a = context === null || context === void 0 ? void 0 : context.firestore) === null || _a === void 0 ? void 0 : _a.indexes;
+    const indexesContext = context?.firestore?.indexes;
     utils.logBullet(clc.bold(clc.cyan("firestore: ")) + "deploying indexes...");
     const firestoreIndexes = new api_1.FirestoreApi();
     await Promise.all(indexesContext.map(async (indexContext) => {
@@ -51,4 +50,3 @@ async function default_1(context, options) {
     await deployRules(context);
     await deployIndexes(context, options);
 }
-exports.default = default_1;

package/lib/deploy/firestore/prepare.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const clc = require("colorette");
 const loadCJSON_1 = require("../../loadCJSON");
 const rulesDeploy_1 = require("../../rulesDeploy");
@@ -72,7 +73,6 @@ async function createDatabase(context, options) {
     }
 }
 async function default_1(context, options) {
-    var _a;
     await (0, ensureApiEnabled_1.ensure)(context.projectId, (0, api_1.firestoreOrigin)(), "firestore");
     await (0, ensureApiEnabled_1.ensure)(context.projectId, (0, api_1.firestoreOrigin)(), "firestore");
     if (options.only) {
@@ -110,7 +110,7 @@ async function default_1(context, options) {
     if (context.firestore.rules.length > 0) {
         await rulesDeploy.compile();
     }
-    const rulesContext = (_a = context === null || context === void 0 ? void 0 : context.firestore) === null || _a === void 0 ? void 0 : _a.rules;
+    const rulesContext = context?.firestore?.rules;
     for (const ruleContext of rulesContext) {
         const databaseId = ruleContext.databaseId;
         const rulesFile = ruleContext.rulesFile;
@@ -119,4 +119,3 @@ async function default_1(context, options) {
         }
     }
 }
-exports.default = default_1;

package/lib/deploy/firestore/release.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const rulesDeploy_1 = require("../../rulesDeploy");
 async function default_1(context) {
-    var _a, _b;
-    const rulesDeploy = (_a = context === null || context === void 0 ? void 0 : context.firestore) === null || _a === void 0 ? void 0 : _a.rulesDeploy;
+    const rulesDeploy = context?.firestore?.rulesDeploy;
     if (!context.firestoreRules || !rulesDeploy) {
         return;
     }
-    const rulesContext = (_b = context === null || context === void 0 ? void 0 : context.firestore) === null || _b === void 0 ? void 0 : _b.rules;
+    const rulesContext = context?.firestore?.rules;
     await Promise.all(rulesContext.map(async (ruleContext) => {
         const databaseId = ruleContext.databaseId;
         const rulesFile = ruleContext.rulesFile;
@@ -16,4 +16,3 @@ async function default_1(context) {
         }
     }));
 }
-exports.default = default_1;