firebase-tools 14.4.0 → 14.5.1

package/lib/emulator/downloadableEmulators.js

@@ -30,83 +30,39 @@ const dataconnectDetails = process.platform === "darwin"
         : EMULATOR_UPDATE_DETAILS.dataconnect.linux;
 exports.DownloadDetails = {
     database: {
-        downloadPath: path.join(CACHE_DIR, `firebase-database-emulator-v${EMULATOR_UPDATE_DETAILS.database.version}.jar`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.database.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.database.version,
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v${EMULATOR_UPDATE_DETAILS.database.version}.jar`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.database.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.database.expectedChecksum,
-            namePrefix: "firebase-database-emulator",
-        },
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.database), { cacheDir: CACHE_DIR, namePrefix: "firebase-database-emulator" }),
     },
     firestore: {
-        downloadPath: path.join(CACHE_DIR, `cloud-firestore-emulator-v${EMULATOR_UPDATE_DETAILS.firestore.version}.jar`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.firestore.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.firestore.version,
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v${EMULATOR_UPDATE_DETAILS.firestore.version}.jar`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.firestore.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.firestore.expectedChecksum,
-            namePrefix: "cloud-firestore-emulator",
-        },
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.firestore), { cacheDir: CACHE_DIR, namePrefix: "cloud-firestore-emulator" }),
     },
     storage: {
-        downloadPath: path.join(CACHE_DIR, `cloud-storage-rules-runtime-v${EMULATOR_UPDATE_DETAILS.storage.version}.jar`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.storage.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.storage.version,
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-storage-rules-runtime-v${EMULATOR_UPDATE_DETAILS.storage.version}.jar`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.storage.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.storage.expectedChecksum,
-            namePrefix: "cloud-storage-rules-emulator",
-        },
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.storage), { cacheDir: CACHE_DIR, namePrefix: "cloud-storage-rules-emulator" }),
     },
     ui: {
         version: emulatorUiDetails.version,
-        downloadPath: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}.zip`),
+        downloadPath: path.join(CACHE_DIR, emulatorUiDetails.downloadPathRelativeToCacheDir),
         unzipDir: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}`),
-        binaryPath: path.join(CACHE_DIR, `ui-v${emulatorUiDetails.version}`, "server", "server.mjs"),
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/ui-v${emulatorUiDetails.version}.zip`,
-            expectedSize: emulatorUiDetails.expectedSize,
-            expectedChecksum: emulatorUiDetails.expectedChecksum,
-            skipCache: experiments.isEnabled("emulatoruisnapshot"),
-            skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"),
-            namePrefix: "ui",
-        },
+        binaryPath: path.join(CACHE_DIR, emulatorUiDetails.binaryPathRelativeToCacheDir),
+        opts: Object.assign(Object.assign({}, emulatorUiDetails), { cacheDir: CACHE_DIR, skipCache: experiments.isEnabled("emulatoruisnapshot"), skipChecksumAndSize: experiments.isEnabled("emulatoruisnapshot"), namePrefix: "ui" }),
     },
     pubsub: {
-        downloadPath: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}.zip`),
+        downloadPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.downloadPathRelativeToCacheDir),
         version: EMULATOR_UPDATE_DETAILS.pubsub.version,
         unzipDir: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`),
