firebase-tools 15.15.0 → 15.16.0

package/lib/deploy/hosting/prepare.js

@@ -74,6 +74,7 @@ async function prepare(context, options) {
         return Promise.resolve();
     }
     const versions = await Promise.all(configs.map(async (config) => {
+        await api.getSite(context.projectId, config.site);
         const labels = {
             ...deploymentTool.labels(),
         };

package/lib/emulator/adminSdkConfig.js

@@ -6,6 +6,7 @@ const api_1 = require("../api");
 const apiv2 = require("../apiv2");
 const configstore_1 = require("../configstore");
 const error_1 = require("../error");
+const error_2 = require("../error");
 const logger_1 = require("../logger");
 const constants_1 = require("./constants");
 const _CONFIGSTORE_KEY = "adminsdkconfig";
@@ -50,7 +51,7 @@ async function getProjectAdminSdkConfig(projectId) {
     }
     catch (err) {
         throw new error_1.FirebaseError(`Failed to get Admin SDK for Firebase project ${projectId}. ` +
-            "Please make sure the project exists and your account has permission to access it.", { exit: 2, original: err });
+            "Please make sure the project exists and your account has permission to access it.", { exit: 2, original: (0, error_2.getError)(err) });
     }
 }
 function setCacheAdminSdkConfig(projectId, config) {

package/lib/emulator/apphosting/serve.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
 exports.getEmulatorEnvs = getEmulatorEnvs;
 const net_1 = require("net");
-const clc = require("colorette");
 const portUtils_1 = require("../portUtils");
 const developmentServer_1 = require("./developmentServer");
 const constants_1 = require("../constants");
@@ -15,7 +14,7 @@ const projectPath_1 = require("../../projectPath");
 const registry_1 = require("../registry");
 const env_1 = require("../env");
 const error_1 = require("../../error");
-const secrets = require("../../gcp/secretManager");
+const index_1 = require("../../apphosting/secrets/index");
 const utils_1 = require("../../utils");
 const apphosting = require("../../gcp/apphosting");
 const constants_2 = require("../constants");
@@ -24,42 +23,6 @@ const child_process_1 = require("child_process");
 const semver_1 = require("semver");
 const utils_2 = require("../../apphosting/utils");
 const apps_1 = require("../../management/apps");
-const secretResourceRegex = /^projects\/([^/]+)\/secrets\/([^/]+)(?:\/versions\/((?:latest)|\d+))?$/;
-const secretShorthandRegex = /^([^/@]+)(?:@((?:latest)|\d+))?$/;
-async function loadSecret(project, name) {
-    let projectId;
-    let secretId;
-    let version;
-    const match = secretResourceRegex.exec(name);
-    if (match) {
-        projectId = match[1];
-        secretId = match[2];
-        version = match[3] || "latest";
-    }
-    else {
-        const match = secretShorthandRegex.exec(name);
-        if (!match) {
-            throw new error_1.FirebaseError(`Invalid secret name: ${name}`);
-        }
-        if (!project) {
-            throw new error_1.FirebaseError(`Cannot load secret ${match[1]} without a project. ` +
-                `Please use ${clc.bold("firebase use")} or pass the --project flag.`);
-        }
-        projectId = project;
-        secretId = match[1];
-        version = match[2] || "latest";
-    }
-    try {
-        return await secrets.accessSecretVersion(projectId, secretId, version);
-    }
-    catch (err) {
-        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.`);
-        }
-        throw err;
-    }
-}
 async function start(options) {
     const hostname = constants_1.DEFAULT_HOST;
     let port = options?.port ?? constants_1.DEFAULT_PORTS.apphosting;
@@ -94,7 +57,7 @@ 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?.projectId, value.secret),
+        value.value ? value.value : await (0, index_1.loadSecret)(options?.projectId, value.secret),
     ]);
     const environmentVariablesToInject = {
         NODE_ENV: process.env.NODE_ENV,

package/lib/emulator/commandUtils.js

@@ -23,6 +23,7 @@ const requireAuth_1 = require("../requireAuth");
 const requireConfig_1 = require("../requireConfig");
 const types_1 = require("./types");
 const error_1 = require("../error");
+const error_2 = require("../error");
 const registry_1 = require("./registry");
 const projectUtils_1 = require("../projectUtils");
 const prompt_1 = require("../prompt");
@@ -330,7 +331,9 @@ async function checkJavaMajorVersion() {
             });
         }
         catch (err) {
-            return reject(new error_1.FirebaseError(`Could not spawn \`java -version\`. ${JAVA_HINT}`, { original: err }));
+            return reject(new error_1.FirebaseError(`Could not spawn \`java -version\`. ${JAVA_HINT}`, {
+                original: (0, error_2.getError)(err),
+            }));
         }
         let output = "";
         let error = "";

package/lib/emulator/controller.js

@@ -20,6 +20,7 @@ const types_1 = require("./types");
 const constants_1 = require("./constants");
 const functionsEmulator_1 = require("./functionsEmulator");
 const error_1 = require("../error");
+const error_2 = require("../error");
 const projectUtils_1 = require("../projectUtils");
 const commandUtils = require("./commandUtils");
 const hub_1 = require("./hub");
@@ -118,7 +119,7 @@ function shouldStart(options, name) {
             return true;
         }
         catch (err) {
-            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("ERROR", "functions", `Failed to start Functions emulator: ${err.message}`);
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.FUNCTIONS).logLabeled("ERROR", "functions", `Failed to start Functions emulator: ${(0, error_2.getErrMsg)(err)}`);
             return false;
         }
     }
