[Bug] Fix issue #2087: Handle multiple schema files in gen-schema-vie…

…ws script
firebase · Nov 28, 2024 · 3a00cdb · 3a00cdb
1 parent 8266204
commit 3a00cdb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/firestore-bigquery-export/scripts/gen-schema-view/src/index.ts b/firestore-bigquery-export/scripts/gen-schema-view/src/index.ts
@@ -174,6 +174,7 @@ async function parseConfig(): Promise<CliConfig> {
       program.outputHelp();
       process.exit(1);
     }
+
     return {
       projectId: program.project,
       bigQueryProjectId: program.bigQueryProject,

diff --git a/firestore-bigquery-export/scripts/gen-schema-view/src/schema-loader-utils.ts b/firestore-bigquery-export/scripts/gen-schema-view/src/schema-loader-utils.ts
@@ -63,8 +63,10 @@ function resolveFilePath(filePath: string): string {
 
 function expandGlobs(globs: string[]): string[] {
   let results = [];
-  for (var i = 0; i < globs.length; i++) {
-    const globResults = glob.sync(globs[i]);
+  // Split any comma-separated globs into individual paths
+  const expandedGlobs = globs.flatMap((g) => g.split(",").map((s) => s.trim()));
+  for (const globPath of expandedGlobs) {
+    const globResults = glob.sync(globPath);
     results = results.concat(globResults);
   }
   return results;