firebase-tools 13.27.0 → 13.28.0

package/lib/appdistribution/client.js

@@ -231,7 +231,7 @@ class AppDistributionClient {
         }
         utils.logSuccess(`Testers removed from group successfully`);
     }
-    async createReleaseTest(releaseName, devices, loginCredential) {
+    async createReleaseTest(releaseName, devices, loginCredential, testCaseName) {
         try {
             const response = await this.appDistroV1AlphaClient.request({
                 method: "POST",
@@ -239,6 +239,7 @@ class AppDistributionClient {
                 body: {
                     deviceExecutions: devices.map(types_1.mapDeviceToExecution),
                     loginCredential,
+                    testCase: testCaseName,
                 },
             });
             return response.body;

package/lib/appdistribution/options-parser-util.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoginCredential = exports.getTestDevices = exports.getAppName = exports.getProjectName = exports.ensureFileExists = exports.getEmails = exports.getTestersOrGroups = void 0;
+exports.getLoginCredential = exports.parseTestDevices = exports.getAppName = exports.getProjectName = exports.ensureFileExists = exports.getEmails = exports.parseIntoStringArray = void 0;
 const fs = require("fs-extra");
 const error_1 = require("../error");
 const projectUtils_1 = require("../projectUtils");
-function getTestersOrGroups(value, file) {
+function parseIntoStringArray(value, file) {
     if (!value && file) {
         ensureFileExists(file);
         value = fs.readFileSync(file, "utf8");
@@ -14,7 +14,7 @@ function getTestersOrGroups(value, file) {
     }
     return [];
 }
-exports.getTestersOrGroups = getTestersOrGroups;
+exports.parseIntoStringArray = parseIntoStringArray;
 function getEmails(emails, file) {
     if (emails.length === 0) {
         ensureFileExists(file);
@@ -49,7 +49,7 @@ function getAppName(options) {
     return `projects/${appId.split(":")[1]}/apps/${appId}`;
 }
 exports.getAppName = getAppName;
-function getTestDevices(value, file) {
+function parseTestDevices(value, file) {
     if (!value && file) {
         ensureFileExists(file);
         value = fs.readFileSync(file, "utf8");
@@ -63,7 +63,7 @@ function getTestDevices(value, file) {
         .filter((entry) => !!entry)
         .map((str) => parseTestDevice(str));
 }
-exports.getTestDevices = getTestDevices;
+exports.parseTestDevices = parseTestDevices;
 function parseTestDevice(testDeviceString) {
     const entries = testDeviceString.split(",");
     const allowedKeys = new Set(["model", "version", "orientation", "locale"]);

package/lib/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.haveValidTokens = exports.loggedIn = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
+exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.haveValidTokens = exports.isExpired = exports.loggedIn = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
 const http = require("http");
@@ -401,6 +401,16 @@ function loggedIn() {
     return !!lastAccessToken;
 }
 exports.loggedIn = loggedIn;
+function isExpired(tokens) {
+    const hasExpiration = (p) => !!p.expires_at;
+    if (hasExpiration(tokens)) {
+        return !(tokens && tokens.expires_at && tokens.expires_at > Date.now());
+    }
+    else {
+        return !tokens;
+    }
+}
+exports.isExpired = isExpired;
 function haveValidTokens(refreshToken, authScopes) {
     var _a;
     if (!(lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.access_token)) {
@@ -413,8 +423,8 @@ function haveValidTokens(refreshToken, authScopes) {
     const oldScopesJSON = JSON.stringify(((_a = lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.scopes) === null || _a === void 0 ? void 0 : _a.sort()) || []);
     const newScopesJSON = JSON.stringify(authScopes.sort());
     const hasSameScopes = oldScopesJSON === newScopesJSON;
-    const isExpired = ((lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at) || 0) < Date.now() + FIFTEEN_MINUTES_IN_MS;
-    const valid = hasTokens && hasSameScopes && !isExpired;
+    const expired = ((lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at) || 0) < Date.now() + FIFTEEN_MINUTES_IN_MS;
+    const valid = hasTokens && hasSameScopes && !expired;
     if (hasTokens) {
         logger_1.logger.debug(`Checked if tokens are valid: ${valid}, expires at: ${lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at}`);
     }

package/lib/bin/firebase.js

@@ -26,7 +26,7 @@ const client = require("..");
 const fsutils = require("../fsutils");
 const utils = require("../utils");
 const winston = require("winston");
-let args = process.argv.slice(2);
+const args = process.argv.slice(2);
 let cmd;
 function findAvailableLogFile() {
     const candidates = ["firebase-debug.log"];
@@ -126,9 +126,10 @@ process.on("uncaughtException", (err) => {
     (0, errorOut_1.errorOut)(err);
 });
 if (!(0, handlePreviewToggles_1.handlePreviewToggles)(args)) {
-    cmd = client.cli.parse(process.argv);
-    args = args.filter((arg) => !arg.includes("-"));
     if (!args.length) {
         client.cli.help();
     }
+    else {
+        cmd = client.cli.parse(process.argv);
+    }
 }

package/lib/commands/appdistribution-distribute.js

@@ -23,14 +23,14 @@ function getReleaseNotes(releaseNotes, releaseNotesFile) {
     return "";
 }
 exports.command = new command_1.Command("appdistribution:distribute <release-binary-file>")
-    .description("upload a release binary")
+    .description("upload a release binary and optionally distribute it to testers and run automated tests")
     .option("--app <app_id>", "the app id of your Firebase app")
     .option("--release-notes <string>", "release notes to include")
     .option("--release-notes-file <file>", "path to file with release notes")
-    .option("--testers <string>", "a comma separated list of tester emails to distribute to")
-    .option("--testers-file <file>", "path to file with a comma separated list of tester emails to distribute to")
-    .option("--groups <string>", "a comma separated list of group aliases to distribute to")
-    .option("--groups-file <file>", "path to file with a comma separated list of group aliases to distribute to")
+    .option("--testers <string>", "a comma-separated list of tester emails to distribute to")
+    .option("--testers-file <file>", "path to file with a comma- or newline-separated list of tester emails to distribute to")
+    .option("--groups <string>", "a comma-separated list of group aliases to distribute to")
+    .option("--groups-file <file>", "path to file with a comma- or newline-separated list of group aliases to distribute to")
     .option("--test-devices <string>", "semicolon-separated list of devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
     .option("--test-devices-file <string>", "path to file containing a list of semicolon- or newline-separated devices to run automated tests on, in the format 'model=<model-id>,version=<os-version-id>,locale=<locale>,orientation=<orientation>'. Run 'gcloud firebase test android|ios models list' to see available devices. Note: This feature is in beta.")
     .option("--test-username <string>", "username for automatic login")
@@ -39,14 +39,20 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
     .option("--test-username-resource <string>", "resource name for the username field for automatic login")
     .option("--test-password-resource <string>", "resource name for the password field for automatic login")
     .option("--test-non-blocking", "run automated tests without waiting for them to complete. Visit the Firebase console for the test results.")
+    .option("--test-case-ids <string>", "a comma-separated list of test case IDs.")
+    .option("--test-case-ids-file <file>", "path to file with a comma- or newline-separated list of test case IDs.")
     .before(requireAuth_1.requireAuth)
     .action(async (file, options) => {
     const appName = (0, options_parser_util_1.getAppName)(options);
     const distribution = new distribution_1.Distribution(file);
     const releaseNotes = getReleaseNotes(options.releaseNotes, options.releaseNotesFile);
-    const testers = (0, options_parser_util_1.getTestersOrGroups)(options.testers, options.testersFile);
-    const groups = (0, options_parser_util_1.getTestersOrGroups)(options.groups, options.groupsFile);
-    const testDevices = (0, options_parser_util_1.getTestDevices)(options.testDevices, options.testDevicesFile);
+    const testers = (0, options_parser_util_1.parseIntoStringArray)(options.testers, options.testersFile);
+    const groups = (0, options_parser_util_1.parseIntoStringArray)(options.groups, options.groupsFile);
+    const testCases = (0, options_parser_util_1.parseIntoStringArray)(options.testCaseIds, options.testCaseIdsFile);
+    const testDevices = (0, options_parser_util_1.parseTestDevices)(options.testDevices, options.testDevicesFile);
+    if (testCases.length && (options.testUsernameResource || options.testPasswordResource)) {
+        throw new error_1.FirebaseError("Password and username resource names are not supported for the AI testing agent.");
+    }
     const loginCredential = (0, options_parser_util_1.getLoginCredential)({
         username: options.testUsername,
         password: options.testPassword,
@@ -137,39 +143,57 @@ exports.command = new command_1.Command("appdistribution:distribute <release-bin
     }
     await requests.updateReleaseNotes(releaseName, releaseNotes);
     await requests.distribute(releaseName, testers, groups);
-    if (testDevices === null || testDevices === void 0 ? void 0 : testDevices.length) {
-        utils.logBullet("starting automated tests (note: this feature is in beta)");
-        const releaseTest = await requests.createReleaseTest(releaseName, testDevices, loginCredential);
-        utils.logSuccess(`Release test created successfully`);
+    if (testDevices.length) {
+        utils.logBullet("starting automated test (note: this feature is in beta)");
+        const releaseTestPromises = [];
+        if (!testCases.length) {
+            releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, loginCredential));
+        }
+        else {
+            for (const testCaseId of testCases) {
+                releaseTestPromises.push(requests.createReleaseTest(releaseName, testDevices, loginCredential, `${appName}/testCases/${testCaseId}`));
+            }
+        }
+        const releaseTests = await Promise.all(releaseTestPromises);
+        utils.logSuccess(`${releaseTests.length} release test(s) started successfully`);
         if (!options.testNonBlocking) {
-            await awaitTestResults(releaseTest.name, requests);
+            await awaitTestResults(releaseTests, requests);
         }
     }
 });
-async function awaitTestResults(releaseTestName, requests) {
+async function awaitTestResults(releaseTests, requests) {
+    const releaseTestNames = new Set(releaseTests.map((rt) => rt.name));
     for (let i = 0; i < TEST_MAX_POLLING_RETRIES; i++) {
-        utils.logBullet("the automated tests results are pending");
+        utils.logBullet(`${releaseTestNames.size} automated test results are pending...`);
         await delay(TEST_POLLING_INTERVAL_MILLIS);
-        const releaseTest = await requests.getReleaseTest(releaseTestName);
-        if (releaseTest.deviceExecutions.every((e) => e.state === "PASSED")) {
-            utils.logSuccess("automated test(s) passed!");
-            return;
-        }
-        for (const execution of releaseTest.deviceExecutions) {
-            switch (execution.state) {
-                case "PASSED":
-                case "IN_PROGRESS":
+        for (const releaseTestName of releaseTestNames) {
+            const releaseTest = await requests.getReleaseTest(releaseTestName);
+            if (releaseTest.deviceExecutions.every((e) => e.state === "PASSED")) {
+                releaseTestNames.delete(releaseTestName);
+                if (releaseTestNames.size === 0) {
+                    utils.logSuccess("Automated test(s) passed!");
+                    return;
+                }
+                else {
                     continue;
-                case "FAILED":
-                    throw new error_1.FirebaseError(`Automated test failed for ${deviceToString(execution.device)}: ${execution.failedReason}`, { exit: 1 });
-                case "INCONCLUSIVE":
-                    throw new error_1.FirebaseError(`Automated test inconclusive for ${deviceToString(execution.device)}: ${execution.inconclusiveReason}`, { exit: 1 });
-                default:
-                    throw new error_1.FirebaseError(`Unsupported automated test state for ${deviceToString(execution.device)}: ${execution.state}`, { exit: 1 });
+                }
+            }
+            for (const execution of releaseTest.deviceExecutions) {
+                switch (execution.state) {
+                    case "PASSED":
+                    case "IN_PROGRESS":
+                        continue;
+                    case "FAILED":
+                        throw new error_1.FirebaseError(`Automated test failed for ${deviceToString(execution.device)}: ${execution.failedReason}`, { exit: 1 });
+                    case "INCONCLUSIVE":
+                        throw new error_1.FirebaseError(`Automated test inconclusive for ${deviceToString(execution.device)}: ${execution.inconclusiveReason}`, { exit: 1 });
+                    default:
+                        throw new error_1.FirebaseError(`Unsupported automated test state for ${deviceToString(execution.device)}: ${execution.state}`, { exit: 1 });
+                }
             }
         }
     }
-    throw new error_1.FirebaseError("It took longer than expected to process your test, please try again.", {
+    throw new error_1.FirebaseError("It took longer than expected to run your test(s), please try again.", {
         exit: 1,
     });
 }

package/lib/commands/firestore-indexes-list.js

@@ -9,6 +9,7 @@ const requirePermissions_1 = require("../requirePermissions");
 const types_1 = require("../emulator/types");
 const commandUtils_1 = require("../emulator/commandUtils");
 const pretty_print_1 = require("../firestore/pretty-print");
+const projectUtils_1 = require("../projectUtils");
 exports.command = new command_1.Command("firestore:indexes")
     .description("List indexes in your project's Cloud Firestore database.")
     .option("--pretty", "Pretty print. When not specified the indexes are printed in the " +
@@ -21,8 +22,9 @@ exports.command = new command_1.Command("firestore:indexes")
     const indexApi = new fsi.FirestoreApi();
     const printer = new pretty_print_1.PrettyPrint();
     const databaseId = (_a = options.database) !== null && _a !== void 0 ? _a : "(default)";
-    const indexes = await indexApi.listIndexes(options.project, databaseId);
-    const fieldOverrides = await indexApi.listFieldOverrides(options.project, databaseId);
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const indexes = await indexApi.listIndexes(projectId, databaseId);
+    const fieldOverrides = await indexApi.listFieldOverrides(projectId, databaseId);
     const indexSpec = indexApi.makeIndexSpec(indexes, fieldOverrides);
     if (options.pretty) {
         logger_1.logger.info(clc.bold(clc.white("Compound Indexes")));

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.rollouts = {};
+        client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
         client.apphosting.config = {};
         client.apphosting.config.export = loadCommand("apphosting-config-export");
         if (experiments.isEnabled("internaltesting")) {
@@ -180,8 +182,6 @@ function load(client) {
             client.apphosting.builds.create = loadCommand("apphosting-builds-create");
             client.apphosting.repos = {};
             client.apphosting.repos.create = loadCommand("apphosting-repos-create");
-            client.apphosting.rollouts = {};
-            client.apphosting.rollouts.create = loadCommand("apphosting-rollouts-create");
             client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
         }
     }

package/lib/dataconnect/schemaMigration.js

@@ -13,18 +13,15 @@ const prompt_1 = require("../prompt");
 const logger_1 = require("../logger");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
-const experiments = require("../experiments");
 const errors = require("./errors");
 async function diffSchema(schema, schemaValidation) {
     const { serviceName, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, false);
     let diffs = [];
-    let validationMode = experiments.isEnabled("fdccompatiblemode")
-        ? schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE"
-        : "STRICT";
+    let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
     try {
-        if (!schemaValidation && experiments.isEnabled("fdccompatiblemode")) {
+        if (!schemaValidation) {
             (0, utils_1.logLabeledBullet)("dataconnect", `generating required schema changes...`);
         }
         await (0, client_1.upsertSchema)(schema, true);
@@ -52,7 +49,7 @@ async function diffSchema(schema, schemaValidation) {
             diffs = incompatible.diffs;
         }
     }
-    if (experiments.isEnabled("fdccompatiblemode") && !schemaValidation) {
+    if (!schemaValidation) {
         validationMode = "STRICT";
         setSchemaValidationMode(schema, validationMode);
         try {
@@ -89,9 +86,7 @@ async function migrateSchema(args) {
     const { serviceName, instanceId, instanceName, databaseId } = getIdentifiers(schema);
     await ensureServiceIsConnectedToCloudSql(serviceName, instanceName, databaseId, true);
     let diffs = [];
-    let validationMode = experiments.isEnabled("fdccompatiblemode")
-        ? schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE"
-        : "STRICT";
+    let validationMode = schemaValidation !== null && schemaValidation !== void 0 ? schemaValidation : "COMPATIBLE";
     setSchemaValidationMode(schema, validationMode);
     try {
         await (0, client_1.upsertSchema)(schema, validateOnly);
@@ -124,7 +119,7 @@ async function migrateSchema(args) {
             await (0, client_1.upsertSchema)(schema, validateOnly);
         }
     }
-    if (experiments.isEnabled("fdccompatiblemode") && !schemaValidation) {
+    if (!schemaValidation) {
         validationMode = "STRICT";
         setSchemaValidationMode(schema, validationMode);
         try {
@@ -185,11 +180,9 @@ function diffsEqual(x, y) {
     return true;
 }
 function setSchemaValidationMode(schema, schemaValidation) {
-    if (experiments.isEnabled("fdccompatiblemode")) {
-        const postgresDatasource = schema.datasources.find((d) => d.postgresql);
-        if (postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) {
-            postgresDatasource.postgresql.schemaValidation = schemaValidation;
-        }
+    const postgresDatasource = schema.datasources.find((d) => d.postgresql);
+    if (postgresDatasource === null || postgresDatasource === void 0 ? void 0 : postgresDatasource.postgresql) {
+        postgresDatasource.postgresql.schemaValidation = schemaValidation;
     }
 }
 function getIdentifiers(schema) {

package/lib/dataconnect/types.js

@@ -17,7 +17,7 @@ var Platform;
     Platform["MULTIPLE"] = "MULTIPLE";
 })(Platform = exports.Platform || (exports.Platform = {}));
 function toDatasource(projectId, locationId, ds) {
-    if (ds.postgresql) {
+    if (ds === null || ds === void 0 ? void 0 : ds.postgresql) {
         return {
             postgresql: {
                 database: ds.postgresql.database,

package/lib/deploy/extensions/tasks.js

@@ -7,7 +7,7 @@ const extensionsApi = require("../../extensions/extensionsApi");
 const extensionsHelper_1 = require("../../extensions/extensionsHelper");
 const refs = require("../../extensions/refs");
 const utils = require("../../utils");
-const types_1 = require("../../extensions/types");
+const error_2 = require("../../error");
 const isRetryable = (err) => err.status === 429 || err.status === 409;
 function extensionsDeploymentHandler(errorHandler) {
     return async (task) => {
@@ -54,7 +54,7 @@ function createExtensionInstanceTask(projectId, instanceSpec, validateOnly = fal
             await extensionsApi.createInstance(createArgs);
         }
         catch (err) {
-            if ((0, types_1.isObject)(err) && err.status === 409) {
+            if ((0, error_2.isObject)(err) && err.status === 409) {
                 throw new error_1.FirebaseError(`Failed to create extension instance. Extension instance ${clc.bold(instanceSpec.instanceId)} already exists.`);
             }
             throw err;

package/lib/emulator/apphosting/developmentServer.js

@@ -26,7 +26,7 @@ async function detectStartCommand(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`");
+        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.startCommand`");
     }
 }
 exports.detectStartCommand = detectStartCommand;

package/lib/emulator/apphosting/index.js

@@ -11,7 +11,7 @@ class AppHostingEmulator {
     async start() {
         const { hostname, port } = await (0, serve_1.start)({
             port: this.args.port,
-            startCommand: this.args.startCommandOverride,
+            startCommand: this.args.startCommand,
             rootDirectory: this.args.rootDirectory,
         });
         this.args.options.host = hostname;

package/lib/emulator/auth/operations.js

@@ -738,11 +738,7 @@ function setAccountInfo(state, reqBody, ctx) {
 }
 function setAccountInfoImpl(state, reqBody, { privileged = false, emulatorUrl = undefined } = {}) {
     var _a, _b;
-    const unimplementedFields = [
-        "provider",
-        "upgradeToFederatedLogin",
-        "linkProviderUserInfo",
-    ];
+    const unimplementedFields = ["provider", "upgradeToFederatedLogin"];
     for (const field of unimplementedFields) {
         if (field in reqBody) {
             throw new errors_1.NotImplementedError(`${field} is not implemented yet.`);
@@ -908,8 +904,15 @@ function setAccountInfoImpl(state, reqBody, { privileged = false, emulatorUrl =
             updates.phoneNumber = undefined;
         }
     }
+    if (reqBody.linkProviderUserInfo) {
+        (0, errors_1.assert)(reqBody.linkProviderUserInfo.providerId, "MISSING_PROVIDER_ID");
+        (0, errors_1.assert)(reqBody.linkProviderUserInfo.rawId, "MISSING_RAW_ID");
+    }
     user = state.updateUserByLocalId(user.localId, updates, {
         deleteProviders: reqBody.deleteProvider,
+        upsertProviders: reqBody.linkProviderUserInfo
+            ? [reqBody.linkProviderUserInfo]
+            : undefined,
     });
     if (signInProvider !== state_1.PROVIDER_ANONYMOUS && user.initialEmail && isEmailUpdate) {
         if (!emulatorUrl) {

package/lib/emulator/controller.js

@@ -615,10 +615,14 @@ async function startAll(options, showUI = true, runningTestScript = false) {
     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);
+        if (apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.startCommandOverride) {
+            const apphostingLogger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.APPHOSTING);
+            apphostingLogger.logLabeled("WARN", types_1.Emulators.APPHOSTING, "The `firebase.json#emulators.apphosting.startCommandOverride` config is deprecated, please use `firebase.json#emulators.apphosting.startCommand` to set a custom start command instead");
+        }
         const apphostingEmulator = new apphosting_1.AppHostingEmulator({
             host: apphostingAddr.host,
             port: apphostingAddr.port,
-            startCommandOverride: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.startCommandOverride,
+            startCommand: (apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.startCommand) || (apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.startCommandOverride),
             rootDirectory: apphostingConfig === null || apphostingConfig === void 0 ? void 0 : apphostingConfig.rootDirectory,
             options,
         });

package/lib/emulator/dataconnectEmulator.js

@@ -147,6 +147,11 @@ class DataConnectEmulator {
             cmd.push("--watch");
         }
         const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8" });
+        if ((0, downloadableEmulators_1.isIncomaptibleArchError)(res.error)) {
+            throw new error_1.FirebaseError(`Unknown system error when running the Data Connect toolkit. ` +
+                `You may be able to fix this by installing Rosetta: ` +
+                `softwareupdate --install-rosetta`);
+        }
         logger_1.logger.info(res.stderr);
         if (res.error) {
             throw new error_1.FirebaseError(`Error starting up Data Connect generate: ${res.error.message}`, {
@@ -163,6 +168,11 @@ class DataConnectEmulator {
         const commandInfo = await (0, downloadableEmulators_1.downloadIfNecessary)(types_1.Emulators.DATACONNECT);
         const cmd = ["--logtostderr", "-v=2", "build", `--config_dir=${args.configDir}`];
         const res = childProcess.spawnSync(commandInfo.binary, cmd, { encoding: "utf-8" });
+        if ((0, downloadableEmulators_1.isIncomaptibleArchError)(res.error)) {
+            throw new error_1.FirebaseError(`Unkown system error when running the Data Connect toolkit. ` +
+                `You may be able to fix this by installing Rosetta: ` +
+                `softwareupdate --install-rosetta`);
+        }
         if (res.error) {
             throw new error_1.FirebaseError(`Error starting up Data Connect build: ${res.error.message}`, {
                 original: res.error,

package/lib/emulator/downloadableEmulators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.requiresJava = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = exports.DownloadDetails = void 0;
+exports.isIncomaptibleArchError = exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.requiresJava = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = exports.DownloadDetails = void 0;
 const lsofi = require("lsofi");
 const types_1 = require("./types");
 const constants_1 = require("./constants");
@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.7.3",
-            expectedSize: 25211648,
-            expectedChecksum: "8410794304b2ae340c3facf07d7edc16",
+            version: "1.7.4",
+            expectedSize: 25277184,
+            expectedChecksum: "74f6b66c79a8a903132c7ab26c644593",
         }
         : process.platform === "win32"
             ? {
-                version: "1.7.3",
-                expectedSize: 25641984,
-                expectedChecksum: "a4bd0f9d9d884528fa4494e4d7918c08",
+                version: "1.7.4",
+                expectedSize: 25707520,
+                expectedChecksum: "66eec92e2d57ae42a8b58f33b65b4184",
             }
             : {
-                version: "1.7.3",
-                expectedSize: 25125016,
-                expectedChecksum: "48660e6370aeed973f33c3420c3255fb",
+                version: "1.7.4",
+                expectedSize: 25190552,
+                expectedChecksum: "acb7be487020afa6e1a597ceb8c6e862",
             },
 };
 exports.DownloadDetails = {
@@ -355,6 +355,11 @@ async function _runBinary(emulator, command, extraEnv) {
             if (e.code === "EACCES") {
                 logger.logLabeled("WARN", emulator.name, `Could not spawn child process for emulator, check that java is installed and on your $PATH.`);
             }
+            else if (isIncomaptibleArchError(e)) {
+                logger.logLabeled("WARN", emulator.name, `Unknown system error when starting emulator binary. ` +
+                    `You may be able to fix this by installing Rosetta: ` +
+                    `softwareupdate --install-rosetta`);
+            }
             _fatal(emulator.name, e);
         }
         const description = constants_1.Constants.description(emulator.name);
@@ -468,3 +473,11 @@ async function start(targetName, args, extraEnv = {}) {
     return _runBinary(emulator, command, extraEnv);
 }
 exports.start = start;
+function isIncomaptibleArchError(err) {
+    var _a;
+    const hasMessage = (e) => !!(e === null || e === void 0 ? void 0 : e.message);
+    return (hasMessage(err) &&
+        /Unknown system error/.test((_a = err.message) !== null && _a !== void 0 ? _a : "") &&
+        process.platform === "darwin");
+}
+exports.isIncomaptibleArchError = isIncomaptibleArchError;

package/lib/emulator/eventarcEmulator.js

@@ -140,6 +140,7 @@ class EventarcEmulator {
             .request({
             method: "POST",
             path: `/functions/projects/${trigger.projectId}/triggers/${trigger.triggerName}`,
+            headers: { "Content-Type": "application/json" },
             body: JSON.stringify(event),
             responseType: "stream",
             resolveOnHTTPError: true,

package/lib/emulator/initEmulators.js

@@ -25,10 +25,10 @@ exports.AdditionalInitFns = {
         const backendRoot = (0, path_1.join)(cwd, backendRelativeDir);
         try {
             const startCommand = await (0, developmentServer_1.detectStartCommand)(backendRoot);
-            additionalConfigs.set("startCommandOverride", startCommand);
+            additionalConfigs.set("startCommand", 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`");
+            logger.log("WARN", "Failed to auto-detect your project's start command. Consider manually setting the start command by setting `firebase.json#emulators.apphosting.startCommand`");
         }
         try {
             const projectRoot = (_a = (0, detectProjectRoot_1.detectProjectRoot)({})) !== null && _a !== void 0 ? _a : backendRoot;
@@ -39,6 +39,21 @@ exports.AdditionalInitFns = {
         }
         return mapToObject(additionalConfigs);
     },
+    [types_1.Emulators.DATACONNECT]: async (config) => {
+        const additionalConfig = {};
+        const defaultDataConnectDir = config.get("dataconnect.source", "dataconnect");
+        const defaultDataDir = config.get("emulators.dataconnect.dataDir", `${defaultDataConnectDir}/.dataconnect/pgliteData`);
+        if (await (0, prompt_1.promptOnce)({
+            name: "dataDir",
+            type: "confirm",
+            message: "Do you want to persist Postgres data from the Data Connect emulator between runs? " +
+                `Data will be saved to ${defaultDataDir}. ` +
+                `You can change this directory by editing 'firebase.json#emulators.dataconnect.dataDir'.`,
+        })) {
+            additionalConfig["dataDir"] = defaultDataDir;
+        }
+        return additionalConfig;
+    },
 };
 function mapToObject(map) {
     const newObject = {};

package/lib/error.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBillingError = exports.getError = exports.getErrStatus = exports.getErrMsg = exports.FirebaseError = void 0;
+exports.isBillingError = exports.getError = exports.getErrStatus = exports.isObject = exports.getErrStack = exports.getErrMsg = exports.FirebaseError = void 0;
 const lodash_1 = require("lodash");
 const DEFAULT_CHILDREN = [];
 const DEFAULT_EXIT = 1;
@@ -31,9 +31,17 @@ function getErrMsg(err, defaultMsg) {
     return JSON.stringify(err);
 }
 exports.getErrMsg = getErrMsg;
+function getErrStack(err) {
+    if (err instanceof Error) {
+        return err.stack || err.message;
+    }
+    return getErrMsg(err);
+}
+exports.getErrStack = getErrStack;
 function isObject(value) {
     return typeof value === "object" && value !== null;
 }
+exports.isObject = isObject;
 function getErrStatus(err, defaultStatus) {
     if (isObject(err) && err.status && typeof err.status === "number") {
         return err.status;

package/lib/experiments.js

@@ -106,12 +106,6 @@ exports.ALL_EXPERIMENTS = experiments({
         default: true,
         public: false,
     },
-    fdccompatiblemode: {
-        shortDescription: "Enable Data Connect schema migrations in Compatible Mode",
-        fullDescription: "Enable Data Connect schema migrations in Compatible Mode",
-        default: true,
-        public: false,
-    },
 });
 function isValidExperiment(name) {
     return Object.keys(exports.ALL_EXPERIMENTS).includes(name);

package/lib/extensions/localHelper.js

@@ -38,9 +38,9 @@ function fixLifecycleEvents(lifecycleEvents) {
         stageUnspecified: "STAGE_UNSPECIFIED",
     };
     const arrayLifecycle = [];
-    if ((0, types_1.isObject)(lifecycleEvents)) {
+    if ((0, error_1.isObject)(lifecycleEvents)) {
         for (const [key, val] of Object.entries(lifecycleEvents)) {
-            if ((0, types_1.isObject)(val) &&
+            if ((0, error_1.isObject)(val) &&
                 typeof val.function === "string" &&
                 typeof val.processingMessage === "string") {
                 arrayLifecycle.push({

package/lib/extensions/runtimes/node.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeSDK = exports.TYPESCRIPT_VERSION = exports.FIREBASE_FUNCTIONS_VERSION = exports.SDK_GENERATION_VERSION = void 0;
 const path = require("path");
-const child_process_1 = require("child_process");
 const marked_terminal_1 = require("marked-terminal");
 const marked_1 = require("marked");
+const error_1 = require("../../error");
 const types_1 = require("../types");
 const prompt_1 = require("../../prompt");
 const secretsUtils = require("../secretsUtils");
@@ -12,7 +12,8 @@ const utils_1 = require("../../utils");
 const common_1 = require("./common");
 const askUserForEventsConfig_1 = require("../askUserForEventsConfig");
 const extensionsHelper_1 = require("../extensionsHelper");
-const error_1 = require("../../error");
+const error_2 = require("../../error");
+const spawn_1 = require("../../init/spawn");
 marked_1.marked.use((0, marked_terminal_1.markedTerminal)());
 exports.SDK_GENERATION_VERSION = "1.0.0";
 exports.FIREBASE_FUNCTIONS_VERSION = ">=5.1.0";
@@ -91,8 +92,8 @@ function addPeerDependency(pkgJson, dependency, version) {
     if (!pkgJson.peerDependencies) {
         pkgJson.peerDependencies = {};
     }
-    if (!(0, types_1.isObject)(pkgJson.peerDependencies)) {
-        throw new error_1.FirebaseError("Internal error generating peer dependencies.");
+    if (!(0, error_1.isObject)(pkgJson.peerDependencies)) {
+        throw new error_2.FirebaseError("Internal error generating peer dependencies.");
     }
     pkgJson.peerDependencies[dependency] = version;
 }
@@ -118,7 +119,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
         }
     }
     if (!dirPath) {
-        throw new error_1.FirebaseError("Invalid extension definition. Must have either extensionRef or localPath");
+        throw new error_2.FirebaseError("Invalid extension definition. Must have either extensionRef or localPath");
     }
     const packageName = makePackageName(extensionRef, spec.name);
     const pkgJson = {
@@ -292,7 +293,7 @@ async function writeSDK(extensionRef, localPath, spec, options) {
                 sdkLines.push(`  ${sysParam.param}${opt}: string;`);
                 break;
             default:
-                throw new error_1.FirebaseError(`Error: Unknown systemParam type: ${sysParam.type || "undefined"}.`);
+                throw new error_2.FirebaseError(`Error: Unknown systemParam type: ${sysParam.type || "undefined"}.`);
         }
         sdkLines.push("");
     }
@@ -347,19 +348,19 @@ async function writeSDK(extensionRef, localPath, spec, options) {
     await (0, common_1.writeFile)(`${dirPath}/tsconfig.json`, JSON.stringify(tsconfigJson, null, 2), options);
     (0, utils_1.logLabeledBullet)("extensions", `running 'npm --prefix ${shortDirPath} install'`);
     try {
-        (0, child_process_1.execFileSync)("npm", ["--prefix", dirPath, "install"]);
+        await (0, spawn_1.spawnWithOutput)("npm", ["--prefix", dirPath, "install"]);
     }
     catch (err) {
-        const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
-        throw new error_1.FirebaseError(`Error during npm install in ${shortDirPath}: ${errMsg}`);
+        const errMsg = (0, error_2.getErrMsg)(err, "unknown error");
+        throw new error_2.FirebaseError(`Error during npm install in ${shortDirPath}: ${errMsg}`);
     }
     (0, utils_1.logLabeledBullet)("extensions", `running 'npm --prefix ${shortDirPath} run build'`);
     try {
-        (0, child_process_1.execFileSync)("npm", ["--prefix", dirPath, "run", "build"]);
+        await (0, spawn_1.spawnWithOutput)("npm", ["--prefix", dirPath, "run", "build"]);
     }
     catch (err) {
-        const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
-        throw new error_1.FirebaseError(`Error during npm run build in ${shortDirPath}: ${errMsg}`);
+        const errMsg = (0, error_2.getErrMsg)(err, "unknown error");
+        throw new error_2.FirebaseError(`Error during npm run build in ${shortDirPath}: ${errMsg}`);
     }
     const codebaseDir = (0, common_1.getCodebaseDir)(options);
     const shortCodebaseDir = codebaseDir.replace(process.cwd(), ".");
@@ -372,11 +373,11 @@ async function writeSDK(extensionRef, localPath, spec, options) {
     })) {
         (0, utils_1.logLabeledBullet)("extensions", `running 'npm --prefix ${shortCodebaseDir} install --save ${shortDirPath}'`);
         try {
-            (0, child_process_1.execFileSync)("npm", ["--prefix", codebaseDir, "install", "--save", dirPath]);
+            await (0, spawn_1.spawnWithOutput)("npm", ["--prefix", codebaseDir, "install", "--save", dirPath]);
         }
         catch (err) {
-            const errMsg = (0, error_1.getErrMsg)(err, "unknown error");
-            throw new error_1.FirebaseError(`Error during npm install in ${codebaseDir}: ${errMsg}`);
+            const errMsg = (0, error_2.getErrMsg)(err, "unknown error");
+            throw new error_2.FirebaseError(`Error during npm install in ${codebaseDir}: ${errMsg}`);
         }
     }
     else {

package/lib/extensions/types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExtensionSpec = exports.isResource = exports.isParam = exports.isObject = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.isExtensionInstance = exports.Visibility = exports.RegistryLaunchStage = void 0;
+exports.isExtensionSpec = exports.isResource = exports.isParam = exports.ParamType = exports.FUNCTIONS_V2_RESOURCE_TYPE = exports.FUNCTIONS_RESOURCE_TYPE = exports.isExtensionInstance = exports.Visibility = exports.RegistryLaunchStage = void 0;
+const error_1 = require("../error");
 var RegistryLaunchStage;
 (function (RegistryLaunchStage) {
     RegistryLaunchStage["EXPERIMENTAL"] = "EXPERIMENTAL";
@@ -23,7 +24,7 @@ const extensionInstanceState = [
     "PAUSED",
 ];
 const isExtensionInstance = (value) => {
-    if (!isObject(value) || typeof value.name !== "string") {
+    if (!(0, error_1.isObject)(value) || typeof value.name !== "string") {
         return false;
     }
     return true;
@@ -40,20 +41,16 @@ var ParamType;
     ParamType["SELECT_RESOURCE"] = "SELECT_RESOURCE";
     ParamType["SECRET"] = "SECRET";
 })(ParamType = exports.ParamType || (exports.ParamType = {}));
-function isObject(value) {
-    return typeof value === "object" && value !== null;
-}
-exports.isObject = isObject;
 const isParam = (param) => {
-    return (isObject(param) && typeof param["param"] === "string" && typeof param["label"] === "string");
+    return ((0, error_1.isObject)(param) && typeof param["param"] === "string" && typeof param["label"] === "string");
 };
 exports.isParam = isParam;
 const isResource = (res) => {
-    return isObject(res) && typeof res["name"] === "string";
+    return (0, error_1.isObject)(res) && typeof res["name"] === "string";
 };
 exports.isResource = isResource;
 const isExtensionSpec = (spec) => {
-    if (!isObject(spec) || typeof spec.name !== "string" || typeof spec.version !== "string") {
+    if (!(0, error_1.isObject)(spec) || typeof spec.name !== "string" || typeof spec.version !== "string") {
         return false;
     }
     if (spec.resources && Array.isArray(spec.resources)) {

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

@@ -8,7 +8,6 @@ const provisionCloudSql_1 = require("../../../dataconnect/provisionCloudSql");
 const freeTrial_1 = require("../../../dataconnect/freeTrial");
 const cloudsql = require("../../../gcp/cloudsql/cloudsqladmin");
 const ensureApis_1 = require("../../../dataconnect/ensureApis");
-const experiments = require("../../../experiments");
 const client_1 = require("../../../dataconnect/client");
 const types_1 = require("../../../dataconnect/types");
 const names_1 = require("../../../dataconnect/names");
@@ -19,7 +18,6 @@ const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const sdk = require("./sdk");
 const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
-const DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect-fdccompatiblemode.yaml");
 const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
@@ -50,6 +48,9 @@ async function doSetup(setup, config) {
         isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
     }
     const info = await askQuestions(setup, isBillingEnabled);
+    const dir = config.get("dataconnect.source", "dataconnect");
+    const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
+    config.set("emulators.dataconnect.dataDir", dataDir);
     await actuate(setup, config, info);
     const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
     if (cwdPlatformGuess !== types_1.Platform.NONE) {
@@ -156,9 +157,7 @@ function subDataconnectYamlValues(replacementValues) {
         connectorDirs: "__connectorDirs__",
         locationId: "__location__",
     };
-    let replaced = experiments.isEnabled("fdccompatiblemode")
-        ? DATACONNECT_YAML_COMPAT_EXPERIMENT_TEMPLATE
-        : DATACONNECT_YAML_TEMPLATE;
+    let replaced = DATACONNECT_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
         replaced = replaced.replace(replacements[k], JSON.stringify(v));
     }

package/lib/init/features/emulators.js

@@ -49,7 +49,7 @@ async function doSetup(setup, config) {
         }
         const additionalInitFn = initEmulators_1.AdditionalInitFns[selected];
         if (additionalInitFn) {
-            const additionalOptions = await additionalInitFn();
+            const additionalOptions = await additionalInitFn(config);
             if (additionalOptions) {
                 setup.config.emulators[selected] = Object.assign(Object.assign({}, setup.config.emulators[selected]), additionalOptions);
             }

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

@@ -6,7 +6,6 @@ const inquirer = require("inquirer");
 const path = require("path");
 const semver = require("semver");
 const clc = require("colorette");
-const child_process_1 = require("child_process");
 const functions_1 = require("../functions");
 const prompt_1 = require("../../../prompt");
 const spawn_1 = require("../../spawn");
@@ -15,7 +14,6 @@ const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
 const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
-const types_1 = require("../../../extensions/types");
 async function getGenkitVersion() {
     let genkitVersion;
     let templateVersion = "0.9.0";
@@ -26,7 +24,17 @@ async function getGenkitVersion() {
         genkitVersion = process.env.GENKIT_DEV_VERSION;
     }
     else {
-        genkitVersion = (0, child_process_1.execFileSync)("npm", ["view", "genkit", "version"]).toString();
+        try {
+            genkitVersion = await (0, spawn_1.spawnWithOutput)("npm", ["view", "genkit", "version"]);
+        }
+        catch (err) {
+            throw new error_1.FirebaseError("Unable to determine which genkit version to install.\n" +
+                `npm Error: ${(0, error_1.getErrMsg)(err)}\n\n` +
+                "For a possible workaround run\n  npm view genkit version\n" +
+                "and then set an environment variable:\n" +
+                "  export GENKIT_DEV_VERSION=<output from previous command>\n" +
+                "and run `firebase init genkit` again");
+        }
     }
     if (!genkitVersion) {
         throw new error_1.FirebaseError("Unable to determine genkit version to install");
@@ -236,7 +244,7 @@ async function genkitSetup(options, genkitInfo, projectDir) {
 }
 exports.genkitSetup = genkitSetup;
 const isTsConfig = (value) => {
-    if (!(0, types_1.isObject)(value) || (value.compilerOptions && !(0, types_1.isObject)(value.compilerOptions))) {
+    if (!(0, error_1.isObject)(value) || (value.compilerOptions && !(0, error_1.isObject)(value.compilerOptions))) {
         return false;
     }
     return true;
@@ -339,7 +347,7 @@ function generateSampleFile(modelPlugin, configPlugins, projectDir, templateVers
     }
 }
 const isPackageJson = (value) => {
-    if (!(0, types_1.isObject)(value) || (value.scripts && !(0, types_1.isObject)(value.scripts))) {
+    if (!(0, error_1.isObject)(value) || (value.scripts && !(0, error_1.isObject)(value.scripts))) {
         return false;
     }
     return true;

package/lib/init/spawn.js

@@ -1,27 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spawnWithCommandString = exports.wrapSpawn = void 0;
+exports.spawnWithCommandString = exports.spawnWithOutput = exports.wrapSpawn = void 0;
 const spawn = require("cross-spawn");
 const logger_1 = require("../logger");
-function wrapSpawn(cmd, args, projectDir, environmentVariables) {
+const error_1 = require("../error");
+function wrapSpawn(cmd, args, projectDir) {
     return new Promise((resolve, reject) => {
         const installer = spawn(cmd, args, {
             cwd: projectDir,
             stdio: "inherit",
-            env: Object.assign(Object.assign({}, process.env), environmentVariables),
+            env: Object.assign({}, process.env),
         });
         installer.on("error", (err) => {
-            logger_1.logger.debug(err.stack);
+            logger_1.logger.debug((0, error_1.getErrStack)(err));
         });
         installer.on("close", (code) => {
             if (code === 0) {
                 return resolve();
             }
-            return reject();
+            return reject(new Error(`Error: spawn(${cmd}, [${args.join(", ")}]) \n exited with code: ${code || "null"}`));
         });
     });
 }
 exports.wrapSpawn = wrapSpawn;
+function spawnWithOutput(cmd, args) {
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        const child = spawn(cmd, args);
+        let output = "";
+        (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
+            if ((0, error_1.isObject)(data) && data.toString) {
+                output += data.toString();
+            }
+            else {
+                output += JSON.stringify(data);
+            }
+        });
+        (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => {
+            logger_1.logger.debug(`Error: spawn(${cmd}, ${args.join(", ")})\n  Stderr:\n${JSON.stringify(data)}\n`);
+        });
+        child.on("error", (err) => {
+            logger_1.logger.debug((0, error_1.getErrStack)(err));
+        });
+        child.on("close", (code) => {
+            if (code === 0) {
+                resolve(output);
+            }
+            else {
+                reject(new Error(`Error: spawn(${cmd}, [${args.join(", ")}]) \n exited with code: ${code || "null"}`));
+            }
+        });
+    });
+}
+exports.spawnWithOutput = spawnWithOutput;
 function spawnWithCommandString(cmd, projectDir, environmentVariables) {
     return new Promise((resolve, reject) => {
         const installer = spawn(cmd, {
@@ -31,13 +62,13 @@ function spawnWithCommandString(cmd, projectDir, environmentVariables) {
             env: Object.assign(Object.assign({}, process.env), environmentVariables),
         });
         installer.on("error", (err) => {
-            logger_1.logger.log("DEBUG", err.stack);
+            logger_1.logger.log("DEBUG", (0, error_1.getErrStack)(err));
         });
         installer.on("close", (code) => {
             if (code === 0) {
                 return resolve();
             }
-            return reject();
+            return reject(new Error(`Error: spawn(${cmd}) \n exited with code: ${code || "null"}`));
         });
     });
 }

package/lib/requireAuth.js

@@ -25,6 +25,7 @@ async function autoAuth(options, authScopes) {
     const client = getAuthClient({ scopes: authScopes, projectId: options.project });
     const token = await client.getAccessToken();
     token !== null ? apiv2.setAccessToken(token) : false;
+    logger_1.logger.debug(`Running auto auth`);
     let clientEmail;
     try {
         const credentials = await client.getCredentials();
@@ -72,7 +73,7 @@ async function requireAuth(options) {
         utils.logWarning("Authenticating with `FIREBASE_TOKEN` is deprecated and will be removed in a future major version of `firebase-tools`. " +
             "Instead, use a service account key with `GOOGLE_APPLICATION_CREDENTIALS`: https://cloud.google.com/docs/authentication/getting-started");
     }
-    else if (user) {
+    else if (user && (!(0, auth_1.isExpired)(tokens) || (tokens === null || tokens === void 0 ? void 0 : tokens.refresh_token))) {
         logger_1.logger.debug(`> authorizing via signed-in user (${user.email})`);
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.27.0",
+  "version": "13.28.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -91,6 +91,7 @@
     "google-auth-library": "^9.11.0",
     "inquirer": "^8.2.6",
     "inquirer-autocomplete-prompt": "^2.0.1",
+    "js-yaml": "^3.14.1",
     "jsonwebtoken": "^9.0.0",
     "leven": "^3.1.0",
     "libsodium-wrappers": "^0.7.10",
@@ -114,7 +115,7 @@
     "sql-formatter": "^15.3.0",
     "stream-chain": "^2.2.4",
     "stream-json": "^1.7.3",
-    "superstatic": "^9.0.3",
+    "superstatic": "^9.1.0",
     "tar": "^6.1.11",
     "tcp-port-used": "^1.0.2",
     "tmp": "^0.2.3",

package/schema/firebase-config.json

@@ -369,6 +369,9 @@
                         "rootDirectory": {
                             "type": "string"
                         },
+                        "startCommand": {
+                            "type": "string"
+                        },
                         "startCommandOverride": {
                             "type": "string"
                         }

package/templates/init/dataconnect/dataconnect.yaml

@@ -8,4 +8,5 @@ schema:
       database: __cloudSqlDatabase__
       cloudSql:
         instanceId: __cloudSqlInstanceId__
+      # schemaValidation: "COMPATIBLE"
 connectorDirs: __connectorDirs__

package/templates/init/dataconnect/dataconnect-fdccompatiblemode.yaml

@@ -1,12 +0,0 @@
-specVersion: "v1beta"
-serviceId: __serviceId__
-location: __location__
-schema:
-  source: "./schema"
-  datasource:
-    postgresql:
-      database: __cloudSqlDatabase__
-      cloudSql:
-        instanceId: __cloudSqlInstanceId__
-      # schemaValidation: "COMPATIBLE"
-connectorDirs: __connectorDirs__