@@ -501,7 +502,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             }
         }
         catch (e) {
-            databaseLogger.log("DEBUG", `Failed to retrieve default database instance: ${JSON.stringify(e)}`);
+            databaseLogger.log("DEBUG", `Failed to retrieve default database instance: ${(0, error_2.getErrMsg)(e)}`);
         }
         const rc = dbRulesConfig.normalizeRulesConfig(dbRulesConfig.getRulesConfig(projectId, options), options);
         logger_1.logger.debug("database rules config: ", JSON.stringify(rc));
@@ -770,7 +771,7 @@ async function exportEmulatorData(exportPath, options, initiatedBy) {
     catch (e) {
         throw new error_1.FirebaseError("Export request failed, see emulator logs for more information.", {
             exit: 1,
-            original: e,
+            original: (0, error_2.getError)(e),
         });
     }
     utils.logSuccess("Export complete");

package/lib/emulator/dataconnectEmulator.js

@@ -11,6 +11,7 @@ const constants_1 = require("./constants");
 const downloadableEmulators_1 = require("./downloadableEmulators");
 const types_1 = require("./types");
 const error_1 = require("../error");
+const error_2 = require("../error");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_2 = require("../dataconnect/types");
 const portUtils_1 = require("./portUtils");
@@ -48,7 +49,7 @@ class DataConnectEmulator {
             }
         }
         catch (err) {
-            this.logger.log("DEBUG", `'fdc build' failed with error: ${err.message}`);
+            this.logger.log("DEBUG", `'fdc build' failed with error: ${(0, error_2.getErrMsg)(err)}`);
         }
         const env = await DataConnectEmulator.getEnv(this.args.account, this.args.extraEnv);
         await (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
@@ -239,7 +240,7 @@ class DataConnectEmulator {
                 if (i === MAX_RETRIES) {
                     throw err;
                 }
-                this.logger.logLabeled("DEBUG", "SQL Connect", `Retrying connectToPostgress call (${i} of ${MAX_RETRIES} attempts): ${err}`);
+                this.logger.logLabeled("DEBUG", "SQL Connect", `Retrying connectToPostgress call (${i} of ${MAX_RETRIES} attempts): ${(0, error_2.getErrMsg)(err)}`);
                 await new Promise((resolve) => setTimeout(resolve, 2000));
             }
         }
