firebase-tools 15.1.0 → 15.2.0

package/lib/extensions/emulator/specHelper.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRuntime = exports.DEFAULT_RUNTIME = exports.getFunctionProperties = exports.getFunctionResourcesWithParamSubstitution = exports.readPostinstall = exports.readExtensionYaml = void 0;
+exports.DEFAULT_RUNTIME = void 0;
+exports.readExtensionYaml = readExtensionYaml;
+exports.readPostinstall = readPostinstall;
+exports.getFunctionResourcesWithParamSubstitution = getFunctionResourcesWithParamSubstitution;
+exports.getFunctionProperties = getFunctionProperties;
+exports.getRuntime = getRuntime;
 const supported = require("../../deploy/functions/runtimes/supported");
 const error_1 = require("../../error");
 const extensionsHelper_1 = require("../extensionsHelper");
@@ -14,36 +19,31 @@ const validFunctionTypes = [
     "firebaseextensions.v1beta.scheduledFunction",
 ];
 async function readExtensionYaml(directory) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const extensionYaml = await (0, utils_2.readFileFromDirectory)(directory, SPEC_FILE);
     const source = extensionYaml.source;
     const spec = (0, utils_2.wrappedSafeLoad)(source);
-    spec.params = (_a = spec.params) !== null && _a !== void 0 ? _a : [];
-    spec.systemParams = (_b = spec.systemParams) !== null && _b !== void 0 ? _b : [];
-    spec.resources = (_c = spec.resources) !== null && _c !== void 0 ? _c : [];
-    spec.apis = (_d = spec.apis) !== null && _d !== void 0 ? _d : [];
-    spec.roles = (_e = spec.roles) !== null && _e !== void 0 ? _e : [];
-    spec.externalServices = (_f = spec.externalServices) !== null && _f !== void 0 ? _f : [];
-    spec.events = (_g = spec.events) !== null && _g !== void 0 ? _g : [];
-    spec.lifecycleEvents = (_h = spec.lifecycleEvents) !== null && _h !== void 0 ? _h : [];
-    spec.contributors = (_j = spec.contributors) !== null && _j !== void 0 ? _j : [];
+    spec.params = spec.params ?? [];
+    spec.systemParams = spec.systemParams ?? [];
+    spec.resources = spec.resources ?? [];
+    spec.apis = spec.apis ?? [];
+    spec.roles = spec.roles ?? [];
+    spec.externalServices = spec.externalServices ?? [];
+    spec.events = spec.events ?? [];
+    spec.lifecycleEvents = spec.lifecycleEvents ?? [];
+    spec.contributors = spec.contributors ?? [];
     return spec;
 }
-exports.readExtensionYaml = readExtensionYaml;
 async function readPostinstall(directory) {
     const content = await (0, utils_2.readFileFromDirectory)(directory, POSTINSTALL_FILE);
     return content.source;
 }
-exports.readPostinstall = readPostinstall;
 function getFunctionResourcesWithParamSubstitution(extensionSpec, params) {
     const rawResources = extensionSpec.resources.filter((resource) => validFunctionTypes.includes(resource.type));
     return (0, extensionsHelper_1.substituteParams)(rawResources, params);
 }
-exports.getFunctionResourcesWithParamSubstitution = getFunctionResourcesWithParamSubstitution;
 function getFunctionProperties(resources) {
     return resources.map((r) => r.properties);
 }
-exports.getFunctionProperties = getFunctionProperties;
 exports.DEFAULT_RUNTIME = supported.latest("nodejs");
 function getRuntime(resources) {
     if (resources.length === 0) {
@@ -66,4 +66,3 @@ function getRuntime(resources) {
     }
     return supported.latest("nodejs", runtimes);
 }
-exports.getRuntime = getRuntime;

package/lib/extensions/emulator/triggerHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.functionResourceToEmulatedTriggerDefintion = void 0;
+exports.functionResourceToEmulatedTriggerDefintion = functionResourceToEmulatedTriggerDefintion;
 const emulatorLogger_1 = require("../../emulator/emulatorLogger");
 const functionsEmulatorShared_1 = require("../../emulator/functionsEmulatorShared");
 const types_1 = require("../../emulator/types");
@@ -16,7 +16,6 @@ const SUPPORTED_SYSTEM_PARAMS = {
     },
 };
 function functionResourceToEmulatedTriggerDefintion(resource, systemParams = {}) {
-    var _a, _b;
     const resourceType = resource.type;
     if (resource.type === types_2.FUNCTIONS_RESOURCE_TYPE) {
         const etd = {
@@ -93,8 +92,8 @@ function functionResourceToEmulatedTriggerDefintion(resource, systemParams = {})
                     }
                 }
                 if (properties.eventTrigger.eventType.includes("google.cloud.firestore")) {
-                    eventFilters["database"] = (_a = eventFilters["database"]) !== null && _a !== void 0 ? _a : "(default)";
-                    eventFilters["namespace"] = (_b = eventFilters["namespace"]) !== null && _b !== void 0 ? _b : "(default)";
+                    eventFilters["database"] = eventFilters["database"] ?? "(default)";
+                    eventFilters["namespace"] = eventFilters["namespace"] ?? "(default)";
                 }
                 etd.eventTrigger.eventFilters = eventFilters;
                 etd.eventTrigger.eventFilterPathPatterns = eventFilterPathPatterns;
@@ -107,4 +106,3 @@ function functionResourceToEmulatedTriggerDefintion(resource, systemParams = {})
     }
     throw new error_1.FirebaseError("Unexpected resource type " + resourceType);
 }