-        binaryPath: path.join(CACHE_DIR, `pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}`, `pubsub-emulator/bin/cloud-pubsub-emulator${process.platform === "win32" ? ".bat" : ""}`),
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: `https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-${EMULATOR_UPDATE_DETAILS.pubsub.version}.zip`,
-            expectedSize: EMULATOR_UPDATE_DETAILS.pubsub.expectedSize,
-            expectedChecksum: EMULATOR_UPDATE_DETAILS.pubsub.expectedChecksum,
-            namePrefix: "pubsub-emulator",
-        },
+        binaryPath: path.join(CACHE_DIR, EMULATOR_UPDATE_DETAILS.pubsub.binaryPathRelativeToCacheDir),
+        opts: Object.assign(Object.assign({}, EMULATOR_UPDATE_DETAILS.pubsub), { cacheDir: CACHE_DIR, namePrefix: "pubsub-emulator" }),
     },
     dataconnect: {
-        downloadPath: path.join(CACHE_DIR, `dataconnect-emulator-${dataconnectDetails.version}${process.platform === "win32" ? ".exe" : ""}`),
+        downloadPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
         version: dataconnectDetails.version,
-        binaryPath: path.join(CACHE_DIR, `dataconnect-emulator-${dataconnectDetails.version}${process.platform === "win32" ? ".exe" : ""}`),
-        opts: {
-            cacheDir: CACHE_DIR,
-            remoteUrl: process.platform === "darwin"
-                ? `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v${dataconnectDetails.version}`
-                : process.platform === "win32"
-                    ? `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v${dataconnectDetails.version}`
-                    : `https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v${dataconnectDetails.version}`,
-            expectedSize: dataconnectDetails.expectedSize,
-            expectedChecksum: dataconnectDetails.expectedChecksum,
-            skipChecksumAndSize: false,
-            namePrefix: "dataconnect-emulator",
-            auth: false,
-        },
+        binaryPath: path.join(CACHE_DIR, dataconnectDetails.downloadPathRelativeToCacheDir),
+        opts: Object.assign(Object.assign({}, dataconnectDetails), { cacheDir: CACHE_DIR, skipChecksumAndSize: false, namePrefix: "dataconnect-emulator", auth: false }),
     },
 };
 const EmulatorDetails = {

package/lib/extensions/manifest.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readInstanceParam = exports.writeExtensionsToFirebaseJson = exports.getInstanceRef = exports.getInstanceTarget = exports.instanceExists = exports.loadConfig = exports.removeFromManifest = exports.writeLocalSecrets = exports.writeEmptyManifest = exports.writeToManifest = exports.ENV_DIRECTORY = void 0;
-const clc = require("colorette");
 const path = require("path");
 const fs = require("fs-extra");
 const refs = require("./refs");
@@ -11,7 +10,6 @@ const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const paramHelper_1 = require("./paramHelper");
 const error_1 = require("../error");
-const utils = require("../utils");
 const extensionsHelper_1 = require("./extensionsHelper");
 const types_1 = require("./types");
 exports.ENV_DIRECTORY = "extensions";
@@ -151,7 +149,6 @@ function writeExtensionsToFirebaseJson(specs, config) {
     }
     config.set("extensions", extensions);
     config.writeProjectFile("firebase.json", config.src);
-    utils.logSuccess("Wrote extensions to " + clc.bold("firebase.json") + "...");
 }
 exports.writeExtensionsToFirebaseJson = writeExtensionsToFirebaseJson;
 async function writeEnvFiles(specs, config, force) {

package/lib/frameworks/angular/index.js

@@ -15,7 +15,7 @@ exports.support = "preview";
 exports.type = 3;
 exports.docsUrl = "https://firebase.google.com/docs/hosting/frameworks/angular";
 const DEFAULT_BUILD_SCRIPT = ["ng build"];
-exports.supportedRange = "16 - 19";
+exports.supportedRange = "16 - 20";
 async function discover(dir) {
     if (!(await (0, fs_extra_1.pathExists)((0, path_1.join)(dir, "package.json"))))
         return;

package/lib/frameworks/angular/utils.js

@@ -381,8 +381,10 @@ async function getBrowserConfig(sourceDir, configuration) {
         architectHost.getOptionsForTarget(buildOrBrowserTarget),
         architectHost.getBuilderNameForTarget(buildOrBrowserTarget),
     ]);
-    (0, utils_2.assertIsString)(targetOptions === null || targetOptions === void 0 ? void 0 : targetOptions.outputPath);
-    const outputPath = (0, path_1.join)(targetOptions.outputPath, buildTarget && getBuilderType(builderName) === BuilderType.APPLICATION ? "browser" : "");
+    const buildOutputPath = typeof (targetOptions === null || targetOptions === void 0 ? void 0 : targetOptions.outputPath) === "string"
+        ? targetOptions.outputPath
+        : (0, path_1.join)("dist", buildOrBrowserTarget.project);
+    const outputPath = (0, path_1.join)(buildOutputPath, buildTarget && getBuilderType(builderName) === BuilderType.APPLICATION ? "browser" : "");
     return { locales, baseHref, outputPath, defaultLocale };
 }
 exports.getBrowserConfig = getBrowserConfig;