@@ -270,8 +271,10 @@ class DataConnectEmulatorClient {
             return res;
         }
         catch (err) {
-            if (err.status === 500) {
-                throw new error_1.FirebaseError(`SQL Connect emulator: ${err?.context?.body?.message}`);
+            const status = (0, error_2.getErrStatus)(err);
+            if (status === 500) {
+                const message = err?.context?.body?.message;
+                throw new error_1.FirebaseError(`SQL Connect emulator: ${message || String(err)}`);
             }
             throw err;
         }

package/lib/emulator/downloadableEmulatorInfo.json

@@ -8,12 +8,12 @@
         "downloadPathRelativeToCacheDir": "firebase-database-emulator-v4.11.2.jar"
     },
     "firestore": {
-        "version": "1.20.4",
-        "expectedSize": 136551710,
-        "expectedChecksum": "8397dac992e02454914dec28d23b6ed8",
-        "expectedChecksumSHA256": "49ee7814741b481ae5becfdaa7b55693bdf7a03363cd184e35c36c1595a9643",
-        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.20.4.jar",
-        "downloadPathRelativeToCacheDir": "cloud-firestore-emulator-v1.20.4.jar"
+        "version": "1.21.0",
+        "expectedSize": 138093843,
+        "expectedChecksum": "6449ec69bc1228e36591ff6dad94fe1a",
+        "expectedChecksumSHA256": "c3d3680a89d946a90a027365ea14c26c6472a162bcf37f099bbb1ebd66d25e8e",
+        "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.21.0.jar",
+        "downloadPathRelativeToCacheDir": "cloud-firestore-emulator-v1.21.0.jar"
     },
     "storage": {
         "version": "1.1.3",
@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.4.5",
-            "expectedSize": 32269984,
-            "expectedChecksum": "5c50dbd6f508998f748195691b5b0678",
-            "expectedChecksumSHA256": "2053e5c47dbe52c923be196cfd7ff70b31f9e2fbde0e7eaeb20c31ee91e8a8b2",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.5",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.5"
+            "version": "3.4.6",
+            "expectedSize": 32361376,
+            "expectedChecksum": "85cf160307a0ff39b8e625676b89789e",
+            "expectedChecksumSHA256": "4f66d53776975c32df3c86870602965d2a5a495a14d86906cdbea84c8e40156b",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.6",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6"
         },
         "darwin_arm64": {
-            "version": "3.4.5",
-            "expectedSize": 30437250,
-            "expectedChecksum": "40f531afa3664284bc319f9721388816",
-            "expectedChecksumSHA256": "8dd59223a43b0e07ac2c7e40abb5e1a56ea7b7b787d23ceed20f8fe9af9c88e0",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.5",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.5"
+            "version": "3.4.6",
+            "expectedSize": 30504594,
+            "expectedChecksum": "c1e5c18caa1fadcaf813c98bc05a8d77",
+            "expectedChecksumSHA256": "1934ec8f6e8788a5521801072df278950b9525b0294c97cc009e65a7446d5567",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.6",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6"
         },
         "win32": {
-            "version": "3.4.5",
-            "expectedSize": 32311296,
-            "expectedChecksum": "406caa49a4d48c03ade3da4a4a6b08b3",
-            "expectedChecksumSHA256": "e6e392f5bc3c32faa95d9b1139497492e51c46cb354e30e65c20d575ee3ba9cf",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.5",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.5.exe"
+            "version": "3.4.6",
+            "expectedSize": 32401408,
+            "expectedChecksum": "c57c0ca3c50f358122ac741e501c9fde",
+            "expectedChecksumSHA256": "ed4bde0ebf9499ffd8915091f9ec3886a1c5ba145f54261b1c8c701a38268984",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.6",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6.exe"
         },
         "linux": {
-            "version": "3.4.5",
-            "expectedSize": 31428792,
-            "expectedChecksum": "2e09522cff69142b6882e71516ad0e3c",
-            "expectedChecksumSHA256": "86565d7724762e45a76a4627791b60248cfea81f332d45709d69be0e71a3c6ec",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.5",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.5"
+            "version": "3.4.6",
+            "expectedSize": 31518904,
+            "expectedChecksum": "b05791a643618dd8fbdb5e56b474c45b",
+            "expectedChecksumSHA256": "716ca10ddb2341873fc0febcffbc84420ac1f20262c3d08f9422cee025d1f60e",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.6",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.6"
         }
     }
 }

