firebase-tools 14.20.0 → 14.22.0

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.15.0",
-            "expectedSize": 29610848,
-            "expectedChecksum": "182ddca17f4974ec081fd5a769f8eeac",
-            "expectedChecksumSHA256": "3bcdc39b7f149f8c2d96f397188ca003daf1b43a1ce845780146b79217970a52",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.15.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0"
+            "version": "2.15.1",
+            "expectedSize": 29946720,
+            "expectedChecksum": "cc8d5dd053cc71adad0f640ac2627018",
+            "expectedChecksumSHA256": "a3749396507678bc546987ef047a9d0c25145064503a9adc777229f1bc9b8c6f",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.15.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.1"
         },
         "win32": {
-            "version": "2.15.0",
-            "expectedSize": 30099456,
-            "expectedChecksum": "5dd4efd368c3987925c41784e21c7af6",
-            "expectedChecksumSHA256": "a664f29cd21f826dd4936f8b95f0673e0ea603ab0d85a426d8231f1aaa8947f9",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.15.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0.exe"
+            "version": "2.15.1",
+            "expectedSize": 30440960,
+            "expectedChecksum": "57390c392101a13952ff2aea74b62787",
+            "expectedChecksumSHA256": "905a9ab2200189dc31f23b5454d21803b0c672442f0ee4bb7db8286d159a86e0",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.15.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.1.exe"
         },
         "linux": {
-            "version": "2.15.0",
-            "expectedSize": 29532344,
-            "expectedChecksum": "38baf423fbfc9c67a89975a27f0a3974",
-            "expectedChecksumSHA256": "d3c5b26470639fedce9e3ac667948fa07473e77f6c2d0b361d78c5f2e856a1ec",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.15.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0"
+            "version": "2.15.1",
+            "expectedSize": 29868216,
+            "expectedChecksum": "cc6ef676d8c5c3a3f74c0bf037083cf0",
+            "expectedChecksumSHA256": "1dfe085c467637ebf6a71cc6c8e8bc11fac85202056b960633607627bd647a6d",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.15.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.1"
         }
     }
 }

package/lib/emulator/hubExport.js

@@ -13,6 +13,7 @@ const hub_1 = require("./hub");
 const downloadableEmulators_1 = require("./downloadableEmulators");
 const node_fs_1 = require("node:fs");
 const track_1 = require("../track");
+const api_1 = require("../api");
 class HubExport {
     constructor(projectId, options) {
         this.projectId = projectId;
@@ -234,5 +235,9 @@ function fetchToFile(options, path) {
     });
 }
 function shouldExport(e) {
+    if (e === types_1.Emulators.DATACONNECT && (0, api_1.dataConnectLocalConnString)()) {
+        logger_1.logger.info("Skipping export for Data Connect because FIREBASE_DATACONNECT_POSTGRESQL_STRING is set.");
+        return false;
+    }
     return types_1.IMPORT_EXPORT_EMULATORS.includes(e) && registry_1.EmulatorRegistry.isRunning(e);
 }

package/lib/experiments.js

