firebase-tools 13.26.0 → 13.27.0

package/lib/apphosting/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfigForEnvironment = exports.maybeAddSecretToYaml = exports.upsertEnv = exports.findEnv = exports.store = exports.load = exports.listAppHostingFilesInPath = exports.discoverBackendRoot = exports.APPHOSTING_YAML_FILE_REGEX = exports.APPHOSTING_LOCAL_YAML_FILE = exports.APPHOSTING_BASE_YAML_FILE = void 0;
+exports.loadConfigToExportSecrets = exports.loadConfigForEnvironment = exports.exportConfig = exports.maybeAddSecretToYaml = exports.upsertEnv = exports.findEnv = exports.store = exports.load = exports.listAppHostingFilesInPath = exports.discoverBackendRoot = exports.APPHOSTING_YAML_FILE_REGEX = exports.APPHOSTING_LOCAL_YAML_FILE = exports.APPHOSTING_BASE_YAML_FILE = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const yaml = require("yaml");
@@ -8,9 +8,17 @@ const fs = require("../fsutils");
 const prompt = require("../prompt");
 const dialogs = require("./secrets/dialogs");
 const yaml_1 = require("./yaml");
+const error_1 = require("../error");
+const utils_1 = require("./utils");
+const secrets_1 = require("./secrets");
+const logger_1 = require("../logger");
+const utils_2 = require("../utils");
+const projects_1 = require("../management/projects");
 exports.APPHOSTING_BASE_YAML_FILE = "apphosting.yaml";
 exports.APPHOSTING_LOCAL_YAML_FILE = "apphosting.local.yaml";
 exports.APPHOSTING_YAML_FILE_REGEX = /^apphosting(\.[a-z0-9_]+)?\.yaml$/;