@@ -394,8 +396,10 @@ async function getServerConfig(sourceDir, configuration) {
         throw new assert_1.AssertionError({ message: "expected build or browser target to be defined" });
     }
     const browserTargetOptions = await architectHost.getOptionsForTarget(buildOrBrowserTarget);
-    (0, utils_2.assertIsString)(browserTargetOptions === null || browserTargetOptions === void 0 ? void 0 : browserTargetOptions.outputPath);
-    const browserOutputPath = (0, path_1.join)(browserTargetOptions.outputPath, buildTarget ? "browser" : "")
+    const buildOutputPath = typeof (browserTargetOptions === null || browserTargetOptions === void 0 ? void 0 : browserTargetOptions.outputPath) === "string"
+        ? browserTargetOptions.outputPath
+        : (0, path_1.join)("dist", buildOrBrowserTarget.project);
+    const browserOutputPath = (0, path_1.join)(buildOutputPath, buildTarget ? "browser" : "")
         .split(path_1.sep)
         .join(path_1.posix.sep);
     const packageJson = JSON.parse(await host.readFile((0, path_1.join)(sourceDir, "package.json")));
@@ -419,8 +423,15 @@ async function getServerConfig(sourceDir, configuration) {
     }
     const { locales: serverLocales, defaultLocale } = await localesForTarget(sourceDir, architectHost, buildOrServerTarget, workspaceProject);
     const serverTargetOptions = await architectHost.getOptionsForTarget(buildOrServerTarget);
