Rename command to firebase init dataconnect:resolver.

Author: rosalyntan

src/commands/init.ts

@@ -95,8 +95,8 @@ let choices: {
     hidden: true,
   },
   {
-    value: "dataconnect:schema",
-    name: "Data Connect: Set up a secondary schema for your Firebase Data Connect service",
+    value: "dataconnect:resolver",
+    name: "Data Connect: Set up a custom resolver for your Firebase Data Connect service",
     checked: false,
     hidden: true,
   },

…init/features/dataconnect/schema.spec.ts …it/features/dataconnect/resolver.spec.tssrc/init/features/dataconnect/schema.spec.ts renamed to src/init/features/dataconnect/resolver.spec.ts src/init/features/dataconnect/schema.spec.ts renamed to src/init/features/dataconnect/resolver.spec.ts

@@ -4,7 +4,12 @@ import * as fs from "fs-extra";
 import * as yaml from "js-yaml";
 import * as sinon from "sinon";
 
-import { addSchemaToDataConnectYaml, askQuestions, actuate, SchemaRequiredInfo } from "./schema";
+import {
+  addSchemaToDataConnectYaml,
+  askQuestions,
+  actuate,
+  ResolverRequiredInfo,
+} from "./resolver";
 import { Setup } from "../..";
 import { Config } from "../../../config";
 import * as load from "../../../dataconnect/load";
