firebase-tools 14.15.2 → 14.17.0

package/lib/functions/projectConfig.js

@@ -1,6 +1,17 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configForCodebase = exports.normalizeAndValidate = exports.validate = exports.assertUnique = exports.validatePrefix = exports.validateCodebase = exports.normalize = exports.DEFAULT_CODEBASE = void 0;
+exports.resolveConfigDir = exports.requireLocal = exports.isRemoteConfig = exports.isLocalConfig = exports.configForCodebase = exports.normalizeAndValidate = exports.validate = exports.assertUnique = exports.validatePrefix = exports.validateCodebase = exports.normalize = exports.DEFAULT_CODEBASE = void 0;
 const error_1 = require("../error");
 exports.DEFAULT_CODEBASE = "default";
 function normalize(config) {
@@ -33,17 +44,33 @@ function validatePrefix(prefix) {
 }
 exports.validatePrefix = validatePrefix;
 function validateSingle(config) {
-    if (!config.source) {
-        throw new error_1.FirebaseError("codebase source must be specified");
+    const { source, remoteSource, runtime, codebase: providedCodebase } = config, rest = __rest(config, ["source", "remoteSource", "runtime", "codebase"]);
+    if (source && remoteSource) {
+        throw new error_1.FirebaseError("Cannot specify both 'source' and 'remoteSource' in a single functions config. Please choose one.");
     }
-    if (!config.codebase) {
-        config.codebase = exports.DEFAULT_CODEBASE;
+    if (!source && !remoteSource) {
+        throw new error_1.FirebaseError("codebase source must be specified. Must specify either 'source' or 'remoteSource' in a functions config.");
     }
-    validateCodebase(config.codebase);
+    const codebase = providedCodebase !== null && providedCodebase !== void 0 ? providedCodebase : exports.DEFAULT_CODEBASE;
+    validateCodebase(codebase);
     if (config.prefix) {
         validatePrefix(config.prefix);
     }
-    return Object.assign(Object.assign({}, config), { source: config.source, codebase: config.codebase });
+    const commonConfig = Object.assign({ codebase }, rest);
+    if (source) {
+        return Object.assign(Object.assign(Object.assign({}, commonConfig), { source }), (runtime ? { runtime } : {}));
+    }
+    else if (remoteSource) {
+        if (!remoteSource.repository || !remoteSource.ref) {
+            throw new error_1.FirebaseError("remoteSource requires 'repository' and 'ref' to be specified.");
+        }
+        if (!runtime) {
+            throw new error_1.FirebaseError("functions.runtime is required when using remoteSource in firebase.json.");
+        }
+        return Object.assign(Object.assign({}, commonConfig), { remoteSource,
+            runtime });
+    }
+    throw new error_1.FirebaseError("Invalid functions config.");
 }
 function assertUnique(config, property, propval) {
     const values = new Set();
@@ -63,9 +90,22 @@ function assertUniqueSourcePrefixPair(config) {
     var _a;
     const sourcePrefixPairs = new Set();
     for (const c of config) {
-        const key = JSON.stringify({ source: c.source, prefix: c.prefix || "" });
+        let sourceIdentifier;
+        let sourceDescription;
+        if (c.source) {
+            sourceIdentifier = c.source;
+            sourceDescription = `source directory ('${c.source}')`;
+        }
+        else if (c.remoteSource) {
+            sourceIdentifier = `remote:${c.remoteSource.repository}#${c.remoteSource.ref}@dir:${c.remoteSource.dir || "."}`;
+            sourceDescription = `remote source ('${c.remoteSource.repository}')`;
+        }
+        else {
+            continue;
+        }
+        const key = JSON.stringify({ source: sourceIdentifier, prefix: c.prefix || "" });
         if (sourcePrefixPairs.has(key)) {
-            throw new error_1.FirebaseError(`More than one functions config specifies the same source directory ('${c.source}') and prefix ('${(_a = c.prefix) !== null && _a !== void 0 ? _a : ""}'). Please add a unique 'prefix' to each function configuration that shares this source to resolve the conflict.`);
+            throw new error_1.FirebaseError(`More than one functions config specifies the same ${sourceDescription} and prefix ('${(_a = c.prefix) !== null && _a !== void 0 ? _a : ""}'). Please add a unique 'prefix' to each function configuration that shares this source to resolve the conflict.`);
         }
         sourcePrefixPairs.add(key);
     }
@@ -89,3 +129,23 @@ function configForCodebase(config, codebase) {
     return codebaseCfg;
 }
 exports.configForCodebase = configForCodebase;
+function isLocalConfig(c) {
+    return c.source !== undefined;
+}
+exports.isLocalConfig = isLocalConfig;
+function isRemoteConfig(c) {
+    return c.remoteSource !== undefined;
+}
+exports.isRemoteConfig = isRemoteConfig;
+function requireLocal(c, purpose) {
+    if (!isLocalConfig(c)) {
+        const msg = purpose !== null && purpose !== void 0 ? purpose : "This operation requires a local functions source directory, but the codebase is configured with a remote source.";
+        throw new error_1.FirebaseError(msg);
+    }
+    return c;
+}
+exports.requireLocal = requireLocal;
+function resolveConfigDir(c) {
+    return c.configDir || c.source;
+}
+exports.resolveConfigDir = resolveConfigDir;

package/lib/gcp/cloudfunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.listFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.captureRuntimeValidationError = exports.API_VERSION = void 0;
+exports.functionFromEndpoint = exports.endpointFromFunction = exports.listAllFunctions = exports.deleteFunction = exports.updateFunction = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.createFunction = exports.generateUploadUrl = exports.captureRuntimeValidationError = exports.API_VERSION = void 0;
 const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
@@ -200,11 +200,6 @@ async function list(projectId, region) {
         });
     }
 }
-async function listFunctions(projectId, region) {
-    const res = await list(projectId, region);
-    return res.functions;
-}
-exports.listFunctions = listFunctions;
 async function listAllFunctions(projectId) {
     return list(projectId, "-");
 }

package/lib/gcp/cloudfunctionsv2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.listFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.API_VERSION = void 0;
+exports.endpointFromFunction = exports.functionFromEndpoint = exports.deleteFunction = exports.updateFunction = exports.listAllFunctions = exports.getFunction = exports.createFunction = exports.generateUploadUrl = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
@@ -84,14 +84,6 @@ async function getFunction(projectId, location, functionId) {
     return res.body;
 }
 exports.getFunction = getFunction;
-async function listFunctions(projectId, region) {
-    const res = await listFunctionsInternal(projectId, region);
-    if (res.unreachable.includes(region)) {
-        throw new error_1.FirebaseError(`Cloud Functions region ${region} is unavailable`);
-    }
-    return res.functions;
-}
-exports.listFunctions = listFunctions;
 async function listAllFunctions(projectId) {
     return await listFunctionsInternal(projectId, "-");
 }

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -151,7 +151,7 @@ async function deleteDatabase(projectId, instanceId, databaseId) {
     return res.body;
 }
 exports.deleteDatabase = deleteDatabase;
-async function createUser(projectId, instanceId, type, username, password) {
+async function createUser(projectId, instanceId, type, username, password, retryTimeout) {
     const maxRetries = 3;
     let retries = 0;
     while (true) {
@@ -180,7 +180,7 @@ async function createUser(projectId, instanceId, type, username, password) {
             if (builtinRoleNotReady(err.message) && retries < maxRetries) {
                 retries++;
                 await new Promise((resolve) => {
-                    setTimeout(resolve, 1000 * retries);
+                    setTimeout(resolve, retryTimeout !== null && retryTimeout !== void 0 ? retryTimeout : 1000 * retries);
                 });
             }
             else {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNextApp = exports.createReactApp = void 0;
+exports.createFlutterApp = exports.createNextApp = exports.createReactApp = void 0;
 const child_process_1 = require("child_process");
 const clc = require("colorette");
 const utils_1 = require("../../../utils");
@@ -26,8 +26,13 @@ async function createNextApp(webAppId) {
     await executeCommand("npx", args);
 }
 exports.createNextApp = createNextApp;
+async function createFlutterApp(webAppId) {
+    const args = ["create", webAppId];
+    await executeCommand("flutter", args);
+}
+exports.createFlutterApp = createFlutterApp;
 async function executeCommand(command, args) {
-    (0, utils_1.logLabeledBullet)("dataconnect", `Running ${clc.bold(`${command} ${args.join(" ")}`)}`);
+    (0, utils_1.logLabeledBullet)("dataconnect", `> ${clc.bold(`${command} ${args.join(" ")}`)}`);
     return new Promise((resolve, reject) => {
         const childProcess = (0, child_process_1.spawn)(command, args, {
             stdio: "inherit",

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

@@ -26,26 +26,25 @@ const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconn
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
 const MUTATIONS_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/mutations.gql");
-const emptyConnector = {
-    id: "example",
-    path: "./example",
-    files: [],
-};
-const defaultConnector = {
-    id: "example",
-    path: "./example",
-    files: [
-        {
-            path: "queries.gql",
-            content: QUERIES_TEMPLATE,
-        },
+const templateServiceInfo = {
+    schemaGql: [{ path: "schema.gql", content: SCHEMA_TEMPLATE }],
+    connectors: [
         {
-            path: "mutations.gql",
-            content: MUTATIONS_TEMPLATE,
+            id: "example",
+            path: "./example",
+            files: [
+                {
+                    path: "queries.gql",
+                    content: QUERIES_TEMPLATE,
+                },
+                {
+                    path: "mutations.gql",
+                    content: MUTATIONS_TEMPLATE,
+                },
+            ],
         },
     ],
 };
-const defaultSchema = { path: "schema.gql", content: SCHEMA_TEMPLATE };
 async function askQuestions(setup) {
     const info = {
         analyticsFlow: "cli",
@@ -54,6 +53,7 @@ async function askQuestions(setup) {
         locationId: "",
         cloudSqlInstanceId: "",
         cloudSqlDatabase: "",
+        shouldProvisionCSQL: false,
     };
     if (setup.projectId) {
         const hasBilling = await (0, cloudbilling_1.isBillingEnabled)(setup);
@@ -101,6 +101,7 @@ async function actuate(setup, config, options) {
         void (0, track_1.trackGA4)("dataconnect_init", {
             project_status: setup.projectId ? (setup.isBillingEnabled ? "blaze" : "spark") : "missing",
             flow: info.analyticsFlow,
+            provision_cloud_sql: String(info.shouldProvisionCSQL),
         });
     }
     if (info.appDescription) {
@@ -118,10 +119,11 @@ async function actuateWithInfo(setup, config, info, options) {
     const projectId = setup.projectId;
     if (!projectId) {
         info.analyticsFlow += "_save_template";
-        return await writeFiles(config, info, { schemaGql: [defaultSchema], connectors: [defaultConnector] }, options);
+        return await writeFiles(config, info, templateServiceInfo, options);
     }
-    const hasBilling = await (0, cloudbilling_1.isBillingEnabled)(setup);
-    if (hasBilling) {
+    await (0, ensureApis_1.ensureApis)(projectId, true);
+    const provisionCSQL = info.shouldProvisionCSQL && (await (0, cloudbilling_1.isBillingEnabled)(setup));
+    if (provisionCSQL) {
         await (0, provisionCloudSql_1.setupCloudSql)({
             projectId: projectId,
             location: info.locationId,
@@ -130,15 +132,18 @@ async function actuateWithInfo(setup, config, info, options) {
             requireGoogleMlIntegration: false,
         });
     }
+    const serviceName = `projects/${projectId}/locations/${info.locationId}/services/${info.serviceId}`;
     if (!info.appDescription) {
+        if (!info.serviceGql) {
+            await downloadService(info, serviceName);
+        }
         if (info.serviceGql) {
             info.analyticsFlow += "_save_downloaded";
             return await writeFiles(config, info, info.serviceGql, options);
         }
         info.analyticsFlow += "_save_template";
-        return await writeFiles(config, info, { schemaGql: [defaultSchema], connectors: [defaultConnector] }, options);
+        return await writeFiles(config, info, templateServiceInfo, options);
     }
-    const serviceName = `projects/${projectId}/locations/${info.locationId}/services/${info.serviceId}`;
     const serviceAlreadyExists = !(await (0, client_1.createService)(projectId, info.locationId, info.serviceId));
     const schemaGql = await (0, utils_1.promiseWithSpinner)(() => (0, fdcExperience_1.generateSchema)(info.appDescription, projectId), "Generating the Data Connect Schema...");
     const schemaFiles = [{ path: "schema.gql", content: schemaGql }];
@@ -148,7 +153,7 @@ async function actuateWithInfo(setup, config, info, options) {
         return await writeFiles(config, info, { schemaGql: schemaFiles, connectors: [] }, options);
     }
     await (0, utils_1.promiseWithSpinner)(async () => {
-        const [saveSchemaGql, waitForCloudSQLProvision] = schemasDeploySequence(projectId, info, schemaFiles, hasBilling);
+        const [saveSchemaGql, waitForCloudSQLProvision] = schemasDeploySequence(projectId, info, schemaFiles, provisionCSQL);
         await (0, client_1.upsertSchema)(saveSchemaGql);
         if (waitForCloudSQLProvision) {
             void (0, client_1.upsertSchema)(waitForCloudSQLProvision);
@@ -284,7 +289,6 @@ function subConnectorYamlValues(replacementValues) {
     return replaced;
 }
 async function promptForExistingServices(setup, info) {
-    var _a, _b, _c, _d, _e;
     if (!setup.projectId) {
         return;
     }
@@ -292,10 +296,7 @@ async function promptForExistingServices(setup, info) {
     if (!existingServices.length) {
         return;
     }
-    const existingServicesAndSchemas = await Promise.all(existingServices.map(async (s) => {
-        return { service: s, schema: await (0, client_1.getSchema)(s.name) };
-    }));
-    const choice = await chooseExistingService(existingServicesAndSchemas);
+    const choice = await chooseExistingService(existingServices);
     if (!choice) {
         const existingServiceIds = existingServices.map((s) => s.name.split("/").pop());
         info.serviceId = (0, utils_1.newUniqueId)(defaultServiceId(), existingServiceIds);
@@ -303,39 +304,50 @@ async function promptForExistingServices(setup, info) {
         return;
     }
     info.analyticsFlow += "_pick_existing_service";
-    const serviceName = (0, names_1.parseServiceName)(choice.service.name);
+    const serviceName = (0, names_1.parseServiceName)(choice.name);
     info.serviceId = serviceName.serviceId;
     info.locationId = serviceName.location;
+    await downloadService(info, choice.name);
+}
+async function downloadService(info, serviceName) {
+    var _a, _b, _c, _d, _e;
+    const schema = await (0, client_1.getSchema)(serviceName);
+    if (!schema) {
+        return;
+    }
     info.serviceGql = {
         schemaGql: [],
-        connectors: [emptyConnector],
+        connectors: [
+            {
+                id: "example",
+                path: "./example",
+                files: [],
+            },
+        ],
     };
-    if (choice.schema) {
-        const primaryDatasource = choice.schema.datasources.find((d) => d.postgresql);
-        if ((_b = (_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance) {
-            const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
-            info.cloudSqlInstanceId = instanceName.instanceId;
-        }
-        if ((_c = choice.schema.source.files) === null || _c === void 0 ? void 0 : _c.length) {
-            info.serviceGql.schemaGql = choice.schema.source.files;
-        }
-        info.cloudSqlDatabase = (_e = (_d = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _d === void 0 ? void 0 : _d.database) !== null && _e !== void 0 ? _e : "";
-        const connectors = await (0, client_1.listConnectors)(choice.service.name, [
-            "connectors.name",
-            "connectors.source.files",
-        ]);
-        if (connectors.length) {
-            info.serviceGql.connectors = connectors.map((c) => {
-                const id = c.name.split("/").pop();
-                return {
-                    id,
-                    path: connectors.length === 1 ? "./example" : `./${id}`,
-                    files: c.source.files || [],
-                };
-            });
-        }
+    const primaryDatasource = schema.datasources.find((d) => d.postgresql);
+    if ((_b = (_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql) === null || _b === void 0 ? void 0 : _b.instance) {
+        const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
+        info.cloudSqlInstanceId = instanceName.instanceId;
+    }
+    if ((_c = schema.source.files) === null || _c === void 0 ? void 0 : _c.length) {
+        info.serviceGql.schemaGql = schema.source.files;
+    }
+    info.cloudSqlDatabase = (_e = (_d = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _d === void 0 ? void 0 : _d.database) !== null && _e !== void 0 ? _e : "";
+    const connectors = await (0, client_1.listConnectors)(serviceName, [
+        "connectors.name",
+        "connectors.source.files",
+    ]);
+    if (connectors.length) {
+        info.serviceGql.connectors = connectors.map((c) => {
+            const id = c.name.split("/").pop();
+            return {
+                id,
+                path: connectors.length === 1 ? "./example" : `./${id}`,
+                files: c.source.files || [],
+            };
+        });
     }
-    return;
 }
 async function chooseExistingService(existing) {
     const fdcConnector = (0, utils_1.envOverride)("FDC_CONNECTOR", "");
@@ -344,7 +356,7 @@ async function chooseExistingService(existing) {
     if (serviceEnvVar) {
         const [serviceLocationFromEnvVar, serviceIdFromEnvVar] = serviceEnvVar.split("/");
         const serviceFromEnvVar = existing.find((s) => {
-            const serviceName = (0, names_1.parseServiceName)(s.service.name);
+            const serviceName = (0, names_1.parseServiceName)(s.name);
             return (serviceName.serviceId === serviceIdFromEnvVar &&
                 serviceName.location === serviceLocationFromEnvVar);
         });
@@ -356,7 +368,7 @@ async function chooseExistingService(existing) {
         (0, utils_1.logWarning)(`Unable to pick up an existing service based on ${envVarName}=${serviceEnvVar}.`);
     }
     const choices = existing.map((s) => {
-        const serviceName = (0, names_1.parseServiceName)(s.service.name);
+        const serviceName = (0, names_1.parseServiceName)(s.name);
         return {
             name: `${serviceName.location}/${serviceName.serviceId}`,
             value: s,
@@ -412,7 +424,11 @@ async function promptForCloudSQL(setup, info) {
         info.locationId = await (0, prompt_1.select)({
             message: "What location would like to use?",
             choices,
-            default: "us-central1",
+            default: "us-east4",
+        });
+        info.shouldProvisionCSQL = await (0, prompt_1.confirm)({
+            message: `Would you like to provision your Cloud SQL instance and database now?`,
+            default: true,
         });
     }
     if (info.cloudSqlInstanceId !== "" && info.cloudSqlDatabase === "") {
@@ -436,14 +452,39 @@ async function locationChoices(setup) {
     }
     else {
         return [
-            { name: "us-central1", value: "us-central1" },
-            { name: "europe-north1", value: "europe-north1" },
+            { name: "asia-east1", value: "asia-east1" },
+            { name: "asia-east2", value: "asia-east2" },
+            { name: "asia-northeast1", value: "asia-northeast1" },
+            { name: "asia-northeast2", value: "asia-northeast2" },
+            { name: "asia-northeast3", value: "asia-northeast3" },
+            { name: "asia-south1", value: "asia-south1" },
+            { name: "asia-southeast1", value: "asia-southeast1" },
+            { name: "asia-southeast2", value: "asia-southeast2" },
+            { name: "australia-southeast1", value: "australia-southeast1" },
+            { name: "australia-southeast2", value: "australia-southeast2" },
             { name: "europe-central2", value: "europe-central2" },
+            { name: "europe-north1", value: "europe-north1" },
+            { name: "europe-southwest1", value: "europe-southwest1" },
             { name: "europe-west1", value: "europe-west1" },
+            { name: "europe-west2", value: "europe-west2" },
+            { name: "europe-west3", value: "europe-west3" },
+            { name: "europe-west4", value: "europe-west4" },
+            { name: "europe-west6", value: "europe-west6" },
+            { name: "europe-west8", value: "europe-west8" },
+            { name: "europe-west9", value: "europe-west9" },
+            { name: "me-west1", value: "me-west1" },
+            { name: "northamerica-northeast1", value: "northamerica-northeast1" },
+            { name: "northamerica-northeast2", value: "northamerica-northeast2" },
+            { name: "southamerica-east1", value: "southamerica-east1" },
             { name: "southamerica-west1", value: "southamerica-west1" },
+            { name: "us-central1", value: "us-central1" },
+            { name: "us-east1", value: "us-east1" },
             { name: "us-east4", value: "us-east4" },
+            { name: "us-south1", value: "us-south1" },
             { name: "us-west1", value: "us-west1" },
-            { name: "asia-southeast1", value: "asia-southeast1" },
+            { name: "us-west2", value: "us-west2" },
+            { name: "us-west3", value: "us-west3" },
+            { name: "us-west4", value: "us-west4" },
         ];
     }
 }

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

@@ -26,25 +26,38 @@ async function askQuestions(setup) {
     };
     info.apps = await chooseApp();
     if (!info.apps.length) {
-        const existingFilesAndDirs = (0, fsutils_1.listFiles)(cwd);
-        const webAppId = (0, utils_1.newUniqueId)("web-app", existingFilesAndDirs);
+        const npxMissingWarning = (0, utils_1.commandExistsSync)("npx")
+            ? ""
+            : clc.yellow(" (you need to install Node.js first)");
+        const flutterMissingWarning = (0, utils_1.commandExistsSync)("flutter")
+            ? ""
+            : clc.yellow(" (you need to install Flutter first)");
         const choice = await (0, prompt_1.select)({
             message: `Do you want to create an app template?`,
             choices: [
-                { name: "React", value: "react" },
-                { name: "Next.JS", value: "next" },
+                { name: `React${npxMissingWarning}`, value: "react" },
+                { name: `Next.JS${npxMissingWarning}`, value: "next" },
+                { name: `Flutter${flutterMissingWarning}`, value: "flutter" },
                 { name: "no", value: "no" },
             ],
         });
-        switch (choice) {
-            case "react":
-                await (0, create_app_1.createReactApp)(webAppId);
-                break;
-            case "next":
-                await (0, create_app_1.createNextApp)(webAppId);
-                break;
-            case "no":
-                break;
+        try {
+            switch (choice) {
+                case "react":
+                    await (0, create_app_1.createReactApp)((0, utils_1.newUniqueId)("web-app", (0, fsutils_1.listFiles)(cwd)));
+                    break;
+                case "next":
+                    await (0, create_app_1.createNextApp)((0, utils_1.newUniqueId)("web-app", (0, fsutils_1.listFiles)(cwd)));
+                    break;
+                case "flutter":
+                    await (0, create_app_1.createFlutterApp)((0, utils_1.newUniqueId)("flutter_app", (0, fsutils_1.listFiles)(cwd)));
+                    break;
+                case "no":
+                    break;
+            }
+        }
+        catch (err) {
+            (0, utils_1.logLabeledError)("dataconnect", `Failed to create a ${choice} app template`);
         }
     }
     setup.featureInfo = setup.featureInfo || {};
@@ -151,10 +164,15 @@ async function actuateWithInfo(setup, config, info) {
     config.writeProjectFile(path.relative(config.projectDir, connectorYamlPath), connectorYamlContents);
     (0, utils_1.logLabeledBullet)("dataconnect", `Installing the generated SDKs ...`);
     const account = (0, auth_1.getGlobalDefaultAccount)();
-    await dataconnectEmulator_1.DataConnectEmulator.generate({
-        configDir: connectorInfo.directory,
-        account,
-    });
+    try {
+        await dataconnectEmulator_1.DataConnectEmulator.generate({
+            configDir: connectorInfo.directory,
+            account,
+        });
+    }
+    catch (e) {
+        (0, utils_1.logLabeledError)("dataconnect", `Failed to generate Data Connect SDKs\n${e === null || e === void 0 ? void 0 : e.message}`);
+    }
     (0, utils_1.logLabeledSuccess)("dataconnect", `Installed generated SDKs for ${clc.bold(apps.map((a) => (0, appFinder_1.appDescription)(a)).join(", "))}`);
     if (apps.some((a) => a.platform === types_1.Platform.IOS)) {
         (0, utils_1.logBullet)(clc.bold("Please follow the instructions here to add your generated sdk to your XCode project:\n\thttps://firebase.google.com/docs/data-connect/ios-sdk#set-client"));

package/lib/mcp/errors.js

@@ -4,18 +4,10 @@ exports.mcpGeminiError = exports.mcpAuthError = exports.NO_PROJECT_ERROR = void
 const util_1 = require("./util");
 exports.NO_PROJECT_ERROR = (0, util_1.mcpError)('No active project was found. Use the `firebase_update_environment` tool to set the project directory to an absolute folder location containing a firebase.json config file. Alternatively, change the MCP server config to add [...,"--dir","/absolute/path/to/project/directory"] in its command-line arguments.', "PRECONDITION_FAILED");
 function mcpAuthError(skipADC) {
-    const cmd = (0, util_1.commandExistsSync)("firebase") ? "firebase" : "npx -y firebase-tools";
     if (skipADC) {
-        return (0, util_1.mcpError)(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please instruct the user to execute this shell command to sign in.
-\`\`\`sh
-${cmd} login
-\`\`\``);
+        return (0, util_1.mcpError)(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please run the 'firebase_login' tool to log in.`);
     }
-    return (0, util_1.mcpError)(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please instruct the user to execute this shell command to sign in or to configure [Application Default Credentials][ADC] on their machine.
-\`\`\`sh
-${cmd} login
-\`\`\`
-
+    return (0, util_1.mcpError)(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please run the 'firebase_login' tool to log in, or instruct the user to configure [Application Default Credentials][ADC] on their machine.
 [ADC]: https://cloud.google.com/docs/authentication/application-default-credentials`);
 }
 exports.mcpAuthError = mcpAuthError;

package/lib/mcp/index.js

@@ -140,9 +140,6 @@ class FirebaseMcpServer {
             return this.emulatorHubClient;
         }
         const projectId = await this.getProjectId();
-        if (!projectId) {
-            return;
-        }
         this.emulatorHubClient = new hubClient_1.EmulatorHubClient(projectId);
         return this.emulatorHubClient;
     }