firebase-tools 13.20.1 → 13.21.0

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

@@ -24,6 +24,11 @@ const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconn
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
 const QUERIES_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/queries.gql");
 const MUTATIONS_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/mutations.gql");
+const emptyConnector = {
+    id: "default",
+    path: "./connector",
+    files: [],
+};
 const defaultConnector = {
     id: "default",
     path: "./connector",
@@ -38,29 +43,27 @@ const defaultConnector = {
         },
     ],
 };
+const defaultSchema = { path: "schema.gql", content: SCHEMA_TEMPLATE };
 async function doSetup(setup, config) {
-    const info = await askQuestions(setup);
+    const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
+    if (setup.projectId) {
+        isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
+    }
+    const info = await askQuestions(setup, isBillingEnabled);
     await actuate(setup, config, info);
     const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
-    if (cwdPlatformGuess !== types_1.Platform.UNDETERMINED) {
+    if (cwdPlatformGuess !== types_1.Platform.NONE) {
         await sdk.doSetup(setup, config);
     }
     else {
-        const promptForSDKGeneration = await (0, prompt_1.confirm)({
-            message: `Would you like to configure generated SDKs now?`,
-            default: false,
-        });
-        if (promptForSDKGeneration) {
-            await sdk.doSetup(setup, config);
-        }
-        else {
-            (0, utils_1.logBullet)(`If you'd like to generate an SDK for your new connector later, run ${clc.bold("firebase init dataconnect:sdk")}`);
-        }
+        (0, utils_1.logBullet)(`If you'd like to add the generated SDK to your app your, run ${clc.bold("firebase init dataconnect:sdk")}`);
+    }
+    if (setup.projectId && !isBillingEnabled) {
+        (0, utils_1.logBullet)((0, freeTrial_1.upgradeInstructions)(setup.projectId));
     }
-    logger_1.logger.info("");
 }
 exports.doSetup = doSetup;
-async function askQuestions(setup) {
+async function askQuestions(setup, isBillingEnabled) {
     let info = {
         serviceId: "",
         locationId: "",
@@ -69,14 +72,10 @@ async function askQuestions(setup) {
         cloudSqlDatabase: "",
         isNewDatabase: false,
         connectors: [defaultConnector],
-        schemaGql: [],
+        schemaGql: [defaultSchema],
         shouldProvisionCSQL: false,
     };
-    const isBillingEnabled = setup.projectId ? await (0, cloudbilling_1.checkBillingEnabled)(setup.projectId) : false;
-    if (setup.projectId) {
-        isBillingEnabled ? await (0, ensureApis_1.ensureApis)(setup.projectId) : await (0, ensureApis_1.ensureSparkApis)(setup.projectId);
-    }
-    info = await checkExistingInstances(setup, info, isBillingEnabled);
+    info = await promptForExistingServices(setup, info, isBillingEnabled);
     const requiredConfigUnset = info.serviceId === "" ||
         info.cloudSqlInstanceId === "" ||
         info.locationId === "" ||
@@ -84,13 +83,12 @@ async function askQuestions(setup) {
     const shouldConfigureBackend = isBillingEnabled && requiredConfigUnset
         ? await (0, prompt_1.confirm)({
             message: `Would you like to configure your backend resources now?`,
-            default: false,
+            default: true,
         })
         : false;
     if (shouldConfigureBackend) {
         info = await promptForService(info);
-        info = await promptForCloudSQLInstance(setup, info);
-        info = await promptForDatabase(info);
+        info = await promptForCloudSQL(setup, info);
         info.shouldProvisionCSQL = !!(setup.projectId &&
             (info.isNewInstance || info.isNewDatabase) &&
             isBillingEnabled &&
@@ -100,14 +98,10 @@ async function askQuestions(setup) {
             })));
     }
     else {
-        if (requiredConfigUnset) {
-            (0, utils_1.logBullet)(`Setting placeholder values in dataconnect.yaml. You can edit these before you deploy to specify different IDs or regions.`);
-        }
-        info.serviceId = info.serviceId !== "" ? info.serviceId : (0, path_1.basename)(process.cwd());
-        info.cloudSqlInstanceId =
-            info.cloudSqlInstanceId !== "" ? info.cloudSqlInstanceId : `${info.serviceId || "app"}-fdc`;
-        info.locationId = info.locationId !== "" ? info.locationId : `us-central1`;
-        info.cloudSqlDatabase = info.cloudSqlDatabase !== "" ? info.cloudSqlDatabase : `fdcdb`;
+        info.serviceId = info.serviceId || (0, path_1.basename)(process.cwd());
+        info.cloudSqlInstanceId = info.cloudSqlInstanceId || `${info.serviceId || "app"}-fdc`;
+        info.locationId = info.locationId || `us-central1`;
+        info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
     }
     return info;
 }
@@ -130,16 +124,12 @@ async function writeFiles(config, info) {
     const dir = config.get("dataconnect.source") || "dataconnect";
     const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: info.connectors.map((c) => c.path) }));
     config.set("dataconnect", { source: dir });