@@ -15,7 +20,7 @@ import * as prompt from "../../../prompt";
 const expect = chai.expect;
 
 describe("addSchemaToDataConnectYaml", () => {
-  let schemaRequiredInfo: SchemaRequiredInfo;
+  let schemaRequiredInfo: ResolverRequiredInfo;
   let dataConnectYaml: DataConnectYaml;
 
   beforeEach(() => {
@@ -156,9 +161,9 @@ describe("askQuestions", () => {
 
     expect(selectStub.called).to.be.false;
     expect(inputStub.calledTwice).to.be.true;
-    expect(setup.featureInfo?.dataconnectSchema?.id).to.equal("test_resolver");
-    expect(setup.featureInfo?.dataconnectSchema?.uri).to.equal("www.test.com");
-    expect(setup.featureInfo?.dataconnectSchema?.serviceInfo.serviceName).to.equal(
+    expect(setup.featureInfo?.dataconnectResolver?.id).to.equal("test_resolver");
+    expect(setup.featureInfo?.dataconnectResolver?.uri).to.equal("www.test.com");
+    expect(setup.featureInfo?.dataconnectResolver?.serviceInfo.serviceName).to.equal(
       "projects/project-id/locations/us-central1/services/service-id",
     );
   });
@@ -183,9 +188,9 @@ describe("askQuestions", () => {
 
     expect(selectStub.calledOnce).to.be.true;
     expect(inputStub.calledTwice).to.be.true;
-    expect(setup.featureInfo?.dataconnectSchema?.id).to.equal("test_resolver");
-    expect(setup.featureInfo?.dataconnectSchema?.uri).to.equal("www.test.com");
-    expect(setup.featureInfo?.dataconnectSchema?.serviceInfo.serviceName).to.equal(
+    expect(setup.featureInfo?.dataconnectResolver?.id).to.equal("test_resolver");
+    expect(setup.featureInfo?.dataconnectResolver?.uri).to.equal("www.test.com");
+    expect(setup.featureInfo?.dataconnectResolver?.serviceInfo.serviceName).to.equal(
       "projects/project-id/locations/us-central1/services/service-id2",
     );
   });
@@ -207,7 +212,7 @@ describe("actuate", () => {
       config: { projectDir: "/path/to/project" } as any,
       rcfile: {} as any,
       featureInfo: {
-        dataconnectSchema: {
+        dataconnectResolver: {
           id: "test_resolver",
           uri: "www.test.com",
           serviceInfo: {

src/init/features/dataconnect/schema.ts src/init/features/dataconnect/resolver.tssrc/init/features/dataconnect/schema.ts renamed to src/init/features/dataconnect/resolver.ts

@@ -16,7 +16,7 @@ import { isBillingEnabled } from "../../../gcp/cloudbilling";
 import { trackGA4 } from "../../../track";
 import { Source } from ".";
 
-export interface SchemaRequiredInfo {
+export interface ResolverRequiredInfo {
   id: string;
   uri: string;
   serviceInfo: ServiceInfo;
@@ -26,7 +26,7 @@ export async function askQuestions(setup: Setup, config: Config): Promise<void>
   if (!experiments.isEnabled("fdcwebhooks")) {
     throw new Error("Unsupported command.");
   }
-  const schemaInfo: SchemaRequiredInfo = {
+  const resolverInfo: ResolverRequiredInfo = {
     id: "",
     uri: "",
     serviceInfo: {} as ServiceInfo,
@@ -38,7 +38,7 @@ export async function askQuestions(setup: Setup, config: Config): Promise<void>
       `No Firebase Data Connect workspace found. Run ${clc.bold("firebase init dataconnect")} to set up a service and main schema.`,
     );
   } else if (serviceInfos.length === 1) {
-    schemaInfo.serviceInfo = serviceInfos[0];
+    resolverInfo.serviceInfo = serviceInfos[0];
   } else {
     const choices: Array<{ name: string; value: ServiceInfo }> = serviceInfos.map((si) => {
       const serviceName = parseServiceName(si.serviceName);
@@ -47,41 +47,41 @@ export async function askQuestions(setup: Setup, config: Config): Promise<void>
         value: si,
       };
     });
-    schemaInfo.serviceInfo = await select<ServiceInfo>({
-      message: "Which service would you like to set up a secondary schema for?",
+    resolverInfo.serviceInfo = await select<ServiceInfo>({
+      message: "Which service would you like to set up a custom resolver for?",
       choices,
     });
   }
 
-  schemaInfo.id = await input({
-    message: `What ID would you like to use for your secondary schema?`,
+  resolverInfo.id = await input({
+    message: `What ID would you like to use for your custom resolver?`,
     default: newUniqueId(
       `resolver`,
-      schemaInfo.serviceInfo.dataConnectYaml.schemas?.map((sch) => sch.id || "") || [],
+      resolverInfo.serviceInfo.dataConnectYaml.schemas?.map((sch) => sch.id || "") || [],
     ),
   });
-  schemaInfo.uri = await input({
-    message: `What is the URL of your Cloud Run data source that implements your secondary schema?`,
-    default: `https://${schemaInfo.id}-${setup.projectNumber || "PROJECT_NUMBER"}.${FDC_DEFAULT_REGION}.run.app/graphql`,
+  resolverInfo.uri = await input({
+    message: `What is the URL of your Cloud Run data source that implements your custom resolver?`,
+    default: `https://${resolverInfo.id}-${setup.projectNumber || "PROJECT_NUMBER"}.${FDC_DEFAULT_REGION}.run.app/graphql`,
   });
 
   setup.featureInfo = setup.featureInfo || {};
-  setup.featureInfo.dataconnectSchema = schemaInfo;
+  setup.featureInfo.dataconnectResolver = resolverInfo;
 }
 
 export async function actuate(setup: Setup, config: Config) {
   if (!experiments.isEnabled("fdcwebhooks")) {
     return;
   }
-  const schemaInfo = setup.featureInfo?.dataconnectSchema;
-  if (!schemaInfo) {
-    throw new Error("Data Connect schema feature SchemaRequiredInfo not provided");
+  const resolverInfo = setup.featureInfo?.dataconnectResolver;
+  if (!resolverInfo) {
+    throw new Error("Data Connect resolver feature ResolverRequiredInfo not provided");
   }
   const startTime = Date.now();
   try {
-    actuateWithInfo(config, schemaInfo);
+    actuateWithInfo(config, resolverInfo);
   } finally {
-    const source: Source = "init_schema";
+    const source: Source = "init_resolver";
     void trackGA4(
       "dataconnect_init",
       {
@@ -98,7 +98,7 @@ export async function actuate(setup: Setup, config: Config) {
   }
 }
 
-function actuateWithInfo(config: Config, info: SchemaRequiredInfo) {
+function actuateWithInfo(config: Config, info: ResolverRequiredInfo) {
   const dataConnectYaml = JSON.parse(
     JSON.stringify(info.serviceInfo?.dataConnectYaml),
   ) as DataConnectYaml;
@@ -118,7 +118,7 @@ function actuateWithInfo(config: Config, info: SchemaRequiredInfo) {
 /** Add secondary schema configuration to dataconnect.yaml in place */
 export function addSchemaToDataConnectYaml(
   dataConnectYaml: DataConnectYaml,
-  info: SchemaRequiredInfo,
+  info: ResolverRequiredInfo,
 ): void {
   const secondarySchema: SchemaYaml = {
     source: `./schema_${info.id}`,

src/init/features/index.ts

@@ -38,10 +38,10 @@ export {
   actuate as dataconnectSdkActuate,
 } from "./dataconnect/sdk";
 export {
-  askQuestions as dataconnectSchemaAskQuestions,
-  SchemaRequiredInfo as DataconnectSchemaInfo,
-  actuate as dataconnectSchemaActuate,
-} from "./dataconnect/schema";
+  askQuestions as dataconnectResolverAskQuestions,
+  ResolverRequiredInfo as DataconnectResolverInfo,
+  actuate as dataconnectResolverActuate,
+} from "./dataconnect/resolver";
 export { doSetup as apphosting } from "./apphosting";
 export { doSetup as genkit } from "./genkit";
 export {

src/init/index.ts

@@ -37,7 +37,7 @@ export interface SetupInfo {
   firestore?: features.FirestoreInfo;
   dataconnect?: features.DataconnectInfo;
   dataconnectSdk?: features.DataconnectSdkInfo;
-  dataconnectSchema?: features.DataconnectSchemaInfo;
+  dataconnectResolver?: features.DataconnectResolverInfo;
   dataconnectSource?: features.DataconnectSource;
   storage?: features.StorageInfo;
   apptesting?: features.ApptestingInfo;
@@ -83,9 +83,9 @@ const featuresList: Feature[] = [
     actuate: features.dataconnectSdkActuate,
   },
   {
-    name: "dataconnect:schema",
-    askQuestions: features.dataconnectSchemaAskQuestions,
-    actuate: features.dataconnectSchemaActuate,
+    name: "dataconnect:resolver",
+    askQuestions: features.dataconnectResolverAskQuestions,
+    actuate: features.dataconnectResolverActuate,
   },
   { name: "functions", doSetup: features.functions },
   {