firebase-tools 14.14.0 → 14.15.1

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toDNSCompatibleId = exports.postSetup = exports.actuate = exports.askQuestions = void 0;
+exports.newUniqueId = exports.toDNSCompatibleId = exports.actuate = exports.askQuestions = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
 const fs = require("fs-extra");
@@ -15,9 +15,9 @@ const names_1 = require("../../../dataconnect/names");
 const logger_1 = require("../../../logger");
 const templates_1 = require("../../../templates");
 const utils_1 = require("../../../utils");
+Object.defineProperty(exports, "newUniqueId", { enumerable: true, get: function () { return utils_1.newUniqueId; } });
 const cloudbilling_1 = require("../../../gcp/cloudbilling");
 const sdk = require("./sdk");
-const fileUtils_1 = require("../../../dataconnect/fileUtils");
 const fdcExperience_1 = require("../../../gemini/fdcExperience");
 const configstore_1 = require("../../../configstore");
 const track_1 = require("../../../track");
@@ -64,7 +64,7 @@ async function askQuestions(setup) {
                 (0, utils_1.logBullet)("Learn more about Gemini in Firebase and how it uses your data: https://firebase.google.com/docs/gemini-in-firebase#how-gemini-in-firebase-uses-your-data");
             }
             info.appDescription = await (0, prompt_1.input)({
-                message: `Describe your app to automatically generate a schema [Enter to skip]:`,
+                message: `Describe your app to automatically generate a schema with Gemini [Enter to skip]:`,
             });
             if (info.appDescription) {
                 configstore_1.configstore.set("gemini", true);
@@ -77,6 +77,7 @@ async function askQuestions(setup) {
     }
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnect = info;
+    await sdk.askQuestions(setup);
 }
 exports.askQuestions = askQuestions;
 async function actuate(setup, config, options) {
@@ -94,6 +95,7 @@ async function actuate(setup, config, options) {
     info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
     try {
         await actuateWithInfo(setup, config, info, options);
+        await sdk.actuate(setup, config);
     }
     finally {
         void (0, track_1.trackGA4)("dataconnect_init", {
@@ -101,6 +103,15 @@ async function actuate(setup, config, options) {
             flow: info.analyticsFlow,
         });
     }
+    if (info.appDescription) {
+        setup.instructions.push(`You can visualize the Data Connect Schema in Firebase Console:
+
+    https://console.firebase.google.com/project/${setup.projectId}/dataconnect/locations/${info.locationId}/services/${info.serviceId}/schema`);
+    }
+    if (!setup.isBillingEnabled) {
+        setup.instructions.push((0, freeTrial_1.upgradeInstructions)(setup.projectId || "your-firebase-project"));
+    }
+    setup.instructions.push(`Install the Data Connect VS Code Extensions. You can explore Data Connect Query on local pgLite and Cloud SQL Postgres Instance.`);
 }
 exports.actuate = actuate;
 async function actuateWithInfo(setup, config, info, options) {
@@ -220,34 +231,6 @@ function schemasDeploySequence(projectId, info, schemaFiles, linkToCloudSql) {
         },
     ];
 }
-async function postSetup(setup, config, options) {
-    var _a;
-    const info = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnect;
-    if (!info) {
-        throw new Error("Data Connect feature RequiredInfo is not provided");
-    }
-    const instructions = [];
-    const cwdPlatformGuess = await (0, fileUtils_1.getPlatformFromFolder)(process.cwd());
-    if (cwdPlatformGuess !== types_1.Platform.NONE || (0, utils_1.envOverride)("FDC_CONNECTOR", "")) {
-        await sdk.doSetup(setup, config, options);
-    }
-    else {
-        instructions.push(`To add the generated SDK to your app, run ${clc.bold("firebase init dataconnect:sdk")}`);
-    }
-    if (info.appDescription) {
-        instructions.push(`You can visualize the Data Connect Schema in Firebase Console:
-
-    https://console.firebase.google.com/project/${setup.projectId}/dataconnect/locations/${info.locationId}/services/${info.serviceId}/schema`);
-    }
-    if (setup.projectId && !setup.isBillingEnabled) {
-        instructions.push((0, freeTrial_1.upgradeInstructions)(setup.projectId));
-    }
-    logger_1.logger.info(`\n${clc.bold("To get started with Firebase Data Connect:")}`);
-    for (const i of instructions) {
-        (0, utils_1.logBullet)(i + "\n");
-    }
-}
-exports.postSetup = postSetup;
 async function writeFiles(config, info, serviceGql, options) {
     const dir = config.get("dataconnect.source") || "dataconnect";
     const subbedDataconnectYaml = subDataconnectYamlValues(Object.assign(Object.assign({}, info), { connectorDirs: serviceGql.connectors.map((c) => c.path) }));
@@ -271,7 +254,7 @@ async function writeFiles(config, info, serviceGql, options) {
 async function writeConnectorFiles(config, connectorInfo, options) {
     const subbedConnectorYaml = subConnectorYamlValues({ connectorId: connectorInfo.id });
     const dir = config.get("dataconnect.source") || "dataconnect";
-    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, "connector.yaml"), subbedConnectorYaml, !!options.force);
+    await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, "connector.yaml"), subbedConnectorYaml, !!options.force, true);
     for (const f of connectorInfo.files) {
         await config.askWriteProjectFile((0, path_1.join)(dir, connectorInfo.path, f.path), f.content, !!options.force);
     }
