More minor refactoring.

Author: rkistner

packages/sync-rules/src/BucketSource.ts

@@ -1,6 +1,6 @@
 import { BucketParameterQuerier, ParameterLookup, PendingQueriers } from './BucketParameterQuerier.js';
 import { ColumnDefinition } from './ExpressionType.js';
-import { HydrationState } from './HydrationState.js';
+import { HydrationState, ParameterLookupScope } from './HydrationState.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { GetQuerierOptions } from './SqlSyncRules.js';
 import { TablePattern } from './TablePattern.js';
@@ -107,8 +107,7 @@ export interface BucketParameterLookupSourceDefinition {
    *
    * This defines the default values if no transformations are applied.
    */
-  defaultLookupName: string;
-  defaultQueryId: string;
+  readonly defaultLookupScope: ParameterLookupScope;
 
   getSourceTables(): Set<TablePattern>;
   createParameterLookupSource(params: CreateSourceParams): BucketParameterLookupSource;

packages/sync-rules/src/HydrationState.ts

@@ -45,37 +45,16 @@ export const DEFAULT_HYDRATION_STATE: HydrationState = {
     };
   },
   getParameterLookupScope(source) {
-    return {
-      lookupName: source.defaultLookupName,
-      queryId: source.defaultQueryId
-    };
+    return source.defaultLookupScope;
   }
 };
 
 export function versionedHydrationState(version: number) {
-  return new VersionedHydrationState((bucketId: string) => {
+  return new BucketIdTransformerHydrationState((bucketId: string) => {
     return `${version}#${bucketId}`;
   });
 }
 
-export class VersionedHydrationState implements HydrationState {
-  constructor(private transformer: BucketIdTransformer) {}
-
-  getBucketSourceState(source: BucketDataSourceDefinition): BucketSourceState {
-    return {
-      bucketPrefix: this.transformer(source.defaultBucketPrefix)
-    };
-  }
-
-  getParameterLookupScope(source: BucketParameterLookupSourceDefinition): ParameterLookupScope {
-    // No transformations applied here
-    return {
-      lookupName: source.defaultLookupName,
-      queryId: source.defaultQueryId
-    };
-  }
-}
-
 export class BucketIdTransformerHydrationState implements HydrationState {
   constructor(private transformer: BucketIdTransformer) {}
 
@@ -87,10 +66,7 @@ export class BucketIdTransformerHydrationState implements HydrationState {
 
   getParameterLookupScope(source: BucketParameterLookupSourceDefinition): ParameterLookupScope {
     // No transformations applied here
-    return {
-      lookupName: source.defaultLookupName,
-      queryId: source.defaultQueryId
-    };
+    return source.defaultLookupScope;
   }
 }
 

packages/sync-rules/src/SqlParameterQuery.ts

@@ -331,12 +331,11 @@ export class SqlParameterQuery
     this.querierDataSource = options.querierDataSource;
   }
 
-  public get defaultLookupName(): string {
-    return this.descriptorName;
-  }
-
-  public get defaultQueryId(): string {
-    return this.queryId;
+  public get defaultLookupScope(): ParameterLookupScope {
+    return {
+      lookupName: this.descriptorName,
+      queryId: this.queryId
+    };
   }
 
   tableSyncsParameters(table: SourceTableInterface): boolean {

packages/sync-rules/src/streams/filter.ts

@@ -539,12 +539,15 @@ export class SubqueryParameterLookupSource implements BucketParameterLookupSourc
     private parameterTable: TablePattern,
     private column: RowValueClause,
     private innerVariant: StreamVariant,
-    public readonly defaultQueryId: string,
+    private defaultQueryId: string,
     private streamName: string
   ) {}
 
-  get defaultLookupName() {
-    return this.streamName;
+  public get defaultLookupScope() {
+    return {
+      lookupName: this.streamName,
+      queryId: this.defaultQueryId
+    };
   }
 
   getSourceTables(): Set<TablePattern> {