-    (0, utils_2.assertIsString)(serverTargetOptions === null || serverTargetOptions === void 0 ? void 0 : serverTargetOptions.outputPath);
-    const serverOutputPath = (0, path_1.join)(serverTargetOptions.outputPath, buildTarget ? "server" : "")
+    if (!serverTargetOptions) {
+        throw new assert_1.AssertionError({
+            message: `expected "JsonObject" but got "${typeof serverTargetOptions}"`,
+        });
+    }
+    const serverTargetOutputPath = typeof (serverTargetOptions === null || serverTargetOptions === void 0 ? void 0 : serverTargetOptions.outputPath) === "string"
+        ? serverTargetOptions.outputPath
+        : (0, path_1.join)("dist", buildOrServerTarget.project);
+    const serverOutputPath = (0, path_1.join)(serverTargetOutputPath, buildTarget ? "server" : "")
         .split(path_1.sep)
         .join(path_1.posix.sep);
     if (serverLocales && !defaultLocale) {

package/lib/gcp/apphosting.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextRolloutId = exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.listBuilds = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.getBackend = exports.createBackend = exports.parseBackendName = exports.serviceAgentEmail = exports.client = exports.API_VERSION = void 0;
+exports.getNextRolloutId = exports.ensureApiEnabled = exports.listLocations = exports.updateTraffic = exports.listRollouts = exports.createRollout = exports.createBuild = exports.listBuilds = exports.getBuild = exports.deleteBackend = exports.listBackends = exports.listDomains = exports.getTraffic = exports.getBackend = exports.createBackend = exports.parseBackendName = exports.serviceAgentEmail = exports.client = exports.API_VERSION = void 0;
 const proto = require("../gcp/proto");
 const apiv2_1 = require("../apiv2");
 const projectUtils_1 = require("../projectUtils");
@@ -40,6 +40,18 @@ async function getBackend(projectId, location, backendId) {
     return res.body;
 }
 exports.getBackend = getBackend;
+async function getTraffic(projectId, location, backendId) {
+    const name = `projects/${projectId}/locations/${location}/backends/${backendId}/traffic`;
+    const res = await exports.client.get(name);
+    return res.body;
+}
+exports.getTraffic = getTraffic;
+async function listDomains(projectId, location, backendId) {
+    const name = `projects/${projectId}/locations/${location}/backends/${backendId}/domains`;
+    const res = await exports.client.get(name, { queryParams: { pageSize: 100 } });
+    return Array.isArray(res.body.domains) ? res.body.domains : [];
+}
+exports.listDomains = listDomains;
 async function listBackends(projectId, location) {
     var _a;
     const name = `projects/${projectId}/locations/${location}/backends`;

package/lib/gcp/run.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.replaceService = exports.serviceIsResolved = exports.updateService = exports.getService = exports.gcpIds = exports.LOCATION_LABEL = void 0;
+exports.fetchServiceLogs = exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.replaceService = exports.serviceIsResolved = exports.updateService = exports.getService = exports.gcpIds = exports.LOCATION_LABEL = void 0;
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const api_1 = require("../api");
 const proto = require("./proto");
 const throttler_1 = require("../throttler/throttler");
 const logger_1 = require("../logger");
+const cloudlogging_1 = require("./cloudlogging");
 const API_VERSION = "v1";
 const client = new apiv2_1.Client({
     urlPrefix: (0, api_1.runOrigin)(),
@@ -155,3 +156,20 @@ async function setInvokerUpdate(projectId, serviceName, invoker, httpClient = cl
     await setIamPolicy(serviceName, policy, httpClient);
 }
 exports.setInvokerUpdate = setInvokerUpdate;
+async function fetchServiceLogs(projectId, serviceId) {
+    var _a, _b;
+    const filter = `resource.type="cloud_run_revision" AND resource.labels.service_name="${serviceId}"`;
+    const pageSize = 100;
+    const order = "desc";
+    try {
+        const entries = await (0, cloudlogging_1.listEntries)(projectId, filter, pageSize, order);
+        return entries || [];
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Failed to fetch logs for Cloud Run service ${serviceId}`, {
+            original: err,
+            status: (_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.statusCode,
+        });
+    }
+}
+exports.fetchServiceLogs = fetchServiceLogs;

package/lib/init/features/apphosting.js

@@ -22,12 +22,14 @@ async function doSetup(setup, config) {
     }
     await (0, apphosting_1.ensureApiEnabled)({ projectId });
     await (0, backend_1.ensureRequiredApisEnabled)(projectId);
+    const spinner = ora("Checking your App Hosting compute service account...").start();
     try {
         await (0, backend_1.ensureAppHostingComputeServiceAccount)(projectId, "", true);
+        spinner.succeed("App Hosting compute Service account is ready");
     }
     catch (err) {
         if (err.status === 400) {
-            utils.logWarning("Your App Hosting compute service account is still being provisioned. Please try again in a few moments.");
+            spinner.warn("Your App Hosting compute service account is still being provisioned. Please try again in a few moments.");
         }
         throw err;
     }
@@ -68,7 +70,6 @@ async function doSetup(setup, config) {
         message: "Specify your app's root directory relative to your firebase.json directory",
     });
     upsertAppHostingConfig(backendConfig, config);
-    utils.logBullet("Writing configuration info to firebase.json...");
     config.writeProjectFile("firebase.json", config.src);
     utils.logBullet("Writing default settings to " + clc.bold("apphosting.yaml") + "...");
     const absRootDir = path.join(process.cwd(), backendConfig.rootDir);

package/lib/init/features/database.js

@@ -5,7 +5,6 @@ const clc = require("colorette");
 const prompt_1 = require("../../prompt");
 const logger_1 = require("../../logger");
 const utils = require("../../utils");
-const fsutils = require("../../fsutils");
 const database_1 = require("../../management/database");
 const ora = require("ora");
 const ensureApiEnabled_1 = require("../../ensureApiEnabled");
@@ -31,9 +30,8 @@ async function getDBRules(instanceDetails) {
     }
     return await response.response.text();
 }
-function writeDBRules(rules, logMessagePrefix, filename, config) {
+function writeDBRules(rules, filename, config) {
     config.writeProjectFile(filename, rules);
-    utils.logSuccess(`${logMessagePrefix} have been written to ${clc.bold(filename)}.`);
     logger_1.logger.info(`Future modifications to ${clc.bold(filename)} will update Realtime Database Security Rules when you run`);
     logger_1.logger.info(clc.bold("firebase deploy") + ".");
 }
@@ -83,11 +81,7 @@ async function initializeDatabaseInstance(projectId) {
     }
     return null;
 }
-async function askQuestions(setup) {
-    let instanceDetails = null;
-    if (setup.projectId) {
-        instanceDetails = await initializeDatabaseInstance(setup.projectId);
-    }
+async function askQuestions(setup, config) {
     logger_1.logger.info();
     logger_1.logger.info("Firebase Realtime Database Security Rules allow you to define how your data should be");
     logger_1.logger.info("structured and when your data can be read from and written to.");
@@ -104,16 +98,14 @@ async function askQuestions(setup) {
         rules: exports.DEFAULT_RULES,
         writeRules: true,
     };
-    if (fsutils.fileExistsSync(rulesFilename)) {
-        const rulesDescription = instanceDetails
-            ? `the Realtime Database Security Rules for ${clc.bold(instanceDetails.name)} from the Firebase console`
-            : "default rules";
-        const msg = `File ${clc.bold(rulesFilename)} already exists. Do you want to overwrite it with ${rulesDescription}?`;
-        info.writeRules = await (0, prompt_1.confirm)(msg);
-    }
-    if (info.writeRules && instanceDetails) {
-        info.rules = await getDBRules(instanceDetails);
+    if (setup.projectId) {
+        const instanceDetails = await initializeDatabaseInstance(setup.projectId);
+        if (instanceDetails) {
+            info.rules = await getDBRules(instanceDetails);
+            utils.logBullet(`Downloaded the existing Realtime Database Security Rules of database ${clc.bold(instanceDetails.name)} from the Firebase console`);
+        }
     }
+    info.writeRules = await config.confirmWriteProjectFile(rulesFilename, info.rules);
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.database = info;
 }
@@ -129,10 +121,10 @@ async function actuate(setup, config) {
     setup.config.database = { rules: info.rulesFilename };
     if (info.writeRules) {
         if (info.rules === exports.DEFAULT_RULES) {
-            writeDBRules(info.rules, `Default rules for ${setup.projectId}`, info.rulesFilename, config);
+            writeDBRules(info.rules, info.rulesFilename, config);
         }
         else {
-            writeDBRules(info.rules, `Database Rules for ${setup.projectId}`, info.rulesFilename, config);
+            writeDBRules(info.rules, info.rulesFilename, config);
         }
     }
     else {

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

@@ -23,7 +23,6 @@ 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 serviceEnvVar = () => (0, utils_1.envOverride)("FDC_SERVICE", "");
 const emptyConnector = {
     id: "default",
     path: "./connector",
@@ -68,7 +67,7 @@ async function askQuestions(setup) {
     const shouldConfigureBackend = hasBilling &&
         requiredConfigUnset &&
         (await (0, prompt_1.confirm)({
-            message: `Would you like to configure your backend resources now?`,
+            message: `Would you like to configure your Cloud SQL datasource now?`,
             default: true,
         }));
     if (shouldConfigureBackend) {
@@ -190,30 +189,7 @@ async function promptForExistingServices(setup, info) {
         return { service: s, schema: await (0, client_1.getSchema)(s.name) };
     }));
     if (existingServicesAndSchemas.length) {
-        let choice;
-        const [serviceLocationFromEnvVar, serviceIdFromEnvVar] = serviceEnvVar().split("/");
-        const serviceFromEnvVar = existingServicesAndSchemas.find((s) => {
-            const serviceName = (0, names_1.parseServiceName)(s.service.name);
-            return (serviceName.serviceId === serviceIdFromEnvVar &&
-                serviceName.location === serviceLocationFromEnvVar);
-        });
-        if (serviceFromEnvVar) {
-            choice = serviceFromEnvVar;
-        }
-        else {
-            const choices = existingServicesAndSchemas.map((s) => {
-                const serviceName = (0, names_1.parseServiceName)(s.service.name);
-                return {
-                    name: `${serviceName.location}/${serviceName.serviceId}`,
-                    value: s,
-                };
-            });
-            choices.push({ name: "Create a new service", value: undefined });
-            choice = await (0, prompt_1.select)({
-                message: "Your project already has existing services. Which would you like to set up local files for?",
-                choices,
-            });
-        }
+        const choice = await chooseExistingService(existingServicesAndSchemas);
         if (choice) {
             const serviceName = (0, names_1.parseServiceName)(choice.service.name);
             info.serviceId = serviceName.serviceId;
@@ -249,6 +225,34 @@ async function promptForExistingServices(setup, info) {
     }
     return info;
 }
+async function chooseExistingService(existing) {
+    const serviceEnvVar = (0, utils_1.envOverride)("FDC_CONNECTOR", "") || (0, utils_1.envOverride)("FDC_SERVICE", "");
+    if (serviceEnvVar) {
+        const [serviceLocationFromEnvVar, serviceIdFromEnvVar] = serviceEnvVar.split("/");
+        const serviceFromEnvVar = existing.find((s) => {
+            const serviceName = (0, names_1.parseServiceName)(s.service.name);
+            return (serviceName.serviceId === serviceIdFromEnvVar &&
+                serviceName.location === serviceLocationFromEnvVar);
+        });
+        if (serviceFromEnvVar) {
+            (0, utils_1.logBullet)(`Picking up the existing service ${clc.bold(serviceLocationFromEnvVar + "/" + serviceIdFromEnvVar)}.`);
+            return serviceFromEnvVar;
+        }
+        (0, utils_1.logWarning)(`Unable to pick up an existing service based on FDC_SERVICE=${serviceEnvVar}.`);
+    }
+    const choices = existing.map((s) => {
+        const serviceName = (0, names_1.parseServiceName)(s.service.name);
+        return {
+            name: `${serviceName.location}/${serviceName.serviceId}`,
+            value: s,
+        };
+    });
+    choices.push({ name: "Create a new service", value: undefined });
+    return await (0, prompt_1.select)({
+        message: "Your project already has existing services. Which would you like to set up local files for?",
+        choices,
+    });
+}
 async function promptForCloudSQL(setup, info) {
     if (info.cloudSqlInstanceId === "" && setup.projectId) {
         const instances = await cloudsql.listInstances(setup.projectId);

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

@@ -29,7 +29,7 @@ async function askQuestions(setup, config) {
         .map((si) => {
         return si.connectorInfo.map((ci) => {
             return {
-                name: `${si.dataConnectYaml.serviceId}/${ci.connectorYaml.connectorId}`,
+                name: `${si.dataConnectYaml.location}/${si.dataConnectYaml.serviceId}/${ci.connectorYaml.connectorId}`,
                 value: ci,
             };
         });
@@ -68,10 +68,7 @@ async function askQuestions(setup, config) {
     else {
         (0, utils_1.logSuccess)(`Detected ${targetPlatform} app in directory ${appDir}`);
     }
-    const connectorInfo = await (0, prompt_1.select)({
-        message: "Which connector do you want set up a generated SDK for?",
-        choices: connectorChoices,
-    });
+    const connectorInfo = await chooseExistingConnector(connectorChoices);
     const connectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
     const newConnectorYaml = await generateSdkYaml(targetPlatform, connectorYaml, connectorInfo.directory, appDir);
     if (targetPlatform === types_1.Platform.WEB) {
@@ -98,6 +95,24 @@ async function askQuestions(setup, config) {
     const displayIOSWarning = targetPlatform === types_1.Platform.IOS;
     return { connectorYamlContents, connectorInfo, displayIOSWarning };
 }
+async function chooseExistingConnector(choices) {
+    if (choices.length === 1) {
+        return choices[0].value;
+    }
+    const connectorEnvVar = (0, utils_1.envOverride)("FDC_CONNECTOR", "");
+    if (connectorEnvVar) {
+        const existingConnector = choices.find((c) => c.name === connectorEnvVar);
+        if (existingConnector) {
+            (0, utils_1.logBullet)(`Picking up the existing connector ${clc.bold(connectorEnvVar)}.`);
+            return existingConnector.value;
+        }
+        (0, utils_1.logWarning)(`Unable to pick up an existing connector based on FDC_CONNECTOR=${connectorEnvVar}.`);
+    }
+    return await (0, prompt_1.select)({
+        message: "Which connector do you want set up a generated SDK for?",
+        choices: choices,
+    });
+}
 async function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appDir) {
     if (!connectorYaml.generate) {
         connectorYaml.generate = {};
@@ -155,7 +170,7 @@ async function actuate(sdkInfo, config) {
     var _a, _b;
     const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
     (0, utils_1.logBullet)(`Writing your new SDK configuration to ${connectorYamlPath}`);
-    await config.askWriteProjectFile(path.relative(config.projectDir, connectorYamlPath), sdkInfo.connectorYamlContents);
+    await config.askWriteProjectFile(path.relative(config.projectDir, connectorYamlPath), sdkInfo.connectorYamlContents, false, true);
     const account = (0, auth_1.getGlobalDefaultAccount)();
     await dataconnectEmulator_1.DataConnectEmulator.generate({
         configDir: sdkInfo.connectorInfo.directory,

package/lib/init/features/emulators.js

@@ -65,9 +65,10 @@ async function doSetup(setup, config) {
                 default: true,
             });
             if (ui.enabled) {
-                ui.port = await (0, prompt_1.number)(`Which port do you want to use for the ${clc.underline(uiDesc)} (leave empty to use any available port)?`);
-                const portNum = Number.parseInt(ui.port);
-                ui.port = isNaN(portNum) ? undefined : portNum;
+                ui.port = await (0, prompt_1.number)({
+                    message: `Which port do you want to use for the ${clc.underline(uiDesc)} (leave empty to use any available port)?`,
+                    required: false,
+                });
             }
         }
         selections.download = await (0, prompt_1.confirm)({

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

@@ -1,45 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actuate = exports.askQuestions = exports.doSetup = void 0;
-const logger_1 = require("../../../logger");
-const apiEnabled = require("../../../ensureApiEnabled");
-const requirePermissions_1 = require("../../../requirePermissions");
-const checkDatabaseType_1 = require("../../../firestore/checkDatabaseType");
+exports.actuate = exports.askQuestions = void 0;
 const rules = require("./rules");
 const indexes = require("./indexes");
 const error_1 = require("../../../error");
-const clc = require("colorette");
+const api_1 = require("../../../firestore/api");
 const prompt_1 = require("../../../prompt");
-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;
-    }
-    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);
-    }
-    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 }));
-}
-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 ensureApiEnabled_1 = require("../../../ensureApiEnabled");
+const api_2 = require("../../../api");
+async function askQuestions(setup, config) {
     const firestore = !Array.isArray(setup.config.firestore) ? setup.config.firestore : undefined;
     const info = {
         databaseId: (firestore === null || firestore === void 0 ? void 0 : firestore.database) || "",
+        locationId: (firestore === null || firestore === void 0 ? void 0 : firestore.location) || "",
         rulesFilename: (firestore === null || firestore === void 0 ? void 0 : firestore.rules) || "",
         rules: "",
         writeRules: true,
@@ -48,7 +21,42 @@ async function askQuestions(setup, config, options) {
         writeIndexes: true,
     };
     if (setup.projectId) {
-        await checkProjectSetup(setup, options, info);
+        await (0, ensureApiEnabled_1.ensure)(setup.projectId, (0, api_2.firestoreOrigin)(), "firestore");
+        info.databaseId = info.databaseId || "(default)";
+        const api = new api_1.FirestoreApi();
+        const databases = await api.listDatabases(setup.projectId);
+        const nativeDatabaseNames = databases
+            .filter((db) => db.type === "FIRESTORE_NATIVE")
+            .map((db) => db.name.split("/")[3]);
+        if (nativeDatabaseNames.length === 0) {
+            if (databases.length > 0) {
+                throw new error_1.FirebaseError(`It looks like this project is using Cloud Firestore in ${databases[0].type}. 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 });
+            }
+            info.databaseId = "(default)";
+            const locations = await api.locations(setup.projectId);
+            const choice = await (0, prompt_1.select)({
+                message: "Please select the location of your Firestore database:",
+                choices: locations.map((location) => location.name.split("/")[3]),
+                default: "nam5",
+            });
+            info.locationId = choice;
+        }
+        else if (nativeDatabaseNames.length === 1) {
+            info.databaseId = nativeDatabaseNames[0];
+            info.locationId = databases
+                .filter((db) => db.name.endsWith(`databases/${info.databaseId}`))
+                .map((db) => db.locationId)[0];
+        }
+        else if (nativeDatabaseNames.length > 1) {
+            const choice = await (0, prompt_1.select)({
+                message: "Please select the name of the Native Firestore database you would like to use:",
+                choices: nativeDatabaseNames,
+            });
+            info.databaseId = choice;
+            info.locationId = databases
+                .filter((db) => db.name.endsWith(`databases/${info.databaseId}`))
+                .map((db) => db.locationId)[0];
+        }
     }
     await rules.initRules(setup, config, info);
     await indexes.initIndexes(setup, config, info);
@@ -63,12 +71,14 @@ async function actuate(setup, config) {
         throw new error_1.FirebaseError("Firestore featureInfo is not found");
     }
     info.databaseId = info.databaseId || "(default)";
+    info.locationId = info.locationId || "nam5";
     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,
+        location: info.locationId,
         rules: info.rulesFilename,
         indexes: info.indexesFilename,
     };