package/lib/emulator/functionsEmulator.js

@@ -522,7 +522,8 @@ class FunctionsEmulator {
                     await this.startRuntime(emulatableBackend);
                 }
                 catch (e) {
-                    this.logger.logLabeled("ERROR", `Failed to start functions in ${emulatableBackend.functionsDir}: ${e}`);
+                    const message = e instanceof Error ? e.message : String(e);
+                    this.logger.logLabeled("ERROR", `Failed to start functions in ${emulatableBackend.functionsDir}: ${message}`);
                 }
             }
         }
@@ -716,7 +717,7 @@ class FunctionsEmulator {
             await client.post(apiPath, bundle, { headers: { Authorization: "Bearer owner" } });
         }
         catch (err) {
-            this.logger.log("WARN", "Error adding Realtime Database function: " + err);
+            this.logger.log("WARN", "Error adding Realtime Database function: " + String(err));
             throw err;
         }
         return true;
@@ -779,7 +780,7 @@ class FunctionsEmulator {
             signature === "cloudevent" ? await client.post(path, bundle) : await client.put(path, bundle);
         }
         catch (err) {
-            this.logger.log("WARN", "Error adding firestore function: " + err);
+            this.logger.log("WARN", "Error adding firestore function: " + String(err));
             throw err;
         }
         return true;
@@ -1034,8 +1035,12 @@ class FunctionsEmulator {
             secretEnvs = functionsEnv.parseStrict(data);
         }
         catch (e) {
-            if (e.code !== "ENOENT") {
-                this.logger.logLabeled("ERROR", "functions", `Failed to read local secrets file ${secretPath}: ${e.message}`);
+            if (typeof e === "object" && e !== null && "code" in e) {
+                const code = e.code;
+                if (code !== "ENOENT") {
+                    const message = e instanceof Error ? e.message : String(e);
+                    this.logger.logLabeled("ERROR", "functions", `Failed to read local secrets file ${secretPath}: ${message}`);
+                }
             }
         }
         const secrets = trigger?.secretEnvironmentVariables || backend.secretEnv;
@@ -1273,8 +1278,9 @@ class FunctionsEmulator {
                 await this.startRuntime(record.backend, trigger);
             }
             catch (e) {
+                const message = e instanceof Error ? e.message : String(e);
                 this.logger.logLabeled("ERROR", `Failed to handle request for function ${trigger.id}`);
-                this.logger.logLabeled("ERROR", `Failed to start functions in ${record.backend.functionsDir}: ${e}`);
+                this.logger.logLabeled("ERROR", `Failed to start functions in ${record.backend.functionsDir}: ${message}`);
                 return;
             }
         }

package/lib/emulator/functionsEmulatorRuntime.js

@@ -6,6 +6,7 @@ const bodyParser = require("body-parser");
 const url_1 = require("url");
 const _ = require("lodash");
 const types_1 = require("./types");
+const error_1 = require("../error");
 const constants_1 = require("./constants");
 const functionsEmulatorShared_1 = require("./functionsEmulatorShared");
 const functionsEmulatorUtils_1 = require("./functionsEmulatorUtils");