@@ -315,7 +298,7 @@ async function promptForExistingServices(setup, info) {
     const choice = await chooseExistingService(existingServicesAndSchemas);
     if (!choice) {
         const existingServiceIds = existingServices.map((s) => s.name.split("/").pop());
-        info.serviceId = newUniqueId(defaultServiceId(), existingServiceIds);
+        info.serviceId = (0, utils_1.newUniqueId)(defaultServiceId(), existingServiceIds);
         info.analyticsFlow += "_pick_new_service";
         return;
     }
@@ -346,7 +329,7 @@ async function promptForExistingServices(setup, info) {
                 const id = c.name.split("/").pop();
                 return {
                     id,
-                    path: connectors.length === 1 ? "./connector" : `./${id}`,
+                    path: connectors.length === 1 ? "./example" : `./${id}`,
                     files: c.source.files || [],
                 };
             });
@@ -419,7 +402,7 @@ async function promptForCloudSQL(setup, info) {
                 info.analyticsFlow += "_pick_new_csql";
                 info.cloudSqlInstanceId = await (0, prompt_1.input)({
                     message: `What ID would you like to use for your new CloudSQL instance?`,
-                    default: newUniqueId(`${defaultServiceId().toLowerCase()}-fdc`, instances.map((i) => i.name)),
+                    default: (0, utils_1.newUniqueId)(`${defaultServiceId().toLowerCase()}-fdc`, instances.map((i) => i.name)),
                 });
             }
         }
@@ -436,7 +419,7 @@ async function promptForCloudSQL(setup, info) {
         try {
             const dbs = await cloudsql.listDatabases(setup.projectId, info.cloudSqlInstanceId);
             const existing = dbs.map((d) => d.name);
-            info.cloudSqlDatabase = newUniqueId("fdcdb", existing);
+            info.cloudSqlDatabase = (0, utils_1.newUniqueId)("fdcdb", existing);
         }
         catch (err) {
             logger_1.logger.debug(`[dataconnect] Cannot list databases during init: ${err}`);
@@ -464,15 +447,6 @@ async function locationChoices(setup) {
         ];
     }
 }
-function newUniqueId(recommended, existingIDs) {
-    let id = recommended;
-    let i = 1;
-    while (existingIDs.includes(id)) {
-        id = `${recommended}-${i}`;
-        i++;
-    }
-    return id;
-}
 function defaultServiceId() {
     return toDNSCompatibleId((0, path_1.basename)(process.cwd()));
 }

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