+const SECRET_CONFIG = "Secret";
+const EXPORTABLE_CONFIG = [SECRET_CONFIG];
 function discoverBackendRoot(cwd) {
     let dir = cwd;
     while (!fs.fileExistsSync((0, path_1.resolve)(dir, exports.APPHOSTING_BASE_YAML_FILE))) {
@@ -108,6 +116,49 @@ async function maybeAddSecretToYaml(secretName) {
     dynamicDispatch.store(path, projectYaml);
 }
 exports.maybeAddSecretToYaml = maybeAddSecretToYaml;
+async function exportConfig(cwd, projectRoot, backendRoot, projectId, userGivenConfigFile) {
+    const choices = await prompt.prompt({}, [
+        {
+            type: "checkbox",
+            name: "configurations",
+            message: "What configs would you like to export?",
+            choices: EXPORTABLE_CONFIG,
+        },
+    ]);
+    if (!choices.configurations.includes(SECRET_CONFIG)) {
+        logger_1.logger.info("No configs selected to export");
+        return;
+    }
+    if (!projectId) {
+        const project = await (0, projects_1.getOrPromptProject)({});
+        projectId = project.projectId;
+    }
+    let localAppHostingConfig = yaml_1.AppHostingYamlConfig.empty();
+    const localAppHostingConfigPath = (0, path_1.resolve)(backendRoot, exports.APPHOSTING_LOCAL_YAML_FILE);
+    if (fs.fileExistsSync(localAppHostingConfigPath)) {
+        localAppHostingConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(localAppHostingConfigPath);
+    }
+    const configToExport = await loadConfigToExportSecrets(cwd, userGivenConfigFile);
+    const secretsToExport = configToExport.secrets;
+    if (!secretsToExport) {
+        logger_1.logger.info("No secrets found to export in the chosen App Hosting config files");
+        return;
+    }
+    const secretMaterial = await (0, secrets_1.fetchSecrets)(projectId, secretsToExport);
+    for (const [key, value] of secretMaterial) {
+        localAppHostingConfig.addEnvironmentVariable({
+            variable: key,
+            value: value,
+            availability: ["RUNTIME"],
+        });
+    }
+    localAppHostingConfig.clearSecrets();
+    localAppHostingConfig.upsertFile(localAppHostingConfigPath);
+    logger_1.logger.info(`Wrote secrets as environment variables to ${exports.APPHOSTING_LOCAL_YAML_FILE}.`);
+    (0, utils_2.updateOrCreateGitignore)(projectRoot, [exports.APPHOSTING_LOCAL_YAML_FILE]);
+    logger_1.logger.info(`${exports.APPHOSTING_LOCAL_YAML_FILE} has been automatically added to your .gitignore.`);
+}
+exports.exportConfig = exportConfig;
 async function loadConfigForEnvironment(envYamlPath, baseYamlPath) {
     const envYamlConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(envYamlPath);
     if (baseYamlPath) {
@@ -118,3 +169,37 @@ async function loadConfigForEnvironment(envYamlPath, baseYamlPath) {
     return envYamlConfig;
 }
 exports.loadConfigForEnvironment = loadConfigForEnvironment;
+async function loadConfigToExportSecrets(cwd, userGivenConfigFile) {
+    if (userGivenConfigFile && !exports.APPHOSTING_YAML_FILE_REGEX.test(userGivenConfigFile)) {
+        throw new error_1.FirebaseError("Invalid apphosting yaml config file provided. File must be in format: 'apphosting.yaml' or 'apphosting.<environment>.yaml'");
+    }
+    const allConfigs = getValidConfigs(cwd);
+    let userGivenConfigFilePath;
+    if (userGivenConfigFile) {
+        if (!allConfigs.has(userGivenConfigFile)) {
+            throw new error_1.FirebaseError(`The provided app hosting config file "${userGivenConfigFile}" does not exist`);
+        }
+        userGivenConfigFilePath = allConfigs.get(userGivenConfigFile);
+    }
+    else {
+        userGivenConfigFilePath = await (0, utils_1.promptForAppHostingYaml)(allConfigs, "Which environment would you like to export secrets from Secret Manager for?");
+    }
+    if (userGivenConfigFile === exports.APPHOSTING_BASE_YAML_FILE) {
+        return yaml_1.AppHostingYamlConfig.loadFromFile(allConfigs.get(exports.APPHOSTING_BASE_YAML_FILE));
+    }
+    const baseFilePath = allConfigs.get(exports.APPHOSTING_BASE_YAML_FILE);
+    return await loadConfigForEnvironment(userGivenConfigFilePath, baseFilePath);
+}
+exports.loadConfigToExportSecrets = loadConfigToExportSecrets;
+function getValidConfigs(cwd) {
+    const appHostingConfigPaths = listAppHostingFilesInPath(cwd).filter((path) => !path.endsWith(exports.APPHOSTING_LOCAL_YAML_FILE));
+    if (appHostingConfigPaths.length === 0) {
+        throw new error_1.FirebaseError("No apphosting.*.yaml configs found");
+    }
+    const fileNameToPathMap = new Map();
+    for (const path of appHostingConfigPaths) {
+        const fileName = (0, path_1.basename)(path);
+        fileNameToPathMap.set(fileName, path);
+    }
+    return fileNameToPathMap;
+}

package/lib/apphosting/secrets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSecretNameParts = exports.loadConfigToExport = exports.fetchSecrets = exports.upsertSecret = exports.grantSecretAccess = exports.serviceAccountsForBackend = exports.toMulti = void 0;
+exports.getSecretNameParts = exports.fetchSecrets = exports.upsertSecret = exports.grantSecretAccess = exports.serviceAccountsForBackend = exports.toMulti = void 0;
 const error_1 = require("../../error");
 const gcsm = require("../../gcp/secretManager");
 const gcb = require("../../gcp/cloudbuild");
@@ -10,10 +10,6 @@ const secretManager_1 = require("../../gcp/secretManager");
 const secretManager_2 = require("../../gcp/secretManager");
 const utils = require("../../utils");
 const prompt = require("../../prompt");
-const path_1 = require("path");
-const config_1 = require("../config");
-const utils_1 = require("../utils");
-const yaml_1 = require("../yaml");
 function toMulti(accounts) {
     const m = {
         buildServiceAccounts: [accounts.buildServiceAccount],
@@ -125,40 +121,6 @@ async function fetchSecrets(projectId, secrets) {
     return secretsKeyValuePairs;
 }
 exports.fetchSecrets = fetchSecrets;
-async function loadConfigToExport(cwd, userGivenConfigFile) {
-    if (userGivenConfigFile && !config_1.APPHOSTING_YAML_FILE_REGEX.test(userGivenConfigFile)) {
-        throw new error_1.FirebaseError("Invalid apphosting yaml config file provided. File must be in format: 'apphosting.yaml' or 'apphosting.<environment>.yaml'");
-    }
-    const allConfigs = getValidConfigs(cwd);
-    let userGivenConfigFilePath;
-    if (userGivenConfigFile) {
-        if (!allConfigs.has(userGivenConfigFile)) {
-            throw new error_1.FirebaseError(`The provided app hosting config file "${userGivenConfigFile}" does not exist`);
-        }
-        userGivenConfigFilePath = allConfigs.get(userGivenConfigFile);
-    }
-    else {
-        userGivenConfigFilePath = await (0, utils_1.promptForAppHostingYaml)(allConfigs, "Which environment would you like to export secrets from Secret Manager for?");
-    }
-    if (userGivenConfigFile === config_1.APPHOSTING_BASE_YAML_FILE) {
-        return yaml_1.AppHostingYamlConfig.loadFromFile(allConfigs.get(config_1.APPHOSTING_BASE_YAML_FILE));
-    }
-    const baseFilePath = allConfigs.get(config_1.APPHOSTING_BASE_YAML_FILE);
-    return await (0, config_1.loadConfigForEnvironment)(userGivenConfigFilePath, baseFilePath);
-}
-exports.loadConfigToExport = loadConfigToExport;
-function getValidConfigs(cwd) {
-    const appHostingConfigPaths = (0, config_1.listAppHostingFilesInPath)(cwd).filter((path) => !path.endsWith(config_1.APPHOSTING_LOCAL_YAML_FILE));
-    if (appHostingConfigPaths.length === 0) {
-        throw new error_1.FirebaseError("No apphosting.*.yaml configs found");
-    }
-    const fileNameToPathMap = new Map();
-    for (const path of appHostingConfigPaths) {
-        const fileName = (0, path_1.basename)(path);
-        fileNameToPathMap.set(fileName, path);
-    }
-    return fileNameToPathMap;
-}
 function getSecretNameParts(secret) {
     let [name, version] = secret.split("@");
     if (!version) {

package/lib/apphosting/yaml.js

@@ -43,6 +43,9 @@ class AppHostingYamlConfig {
     addSecret(secret) {
         this._secrets.set(secret.variable, secret);
     }
+    clearSecrets() {
+        this._secrets.clear();
+    }
     merge(other) {
         for (const [key, value] of other._environmentVariables) {
             this._environmentVariables.set(key, value);

package/lib/commands/apphosting-config-export.js

@@ -2,17 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
 const command_1 = require("../command");
-const logger_1 = require("../logger");
 const projectUtils_1 = require("../projectUtils");
 const requireAuth_1 = require("../requireAuth");
 const secretManager = require("../gcp/secretManager");
 const requirePermissions_1 = require("../requirePermissions");
 const config_1 = require("../apphosting/config");
-const secrets_1 = require("../apphosting/secrets");
-const path_1 = require("path");
-const fs = require("../fsutils");
-const yaml_1 = require("../apphosting/yaml");
 const error_1 = require("../error");
+const detectProjectRoot_1 = require("../detectProjectRoot");
 exports.command = new command_1.Command("apphosting:config:export")
     .description("Export App Hosting configurations such as secrets into an apphosting.local.yaml file")
     .option("-s, --secrets <apphosting.yaml or apphosting.<environment>.yaml file to export secrets from>", "This command combines the base apphosting.yaml with the specified environment-specific file (e.g., apphosting.staging.yaml). If keys conflict, the environment-specific file takes precedence.")
@@ -20,32 +16,14 @@ exports.command = new command_1.Command("apphosting:config:export")
     .before(secretManager.ensureApi)
     .before(requirePermissions_1.requirePermissions, ["secretmanager.versions.access"])
     .action(async (options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const environmentConfigFile = options.secrets;
     const cwd = process.cwd();
-    let localAppHostingConfig = yaml_1.AppHostingYamlConfig.empty();
     const backendRoot = (0, config_1.discoverBackendRoot)(cwd);
     if (!backendRoot) {
         throw new error_1.FirebaseError("Missing apphosting.yaml: This command requires an apphosting.yaml configuration file. Please run 'firebase init apphosting' and try again.");
     }
-    const localAppHostingConfigPath = (0, path_1.resolve)(backendRoot, config_1.APPHOSTING_LOCAL_YAML_FILE);
-    if (fs.fileExistsSync(localAppHostingConfigPath)) {
-        localAppHostingConfig = await yaml_1.AppHostingYamlConfig.loadFromFile(localAppHostingConfigPath);
-    }
-    const configToExport = await (0, secrets_1.loadConfigToExport)(cwd, environmentConfigFile);
-    const secretsToExport = configToExport.secrets;
-    if (!secretsToExport) {
-        logger_1.logger.warn("No secrets found to export in the chosen App Hosting config files");
-        return;
-    }
-    const secretMaterial = await (0, secrets_1.fetchSecrets)(projectId, secretsToExport);
-    for (const [key, value] of secretMaterial) {
-        localAppHostingConfig.addEnvironmentVariable({
-            variable: key,
-            value: value,
-            availability: ["RUNTIME"],
-        });
-    }
-    localAppHostingConfig.upsertFile(localAppHostingConfigPath);
-    logger_1.logger.info(`Wrote secrets as environment variables to ${config_1.APPHOSTING_LOCAL_YAML_FILE}.`);
+    const projectRoot = (_a = (0, detectProjectRoot_1.detectProjectRoot)({})) !== null && _a !== void 0 ? _a : backendRoot;
+    await (0, config_1.exportConfig)(cwd, projectRoot, backendRoot, projectId, environmentConfigFile);
 });

package/lib/commands/index.js

@@ -172,6 +172,8 @@ function load(client) {
         client.apphosting.secrets.grantaccess = loadCommand("apphosting-secrets-grantaccess");
         client.apphosting.secrets.describe = loadCommand("apphosting-secrets-describe");
         client.apphosting.secrets.access = loadCommand("apphosting-secrets-access");
+        client.apphosting.config = {};
+        client.apphosting.config.export = loadCommand("apphosting-config-export");
         if (experiments.isEnabled("internaltesting")) {
             client.apphosting.builds = {};
             client.apphosting.builds.get = loadCommand("apphosting-builds-get");
@@ -182,10 +184,6 @@ function load(client) {
             client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
             client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
         }
-        if (experiments.isEnabled("emulatorapphosting")) {
-            client.apphosting.config = {};
-            client.apphosting.config.export = loadCommand("apphosting-config-export");
-        }
     }
     client.login = loadCommand("login");
     client.login.add = loadCommand("login-add");

package/lib/deploy/functions/release/fabricator.js

@@ -224,7 +224,7 @@ class Fabricator {
         }
     }
     async createV2Function(endpoint, scraper) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const storageSource = (_a = this.sources[endpoint.codebase]) === null || _a === void 0 ? void 0 : _a.storage;
         if (!storageSource) {
             logger_1.logger.debug("Precondition failed. Cannot create a GCFv2 function without storage");
@@ -295,8 +295,8 @@ class Fabricator {
                 }
             });
         }
-        endpoint.uri = (_d = resultFunction.serviceConfig) === null || _d === void 0 ? void 0 : _d.uri;
-        const serviceName = (_e = resultFunction.serviceConfig) === null || _e === void 0 ? void 0 : _e.service;
+        endpoint.uri = resultFunction.url;
+        const serviceName = (_d = resultFunction.serviceConfig) === null || _d === void 0 ? void 0 : _d.service;
         endpoint.runServiceId = utils.last(serviceName === null || serviceName === void 0 ? void 0 : serviceName.split("/"));
         if (!serviceName) {
             logger_1.logger.debug("Result function unexpectedly didn't have a service name.");

package/lib/emulator/apphosting/developmentServer.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectStartCommand = exports.detectPackageManager = exports.logger = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const emulatorLogger_1 = require("../emulatorLogger");
+const types_1 = require("../types");
+const error_1 = require("../../error");
+exports.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
+async function detectPackageManager(rootdir) {
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "pnpm-lock.yaml"))) {
+        return "pnpm";
+    }
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "yarn.lock"))) {
+        return "yarn";
+    }
+    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "package-lock.json"))) {
+        return "npm";
+    }
+    throw new error_1.FirebaseError("Unsupported package manager");
+}
+exports.detectPackageManager = detectPackageManager;
+async function detectStartCommand(rootDir) {
+    try {
+        const packageManager = await detectPackageManager(rootDir);
+        return `${packageManager} run dev`;
+    }
+    catch (e) {
+        throw new error_1.FirebaseError("Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommandOverride`");
+    }
+}
+exports.detectStartCommand = detectStartCommand;

package/lib/emulator/apphosting/index.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppHostingEmulator = void 0;
 const types_1 = require("../types");
 const serve_1 = require("./serve");
-const utils_1 = require("./utils");
+const developmentServer_1 = require("./developmentServer");
 class AppHostingEmulator {
     constructor(args) {
         this.args = args;
     }
     async start() {
         const { hostname, port } = await (0, serve_1.start)({
+            port: this.args.port,
             startCommand: this.args.startCommandOverride,
             rootDirectory: this.args.rootDirectory,
         });
@@ -17,11 +18,11 @@ class AppHostingEmulator {
         this.args.options.port = port;
     }
     connect() {
-        utils_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "connecting apphosting emulator");
+        developmentServer_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "connecting apphosting emulator");
         return Promise.resolve();
     }
     stop() {
-        utils_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "stopping apphosting emulator");
+        developmentServer_1.logger.logLabeled("INFO", types_1.Emulators.APPHOSTING, "stopping apphosting emulator");
         return Promise.resolve();
     }
     getInfo() {

package/lib/emulator/apphosting/serve.js

@@ -3,16 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
 const net_1 = require("net");
 const portUtils_1 = require("../portUtils");
-const utils_1 = require("./utils");
+const developmentServer_1 = require("./developmentServer");
 const constants_1 = require("../constants");
 const spawn_1 = require("../../init/spawn");
-const utils_2 = require("./utils");
+const developmentServer_2 = require("./developmentServer");
 const types_1 = require("../types");
 const config_1 = require("./config");
 const projectPath_1 = require("../../projectPath");
 async function start(options) {
+    var _a;
     const hostname = constants_1.DEFAULT_HOST;
-    let port = constants_1.DEFAULT_PORTS.apphosting;
+    let port = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_PORTS.apphosting;
     while (!(await availablePort(hostname, port))) {
         port += 1;
     }
@@ -30,13 +31,13 @@ async function serve(port, startCommand, backendRelativeDir) {
     }
     const environmentVariablesToInject = Object.assign(Object.assign({}, environmentVariablesAsRecord), { PORT: port.toString() });
     if (startCommand) {
-        utils_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
+        developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `running custom start command: '${startCommand}'`);
         await (0, spawn_1.spawnWithCommandString)(startCommand, backendRoot, environmentVariablesToInject);
         return;
     }
-    const packageManager = await (0, utils_1.discoverPackageManager)(backendRoot);
-    utils_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${packageManager} run dev'`);
-    await (0, spawn_1.wrapSpawn)(packageManager, ["run", "dev"], backendRoot, environmentVariablesToInject);
+    const detectedStartCommand = await (0, developmentServer_1.detectStartCommand)(backendRoot);
+    developmentServer_2.logger.logLabeled("BULLET", types_1.Emulators.APPHOSTING, `starting app with: '${detectedStartCommand}'`);
+    await (0, spawn_1.spawnWithCommandString)(detectedStartCommand, backendRoot, environmentVariablesToInject);
 }
 function availablePort(host, port) {
     return (0, portUtils_1.checkListenable)({

package/lib/emulator/commandUtils.js

@@ -300,8 +300,9 @@ async function emulatorExec(script, options) {
         exitCode = await runScript(script, extraEnv);
         await controller.onExit(options);
     }
-    catch (_a) {
+    catch (err) {
         await (0, webhook_1.sendVSCodeMessage)({ message: webhook_1.VSCODE_MESSAGE.EMULATORS_START_ERRORED });
+        throw err;
     }
     finally {
         await controller.cleanShutdown();

package/lib/emulator/controller.js

@@ -58,7 +58,7 @@ async function exportOnExit(options) {
             await exportEmulatorData(exportOnExitDir, options, "exit");
         }
         catch (e) {
-            utils.logWarning(e);
+            utils.logWarning(`${e}`);
             utils.logWarning(`Automatic export to "${exportOnExitDir}" failed, going to exit now...`);
         }
     }
@@ -561,19 +561,30 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         else if (config.length > 1) {
             logger_1.logger.warn(`TODO: Add support for multiple services in the Data Connect emulator. Currently emulating first service ${config[0].source}`);
         }
-        const configDir = config[0].source;
-        const dataConnectEmulator = new dataconnectEmulator_1.DataConnectEmulator({
+        const args = {
             listen: listenForEmulator.dataconnect,
             projectId,
             auto_download: true,
-            configDir,
+            configDir: config[0].source,
             rc: options.rc,
             config: options.config,
             autoconnectToPostgres: true,
             postgresListen: listenForEmulator["dataconnect.postgres"],
             enable_output_generated_sdk: true,
             enable_output_schema_extensions: true,
-        });
+        };
+        if (exportMetadata.dataconnect) {
+            utils.assertIsString(options.import);
+            const importDirAbsPath = path.resolve(options.import);
+            const exportMetadataFilePath = path.resolve(importDirAbsPath, exportMetadata.dataconnect.path);
+            emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.DATACONNECT).logLabeled("BULLET", "dataconnect", `Importing data from ${exportMetadataFilePath}`);
+            args.importPath = exportMetadataFilePath;
+            void (0, track_1.trackEmulator)("emulator_import", {
+                initiated_by: "start",
+                emulator_name: types_1.Emulators.DATACONNECT,
+            });
+        }
+        const dataConnectEmulator = new dataconnectEmulator_1.DataConnectEmulator(args);
         await startEmulator(dataConnectEmulator);
     }
     if (listenForEmulator.storage) {
@@ -601,19 +612,17 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         });
         await startEmulator(hostingEmulator);
     }