-exports.functionResourceToEmulatedTriggerDefintion = functionResourceToEmulatedTriggerDefintion;

package/lib/extensions/etags.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectEtagChanges = exports.saveEtags = void 0;
+exports.saveEtags = saveEtags;
+exports.detectEtagChanges = detectEtagChanges;
 function saveEtags(rc, projectId, instances) {
     rc.setEtags(projectId, "extensionInstances", etagsMap(instances));
 }
-exports.saveEtags = saveEtags;
 function detectEtagChanges(rc, projectId, instances) {
     const lastDeployedEtags = rc.getEtags(projectId).extensionInstances;
     const currentEtags = etagsMap(instances);
@@ -17,7 +17,6 @@ function detectEtagChanges(rc, projectId, instances) {
     const newExtensionInstances = Object.keys(currentEtags).filter((instanceName) => !lastDeployedEtags[instanceName]);
     return newExtensionInstances.concat(changedExtensionInstances);
 }
-exports.detectEtagChanges = detectEtagChanges;
 function etagsMap(instances) {
     return instances.reduce((acc, i) => {
         if (i.etag) {

package/lib/extensions/export.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayExportInfo = exports.setSecretParamsToLatest = exports.parameterizeProject = void 0;
+exports.parameterizeProject = parameterizeProject;
+exports.setSecretParamsToLatest = setSecretParamsToLatest;
+exports.displayExportInfo = displayExportInfo;
 const planner_1 = require("../deploy/extensions/planner");
 const deploymentSummary_1 = require("../deploy/extensions/deploymentSummary");
 const logger_1 = require("../logger");
@@ -13,13 +15,12 @@ function parameterizeProject(projectId, projectNumber, spec) {
         const p2 = p1.replace(projectNumber, "${param:PROJECT_NUMBER}");
         newParams[key] = p2;
     }
-    const newSpec = Object.assign({}, spec);
+    const newSpec = { ...spec };
     newSpec.params = newParams;
     return newSpec;
 }
-exports.parameterizeProject = parameterizeProject;
 async function setSecretParamsToLatest(spec) {
-    const newParams = Object.assign({}, spec.params);
+    const newParams = { ...spec.params };
     const extensionVersion = await (0, planner_1.getExtensionVersion)(spec);
     const activeSecrets = (0, secretsUtils_1.getActiveSecrets)(extensionVersion.spec, newParams);
     for (const [key, val] of Object.entries(newParams)) {
@@ -29,9 +30,8 @@ async function setSecretParamsToLatest(spec) {
             newParams[key] = (0, secretManager_1.toSecretVersionResourceName)(parsed);
         }
     }
-    return Object.assign(Object.assign({}, spec), { params: newParams });
+    return { ...spec, params: newParams };
 }
-exports.setSecretParamsToLatest = setSecretParamsToLatest;
 function displayExportInfo(withRef, withoutRef) {
     logger_1.logger.info("The following Extension instances will be saved locally:");
     logger_1.logger.info("");
@@ -43,9 +43,7 @@ function displayExportInfo(withRef, withoutRef) {
         }
     }
 }
-exports.displayExportInfo = displayExportInfo;
 function displaySpecs(specs) {
-    var _a;
     for (let i = 0; i < specs.length; i++) {
         const spec = specs[i];
         logger_1.logger.info(`${i + 1}. ${(0, deploymentSummary_1.humanReadable)(spec)}`);
@@ -53,7 +51,7 @@ function displaySpecs(specs) {
         for (const p of Object.entries(spec.params)) {
             logger_1.logger.info(`\t${p[0]}=${p[1]}`);
         }
-        if ((_a = spec.allowedEventTypes) === null || _a === void 0 ? void 0 : _a.length) {
+        if (spec.allowedEventTypes?.length) {
             logger_1.logger.info(`\tALLOWED_EVENTS=${spec.allowedEventTypes}`);
         }
         if (spec.eventarcChannel) {

package/lib/extensions/extensionsApi.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refNotFoundError = exports.getExtension = exports.listExtensionVersions = exports.listExtensions = exports.getExtensionVersion = exports.getSource = exports.createSource = exports.populateSpec = exports.updateInstanceFromRegistry = exports.updateInstance = exports.configureInstance = exports.listInstances = exports.getInstance = exports.deleteInstance = exports.createInstance = void 0;
+exports.createInstance = createInstance;
+exports.deleteInstance = deleteInstance;
+exports.getInstance = getInstance;
+exports.listInstances = listInstances;
+exports.configureInstance = configureInstance;
+exports.updateInstance = updateInstance;
+exports.updateInstanceFromRegistry = updateInstanceFromRegistry;
+exports.populateSpec = populateSpec;
+exports.createSource = createSource;
+exports.getSource = getSource;
+exports.getExtensionVersion = getExtensionVersion;
+exports.listExtensions = listExtensions;
+exports.listExtensionVersions = listExtensionVersions;
+exports.getExtension = getExtension;
+exports.refNotFoundError = refNotFoundError;
 const yaml = require("yaml");
 const clc = require("colorette");
 const apiv2_1 = require("../apiv2");
@@ -38,10 +52,9 @@ async function createInstanceHelper(projectId, instanceId, config, labels, valid
     return pollRes;
 }
 async function createInstance(args) {
-    var _a, _b, _c;
     const config = {
         params: args.params,
-        systemParams: (_a = args.systemParams) !== null && _a !== void 0 ? _a : {},
+        systemParams: args.systemParams ?? {},
         allowedEventTypes: args.allowedEventTypes,
         eventarcChannel: args.eventarcChannel,
     };
@@ -49,12 +62,12 @@ async function createInstance(args) {
         throw new error_1.FirebaseError("ExtensionSource and ExtensionVersion both provided, but only one should be.");
     }
     else if (args.extensionSource) {
-        config.source = { name: (_b = args.extensionSource) === null || _b === void 0 ? void 0 : _b.name };
+        config.source = { name: args.extensionSource?.name };
     }
     else if (args.extensionVersionRef) {
         const ref = refs.parse(args.extensionVersionRef);
         config.extensionRef = refs.toExtensionRef(ref);
-        config.extensionVersion = (_c = ref.version) !== null && _c !== void 0 ? _c : "";
+        config.extensionVersion = ref.version ?? "";
     }
     else {
         throw new error_1.FirebaseError("No ExtensionVersion or ExtensionSource provided but one is required.");
@@ -67,7 +80,6 @@ async function createInstance(args) {
     }
     return await createInstanceHelper(args.projectId, args.instanceId, config, args.labels, args.validateOnly);
 }
-exports.createInstance = createInstance;
 async function deleteInstance(projectId, instanceId) {
     const deleteRes = await extensionsApiClient.delete(`/projects/${projectId}/instances/${instanceId}`);
     const pollRes = await operationPoller.pollOperation({
@@ -78,7 +90,6 @@ async function deleteInstance(projectId, instanceId) {
     });
     return pollRes;
 }
-exports.deleteInstance = deleteInstance;
 async function getInstance(projectId, instanceId) {
     try {
         const res = await extensionsApiClient.get(`/projects/${projectId}/instances/${instanceId}`);
@@ -93,7 +104,6 @@ async function getInstance(projectId, instanceId) {
         throw err;
     }
 }
-exports.getInstance = getInstance;
 async function listInstances(projectId) {
     const instances = [];
     const getNextPage = async (pageToken = "") => {
@@ -113,14 +123,12 @@ async function listInstances(projectId) {
     await getNextPage();
     return instances;
 }
-exports.listInstances = listInstances;
 async function configureInstance(args) {
-    var _a;
     const reqBody = {
         projectId: args.projectId,
         instanceId: args.instanceId,
         updateMask: "config.params",
-        validateOnly: (_a = args.validateOnly) !== null && _a !== void 0 ? _a : false,
+        validateOnly: args.validateOnly ?? false,
         data: {
             config: {
                 params: args.params,
@@ -141,9 +149,7 @@ async function configureInstance(args) {
     }
     return patchInstance(reqBody);
 }
-exports.configureInstance = configureInstance;
 async function updateInstance(args) {
-    var _a;
     const body = {
         config: {
             source: { name: args.extensionSource.name },
@@ -170,13 +176,11 @@ async function updateInstance(args) {
         projectId: args.projectId,
         instanceId: args.instanceId,
         updateMask,
-        validateOnly: (_a = args.validateOnly) !== null && _a !== void 0 ? _a : false,
+        validateOnly: args.validateOnly ?? false,
         data: body,
     });
 }
-exports.updateInstance = updateInstance;
 async function updateInstanceFromRegistry(args) {
-    var _a;
     const ref = refs.parse(args.extRef);
     const body = {
         config: {
@@ -205,11 +209,10 @@ async function updateInstanceFromRegistry(args) {
         projectId: args.projectId,
         instanceId: args.instanceId,
         updateMask,
-        validateOnly: (_a = args.validateOnly) !== null && _a !== void 0 ? _a : false,
+        validateOnly: args.validateOnly ?? false,
         data: body,
     });
 }
-exports.updateInstanceFromRegistry = updateInstanceFromRegistry;
 async function patchInstance(args) {
     const updateRes = await extensionsApiClient.patch(`/projects/${args.projectId}/instances/${args.instanceId}`, args.data, {
         queryParams: {
@@ -229,7 +232,6 @@ async function patchInstance(args) {
     return pollRes;
 }
 function populateSpec(spec) {
-    var _a, _b;
     if (spec) {
         for (const r of spec.resources) {
             try {
@@ -241,11 +243,10 @@ function populateSpec(spec) {
                 logger_1.logger.debug(`[ext] failed to parse resource properties yaml: ${(0, error_1.getErrMsg)(err)}`);
             }
         }
-        spec.params = (_a = spec.params) !== null && _a !== void 0 ? _a : [];
-        spec.systemParams = (_b = spec.systemParams) !== null && _b !== void 0 ? _b : [];
+        spec.params = spec.params ?? [];
+        spec.systemParams = spec.systemParams ?? [];
     }
 }
-exports.populateSpec = populateSpec;
 async function createSource(projectId, packageUri, extensionRoot) {
     const createRes = await extensionsApiClient.post(`/projects/${projectId}/sources/`, {
         packageUri,
@@ -262,7 +263,6 @@ async function createSource(projectId, packageUri, extensionRoot) {
     }
     return pollRes;
 }
-exports.createSource = createSource;
 async function getSource(sourceName) {
     const res = await extensionsApiClient.get(`/${sourceName}`);
     if (res.body.spec) {
@@ -270,7 +270,6 @@ async function getSource(sourceName) {
     }
     return res.body;
 }
-exports.getSource = getSource;
 async function getExtensionVersion(extensionVersionRef) {
     const ref = refs.parse(extensionVersionRef);
     if (!ref.version) {
@@ -293,7 +292,6 @@ async function getExtensionVersion(extensionVersionRef) {
         throw new error_1.FirebaseError(`Failed to query the extension version '${clc.bold(extensionVersionRef)}': ${(0, error_1.getErrMsg)(err)}`);
     }
 }
-exports.getExtensionVersion = getExtensionVersion;
 async function listExtensions(publisherId) {
     const extensions = [];
     const getNextPage = async (pageToken = "") => {
@@ -313,7 +311,6 @@ async function listExtensions(publisherId) {
     await getNextPage();
     return extensions;
 }
-exports.listExtensions = listExtensions;
 async function listExtensionVersions(ref, filter = "", showPrereleases = false) {
     const { publisherId, extensionId } = refs.parse(ref);
     const extensionVersions = [];
@@ -336,7 +333,6 @@ async function listExtensionVersions(ref, filter = "", showPrereleases = false)
     await getNextPage();
     return extensionVersions;
 }
-exports.listExtensionVersions = listExtensionVersions;
 async function getExtension(extensionRef) {
     const ref = refs.parse(extensionRef);
     try {
@@ -355,11 +351,9 @@ async function getExtension(extensionRef) {
         });
     }
 }
-exports.getExtension = getExtension;
 function refNotFoundError(ref) {
     return new error_1.FirebaseError(`The extension reference '${clc.bold(ref.version ? refs.toExtensionVersionRef(ref) : refs.toExtensionRef(ref))}' doesn't exist. This could happen for two reasons:\n` +
         `  -The publisher ID '${clc.bold(ref.publisherId)}' doesn't exist or could be misspelled\n` +
         `  -The name of the ${ref.version ? "extension version" : "extension"} '${clc.bold(ref.version ? `${ref.extensionId}@${ref.version}` : ref.extensionId)}' doesn't exist or could be misspelled\n\n` +
         `Please correct the extension reference and try again. If you meant to reference an extension from a local source, please provide a relative path prefixed with '${clc.bold("./")}', '${clc.bold("../")}', or '${clc.bold("~/")}'.}`, { status: 404 });
 }
-exports.refNotFoundError = refNotFoundError;