@@ -1,116 +1,187 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.actuate = exports.generateSdkYaml = exports.doSetup = exports.FDC_SDK_PLATFORM_ENV = exports.FDC_SDK_FRAMEWORKS_ENV = exports.FDC_APP_FOLDER = void 0;
+exports.addSdkGenerateToConnectorYaml = exports.actuate = exports.askQuestions = exports.FDC_SDK_PLATFORM_ENV = exports.FDC_SDK_FRAMEWORKS_ENV = exports.FDC_APP_FOLDER = void 0;
 const yaml = require("yaml");
 const clc = require("colorette");
 const path = require("path");
-const fsutils_1 = require("../../../fsutils");
+const cwd = process.cwd();
 const prompt_1 = require("../../../prompt");
-const fileUtils_1 = require("../../../dataconnect/fileUtils");
+const appFinder_1 = require("../../../dataconnect/appFinder");
 const load_1 = require("../../../dataconnect/load");
 const types_1 = require("../../../dataconnect/types");
-const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
 const error_1 = require("../../../error");
 const lodash_1 = require("lodash");
 const utils_1 = require("../../../utils");
+const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
 const auth_1 = require("../../../auth");
+const create_app_1 = require("./create_app");
+const track_1 = require("../../../track");
+const fsutils_1 = require("../../../fsutils");
 exports.FDC_APP_FOLDER = "FDC_APP_FOLDER";
 exports.FDC_SDK_FRAMEWORKS_ENV = "FDC_SDK_FRAMEWORKS";
 exports.FDC_SDK_PLATFORM_ENV = "FDC_SDK_PLATFORM";
