firebase-tools 14.3.1 → 14.4.0

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.actuate = exports.askQuestions = exports.doSetup = void 0;
 const logger_1 = require("../../../logger");
 const apiEnabled = require("../../../ensureApiEnabled");
 const requirePermissions_1 = require("../../../requirePermissions");
@@ -10,42 +10,73 @@ const indexes = require("./indexes");
 const error_1 = require("../../../error");
 const clc = require("colorette");
 const prompt_1 = require("../../../prompt");
-async function checkProjectSetup(setup, config, options) {
+async function checkProjectSetup(setup, options, info) {
     const firestoreUnusedError = new error_1.FirebaseError(`It looks like you haven't used Cloud Firestore in this project before. Go to ${clc.bold(clc.underline(`https://console.firebase.google.com/project/${setup.projectId}/firestore`))} to create your Cloud Firestore database.`, { exit: 1 });
     const isFirestoreEnabled = await apiEnabled.check(setup.projectId, "firestore.googleapis.com", "", true);
     if (!isFirestoreEnabled) {
         throw firestoreUnusedError;
     }
-    const dbType = await getDatabaseType(setup);
-    logger_1.logger.debug(`database_type: ${dbType}`);
-    if (!dbType) {
-        throw firestoreUnusedError;
+    info.databaseId = info.databaseId || "(default)";
+    let dbType = await (0, checkDatabaseType_1.checkDatabaseType)(setup.projectId, info.databaseId);
+    if (dbType === "DATABASE_DOES_NOT_EXIST") {
+        info.databaseId = await selectDatabaseByPrompting();
+        dbType = await (0, checkDatabaseType_1.checkDatabaseType)(setup.projectId, info.databaseId);
     }
-    else if (dbType !== "FIRESTORE_NATIVE") {
+    if (dbType !== "FIRESTORE_NATIVE") {
+        logger_1.logger.debug(`firestore database_type: ${dbType}`);
         throw new error_1.FirebaseError(`It looks like this project is using Cloud Datastore or Cloud Firestore in Datastore mode. The Firebase CLI can only manage projects using Cloud Firestore in Native mode. For more information, visit https://cloud.google.com/datastore/docs/firestore-or-datastore`, { exit: 1 });
     }
     await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: setup.projectId }));
 }
-async function getDatabaseType(setup) {
-    const dbType = await (0, checkDatabaseType_1.checkDatabaseType)(setup.projectId, setup.databaseId);
-    logger_1.logger.debug(`database_type: ${dbType}`);
-    if (dbType === "DATABASE_DOES_NOT_EXIST") {
-        setup.databaseId = await selectDatabaseByPrompting();
-        return await getDatabaseType(setup);
-    }
-    else {
-        return dbType;
-    }
-}
 function selectDatabaseByPrompting() {
     return (0, prompt_1.input)("Please input the name of the Native Firestore database you would like to use:");
 }
 async function doSetup(setup, config, options) {
+    await askQuestions(setup, config, options);
+    await actuate(setup, config);
+}
+exports.doSetup = doSetup;
+async function askQuestions(setup, config, options) {
+    const firestore = !Array.isArray(setup.config.firestore) ? setup.config.firestore : undefined;
+    const info = {
+        databaseId: (firestore === null || firestore === void 0 ? void 0 : firestore.database) || "",
+        rulesFilename: (firestore === null || firestore === void 0 ? void 0 : firestore.rules) || "",
+        rules: "",
+        writeRules: true,
+        indexesFilename: (firestore === null || firestore === void 0 ? void 0 : firestore.indexes) || "",
+        indexes: "",
+        writeIndexes: true,
+    };
     if (setup.projectId) {
-        await checkProjectSetup(setup, config, options);
+        await checkProjectSetup(setup, options, info);
     }
-    setup.config.firestore = {};
-    await rules.initRules(setup, config);
-    await indexes.initIndexes(setup, config);
+    await rules.initRules(setup, config, info);
+    await indexes.initIndexes(setup, config, info);
+    setup.featureInfo = setup.featureInfo || {};
+    setup.featureInfo.firestore = info;
 }
-exports.doSetup = doSetup;
+exports.askQuestions = askQuestions;
+async function actuate(setup, config) {
+    var _a;
+    const info = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.firestore;
+    if (!info) {
+        throw new error_1.FirebaseError("Firestore featureInfo is not found");
+    }
+    info.databaseId = info.databaseId || "(default)";
+    info.rules = info.rules || rules.getDefaultRules();
+    info.rulesFilename = info.rulesFilename || rules.DEFAULT_RULES_FILE;
+    info.indexes = info.indexes || indexes.INDEXES_TEMPLATE;
+    info.indexesFilename = info.indexesFilename || indexes.DEFAULT_INDEXES_FILE;
+    setup.config.firestore = {
+        database: info.databaseId,
+        rules: info.rulesFilename,
+        indexes: info.indexesFilename,
+    };
+    if (info.writeRules) {
+        config.writeProjectFile(info.rulesFilename, info.rules);
+    }
+    if (info.writeIndexes) {
+        config.writeProjectFile(info.indexesFilename, info.indexes);
+    }
+}
+exports.actuate = actuate;

package/lib/init/features/firestore/indexes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initIndexes = void 0;
+exports.initIndexes = exports.INDEXES_TEMPLATE = exports.DEFAULT_INDEXES_FILE = void 0;
 const clc = require("colorette");
 const error_1 = require("../../../error");
 const api = require("../../../firestore/api");
@@ -9,50 +9,49 @@ const prompt_1 = require("../../../prompt");
 const logger_1 = require("../../../logger");
 const templates_1 = require("../../../templates");
 const indexes = new api.FirestoreApi();
-const INDEXES_TEMPLATE = (0, templates_1.readTemplateSync)("init/firestore/firestore.indexes.json");
-async function initIndexes(setup, config) {
+exports.DEFAULT_INDEXES_FILE = "firestore.indexes.json";
+exports.INDEXES_TEMPLATE = (0, templates_1.readTemplateSync)("init/firestore/firestore.indexes.json");
+async function initIndexes(setup, config, info) {
     logger_1.logger.info();
     logger_1.logger.info("Firestore indexes allow you to perform complex queries while");
     logger_1.logger.info("maintaining performance that scales with the size of the result");
     logger_1.logger.info("set. You can keep index definitions in your project directory");
     logger_1.logger.info("and publish them with " + clc.bold("firebase deploy") + ".");
     logger_1.logger.info();
-    const filename = setup.config.firestore.indexes ||
-        (await (0, prompt_1.input)({
-            message: "What file should be used for Firestore indexes?",
-            default: "firestore.indexes.json",
-        }));
-    setup.config.firestore.indexes = filename;
-    if (fsutils.fileExistsSync(filename)) {
+    info.indexesFilename =
+        info.indexesFilename ||
+            (await (0, prompt_1.input)({
+                message: "What file should be used for Firestore indexes?",
+                default: exports.DEFAULT_INDEXES_FILE,
+            }));
+    if (fsutils.fileExistsSync(info.indexesFilename)) {
         const msg = "File " +
-            clc.bold(filename) +
+            clc.bold(info.indexesFilename) +
             " already exists." +
             " Do you want to overwrite it with the Firestore Indexes from the Firebase Console?";
         if (!(await (0, prompt_1.confirm)(msg))) {
+            info.writeIndexes = false;
             return;
         }
     }
-    if (!setup.projectId) {
-        return config.writeProjectFile(setup.config.firestore.indexes, INDEXES_TEMPLATE);
+    if (setup.projectId) {
+        info.indexes = await getIndexesFromConsole(setup.projectId, info.databaseId);
     }
-    return getIndexesFromConsole(setup.projectId, setup.databaseId).then((contents) => {
-        return config.writeProjectFile(setup.config.firestore.indexes, contents);
-    });
 }
 exports.initIndexes = initIndexes;
-function getIndexesFromConsole(projectId, databaseId) {
+async function getIndexesFromConsole(projectId, databaseId) {
     const indexesPromise = indexes.listIndexes(projectId, databaseId);
     const fieldOverridesPromise = indexes.listFieldOverrides(projectId, databaseId);
-    return Promise.all([indexesPromise, fieldOverridesPromise])
-        .then((res) => {
-        return indexes.makeIndexSpec(res[0], res[1]);
-    })
-        .catch((e) => {
+    try {
+        const res = await Promise.all([indexesPromise, fieldOverridesPromise]);
+        return JSON.stringify(indexes.makeIndexSpec(res[0], res[1]), null, 2);
+    }
+    catch (e) {
         if (e.message.indexOf("is not a Cloud Firestore enabled project") >= 0) {
-            return INDEXES_TEMPLATE;
+            return exports.INDEXES_TEMPLATE;
         }
         throw new error_1.FirebaseError("Error fetching Firestore indexes", {
             original: e,
         });
-    });
+    }
 }

package/lib/init/features/firestore/rules.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initRules = void 0;
+exports.initRules = exports.getDefaultRules = exports.DEFAULT_RULES_FILE = void 0;
 const clc = require("colorette");
 const gcp = require("../../../gcp");
 const fsutils = require("../../../fsutils");
@@ -8,60 +8,54 @@ const prompt_1 = require("../../../prompt");
 const logger_1 = require("../../../logger");
 const utils = require("../../../utils");
 const templates_1 = require("../../../templates");
-const DEFAULT_RULES_FILE = "firestore.rules";
+exports.DEFAULT_RULES_FILE = "firestore.rules";
 const RULES_TEMPLATE = (0, templates_1.readTemplateSync)("init/firestore/firestore.rules");
-async function initRules(setup, config) {
+function getDefaultRules() {
+    const date = utils.thirtyDaysFromNow();
+    const formattedForRules = `${date.getFullYear()}, ${date.getMonth() + 1}, ${date.getDate()}`;
+    return RULES_TEMPLATE.replace(/{{IN_30_DAYS}}/g, formattedForRules);
+}
+exports.getDefaultRules = getDefaultRules;
+async function initRules(setup, config, info) {
     logger_1.logger.info();
     logger_1.logger.info("Firestore Security Rules allow you to define how and when to allow");
     logger_1.logger.info("requests. You can keep these rules in your project directory");
     logger_1.logger.info("and publish them with " + clc.bold("firebase deploy") + ".");
     logger_1.logger.info();
-    const filename = setup.config.firestore.rules ||
-        (await (0, prompt_1.input)({
-            message: "What file should be used for Firestore Rules?",
-            default: DEFAULT_RULES_FILE,
-        }));
-    setup.config.firestore.rules = filename;
-    if (fsutils.fileExistsSync(filename)) {
+    info.rulesFilename =
+        info.rulesFilename ||
+            (await (0, prompt_1.input)({
+                message: "What file should be used for Firestore Rules?",
+                default: exports.DEFAULT_RULES_FILE,
+            }));
+    if (fsutils.fileExistsSync(info.rulesFilename)) {
         const msg = "File " +
-            clc.bold(filename) +
+            clc.bold(info.rulesFilename) +
             " already exists." +
             " Do you want to overwrite it with the Firestore Rules from the Firebase Console?";
         if (!(await (0, prompt_1.confirm)(msg))) {
+            info.writeRules = false;
             return;
         }
     }
-    if (!setup.projectId) {
-        return config.writeProjectFile(setup.config.firestore.rules, getDefaultRules());
+    if (setup.projectId) {
+        info.rules = await getRulesFromConsole(setup.projectId);
     }
-    return getRulesFromConsole(setup.projectId).then((contents) => {
-        return config.writeProjectFile(setup.config.firestore.rules, contents);
-    });
 }
 exports.initRules = initRules;
-function getDefaultRules() {
-    const date = utils.thirtyDaysFromNow();
-    const formattedForRules = `${date.getFullYear()}, ${date.getMonth() + 1}, ${date.getDate()}`;
-    return RULES_TEMPLATE.replace(/{{IN_30_DAYS}}/g, formattedForRules);
-}
-function getRulesFromConsole(projectId) {
-    return gcp.rules
-        .getLatestRulesetName(projectId, "cloud.firestore")
-        .then((name) => {
-        if (!name) {
-            logger_1.logger.debug("No rulesets found, using default.");
-            return [{ name: DEFAULT_RULES_FILE, content: getDefaultRules() }];
-        }
-        logger_1.logger.debug("Found ruleset: " + name);
-        return gcp.rules.getRulesetContent(name);
-    })
-        .then((rules) => {
-        if (rules.length <= 0) {
-            return utils.reject("Ruleset has no files", { exit: 1 });
-        }
-        if (rules.length > 1) {
-            return utils.reject("Ruleset has too many files: " + rules.length, { exit: 1 });
-        }
-        return rules[0].content;
-    });
+async function getRulesFromConsole(projectId) {
+    const name = await gcp.rules.getLatestRulesetName(projectId, "cloud.firestore");
+    if (!name) {
+        logger_1.logger.debug("No rulesets found, using default.");
+        return getDefaultRules();
+    }
+    logger_1.logger.debug("Found ruleset: " + name);
+    const rules = await gcp.rules.getRulesetContent(name);
+    if (rules.length <= 0) {
+        return utils.reject("Ruleset has no files", { exit: 1 });
+    }
+    if (rules.length > 1) {
+        return utils.reject("Ruleset has too many files: " + rules.length, { exit: 1 });
+    }
+    return rules[0].content;
 }

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

@@ -9,6 +9,7 @@ const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 const projectConfig_1 = require("../../../functions/projectConfig");
 const error_1 = require("../../../error");
 const api_1 = require("../../../api");
+const supported = require("../../../deploy/functions/runtimes/supported");
 const MAX_ATTEMPTS = 5;
 async function doSetup(setup, config, options) {
     var _a, _b;
@@ -168,6 +169,7 @@ async function languageSetup(setup, config) {
             break;
         case "python":
             cbconfig.ignore = ["venv", ".git", "firebase-debug.log", "firebase-debug.*.log", "*.local"];
+            cbconfig.runtime = supported.latest("python");
             break;
     }
     setup.functions.languageChoice = language;

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

@@ -5,6 +5,7 @@ const npm_dependencies_1 = require("./npm-dependencies");
 const prompt_1 = require("../../../prompt");
 const projectConfig_1 = require("../../../functions/projectConfig");
 const templates_1 = require("../../../templates");
+const supported = require("../../../deploy/functions/runtimes/supported");
 const INDEX_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/index.js");
 const PACKAGE_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/package.lint.json");
 const PACKAGE_NO_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/javascript/package.nolint.json");
@@ -17,11 +18,11 @@ async function setup(setup, config) {
     if (setup.functions.lint) {
         const cbconfig = (0, projectConfig_1.configForCodebase)(setup.config.functions, setup.functions.codebase);
         cbconfig.predeploy = ['npm --prefix "$RESOURCE_DIR" run lint'];
-        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE);
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE.replace("{{RUNTIME}}", supported.latest("nodejs").replace("nodejs", "")));
         await config.askWriteProjectFile(`${setup.functions.source}/.eslintrc.js`, ESLINT_TEMPLATE);
     }
     else {
-        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE);
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE.replace("{{RUNTIME}}", supported.latest("nodejs").replace("nodejs", "")));
     }
     await config.askWriteProjectFile(`${setup.functions.source}/index.js`, INDEX_TEMPLATE);
     await config.askWriteProjectFile(`${setup.functions.source}/.gitignore`, GITIGNORE_TEMPLATE);

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

@@ -5,6 +5,7 @@ const npm_dependencies_1 = require("./npm-dependencies");
 const prompt_1 = require("../../../prompt");
 const projectConfig_1 = require("../../../functions/projectConfig");
 const templates_1 = require("../../../templates");
+const supported = require("../../../deploy/functions/runtimes/supported");
 const PACKAGE_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/package.lint.json");
 const PACKAGE_NO_LINTING_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/package.nolint.json");
 const ESLINT_TEMPLATE = (0, templates_1.readTemplateSync)("init/functions/typescript/_eslintrc");
@@ -24,13 +25,13 @@ async function setup(setup, config) {
     if (setup.functions.lint) {
         cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run lint');
         cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run build');
-        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE);
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_LINTING_TEMPLATE.replace("{{RUNTIME}}", supported.latest("nodejs").replace("nodejs", "")));
         await config.askWriteProjectFile(`${setup.functions.source}/.eslintrc.js`, ESLINT_TEMPLATE);
         await config.askWriteProjectFile(`${setup.functions.source}/tsconfig.dev.json`, TSCONFIG_DEV_TEMPLATE);
     }
     else {
         cbconfig.predeploy.push('npm --prefix "$RESOURCE_DIR" run build');
-        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE);
+        await config.askWriteProjectFile(`${setup.functions.source}/package.json`, PACKAGE_NO_LINTING_TEMPLATE.replace("{{RUNTIME}}", supported.latest("nodejs").replace("nodejs", "")));
     }
     await config.askWriteProjectFile(`${setup.functions.source}/tsconfig.json`, TSCONFIG_TEMPLATE);
     await config.askWriteProjectFile(`${setup.functions.source}/src/index.ts`, INDEX_TEMPLATE);

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

@@ -89,8 +89,9 @@ function showStartMessage(setup, command) {
     logger_1.logger.info("Then start the Genkit developer experience by running:");
     logger_1.logger.info(clc.bold(clc.green(`    ${command}`)));
 }
-async function doSetup(setup, config, options) {
+async function doSetup(initSetup, config, options) {
     var _a;
+    const setup = initSetup;
     const genkitInfo = await getGenkitInfo();
     if (genkitInfo.stopInstall) {
         (0, utils_1.logLabeledWarning)("genkit", "Stopped Genkit initialization");

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

@@ -67,7 +67,7 @@ async function initGitHub(setup) {
     (0, utils_1.logSuccess)(`Uploaded service account JSON to GitHub as secret ${(0, colorette_1.bold)(githubSecretName)}.`);
     (0, utils_1.logBullet)(`You can manage your secrets at https://github.com/${repo}/settings/secrets.`);
     logger_1.logger.info();
-    if (setup.config.hosting.predeploy) {
+    if (!Array.isArray(setup.config.hosting) && setup.config.hosting.predeploy) {
         (0, utils_1.logBullet)(`You have a predeploy script configured in firebase.json.`);
     }
     const { script } = await promptForBuildScript((_a = setup === null || setup === void 0 ? void 0 : setup.hosting) === null || _a === void 0 ? void 0 : _a.useWebFrameworks);
@@ -259,7 +259,7 @@ async function uploadSecretToGitHub(repo, ghAccessToken, encryptedServiceAccount
 async function promptForRepo(options, ghAccessToken) {
     let key = "";
     let keyId = "";
-    const { repo } = options.repo ||
+    const repo = options.repo ||
         (await (0, prompt_1.input)({
             default: defaultGithubRepo(),
             message: "For which GitHub repository would you like to set up a GitHub workflow? (format: user/repository)",
@@ -287,6 +287,7 @@ async function promptForRepo(options, ghAccessToken) {
                 return true;
             },
         }));
+    options.repo = repo;
     return { repo, key, keyId };
 }
 async function promptForBuildScript(useWebFrameworks) {

package/lib/init/features/index.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genkit = exports.apphosting = exports.dataconnectSdk = exports.dataconnect = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storage = exports.hosting = exports.functions = exports.firestore = exports.database = exports.account = void 0;
+exports.genkit = exports.apphosting = exports.dataconnectSdk = exports.dataconnectPostSetup = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storage = exports.hosting = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = 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; } });
+Object.defineProperty(exports, "databaseAskQuestions", { enumerable: true, get: function () { return database_1.askQuestions; } });
+Object.defineProperty(exports, "databaseActuate", { enumerable: true, get: function () { return database_1.actuate; } });
 var firestore_1 = require("./firestore");
-Object.defineProperty(exports, "firestore", { enumerable: true, get: function () { return firestore_1.doSetup; } });
+Object.defineProperty(exports, "firestoreAskQuestions", { enumerable: true, get: function () { return firestore_1.askQuestions; } });
+Object.defineProperty(exports, "firestoreActuate", { enumerable: true, get: function () { return firestore_1.actuate; } });
 var functions_1 = require("./functions");
 Object.defineProperty(exports, "functions", { enumerable: true, get: function () { return functions_1.doSetup; } });
 var hosting_1 = require("./hosting");
@@ -24,7 +26,9 @@ Object.defineProperty(exports, "remoteconfig", { enumerable: true, get: function
 var github_1 = require("./hosting/github");
 Object.defineProperty(exports, "hostingGithub", { enumerable: true, get: function () { return github_1.initGitHub; } });
 var dataconnect_1 = require("./dataconnect");
-Object.defineProperty(exports, "dataconnect", { enumerable: true, get: function () { return dataconnect_1.doSetup; } });
+Object.defineProperty(exports, "dataconnectAskQuestions", { enumerable: true, get: function () { return dataconnect_1.askQuestions; } });
+Object.defineProperty(exports, "dataconnectActuate", { enumerable: true, get: function () { return dataconnect_1.actuate; } });
+Object.defineProperty(exports, "dataconnectPostSetup", { enumerable: true, get: function () { return dataconnect_1.postSetup; } });
 var sdk_1 = require("./dataconnect/sdk");
 Object.defineProperty(exports, "dataconnectSdk", { enumerable: true, get: function () { return sdk_1.doSetup; } });
 var apphosting_1 = require("./apphosting");

package/lib/init/features/remoteconfig.js

@@ -5,7 +5,6 @@ const prompt_1 = require("../../prompt");
 const fsutils = require("../../fsutils");
 const clc = require("colorette");
 async function doSetup(setup, config) {
-    setup.config.remoteconfig = {};
     const jsonFilePath = await (0, prompt_1.input)({
         message: "What file should be used for your Remote Config template?",
         default: "remoteconfig.template.json",
@@ -20,7 +19,9 @@ async function doSetup(setup, config) {
             return;
         }
     }
-    setup.config.remoteconfig.template = jsonFilePath;
+    setup.config.remoteconfig = {
+        template: jsonFilePath,
+    };
     config.writeProjectFile(setup.config.remoteconfig.template, "{}");
 }
 exports.doSetup = doSetup;

package/lib/init/index.js

@@ -1,45 +1,97 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
+exports.actuate = exports.init = void 0;
 const lodash_1 = require("lodash");
 const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const features = require("./features");
-const featureFns = new Map([
-    ["account", features.account],
-    ["database", features.database],
-    ["firestore", features.firestore],
-    ["dataconnect", features.dataconnect],
-    ["dataconnect:sdk", features.dataconnectSdk],
-    ["functions", features.functions],
-    ["hosting", features.hosting],
-    ["storage", features.storage],
-    ["emulators", features.emulators],
-    ["extensions", features.extensions],
-    ["project", features.project],
-    ["remoteconfig", features.remoteconfig],
-    ["hosting:github", features.hostingGithub],
-    ["genkit", features.genkit],
-    ["apphosting", features.apphosting],
-]);
+const featuresList = [
+    { name: "account", doSetup: features.account },
+    {
+        name: "database",
+        askQuestions: features.databaseAskQuestions,
+        actuate: features.databaseActuate,
+    },
+    {
+        name: "firestore",
+        askQuestions: features.firestoreAskQuestions,
+        actuate: features.firestoreActuate,
+    },
+    {
+        name: "dataconnect",
+        askQuestions: features.dataconnectAskQuestions,
+        actuate: features.dataconnectActuate,
+        postSetup: features.dataconnectPostSetup,
+    },
+    { name: "dataconnect:sdk", doSetup: features.dataconnectSdk },
+    { name: "functions", doSetup: features.functions },
+    { name: "hosting", doSetup: features.hosting },
+    { name: "storage", doSetup: features.storage },
+    { name: "emulators", doSetup: features.emulators },
+    { name: "extensions", doSetup: features.extensions },
+    { name: "project", doSetup: features.project },
+    { name: "remoteconfig", doSetup: features.remoteconfig },
+    { name: "hosting:github", doSetup: features.hostingGithub },
+    { name: "genkit", doSetup: features.genkit },
+    { name: "apphosting", displayName: "App Hosting", doSetup: features.apphosting },
+];
+const featureMap = new Map(featuresList.map((feature) => [feature.name, feature]));
 async function init(setup, config, options) {
     var _a;
     const nextFeature = (_a = setup.features) === null || _a === void 0 ? void 0 : _a.shift();
     if (nextFeature) {
-        if (!featureFns.has(nextFeature)) {
+        const f = featureMap.get(nextFeature);
+        if (!f) {
             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("===")} ${(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 });
+        logger_1.logger.info(clc.bold(`\n${clc.white("===")} ${f.displayName || (0, lodash_1.capitalize)(nextFeature)} Setup`));
+        if (f.doSetup) {
+            await f.doSetup(setup, config, options);
+        }
+        else {
+            if (f.askQuestions) {
+                await f.askQuestions(setup, config, options);
+            }
+            if (f.actuate) {
+                await f.actuate(setup, config, options);
+            }
+        }
+        if (f.postSetup) {
+            await f.postSetup(setup, config, options);
         }
-        await fn(setup, config, options);
         return init(setup, config, options);
     }
 }
 exports.init = init;
+async function actuate(setup, config, options) {
+    var _a;
+    const nextFeature = (_a = setup.features) === null || _a === void 0 ? void 0 : _a.shift();
+    if (nextFeature) {
+        const f = lookupFeature(nextFeature);
+        logger_1.logger.info(clc.bold(`\n${clc.white("===")} ${(0, lodash_1.capitalize)(nextFeature)} Setup Actuation`));
+        if (f.doSetup) {
+            throw new error_1.FirebaseError(`The feature ${nextFeature} does not support actuate yet. Please run ${clc.bold("firebase init " + nextFeature)} instead.`);
+        }
+        else {
+            if (f.actuate) {
+                await f.actuate(setup, config, options);
+            }
+        }
+        return actuate(setup, config, options);
+    }
+}
+exports.actuate = actuate;
+function lookupFeature(feature) {
+    const f = featureMap.get(feature);
+    if (!f) {
+        const availableFeatures = Object.keys(features)
+            .filter((f) => f !== "project")
+            .join(", ");
+        throw new error_1.FirebaseError(`${clc.bold(feature)} is not a valid feature. Must be one of ${availableFeatures}`);
+    }
+    return f;
+}