-    if (experiments.isEnabled("emulatorapphosting")) {
-        const apphostingConfig = (_l = options.config.src.emulators) === null || _l === void 0 ? void 0 : _l[types_1.Emulators.APPHOSTING];
-        if (listenForEmulator.apphosting) {
-            const apphostingAddr = legacyGetFirstAddr(types_1.Emulators.APPHOSTING);
-            const apphostingEmulator = new apphosting_1.AppHostingEmulator({
-                host: apphostingAddr.host,
-                port: apphostingAddr.port,
-                startCommandOverride: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.startCommandOverride,
-                rootDirectory: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.rootDirectory,
-                options,
-            });
-            await startEmulator(apphostingEmulator);
-        }
+    const apphostingConfig = (_l = options.config.src.emulators) === null || _l === void 0 ? void 0 : _l[types_1.Emulators.APPHOSTING];
+    if (listenForEmulator.apphosting) {
+        const apphostingAddr = legacyGetFirstAddr(types_1.Emulators.APPHOSTING);
+        const apphostingEmulator = new apphosting_1.AppHostingEmulator({
+            host: apphostingAddr.host,
+            port: apphostingAddr.port,
+            startCommandOverride: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.startCommandOverride,
+            rootDirectory: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.rootDirectory,
+            options,
+        });
+        await startEmulator(apphostingEmulator);
     }
     if (listenForEmulator.logging) {
         const loggingAddr = legacyGetFirstAddr(types_1.Emulators.LOGGING);

package/lib/emulator/dataconnect/pgliteServer.js

@@ -19,17 +19,28 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PGliteExtendedQueryPatch = exports.PostgresServer = void 0;
+exports.PGliteExtendedQueryPatch = exports.PostgresServer = exports.TRUNCATE_TABLES_SQL = void 0;
 const pglite_1 = require("@electric-sql/pglite");
 const { dynamicImport } = require(true && "../../dynamicImport");
 const net = require("node:net");
+const fs = require("fs");
 const index_1 = require("./pg-gateway/index");
 const node_1 = require("./pg-gateway/platforms/node");
 const logger_1 = require("../../logger");
+exports.TRUNCATE_TABLES_SQL = `
+DO $do$
+BEGIN
+   EXECUTE
+   (SELECT 'TRUNCATE TABLE ' || string_agg(oid::regclass::text, ', ') || ' CASCADE'
+    FROM   pg_class
+    WHERE  relkind = 'r'
+    AND    relnamespace = 'public'::regnamespace
+   );
+END
+$do$;`;
 class PostgresServer {
     async createPGServer(host = "127.0.0.1", port) {
-        const db = await this.getDb();
-        await db.waitReady;
+        const getDb = this.getDb.bind(this);
         const server = net.createServer(async (socket) => {
             const connection = await (0, node_1.fromNodeSocket)(socket, {
                 serverVersion: "16.3 (PGlite 0.2.0)",
@@ -38,6 +49,7 @@ class PostgresServer {
                     if (!isAuthenticated) {
                         return;
                     }
+                    const db = await getDb();
                     const result = await db.execProtocolRaw(data);
                     return extendedQueryPatch.filterResponse(data, result);
                 },
@@ -55,29 +67,50 @@ class PostgresServer {
                 resolve();
             });
         });
-        await db.waitReady;
         await listeningPromise;
         return server;
     }
     async getDb() {
-        if (this.db) {
-            return this.db;
+        if (!this.db) {
+            const vector = (await dynamicImport("@electric-sql/pglite/vector")).vector;
+            const uuidOssp = (await dynamicImport("@electric-sql/pglite/contrib/uuid_ossp")).uuid_ossp;
+            const pgliteArgs = {
+                username: this.username,
+                database: this.database,
+                debug: 0,
+                extensions: {
+                    vector,
+                    uuidOssp,
+                },
+                dataDir: this.dataDirectory,
+            };
+            if (this.importPath) {
+                logger_1.logger.debug(`Importing from ${this.importPath}`);
+                const rf = fs.readFileSync(this.importPath);
+                const file = new File([rf], this.importPath);
+                pgliteArgs.loadDataDir = file;
+            }
+            this.db = await pglite_1.PGlite.create(pgliteArgs);
+            await this.db.waitReady;
         }
-        const vector = (await dynamicImport("@electric-sql/pglite/vector")).vector;
-        const uuidOssp = (await dynamicImport("@electric-sql/pglite/contrib/uuid_ossp")).uuid_ossp;
-        return pglite_1.PGlite.create({
-            username: this.username,
-            database: this.database,
-            debug: 0,
-            extensions: {
-                vector,
-                uuidOssp,
-            },
-        });
+        return this.db;
+    }
+    async clearDb() {
+        const db = await this.getDb();
+        await db.query(exports.TRUNCATE_TABLES_SQL);
+    }
+    async exportData(exportPath) {
+        const db = await this.getDb();
+        const dump = await db.dumpDataDir();
+        const arrayBuff = await dump.arrayBuffer();
+        fs.writeFileSync(exportPath, new Uint8Array(arrayBuff));
     }
-    constructor(database, username) {
+    constructor(database, username, dataDirectory, importPath) {
+        this.db = undefined;
         this.username = username;
         this.database = database;
+        this.dataDirectory = dataDirectory;
+        this.importPath = importPath;
     }
 }
 exports.PostgresServer = PostgresServer;

package/lib/emulator/dataconnectEmulator.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataConnectEmulatorClient = exports.DataConnectEmulator = exports.dataConnectEmulatorEvents = void 0;
 const childProcess = require("child_process");
+const pg = require("pg");
 const events_1 = require("events");
 const clc = require("colorette");
+const path = require("path");
 const api_1 = require("../api");
 const constants_1 = require("./constants");
 const downloadableEmulators_1 = require("./downloadableEmulators");
@@ -63,8 +65,12 @@ class DataConnectEmulator {
                 this.logger.logLabeled("INFO", "dataconnect", `FIREBASE_DATACONNECT_POSTGRESQL_STRING is set to ${clc.bold(connStr)} - using that instead of starting a new database`);
             }
             else if (pgHost && pgPort) {
-                const pgServer = new pgliteServer_1.PostgresServer(dbId, "postgres");
-                const server = await pgServer.createPGServer(pgHost, pgPort);
+                const dataDirectory = this.args.config.get("emulators.dataconnect.dataDir");
+                const postgresDumpPath = this.args.importPath
+                    ? path.join(this.args.importPath, "postgres.tar.gz")
+                    : undefined;
+                this.postgresServer = new pgliteServer_1.PostgresServer(dbId, "postgres", dataDirectory, postgresDumpPath);
+                const server = await this.postgresServer.createPGServer(pgHost, pgPort);
                 const connectableHost = (0, utils_1.connectableHostname)(pgHost);
                 connStr = `postgres://${connectableHost}:${pgPort}/${dbId}?sslmode=disable`;
                 server.on("error", (err) => {
@@ -110,6 +116,24 @@ class DataConnectEmulator {
     getName() {
         return types_1.Emulators.DATACONNECT;
     }
+    async clearData() {
+        if (this.postgresServer) {
+            await this.postgresServer.clearDb();
+        }
+        else {
+            const conn = new pg.Client((0, api_1.dataConnectLocalConnString)());
+            await conn.query(pgliteServer_1.TRUNCATE_TABLES_SQL);
+            await conn.end();
+        }
+    }
+    async exportData(exportPath) {
+        if (this.postgresServer) {
+            await this.postgresServer.exportData(path.join(exportPath, "postgres.tar.gz"));
+        }
+        else {
+            throw new error_1.FirebaseError("The Data Connect emulator is currently connected to a separate Postgres instance. Export is not supported.");
+        }
+    }
     static async generate(args) {
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
         const cmd = [

package/lib/emulator/hub.js

@@ -105,6 +105,21 @@ class EmulatorHub extends ExpressBasedEmulator_1.ExpressBasedEmulator {
             await emu.reloadTriggers();
             res.status(200).json({ enabled: true });
         });
+        app.post(EmulatorHub.PATH_CLEAR_DATA_CONNECT, async (req, res) => {
+            if (req.headers.origin) {
+                res.status(403).json({
+                    message: `Clear Data Connect cannot be triggered by external callers.`,
+                });
+            }
+            utils.logLabeledBullet("emulators", `Clearing data from Data Connect data sources.`);
+            const instance = registry_1.EmulatorRegistry.get(types_1.Emulators.DATACONNECT);
+            if (!instance) {
+                res.status(400).json({ error: "The Data Connect emulator is not running." });
+                return;
+            }
+            await instance.clearData();
+            res.status(200).send("Data cleared");
+        });
         return app;
     }
     async stop() {
@@ -169,3 +184,4 @@ EmulatorHub.PATH_EXPORT = "/_admin/export";
 EmulatorHub.PATH_DISABLE_FUNCTIONS = "/functions/disableBackgroundTriggers";
 EmulatorHub.PATH_ENABLE_FUNCTIONS = "/functions/enableBackgroundTriggers";
 EmulatorHub.PATH_EMULATORS = "/emulators";
+EmulatorHub.PATH_CLEAR_DATA_CONNECT = "/dataconnect/clearData";

package/lib/emulator/hubExport.js

@@ -71,6 +71,13 @@ class HubExport {
             };
             await this.exportStorage(metadata);
         }
+        if (shouldExport(types_1.Emulators.DATACONNECT)) {
+            metadata.dataconnect = {
+                version: hub_1.EmulatorHub.CLI_VERSION,
+                path: "dataconnect_export",
+            };
+            await this.exportDataConnect(metadata);
+        }
         if (!fs.existsSync(this.exportPath)) {
             fs.mkdirSync(this.exportPath);
         }
@@ -197,6 +204,22 @@ class HubExport {
             throw new error_1.FirebaseError(`Failed to export storage: ${await res.response.text()}`);
         }
     }
+    async exportDataConnect(metadata) {
+        void (0, track_1.trackEmulator)("emulator_export", {
+            initiated_by: this.options.initiatedBy,
+            emulator_name: types_1.Emulators.DATACONNECT,
+        });
+        const instance = registry_1.EmulatorRegistry.get(types_1.Emulators.DATACONNECT);
+        if (!instance) {
+            throw new error_1.FirebaseError("Unable to export Data Connect emulator data: the Data Connect emulator is not running.");
+        }
+        const dataconnectExportPath = path.join(this.tmpDir, metadata.dataconnect.path);
+        if (fs.existsSync(dataconnectExportPath)) {
+            fse.removeSync(dataconnectExportPath);
+        }
+        fs.mkdirSync(dataconnectExportPath);
+        await instance.exportData(dataconnectExportPath);
+    }
 }
 exports.HubExport = HubExport;
 HubExport.METADATA_FILE_NAME = "firebase-export-metadata.json";

package/lib/emulator/initEmulators.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdditionalInitFns = void 0;
+const path_1 = require("path");
+const prompt_1 = require("../prompt");
+const developmentServer_1 = require("./apphosting/developmentServer");
+const emulatorLogger_1 = require("./emulatorLogger");
+const types_1 = require("./types");
+const config_1 = require("../apphosting/config");
+const detectProjectRoot_1 = require("../detectProjectRoot");
+exports.AdditionalInitFns = {
+    [types_1.Emulators.APPHOSTING]: async () => {
+        var _a;
+        const cwd = process.cwd();
+        const additionalConfigs = new Map();
+        const logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
+        logger.logLabeled("INFO", "Initializing Emulator");
+        const backendRelativeDir = await (0, prompt_1.promptOnce)({
+            name: "rootDir",
+            type: "input",
+            default: "./",
+            message: "Specify your app's root directory relative to your repository",
+        });
+        additionalConfigs.set("rootDirectory", backendRelativeDir);
+        const backendRoot = (0, path_1.join)(cwd, backendRelativeDir);
+        try {
+            const startCommand = await (0, developmentServer_1.detectStartCommand)(backendRoot);
+            additionalConfigs.set("startCommandOverride", startCommand);
+        }
+        catch (e) {
+            logger.log("WARN", "Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommandOverride`");
+        }
+        try {
+            const projectRoot = (_a = (0, detectProjectRoot_1.detectProjectRoot)({})) !== null && _a !== void 0 ? _a : backendRoot;
+            await (0, config_1.exportConfig)(cwd, projectRoot, backendRoot);
+        }
+        catch (e) {
+            logger.log("WARN", "failed to export app hosting configs");
+        }
+        return mapToObject(additionalConfigs);
+    },
+};
+function mapToObject(map) {
+    const newObject = {};
+    for (const [key, value] of map) {
+        newObject[key] = value;
+    }
+    return newObject;
+}

package/lib/emulator/types.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Severity = exports.EmulatorLog = exports.FunctionsExecutionMode = exports.isEmulator = exports.isDownloadableEmulator = exports.ALL_EMULATORS = exports.EMULATORS_SUPPORTED_BY_USE_EMULATOR = exports.EMULATORS_SUPPORTED_BY_UI = exports.EMULATORS_SUPPORTED_BY_FUNCTIONS = exports.ALL_SERVICE_EMULATORS = exports.IMPORT_EXPORT_EMULATORS = exports.DOWNLOADABLE_EMULATORS = exports.Emulators = void 0;
-const experiments = require("../experiments");
 var Emulators;
 (function (Emulators) {
     Emulators["AUTH"] = "auth";
@@ -33,9 +32,10 @@ exports.IMPORT_EXPORT_EMULATORS = [
     Emulators.DATABASE,
     Emulators.AUTH,
     Emulators.STORAGE,
+    Emulators.DATACONNECT,
 ];
 exports.ALL_SERVICE_EMULATORS = [
-    ...(experiments.isEnabled("emulatorapphosting") ? [Emulators.APPHOSTING] : []),
+    Emulators.APPHOSTING,
     Emulators.AUTH,
     Emulators.FUNCTIONS,
     Emulators.FIRESTORE,

package/lib/gcp/cloudfunctionsv2.js

@@ -381,6 +381,7 @@ function endpointFromFunction(gcfFunction) {
             endpoint.runServiceId = utils.last(serviceName.split("/"));
         }
     }
+    proto.renameIfPresent(endpoint, gcfFunction, "uri", "url");
     endpoint.codebase = ((_e = gcfFunction.labels) === null || _e === void 0 ? void 0 : _e[constants_1.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
     if ((_f = gcfFunction.labels) === null || _f === void 0 ? void 0 : _f[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];

package/lib/init/features/emulators.js

@@ -7,6 +7,7 @@ const prompt_1 = require("../../prompt");
 const types_1 = require("../../emulator/types");
 const constants_1 = require("../../emulator/constants");
 const downloadableEmulators_1 = require("../../emulator/downloadableEmulators");
+const initEmulators_1 = require("../../emulator/initEmulators");
 async function doSetup(setup, config) {
     var _a, _b, _c;
     const choices = types_1.ALL_SERVICE_EMULATORS.map((e) => {
@@ -46,6 +47,13 @@ async function doSetup(setup, config) {
                 },
             ]);
         }
+        const additionalInitFn = initEmulators_1.AdditionalInitFns[selected];
+        if (additionalInitFn) {
+            const additionalOptions = await additionalInitFn();
+            if (additionalOptions) {
+                setup.config.emulators[selected] = Object.assign(Object.assign({}, setup.config.emulators[selected]), additionalOptions);
+            }
+        }
     }
     if (selections.emulators.length) {
         const uiDesc = constants_1.Constants.description(types_1.Emulators.UI);

package/lib/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openInBrowser = exports.connectableHostname = exports.randomInt = exports.debounce = exports.last = exports.cloneDeep = exports.groupBy = exports.assertIsStringOrUndefined = exports.assertIsNumber = exports.assertIsString = exports.thirtyDaysFromNow = exports.isRunningInWSL = exports.isCloudEnvironment = exports.datetimeString = exports.createDestroyer = exports.sleep = exports.promiseWithSpinner = exports.setupLoggers = exports.tryParse = exports.tryStringify = exports.promiseProps = exports.withTimeout = exports.promiseWhile = exports.promiseAllSettled = exports.getFunctionsEventProvider = exports.endpoint = exports.makeActiveProject = exports.streamToString = exports.stringToStream = exports.explainStdin = exports.allSettled = exports.reject = exports.logLabeledError = exports.logLabeledWarning = exports.logWarning = exports.logLabeledBullet = exports.logBullet = exports.logLabeledSuccess = exports.logSuccess = exports.addSubdomain = exports.addDatabaseNamespace = exports.getDatabaseViewDataUrl = exports.getDatabaseUrl = exports.envOverride = exports.setVSCodeEnvVars = exports.getInheritedOption = exports.consoleUrl = exports.vscodeEnvVars = exports.envOverrides = exports.IS_WINDOWS = void 0;
-exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = void 0;
+exports.updateOrCreateGitignore = exports.readSecretValue = exports.generateId = exports.wrappedSafeLoad = exports.readFileFromDirectory = exports.getHostnameFromUrl = exports.openInBrowserPopup = void 0;
 const fs = require("fs-extra");
 const tty = require("tty");
 const path = require("node:path");
@@ -597,3 +597,18 @@ function readSecretValue(prompt, dataFile) {
     }
 }
 exports.readSecretValue = readSecretValue;
+function updateOrCreateGitignore(dirPath, entries) {
+    const gitignorePath = path.join(dirPath, ".gitignore");
+    if (!fs.existsSync(gitignorePath)) {
+        fs.writeFileSync(gitignorePath, entries.join("\n"));
+        return;
+    }
+    let content = fs.readFileSync(gitignorePath, "utf-8");
+    for (const entry of entries) {
+        if (!content.includes(entry)) {
+            content += `\n${entry}\n`;
+        }
+    }
+    fs.writeFileSync(gitignorePath, content);
+}
+exports.updateOrCreateGitignore = updateOrCreateGitignore;

package/package.json

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

package/schema/firebase-config.json

@@ -402,6 +402,9 @@
                 "dataconnect": {
                     "additionalProperties": false,
                     "properties": {
+                        "dataDir": {
+                            "type": "string"
+                        },
                         "host": {
                             "type": "string"
                         },

package/lib/emulator/apphosting/utils.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.discoverPackageManager = exports.logger = void 0;
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
-const emulatorLogger_1 = require("../emulatorLogger");
-const types_1 = require("../types");
-exports.logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
-async function discoverPackageManager(rootdir) {
-    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "pnpm-lock.yaml"))) {
-        return "pnpm";
-    }
-    if (await (0, fs_extra_1.pathExists)((0, path_1.join)(rootdir, "yarn.lock"))) {
-        return "yarn";
-    }
-    return "npm";
-}
-exports.discoverPackageManager = discoverPackageManager;