-    await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml);
+    await config.askWriteProjectFile((0, path_1.join)(dir, "dataconnect.yaml"), subbedDataconnectYaml, false, true);
     if (info.schemaGql.length) {
-        (0, utils_1.logSuccess)("The service you chose already has GQL files deployed. We'll use those instead of the default templates.");
         for (const f of info.schemaGql) {
             await config.askWriteProjectFile((0, path_1.join)(dir, "schema", f.path), f.content);
         }
     }
-    else {
-        await config.askWriteProjectFile((0, path_1.join)(dir, "schema", "schema.gql"), SCHEMA_TEMPLATE);
-    }
     for (const c of info.connectors) {
         await writeConnectorFiles(config, c);
     }
@@ -178,8 +168,8 @@ function subConnectorYamlValues(replacementValues) {
     }
     return replaced;
 }
-async function checkExistingInstances(setup, info, isBillingEnabled) {
-    var _a, _b, _c;
+async function promptForExistingServices(setup, info, isBillingEnabled) {
+    var _a, _b, _c, _d;
     if (!setup.projectId || !isBillingEnabled) {
         return info;
     }
@@ -208,16 +198,18 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
             const serviceName = (0, names_1.parseServiceName)(choice.service.name);
             info.serviceId = serviceName.serviceId;
             info.locationId = serviceName.location;
+            info.schemaGql = [];
+            info.connectors = [emptyConnector];
             if (choice.schema) {
                 const primaryDatasource = choice.schema.datasources.find((d) => d.postgresql);
                 if ((_a = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _a === void 0 ? void 0 : _a.cloudSql.instance) {
                     const instanceName = (0, names_1.parseCloudSQLInstanceName)(primaryDatasource.postgresql.cloudSql.instance);
                     info.cloudSqlInstanceId = instanceName.instanceId;
                 }
-                if (choice.schema.source.files) {
+                if ((_b = choice.schema.source.files) === null || _b === void 0 ? void 0 : _b.length) {
                     info.schemaGql = choice.schema.source.files;
                 }
-                info.cloudSqlDatabase = (_c = (_b = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _b === void 0 ? void 0 : _b.database) !== null && _c !== void 0 ? _c : "";
+                info.cloudSqlDatabase = (_d = (_c = primaryDatasource === null || primaryDatasource === void 0 ? void 0 : primaryDatasource.postgresql) === null || _c === void 0 ? void 0 : _c.database) !== null && _d !== void 0 ? _d : "";
                 const connectors = await (0, client_1.listConnectors)(choice.service.name, [
                     "connectors.name",
                     "connectors.source.files",
@@ -234,20 +226,24 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
                 }
             }
         }
-        else {
-            info = await promptForService(info);
-        }
     }
-    if (info.cloudSqlInstanceId === "") {
+    return info;
+}
+async function promptForCloudSQL(setup, info) {
+    if (info.cloudSqlInstanceId === "" && setup.projectId) {
         const instances = await cloudsql.listInstances(setup.projectId);
         let choices = instances.map((i) => {
-            return { name: i.name, value: i.name, location: i.region };
+            var _a;
+            let display = `${i.name} (${i.region})`;
+            if (((_a = i.settings.userLabels) === null || _a === void 0 ? void 0 : _a["firebase-data-connect"]) === "ft") {
+                display += " (no cost trial)";
+            }
+            return { name: display, value: i.name, location: i.region };
         });
         choices = choices.filter((c) => info.locationId === "" || info.locationId === c.location);
         if (choices.length) {
-            const freeTrialInstanceId = await (0, freeTrial_1.checkForFreeTrialInstance)(setup.projectId);
-            if (!freeTrialInstanceId) {
-                choices.push({ name: "Create a new instance", value: "", location: "" });
+            if (!(await (0, freeTrial_1.checkFreeTrialInstanceUsed)(setup.projectId))) {
+                choices.push({ name: "Create a new free trial instance", value: "", location: "" });
             }
             info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
                 message: `Which CloudSQL instance would you like to use?`,
@@ -257,12 +253,25 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
             if (info.cloudSqlInstanceId !== "") {
                 info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
             }
-            else {
-                info = await promptForCloudSQLInstance(setup, info);
-            }
         }
     }
-    if (info.cloudSqlDatabase === "" && info.cloudSqlInstanceId !== "") {
+    if (info.cloudSqlInstanceId === "") {
+        info.isNewInstance = true;
+        info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new CloudSQL instance?`,
+            type: "input",
+            default: `${info.serviceId || "app"}-fdc`,
+        });
+    }
+    if (info.locationId === "") {
+        const choices = await locationChoices(setup);
+        info.locationId = await (0, prompt_1.promptOnce)({
+            message: "What location would like to use?",
+            type: "list",
+            choices,
+        });
+    }
+    if (info.cloudSqlDatabase === "" && setup.projectId) {
         try {
             const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
             const choices = dbs.map((d) => {
@@ -275,15 +284,20 @@ async function checkExistingInstances(setup, info, isBillingEnabled) {
                     type: "list",
                     choices,
                 });
-                if (info.cloudSqlDatabase === "") {
-                    info = await promptForDatabase(info);
-                }
             }
         }
         catch (err) {
             logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
         }
     }
+    if (info.cloudSqlDatabase === "") {
+        info.isNewDatabase = true;
+        info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
+            message: `What ID would you like to use for your new database in ${info.cloudSqlInstanceId}?`,
+            type: "input",
+            default: `fdcdb`,
+        });
+    }
     return info;
 }
 async function promptForService(info) {
@@ -296,25 +310,6 @@ async function promptForService(info) {
     }
     return info;
 }
-async function promptForCloudSQLInstance(setup, info) {
-    if (info.cloudSqlInstanceId === "") {
-        info.isNewInstance = true;
-        info.cloudSqlInstanceId = await (0, prompt_1.promptOnce)({
-            message: `What ID would you like to use for your new CloudSQL instance?`,
-            type: "input",
-            default: `${info.serviceId || "app"}-fdc`,
-        });
-    }
-    if (info.locationId === "") {
-        const choices = await locationChoices(setup);
-        info.locationId = await (0, prompt_1.promptOnce)({
-            message: "What location would like to use?",
-            type: "list",
-            choices,
-        });
-    }
-    return info;
-}
 async function locationChoices(setup) {
     if (setup.projectId) {
         const locations = await (0, client_1.listLocations)(setup.projectId);
@@ -335,14 +330,3 @@ async function locationChoices(setup) {
         ];
     }
 }
-async function promptForDatabase(info) {
-    if (info.cloudSqlDatabase === "") {
-        info.isNewDatabase = true;
-        info.cloudSqlDatabase = await (0, prompt_1.promptOnce)({
-            message: `What ID would you like to use for your new database in ${info.cloudSqlInstanceId}?`,
-            type: "input",
-            default: `fdcdb`,
-        });
-    }
-    return info;
-}

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actuate = exports.doSetup = exports.FDC_APP_FOLDER = void 0;
+exports.actuate = exports.generateSdkYaml = exports.doSetup = exports.FDC_APP_FOLDER = void 0;
 const yaml = require("yaml");
 const fs = require("fs");
 const clc = require("colorette");
 const path = require("path");
+const fsutils_1 = require("../../../fsutils");
 const prompt_1 = require("../../../prompt");
 const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const load_1 = require("../../../dataconnect/load");
@@ -16,12 +17,12 @@ const utils_1 = require("../../../utils");
 exports.FDC_APP_FOLDER = "_FDC_APP_FOLDER";
 async function doSetup(setup, config) {
     const sdkInfo = await askQuestions(setup, config);
-    await actuate(sdkInfo, setup.projectId);
-    (0, utils_1.logSuccess)(`If you'd like to generate additional SDKs later, run ${clc.bold("firebase init dataconnect:sdk")}`);
+    await actuate(sdkInfo);
+    (0, utils_1.logSuccess)(`If you'd like to add more generated SDKs to your app your later, run ${clc.bold("firebase init dataconnect:sdk")} again`);
 }
 exports.doSetup = doSetup;
 async function askQuestions(setup, config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a;
     const serviceCfgs = (0, fileUtils_1.readFirebaseJson)(config);
     const serviceInfos = await Promise.all(serviceCfgs.map((c) => (0, load_1.load)(setup.projectId || "", config, c.source)));
     const connectorChoices = serviceInfos
@@ -37,121 +38,103 @@ async function askQuestions(setup, config) {
     if (!connectorChoices.length) {
         throw new error_1.FirebaseError(`Your config has no connectors to set up SDKs for. Run ${clc.bold("firebase init dataconnect")} to set up a service and connectors.`);
     }
-    let targetPlatform = types_1.Platform.UNDETERMINED;
     let appDir = process.env[exports.FDC_APP_FOLDER] || process.cwd();
-    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
-    if (cwdPlatformGuess !== types_1.Platform.UNDETERMINED) {
-        (0, utils_1.logSuccess)(`Detected ${cwdPlatformGuess} app in directory ${appDir}`);
-        targetPlatform = cwdPlatformGuess;
+    let targetPlatform = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
+    if (targetPlatform === types_1.Platform.NONE && !((_a = process.env[exports.FDC_APP_FOLDER]) === null || _a === void 0 ? void 0 : _a.length)) {
+        appDir = await (0, prompt_1.promptForDirectory)({
+            config,
+            message: "Where is your app directory? Leave blank to set up a generated SDK in your current directory.",
+        });
+        targetPlatform = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
     }
-    else {
-        (0, utils_1.logBullet)(`Couldn't automatically detect your app directory.`);
-        appDir =
-            (_a = process.env[exports.FDC_APP_FOLDER]) !== null && _a !== void 0 ? _a : (await (0, prompt_1.promptForDirectory)({
-                config,
-                message: "Where is your app directory? Leave blank to set up a generated SDK in your current directory.",
-            }));
-        const platformGuess = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
-        if (platformGuess !== types_1.Platform.UNDETERMINED) {
-            (0, utils_1.logSuccess)(`Detected ${platformGuess} app in directory ${appDir}`);
-            targetPlatform = platformGuess;
+    if (targetPlatform === types_1.Platform.NONE || targetPlatform === types_1.Platform.MULTIPLE) {
+        if (targetPlatform === types_1.Platform.NONE) {
+            (0, utils_1.logBullet)(`Couldn't automatically detect app your in directory ${appDir}.`);
         }
         else {
-            (0, utils_1.logBullet)("Couldn't automatically detect your app's platform.");
-            const platforms = [
-                { name: "iOS (Swift)", value: types_1.Platform.IOS },
-                { name: "Web (JavaScript)", value: types_1.Platform.WEB },
-                { name: "Android (Kotlin)", value: types_1.Platform.ANDROID },
-            ];
-            targetPlatform = await (0, prompt_1.promptOnce)({
-                message: "Which platform do you want to set up a generated SDK for?",
-                type: "list",
-                choices: platforms,
-            });
+            (0, utils_1.logSuccess)(`Detected multiple app platforms in directory ${appDir}`);
         }
+        const platforms = [
+            { name: "iOS (Swift)", value: types_1.Platform.IOS },
+            { name: "Web (JavaScript)", value: types_1.Platform.WEB },
+            { name: "Android (Kotlin)", value: types_1.Platform.ANDROID },
+            { name: "Flutter (Dart)", value: types_1.Platform.FLUTTER },
+        ];
+        targetPlatform = await (0, prompt_1.promptOnce)({
+            message: "Which platform do you want to set up a generated SDK for?",
+            type: "list",
+            choices: platforms,
+        });
+    }
+    else {
+        (0, utils_1.logSuccess)(`Detected ${targetPlatform} app in directory ${appDir}`);
     }
     const connectorInfo = await (0, prompt_1.promptOnce)({
         message: "Which connector do you want set up a generated SDK for?",
         type: "list",
         choices: connectorChoices,
     });
-    const newConnectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
-    if (!newConnectorYaml.generate) {
-        newConnectorYaml.generate = {};
+    const connectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
+    const newConnectorYaml = generateSdkYaml(targetPlatform, connectorYaml, connectorInfo.directory, appDir);
+    const connectorYamlContents = yaml.stringify(newConnectorYaml);
+    connectorInfo.connectorYaml = newConnectorYaml;
+    const displayIOSWarning = targetPlatform === types_1.Platform.IOS;
+    return { connectorYamlContents, connectorInfo, displayIOSWarning };
+}
+function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appDir) {
+    if (!connectorYaml.generate) {
+        connectorYaml.generate = {};
     }
-    let displayIOSWarning = false;
     if (targetPlatform === types_1.Platform.IOS) {
-        const outputDir = ((_b = newConnectorYaml.generate.swiftSdk) === null || _b === void 0 ? void 0 : _b.outputDir) ||
-            path.relative(connectorInfo.directory, path.join(appDir, `generated/swift`));
-        const pkg = (_d = (_c = newConnectorYaml.generate.swiftSdk) === null || _c === void 0 ? void 0 : _c.package) !== null && _d !== void 0 ? _d : (0, lodash_1.upperFirst)((0, lodash_1.camelCase)(newConnectorYaml.connectorId));
-        const swiftSdk = { outputDir, package: pkg };
-        newConnectorYaml.generate.swiftSdk = swiftSdk;
-        displayIOSWarning = true;
+        const swiftSdk = {
+            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/swift`)),
+            package: (0, lodash_1.upperFirst)((0, lodash_1.camelCase)(connectorYaml.connectorId)) + "Connector",
+        };
+        connectorYaml.generate.swiftSdk = swiftSdk;
     }
     if (targetPlatform === types_1.Platform.WEB) {
-        const outputDir = ((_e = newConnectorYaml.generate.javascriptSdk) === null || _e === void 0 ? void 0 : _e.outputDir) ||
-            path.relative(connectorInfo.directory, path.join(appDir, `generated/javascript/${newConnectorYaml.connectorId}`));
-        const pkg = (_g = (_f = newConnectorYaml.generate.javascriptSdk) === null || _f === void 0 ? void 0 : _f.package) !== null && _g !== void 0 ? _g : `@firebasegen/${connectorInfo.connectorYaml.connectorId}`;
+        const pkg = `${connectorYaml.connectorId}-connector`;
         const javascriptSdk = {
-            outputDir,
-            package: pkg,
+            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/js/${pkg}`)),
+            package: `@firebasegen/${pkg}`,
+            packageJsonDir: path.relative(connectorDir, appDir),
         };
-        if ((await (0, fileUtils_1.directoryHasPackageJson)(appDir)) &&
-            (await (0, prompt_1.confirm)({
-                message: "Would you like to add a dependency on the generated SDK to your package.json?",
-            }))) {
-            javascriptSdk.packageJsonDir = path.relative(connectorInfo.directory, appDir);
-        }
-        newConnectorYaml.generate.javascriptSdk = javascriptSdk;
+        connectorYaml.generate.javascriptSdk = javascriptSdk;
     }
-    if (targetPlatform === types_1.Platform.DART) {
-        const outputDir = ((_h = newConnectorYaml.generate.dartSdk) === null || _h === void 0 ? void 0 : _h.outputDir) ||
-            path.relative(connectorInfo.directory, path.join(appDir, `generated/dart/${newConnectorYaml.connectorId}`));
-        const pkg = (_k = (_j = newConnectorYaml.generate.dartSdk) === null || _j === void 0 ? void 0 : _j.package) !== null && _k !== void 0 ? _k : newConnectorYaml.connectorId;
+    if (targetPlatform === types_1.Platform.FLUTTER) {
+        const pkg = `${(0, lodash_1.snakeCase)(connectorYaml.connectorId)}_connector`;
         const dartSdk = {
-            outputDir,
+            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/dart/${pkg}`)),
             package: pkg,
         };
-        newConnectorYaml.generate.dartSdk = dartSdk;
+        connectorYaml.generate.dartSdk = dartSdk;
     }
     if (targetPlatform === types_1.Platform.ANDROID) {
-        let baseDir = path.join(appDir, `generated/kotlin`);
+        const kotlinSdk = {
+            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/kotlin`)),
+            package: `connectors.${(0, lodash_1.snakeCase)(connectorYaml.connectorId)}`,
+        };
         for (const candidateSubdir of ["app/src/main/java", "app/src/main/kotlin"]) {
             const candidateDir = path.join(appDir, candidateSubdir);
-            if (fs.existsSync(candidateDir)) {
-                baseDir = candidateDir;
+            if ((0, fsutils_1.dirExistsSync)(candidateDir)) {
+                kotlinSdk.outputDir = path.relative(connectorDir, candidateDir);
             }
         }
-        const outputDir = ((_l = newConnectorYaml.generate.kotlinSdk) === null || _l === void 0 ? void 0 : _l.outputDir) ||
-            path.relative(connectorInfo.directory, baseDir);
-        const pkg = (_o = (_m = newConnectorYaml.generate.kotlinSdk) === null || _m === void 0 ? void 0 : _m.package) !== null && _o !== void 0 ? _o : `connectors.${(0, lodash_1.snakeCase)(connectorInfo.connectorYaml.connectorId)}`;
-        const kotlinSdk = {
-            outputDir,
-            package: pkg,
-        };
-        newConnectorYaml.generate.kotlinSdk = kotlinSdk;
+        connectorYaml.generate.kotlinSdk = kotlinSdk;
     }
-    const shouldGenerate = !!(setup.projectId &&
-        (await (0, prompt_1.confirm)({
-            message: "Would you like to generate SDK code now?",
-            default: true,
-        })));
-    const connectorYamlContents = yaml.stringify(newConnectorYaml);
-    connectorInfo.connectorYaml = newConnectorYaml;
-    return { connectorYamlContents, connectorInfo, shouldGenerate, displayIOSWarning };
+    return connectorYaml;
 }
-async function actuate(sdkInfo, projectId) {
+exports.generateSdkYaml = generateSdkYaml;
+async function actuate(sdkInfo) {
     var _a;
     const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
     fs.writeFileSync(connectorYamlPath, sdkInfo.connectorYamlContents, "utf8");
     (0, utils_1.logBullet)(`Wrote new config to ${connectorYamlPath}`);
-    if (projectId && sdkInfo.shouldGenerate) {
-        await dataconnectEmulator_1.DataConnectEmulator.generate({
-            configDir: sdkInfo.connectorInfo.directory,
-            connectorId: sdkInfo.connectorInfo.connectorYaml.connectorId,
-        });
-        (0, utils_1.logBullet)(`Generated SDK code for ${sdkInfo.connectorInfo.connectorYaml.connectorId}`);
-    }
+    await dataconnectEmulator_1.DataConnectEmulator.generate({
+        configDir: sdkInfo.connectorInfo.directory,
+        connectorId: sdkInfo.connectorInfo.connectorYaml.connectorId,
+    });
+    (0, utils_1.logBullet)(`Generated SDK code for ${sdkInfo.connectorInfo.connectorYaml.connectorId}`);
     if (((_a = sdkInfo.connectorInfo.connectorYaml.generate) === null || _a === void 0 ? void 0 : _a.swiftSdk) && sdkInfo.displayIOSWarning) {
         (0, utils_1.logBullet)(clc.bold("Please follow the instructions here to add your generated sdk to your XCode project:\n\thttps://firebase.google.com/docs/data-connect/gp/ios-sdk#set-client"));
     }

package/lib/init/spawn.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapSpawn = void 0;
 const spawn = require("cross-spawn");
 const logger_1 = require("../logger");
-function wrapSpawn(cmd, args, projectDir) {
+function wrapSpawn(cmd, args, projectDir, environmentVariables) {
     return new Promise((resolve, reject) => {
         const installer = spawn(cmd, args, {
             cwd: projectDir,
             stdio: "inherit",
+            env: Object.assign(Object.assign({}, process.env), environmentVariables),
         });
         installer.on("error", (err) => {
             logger_1.logger.debug(err.stack);

package/package.json

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