-async function doSetup(setup, config, options) {
-    const sdkInfo = await askQuestions(setup, config, options);
-    await actuate(sdkInfo, config);
-    (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`);
+async function askQuestions(setup) {
+    const info = {
+        apps: [],
+    };
+    info.apps = await chooseApp();
+    if (!info.apps.length) {
+        const existingFilesAndDirs = (0, fsutils_1.listFiles)(cwd);
+        const webAppId = (0, utils_1.newUniqueId)("web-app", existingFilesAndDirs);
+        const choice = await (0, prompt_1.select)({
+            message: `Do you want to create an app template?`,
+            choices: [
+                { name: "React", value: "react" },
+                { name: "Next.JS", value: "next" },
+                { name: "no", value: "no" },
+            ],
+        });
+        switch (choice) {
+            case "react":
+                await (0, create_app_1.createReactApp)(webAppId);
+                break;
+            case "next":
+                await (0, create_app_1.createNextApp)(webAppId);
+                break;
+            case "no":
+                break;
+        }
+    }
+    setup.featureInfo = setup.featureInfo || {};
+    setup.featureInfo.dataconnectSdk = info;
 }
-exports.doSetup = doSetup;
-async function askQuestions(setup, config, options) {
-    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
-        .map((si) => {
-        return si.connectorInfo.map((ci) => {
+exports.askQuestions = askQuestions;
+async function chooseApp() {
+    let apps = await (0, appFinder_1.detectApps)(cwd);
+    if (apps.length) {
+        (0, utils_1.logLabeledSuccess)("dataconnect", `Detected existing apps ${apps.map((a) => (0, appFinder_1.appDescription)(a)).join(", ")}`);
+    }
+    else {
+        (0, utils_1.logLabeledWarning)("dataconnect", "No app exists in the current directory.");
+    }
+    const envAppFolder = (0, utils_1.envOverride)(exports.FDC_APP_FOLDER, "");
+    const envPlatform = (0, utils_1.envOverride)(exports.FDC_SDK_PLATFORM_ENV, types_1.Platform.NONE);
+    const envFrameworks = (0, utils_1.envOverride)(exports.FDC_SDK_FRAMEWORKS_ENV, "")
+        .split(",")
+        .map((f) => f);
+    if (envAppFolder && envPlatform !== types_1.Platform.NONE) {
+        const envAppRelDir = path.relative(cwd, path.resolve(cwd, envAppFolder));
+        const matchedApps = apps.filter((app) => app.directory === envAppRelDir && (!app.platform || app.platform === envPlatform));
+        if (matchedApps.length) {
+            for (const a of matchedApps) {
+                a.frameworks = [...(a.frameworks || []), ...envFrameworks];
+            }
+            return matchedApps;
+        }
+        return [
+            {
+                platform: envPlatform,
+                directory: envAppRelDir,
+                frameworks: envFrameworks,
+            },
+        ];
+    }
+    if (apps.length >= 2) {
+        const choices = apps.map((a) => {
             return {
-                name: `${si.dataConnectYaml.location}/${si.dataConnectYaml.serviceId}/${ci.connectorYaml.connectorId}`,
-                value: ci,
+                name: (0, appFinder_1.appDescription)(a),
+                value: a,
+                checked: a.directory === ".",
             };
         });
-    })
-        .flat();
-    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 appDir = process.env[exports.FDC_APP_FOLDER] || process.cwd();
-    let targetPlatform = (0, utils_1.envOverride)(exports.FDC_SDK_PLATFORM_ENV, (await (0, fileUtils_1.getPlatformFromFolder)(appDir)) || types_1.Platform.NONE);
-    if (options.nonInteractive && targetPlatform === types_1.Platform.NONE) {
-        throw new error_1.FirebaseError(`In non-interactive mode, the target platform and app directory must be specified using environment variables if they cannot be automatically detected.
-Please set the ${exports.FDC_SDK_PLATFORM_ENV} and ${exports.FDC_APP_FOLDER} environment variables.
-For example:
-${clc.bold(`${exports.FDC_SDK_PLATFORM_ENV}=WEB ${exports.FDC_APP_FOLDER}=app-dir ${exports.FDC_SDK_FRAMEWORKS_ENV}=react firebase init dataconnect:sdk --non-interactive`)}`);
-    }
-    if (targetPlatform === types_1.Platform.NONE && !((_a = process.env[exports.FDC_APP_FOLDER]) === null || _a === void 0 ? void 0 : _a.length)) {
-        appDir = await (0, utils_1.promptForDirectory)({
-            config,
-            message: "Where is your app directory? Leave blank to set up a generated SDK in your current directory.",
+        const pickedApps = await (0, prompt_1.checkbox)({
+            message: "Which apps do you want to set up Data Connect SDKs in?",
+            choices,
         });
-        targetPlatform = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
+        if (!pickedApps.length) {
+            throw new error_1.FirebaseError("Command Aborted. Please choose at least one app.");
+        }
+        apps = pickedApps;
+    }
+    return apps;
+}
+async function actuate(setup, config) {
+    var _a, _b;
+    const fdcInfo = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnect;
+    const sdkInfo = (_b = setup.featureInfo) === null || _b === void 0 ? void 0 : _b.dataconnectSdk;
+    if (!sdkInfo) {
+        throw new Error("Data Connect SDK feature RequiredInfo is not provided");
+    }
+    try {
+        await actuateWithInfo(setup, config, sdkInfo);
     }
-    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}.`);
+    finally {
+        let flow = "no_app";
+        if (sdkInfo.apps.length) {
+            const platforms = sdkInfo.apps.map((a) => a.platform.toLowerCase()).sort();
+            flow = `${platforms.join("_")}_app`;
+        }
+        if (fdcInfo) {
+            fdcInfo.analyticsFlow += `_${flow}`;
         }
         else {
-            (0, utils_1.logSuccess)(`Detected multiple app platforms in directory ${appDir}`);
+            void (0, track_1.trackGA4)("dataconnect_init", {
+                project_status: setup.projectId ? (setup.isBillingEnabled ? "blaze" : "spark") : "missing",
+                flow: `cli_sdk_${flow}`,
+            });
         }
-        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.select)({
-            message: "Which platform do you want to set up a generated SDK for?",
-            choices: platforms,
-        });
     }
