firebase-tools 13.10.2 → 13.11.1

package/lib/commands/dataconnect-services-list.js

@@ -17,7 +17,7 @@ exports.command = new command_1.Command("dataconnect:services:list")
     "dataconnect.connectors.list",
 ])
     .action(async (options) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     await (0, ensureApis_1.ensureApis)(projectId);
     const services = await client.listAllServices(projectId);
@@ -34,28 +34,22 @@ exports.command = new command_1.Command("dataconnect:services:list")
     });
     const jsonOutput = { services: [] };
     for (const service of services) {
-        let schema = {
+        const schema = (_a = (await client.getSchema(service.name))) !== null && _a !== void 0 ? _a : {
             name: "",
             primaryDatasource: {},
             source: { files: [] },
         };
-        try {
-            schema = await client.getSchema(service.name);
-        }
-        catch (err) {
-            logger_1.logger.debug(`Error fetching schema: ${err}`);
-        }
         const connectors = await client.listConnectors(service.name);
         const serviceName = names.parseServiceName(service.name);
-        const instanceName = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) !== null && _b !== void 0 ? _b : "";
+        const instanceName = (_c = (_b = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.cloudSql.instance) !== null && _c !== void 0 ? _c : "";
         const instanceId = instanceName.split("/").pop();
-        const dbId = (_d = (_c = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
+        const dbId = (_e = (_d = schema === null || schema === void 0 ? void 0 : schema.primaryDatasource.postgresql) === null || _d === void 0 ? void 0 : _d.database) !== null && _e !== void 0 ? _e : "";
         const dbName = `CloudSQL Instance: ${instanceId}\nDatabase:${dbId}`;
         table.push([
             serviceName.serviceId,
             serviceName.location,
             dbName,
-            (_e = schema === null || schema === void 0 ? void 0 : schema.updateTime) !== null && _e !== void 0 ? _e : "",
+            (_f = schema === null || schema === void 0 ? void 0 : schema.updateTime) !== null && _f !== void 0 ? _f : "",
             "",
             "",
         ]);
@@ -71,7 +65,7 @@ exports.command = new command_1.Command("dataconnect:services:list")
             table.push(["", "", "", "", connectorName.connectorId, conn.updateTime]);
             serviceJson.connectors.push({
                 connectorId: connectorName.connectorId,
-                connectorLastUpdated: (_f = conn.updateTime) !== null && _f !== void 0 ? _f : "",
+                connectorLastUpdated: (_g = conn.updateTime) !== null && _g !== void 0 ? _g : "",
             });
         }
         jsonOutput.services.push(serviceJson);

package/lib/crashlytics/buildToolsJarHelper.js

@@ -12,10 +12,11 @@ const rimraf = require("rimraf");
 const utils = require("../utils");
 const JAR_CACHE_DIR = process.env.FIREBASE_CRASHLYTICS_BUILDTOOLS_PATH ||
     path.join(os.homedir(), ".cache", "firebase", "crashlytics", "buildtools");
-const JAR_VERSION = "2.9.2";
+const JAR_VERSION = "3.0.0";
 const JAR_URL = `https://dl.google.com/android/maven2/com/google/firebase/firebase-crashlytics-buildtools/${JAR_VERSION}/firebase-crashlytics-buildtools-${JAR_VERSION}.jar`;
 async function fetchBuildtoolsJar() {
     if (process.env.CRASHLYTICS_LOCAL_JAR) {
+        logger_1.logger.debug(`Using local Crashlytics Jar override at ${process.env.CRASHLYTICS_LOCAL_JAR}`);
         return process.env.CRASHLYTICS_LOCAL_JAR;
     }
     const jarPath = path.join(JAR_CACHE_DIR, `crashlytics-buildtools-${JAR_VERSION}.jar`);

package/lib/dataconnect/client.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.upsertSchema = exports.getSchema = exports.deleteService = exports.createService = exports.listServices = exports.listAllServices = exports.listLocations = void 0;
+exports.upsertConnector = exports.listConnectors = exports.deleteConnector = exports.getConnector = exports.upsertSchema = exports.getSchema = exports.deleteService = exports.createService = exports.listAllServices = exports.listLocations = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const operationPoller = require("../operation-poller");
 const types = require("./types");
-const logger_1 = require("../logger");
 const DATACONNECT_API_VERSION = "v1alpha";
 const dataconnectClient = () => new apiv2_1.Client({
     urlPrefix: (0, api_1.dataconnectOrigin)(),
@@ -19,26 +18,11 @@ async function listLocations(projectId) {
 }
 exports.listLocations = listLocations;
 async function listAllServices(projectId) {
-    const locations = await listLocations(projectId);
-    let services = [];
-    await Promise.all(locations.map(async (l) => {
-        try {
-            const locationServices = await listServices(projectId, l);
-            services = services.concat(locationServices);
-        }
-        catch (err) {
-            logger_1.logger.debug(`Unable to listServices in ${l}: ${err}`);
-        }
-    }));
-    return services;
-}
-exports.listAllServices = listAllServices;
-async function listServices(projectId, locationId) {
     var _a;
-    const res = await dataconnectClient().get(`/projects/${projectId}/locations/${locationId}/services`);
+    const res = await dataconnectClient().get(`/projects/${projectId}/locations/-/services`);
     return (_a = res.body.services) !== null && _a !== void 0 ? _a : [];
 }
-exports.listServices = listServices;
+exports.listAllServices = listAllServices;
 async function createService(projectId, locationId, serviceId) {
     const op = await dataconnectClient().post(`/projects/${projectId}/locations/${locationId}/services`, {
         name: `projects/${projectId}/locations/${locationId}/services/${serviceId}`,
@@ -66,8 +50,16 @@ async function deleteService(projectId, locationId, serviceId) {
 }
 exports.deleteService = deleteService;
 async function getSchema(serviceName) {
-    const res = await dataconnectClient().get(`${serviceName}/schemas/${types.SCHEMA_ID}`);
-    return res.body;
+    try {
+        const res = await dataconnectClient().get(`${serviceName}/schemas/${types.SCHEMA_ID}`);
+        return res.body;
+    }
+    catch (err) {
+        if (err.status !== 404) {
+            throw err;
+        }
+        return undefined;
+    }
 }
 exports.getSchema = getSchema;
 async function upsertSchema(schema, validateOnly = false) {

package/lib/dataconnect/graphqlError.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prettify = void 0;
 function prettify(err) {
-    var _a;
+    var _a, _b, _c, _d;
     const message = err.message;
-    let header = (_a = err.extensions.file) !== null && _a !== void 0 ? _a : "";
-    if (err.locations) {
-        header += `:${err.locations[0].line}`;
+    let header = (_b = (_a = err.extensions) === null || _a === void 0 ? void 0 : _a.file) !== null && _b !== void 0 ? _b : "";
+    if (err.locations && err.locations.length) {
+        const line = (_d = (_c = err.locations[0]) === null || _c === void 0 ? void 0 : _c.line) !== null && _d !== void 0 ? _d : "";
+        if (line) {
+            header += `:${line}`;
+        }
     }
     return header.length ? `${header}: ${message}` : message;
 }

package/lib/dataconnect/provisionCloudSql.js

@@ -9,8 +9,8 @@ const GOOGLE_ML_INTEGRATION_ROLE = "roles/aiplatform.user";
 const freeTrial_1 = require("./freeTrial");
 const error_1 = require("../error");
 async function provisionCloudSql(args) {
-    let connectionName;
-    const { projectId, locationId, instanceId, databaseId, enableGoogleMlIntegration, silent } = args;
+    let connectionName = "";
+    const { projectId, locationId, instanceId, databaseId, enableGoogleMlIntegration, waitForCreation, silent, } = args;
     try {
         const existingInstance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
         silent || utils.logLabeledBullet("dataconnect", `Found existing instance ${instanceId}.`);
@@ -35,11 +35,17 @@ async function provisionCloudSql(args) {
             throw new error_1.FirebaseError("Free trial unavailable.");
         }
         silent ||
-            utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found, creating it. This instance is provided under the terms of the Data Connect free trial ${(0, freeTrial_1.freeTrialTermsLink)()}`);
-        silent || utils.logLabeledBullet("dataconnect", `This may take while...`);
-        const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance(projectId, locationId, instanceId, enableGoogleMlIntegration), "Creating your instance...");
-        silent || utils.logLabeledBullet("dataconnect", "Instance created");
-        connectionName = (newInstance === null || newInstance === void 0 ? void 0 : newInstance.connectionName) || "";
+            utils.logLabeledBullet("dataconnect", `CloudSQL instance '${instanceId}' not found, creating it.` +
+                `\nThis instance is provided under the terms of the Data Connect free trial ${(0, freeTrial_1.freeTrialTermsLink)()}` +
+                `\nMonitor the progress at ${cloudSqlAdminClient.instanceConsoleLink(projectId, instanceId)}`);
+        const newInstance = await (0, utils_1.promiseWithSpinner)(() => cloudSqlAdminClient.createInstance(projectId, locationId, instanceId, enableGoogleMlIntegration, waitForCreation), "Creating your instance...");
+        if (newInstance) {
+            silent || utils.logLabeledBullet("dataconnect", "Instance created");
+            connectionName = (newInstance === null || newInstance === void 0 ? void 0 : newInstance.connectionName) || "";
+        }
+        else {
+            silent || utils.logLabeledBullet("dataconnect", "Instance creation process started");
+        }
     }
     try {
         await cloudSqlAdminClient.getDatabase(projectId, instanceId, databaseId);

package/lib/dataconnect/schemaMigration.js

@@ -205,14 +205,8 @@ function displayInvalidConnectors(invalidConnectors) {
     (0, utils_1.logLabeledWarning)("dataconnect", `This is a ${clc.red("breaking")} change and may break existing apps.`);
 }
 async function ensureServiceIsConnectedToCloudSql(serviceName, instanceId, databaseId, linkIfNotConnected) {
-    let currentSchema;
-    try {
-        currentSchema = await (0, client_1.getSchema)(serviceName);
-    }
-    catch (err) {
-        if (err.status !== 404) {
-            throw err;
-        }
+    let currentSchema = await (0, client_1.getSchema)(serviceName);
+    if (!currentSchema) {
         if (!linkIfNotConnected) {
             (0, utils_1.logLabeledWarning)("dataconnect", `Not yet linked to the Cloud SQL instance.`);
             return;

package/lib/deploy/dataconnect/deploy.js

@@ -56,6 +56,7 @@ async function default_1(context, options) {
             instanceId,
             databaseId,
             enableGoogleMlIntegration,
+            waitForCreation: true,
         });
     }));
     return;

package/lib/deploy/functions/prepare.js

@@ -290,7 +290,7 @@ async function loadCodebases(config, options, firebaseConfig, runtimeConfig, fil
         const firebaseJsonRuntime = codebaseConfig.runtime;
         if (firebaseJsonRuntime && !supported.isRuntime(firebaseJsonRuntime)) {
             throw new error_1.FirebaseError(`Functions codebase ${codebase} has invalid runtime ` +
-                `${firebaseJsonRuntime} specified in firebase.json. Valid values are: ` +
+                `${firebaseJsonRuntime} specified in firebase.json. Valid values are: \n` +
                 Object.keys(supported.RUNTIMES)
                     .map((s) => `- ${s}`)
                     .join("\n"));

package/lib/deploy/functions/runtimes/supported/types.js

@@ -53,6 +53,12 @@ exports.RUNTIMES = runtimes({
         deprecationDate: "2026-04-30",
         decommissionDate: "2026-10-31",
     },
+    nodejs22: {
+        friendly: "Node.js 22",
+        status: "beta",
+        deprecationDate: "2027-04-30",
+        decommissionDate: "2027-10-31",
+    },
     python310: {
         friendly: "Python 3.10",
         status: "GA",

package/lib/emulator/controller.js

@@ -539,6 +539,9 @@ async function startAll(options, showUI = true, runningTestScript = false) {
             rc: options.rc,
         });
         await startEmulator(dataConnectEmulator);
+        if (!utils.isVSCodeExtension()) {
+            await dataConnectEmulator.connectToPostgres();
+        }
     }
     if (listenForEmulator.storage) {
         const storageAddr = legacyGetFirstAddr(types_1.Emulators.STORAGE);

package/lib/emulator/dataconnectEmulator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataConnectEmulator = void 0;
+exports.DataConnectEmulatorClient = exports.DataConnectEmulator = void 0;
 const childProcess = require("child_process");
 const api_1 = require("../api");
 const constants_1 = require("./constants");
@@ -10,23 +10,35 @@ const error_1 = require("../error");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_2 = require("../dataconnect/types");
 const portUtils_1 = require("./portUtils");
+const registry_1 = require("./registry");
 class DataConnectEmulator {
     constructor(args) {
         this.args = args;
         this.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT);
+        this.emulatorClient = new DataConnectEmulatorClient();
     }
     async start() {
-        this.logger.log("DEBUG", `Using Postgres connection string: ${this.getLocalConectionString()}`);
-        const info = await DataConnectEmulator.build({ configDir: this.args.configDir });
-        if ((0, types_2.requiresVector)(info.metadata)) {
-            if (constants_1.Constants.isDemoProject(this.args.projectId)) {
-                this.logger.logLabeled("WARN", "Data Connect", "Detected a 'demo-' project, but vector embeddings require a real project. Operations that use vector_embed will fail.");
-            }
-            else {
-                this.logger.logLabeled("WARN", "Data Connect", "Operations that use vector_embed will make calls to production Vertex AI");
+        try {
+            const info = await DataConnectEmulator.build({ configDir: this.args.configDir });
+            if ((0, types_2.requiresVector)(info.metadata)) {
+                if (constants_1.Constants.isDemoProject(this.args.projectId)) {
+                    this.logger.logLabeled("WARN", "Data Connect", "Detected a 'demo-' project, but vector embeddings require a real project. Operations that use vector_embed will fail.");
+                }
+                else {
+                    this.logger.logLabeled("WARN", "Data Connect", "Operations that use vector_embed will make calls to production Vertex AI");
+                }
             }
         }
-        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, Object.assign(Object.assign({}, this.args), { listen: (0, portUtils_1.listenSpecsToString)(this.args.listen), config_dir: this.args.configDir, local_connection_string: this.getLocalConectionString(), project_id: this.args.projectId, service_location: this.args.locationId }));
+        catch (err) {
+            this.logger.log("DEBUG", `'fdc build' failed with error: ${err.message}`);
+        }
+        return (0, downloadableEmulators_1.start)(types_1.Emulators.DATACONNECT, {
+            auto_download: this.args.auto_download,
+            listen: (0, portUtils_1.listenSpecsToString)(this.args.listen),
+            config_dir: this.args.configDir,
+            project_id: this.args.projectId,
+            service_location: this.args.locationId,
+        });
     }
     connect() {
         return Promise.resolve();
@@ -73,8 +85,11 @@ class DataConnectEmulator {
                 original: res.error,
             });
         }
+        if (res.status !== 0) {
+            throw new error_1.FirebaseError(`Unable to build your Data Connect schema and connectors (exit code ${res.status}): ${res.stderr}`);
+        }
         if (res.stderr) {
-            throw new error_1.FirebaseError(`Unable to build your Data Connect schema and connectors: ${res.stderr}`);
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT).log("DEBUG", res.stderr);
         }
         try {
             return JSON.parse(res.stdout);
@@ -90,5 +105,35 @@ class DataConnectEmulator {
         }
         return (_b = (_a = this.args.rc.getDataconnect()) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString;
     }
+    async connectToPostgres(localConnectionString, database, serviceId) {
+        const connectionString = localConnectionString !== null && localConnectionString !== void 0 ? localConnectionString : this.getLocalConectionString();
+        if (!connectionString) {
+            this.logger.log("DEBUG", "No Postgres connection string found, not connecting to Postgres");
+            return false;
+        }
+        await this.emulatorClient.configureEmulator({ connectionString, database, serviceId });
+        return true;
+    }
 }
 exports.DataConnectEmulator = DataConnectEmulator;
+class DataConnectEmulatorClient {
+    constructor() {
+        this.client = undefined;
+    }
+    async configureEmulator(body) {
+        if (!this.client) {
+            this.client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATACONNECT);
+        }
+        try {
+            const res = await this.client.post("emulator/configure", body);
+            return res;
+        }
+        catch (err) {
+            if (err.status === 500) {
+                throw new error_1.FirebaseError(`Data Connect emulator: ${err.context.body.message}`);
+            }
+            throw err;
+        }
+    }
+}
+exports.DataConnectEmulatorClient = DataConnectEmulatorClient;

package/lib/emulator/download.js

@@ -13,6 +13,10 @@ const downloadUtils = require("../downloadUtils");
 tmp.setGracefulCleanup();
 async function downloadEmulator(name) {
     const emulator = downloadableEmulators.getDownloadDetails(name);
+    if (emulator.localOnly) {
+        emulatorLogger_1.EmulatorLogger.forEmulator(name).logLabeled("WARN", name, `Env variable override detected, skipping download. Using ${emulator} emulator at ${emulator.binaryPath}`);
+        return;
+    }
     emulatorLogger_1.EmulatorLogger.forEmulator(name).logLabeled("BULLET", name, `downloading ${path.basename(emulator.downloadPath)}...`);
     fs.ensureDirSync(emulator.opts.cacheDir);
     const tmpfile = await downloadUtils.downloadToTmp(emulator.opts.remoteUrl, !!emulator.opts.auth);

package/lib/emulator/downloadableEmulators.js

@@ -23,9 +23,9 @@ const EMULATOR_UPDATE_DETAILS = {
         expectedChecksum: "2fd771101c0e1f7898c04c9204f2ce63",
     },
     firestore: {
-        version: "1.19.6",
-        expectedSize: 66349770,
-        expectedChecksum: "2eaabbe3cdb4867df585b7ec5505bad7",
+        version: "1.19.7",
+        expectedSize: 66438992,
+        expectedChecksum: "aec233bea95c5cfab03881574ec16d6c",
     },
     storage: {
         version: "1.1.3",
@@ -40,26 +40,26 @@ const EMULATOR_UPDATE_DETAILS = {
             expectedChecksum: "a7f4398a00e5ca22abdcd78dc3877d00",
         },
     pubsub: {
-        version: "0.8.2",
-        expectedSize: 65611398,
-        expectedChecksum: "70bb840321423e6ae621a3ae2f314903",
+        version: "0.8.14",
+        expectedSize: 66786933,
+        expectedChecksum: "a9025b3e53fdeafd2969ccb3ba1e1d38",
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.1.19",
-            expectedSize: 25836864,
-            expectedChecksum: "b31ba00789b82a30f0dee1c03b8f74ce",
+            version: "1.2.0",
+            expectedSize: 23954240,
+            expectedChecksum: "0f250761959519bb5a28fed76ceab2cb",
         }
         : process.platform === "win32"
             ? {
-                version: "1.1.19",
-                expectedSize: 23629824,
-                expectedChecksum: "bcbd7705b36cee72ff0587749d67bfc3",
+                version: "1.2.0",
+                expectedSize: 24360960,
+                expectedChecksum: "168ce32c742e1d26037c52bdbb7d871c",
             }
             : {
-                version: "1.1.19",
-                expectedSize: 23247120,
-                expectedChecksum: "56d6cb2ad85474d3a67999e35d2916a1",
+                version: "1.2.0",
+                expectedSize: 23970052,
+                expectedChecksum: "2ca17e4009a9ebae0f7c983bafff2ee6",
             },
 };
 exports.DownloadDetails = {
@@ -243,12 +243,15 @@ const Commands = {
         optionalArgs: [
             "listen",
             "config_dir",
-            "local_connection_string",
             "project_id",
             "service_location",
+            "disable_sdk_generation",
+            "resolvers_emulator",
+            "vertex_location",
+            "rpc_retry_count",
         ],
         joinArgs: true,
-        shell: true,
+        shell: false,
     },
 };
 function getExecPath(name) {
@@ -380,7 +383,17 @@ async function _runBinary(emulator, command, extraEnv) {
     });
 }
 function getDownloadDetails(emulator) {
-    return exports.DownloadDetails[emulator];
+    const details = exports.DownloadDetails[emulator];
+    const pathOverride = process.env[`${emulator.toUpperCase()}_EMULATOR_BINARY_PATH`];
+    if (pathOverride) {
+        const logger = emulatorLogger_1.EmulatorLogger.forEmulator(emulator);
+        logger.logLabeled("WARN", emulator, `Env variable override detected. Using ${emulator} emulator at ${pathOverride}`);
+        details.downloadPath = pathOverride;
+        details.binaryPath = pathOverride;
+        details.localOnly = true;
+        fs.chmodSync(pathOverride, 0o755);
+    }
+    return details;
 }
 exports.getDownloadDetails = getDownloadDetails;
 function get(emulator) {
@@ -424,7 +437,7 @@ async function downloadIfNecessary(targetName) {
 }
 exports.downloadIfNecessary = downloadIfNecessary;
 async function start(targetName, args, extraEnv = {}) {
-    const downloadDetails = exports.DownloadDetails[targetName];
+    const downloadDetails = getDownloadDetails(targetName);
     const emulator = get(targetName);
     const hasEmulator = fs.existsSync(getExecPath(targetName));
     const logger = emulatorLogger_1.EmulatorLogger.forEmulator(targetName);

package/lib/emulator/storage/rules/runtime.js

@@ -74,7 +74,7 @@ class StorageRulesRuntime {
         if (this.alive) {
             return;
         }
-        const downloadDetails = downloadableEmulators_1.DownloadDetails[types_2.Emulators.STORAGE];
+        const downloadDetails = (0, downloadableEmulators_1.getDownloadDetails)(types_2.Emulators.STORAGE);
         const hasEmulator = fs.existsSync(downloadDetails.downloadPath);
         if (!hasEmulator) {
             if (autoDownload) {

package/lib/frameworks/angular/utils.js

@@ -310,6 +310,8 @@ async function getContext(dir, targetOrConfiguration) {
                 continue;
             if (target === buildTarget && builder === "@angular-devkit/build-angular:application")
                 continue;
+            if (target === buildTarget && builder === "@angular-devkit/build-angular:browser")
+                continue;
             if (target === browserTarget && builder === "@angular-devkit/build-angular:browser-esbuild")
                 continue;
             if (target === browserTarget && builder === "@angular-devkit/build-angular:browser")
@@ -364,10 +366,13 @@ async function getBrowserConfig(sourceDir, configuration) {
     if (!buildOrBrowserTarget) {
         throw new assert_1.AssertionError({ message: "expected build or browser target defined" });
     }
-    const { locales, defaultLocale } = await localesForTarget(sourceDir, architectHost, buildOrBrowserTarget, workspaceProject);
-    const targetOptions = await architectHost.getOptionsForTarget(buildOrBrowserTarget);
+    const [{ locales, defaultLocale }, targetOptions, builderName] = await Promise.all([
+        localesForTarget(sourceDir, architectHost, buildOrBrowserTarget, workspaceProject),
+        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 ? "browser" : "");
+    const outputPath = (0, path_1.join)(targetOptions.outputPath, buildTarget && builderName === "@angular-devkit/build-angular:application" ? "browser" : "");
     return { locales, baseHref, outputPath, defaultLocale };
 }
 exports.getBrowserConfig = getBrowserConfig;

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.getInstance = exports.listInstances = void 0;
+exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = void 0;
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
 const operationPoller = require("../../operation-poller");
+const error_1 = require("../../error");
 const API_VERSION = "v1";
 const client = new apiv2_1.Client({
     urlPrefix: (0, api_1.cloudSQLAdminOrigin)(),
@@ -18,10 +19,17 @@ async function listInstances(projectId) {
 exports.listInstances = listInstances;
 async function getInstance(projectId, instanceId) {
     const res = await client.get(`projects/${projectId}/instances/${instanceId}`);
+    if (res.body.state === "FAILED") {
+        throw new error_1.FirebaseError(`Cloud SQL instance ${instanceId} is in a failed state.\nGo to ${instanceConsoleLink(projectId, instanceId)} to repair or delete it.`);
+    }
     return res.body;
 }
 exports.getInstance = getInstance;
-async function createInstance(projectId, location, instanceId, enableGoogleMlIntegration) {
+function instanceConsoleLink(projectId, instanceId) {
+    return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
+}
+exports.instanceConsoleLink = instanceConsoleLink;
+async function createInstance(projectId, location, instanceId, enableGoogleMlIntegration, waitForCreation) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
     if (enableGoogleMlIntegration) {
         databaseFlags.push({ name: "cloudsql.enable_google_ml_integration", value: "on" });
@@ -47,6 +55,9 @@ async function createInstance(projectId, location, instanceId, enableGoogleMlInt
             },
         },
     });
+    if (!waitForCreation) {
+        return;
+    }
     const opName = `projects/${projectId}/operations/${op.body.name}`;
     const pollRes = await operationPoller.pollOperation({
         apiOrigin: (0, api_1.cloudSQLAdminOrigin)(),

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

@@ -10,6 +10,8 @@ const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
 const client_1 = require("../../../dataconnect/client");
 const emulators_1 = require("../emulators");
+const names_1 = require("../../../dataconnect/names");
+const logger_1 = require("../../../logger");
 const TEMPLATE_ROOT = (0, path_1.resolve)(__dirname, "../../../../templates/init/dataconnect/");
 const DATACONNECT_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "dataconnect.yaml"), "utf8");
 const CONNECTOR_YAML_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "connector.yaml"), "utf8");
@@ -18,97 +20,21 @@ const QUERIES_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT,
 const MUTATIONS_TEMPLATE = (0, fs_1.readFileSync)((0, path_1.join)(TEMPLATE_ROOT, "mutations.gql"), "utf8");
 async function doSetup(setup, config) {
     var _a, _b, _c;
-    if (setup.projectId) {
-        await (0, ensureApis_1.ensureApis)(setup.projectId);
-    }
-    const serviceId = await (0, prompt_1.promptOnce)({
-        message: "What ID would you like to use for this service?",
-        type: "input",
-        default: "dataconnect",
-    });
-    const connectorId = await (0, prompt_1.promptOnce)({
-        message: "What ID would you like to use for your connector?",
-        type: "input",
-        default: "my-connector",
-    });
-    let cloudSqlInstanceId = "";
-    let newInstance = false;
-    let locationId = "";
-    if (setup.projectId) {
-        const instances = await cloudsql.listInstances(setup.projectId);
-        const choices = instances.map((i) => {
-            return { name: i.name, value: i.name, location: i.region };
-        });
-        const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(setup.projectId);
-        if (!freeTrialInstanceId) {
-            choices.push({ name: "Create a new instance", value: "", location: "" });
-        }
-        if (instances.length) {
-            cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
-                message: `Which CloudSQL instance would you like to use?`,
-                type: "list",
-                choices,
-            });
-        }
-        locationId = choices.find((c) => c.value === cloudSqlInstanceId).location;
-    }
-    if (cloudSqlInstanceId === "") {
-        let locationOptions = [
-            { name: "us-central1", value: "us-central1" },
-            { name: "europe-north1", value: "europe-north1" },
-            { name: "europe-central2", value: "europe-central2" },
-            { name: "europe-west1", value: "europe-west1" },
-            { name: "southamerica-west1", value: "southamerica-west1" },
-            { name: "us-east4", value: "us-east4" },
-            { name: "us-west1", value: "us-west1" },
-            { name: "asia-southeast1", value: "asia-southeast1" },
-        ];
-        if (setup.projectId) {
-            const locations = await (0, client_1.listLocations)(setup.projectId);
-            locationOptions = locations.map((l) => {
-                return { name: l, value: l };
-            });
-        }
-        newInstance = true;
-        cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
-            message: `What ID would you like to use for your new CloudSQL instance?`,
-            type: "input",
-            default: `dataconnect-test`,
-        });
-        locationId = await (0, prompt_1.promptOnce)({
-            message: "What location would you use for this instance?",
-            type: "list",
-            choices: locationOptions,
-        });
-    }
-    const dir = config.get("dataconnect.source") || "dataconnect";
-    if (!config.has("dataconnect")) {
-        config.set("dataconnect.source", dir);
-        config.set("dataconnect.location", locationId);
-    }
-    let cloudSqlDatabase = "";
-    let newDB = false;
-    if (!newInstance && setup.projectId) {
-        const dbs = await cloudsql.listDatabases(setup.projectId, cloudSqlInstanceId);
-        const choices = dbs.map((d) => {
-            return { name: d.name, value: d.name };
-        });
-        choices.push({ name: "Create a new database", value: "" });
-        if (dbs.length) {
-            cloudSqlDatabase = await (0, prompt_1.promptOnce)({
-                message: `Which database in ${cloudSqlInstanceId} would you like to use?`,
-                type: "list",
-                choices,
-            });
-        }
+    let info = {
+        serviceId: "",
+        locationId: "",
+        cloudSqlInstanceId: "",
+        isNewInstance: false,
+        cloudSqlDatabase: "",
+        isNewDatabase: false,
+        connectorId: "default-connector",
+    };
+    info = await promptForService(setup, info);
+    if (info.cloudSqlInstanceId === "") {
+        info = await promptForCloudSQLInstance(setup, info);
     }
-    if (cloudSqlDatabase === "") {
-        newDB = true;
-        cloudSqlDatabase = await (0, prompt_1.promptOnce)({
-            message: `What ID would you like to use for your new database in ${cloudSqlInstanceId}?`,
-            type: "input",
-            default: `dataconnect`,
-        });
+    if (info.cloudSqlDatabase === "") {
+        info = await promptForDatabase(setup, config, info);
     }
     const defaultConnectionString = (_c = (_b = (_a = setup.rcfile.dataconnectEmulatorConfig) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.localConnectionString) !== null && _c !== void 0 ? _c : emulators_1.DEFAULT_POSTGRES_CONNECTION;
     const localConnectionString = await (0, prompt_1.promptOnce)({
@@ -118,35 +44,27 @@ async function doSetup(setup, config) {
         default: defaultConnectionString,
     });
     setup.rcfile.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
-    const subbedDataconnectYaml = subValues(DATACONNECT_YAML_TEMPLATE, {
-        serviceId,
-        cloudSqlInstanceId,
-        cloudSqlDatabase,
-        connectorId,
-    });
-    const subbedConnectorYaml = subValues(CONNECTOR_YAML_TEMPLATE, {
-        serviceId,
-        cloudSqlInstanceId,
-        cloudSqlDatabase,
-        connectorId,
-    });
+    const dir = config.get("dataconnect.source") || "dataconnect";
+    const subbedDataconnectYaml = subValues(DATACONNECT_YAML_TEMPLATE, info);
+    const subbedConnectorYaml = subValues(CONNECTOR_YAML_TEMPLATE, info);
     await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
-    await config.askWriteProjectFile((0, path_1.join)(dir, "connector", "connector.yaml"), subbedConnectorYaml);
     await config.askWriteProjectFile((0, path_1.join)(dir, "schema", "schema.gql"), SCHEMA_TEMPLATE);
-    await config.askWriteProjectFile((0, path_1.join)(dir, "connector", "queries.gql"), QUERIES_TEMPLATE);
-    await config.askWriteProjectFile((0, path_1.join)(dir, "connector", "mutations.gql"), MUTATIONS_TEMPLATE);
+    await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "connector.yaml"), subbedConnectorYaml);
+    await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "queries.gql"), QUERIES_TEMPLATE);
+    await config.askWriteProjectFile((0, path_1.join)(dir, info.connectorId, "mutations.gql"), MUTATIONS_TEMPLATE);
     if (setup.projectId &&
-        (newInstance || newDB) &&
+        (info.isNewInstance || info.isNewDatabase) &&
         (await (0, prompt_1.confirm)({
             message: "Would you like to provision your CloudSQL instance and database now? This will take a few minutes.",
             default: true,
         }))) {
         await (0, provisionCloudSql_1.provisionCloudSql)({
             projectId: setup.projectId,
-            locationId,
-            instanceId: cloudSqlInstanceId,
-            databaseId: cloudSqlDatabase,
+            locationId: info.locationId,
+            instanceId: info.cloudSqlInstanceId,
+            databaseId: info.cloudSqlDatabase,
             enableGoogleMlIntegration: false,
+            waitForCreation: false,
         });
     }
 }
@@ -164,3 +82,146 @@ function subValues(template, replacementValues) {
     }
     return replaced;
 }
+async function promptForService(setup, info) {
+    var _a, _b, _c, _d;
+    if (setup.projectId) {
+        await (0, ensureApis_1.ensureApis)(setup.projectId);
+        const existingServices = await (0, client_1.listAllServices)(setup.projectId);
+        const existingServicesAndSchemas = await Promise.all(existingServices.map(async (s) => {
+            return {
+                service: s,
+                schema: await (0, client_1.getSchema)(s.name),
+            };
+        }));
+        const existingFreshServicesAndSchemas = existingServicesAndSchemas.filter((s) => {
+            var _a, _b;
+            return !((_b = (_a = s.schema) === null || _a === void 0 ? void 0 : _a.source.files) === null || _b === void 0 ? void 0 : _b.length);
+        });
+        if (existingFreshServicesAndSchemas.length) {
+            const choices = existingFreshServicesAndSchemas.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 });
+            const choice = await (0, prompt_1.promptOnce)({
+                message: "Your project already has existing services. Which would you like to set up local files for?",
+                type: "list",
+                choices,
+            });
+            if (choice) {
+                const serviceName = (0, names_1.parseServiceName)(choice.service.name);
+                info.serviceId = serviceName.serviceId;
+                info.locationId = serviceName.location;
+                if (choice.schema) {
+                    info.cloudSqlInstanceId =
+                        (_b = (_a = choice.schema.primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) !== null && _b !== void 0 ? _b : "";
+                    info.cloudSqlDatabase = (_d = (_c = choice.schema.primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
+                }
+            }
+        }
+    }
+    if (info.serviceId === "") {
+        info.serviceId = await (0, prompt_1.promptOnce)({
+            message: "What ID would you like to use for this service?",
+            type: "input",
+            default: "my-service",
+        });
+    }
+    return info;
+}
+async function promptForCloudSQLInstance(setup, info) {
+    if (setup.projectId) {
+        const instances = await cloudsql.listInstances(setup.projectId);
+        let choices = instances.map((i) => {
+            return { name: i.name, value: i.name, location: i.region };
+        });
+        choices = choices.filter((c) => info.locationId === "" || info.locationId === c.location);
+        if (choices.length) {
+            const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(setup.projectId);
+            if (!freeTrialInstanceId) {
+                choices.push({ name: "Create a new instance", value: "", location: "" });
+            }
+            info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
+                message: `Which CloudSQL instance would you like to use?`,
+                type: "list",
+                choices,
+            });
+            info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
+        }
+    }
+    if (info.cloudSqlInstanceId === "") {
+        info.isNewInstance = true;
+        info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new CloudSQL instance?`,
+            type: "input",
+            default: `fdc-sql`,
+        });
+    }
+    if (info.locationId === "") {
+        const choices = await locationChoices(setup);
+        info.locationId = await (0, prompt_1.promptOnce)({
+            message: "What location would like to use?",
+            type: "list",
+            choices,
+        });
+    }
+    return info;
+}
+async function locationChoices(setup) {
+    if (setup.projectId) {
+        const locations = await (0, client_1.listLocations)(setup.projectId);
+        return locations.map((l) => {
+            return { name: l, value: l };
+        });
+    }
+    else {
+        return [
+            { name: "us-central1", value: "us-central1" },
+            { name: "europe-north1", value: "europe-north1" },
+            { name: "europe-central2", value: "europe-central2" },
+            { name: "europe-west1", value: "europe-west1" },
+            { name: "southamerica-west1", value: "southamerica-west1" },
+            { name: "us-east4", value: "us-east4" },
+            { name: "us-west1", value: "us-west1" },
+            { name: "asia-southeast1", value: "asia-southeast1" },
+        ];
+    }
+}
+async function promptForDatabase(setup, config, info) {
+    const dir = config.get("dataconnect.source") || "dataconnect";
+    if (!config.has("dataconnect")) {
+        config.set("dataconnect.source", dir);
+        config.set("dataconnect.location", info.locationId);
+    }
+    if (!info.isNewInstance && setup.projectId) {
+        try {
+            const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
+            const choices = dbs.map((d) => {
+                return { name: d.name, value: d.name };
+            });
+            choices.push({ name: "Create a new database", value: "" });
+            if (dbs.length) {
+                info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+                    message: `Which database in ${info.cloudSqlInstanceId} would you like to use?`,
+                    type: "list",
+                    choices,
+                });
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
+        }
+    }
+    if (info.cloudSqlDatabase === "") {
+        info.isNewDatabase = true;
+        info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new database in ${info.cloudSqlInstanceId}?`,
+            type: "input",
+            default: `fdcdb`,
+        });
+    }
+    return info;
+}

package/lib/rc.js

@@ -157,9 +157,7 @@ class RC {
         return (_a = this.data.dataconnectEmulatorConfig) !== null && _a !== void 0 ? _a : {};
     }
     setDataconnect(localConnectionString) {
-        if (!this.data.dataconnectEmulatorConfig) {
-            this.data.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
-        }
+        this.data.dataconnectEmulatorConfig = { postgres: { localConnectionString } };
     }
     save() {
         if (this.path) {

package/lib/track.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.track = exports.cliSession = exports.emulatorSession = exports.trackEmulator = exports.trackGA4 = exports.usageEnabled = exports.GA4_PROPERTIES = void 0;
+exports.track = exports.cliSession = exports.vscodeSession = exports.emulatorSession = exports.trackVSCode = exports.trackEmulator = exports.trackGA4 = exports.usageEnabled = exports.GA4_PROPERTIES = void 0;
 const node_fetch_1 = require("node-fetch");
 const ua = require("universal-analytics");
 const uuid_1 = require("uuid");
@@ -19,6 +19,11 @@ exports.GA4_PROPERTIES = {
         apiSecret: process.env.FIREBASE_EMULATOR_GA4_API_SECRET || "2V_zBYc4TdeoppzDaIu0zw",
         clientIdKey: "emulator-analytics-clientId",
     },
+    vscode: {
+        measurementId: process.env.FIREBASE_VSCODE_GA4_MEASUREMENT_ID || "G-FYJ489XM2T",
+        apiSecret: process.env.FIREBASE_VSCODE_GA4_API_SECRET || "XAEWKHe7RM-ygCK44N52Ww",
+        clientIdKey: "vscode-analytics-clientId",
+    },
 };
 function usageEnabled() {
     return !!process.env.IS_FIREBASE_CLI && !!configstore_1.configstore.get("usage");
@@ -69,6 +74,24 @@ async function trackEmulator(eventName, params) {
     });
 }
 exports.trackEmulator = trackEmulator;
+async function trackVSCode(eventName, params) {
+    const session = vscodeSession();
+    if (!session) {
+        return;
+    }
+    session.debugMode = process.env.VSCODE_DEBUG_MODE === "true";
+    const oldTotalEngagementSeconds = session.totalEngagementSeconds;
+    session.totalEngagementSeconds = process.uptime();
+    const duration = session.totalEngagementSeconds - oldTotalEngagementSeconds;
+    return _ga4Track({
+        session,
+        apiSecret: exports.GA4_PROPERTIES.vscode.apiSecret,
+        eventName,
+        params,
+        duration,
+    });
+}
+exports.trackVSCode = trackVSCode;
 async function _ga4Track(args) {
     const { session, apiSecret, eventName, params, duration } = args;
     session.commandName = (params === null || params === void 0 ? void 0 : params.command_name) || session.commandName;
@@ -119,13 +142,17 @@ function emulatorSession() {
     return session("emulator");
 }
 exports.emulatorSession = emulatorSession;
+function vscodeSession() {
+    return session("vscode");
+}
+exports.vscodeSession = vscodeSession;
 function cliSession() {
     return session("cli");
 }
 exports.cliSession = cliSession;
 function session(propertyName) {
     const validateOnly = !!process.env.FIREBASE_CLI_MP_VALIDATE;
-    if (!usageEnabled()) {
+    if (!usageEnabled() && propertyName !== "vscode") {
         if (validateOnly) {
             logger_1.logger.warn("Google Analytics is DISABLED. To enable, (re)login and opt in to collection.");
         }

package/package.json

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

package/schema/firebase-config.json

@@ -726,6 +726,7 @@
                                 "nodejs16",
                                 "nodejs18",
                                 "nodejs20",
+                                "nodejs22",
                                 "nodejs6",
                                 "nodejs8",
                                 "python310",
@@ -787,6 +788,7 @@
                                     "nodejs16",
                                     "nodejs18",
                                     "nodejs20",
+                                    "nodejs22",
                                     "nodejs6",
                                     "nodejs8",
                                     "python310",

package/templates/init/dataconnect/dataconnect.yaml

@@ -7,4 +7,4 @@ schema:
       database: "__cloudSqlDatabase__"
       cloudSql:
         instanceId: "__cloudSqlInstanceId__"
-connectorDirs: ["./connector"]
+connectorDirs: ["./__connectorId__"]

package/templates/init/dataconnect/mutations.gql

@@ -10,7 +10,7 @@
 # }
 # mutation CreateEmail($content: String, $subject: String, $fromUid: String) @auth(level: PUBLIC) {
 #   email_insert(data: {
-#     text: $content,
+#     text: $content, # The request variable name doesn't have to match the field name.
 #     subject: $subject,
 #     fromUid: $fromUid,
 ## Server values let your service populate data for you

package/templates/init/dataconnect/queries.gql

@@ -13,12 +13,12 @@
 ## where allows you to filter lists
 ## Here, we use it to filter to only emails where this user is one of the recipients.
 #   emails(where: {
-#     users_via_Recipient: { 
+#     users_via_Recipient: {
 #       exist: { uid: { eq: $uid }
 #     }}
 #   }) {
-#     id subject sent 
-#     content: text 
+#     id subject sent
+#     content: text # Select the `text` field but alias it as `content` in the response.
 #     sender: from { name email: address uid }
 
 ## <field>_on_<foreign_key_field> makes it easy to grab info from another table
@@ -38,11 +38,11 @@
 # query ListSent(
 #   $uid: String
 # ) @auth(level: PUBLIC) {
-#   emails(where: { 
+#   emails(where: {
 #     fromUid: { eq: $uid }
 #   }) {
-#     id subject sent 
-#     content: text 
+#     id subject sent
+#     content: text
 #     sender: from { name email: address uid }
 #     to: recipients_on_email {
 #       user { name email: address uid }