firebase-tools 15.1.0 → 15.2.0

package/lib/deploy/remoteconfig/functions.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.publishTemplate = exports.deployTemplate = exports.validateInputRemoteConfigTemplate = exports.getEtag = void 0;
+exports.getEtag = getEtag;
+exports.validateInputRemoteConfigTemplate = validateInputRemoteConfigTemplate;
+exports.deployTemplate = deployTemplate;
+exports.publishTemplate = publishTemplate;
 const api_1 = require("../../api");
 const apiv2_1 = require("../../apiv2");
 const error_1 = require("../../error");
@@ -21,7 +24,6 @@ async function getEtag(projectNumber, versionNumber) {
     });
     return response.response.headers.get("etag") || "";
 }
-exports.getEtag = getEtag;
 function validateInputRemoteConfigTemplate(template) {
     const templateCopy = JSON.parse(JSON.stringify(template));
     if (!templateCopy || templateCopy === "null" || templateCopy === "undefined") {
@@ -35,10 +37,9 @@ function validateInputRemoteConfigTemplate(template) {
     }
     return templateCopy;
 }
-exports.validateInputRemoteConfigTemplate = validateInputRemoteConfigTemplate;
 async function deployTemplate(projectNumber, template, etag, options) {
     const reqPath = `/projects/${projectNumber}/remoteConfig`;
-    if (options === null || options === void 0 ? void 0 : options.force) {
+    if (options?.force) {
         etag = "*";
     }
     const response = await client.request({
@@ -54,7 +55,6 @@ async function deployTemplate(projectNumber, template, etag, options) {
     });
     return response.body;
 }
-exports.deployTemplate = deployTemplate;
 function publishTemplate(projectNumber, template, etag, options) {
     const temporaryTemplate = {
         conditions: template.conditions,
@@ -66,4 +66,3 @@ function publishTemplate(projectNumber, template, etag, options) {
     validTemplate = validateInputRemoteConfigTemplate(template);
     return deployTemplate(projectNumber, validTemplate, etag, options);
 }
-exports.publishTemplate = publishTemplate;

package/lib/deploy/remoteconfig/prepare.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const projectUtils_1 = require("../../projectUtils");
 const loadCJSON_1 = require("../../loadCJSON");
 const functions_1 = require("./functions");
 const functions_2 = require("./functions");
 async function default_1(context, options) {
-    var _a;
     if (!context) {
         return;
     }
-    const filePath = (_a = options.config.src.remoteconfig) === null || _a === void 0 ? void 0 : _a.template;
+    const filePath = options.config.src.remoteconfig?.template;
     if (!filePath) {
         return;
     }
@@ -20,4 +20,3 @@ async function default_1(context, options) {
     context.remoteconfigTemplate = template;
     return;
 }
-exports.default = default_1;

package/lib/deploy/remoteconfig/release.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const functions_1 = require("./functions");
 const projectUtils_1 = require("../../projectUtils");
 async function default_1(context, options) {
-    if (!(context === null || context === void 0 ? void 0 : context.remoteconfigTemplate)) {
+    if (!context?.remoteconfigTemplate) {
         return;
     }
     const template = context.remoteconfigTemplate;
@@ -11,4 +12,3 @@ async function default_1(context, options) {
     const etag = await (0, functions_1.getEtag)(projectNumber);
     return (0, functions_1.publishTemplate)(projectNumber, template, etag, options);
 }
-exports.default = default_1;

package/lib/deploy/storage/deploy.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const lodash_1 = require("lodash");
 const rulesDeploy_1 = require("../../rulesDeploy");
 async function default_1(context) {
@@ -9,4 +10,3 @@ async function default_1(context) {
     }
     await rulesDeploy.createRulesets(rulesDeploy_1.RulesetServiceType.FIREBASE_STORAGE);
 }
-exports.default = default_1;

package/lib/deploy/storage/prepare.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const _ = require("lodash");
 const gcp = require("../../gcp");
 const rulesDeploy_1 = require("../../rulesDeploy");
@@ -49,4 +50,3 @@ async function default_1(context, options) {
     _.set(context, "storage.rulesDeploy", rulesDeploy);
     await rulesDeploy.compile();
 }
-exports.default = default_1;

package/lib/deploy/storage/release.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const lodash_1 = require("lodash");
 const rulesDeploy_1 = require("../../rulesDeploy");
 async function default_1(context, options) {
@@ -24,4 +25,3 @@ async function default_1(context, options) {
     }));
     return toRelease.map((r) => r.bucket);
 }
-exports.default = default_1;

package/lib/deploymentTool.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFirebaseManaged = exports.labels = exports.value = exports.BASE = void 0;
+exports.BASE = void 0;
+exports.value = value;
+exports.labels = labels;
+exports.isFirebaseManaged = isFirebaseManaged;
 exports.BASE = "cli-firebase";
 function value() {
     if (!process.env.FIREBASE_DEPLOY_AGENT) {
@@ -8,15 +11,11 @@ function value() {
     }
     return [exports.BASE, process.env.FIREBASE_DEPLOY_AGENT].join("--");
 }
-exports.value = value;
 function labels() {
     return {
         "deployment-tool": value(),
     };
 }
-exports.labels = labels;
 function isFirebaseManaged(labels) {
-    var _a;
-    return (_a = labels === null || labels === void 0 ? void 0 : labels["deployment-tool"]) === null || _a === void 0 ? void 0 : _a.startsWith(exports.BASE);
+    return labels?.["deployment-tool"]?.startsWith(exports.BASE);
 }
-exports.isFirebaseManaged = isFirebaseManaged;

package/lib/detectProjectRoot.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectProjectRoot = void 0;
+exports.detectProjectRoot = detectProjectRoot;
 const fsutils_1 = require("./fsutils");
 const error_1 = require("./error");
 const path_1 = require("path");
@@ -25,4 +25,3 @@ function detectProjectRoot(options) {
     }
     return projectRootDir;
 }
-exports.detectProjectRoot = detectProjectRoot;

package/lib/downloadUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadToTmp = void 0;
+exports.downloadToTmp = downloadToTmp;
 const url_1 = require("url");
 const fs = require("fs-extra");
 const ProgressBar = require("progress");
@@ -30,9 +30,8 @@ async function downloadToTmp(remoteUrl, auth = false) {
         bar.tick(chunk.length);
     });
     await new Promise((resolve) => {
-        writeStream.on("finish", resolve);
+        writeStream.on("finish", () => resolve());
         res.body.pipe(writeStream);
     });
     return tmpfile.name;
 }
-exports.downloadToTmp = downloadToTmp;

package/lib/emulator/adminSdkConfig.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectAdminSdkConfigOrCached = exports.constructDefaultAdminSdkConfig = void 0;
+exports.constructDefaultAdminSdkConfig = constructDefaultAdminSdkConfig;
+exports.getProjectAdminSdkConfigOrCached = getProjectAdminSdkConfigOrCached;
 const api_1 = require("../api");
 const apiv2 = require("../apiv2");
 const configstore_1 = require("../configstore");
@@ -15,7 +16,6 @@ function constructDefaultAdminSdkConfig(projectId) {
         storageBucket: process.env.STORAGE_BUCKET_URL || `${projectId}.appspot.com`,
     };
 }
-exports.constructDefaultAdminSdkConfig = constructDefaultAdminSdkConfig;
 async function getProjectAdminSdkConfigOrCached(projectId) {
     if (constants_1.Constants.isDemoProject(projectId)) {
         return constructDefaultAdminSdkConfig(projectId);
@@ -30,7 +30,6 @@ async function getProjectAdminSdkConfigOrCached(projectId) {
         return getCachedAdminSdkConfig(projectId);
     }
 }
-exports.getProjectAdminSdkConfigOrCached = getProjectAdminSdkConfigOrCached;
 async function getProjectAdminSdkConfig(projectId) {
     const apiClient = new apiv2.Client({
         auth: true,

package/lib/emulator/apphosting/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLocalAppHostingConfiguration = void 0;
+exports.getLocalAppHostingConfiguration = getLocalAppHostingConfiguration;
 const path_1 = require("path");
 const config_1 = require("../../apphosting/config");
 const yaml_1 = require("../../apphosting/yaml");
@@ -25,4 +25,3 @@ async function getLocalAppHostingConfiguration(backendDir) {
     }
     return output;
 }
-exports.getLocalAppHostingConfiguration = getLocalAppHostingConfiguration;

package/lib/emulator/apphosting/developmentServer.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectPackageManagerStartCommand = exports.detectPackageManager = exports.logger = void 0;
+exports.logger = void 0;
+exports.detectPackageManager = detectPackageManager;
+exports.detectPackageManagerStartCommand = detectPackageManagerStartCommand;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const emulatorLogger_1 = require("../emulatorLogger");
@@ -19,7 +21,6 @@ async function detectPackageManager(rootdir) {
     }
     throw new error_1.FirebaseError("Unsupported package manager");
 }
-exports.detectPackageManager = detectPackageManager;
 async function detectPackageManagerStartCommand(rootDir) {
     try {
         const packageManager = await detectPackageManager(rootDir);
@@ -29,4 +30,3 @@ async function detectPackageManagerStartCommand(rootDir) {
         throw new error_1.FirebaseError("Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommand`");
     }
 }
-exports.detectPackageManagerStartCommand = detectPackageManagerStartCommand;

package/lib/emulator/apphosting/serve.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEmulatorEnvs = exports.start = void 0;
+exports.start = start;
+exports.getEmulatorEnvs = getEmulatorEnvs;
 const net_1 = require("net");
 const clc = require("colorette");
 const portUtils_1 = require("../portUtils");
@@ -25,7 +26,6 @@ const semver_1 = require("semver");
 const secretResourceRegex = /^projects\/([^/]+)\/secrets\/([^/]+)(?:\/versions\/((?:latest)|\d+))?$/;
 const secretShorthandRegex = /^([^/@]+)(?:@((?:latest)|\d+))?$/;
 async function loadSecret(project, name) {
-    var _a, _b, _c, _d;
     let projectId;
     let secretId;
     let version;
@@ -52,7 +52,7 @@ async function loadSecret(project, name) {
         return await secrets.accessSecretVersion(projectId, secretId, version);
     }
     catch (err) {
-        if (((_a = err === null || err === void 0 ? void 0 : err.original) === null || _a === void 0 ? void 0 : _a.code) === 403 || ((_d = (_c = (_b = err === null || err === void 0 ? void 0 : err.original) === null || _b === void 0 ? void 0 : _b.context) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.statusCode) === 403) {
+        if (err?.original?.code === 403 || err?.original?.context?.response?.statusCode === 403) {
             (0, utils_1.logLabeledError)(types_1.Emulators.APPHOSTING, `Permission denied to access secret ${secretId}. Use ` +
                 `${clc.bold("firebase apphosting:secrets:grantaccess")} to get permissions.`);
         }
@@ -60,16 +60,15 @@ async function loadSecret(project, name) {
     }
 }
 async function start(options) {
-    var _a, _b;
     const hostname = constants_1.DEFAULT_HOST;
-    let port = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PORTS.apphosting;
+    let port = options?.port ?? constants_1.DEFAULT_PORTS.apphosting;
     while (!(await availablePort(hostname, port))) {
         port += 1;
     }
-    const backendRoot = (0, projectPath_1.resolveProjectPath)({}, (_b = options === null || options === void 0 ? void 0 : options.rootDirectory) !== null && _b !== void 0 ? _b : "./");
+    const backendRoot = (0, projectPath_1.resolveProjectPath)({}, options?.rootDirectory ?? "./");
     let startCommand;
-    if (options === null || options === void 0 ? void 0 : options.startCommand) {
-        startCommand = options === null || options === void 0 ? void 0 : options.startCommand;
+    if (options?.startCommand) {
+        startCommand = options?.startCommand;
         if (startCommand.includes("--port") || startCommand.includes(" -p ")) {
             throw new error_1.FirebaseError("Specifying a port in the start command is not supported by the apphosting emulator");
         }
@@ -85,15 +84,24 @@ async function start(options) {
     const apphostingLocalConfig = await (0, config_1.getLocalAppHostingConfiguration)(backendRoot);
     const resolveEnv = Object.entries(apphostingLocalConfig.env).map(async ([key, value]) => [
         key,
-        value.value ? value.value : await loadSecret(options === null || options === void 0 ? void 0 : options.projectId, value.secret),
+        value.value ? value.value : await loadSecret(options?.projectId, value.secret),
     ]);
-    const environmentVariablesToInject = Object.assign(Object.assign(Object.assign({ NODE_ENV: process.env.NODE_ENV }, getEmulatorEnvs()), Object.fromEntries(await Promise.all(resolveEnv))), { FIREBASE_APP_HOSTING: "1", X_GOOGLE_TARGET_PLATFORM: "fah", GCLOUD_PROJECT: options === null || options === void 0 ? void 0 : options.projectId, PROJECT_ID: options === null || options === void 0 ? void 0 : options.projectId, PORT: port.toString() });
+    const environmentVariablesToInject = {
+        NODE_ENV: process.env.NODE_ENV,
+        ...getEmulatorEnvs(),
+        ...Object.fromEntries(await Promise.all(resolveEnv)),
+        FIREBASE_APP_HOSTING: "1",
+        X_GOOGLE_TARGET_PLATFORM: "fah",
+        GCLOUD_PROJECT: options?.projectId,
+        PROJECT_ID: options?.projectId,
+        PORT: port.toString(),
+    };
     const packageManager = await (0, developmentServer_1.detectPackageManager)(backendRoot).catch(() => undefined);
     if (packageManager === "pnpm") {
         (0, utils_1.logLabeledWarning)("apphosting", `Firebase JS SDK autoinit does not currently support PNPM.`);
     }
     else {
-        const webappConfig = await getBackendAppConfig(options === null || options === void 0 ? void 0 : options.projectId, options === null || options === void 0 ? void 0 : options.backendId);
+        const webappConfig = await getBackendAppConfig(options?.projectId, options?.backendId);
         if (webappConfig) {
             environmentVariablesToInject["FIREBASE_WEBAPP_CONFIG"] || (environmentVariablesToInject["FIREBASE_WEBAPP_CONFIG"] = JSON.stringify(webappConfig));
             environmentVariablesToInject["FIREBASE_CONFIG"] || (environmentVariablesToInject["FIREBASE_CONFIG"] = JSON.stringify({
@@ -111,7 +119,6 @@ async function start(options) {
         .then(() => developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `Dev Server stopped`));
     return { hostname, port };
 }
-exports.start = start;
 function availablePort(host, port) {
     return (0, portUtils_1.checkListenable)({
         address: host,
@@ -125,7 +132,6 @@ function getEmulatorEnvs() {
     (0, env_1.setEnvVarsForEmulators)(envs, emulatorInfos);
     return envs;
 }
-exports.getEmulatorEnvs = getEmulatorEnvs;
 async function tripFirebasePostinstall(rootDirectory, env) {
     const npmLs = (0, child_process_1.spawnSync)("npm", ["ls", "@firebase/util", "--json", "--long"], {
         cwd: rootDirectory,
@@ -168,7 +174,7 @@ async function getBackendAppConfig(projectId, backendId) {
         return undefined;
     }
     const backendsList = await apphosting.listBackends(projectId, "-").catch(() => undefined);
-    const backend = backendsList === null || backendsList === void 0 ? void 0 : backendsList.backends.find((b) => apphosting.parseBackendName(b.name).id === backendId);
+    const backend = backendsList?.backends.find((b) => apphosting.parseBackendName(b.name).id === backendId);
     if (!backend) {
         (0, utils_1.logLabeledWarning)("apphosting", `Unable to lookup details for backend ${backendId}. Firebase SDK autoinit will not be available.`);
         return undefined;

package/lib/emulator/auth/cloudFunctions.js

@@ -26,7 +26,7 @@ class AuthCloudFunction {
         catch (e) {
             err = e;
         }
-        if (err || (res === null || res === void 0 ? void 0 : res.status) !== 200) {
+        if (err || res?.status !== 200) {
             this.logger.logLabeled("WARN", "functions", `Firebase Authentication function was not triggered due to emulation error. Please file a bug.`);
         }
     }
@@ -44,7 +44,6 @@ class AuthCloudFunction {
         };
     }
     createUserInfoPayload(user) {
-        var _a;
         return {
             uid: user.localId,
             email: user.email,
@@ -62,7 +61,7 @@ class AuthCloudFunction {
                     : undefined,
             },
             customClaims: JSON.parse(user.customAttributes || "{}"),
-            providerData: (_a = user.providerUserInfo) === null || _a === void 0 ? void 0 : _a.map((info) => this.createProviderUserInfoPayload(info)),
+            providerData: user.providerUserInfo?.map((info) => this.createProviderUserInfoPayload(info)),
             tenantId: user.tenantId,
             mfaInfo: user.mfaInfo,
         };

package/lib/emulator/auth/errors.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = exports.NotImplementedError = exports.InternalError = exports.UnknownError = exports.NotFoundError = exports.PermissionDeniedError = exports.UnauthenticatedError = exports.InvalidArgumentError = exports.BadRequestError = exports.ApiError = void 0;
+exports.NotImplementedError = exports.InternalError = exports.UnknownError = exports.NotFoundError = exports.PermissionDeniedError = exports.UnauthenticatedError = exports.InvalidArgumentError = exports.BadRequestError = exports.ApiError = void 0;
+exports.assert = assert;
 const errors_1 = require("exegesis/lib/errors");
 class ApiError extends errors_1.ExtendableError {
     constructor(code, status, message, reasonOrErrors) {
@@ -74,4 +75,3 @@ function assert(assertion, error) {
         throw new BadRequestError(error);
     }
 }
-exports.assert = assert;

package/lib/emulator/auth/handlers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerHandlers = void 0;
+exports.registerHandlers = registerHandlers;
 const url_1 = require("url");
 const operations_1 = require("./operations");
 const errors_1 = require("./errors");
@@ -29,7 +29,7 @@ function registerHandlers(app, getProjectStateByApiKey) {
             case "recoverEmail": {
                 const oob = state.validateOobCode(oobCode);
                 const RETRY_INSTRUCTIONS = "If you're trying to test the reverting email flow, try changing the email again to generate a new link.";
-                if ((oob === null || oob === void 0 ? void 0 : oob.requestType) !== "RECOVER_EMAIL") {
+                if (oob?.requestType !== "RECOVER_EMAIL") {
                     return res.status(400).json({
                         authEmulator: {
                             error: `Requested mode does not match the OOB code provided.`,
@@ -63,7 +63,7 @@ function registerHandlers(app, getProjectStateByApiKey) {
             }
             case "resetPassword": {
                 const oob = state.validateOobCode(oobCode);
-                if ((oob === null || oob === void 0 ? void 0 : oob.requestType) !== "PASSWORD_RESET") {
+                if (oob?.requestType !== "PASSWORD_RESET") {
                     return res.status(400).json({
                         authEmulator: {
                             error: `Your request to reset your password has expired or the link has already been used.`,
@@ -290,7 +290,6 @@ function registerHandlers(app, getProjectStateByApiKey) {
 `);
     });
 }
-exports.registerHandlers = registerHandlers;
 function createFakeClaims(info) {
     const claims = {
         sub: info.rawId,

package/lib/emulator/auth/index.js

@@ -16,7 +16,7 @@ var SingleProjectMode;
     SingleProjectMode[SingleProjectMode["NO_WARNING"] = 0] = "NO_WARNING";
     SingleProjectMode[SingleProjectMode["WARNING"] = 1] = "WARNING";
     SingleProjectMode[SingleProjectMode["ERROR"] = 2] = "ERROR";
-})(SingleProjectMode = exports.SingleProjectMode || (exports.SingleProjectMode = {}));
+})(SingleProjectMode || (exports.SingleProjectMode = SingleProjectMode = {}));
 class AuthEmulator {
     constructor(args) {
         this.args = args;
@@ -53,7 +53,7 @@ class AuthEmulator {
         const { host, port } = this.getInfo();
         const configPath = path.join(authExportDir, "config.json");
         const configStat = await stat(configPath);
-        if (configStat === null || configStat === void 0 ? void 0 : configStat.isFile()) {
+        if (configStat?.isFile()) {
             logger.logLabeled("BULLET", "auth", `Importing config from ${configPath}`);
             await importFromFile({
                 method: "PATCH",
@@ -71,7 +71,7 @@ class AuthEmulator {
         }
         const accountsPath = path.join(authExportDir, "accounts.json");
         const accountsStat = await stat(accountsPath);
-        if (accountsStat === null || accountsStat === void 0 ? void 0 : accountsStat.isFile()) {
+        if (accountsStat?.isFile()) {
             logger.logLabeled("BULLET", "auth", `Importing accounts from ${accountsPath}`);
             await importFromFile({
                 method: "POST",
@@ -118,13 +118,13 @@ function importFromFile(reqOptions, path, options = {}) {
                 })
                     .on("error", reject)
                     .on("end", () => {
-                    const ignoreErrors = options === null || options === void 0 ? void 0 : options.ignoreErrors;
-                    if (ignoreErrors === null || ignoreErrors === void 0 ? void 0 : ignoreErrors.length) {
+                    const ignoreErrors = options?.ignoreErrors;
+                    if (ignoreErrors?.length) {
                         let message;
                         try {
                             message = JSON.parse(data).error.message;
                         }
-                        catch (_a) {
+                        catch {
                             message = undefined;
                         }
                         if (message && ignoreErrors.includes(message)) {