-    else {
-        (0, utils_1.logSuccess)(`Detected ${targetPlatform} app in directory ${appDir}`);
+}
+exports.actuate = actuate;
+async function actuateWithInfo(setup, config, info) {
+    if (!info.apps.length) {
+        info.apps = await (0, appFinder_1.detectApps)(cwd);
+        if (!info.apps.length) {
+            (0, utils_1.logLabeledBullet)("dataconnect", "No apps to setup Data Connect Generated SDKs");
+            return;
+        }
     }
-    const connectorInfo = await chooseExistingConnector(connectorChoices);
+    const apps = info.apps;
+    const connectorInfo = await chooseExistingConnector(setup, config);
     const connectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
-    const newConnectorYaml = await generateSdkYaml(targetPlatform, connectorYaml, connectorInfo.directory, appDir);
-    if (targetPlatform === types_1.Platform.WEB) {
-        const unusedFrameworks = fileUtils_1.SUPPORTED_FRAMEWORKS.filter((framework) => { var _a; return !((_a = newConnectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk[framework]); });
-        if (unusedFrameworks.length > 0) {
-            let additionalFrameworks = [];
-            if (options.nonInteractive) {
-                additionalFrameworks = (0, utils_1.envOverride)(exports.FDC_SDK_FRAMEWORKS_ENV, "")
-                    .split(",")
-                    .filter((f) => f);
-            }
-            else {
-                additionalFrameworks = await (0, prompt_1.checkbox)({
-                    message: "Which frameworks would you like to generate SDKs for in addition to the TypeScript SDK? Press Enter to skip.\n",
-                    choices: fileUtils_1.SUPPORTED_FRAMEWORKS.map((frameworkStr) => {
-                        var _a, _b;
-                        return ({
-                            value: frameworkStr,
-                            checked: (_b = (_a = newConnectorYaml === null || newConnectorYaml === void 0 ? void 0 : newConnectorYaml.generate) === null || _a === void 0 ? void 0 : _a.javascriptSdk) === null || _b === void 0 ? void 0 : _b[frameworkStr],
-                        });
-                    }),
-                });
-            }
-            for (const framework of additionalFrameworks) {
-                newConnectorYaml.generate.javascriptSdk[framework] = true;
-            }
+    for (const app of apps) {
+        if (!(0, fsutils_1.dirExistsSync)(app.directory)) {
+            (0, utils_1.logLabeledWarning)("dataconnect", `App directory ${app.directory} does not exist`);
         }
+        addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app);
+    }
+    const connectorYamlContents = yaml.stringify(connectorYaml);
+    connectorInfo.connectorYaml = connectorYaml;
+    const connectorYamlPath = `${connectorInfo.directory}/connector.yaml`;
+    config.writeProjectFile(path.relative(config.projectDir, connectorYamlPath), connectorYamlContents);
+    (0, utils_1.logLabeledBullet)("dataconnect", `Installing the generated SDKs ...`);
+    const account = (0, auth_1.getGlobalDefaultAccount)();
+    await dataconnectEmulator_1.DataConnectEmulator.generate({
+        configDir: connectorInfo.directory,
+        connectorId: connectorInfo.connectorYaml.connectorId,
+        account,
+    });
+    (0, utils_1.logLabeledSuccess)("dataconnect", `Installed generated SDKs for ${clc.bold(apps.map((a) => (0, appFinder_1.appDescription)(a)).join(", "))}`);
+    if (apps.some((a) => a.platform === types_1.Platform.IOS)) {
+        (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/ios-sdk#set-client"));
+    }
+    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes("react"); })) {
+        (0, utils_1.logBullet)("Visit https://firebase.google.com/docs/data-connect/web-sdk#react for more information on how to set up React Generated SDKs for Firebase Data Connect");
+    }
+    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes("angular"); })) {
+        (0, utils_1.logBullet)("Run `ng add @angular/fire` to install angular sdk dependencies.\nVisit https://github.com/invertase/tanstack-query-firebase/tree/main/packages/angular for more information on how to set up Angular Generated SDKs for Firebase Data Connect");
     }
-    const connectorYamlContents = yaml.stringify(newConnectorYaml);
-    connectorInfo.connectorYaml = newConnectorYaml;
-    const displayIOSWarning = targetPlatform === types_1.Platform.IOS;
-    return { connectorYamlContents, connectorInfo, displayIOSWarning };
 }
