firebase-tools 10.4.0 → 10.4.1

package/lib/accountExporter.js

@@ -1,15 +1,17 @@
 "use strict";
-var os = require("os");
-var path = require("path");
-var _ = require("lodash");
-const { Client } = require("./apiv2");
-const { googleOrigin } = require("./api");
-var { FirebaseError } = require("./error");
-var utils = require("./utils");
-const apiClient = new Client({
-    urlPrefix: googleOrigin,
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serialExportUsers = exports.validateOptions = void 0;
+const _ = require("lodash");
+const os = require("os");
+const path = require("path");
+const apiv2_1 = require("./apiv2");
+const error_1 = require("./error");
+const api_1 = require("./api");
+const utils = require("./utils");
+const apiClient = new apiv2_1.Client({
+    urlPrefix: api_1.googleOrigin,
 });
-var EXPORTED_JSON_KEYS = [
+const EXPORTED_JSON_KEYS = [
     "localId",
     "email",
     "emailVerified",
@@ -23,44 +25,53 @@ var EXPORTED_JSON_KEYS = [
     "disabled",
     "customAttributes",
 ];
-var EXPORTED_JSON_KEYS_RENAMING = {
+const EXPORTED_JSON_KEYS_RENAMING = {
     lastLoginAt: "lastSignedInAt",
 };
-var EXPORTED_PROVIDER_USER_INFO_KEYS = ["providerId", "rawId", "email", "displayName", "photoUrl"];
-var PROVIDER_ID_INDEX_MAP = {
-    "google.com": 7,
-    "facebook.com": 11,
-    "twitter.com": 15,
-    "github.com": 19,
-};
-var _escapeComma = function (str) {
-    if (str.indexOf(",") !== -1) {
+const EXPORTED_PROVIDER_USER_INFO_KEYS = [
+    "providerId",
+    "rawId",
+    "email",
+    "displayName",
+    "photoUrl",
+];
+const PROVIDER_ID_INDEX_MAP = new Map([
+    ["google.com", 7],
+    ["facebook.com", 11],
+    ["twitter.com", 15],
+    ["github.com", 19],
+]);
+function escapeComma(str) {
+    if (str.includes(",")) {
         return `"${str}"`;
     }
     return str;
-};
-var _convertToNormalBase64 = function (data) {
+}
+function convertToNormalBase64(data) {
     return data.replace(/_/g, "/").replace(/-/g, "+");
-};
-var _addProviderUserInfo = function (providerInfo, arr, startPos) {
+}
+function addProviderUserInfo(providerInfo, arr, startPos) {
     arr[startPos] = providerInfo.rawId;
     arr[startPos + 1] = providerInfo.email || "";
-    arr[startPos + 2] = _escapeComma(providerInfo.displayName || "");
+    arr[startPos + 2] = escapeComma(providerInfo.displayName || "");
     arr[startPos + 3] = providerInfo.photoUrl || "";
-};
-var _transUserToArray = function (user) {
-    var arr = Array(27).fill("");
+}
+function transUserToArray(user) {
+    const arr = Array(27).fill("");
     arr[0] = user.localId;
     arr[1] = user.email || "";
     arr[2] = user.emailVerified || false;
-    arr[3] = _convertToNormalBase64(user.passwordHash || "");
-    arr[4] = _convertToNormalBase64(user.salt || "");
-    arr[5] = _escapeComma(user.displayName || "");
+    arr[3] = convertToNormalBase64(user.passwordHash || "");
+    arr[4] = convertToNormalBase64(user.salt || "");
+    arr[5] = escapeComma(user.displayName || "");
     arr[6] = user.photoUrl || "";
-    for (var i = 0; i < (!user.providerUserInfo ? 0 : user.providerUserInfo.length); i++) {
-        var providerInfo = user.providerUserInfo[i];
-        if (providerInfo && PROVIDER_ID_INDEX_MAP[providerInfo.providerId]) {
-            _addProviderUserInfo(providerInfo, arr, PROVIDER_ID_INDEX_MAP[providerInfo.providerId]);
+    for (let i = 0; i < (!user.providerUserInfo ? 0 : user.providerUserInfo.length); i++) {
+        const providerInfo = user.providerUserInfo[i];
+        if (providerInfo) {
+            const providerIndex = PROVIDER_ID_INDEX_MAP.get(providerInfo.providerId);
+            if (providerIndex) {
+                addProviderUserInfo(providerInfo, arr, providerIndex);
+            }
         }
     }
     arr[23] = user.createdAt;
@@ -69,36 +80,35 @@ var _transUserToArray = function (user) {
     arr[26] = user.disabled;
     arr[27] = user.customAttributes;
     return arr;
-};
-var _transUserJson = function (user) {
-    var newUser = {};
-    _.each(_.pick(user, EXPORTED_JSON_KEYS), function (value, key) {
-        var newKey = EXPORTED_JSON_KEYS_RENAMING[key] || key;
+}
+function transUserJson(user) {
+    const newUser = {};
+    _.each(_.pick(user, EXPORTED_JSON_KEYS), (value, key) => {
+        const newKey = EXPORTED_JSON_KEYS_RENAMING[key] || key;
         newUser[newKey] = value;
     });
     if (newUser.passwordHash) {
-        newUser.passwordHash = _convertToNormalBase64(newUser.passwordHash);
+        newUser.passwordHash = convertToNormalBase64(newUser.passwordHash);
     }
     if (newUser.salt) {
-        newUser.salt = _convertToNormalBase64(newUser.salt);
+        newUser.salt = convertToNormalBase64(newUser.salt);
     }
     if (user.providerUserInfo) {
         newUser.providerUserInfo = [];
-        user.providerUserInfo.forEach(function (providerInfo) {
-            if (!_.includes(Object.keys(PROVIDER_ID_INDEX_MAP), providerInfo.providerId)) {
-                return;
+        for (const providerInfo of user.providerUserInfo) {
+            if (PROVIDER_ID_INDEX_MAP.has(providerInfo.providerId)) {
+                newUser.providerUserInfo.push(_.pick(providerInfo, EXPORTED_PROVIDER_USER_INFO_KEYS));
             }
-            newUser.providerUserInfo.push(_.pick(providerInfo, EXPORTED_PROVIDER_USER_INFO_KEYS));
-        });
+        }
     }
     return newUser;
-};
-var validateOptions = function (options, fileName) {
-    var exportOptions = {};
+}
+function validateOptions(options, fileName) {
+    const exportOptions = {};
     if (fileName === undefined) {
-        throw new FirebaseError("Must specify data file", { exit: 1 });
+        throw new error_1.FirebaseError("Must specify data file");
     }
-    var extName = path.extname(fileName.toLowerCase());
+    const extName = path.extname(fileName.toLowerCase());
     if (extName === ".csv") {
         exportOptions.format = "csv";
     }
@@ -106,44 +116,44 @@ var validateOptions = function (options, fileName) {
         exportOptions.format = "json";
     }
     else if (options.format) {
-        var format = options.format.toLowerCase();
+        const format = options.format.toLowerCase();
         if (format === "csv" || format === "json") {
             exportOptions.format = format;
         }
         else {
-            throw new FirebaseError("Unsupported data file format, should be csv or json", { exit: 1 });
+            throw new error_1.FirebaseError("Unsupported data file format, should be csv or json");
         }
     }
     else {
-        throw new FirebaseError("Please specify data file format in file name, or use `format` parameter", {
-            exit: 1,
-        });
+        throw new error_1.FirebaseError("Please specify data file format in file name, or use `format` parameter");
     }
     return exportOptions;
-};
-var _createWriteUsersToFile = function () {
-    var jsonSep = "";
-    return function (userList, format, writeStream) {
-        userList.map(function (user) {
+}
+exports.validateOptions = validateOptions;
+function createWriteUsersToFile() {
+    let jsonSep = "";
+    return (userList, format, writeStream) => {
+        userList.map((user) => {
             if (user.passwordHash && user.version !== 0) {
                 delete user.passwordHash;
                 delete user.salt;
             }
             if (format === "csv") {
-                writeStream.write(_transUserToArray(user).join(",") + "," + os.EOL, "utf8");
+                writeStream.write(transUserToArray(user).join(",") + "," + os.EOL, "utf8");
             }
             else {
-                writeStream.write(jsonSep + JSON.stringify(_transUserJson(user), null, 2), "utf8");
+                writeStream.write(jsonSep + JSON.stringify(transUserJson(user), null, 2), "utf8");
                 jsonSep = "," + os.EOL;
             }
         });
     };
-};
-var serialExportUsers = function (projectId, options) {
+}
+async function serialExportUsers(projectId, options) {
+    var _a;
     if (!options.writeUsersToFile) {
-        options.writeUsersToFile = _createWriteUsersToFile();
+        options.writeUsersToFile = createWriteUsersToFile();
     }
-    var postBody = {
+    const postBody = {
         targetProjectId: projectId,
         maxResults: options.batchSize,
     };
@@ -153,13 +163,12 @@ var serialExportUsers = function (projectId, options) {
     if (!options.timeoutRetryCount) {
         options.timeoutRetryCount = 0;
     }
-    return apiClient
-        .post("/identitytoolkit/v3/relyingparty/downloadAccount", postBody, {
-        skipLog: { resBody: true },
-    })
-        .then(function (ret) {
+    try {
+        const ret = await apiClient.post("/identitytoolkit/v3/relyingparty/downloadAccount", postBody, {
+            skipLog: { resBody: true },
+        });
         options.timeoutRetryCount = 0;
-        var userList = ret.body.users;
+        const userList = ret.body.users;
         if (userList && userList.length > 0) {
             options.writeUsersToFile(userList, options.format, options.writeStream);
             utils.logSuccess("Exported " + userList.length + " account(s) successfully.");
@@ -169,19 +178,21 @@ var serialExportUsers = function (projectId, options) {
             options.nextPageToken = ret.body.nextPageToken;
             return serialExportUsers(projectId, options);
         }
-    })
-        .catch((err) => {
-        if (err.original.code === "ETIMEDOUT") {
+    }
+    catch (err) {
+        if (((_a = err.original) === null || _a === void 0 ? void 0 : _a.code) === "ETIMEDOUT") {
             options.timeoutRetryCount++;
             if (options.timeoutRetryCount > 5) {
                 return err;
             }
             return serialExportUsers(projectId, options);
         }
-    });
-};
-var accountExporter = {
-    validateOptions: validateOptions,
-    serialExportUsers: serialExportUsers,
-};
-module.exports = accountExporter;
+        if (err instanceof error_1.FirebaseError) {
+            throw err;
+        }
+        else {
+            throw new error_1.FirebaseError(`Failed to export accounts: ${err}`, { original: err });
+        }
+    }
+}
+exports.serialExportUsers = serialExportUsers;

package/lib/commands/functions-config-export.js

@@ -13,6 +13,7 @@ const utils_1 = require("../utils");
 const functional_1 = require("../functional");
 const configExport = require("../functions/runtimeConfigExport");
 const requireConfig_1 = require("../requireConfig");
+const projectConfig_1 = require("../functions/projectConfig");
 const REQUIRED_PERMISSIONS = [
     "runtimeconfig.configs.list",
     "runtimeconfig.configs.get",
@@ -79,6 +80,8 @@ exports.default = new command_1.Command("functions:config:export")
     .before(requireConfig_1.requireConfig)
     .before(requireInteractive_1.default)
     .action(async (options) => {
+    const config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions)[0];
+    const functionsDir = config.source;
     let pInfos = configExport.getProjectInfos(options);
     checkReservedAliases(pInfos);
     (0, utils_1.logBullet)("Importing functions configs from projects [" +
@@ -108,7 +111,6 @@ exports.default = new command_1.Command("functions:config:export")
     const filesToWrite = fromEntries((0, functional_1.zip)(filenames, dotEnvs));
     filesToWrite[".env.local"] = `${header}\n# .env.local file contains environment variables for the Functions Emulator.\n`;
     filesToWrite[".env"] = `${header}# .env file contains environment variables that applies to all projects.\n`;
-    const functionsDir = options.config.get("functions.source", ".");
     for (const [filename, content] of Object.entries(filesToWrite)) {
         await options.config.askWriteProjectFile(path.join(functionsDir, filename), content);
     }

package/lib/config.js

@@ -39,10 +39,17 @@ class Config {
                 _.set(this.data, target, this.materialize(target));
             }
         });
-        if (this.projectDir &&
-            !this.get("functions.source") &&
-            fsutils.dirExistsSync(this.path("functions"))) {
-            this.set("functions.source", Config.DEFAULT_FUNCTIONS_SOURCE);
+        if (this.projectDir && fsutils.dirExistsSync(this.path(Config.DEFAULT_FUNCTIONS_SOURCE))) {
+            if (Array.isArray(this.get("functions"))) {
+                if (!this.get("functions.[0].source")) {
+                    this.set("functions.[0].source", Config.DEFAULT_FUNCTIONS_SOURCE);
+                }
+            }
+            else {
+                if (!this.get("functions.source")) {
+                    this.set("functions.source", Config.DEFAULT_FUNCTIONS_SOURCE);
+                }
+            }
         }
     }
     materialize(target) {

package/lib/deploy/functions/deploy.js

@@ -9,7 +9,6 @@ const utils_1 = require("../../utils");
 const gcs = require("../../gcp/storage");
 const gcf = require("../../gcp/cloudfunctions");
 const gcfv2 = require("../../gcp/cloudfunctionsv2");
-const utils = require("../../utils");
 const backend = require("./backend");
 (0, tmp_1.setGracefulCleanup)();
 async function uploadSourceV1(context, region) {
@@ -33,7 +32,7 @@ async function uploadSourceV2(context, region) {
     context.storage = Object.assign(Object.assign({}, context.storage), { [region]: res.storageSource });
 }
 async function deploy(context, options, payload) {
-    if (!options.config.src.functions) {
+    if (!context.config) {
         return;
     }
     if (!context.functionsSourceV1 && !context.functionsSourceV2) {
@@ -53,12 +52,9 @@ async function deploy(context, options, payload) {
             }
         }
         await Promise.all(uploads);
-        utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
+        const source = context.config.source;
         if (uploads.length) {
-            (0, utils_1.logSuccess)(clc.green.bold("functions:") +
-                " " +
-                clc.bold(options.config.src.functions.source) +
-                " folder uploaded successfully");
+            (0, utils_1.logSuccess)(`${clc.green.bold("functions:")} ${clc.bold(source)} folder uploaded successfully`);
         }
     }
     catch (err) {

package/lib/deploy/functions/prepare.js

@@ -19,6 +19,7 @@ const logger_1 = require("../../logger");
 const triggerRegionHelper_1 = require("./triggerRegionHelper");
 const checkIam_1 = require("./checkIam");
 const error_1 = require("../../error");
+const projectConfig_1 = require("../../functions/projectConfig");
 function hasUserConfig(config) {
     return Object.keys(config).length > 1;
 }
@@ -28,16 +29,17 @@ function hasDotenv(opts) {
 async function prepare(context, options, payload) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
-    const sourceDirName = options.config.get("functions.source");
+    context.config = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions)[0];
+    const sourceDirName = context.config.source;
     if (!sourceDirName) {
-        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions.source defined in firebase.json`);
+        throw new error_1.FirebaseError(`No functions code detected at default location (./functions), and no functions source defined in firebase.json`);
     }
     const sourceDir = options.config.path(sourceDirName);
     const delegateContext = {
         projectId,
         sourceDir,
         projectDir: options.config.projectDir,
-        runtime: options.config.get("functions.runtime") || "",
+        runtime: context.config.runtime || "",
     };
     const runtimeDelegate = await runtimes.getRuntimeDelegate(delegateContext);
     logger_1.logger.debug(`Validating ${runtimeDelegate.name} source`);
@@ -95,10 +97,10 @@ async function prepare(context, options, payload) {
             " directory for uploading...");
     }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv1")) {
-        context.functionsSourceV1 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(runtimeConfig, options);
+        context.functionsSourceV1 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, context.config, runtimeConfig);
     }
     if (backend.someEndpoint(wantBackend, (e) => e.platform === "gcfv2")) {
-        context.functionsSourceV2 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(undefined, options);
+        context.functionsSourceV2 = await (0, prepareFunctionsUpload_1.prepareFunctionsUpload)(sourceDir, context.config);
     }
     for (const endpoint of backend.allEndpoints(wantBackend)) {
         endpoint.environmentVariables = wantBackend.environmentVariables;

package/lib/deploy/functions/prepareFunctionsUpload.js

@@ -48,15 +48,14 @@ async function pipeAsync(from, to) {
         from.pipe(to);
     });
 }
-async function packageSource(options, sourceDir, configValues) {
-    var _a;
+async function packageSource(sourceDir, config, runtimeConfig) {
     const tmpFile = tmp.fileSync({ prefix: "firebase-functions-", postfix: ".zip" }).name;
     const fileStream = fs.createWriteStream(tmpFile, {
         flags: "w",
         encoding: "binary",
     });
     const archive = archiver("zip");
-    const ignore = ((_a = options.config.src.functions) === null || _a === void 0 ? void 0 : _a.ignore) || ["node_modules", ".git"];
+    const ignore = config.ignore || ["node_modules", ".git"];
     ignore.push("firebase-debug.log", "firebase-debug.*.log", CONFIG_DEST_FILE);
     try {
         const files = await fsAsync.readdirRecursive({ path: sourceDir, ignore: ignore });
@@ -66,8 +65,8 @@ async function packageSource(options, sourceDir, configValues) {
                 mode: file.mode,
             });
         });
-        if (typeof configValues !== "undefined") {
-            archive.append(JSON.stringify(configValues, null, 2), {
+        if (typeof runtimeConfig !== "undefined") {
+            archive.append(JSON.stringify(runtimeConfig, null, 2), {
                 name: CONFIG_DEST_FILE,
                 mode: 420,
             });
@@ -81,20 +80,15 @@ async function packageSource(options, sourceDir, configValues) {
             exit: 1,
         });
     }
-    utils.assertDefined(options.config.src.functions);
-    utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
     utils.logBullet(clc.cyan.bold("functions:") +
         " packaged " +
-        clc.bold(options.config.src.functions.source) +
+        clc.bold(sourceDir) +
         " (" +
         filesize(archive.pointer()) +
         ") for uploading");
     return tmpFile;
 }
-async function prepareFunctionsUpload(runtimeConfig, options) {
-    utils.assertDefined(options.config.src.functions);
-    utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
-    const sourceDir = options.config.path(options.config.src.functions.source);
-    return packageSource(options, sourceDir, runtimeConfig);
+async function prepareFunctionsUpload(sourceDir, config, runtimeConfig) {
+    return packageSource(sourceDir, config, runtimeConfig);
 }
 exports.prepareFunctionsUpload = prepareFunctionsUpload;

package/lib/deploy/functions/release/fabricator.js

@@ -180,6 +180,13 @@ class Fabricator {
                     .catch(rethrowAs(endpoint, "set invoker"));
             }
         }
+        else if (backend.isCallableTriggered(endpoint)) {
+            await this.executor
+                .run(async () => {
+                await gcf.setInvokerCreate(endpoint.project, backend.functionName(endpoint), ["public"]);
+            })
+                .catch(rethrowAs(endpoint, "set invoker"));
+        }
         else if (backend.isTaskQueueTriggered(endpoint)) {
             const invoker = endpoint.taskQueueTrigger.invoker;
             if (invoker && !invoker.includes("private")) {
@@ -232,12 +239,17 @@ class Fabricator {
                     .catch(rethrowAs(endpoint, "set invoker"));
             }
         }
+        else if (backend.isCallableTriggered(endpoint)) {
+            await this.executor
+                .run(() => run.setInvokerCreate(endpoint.project, serviceName, ["public"]))
+                .catch(rethrowAs(endpoint, "set invoker"));
+        }
         else if (backend.isTaskQueueTriggered(endpoint)) {
             const invoker = endpoint.taskQueueTrigger.invoker;
             if (invoker && !invoker.includes("private")) {
                 await this.executor
                     .run(async () => {
-                    await gcf.setInvokerCreate(endpoint.project, backend.functionName(endpoint), invoker);
+                    await run.setInvokerCreate(endpoint.project, serviceName, invoker);
                 })
                     .catch(rethrowAs(endpoint, "set invoker"));
             }

package/lib/deploy/functions/release/index.js

@@ -15,7 +15,7 @@ const functionsConfig_1 = require("../../../functionsConfig");
 const functionsDeployHelper_1 = require("../functionsDeployHelper");
 const error_1 = require("../../../error");
 async function release(context, options, payload) {
-    if (!options.config.has("functions")) {
+    if (!context.config) {
         return;
     }
     const plan = planner.createDeploymentPlan(payload.functions.backend, await backend.existingBackend(context), { filters: context.filters });

package/lib/deploy/hosting/deploy.js

@@ -41,12 +41,22 @@ async function deploy(context, options) {
         const publicDir = options.config.path(deploy.config.public);
         const files = (0, listFiles_1.listFiles)(publicDir, deploy.config.ignore);
         (0, utils_1.logLabeledBullet)(`hosting[${deploy.site}]`, `found ${files.length} files in ${clc.bold(deploy.config.public)}`);
+        let concurrency = 200;
+        const envConcurrency = (0, utils_1.envOverride)("FIREBASE_HOSTING_UPLOAD_CONCURRENCY", "");
+        if (envConcurrency) {
+            const c = parseInt(envConcurrency, 10);
+            if (!isNaN(c) && c > 0) {
+                concurrency = c;
+            }
+        }
+        logger_1.logger.debug(`[hosting] uploading with ${concurrency} concurrency`);
         const uploader = new uploader_1.Uploader({
             version: deploy.version,
             files: files,
             public: publicDir,
             cwd: options.cwd,
             projectRoot: (0, detectProjectRoot_1.detectProjectRoot)(options),
+            uploadConcurrency: concurrency,
         });
         const progressInterval = setInterval(() => updateSpinner(uploader.statusMessage(), debugging), debugging ? 2000 : 200);
         try {

package/lib/emulator/controller.js

@@ -38,6 +38,7 @@ const getDefaultDatabaseInstance_1 = require("../getDefaultDatabaseInstance");
 const auth_2 = require("../auth");
 const extensionsEmulator_1 = require("./extensionsEmulator");
 const previews_1 = require("../previews");
+const projectConfig_1 = require("../functions/projectConfig");
 const START_LOGGING_EMULATOR = utils.envOverride("START_LOGGING_EMULATOR", "false", (val) => val === "true");
 async function getAndCheckAddress(emulator, options) {
     var _a, _b, _c, _d;
@@ -140,7 +141,7 @@ function filterEmulatorTargets(options) {
 }
 exports.filterEmulatorTargets = filterEmulatorTargets;
 function shouldStart(options, name) {
-    var _a, _b, _c;
+    var _a, _b;
     if (name === types_1.Emulators.HUB) {
         return !!options.project;
     }
@@ -155,9 +156,15 @@ function shouldStart(options, name) {
         }
         return (!!options.project && targets.some((target) => types_1.EMULATORS_SUPPORTED_BY_UI.includes(target)));
     }
-    if (name === types_1.Emulators.FUNCTIONS && emulatorInTargets && !((_c = options.config.src.functions) === null || _c === void 0 ? void 0 : _c.source)) {
-        emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("WARN", "functions", `The functions emulator is configured but there is no functions source directory. Have you run ${clc.bold("firebase init functions")}?`);
-        return false;
+    if (name === types_1.Emulators.FUNCTIONS && emulatorInTargets) {
+        try {
+            (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions);
+            return true;
+        }
+        catch (err) {
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("WARN", "functions", `The functions emulator is configured but there is no functions source directory. Have you run ${clc.bold("firebase init functions")}?`);
+            return false;
+        }
     }
     if (name === types_1.Emulators.HOSTING && emulatorInTargets && !options.config.get("hosting")) {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.HOSTING).logLabeled("WARN", "hosting", `The hosting emulator is configured but there is no hosting configuration. Have you run ${clc.bold("firebase init hosting")}?`);
@@ -253,16 +260,15 @@ async function startAll(options, showUI = true) {
     const emulatableBackends = [];
     const projectDir = (options.extDevDir || options.config.projectDir);
     if (shouldStart(options, types_1.Emulators.FUNCTIONS)) {
-        utils.assertDefined(options.config.src.functions);
-        utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
+        const functionsCfg = (0, projectConfig_1.normalizeAndValidate)(options.config.src.functions)[0];
         utils.assertIsStringOrUndefined(options.extDevDir);
-        const functionsDir = path.join(projectDir, options.config.src.functions.source);
+        const functionsDir = path.join(projectDir, functionsCfg.source);
         emulatableBackends.push({
             functionsDir,
             env: Object.assign({}, options.extDevEnv),
             secretEnv: [],
             predefinedTriggers: options.extDevTriggers,
-            nodeMajorVersion: (0, functionsEmulatorUtils_1.parseRuntimeVersion)(options.extDevNodeVersion || options.config.get("functions.runtime")),
+            nodeMajorVersion: (0, functionsEmulatorUtils_1.parseRuntimeVersion)(options.extDevNodeVersion || functionsCfg.runtime),
         });
     }
     if (shouldStart(options, types_1.Emulators.EXTENSIONS) && previews_1.previews.extensionsemulator) {

package/lib/emulator/downloadableEmulators.js

@@ -40,13 +40,13 @@ exports.DownloadDetails = {
         },
     },
     storage: {
-        downloadPath: path.join(CACHE_DIR, "cloud-storage-rules-runtime-v1.0.1.jar"),
-        version: "1.0.1",
+        downloadPath: path.join(CACHE_DIR, "cloud-storage-rules-runtime-v1.0.2.jar"),
+        version: "1.0.2",
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v1.0.1.jar",
-            expectedSize: 32729999,
-            expectedChecksum: "1a441f5e16c17aa7a27db71c9c9186d5",
+            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v1.0.2.jar",
+            expectedSize: 35704306,
+            expectedChecksum: "0dd3e17939610fc3dbdf53fb24cfda86",
             namePrefix: "cloud-storage-rules-emulator",
         },
     },

package/lib/extensions/askUserForParam.js

@@ -129,9 +129,9 @@ async function askForParam(args) {
                 valid = checkResponse(response, paramSpec);
                 break;
             case extensionsApi_1.ParamType.SECRET:
-                while (!secretLocations.length) {
-                    secretLocations = await promptSecretLocations();
-                }
+                do {
+                    secretLocations = await promptSecretLocations(paramSpec);
+                } while (!isValidSecretLocations(secretLocations, paramSpec));
                 if (secretLocations.includes(SecretLocation.CLOUD.toString())) {
                     response = args.reconfiguring
                         ? await promptReconfigureSecret(args.projectId, args.instanceId, paramSpec)
@@ -155,14 +155,40 @@ async function askForParam(args) {
     return Object.assign({ baseValue: response }, (responseForLocal ? { local: responseForLocal } : {}));
 }
 exports.askForParam = askForParam;
-async function promptSecretLocations() {
+function isValidSecretLocations(secretLocations, paramSpec) {
+    if (paramSpec.required) {
+        return !!secretLocations.length;
+    }
+    return true;
+}
+async function promptSecretLocations(paramSpec) {
+    if (paramSpec.required) {
+        return await (0, prompt_1.promptOnce)({
+            name: "input",
+            type: "checkbox",
+            message: "Where would you like to store your secrets? You must select at least one value",
+            choices: [
+                {
+                    checked: true,
+                    name: "Google Cloud Secret Manager",
+                    value: SecretLocation.CLOUD.toString(),
+                },
+                {
+                    checked: false,
+                    name: "Local file (Only used by Firebase Emulator)",
+                    value: SecretLocation.LOCAL.toString(),
+                },
+            ],
+        });
+    }
     return await (0, prompt_1.promptOnce)({
         name: "input",
         type: "checkbox",
-        message: "Where would you like to store your secrets? You must select at least one value",
+        message: "Where would you like to store your secrets? " +
+            "If you don't want to set this optional secret, leave both options unselected to skip it",
         choices: [
             {
-                checked: true,
+                checked: false,
                 name: "Google Cloud Secret Manager",
                 value: SecretLocation.CLOUD.toString(),
             },

package/lib/functions/projectConfig.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeAndValidate = exports.validate = exports.normalize = void 0;
+const error_1 = require("../error");
+function normalize(config) {
+    if (!config) {
+        throw new error_1.FirebaseError("No valid functions configuration detected in firebase.json");
+    }
+    if (Array.isArray(config)) {
+        if (config.length < 1) {
+            throw new error_1.FirebaseError("Requires at least one functions.source in firebase.json.");
+        }
+        return config;
+    }
+    return [config];
+}
+exports.normalize = normalize;
+function validateSingle(config) {
+    if (!config.source) {
+        throw new error_1.FirebaseError("functions.source must be specified");
+    }
+    return Object.assign(Object.assign({}, config), { source: config.source });
+}
+function validate(config) {
+    if (config.length > 1) {
+        throw new error_1.FirebaseError("More than one functions.source detected in firebase.json.");
+    }
+    return [validateSingle(config[0])];
+}
+exports.validate = validate;
+function normalizeAndValidate(config) {
+    return validate(normalize(config));
+}
+exports.normalizeAndValidate = normalizeAndValidate;

package/lib/init/features/functions/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.doSetup = void 0;
 const clc = require("cli-color");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const requirePermissions_1 = require("../../../requirePermissions");
 const previews_1 = require("../../../previews");
 const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
-module.exports = async function (setup, config, options) {
+async function doSetup(setup, config, options) {
     var _a, _b;
     logger_1.logger.info();
     logger_1.logger.info("A " + clc.bold("functions") + " directory will be created in your project with sample code");
@@ -44,4 +45,5 @@ module.exports = async function (setup, config, options) {
         choices,
     });
     return require("./" + language)(setup, config);
-};
+}
+exports.doSetup = doSetup;

package/lib/init/features/hosting/index.js

@@ -1,23 +1,23 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doSetup = void 0;
 const clc = require("cli-color");
 const fs = require("fs");
-const { Client } = require("../../../apiv2");
-const { initGitHub } = require("./github");
-const { prompt } = require("../../../prompt");
-const { logger } = require("../../../logger");
+const apiv2_1 = require("../../../apiv2");
+const github_1 = require("./github");
+const prompt_1 = require("../../../prompt");
+const logger_1 = require("../../../logger");
 const INDEX_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/index.html", "utf8");
 const MISSING_TEMPLATE = fs.readFileSync(__dirname + "/../../../../templates/init/hosting/404.html", "utf8");
 const DEFAULT_IGNORES = ["firebase.json", "**/.*", "**/node_modules/**"];
-module.exports = function (setup, config, options) {
+async function doSetup(setup, config, options) {
     setup.hosting = {};
-    logger.info();
-    logger.info("Your " +
-        clc.bold("public") +
-        " directory is the folder (relative to your project directory) that");
-    logger.info("will contain Hosting assets to be uploaded with " + clc.bold("firebase deploy") + ". If you");
-    logger.info("have a build process for your assets, use your build's output directory.");
-    logger.info();
-    return prompt(setup.hosting, [
+    logger_1.logger.info();
+    logger_1.logger.info(`Your ${clc.bold("public")} directory is the folder (relative to your project directory) that`);
+    logger_1.logger.info(`will contain Hosting assets to be uploaded with ${clc.bold("firebase deploy")}. If you`);
+    logger_1.logger.info("have a build process for your assets, use your build's output directory.");
+    logger_1.logger.info();
+    await (0, prompt_1.prompt)(setup.hosting, [
         {
             name: "public",
             type: "input",
@@ -36,31 +36,22 @@ module.exports = function (setup, config, options) {
             default: false,
             message: "Set up automatic builds and deploys with GitHub?",
         },
-    ]).then(function () {
-        setup.config.hosting = {
-            public: setup.hosting.public,
-            ignore: DEFAULT_IGNORES,
-        };
-        let next;
-        if (setup.hosting.spa) {
-            setup.config.hosting.rewrites = [{ source: "**", destination: "/index.html" }];
-            next = Promise.resolve();
-        }
-        else {
-            next = config.askWriteProjectFile(setup.hosting.public + "/404.html", MISSING_TEMPLATE);
-        }
-        return next
-            .then(() => {
-            const c = new Client({ urlPrefix: "https://www.gstatic.com", auth: false });
-            return c.get("/firebasejs/releases.json");
-        })
-            .then((response) => {
-            return config.askWriteProjectFile(setup.hosting.public + "/index.html", INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version));
-        })
-            .then(() => {
-            if (setup.hosting.github) {
-                return initGitHub(setup, config, options);
-            }
-        });
-    });
-};
+    ]);
+    setup.config.hosting = {
+        public: setup.hosting.public,
+        ignore: DEFAULT_IGNORES,
+    };
+    if (setup.hosting.spa) {
+        setup.config.hosting.rewrites = [{ source: "**", destination: "/index.html" }];
+    }
+    else {
+        await config.askWriteProjectFile(`${setup.hosting.public}/404.html`, MISSING_TEMPLATE);
+    }
+    const c = new apiv2_1.Client({ urlPrefix: "https://www.gstatic.com", auth: false });
+    const response = await c.get("/firebasejs/releases.json");
+    await config.askWriteProjectFile(`${setup.hosting.public}/index.html`, INDEX_TEMPLATE.replace(/{{VERSION}}/g, response.body.current.version));
+    if (setup.hosting.github) {
+        return (0, github_1.initGitHub)(setup, config, options);
+    }
+}
+exports.doSetup = doSetup;

package/lib/init/features/index.js

@@ -1,13 +1,23 @@
 "use strict";
-module.exports = {
-    account: require("./account").doSetup,
-    database: require("./database").doSetup,
-    firestore: require("./firestore").doSetup,
-    functions: require("./functions"),
-    hosting: require("./hosting"),
-    storage: require("./storage").doSetup,
-    emulators: require("./emulators").doSetup,
-    project: require("./project").doSetup,
-    remoteconfig: require("./remoteconfig").doSetup,
-    "hosting:github": require("./hosting/github").initGitHub,
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hostingGithub = exports.remoteconfig = exports.project = exports.emulators = exports.storage = exports.hosting = exports.functions = exports.firestore = exports.database = exports.account = void 0;
+var account_1 = require("./account");
+Object.defineProperty(exports, "account", { enumerable: true, get: function () { return account_1.doSetup; } });
+var database_1 = require("./database");
+Object.defineProperty(exports, "database", { enumerable: true, get: function () { return database_1.doSetup; } });
+var firestore_1 = require("./firestore");
+Object.defineProperty(exports, "firestore", { enumerable: true, get: function () { return firestore_1.doSetup; } });
+var functions_1 = require("./functions");
+Object.defineProperty(exports, "functions", { enumerable: true, get: function () { return functions_1.doSetup; } });
+var hosting_1 = require("./hosting");
+Object.defineProperty(exports, "hosting", { enumerable: true, get: function () { return hosting_1.doSetup; } });
+var storage_1 = require("./storage");
+Object.defineProperty(exports, "storage", { enumerable: true, get: function () { return storage_1.doSetup; } });
+var emulators_1 = require("./emulators");
+Object.defineProperty(exports, "emulators", { enumerable: true, get: function () { return emulators_1.doSetup; } });
+var project_1 = require("./project");
+Object.defineProperty(exports, "project", { enumerable: true, get: function () { return project_1.doSetup; } });
+var remoteconfig_1 = require("./remoteconfig");
+Object.defineProperty(exports, "remoteconfig", { enumerable: true, get: function () { return remoteconfig_1.doSetup; } });
+var github_1 = require("./hosting/github");
+Object.defineProperty(exports, "hostingGithub", { enumerable: true, get: function () { return github_1.initGitHub; } });

package/lib/init/index.js

@@ -1,22 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
-const _ = require("lodash");
+const lodash_1 = require("lodash");
 const clc = require("cli-color");
+const error_1 = require("../error");
 const logger_1 = require("../logger");
-const _features = require("./features");
-const utils = require("../utils");
-const features = _features;
+const features = require("./features");
+const featureFns = new Map([
+    ["account", features.account],
+    ["database", features.database],
+    ["firestore", features.firestore],
+    ["functions", features.functions],
+    ["hosting", features.hosting],
+    ["storage", features.storage],
+    ["emulators", features.emulators],
+    ["project", features.project],
+    ["remoteconfig", features.remoteconfig],
+    ["hosting:github", features.hostingGithub],
+]);
 async function init(setup, config, options) {
-    const nextFeature = setup.features ? setup.features.shift() : undefined;
+    var _a;
+    const nextFeature = (_a = setup.features) === null || _a === void 0 ? void 0 : _a.shift();
     if (nextFeature) {
-        if (!features[nextFeature]) {
-            return utils.reject(clc.bold(nextFeature) +
-                " is not a valid feature. Must be one of " +
-                _.without(_.keys(features), "project").join(", "));
+        if (!featureFns.has(nextFeature)) {
+            const availableFeatures = Object.keys(features)
+                .filter((f) => f !== "project")
+                .join(", ");
+            throw new error_1.FirebaseError(`${clc.bold(nextFeature)} is not a valid feature. Must be one of ${availableFeatures}`);
         }
-        logger_1.logger.info(clc.bold("\n" + clc.white("=== ") + _.capitalize(nextFeature) + " Setup"));
-        await Promise.resolve(features[nextFeature](setup, config, options));
+        logger_1.logger.info(clc.bold(`\n${clc.white("===")} ${(0, lodash_1.capitalize)(nextFeature)} Setup`));
+        const fn = featureFns.get(nextFeature);
+        if (!fn) {
+            throw new error_1.FirebaseError(`We've lost the function to init ${nextFeature}`, { exit: 2 });
+        }
+        await fn(setup, config, options);
         return init(setup, config, options);
     }
 }

package/lib/serve/functions.js

@@ -7,6 +7,7 @@ const emulatorServer_1 = require("../emulator/emulatorServer");
 const functionsEmulatorUtils_1 = require("../emulator/functionsEmulatorUtils");
 const projectUtils_1 = require("../projectUtils");
 const auth_1 = require("../auth");
+const projectConfig = require("../functions/projectConfig");
 const utils = require("../utils");
 class FunctionsServer {
     constructor() {
@@ -20,11 +21,10 @@ class FunctionsServer {
     }
     async start(options, partialArgs) {
         const projectId = (0, projectUtils_1.needProjectId)(options);
-        utils.assertDefined(options.config.src.functions);
-        utils.assertDefined(options.config.src.functions.source, "Error: 'functions.source' is not defined");
-        const functionsDir = path.join(options.config.projectDir, options.config.src.functions.source);
+        const config = projectConfig.normalizeAndValidate(options.config.src.functions)[0];
+        const functionsDir = path.join(options.config.projectDir, config.source);
         const account = (0, auth_1.getProjectDefaultAccount)(options.config.projectDir);
-        const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(options.config.get("functions.runtime"));
+        const nodeMajorVersion = (0, functionsEmulatorUtils_1.parseRuntimeVersion)(config.runtime);
         this.backend = {
             functionsDir,
             nodeMajorVersion,
@@ -40,7 +40,7 @@ class FunctionsServer {
             utils.assertIsNumber(options.port);
             const targets = options.targets;
             const port = options.port;
-            const hostingRunning = targets && targets.indexOf("hosting") >= 0;
+            const hostingRunning = targets && targets.includes("hosting");
             if (hostingRunning) {
                 args.port = port + 1;
             }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.4.0",
+      "version": "10.4.1",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "10.4.0",
+  "version": "10.4.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

package/schema/firebase-config.json

@@ -326,54 +326,111 @@
             "type": "object"
         },
         "functions": {
-            "additionalProperties": false,
-            "properties": {
-                "ignore": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "postdeploy": {
-                    "anyOf": [
-                        {
+            "anyOf": [
+                {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ignore": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        {
+                        "postdeploy": {
+                            "anyOf": [
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "predeploy": {
+                            "anyOf": [
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "runtime": {
+                            "enum": [
+                                "nodejs10",
+                                "nodejs12",
+                                "nodejs14",
+                                "nodejs16"
+                            ],
+                            "type": "string"
+                        },
+                        "source": {
                             "type": "string"
                         }
-                    ]
+                    },
+                    "type": "object"
                 },
-                "predeploy": {
-                    "anyOf": [
-                        {
-                            "items": {
+                {
+                    "items": {
+                        "additionalProperties": false,
+                        "properties": {
+                            "ignore": {
+                                "items": {
+                                    "type": "string"
+                                },
+                                "type": "array"
+                            },
+                            "postdeploy": {
+                                "anyOf": [
+                                    {
+                                        "items": {
+                                            "type": "string"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "type": "string"
+                                    }
+                                ]
+                            },
+                            "predeploy": {
+                                "anyOf": [
+                                    {
+                                        "items": {
+                                            "type": "string"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "type": "string"
+                                    }
+                                ]
+                            },
+                            "runtime": {
+                                "enum": [
+                                    "nodejs10",
+                                    "nodejs12",
+                                    "nodejs14",
+                                    "nodejs16"
+                                ],
                                 "type": "string"
                             },
-                            "type": "array"
+                            "source": {
+                                "type": "string"
+                            }
                         },
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "runtime": {
-                    "enum": [
-                        "nodejs10",
-                        "nodejs12",
-                        "nodejs14",
-                        "nodejs16"
-                    ],
-                    "type": "string"
-                },
-                "source": {
-                    "type": "string"
+                        "type": "object"
+                    },
+                    "type": "array"
                 }
-            },
-            "type": "object"
+            ]
         },
         "hosting": {
             "anyOf": [