firebase-tools 13.27.0 → 13.29.0

package/lib/emulator/dataconnectEmulator.js

@@ -69,7 +69,13 @@ class DataConnectEmulator {
                 const postgresDumpPath = this.args.importPath
                     ? path.join(this.args.importPath, "postgres.tar.gz")
                     : undefined;
-                this.postgresServer = new pgliteServer_1.PostgresServer(dbId, "postgres", dataDirectory, postgresDumpPath);
+                this.postgresServer = new pgliteServer_1.PostgresServer({
+                    database: dbId,
+                    username: "fdc",
+                    dataDirectory,
+                    importPath: postgresDumpPath,
+                    debug: this.args.debug,
+                });
                 const server = await this.postgresServer.createPGServer(pgHost, pgPort);
                 const connectableHost = (0, utils_1.connectableHostname)(pgHost);
                 connStr = `postgres://${connectableHost}:${pgPort}/${dbId}?sslmode=disable`;
@@ -101,6 +107,9 @@ class DataConnectEmulator {
             this.logger.logLabeled("INFO", "dataconnect", "Skipping cleanup of Data Connect emulator, as it was not started by this process.");
             return;
         }
+        if (this.postgresServer) {
+            await this.postgresServer.stop();
+        }
         return (0, downloadableEmulators_1.stop)(types_1.Emulators.DATACONNECT);
     }
     getInfo() {
@@ -147,6 +156,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 +177,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.5",
+            expectedSize: 25281280,
+            expectedChecksum: "85d0de96b5c08b553fd8506a2bc381bb",
         }
         : process.platform === "win32"
             ? {
-                version: "1.7.3",
-                expectedSize: 25641984,
-                expectedChecksum: "a4bd0f9d9d884528fa4494e4d7918c08",
+                version: "1.7.5",
+                expectedSize: 25711616,
+                expectedChecksum: "c99d67fa8e74d41760b96122b055b8e2",
             }
             : {
-                version: "1.7.3",
-                expectedSize: 25125016,
-                expectedChecksum: "48660e6370aeed973f33c3420c3255fb",
+                version: "1.7.5",
+                expectedSize: 25190552,
+                expectedChecksum: "61d966b781e6f2887f8b38ec271b54e2",
             },
 };
 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,10 @@ async function start(targetName, args, extraEnv = {}) {
     return _runBinary(emulator, command, extraEnv);
 }
 exports.start = start;
+function isIncomaptibleArchError(err) {
+    var _a;
+    return ((0, error_1.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.hasMessage = 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;
@@ -57,3 +65,5 @@ function isBillingError(e) {
     }));
 }
 exports.isBillingError = isBillingError;
+const hasMessage = (e) => !!(e === null || e === void 0 ? void 0 : e.message);
+exports.hasMessage = hasMessage;

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/functions/events/v2.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIRESTORE_EVENT_WITH_AUTH_CONTEXT_REGEX = exports.FIRESTORE_EVENT_REGEX = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
+exports.CONVERTABLE_EVENTS = exports.FIREALERTS_EVENT = exports.FIRESTORE_EVENTS = exports.TEST_LAB_EVENT = exports.REMOTE_CONFIG_EVENT = exports.DATABASE_EVENTS = exports.FIREBASE_ALERTS_PUBLISH_EVENT = exports.STORAGE_EVENTS = exports.PUBSUB_PUBLISH_EVENT = void 0;
 exports.PUBSUB_PUBLISH_EVENT = "google.cloud.pubsub.topic.v1.messagePublished";
 exports.STORAGE_EVENTS = [
     "google.cloud.storage.object.v1.finalized",
@@ -28,5 +28,9 @@ exports.FIRESTORE_EVENTS = [
     "google.cloud.firestore.document.v1.deleted.withAuthContext",
 ];
 exports.FIREALERTS_EVENT = "google.firebase.firebasealerts.alerts.v1.published";
-exports.FIRESTORE_EVENT_REGEX = /^google\.cloud\.firestore\.document\.v1\.[^\.]*$/;
-exports.FIRESTORE_EVENT_WITH_AUTH_CONTEXT_REGEX = /^google\.cloud\.firestore\.document\.v1\..*\.withAuthContext$/;
+exports.CONVERTABLE_EVENTS = {
+    "google.cloud.firestore.document.v1.created": "google.cloud.firestore.document.v1.created.withAuthContext",
+    "google.cloud.firestore.document.v1.updated": "google.cloud.firestore.document.v1.updated.withAuthContext",
+    "google.cloud.firestore.document.v1.deleted": "google.cloud.firestore.document.v1.deleted.withAuthContext",
+    "google.cloud.firestore.document.v1.written": "google.cloud.firestore.document.v1.written.withAuthContext",
+};

package/lib/gcp/cloudfunctionsv2.js

@@ -259,6 +259,9 @@ function functionFromEndpoint(endpoint) {
     }
     else if (backend.isCallableTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { "deployment-callable": "true" });
+        if (endpoint.callableTrigger.genkitAction) {
+            gcfFunction.labels["genkit-action"] = endpoint.callableTrigger.genkitAction;
+        }
     }
     else if (backend.isBlockingTriggered(endpoint)) {
         gcfFunction.labels = Object.assign(Object.assign({}, gcfFunction.labels), { [constants_1.BLOCKING_LABEL]: constants_1.BLOCKING_EVENT_TO_LABEL_KEY[endpoint.blockingTrigger.eventType] });
@@ -294,6 +297,9 @@ function endpointFromFunction(gcfFunction) {
         trigger = {
             callableTrigger: {},
         };
+        if (gcfFunction.labels["genkit-action"]) {
+            trigger.callableTrigger.genkitAction = gcfFunction.labels["genkit-action"];
+        }
     }
     else if ((_d = gcfFunction.labels) === null || _d === void 0 ? void 0 : _d[constants_1.BLOCKING_LABEL]) {
         trigger = {

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

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.actuate = exports.doSetup = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
+const fs = require("fs-extra");
 const prompt_1 = require("../../../prompt");
 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 +19,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 +49,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) {
@@ -136,6 +138,9 @@ async function writeFiles(config, info) {
             await config.askWriteProjectFile((0, path_1.join)(dir, "schema", f.path), f.content);
         }
     }
+    else {
+        fs.ensureFileSync((0, path_1.join)(dir, "schema", "schema.gql"));
+    }
     for (const c of info.connectors) {
         await writeConnectorFiles(config, c);
     }
@@ -156,9 +161,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/management/projects.js

@@ -26,12 +26,34 @@ exports.PROJECTS_CREATE_QUESTIONS = [
         default: "",
         message: "Please specify a unique project id " +
             `(${clc.yellow("warning")}: cannot be modified afterward) [6-30 characters]:\n`,
+        validate: (projectId) => {
+            if (projectId.length < 6) {
+                return "Project ID must be at least 6 characters long";
+            }
+            else if (projectId.length > 30) {
+                return "Project ID cannot be longer than 30 characters";
+            }
+            else {
+                return true;
+            }
+        },
     },
     {
         type: "input",
         name: "displayName",
-        default: "",
+        default: (answers) => answers.projectId,
         message: "What would you like to call your project? (defaults to your project ID)",
+        validate: (displayName) => {
+            if (displayName.length < 4) {
+                return "Project name must be at least 4 characters long";
+            }
+            else if (displayName.length > 30) {
+                return "Project name cannot be longer than 30 characters";
+            }
+            else {
+                return true;
+            }
+        },
     },
 ];
 const firebaseAPIClient = new apiv2_1.Client({

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 {