@@ -475,8 +476,14 @@ async function loadTriggers() {
         triggerModule = require(process.cwd());
     }
     catch (err) {
-        if (err.code !== "ERR_REQUIRE_ESM") {
-            await moduleResolutionDetective(err);
+        if (typeof err === "object" && err !== null && "code" in err) {
+            const code = err.code;
+            if (code !== "ERR_REQUIRE_ESM") {
+                await moduleResolutionDetective(err);
+                throw err;
+            }
+        }
+        else {
             throw err;
         }
         const modulePath = require.resolve(process.cwd());
@@ -528,7 +535,7 @@ async function main() {
         functionModule = await loadTriggers();
     }
     catch (e) {
-        new types_1.EmulatorLog("FATAL", "runtime-status", `Failed to initialize and load triggers. This shouldn't happen: ${e.message}`).log();
+        new types_1.EmulatorLog("FATAL", "runtime-status", `Failed to initialize and load triggers. This shouldn't happen: ${(0, error_1.getErrMsg)(e)}`).log();
         await flushAndExit(1);
     }
     const app = express();
@@ -586,8 +593,8 @@ async function main() {
             }
         }
         catch (err) {
-            new types_1.EmulatorLog("FATAL", "runtime-error", err.stack ? err.stack : err).log();
-            res.status(500).send(err.message);
+            new types_1.EmulatorLog("FATAL", "runtime-error", (0, error_1.getErrStack)(err)).log();
+            res.status(500).send((0, error_1.getErrMsg)(err));
         }
     });
     app.listen(process.env.PORT, () => {

package/lib/emulator/functionsRuntimeWorker.js

@@ -206,9 +206,12 @@ class RuntimeWorker {
                 break;
             }
             catch (err) {
-                if (["ECONNREFUSED", "ENOENT"].includes(err?.code)) {
-                    await sleep(100);
-                    continue;
+                if (typeof err === "object" && err !== null && "code" in err) {
+                    const code = err.code;
+                    if (typeof code === "string" && ["ECONNREFUSED", "ENOENT"].includes(code)) {
+                        await sleep(100);
+                        continue;
+                    }
                 }
                 throw err;
             }

package/lib/experiments.js

@@ -76,7 +76,7 @@ exports.ALL_EXPERIMENTS = experiments({
     },
     dartfunctions: {
         shortDescription: "Enable Dart Functions.",
-        public: false,
+        public: true,
         default: false,
     },
     emulatoruisnapshot: {
@@ -158,6 +158,11 @@ exports.ALL_EXPERIMENTS = experiments({
         default: false,
         public: true,
     },
+    mcpapps: {
+        shortDescription: "Enables MCP Apps features",
+        fullDescription: "Enables MCP Apps features, including returning UI resource URIs.",
+        public: true,
+    },
     fdcift: {
         shortDescription: "Enable instrumentless trial for SQL Connect",
         default: true,

package/lib/frameworks/angular/index.js

@@ -30,7 +30,12 @@ async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "angular.json"))))
         return;
     const version = (0, utils_2.getAngularVersion)(dir);
-    return { mayWantBackend: true, version };
+    const mayWantBackend = !!(0, utils_1.findDependency)("@angular/platform-server", {
+        cwd: dir,
+        depth: 0,
+        omitDev: false,
+    });
+    return { mayWantBackend, version };
 }
 function init(setup, config) {
     (0, child_process_1.execSync)(`npx --yes -p @angular/cli@"${exports.supportedRange}" ng new ${setup.projectId} --directory ${setup.featureInfo.hosting.source} --skip-git`, {

package/lib/gcp/rules.js

@@ -28,8 +28,7 @@ function _handleErrorResponse(response) {
         code: 2,
     });
 }
-async function getLatestRulesetName(projectId, service, resourceName) {
-    const releases = await listAllReleases(projectId);
+async function getLatestRulesetName(projectId, service, releases, resourceName) {
     let prefix = `projects/${projectId}/releases/${service}`;
     if (resourceName) {
         prefix += `/${resourceName}`;
@@ -111,8 +110,13 @@ async function deleteRuleset(projectId, id) {
     }
     return _handleErrorResponse(response);
 }
-async function createRuleset(projectId, files) {
-    const payload = { source: { files } };
+async function createRuleset(projectId, files, attachmentPoint) {
+    const payload = {
+        source: { files },
+    };
+    if (attachmentPoint) {
+        payload.attachment_point = attachmentPoint;
+    }
     const response = await apiClient.post(`/projects/${projectId}/rulesets`, payload, { skipLog: { body: true } });
     if (response.status === 200) {
         logger_1.logger.debug("[rules] created ruleset", response.body.name);

package/lib/init/features/agentSkills.js

@@ -5,10 +5,10 @@ exports.actuate = actuate;
 const agentSkills_1 = require("../../agentSkills");
 const logger_1 = require("../../logger");
 const error_1 = require("../../error");
-async function askQuestions(setup) {
+async function askQuestions(setup, config, options) {
     try {
         logger_1.logger.info("If you are using an AI coding agent, Firebase Agent Skills make it an expert at Firebase.");
-        const shouldInstall = await (0, agentSkills_1.promptForAgentSkills)();
+        const shouldInstall = await (0, agentSkills_1.promptForAgentSkills)(options);
         setup.featureInfo = setup.featureInfo || {};
         setup.featureInfo.agentSkills = { shouldInstall };
     }

package/lib/init/features/apphosting.js

@@ -52,16 +52,10 @@ async function doSetup(setup, config, options) {
         if (!webApp) {
             utils.logWarning(`Firebase web app not set`);
         }
-        const experiments = await dynamicImport("./experiments");
         const prompts = await dynamicImport("./apphosting/prompts");
-        let runtime = experiments.isEnabled("abiu") ? prompts.DEFAULT_RUNTIME : undefined;
-        let automaticBaseImageUpdatesDisabled = experiments.isEnabled("abiu") ? false : undefined;
-        if (experiments.isEnabled("abiu") && !options.nonInteractive) {
-            runtime = await prompts.promptRuntime(projectId, location);
-            automaticBaseImageUpdatesDisabled = !(await prompts.promptAutomaticBaseImageUpdates());
-        }
+        const runtime = await prompts.resolveRuntime(projectId, location, options.nonInteractive);
         const createBackendSpinner = ora("Creating your new backend...").start();
-        const backend = await (0, backend_1.createBackend)(projectId, location, backendId, null, undefined, webApp?.id, "/", runtime, automaticBaseImageUpdatesDisabled);
+        const backend = await (0, backend_1.createBackend)(projectId, location, backendId, null, undefined, webApp?.id, "/", runtime);
         createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
     }
     (0, utils_1.logBullet)(`${clc.yellow("===")} Deploy local source setup`);

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

@@ -55,7 +55,7 @@ const templateServiceInfo = {
     ],
     seedDataGql: SEED_DATA_TEMPLATE,
 };
-async function askQuestions(setup) {
+async function askQuestions(setup, config, options) {
     const info = {
         flow: "",
         appDescription: "",
@@ -67,14 +67,15 @@ async function askQuestions(setup) {
     };
     if (setup.projectId) {
         await (0, ensureApis_1.ensureApis)(setup.projectId);
-        await promptForExistingServices(setup, info);
-        if (!info.serviceGql) {
+        await promptForExistingServices(setup, info, options);
+        if (!info.serviceGql && !options.nonInteractive) {
             if (!configstore_1.configstore.get("gemini")) {
                 (0, utils_1.logBullet)("Learn more about Gemini in Firebase and how it uses your data: https://firebase.google.com/docs/gemini-in-firebase#how-gemini-in-firebase-uses-your-data");
             }
             const wantToGenerate = await (0, prompt_1.confirm)({
                 message: "Do you want to generate schema and queries with Gemini?",
                 default: false,
+                nonInteractive: options.nonInteractive,
             });
             if (wantToGenerate) {
                 configstore_1.configstore.set("gemini", true);
@@ -87,14 +88,15 @@ async function askQuestions(setup) {
                         }
                         return "Please enter a description for your app idea.";
                     },
+                    nonInteractive: options.nonInteractive,
                 });
             }
         }
-        await promptForCloudSQL(setup, info);
+        await promptForCloudSQL(setup, info, options);
     }
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnect = info;
-    await sdk.askQuestions(setup);
+    await sdk.askQuestions(setup, config, options);
 }
 async function actuate(setup, config, options) {
     const dir = config.get("dataconnect.source", "dataconnect");
@@ -337,7 +339,7 @@ function subConnectorYamlValues(replacementValues) {
     }
     return replaced;
 }
-async function promptForExistingServices(setup, info) {
+async function promptForExistingServices(setup, info, options) {
     if (!setup.projectId) {
         return;
     }
@@ -345,7 +347,7 @@ async function promptForExistingServices(setup, info) {
     if (!existingServices.length) {
         return;
     }
-    const choice = await chooseExistingService(existingServices);
+    const choice = await chooseExistingService(existingServices, options);
     if (!choice) {
         const existingServiceIds = existingServices.map((s) => s.name.split("/").pop());
         info.serviceId = (0, utils_1.newUniqueId)(defaultServiceId(), existingServiceIds);
@@ -423,7 +425,7 @@ async function downloadService(info, serviceName) {
         });
     }
 }
-async function chooseExistingService(existing) {
+async function chooseExistingService(existing, options) {
     const fdcConnector = (0, utils_1.envOverride)("FDC_CONNECTOR", "");
     const fdcService = (0, utils_1.envOverride)("FDC_SERVICE", "");
     const serviceEnvVar = fdcConnector || fdcService;
@@ -452,9 +454,11 @@ async function chooseExistingService(existing) {
     return await (0, prompt_1.select)({
         message: "Your project already has existing services. Which would you like to set up local files for?",
         choices,
+        default: choices[0].value,
+        nonInteractive: options.nonInteractive,
     });
 }
-async function promptForCloudSQL(setup, info) {
+async function promptForCloudSQL(setup, info, options) {
     if (!setup.projectId) {
         return;
     }
@@ -496,6 +500,8 @@ async function promptForCloudSQL(setup, info) {
             info.cloudSqlInstanceId = await (0, prompt_1.select)({
                 message: `Which CloudSQL instance would you like to use?`,
                 choices,
+                default: choices[0].value,
+                nonInteractive: options.nonInteractive,
             });
             if (info.cloudSqlInstanceId !== "") {
                 info.flow += "_pick_existing_csql";
@@ -510,16 +516,20 @@ async function promptForCloudSQL(setup, info) {
                 info.cloudSqlInstanceId = await (0, prompt_1.input)({
                     message: `What ID would you like to use for your new CloudSQL instance?`,
                     default: (0, utils_1.newUniqueId)(`${defaultServiceId().toLowerCase()}-fdc`, instances.map((i) => i.name)),
+                    nonInteractive: options.nonInteractive,
                 });
             }
         }
     }
     if (info.locationId === "") {
-        await promptForLocation(setup, info);
-        info.shouldProvisionCSQL = await (0, prompt_1.confirm)({
-            message: `Would you like to provision your ${freeTrialAvailable ? "free trial " : ""}Cloud SQL instance and database now?`,
-            default: true,
-        });
+        await promptForLocation(setup, info, options);
+        info.shouldProvisionCSQL =
+            !options.nonInteractive &&
+                (await (0, prompt_1.confirm)({
+                    message: `Would you like to provision your ${freeTrialAvailable ? "free trial " : ""}Cloud SQL instance and database now?`,
+                    default: !options.nonInteractive,
+                    nonInteractive: options.nonInteractive,
+                }));
     }
     if (info.cloudSqlInstanceId !== "" && info.cloudSqlDatabase === "") {
         try {
@@ -533,13 +543,14 @@ async function promptForCloudSQL(setup, info) {
     }
     return;
 }
-async function promptForLocation(setup, info) {
+async function promptForLocation(setup, info, options) {
     if (info.locationId === "") {
         const choices = await locationChoices(setup);
         info.locationId = await (0, prompt_1.select)({
             message: "What location would you like to use?",
             choices,
             default: exports.FDC_DEFAULT_REGION,
+            nonInteractive: options.nonInteractive,
         });
     }
 }