@@ -41,13 +41,6 @@ exports.ALL_EXPERIMENTS = experiments({
             "of how that image was created.",
         public: true,
     },
-    dangerouslyAllowFunctionsConfig: {
-        shortDescription: "Allows the use of deprecated functions.config() API",
-        fullDescription: "The functions.config() API is deprecated and will be removed on December 31, 2025. " +
-            "This experiment allows continued use of the API during the migration period.",
-        default: true,
-        public: true,
-    },
     runfunctions: {
         shortDescription: "Functions created using the V2 API target Cloud Run Functions (not production ready)",
         public: false,

package/lib/firestore/api.js

@@ -580,6 +580,21 @@ class FirestoreApi {
         }
         return database;
     }
+    async cloneDatabase(project, pitrSnapshot, databaseId, encryptionConfig) {
+        const url = `/projects/${project}/databases:clone`;
+        const payload = {
+            databaseId,
+            pitrSnapshot,
+            encryptionConfig,
+        };
+        const options = { queryParams: { databaseId: databaseId } };
+        const res = await this.apiClient.post(url, payload, options);
+        const lro = res.body;
+        if (!lro) {
+            throw new error_1.FirebaseError("Not found");
+        }
+        return lro;
+    }
     async listOperations(project, databaseId, limit) {
         const url = `/projects/${project}/databases/${databaseId}/operations`;
         const res = await this.apiClient.get(url, {

package/lib/firestore/util.js

@@ -1,9 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.booleanXOR = exports.parseFieldName = exports.parseIndexName = void 0;
+exports.getCurrentMinuteAsIsoString = exports.booleanXOR = exports.parseFieldName = exports.parseIndexName = exports.parseDatabaseName = void 0;
 const error_1 = require("../error");
+const DATABASE_NAME_REGEX = /projects\/([^\/]+?)\/databases\/([^\/]+)/;
 const INDEX_NAME_REGEX = /projects\/([^\/]+?)\/databases\/([^\/]+?)\/collectionGroups\/([^\/]+?)\/indexes\/([^\/]*)/;
 const FIELD_NAME_REGEX = /projects\/([^\/]+?)\/databases\/([^\/]+?)\/collectionGroups\/([^\/]+?)\/fields\/([^\/]*)/;
+function parseDatabaseName(name) {
+    if (!name) {
+        throw new error_1.FirebaseError(`Cannot parse undefined database name.`);
+    }
+    const m = name.match(DATABASE_NAME_REGEX);
+    if (!m || m.length < 3) {
+        throw new error_1.FirebaseError(`Error parsing database name: ${name}`);
+    }
+    return {
+        projectId: m[1],
+        databaseId: m[2],
+    };
+}
+exports.parseDatabaseName = parseDatabaseName;
 function parseIndexName(name) {
     if (!name) {
         throw new error_1.FirebaseError(`Cannot parse undefined index name.`);
@@ -37,3 +52,9 @@ function booleanXOR(a, b) {
     return !!(Number(a) - Number(b));
 }
 exports.booleanXOR = booleanXOR;
+function getCurrentMinuteAsIsoString() {
+    const mostRecentTimestamp = new Date(Date.now());
+    mostRecentTimestamp.setSeconds(0, 0);
+    return mostRecentTimestamp.toISOString();
+}
+exports.getCurrentMinuteAsIsoString = getCurrentMinuteAsIsoString;

package/lib/frameworks/angular/index.js

@@ -26,7 +26,7 @@ async function discover(dir) {
 }
 exports.discover = discover;
 function init(setup, config) {
-    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@"${exports.supportedRange}" ng new ${setup.projectId} --directory ${setup.hosting.source} --skip-git`, {
+    (0, child_process_1.execSync)(`npx --yes -p @angular/cli@"${exports.supportedRange}" ng new ${setup.projectId} --directory ${setup.featureInfo.hosting.source} --skip-git`, {
         stdio: "inherit",
         cwd: config.projectDir,
     });

package/lib/frameworks/flutter/index.js

@@ -34,7 +34,7 @@ function init(setup, config) {
         `--project-name=${projectName}`,
         "--overwrite",
         "--platforms=web",
-        setup.hosting.source,
+        setup.featureInfo.hosting.source,
     ], { stdio: "inherit", cwd: config.projectDir });
     if (result.status !== 0)
         throw new error_1.FirebaseError("We were not able to create your flutter app, create the application yourself https://docs.flutter.dev/get-started/test-drive?tab=terminal before trying again.");

package/lib/frameworks/next/index.js

@@ -214,7 +214,7 @@ async function init(setup, config) {
         ],
     });
     (0, child_process_1.execSync)(`npx --yes create-next-app@"${exports.supportedRange}" -e hello-world ` +
-        `${setup.hosting.source} --use-npm --${language}`, { stdio: "inherit", cwd: config.projectDir });
+        `${setup.featureInfo.hosting.source} --use-npm --${language}`, { stdio: "inherit", cwd: config.projectDir });
 }
 exports.init = init;
 async function ɵcodegenPublicDirectory(sourceDir, destDir, _, context) {

package/lib/frameworks/nuxt/index.js

@@ -93,7 +93,7 @@ async function getConfig(cwd) {
 }
 exports.getConfig = getConfig;
 function init(setup, config) {
-    (0, child_process_1.execSync)(`npx --yes nuxi@"${exports.supportedRange}" init ${setup.hosting.source}`, {
+    (0, child_process_1.execSync)(`npx --yes nuxi@"${exports.supportedRange}" init ${setup.featureInfo.hosting.source}`, {
         stdio: "inherit",
         cwd: config.projectDir,
     });

package/lib/frameworks/vite/index.js

@@ -25,11 +25,14 @@ async function init(setup, config, baseTemplate = "vanilla") {
             { name: "TypeScript", value: `${baseTemplate}-ts` },
         ],
     });
-    (0, child_process_1.execSync)(`npm create vite@"${exports.supportedRange}" ${setup.hosting.source} --yes -- --template ${template}`, {
+    (0, child_process_1.execSync)(`npm create vite@"${exports.supportedRange}" ${setup.featureInfo.hosting.source} --yes -- --template ${template}`, {
         stdio: "inherit",
         cwd: config.projectDir,
     });
-    (0, child_process_1.execSync)(`npm install`, { stdio: "inherit", cwd: (0, path_1.join)(config.projectDir, setup.hosting.source) });
+    (0, child_process_1.execSync)(`npm install`, {
+        stdio: "inherit",
+        cwd: (0, path_1.join)(config.projectDir, setup.featureInfo.hosting.source),
+    });
 }
 exports.init = init;
 const viteDiscoverWithNpmDependency = (dep) => async (dir) => await discover(dir, undefined, dep);

package/lib/functions/projectConfig.js

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveConfigDir = exports.requireLocal = exports.isRemoteConfig = exports.isLocalConfig = exports.configForCodebase = exports.normalizeAndValidate = exports.validate = exports.assertUnique = exports.validatePrefix = exports.validateCodebase = exports.normalize = exports.DEFAULT_CODEBASE = void 0;
+exports.shouldUseRuntimeConfig = exports.resolveConfigDir = exports.requireLocal = exports.isRemoteConfig = exports.isLocalConfig = exports.configForCodebase = exports.normalizeAndValidate = exports.validate = exports.assertUnique = exports.validatePrefix = exports.validateCodebase = exports.normalize = exports.DEFAULT_CODEBASE = void 0;
 const error_1 = require("../error");
 exports.DEFAULT_CODEBASE = "default";
 function normalize(config) {
@@ -149,3 +149,7 @@ function resolveConfigDir(c) {
     return c.configDir || c.source;
 }
 exports.resolveConfigDir = resolveConfigDir;
+function shouldUseRuntimeConfig(cfg) {
+    return isLocalConfig(cfg) && cfg.disallowLegacyRuntimeConfig !== true;
+}
+exports.shouldUseRuntimeConfig = shouldUseRuntimeConfig;

package/lib/functions/secrets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describeSecret = exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.versionInUse = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = void 0;
+exports.describeSecret = exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.versionInUse = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.validateJsonSecret = exports.ensureValidKey = void 0;
 const utils = require("../utils");
 const poller = require("../operation-poller");
 const gcfV1 = require("../gcp/cloudfunctions");
@@ -61,6 +61,19 @@ async function ensureValidKey(key, options) {
     return transformedKey;
 }
 exports.ensureValidKey = ensureValidKey;
+function validateJsonSecret(secretName, secretValue) {
+    try {
+        JSON.parse(secretValue);
+    }
+    catch (e) {
+        throw new error_1.FirebaseError(`Provided value for ${secretName} is not valid JSON: ${e.message}\n\n` +
+            `For complex JSON values, use:\n` +
+            `  firebase functions:secrets:set ${secretName} --data-file <file.json>\n` +
+            `Or pipe from stdin:\n` +
+            `  cat <file.json> | firebase functions:secrets:set ${secretName} --format=json`);
+    }
+}
+exports.validateJsonSecret = validateJsonSecret;
 async function ensureSecret(projectId, name, options) {
     try {
         const secret = await (0, secretManager_1.getSecret)(projectId, name);

package/lib/hosting/interactive.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.interactiveCreateHostingSite = void 0;
+exports.pickHostingSiteName = void 0;
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const projectUtils_1 = require("../projectUtils");
@@ -9,11 +9,11 @@ const prompt_1 = require("../prompt");
 const nameSuggestion = new RegExp("try something like `(.+)`");
 const prompt = "Please provide an unique, URL-friendly id for your site. Your site's URL will be <site-id>.web.app. " +
     'We recommend using letters, numbers, and hyphens (e.g. "{project-id}-{random-hash}"):';
-async function interactiveCreateHostingSite(siteId, appId, options) {
+async function pickHostingSiteName(siteId, options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
     let id = siteId;
-    let newSite;
+    let nameConfirmed = false;
     let suggestion;
     if (!id) {
         const attempt = await trySiteID(projectNumber, projectId);
@@ -24,7 +24,7 @@ async function interactiveCreateHostingSite(siteId, appId, options) {
             suggestion = attempt.suggestion;
         }
     }
-    while (!newSite) {
+    while (!nameConfirmed) {
         if (!id || suggestion) {
             id = await (0, prompt_1.input)({
                 message: prompt,
@@ -32,24 +32,16 @@ async function interactiveCreateHostingSite(siteId, appId, options) {
                 default: suggestion,
             });
         }
-        try {
-            newSite = await (0, api_1.createSite)(projectNumber, id, appId);
-        }
-        catch (err) {
-            if (!(err instanceof error_1.FirebaseError)) {
-                throw err;
-            }
-            if (options.nonInteractive) {
-                throw err;
-            }
+        const attempt = await trySiteID(projectNumber, id, options.nonInteractive);
+        nameConfirmed = attempt.available;
+        suggestion = attempt.suggestion;
+        if (!nameConfirmed)
             id = "";
-            suggestion = getSuggestionFromError(err);
-        }
     }
-    return newSite;
+    return id;
 }
-exports.interactiveCreateHostingSite = interactiveCreateHostingSite;
-async function trySiteID(projectNumber, id) {
+exports.pickHostingSiteName = pickHostingSiteName;
+async function trySiteID(projectNumber, id, nonInteractive = false) {
     try {
         await (0, api_1.createSite)(projectNumber, id, "", true);
         return { available: true };
@@ -58,6 +50,9 @@ async function trySiteID(projectNumber, id) {
         if (!(err instanceof error_1.FirebaseError)) {
             throw err;
         }
+        if (nonInteractive) {
+            throw err;
+        }
         const suggestion = getSuggestionFromError(err);
         return { available: false, suggestion };
     }

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

@@ -50,7 +50,7 @@ const templateServiceInfo = {
 };
 async function askQuestions(setup) {
     const info = {
-        analyticsFlow: "cli",
+        flow: "",
         appDescription: "",
         serviceId: "",
         locationId: "",
@@ -97,7 +97,7 @@ async function askQuestions(setup) {
 }
 exports.askQuestions = askQuestions;
 async function actuate(setup, config, options) {
-    var _a;
+    var _a, _b, _c;
     const dir = config.get("dataconnect.source", "dataconnect");
     const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
     config.set("emulators.dataconnect.dataDir", dataDir);
@@ -109,37 +109,38 @@ async function actuate(setup, config, options) {
     info.cloudSqlInstanceId = info.cloudSqlInstanceId || `${info.serviceId.toLowerCase()}-fdc`;
     info.locationId = info.locationId || exports.FDC_DEFAULT_REGION;
     info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
+    const startTime = Date.now();
     try {
         await actuateWithInfo(setup, config, info, options);
         await sdk.actuate(setup, config);
     }
     finally {
-        void (0, track_1.trackGA4)("dataconnect_init", {
-            flow: info.analyticsFlow,
-            project_status: setup.projectId
-                ? setup.isBillingEnabled
+        const sdkInfo = (_b = setup.featureInfo) === null || _b === void 0 ? void 0 : _b.dataconnectSdk;
+        const source = ((_c = setup.featureInfo) === null || _c === void 0 ? void 0 : _c.dataconnectSource) || "init";
+        void (0, track_1.trackGA4)("dataconnect_init", Object.assign({ source, flow: info.flow.substring(1), project_status: setup.projectId
+                ? (await (0, cloudbilling_1.isBillingEnabled)(setup))
                     ? info.shouldProvisionCSQL
                         ? "blaze_provisioned_csql"
                         : "blaze"
                     : "spark"
-                : "missing",
-        });
+                : "missing" }, (sdkInfo ? sdk.initAppCounters(sdkInfo) : {})), Date.now() - startTime);
     }
     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) {
+    if (!(await (0, cloudbilling_1.isBillingEnabled)(setup))) {
         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) {
+    var _a;
     const projectId = setup.projectId;
     if (!projectId) {
-        info.analyticsFlow += "_save_template";
+        info.flow += "_save_template";
         return await writeFiles(config, info, templateServiceInfo, options);
     }
     await (0, ensureApis_1.ensureApis)(projectId, true);
@@ -151,7 +152,7 @@ async function actuateWithInfo(setup, config, info, options) {
             instanceId: info.cloudSqlInstanceId,
             databaseId: info.cloudSqlDatabase,
             requireGoogleMlIntegration: false,
-            source: info.analyticsFlow.startsWith("mcp") ? "mcp_init" : "init",
+            source: ((_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnectSource) || "init",
         });
     }
     const serviceName = `projects/${projectId}/locations/${info.locationId}/services/${info.serviceId}`;
@@ -160,10 +161,10 @@ async function actuateWithInfo(setup, config, info, options) {
             await downloadService(info, serviceName);
         }
         if (info.serviceGql) {
-            info.analyticsFlow += "_save_downloaded";
+            info.flow += "_save_downloaded";
             return await writeFiles(config, info, info.serviceGql, options);
         }
-        info.analyticsFlow += "_save_template";
+        info.flow += "_save_template";
         return await writeFiles(config, info, templateServiceInfo, options);
     }
     const serviceAlreadyExists = !(await (0, client_1.createService)(projectId, info.locationId, info.serviceId));
@@ -171,7 +172,7 @@ async function actuateWithInfo(setup, config, info, options) {
     const schemaFiles = [{ path: "schema.gql", content: schemaGql }];
     if (serviceAlreadyExists) {
         (0, utils_1.logLabeledError)("dataconnect", `Data Connect Service ${serviceName} already exists. Skip saving them...`);
-        info.analyticsFlow += "_save_gemini_service_already_exists";
+        info.flow += "_save_gemini_service_already_exists";
         return await writeFiles(config, info, { schemaGql: schemaFiles, connectors: [] }, options);
     }
     await (0, utils_1.promiseWithSpinner)(async () => {
@@ -198,12 +199,12 @@ async function actuateWithInfo(setup, config, info, options) {
                 ],
             },
         ];
-        info.analyticsFlow += "_save_gemini";
+        info.flow += "_save_gemini";
         await writeFiles(config, info, { schemaGql: schemaFiles, connectors: connectors, seedDataGql: seedDataGql }, options);
     }
     catch (err) {
         (0, utils_1.logLabeledError)("dataconnect", `Operation Generation failed...`);
-        info.analyticsFlow += "_save_gemini_operation_error";
+        info.flow += "_save_gemini_operation_error";
         await writeFiles(config, info, { schemaGql: schemaFiles, connectors: [] }, options);
         throw err;
     }
@@ -322,10 +323,10 @@ async function promptForExistingServices(setup, info) {
     if (!choice) {
         const existingServiceIds = existingServices.map((s) => s.name.split("/").pop());
         info.serviceId = (0, utils_1.newUniqueId)(defaultServiceId(), existingServiceIds);
-        info.analyticsFlow += "_pick_new_service";
+        info.flow += "_pick_new_service";
         return;
     }
-    info.analyticsFlow += "_pick_existing_service";
+    info.flow += "_pick_existing_service";
     const serviceName = (0, names_1.parseServiceName)(choice.name);
     info.serviceId = serviceName.serviceId;
     info.locationId = serviceName.location;
@@ -429,11 +430,11 @@ async function promptForCloudSQL(setup, info) {
                 choices,
             });
             if (info.cloudSqlInstanceId !== "") {
-                info.analyticsFlow += "_pick_existing_csql";
+                info.flow += "_pick_existing_csql";
                 info.locationId = choices.find((c) => c.value === info.cloudSqlInstanceId).location;
             }
             else {
-                info.analyticsFlow += "_pick_new_csql";
+                info.flow += "_pick_new_csql";
                 info.cloudSqlInstanceId = await (0, prompt_1.input)({
                     message: `What ID would you like to use for your new CloudSQL instance?`,
                     default: (0, utils_1.newUniqueId)(`${defaultServiceId().toLowerCase()}-fdc`, instances.map((i) => i.name)),

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSdkGenerateToConnectorYaml = exports.actuate = exports.chooseApp = exports.askQuestions = exports.FDC_SDK_PLATFORM_ENV = exports.FDC_SDK_FRAMEWORKS_ENV = exports.FDC_APP_FOLDER = void 0;
+exports.addSdkGenerateToConnectorYaml = exports.initAppCounters = exports.actuate = exports.chooseApp = 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");
@@ -16,6 +16,7 @@ const auth_1 = require("../../../auth");
 const create_app_1 = require("./create_app");
 const track_1 = require("../../../track");
 const fsutils_1 = require("../../../fsutils");
+const cloudbilling_1 = require("../../../gcp/cloudbilling");
 exports.FDC_APP_FOLDER = "FDC_APP_FOLDER";
 exports.FDC_SDK_FRAMEWORKS_ENV = "FDC_SDK_FRAMEWORKS";
 exports.FDC_SDK_PLATFORM_ENV = "FDC_SDK_PLATFORM";
@@ -37,7 +38,7 @@ async function askQuestions(setup) {
                 { name: `React${npxMissingWarning}`, value: "react" },
                 { name: `Next.JS${npxMissingWarning}`, value: "next" },
                 { name: `Flutter${flutterMissingWarning}`, value: "flutter" },
-                { name: "no", value: "no" },
+                { name: "skip", value: "skip" },
             ],
         });
         try {
@@ -51,7 +52,7 @@ async function askQuestions(setup) {
                 case "flutter":
                     await (0, create_app_1.createFlutterApp)((0, utils_1.newUniqueId)("flutter_app", (0, fsutils_1.listFiles)(cwd)));
                     break;
-                case "no":
+                case "skip":
                     break;
             }
         }
@@ -69,7 +70,7 @@ async function chooseApp() {
         (0, utils_1.logLabeledSuccess)("dataconnect", `Detected existing apps ${apps.map((a) => (0, appUtils_1.appDescription)(a)).join(", ")}`);
     }
     else {
-        (0, utils_1.logLabeledWarning)("dataconnect", "No app exists in the current directory.");
+        (0, utils_1.logLabeledWarning)("dataconnect", "Cannot detect an existing app 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, "");
@@ -115,33 +116,55 @@ async function chooseApp() {
 }
 exports.chooseApp = chooseApp;
 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;
+    var _a, _b, _c;
+    const sdkInfo = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnectSdk;
     if (!sdkInfo) {
         throw new Error("Data Connect SDK feature RequiredInfo is not provided");
     }
+    const startTime = Date.now();
     try {
         await actuateWithInfo(setup, config, sdkInfo);
     }
     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 {
-            void (0, track_1.trackGA4)("dataconnect_init", {
-                project_status: setup.projectId ? (setup.isBillingEnabled ? "blaze" : "spark") : "missing",
-                flow: `cli_sdk_${flow}`,
-            });
+        const fdcInfo = (_b = setup.featureInfo) === null || _b === void 0 ? void 0 : _b.dataconnect;
+        if (!fdcInfo) {
+            const source = ((_c = setup.featureInfo) === null || _c === void 0 ? void 0 : _c.dataconnectSource) || "init_sdk";
+            void (0, track_1.trackGA4)("dataconnect_init", Object.assign({ source, project_status: setup.projectId
+                    ? (await (0, cloudbilling_1.isBillingEnabled)(setup))
+                        ? "blaze"
+                        : "spark"
+                    : "missing" }, initAppCounters(sdkInfo)), Date.now() - startTime);
         }
     }
 }
 exports.actuate = actuate;
+function initAppCounters(info) {
+    var _a;
+    const counts = {
+        num_web_apps: 0,
+        num_android_apps: 0,
+        num_ios_apps: 0,
+        num_flutter_apps: 0,
+    };
+    for (const app of (_a = info.apps) !== null && _a !== void 0 ? _a : []) {
+        switch (app.platform) {
+            case appUtils_1.Platform.WEB:
+                counts.num_web_apps++;
+                break;
+            case appUtils_1.Platform.ANDROID:
+                counts.num_android_apps++;
+                break;
+            case appUtils_1.Platform.IOS:
+                counts.num_ios_apps++;
+                break;
+            case appUtils_1.Platform.FLUTTER:
+                counts.num_flutter_apps++;
+                break;
+        }
+    }
+    return counts;
+}
+exports.initAppCounters = initAppCounters;
 async function actuateWithInfo(setup, config, info) {
     if (!info.apps.length) {
         info.apps = await (0, appUtils_1.detectApps)(cwd);
@@ -245,7 +268,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
         case appUtils_1.Platform.FLUTTER: {
             const dartSdk = {
                 outputDir: path.relative(connectorDir, path.join(appDir, `lib/dataconnect_generated`)),
-                package: "dataconnect_generated",
+                package: "dataconnect_generated/generated.dart",
             };
             if (!(0, lodash_1.isArray)(generate === null || generate === void 0 ? void 0 : generate.dartSdk)) {
                 generate.dartSdk = generate.dartSdk ? [generate.dartSdk] : [];

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

@@ -98,6 +98,7 @@ async function initNewCodebase(setup, config) {
     setup.config.functions.push({
         source,
         codebase,
+        disallowLegacyRuntimeConfig: true,
     });
     setup.functions.source = source;
     setup.functions.codebase = codebase;