-async function chooseExistingConnector(choices) {
+async function chooseExistingConnector(setup, config) {
+    const serviceInfos = await (0, load_1.loadAll)(setup.projectId || "", config);
+    const choices = serviceInfos
+        .map((si) => {
+        return si.connectorInfo.map((ci) => {
+            return {
+                name: `${si.dataConnectYaml.location}/${si.dataConnectYaml.serviceId}/${ci.connectorYaml.connectorId}`,
+                value: ci,
+            };
+        });
+    })
+        .flat();
+    if (!choices.length) {
+        throw new error_1.FirebaseError(`No Firebase Data Connect workspace found. Run ${clc.bold("firebase init dataconnect")} to set up a service and connector.`);
+    }
     if (choices.length === 1) {
         return choices[0].value;
     }
@@ -123,93 +194,79 @@ async function chooseExistingConnector(choices) {
         }
         (0, utils_1.logWarning)(`Unable to pick up an existing connector based on FDC_CONNECTOR=${connectorEnvVar}.`);
     }
-    return await (0, prompt_1.select)({
-        message: "Which connector do you want set up a generated SDK for?",
-        choices: choices,
-    });
+    (0, utils_1.logWarning)(`Pick up the first connector ${clc.bold(connectorEnvVar)}. Use FDC_CONNECTOR to override it`);
+    return choices[0].value;
 }
-async function generateSdkYaml(targetPlatform, connectorYaml, connectorDir, appDir) {
+function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
+    const connectorDir = connectorInfo.directory;
+    const appDir = app.directory;
     if (!connectorYaml.generate) {
         connectorYaml.generate = {};
     }
-    if (targetPlatform === types_1.Platform.IOS) {
-        const swiftSdk = {
-            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/swift`)),
-            package: "DataConnectGenerated",
-        };
-        connectorYaml.generate.swiftSdk = swiftSdk;
-    }
-    if (targetPlatform === types_1.Platform.WEB) {
-        const pkg = `${connectorYaml.connectorId}-connector`;
-        const packageJsonDir = path.relative(connectorDir, appDir);
-        const javascriptSdk = {
-            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/js/${pkg}`)),
-            package: `@dataconnect/generated`,
-            packageJsonDir,
-        };
-        const packageJson = await (0, fileUtils_1.resolvePackageJson)(appDir);
-        if (packageJson) {
-            const frameworksUsed = (0, fileUtils_1.getFrameworksFromPackageJson)(packageJson);
-            for (const framework of frameworksUsed) {
-                (0, utils_1.logBullet)(`Detected ${framework} app. Enabling ${framework} generated SDKs.`);
-                javascriptSdk[framework] = true;
+    const generate = connectorYaml.generate;
+    switch (app.platform) {
+        case types_1.Platform.WEB: {
+            const javascriptSdk = {
+                outputDir: path.relative(connectorDir, path.join(appDir, `src/dataconnect-generated`)),
+                package: `@dataconnect/generated`,
+                packageJsonDir: path.relative(connectorDir, appDir),
+                react: false,
+                angular: false,
+            };
+            for (const f of app.frameworks || []) {
+                javascriptSdk[f] = true;
+            }
+            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.javascriptSdk)) {
+                generate.javascriptSdk = generate.javascriptSdk ? [generate.javascriptSdk] : [];
+            }
+            if (!generate.javascriptSdk.some((s) => s.outputDir === javascriptSdk.outputDir)) {
+                generate.javascriptSdk.push(javascriptSdk);
+            }
+            break;
+        }
+        case types_1.Platform.FLUTTER: {
+            const dartSdk = {
+                outputDir: path.relative(connectorDir, path.join(appDir, `lib/dataconnect_generated`)),
+                package: "dataconnect_generated",
+            };
+            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.dartSdk)) {
+                generate.dartSdk = generate.dartSdk ? [generate.dartSdk] : [];
+            }
+            if (!generate.dartSdk.some((s) => s.outputDir === dartSdk.outputDir)) {
+                generate.dartSdk.push(dartSdk);
             }
+            break;
         }
