Split out dataSource on SqlBucketDescriptor.

Author: rkistner

packages/sync-rules/src/SqlBucketDescriptor.ts

@@ -3,10 +3,7 @@ import {
   BucketDataSourceDefinition,
   BucketSource,
   BucketSourceType,
-  CreateSourceParams,
-  DebugMergedSource,
-  mergeParameterLookupSources,
-  mergeParameterQuerierSources
+  CreateSourceParams
 } from './BucketSource.js';
 import { ColumnDefinition } from './ExpressionType.js';
 import { IdSequence } from './IdSequence.js';
@@ -30,12 +27,14 @@ export interface QueryParseResult {
   errors: SqlRuleError[];
 }
 
-export class SqlBucketDescriptor implements BucketDataSourceDefinition, BucketSource {
+export class SqlBucketDescriptor implements BucketSource {
   name: string;
   private bucketParametersInternal: string[] | null = null;
 
   public readonly subscribedToByDefault: boolean = true;
 
+  private readonly dataSource = new BucketDefinitionDataSource(this);
+
   /**
    * source table -> queries
    */
@@ -58,7 +57,7 @@ export class SqlBucketDescriptor implements BucketDataSourceDefinition, BucketSo
   }
 
   get dataSources() {
-    return [this];
+    return [this.dataSource];
   }
 
   get parameterLookupSources() {
@@ -107,11 +106,51 @@ export class SqlBucketDescriptor implements BucketDataSourceDefinition, BucketSo
     };
   }
 
+  debugRepresentation() {
+    let all_parameter_queries = [...this.parameterQueries.values()].flat();
+    let all_data_queries = [...this.dataQueries.values()].flat();
+    return {
+      name: this.name,
+      type: BucketSourceType[this.type],
+      bucket_parameters: this.bucketParameters,
+      global_parameter_queries: this.globalParameterQueries.map((q) => {
+        return {
+          sql: q.sql
+        };
+      }),
+      parameter_queries: all_parameter_queries.map((q) => {
+        return {
+          sql: q.sql,
+          table: q.sourceTable,
+          input_parameters: q.inputParameters
+        };
+      }),
+      data_queries: all_data_queries.map((q) => {
+        return {
+          sql: q.sql,
+          table: q.sourceTable,
+          columns: q.columnOutputNames()
+        };
+      })
+    };
+  }
+}
+
+export class BucketDefinitionDataSource implements BucketDataSourceDefinition {
+  constructor(private descriptor: SqlBucketDescriptor) {}
+
+  /**
+   * For debug use only.
+   */
+  get bucketParameters() {
+    return this.descriptor.bucketParameters;
+  }
+
   createDataSource(params: CreateSourceParams): BucketDataSource {
     return {
       evaluateRow: (options) => {
         let results: EvaluationResult[] = [];
-        for (let query of this.dataQueries) {
+        for (let query of this.descriptor.dataQueries) {
           if (!query.applies(options.sourceTable)) {
             continue;
           }
@@ -125,20 +164,14 @@ export class SqlBucketDescriptor implements BucketDataSourceDefinition, BucketSo
 
   getSourceTables(): Set<TablePattern> {
     let result = new Set<TablePattern>();
-    for (let query of this.parameterQueries) {
-      result.add(query.sourceTable);
-    }
-    for (let query of this.dataQueries) {
+    for (let query of this.descriptor.dataQueries) {
       result.add(query.sourceTable);
     }
-
-    // Note: No physical tables for global_parameter_queries
-
     return result;
   }
 
   tableSyncsData(table: SourceTableInterface): boolean {
-    for (let query of this.dataQueries) {
+    for (let query of this.descriptor.dataQueries) {
       if (query.applies(table)) {
         return true;
       }
@@ -147,13 +180,13 @@ export class SqlBucketDescriptor implements BucketDataSourceDefinition, BucketSo
   }
 
   resolveResultSets(schema: SourceSchema, tables: Record<string, Record<string, ColumnDefinition>>) {
-    for (let query of this.dataQueries) {
+    for (let query of this.descriptor.dataQueries) {
       query.resolveResultSets(schema, tables);
     }
   }
 
   debugWriteOutputTables(result: Record<string, { query: string }[]>): void {
-    for (let q of this.dataQueries) {
+    for (let q of this.descriptor.dataQueries) {
       result[q.table!.sqlName] ??= [];
       const r = {
         query: q.sql
@@ -162,33 +195,4 @@ export class SqlBucketDescriptor implements BucketDataSourceDefinition, BucketSo
       result[q.table!.sqlName].push(r);
     }
   }
-
-  debugRepresentation() {
-    let all_parameter_queries = [...this.parameterQueries.values()].flat();
-    let all_data_queries = [...this.dataQueries.values()].flat();
-    return {
-      name: this.name,
-      type: BucketSourceType[this.type],
-      bucket_parameters: this.bucketParameters,
-      global_parameter_queries: this.globalParameterQueries.map((q) => {
-        return {
-          sql: q.sql
-        };
-      }),
-      parameter_queries: all_parameter_queries.map((q) => {
-        return {
-          sql: q.sql,
-          table: q.sourceTable,
-          input_parameters: q.inputParameters
-        };
-      }),
-      data_queries: all_data_queries.map((q) => {
-        return {
-          sql: q.sql,
-          table: q.sourceTable,
-          columns: q.columnOutputNames()
-        };
-      })
-    };
-  }
 }

packages/sync-rules/test/src/sync_rules.test.ts

@@ -34,7 +34,7 @@ bucket_definitions:
       PARSE_OPTIONS
     );
     const hydrated = rules.hydrate({ bucketIdTransformer });
-    const bucket = rules.bucketDataSources[0] as SqlBucketDescriptor;
+    const bucket = rules.bucketSources[0] as SqlBucketDescriptor;
     expect(bucket.name).toEqual('mybucket');
     expect(bucket.bucketParameters).toEqual([]);
     const dataQuery = bucket.dataQueries[0];