Fix compilation errors with secondary schemas in VSCode.

firebase-vscode/src/data-connect/config.ts

@@ -1,6 +1,6 @@
 import { isPathInside } from "./file-utils";
 import { DeepReadOnly } from "../metaprogramming";
-import { ConnectorYaml, DataConnectYaml, mainSchemaYaml } from "../../../src/dataconnect/types";
+import { ConnectorYaml, DataConnectYaml, mainSchemaYaml, secondarySchemaYamls } from "../../../src/dataconnect/types";
 import { Result, ResultValue } from "../result";
 import { computed, effect, signal } from "@preact/signals-core";
 import {
@@ -264,19 +264,27 @@ export class ResolvedDataConnectConfig {
     return this.value.connectorDirs;
   }
 
-  get schemaDir(): string {
+  get mainSchemaDir(): string {
     return mainSchemaYaml(this.value).source;
   }
 
+  get secondarySchemaDirs(): string[] {
+    return secondarySchemaYamls(this.value).map((s) => s.source);
+  }
+
   get relativePath(): string {
     if (!getConfigPath()) {
       return this.path.split("/").pop()!;
     }
     return path.relative(getConfigPath()!, this.path);
   }
 
-  get relativeSchemaPath(): string {
-    return this.schemaDir.replace(".", this.relativePath);
+  get relativeSchemaPaths(): string[] {
+    const paths = [this.mainSchemaDir.replace(".", this.relativePath)];
+    for (const secondarySchemaDir of this.secondarySchemaDirs) {
+      paths.push(secondarySchemaDir.replace(".", this.relativePath));
+    }
+    return paths;
   }
 
   get relativeConnectorPaths(): string[] {

firebase-vscode/src/data-connect/language-client.ts

@@ -95,11 +95,10 @@ export function setupLanguageClient(
     // TODO: Expand to multiple services
     const config = configs.values[0];
     const generatedPath = ".dataconnect";
-    path.join(config.relativeSchemaPath, "**", "*.gql");
-    let schemaPaths = [
-      path.join(config.relativeSchemaPath, "**", "*.gql"),
-      path.join(config.relativePath, generatedPath, "**", "*.gql"),
-    ];
+    let schemaPaths = [path.join(config.relativePath, generatedPath, "**", "*.gql")];
+    for (const relativeSchemaPath of config.relativeSchemaPaths) {
+      schemaPaths.push(path.join(relativeSchemaPath, "**", "*.gql"));
+    }
     let documentPaths = config.relativeConnectorPaths.map((connectorPath) =>
       path.join(connectorPath, "**", "*.gql"),
     );

src/dataconnect/types.ts

@@ -99,7 +99,7 @@
     file?: string;
     warningLevel?: WarningLevel;
     workarounds?: Workaround[];
     [key: string]: any;
   };
 }
 export interface BuildResult {
@@ -115,7 +115,7 @@
   };
 }
 
 export function requiresVector(dm?: DeploymentMetadata): boolean {
   return dm?.primaryDataSource?.postgres?.requiredExtensions?.includes("vector") ?? false;
 }
 
@@ -209,7 +209,7 @@
   connectorYaml: ConnectorYaml;
 }
 
 export function toDatasource(
   projectId: string,
   locationId: string,
   ds: DatasourceYaml,
@@ -248,6 +248,14 @@
   return mainSch;
 }
 
+/** Returns the secondary schema YAMLs for a Data Connect YAML */
+export function secondarySchemaYamls(dataconnectYaml: DataConnectYaml): SchemaYaml[] {
+  if (dataconnectYaml.schema) {
+    return [];
+  }
+  return (dataconnectYaml.schemas || []).filter((s) => s.id && s.id !== MAIN_SCHEMA_ID);
+}
+
 /** Returns the main schema from a list of schemas */
 export function mainSchema(schemas: Schema[]): Schema {
   const mainSch = schemas.find((s) => isMainSchema(s));
@@ -271,8 +279,8 @@
 }
 
 export interface GraphqlResponse {
   data: Record<string, any>;
   errors: any[];
 }
 
 export interface ExecuteOperationRequest {
@@ -281,11 +289,11 @@
 }
 
 export interface GraphqlResponseError {
   error: { code: number; message: string; status: string; details: any[] };
 }
 
 export const isGraphQLResponse = (g: any): g is GraphqlResponse => !!g.data || !!g.errors;
 export const isGraphQLResponseError = (g: any): g is GraphqlResponseError => !!g.error;
 
 interface ImpersonationAuthenticated {
   authClaims: any;