firebase · fredzqm · Aug 18, 2025 · Aug 7, 2025 · Aug 7, 2025 · Aug 9, 2025
diff --git a/src/dataconnect/fileUtils.ts b/src/dataconnect/fileUtils.ts
@@ -1,6 +1,7 @@
 import * as fs from "fs-extra";
 import * as path from "path";
 import * as clc from "colorette";
+import { glob } from "glob";
 
 import { FirebaseError } from "../error";
 import {
@@ -17,19 +18,19 @@
 import { load } from "./load";
 import { PackageJSON } from "../frameworks/compose/discover/runtime/node";

 export function readFirebaseJson(config?: Config): DataConnectMultiple {
  if (!config?.has("dataconnect")) {
    return [];
  }
  const validator = (cfg: any) => {
    if (!cfg["source"]) {
      throw new FirebaseError("Invalid firebase.json: DataConnect requires `source`");
    }
    return {
      source: cfg["source"],
    };
  };
  const configs = config.get("dataconnect");
  if (typeof configs === "object" && !Array.isArray(configs)) {
    return [validator(configs)];
  } else if (Array.isArray(configs)) {
@@ -41,13 +42,13 @@
  }
 }

 export async function readDataConnectYaml(sourceDirectory: string): Promise<DataConnectYaml> {
  const file = await readFileFromDirectory(sourceDirectory, "dataconnect.yaml");
  const dataconnectYaml = await wrappedSafeLoad(file.source);
  return validateDataConnectYaml(dataconnectYaml);
 }

 function validateDataConnectYaml(unvalidated: any): DataConnectYaml {
  // TODO: Use json schema for validation here!
  if (!unvalidated["location"]) {
    throw new FirebaseError("Missing required field 'location' in dataconnect.yaml");
@@ -70,15 +71,12 @@
   if (!fs.existsSync(sourceDir)) {
     return [];
   }
-  const files = await fs.readdir(sourceDir);
-  // TODO: Handle files in subdirectories such as `foo/a.gql` and `bar/baz/b.gql`.
-  return files
-    .filter((f) => f.endsWith(".gql") || f.endsWith(".graphql"))
-    .map((f) => toFile(sourceDir, f));
+  const files = await glob(`${sourceDir}/**/*.{gql,graphql}`);
+  return files.map((f) => toFile(sourceDir, f));
 }
 
-function toFile(sourceDir: string, relPath: string): File {
-  const fullPath = path.join(sourceDir, relPath);
+function toFile(sourceDir: string, fullPath: string): File {
+  const relPath = path.relative(sourceDir, fullPath);
   if (!fs.existsSync(fullPath)) {
     throw new FirebaseError(`file ${fullPath} not found`);
   }