-        connectorYaml.generate.javascriptSdk = javascriptSdk;
-    }
-    if (targetPlatform === types_1.Platform.FLUTTER) {
-        const pkg = `${(0, lodash_1.snakeCase)(connectorYaml.connectorId)}_connector`;
-        const dartSdk = {
-            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/dart/${pkg}`)),
-            package: "dataconnect_generated",
-        };
-        connectorYaml.generate.dartSdk = dartSdk;
-    }
-    if (targetPlatform === types_1.Platform.ANDROID) {
-        const kotlinSdk = {
-            outputDir: path.relative(connectorDir, path.join(appDir, `dataconnect-generated/kotlin`)),
-            package: `com.google.firebase.dataconnect.generated`,
-        };
-        for (const candidateSubdir of ["app/src/main/java", "app/src/main/kotlin"]) {
-            const candidateDir = path.join(appDir, candidateSubdir);
-            if ((0, fsutils_1.dirExistsSync)(candidateDir)) {
-                kotlinSdk.outputDir = path.relative(connectorDir, candidateDir);
+        case types_1.Platform.ANDROID: {
+            const kotlinSdk = {
+                outputDir: path.relative(connectorDir, path.join(appDir, `src/main/kotlin`)),
+                package: `com.google.firebase.dataconnect.generated`,
+            };
+            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.kotlinSdk)) {
+                generate.kotlinSdk = generate.kotlinSdk ? [generate.kotlinSdk] : [];
             }
+            if (!generate.kotlinSdk.some((s) => s.outputDir === kotlinSdk.outputDir)) {
+                generate.kotlinSdk.push(kotlinSdk);
+            }
+            break;
         }
-        connectorYaml.generate.kotlinSdk = kotlinSdk;
-    }
-    return connectorYaml;
-}
-exports.generateSdkYaml = generateSdkYaml;
-async function actuate(sdkInfo, config) {
-    var _a, _b;
-    const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
-    (0, utils_1.logBullet)(`Writing your new SDK configuration to ${connectorYamlPath}`);
-    config.writeProjectFile(path.relative(config.projectDir, connectorYamlPath), sdkInfo.connectorYamlContents);
-    const account = (0, auth_1.getGlobalDefaultAccount)();
-    await dataconnectEmulator_1.DataConnectEmulator.generate({
-        configDir: sdkInfo.connectorInfo.directory,
-        connectorId: sdkInfo.connectorInfo.connectorYaml.connectorId,
-        account,
-    });
-    (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/ios-sdk#set-client"));
-    }
-    if ((_b = sdkInfo.connectorInfo.connectorYaml.generate) === null || _b === void 0 ? void 0 : _b.javascriptSdk) {
-        for (const framework of fileUtils_1.SUPPORTED_FRAMEWORKS) {
-            if (sdkInfo.connectorInfo.connectorYaml.generate.javascriptSdk[framework]) {
-                logInfoForFramework(framework);
+        case types_1.Platform.IOS: {
+            const swiftSdk = {
+                outputDir: path.relative(connectorDir, path.join(app.directory, `../FirebaseDataConnectGenerated`)),
+                package: "DataConnectGenerated",
+            };
+            if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.swiftSdk)) {
+                generate.swiftSdk = generate.swiftSdk ? [generate.swiftSdk] : [];
+            }
+            if (!generate.swiftSdk.some((s) => s.outputDir === swiftSdk.outputDir)) {
+                generate.swiftSdk.push(swiftSdk);
             }
+            break;
         }
+        default:
+            throw new error_1.FirebaseError(`Unsupported platform ${app.platform} for Data Connect SDK generation. Supported platforms are: ${Object.values(types_1.Platform)
+                .filter((p) => p !== types_1.Platform.NONE && p !== types_1.Platform.MULTIPLE)
+                .join(", ")}\n${JSON.stringify(app)}`);
     }
 }
-exports.actuate = actuate;
-function logInfoForFramework(framework) {
-    if (framework === "react") {
-        (0, utils_1.logBullet)("Visit https://firebase.google.com/docs/data-connect/web-sdk#react for more information on how to set up React Generated SDKs for Firebase Data Connect");
-    }
-    else if (framework === "angular") {
-        (0, utils_1.logBullet)("Run `npm i --save @angular/fire @tanstack-query-firebase/angular @tanstack/angular-query-experimental` to install angular sdk dependencies.\nVisit https://github.com/invertase/tanstack-query-firebase/tree/main/packages/angular for more information on how to set up Angular Generated SDKs for Firebase Data Connect");
-    }
-}
+exports.addSdkGenerateToConnectorYaml = addSdkGenerateToConnectorYaml;

package/lib/init/features/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aitools = exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectSdk = exports.dataconnectPostSetup = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hosting = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = exports.account = void 0;
+exports.aitools = exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectSdkActuate = exports.dataconnectSdkAskQuestions = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hosting = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = exports.account = void 0;
 var account_1 = require("./account");
 Object.defineProperty(exports, "account", { enumerable: true, get: function () { return account_1.doSetup; } });
 var database_1 = require("./database");
@@ -29,9 +29,9 @@ Object.defineProperty(exports, "hostingGithub", { enumerable: true, get: functio
 var dataconnect_1 = require("./dataconnect");
 Object.defineProperty(exports, "dataconnectAskQuestions", { enumerable: true, get: function () { return dataconnect_1.askQuestions; } });
 Object.defineProperty(exports, "dataconnectActuate", { enumerable: true, get: function () { return dataconnect_1.actuate; } });
-Object.defineProperty(exports, "dataconnectPostSetup", { enumerable: true, get: function () { return dataconnect_1.postSetup; } });
 var sdk_1 = require("./dataconnect/sdk");
-Object.defineProperty(exports, "dataconnectSdk", { enumerable: true, get: function () { return sdk_1.doSetup; } });
+Object.defineProperty(exports, "dataconnectSdkAskQuestions", { enumerable: true, get: function () { return sdk_1.askQuestions; } });
+Object.defineProperty(exports, "dataconnectSdkActuate", { enumerable: true, get: function () { return sdk_1.actuate; } });
 var apphosting_1 = require("./apphosting");
 Object.defineProperty(exports, "apphosting", { enumerable: true, get: function () { return apphosting_1.doSetup; } });
 var genkit_1 = require("./genkit");

package/lib/init/index.js

@@ -23,9 +23,12 @@ const featuresList = [
         name: "dataconnect",
         askQuestions: features.dataconnectAskQuestions,
         actuate: features.dataconnectActuate,
-        postSetup: features.dataconnectPostSetup,
     },
-    { name: "dataconnect:sdk", doSetup: features.dataconnectSdk },
+    {
+        name: "dataconnect:sdk",
+        askQuestions: features.dataconnectSdkAskQuestions,
+        actuate: features.dataconnectSdkActuate,
+    },
     { name: "functions", doSetup: features.functions },
     { name: "hosting", doSetup: features.hosting },
     {

package/lib/management/apps.js

@@ -13,7 +13,7 @@ const types_1 = require("../dataconnect/types");
 const projectUtils_1 = require("../projectUtils");
 const prompt = require("../prompt");
 const projects_1 = require("./projects");
-const fileUtils_1 = require("../dataconnect/fileUtils");
+const appFinder_1 = require("../dataconnect/appFinder");
 const utils_1 = require("../utils");
 const TIMEOUT_MILLIS = 30000;
 exports.APP_LIST_PAGE_SIZE = 100;
@@ -22,14 +22,14 @@ async function getDisplayName() {
     return await prompt.input("What would you like to call your app?");
 }
 async function getPlatform(appDir, config) {
-    let targetPlatform = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
+    let targetPlatform = await (0, appFinder_1.getPlatformFromFolder)(appDir);
     if (targetPlatform === types_1.Platform.NONE) {
         appDir = await (0, utils_1.promptForDirectory)({
             config,
             relativeTo: appDir,
             message: "We couldn't determine what kind of app you're using. Where is your app directory?",
         });
-        targetPlatform = await (0, fileUtils_1.getPlatformFromFolder)(appDir);
+        targetPlatform = await (0, appFinder_1.getPlatformFromFolder)(appDir);
     }
     if (targetPlatform === types_1.Platform.NONE || targetPlatform === types_1.Platform.MULTIPLE) {
         if (targetPlatform === types_1.Platform.NONE) {