[FDC] Update Dart import lib name to generated.dart

CHANGELOG.md

@@ -4,3 +4,4 @@
 - Tighten --only filter resolution for functions deployment to prefer codebase names (#9353)
 - Fixed an issue where the Data Connect emulator would attempt to export data when `FIREBASE_DATACONNECT_POSTGRESQL_STRING` is set (#9330)
 - Added `functions.disallowLegacyRuntimeConfig` option to `firebase.json` to optionally skip fetching legacy Runtime Config during function deploys (#9354)
+- Update Data Connect Dart SDK's default import path to `import 'dataconnect_generated/generated.dart';` (#9365)

src/init/features/dataconnect/index.ts

@@ -105,7 +105,7 @@
 
 // askQuestions prompts the user about the Data Connect service they want to init. Any prompting
 // logic should live here, and _no_ actuation logic should live here.
 export async function askQuestions(setup: Setup): Promise<void> {
  const info: RequiredInfo = {
  flow: "",
  appDescription: "",
@@ -158,10 +158,10 @@
 
 // actuate writes product specific files and makes product specifc API calls.
 // It does not handle writing firebase.json and .firebaserc
 export async function actuate(setup: Setup, config: Config, options: any): Promise<void> {
  // Most users will want to persist data between emulator runs, so set this to a reasonable default.
  const dir: string = config.get("dataconnect.source", "dataconnect");
  const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
  config.set("emulators.dataconnect.dataDir", dataDir);
 
  const info = setup.featureInfo?.dataconnect;
@@ -180,10 +180,11 @@
  await sdk.actuate(setup, config);
  } finally {
  const sdkInfo = setup.featureInfo?.dataconnectSdk;
+ const source: Source = setup.featureInfo?.dataconnectSource || "init";
  void trackGA4(
  "dataconnect_init",
  {
- source: setup.featureInfo?.dataconnectSource || "init",
+ source,
  flow: info.flow.substring(1), // Trim the leading `_`
  project_status: setup.projectId
  ? (await isBillingEnabled(setup))
@@ -202,7 +203,7 @@
  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 (!(await isBillingEnabled(setup))) {
@@ -217,7 +218,7 @@
  setup: Setup,
  config: Config,
  info: RequiredInfo,
  options: any,
 ): Promise<void> {
  const projectId = setup.projectId;
  if (!projectId) {
@@ -324,7 +325,7 @@
  { schemaGql: schemaFiles, connectors: connectors, seedDataGql: seedDataGql },
  options,
  );
  } catch (err: any) {
  logLabeledError("dataconnect", `Operation Generation failed...`);
  // GiF generate operation API has stability concerns.
  // Fallback to save only the generated schema.
@@ -398,9 +399,9 @@
  config: Config,
  info: RequiredInfo,
  serviceGql: ServiceGQL,
  options: any,
 ): Promise<void> {
  const dir: string = config.get("dataconnect.source") || "dataconnect";
  const subbedDataconnectYaml = subDataconnectYamlValues({
  ...info,
  connectorDirs: serviceGql.connectors.map((c) => c.path),

src/init/features/dataconnect/sdk.spec.ts

@@ -82,7 +82,7 @@ describe("addSdkGenerateToConnectorYaml", () => {
  expect(connectorYaml.generate?.dartSdk).to.deep.equal([
  {
  outputDir: "../app/lib/dataconnect_generated",
- package: "dataconnect_generated",
+ package: "dataconnect_generated/generated.dart",
  },
  ]);
  });

src/init/features/dataconnect/sdk.ts

@@ -35,6 +35,7 @@ import { createFlutterApp, createNextApp, createReactApp } from "./create_app";
 import { trackGA4 } from "../../../track";
 import { dirExistsSync, listFiles } from "../../../fsutils";
 import { isBillingEnabled } from "../../../gcp/cloudbilling";
+import { Source } from ".";
 
 export const FDC_APP_FOLDER = "FDC_APP_FOLDER";
 export const FDC_SDK_FRAMEWORKS_ENV = "FDC_SDK_FRAMEWORKS";
@@ -168,10 +169,11 @@ export async function actuate(setup: Setup, config: Config) {
  // Otherwise, `firebase init dataconnect` will emit those stats.
  const fdcInfo = setup.featureInfo?.dataconnect;
  if (!fdcInfo) {
+ const source: Source = setup.featureInfo?.dataconnectSource || "init_sdk";
  void trackGA4(
  "dataconnect_init",
  {
- source: setup.featureInfo?.dataconnectSource || "cli_sdk",
+ source,
  project_status: setup.projectId
  ? (await isBillingEnabled(setup))
  ? "blaze"
@@ -370,7 +372,7 @@ export function addSdkGenerateToConnectorYaml(
  case Platform.FLUTTER: {
  const dartSdk: DartSDK = {
  outputDir: path.relative(connectorDir, path.join(appDir, `lib/dataconnect_generated`)),
- package: "dataconnect_generated",
+ package: "dataconnect_generated/generated.dart",
  };
  if (!isArray(generate?.dartSdk)) {
  generate.dartSdk = generate.dartSdk ? [generate.dartSdk] : [];