@powersync/service-sync-rules 0.29.10 → 0.31.0

package/dist/HydratedSyncRules.js

@@ -0,0 +1,88 @@
+import { CompatibilityContext, isEvaluatedParameters, isEvaluatedRow, isEvaluationError, mergeBucketParameterQueriers, mergeDataSources, mergeParameterIndexLookupCreators } from './index.js';
+/**
+ * Hydrated sync rules is sync rule definitions along with persisted state. Currently, the persisted state
+ * specifically affects bucket names.
+ */
+export class HydratedSyncRules {
+    bucketSources = [];
+    eventDescriptors = [];
+    compatibility = CompatibilityContext.FULL_BACKWARDS_COMPATIBILITY;
+    definition;
+    innerEvaluateRow;
+    innerEvaluateParameterRow;
+    constructor(params) {
+        const hydrationState = params.createParams.hydrationState;
+        this.definition = params.definition;
+        this.innerEvaluateRow = mergeDataSources(hydrationState, params.bucketDataSources).evaluateRow;
+        this.innerEvaluateParameterRow = mergeParameterIndexLookupCreators(hydrationState, params.bucketParameterIndexLookupCreators).evaluateParameterRow;
+        if (params.eventDescriptors) {
+            this.eventDescriptors = params.eventDescriptors;
+        }
+        if (params.compatibility) {
+            this.compatibility = params.compatibility;
+        }
+        this.bucketSources = this.definition.bucketSources.map((source) => source.hydrate(params.createParams));
+    }
+    // These methods do not depend on hydration, so we can just forward them to the definition.
+    getSourceTables() {
+        return this.definition.getSourceTables();
+    }
+    tableTriggersEvent(table) {
+        return this.definition.tableTriggersEvent(table);
+    }
+    tableSyncsData(table) {
+        return this.definition.tableSyncsData(table);
+    }
+    tableSyncsParameters(table) {
+        return this.definition.tableSyncsParameters(table);
+    }
+    applyRowContext(source) {
+        return this.definition.applyRowContext(source);
+    }
+    /**
+     * Throws errors.
+     */
+    evaluateRow(options) {
+        const { results, errors } = this.evaluateRowWithErrors(options);
+        if (errors.length > 0) {
+            throw new Error(errors[0].error);
+        }
+        return results;
+    }
+    evaluateRowWithErrors(options) {
+        const rawResults = this.innerEvaluateRow(options);
+        const results = rawResults.filter(isEvaluatedRow);
+        const errors = rawResults.filter(isEvaluationError);
+        return { results, errors };
+    }
+    /**
+     * Throws errors.
+     */
+    evaluateParameterRow(table, row) {
+        const { results, errors } = this.evaluateParameterRowWithErrors(table, row);
+        if (errors.length > 0) {
+            throw new Error(errors[0].error);
+        }
+        return results;
+    }
+    evaluateParameterRowWithErrors(table, row) {
+        const rawResults = this.innerEvaluateParameterRow(table, row);
+        const results = rawResults.filter(isEvaluatedParameters);
+        const errors = rawResults.filter(isEvaluationError);
+        return { results, errors };
+    }
+    getBucketParameterQuerier(options) {
+        const queriers = [];
+        const errors = [];
+        const pending = { queriers, errors };
+        for (const source of this.bucketSources) {
+            if ((source.definition.subscribedToByDefault && options.hasDefaultStreams) ||
+                source.definition.name in options.streams) {
+                source.pushBucketParameterQueriers(pending, options);
+            }
+        }
+        const querier = mergeBucketParameterQueriers(queriers);
+        return { querier, errors };
+    }
+}
+//# sourceMappingURL=HydratedSyncRules.js.map

package/dist/HydratedSyncRules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HydratedSyncRules.js","sourceRoot":"","sources":["../src/HydratedSyncRules.ts"],"names":[],"mappings":"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"}

package/dist/HydrationState.d.ts

@@ -0,0 +1,45 @@
+import { BucketDataSource, ParameterIndexLookupCreator } from './BucketSource.js';
+export interface BucketDataScope {
+    /** The prefix is the bucket name before the parameters. */
+    bucketPrefix: string;
+}
+export interface ParameterLookupScope {
+    /** The lookup name + queryid is used to reference the parameter lookup record. */
+    lookupName: string;
+    queryId: string;
+}
+/**
+ * Hydration state information for a source.
+ *
+ * This is what keeps track of bucket name and parameter lookup mappings for hydration. This can be used
+ * both to re-use mappings across hydrations of different sync rule versions, or to generate new mappings.
+ */
+export interface HydrationState {
+    /**
+     * Given a bucket data source definition, get the bucket prefix to use for it.
+     */
+    getBucketSourceScope(source: BucketDataSource): BucketDataScope;
+    /**
+     * Given a bucket parameter lookup definition, get the persistence name to use.
+     */
+    getParameterIndexLookupScope(source: ParameterIndexLookupCreator): ParameterLookupScope;
+}
+/**
+ * This represents hydration state that performs no transformations.
+ *
+ * This is the legacy default behavior with no bucket versioning.
+ */
+export declare const DEFAULT_HYDRATION_STATE: HydrationState;
+/**
+ * Transforms bucket ids generated when evaluating the row by e.g. encoding version information.
+ *
+ * Because buckets are recreated on a sync rule redeploy, it makes sense to use different bucket ids (otherwise, clients
+ * may run into checksum errors causing a sync to take longer than necessary or breaking progress).
+ *
+ * So, this transformer receives the original bucket id as generated by defined sync rules, and can prepend a version
+ * identifier.
+ *
+ * Note that this transformation has not been present in older versions of the sync service. To preserve backwards
+ * compatibility, sync rules will not use this without an opt-in.
+ */
+export declare function versionedHydrationState(version: number): HydrationState;

package/dist/HydrationState.js

@@ -0,0 +1,41 @@
+/**
+ * This represents hydration state that performs no transformations.
+ *
+ * This is the legacy default behavior with no bucket versioning.
+ */
+export const DEFAULT_HYDRATION_STATE = {
+    getBucketSourceScope(source) {
+        return {
+            bucketPrefix: source.uniqueName
+        };
+    },
+    getParameterIndexLookupScope(source) {
+        return source.defaultLookupScope;
+    }
+};
+/**
+ * Transforms bucket ids generated when evaluating the row by e.g. encoding version information.
+ *
+ * Because buckets are recreated on a sync rule redeploy, it makes sense to use different bucket ids (otherwise, clients
+ * may run into checksum errors causing a sync to take longer than necessary or breaking progress).
+ *
+ * So, this transformer receives the original bucket id as generated by defined sync rules, and can prepend a version
+ * identifier.
+ *
+ * Note that this transformation has not been present in older versions of the sync service. To preserve backwards
+ * compatibility, sync rules will not use this without an opt-in.
+ */
+export function versionedHydrationState(version) {
+    return {
+        getBucketSourceScope(source) {
+            return {
+                bucketPrefix: `${version}#${source.uniqueName}`
+            };
+        },
+        getParameterIndexLookupScope(source) {
+            // No transformations applied here
+            return source.defaultLookupScope;
+        }
+    };
+}
+//# sourceMappingURL=HydrationState.js.map

package/dist/HydrationState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HydrationState.js","sourceRoot":"","sources":["../src/HydrationState.ts"],"names":[],"mappings":"AA+BA;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAmB;IACrD,oBAAoB,CAAC,MAAwB;QAC3C,OAAO;YACL,YAAY,EAAE,MAAM,CAAC,UAAU;SAChC,CAAC;IACJ,CAAC;IACD,4BAA4B,CAAC,MAAM;QACjC,OAAO,MAAM,CAAC,kBAAkB,CAAC;IACnC,CAAC;CACF,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe;IACrD,OAAO;QACL,oBAAoB,CAAC,MAAwB;YAC3C,OAAO;gBACL,YAAY,EAAE,GAAG,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE;aAChD,CAAC;QACJ,CAAC;QAED,4BAA4B,CAAC,MAAmC;YAC9D,kCAAkC;YAClC,OAAO,MAAM,CAAC,kBAAkB,CAAC;QACnC,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/SqlBucketDescriptor.d.ts

@@ -1,18 +1,16 @@
-import { BucketInclusionReason, ResolvedBucket } from './BucketDescription.js';
-import { BucketParameterQuerier, PendingQueriers } from './BucketParameterQuerier.js';
-import { BucketSource, BucketSourceType } from './BucketSource.js';
+import { BucketDataSource, BucketSource, BucketSourceType, CreateSourceParams, HydratedBucketSource } from './BucketSource.js';
 import { ColumnDefinition } from './ExpressionType.js';
 import { IdSequence } from './IdSequence.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { SqlDataQuery } from './SqlDataQuery.js';
 import { SqlParameterQuery } from './SqlParameterQuery.js';
-import { GetQuerierOptions, SyncRulesOptions } from './SqlSyncRules.js';
+import { SyncRulesOptions } from './SqlSyncRules.js';
 import { StaticSqlParameterQuery } from './StaticSqlParameterQuery.js';
 import { TablePattern } from './TablePattern.js';
 import { TableValuedFunctionSqlParameterQuery } from './TableValuedFunctionSqlParameterQuery.js';
-import { SqlRuleError } from './errors.js';
 import { CompatibilityContext } from './compatibility.js';
-import { BucketIdTransformer, EvaluatedParametersResult, EvaluateRowOptions, EvaluationResult, QueryParseOptions, RequestParameters, SourceSchema, SqliteRow } from './types.js';
+import { SqlRuleError } from './errors.js';
+import { EvaluateRowOptions, QueryParseOptions, SourceSchema, UnscopedEvaluationResult } from './types.js';
 export interface QueryParseResult {
     /**
      * True if parsed in some form, even if there are errors.
@@ -22,10 +20,9 @@ export interface QueryParseResult {
 }
 export declare class SqlBucketDescriptor implements BucketSource {
     name: string;
-    bucketParameters?: string[];
-    constructor(name: string);
-    get type(): BucketSourceType;
-    get subscribedToByDefault(): boolean;
+    private bucketParametersInternal;
+    readonly subscribedToByDefault: boolean;
+    private readonly dataSource;
     /**
      * source table -> queries
      */
@@ -33,29 +30,18 @@ export declare class SqlBucketDescriptor implements BucketSource {
     parameterQueries: SqlParameterQuery[];
     globalParameterQueries: (StaticSqlParameterQuery | TableValuedFunctionSqlParameterQuery)[];
     parameterIdSequence: IdSequence;
+    constructor(name: string);
+    get type(): BucketSourceType;
+    get bucketParameters(): string[];
+    get dataSources(): BucketDefinitionDataSource[];
+    get parameterIndexLookupCreators(): SqlParameterQuery[];
+    get parameterQuerierSources(): (StaticSqlParameterQuery | TableValuedFunctionSqlParameterQuery | SqlParameterQuery)[];
     addDataQuery(sql: string, options: SyncRulesOptions, compatibility: CompatibilityContext): QueryParseResult;
     addParameterQuery(sql: string, options: QueryParseOptions): QueryParseResult;
-    evaluateRow(options: EvaluateRowOptions): EvaluationResult[];
-    evaluateParameterRow(sourceTable: SourceTableInterface, row: SqliteRow): EvaluatedParametersResult[];
-    /**
-     * @deprecated Use `pushBucketParameterQueriers` instead and merge at the top-level.
-     */
-    getBucketParameterQuerier(options: GetQuerierOptions): BucketParameterQuerier;
-    pushBucketParameterQueriers(result: PendingQueriers, options: GetQuerierOptions): void;
-    getStaticBucketDescriptions(parameters: RequestParameters, reasons: BucketInclusionReason[], transformer: BucketIdTransformer): ResolvedBucket[];
-    hasDynamicBucketQueries(): boolean;
-    getSourceTables(): Set<TablePattern>;
-    private bucketInclusionReason;
-    tableSyncsData(table: SourceTableInterface): boolean;
-    tableSyncsParameters(table: SourceTableInterface): boolean;
-    resolveResultSets(schema: SourceSchema, tables: Record<string, Record<string, ColumnDefinition>>): void;
-    debugWriteOutputTables(result: Record<string, {
-        query: string;
-    }[]>): void;
     debugRepresentation(): {
         name: string;
         type: string;
-        bucket_parameters: string[] | undefined;
+        bucket_parameters: string[];
         global_parameter_queries: {
             sql: string;
         }[];
@@ -70,4 +56,21 @@ export declare class SqlBucketDescriptor implements BucketSource {
             columns: string[];
         }[];
     };
+    hydrate(params: CreateSourceParams): HydratedBucketSource;
+}
+export declare class BucketDefinitionDataSource implements BucketDataSource {
+    private descriptor;
+    constructor(descriptor: SqlBucketDescriptor);
+    /**
+     * For debug use only.
+     */
+    get bucketParameters(): string[];
+    get uniqueName(): string;
+    evaluateRow(options: EvaluateRowOptions): UnscopedEvaluationResult[];
+    getSourceTables(): Set<TablePattern>;
+    tableSyncsData(table: SourceTableInterface): boolean;
+    resolveResultSets(schema: SourceSchema, tables: Record<string, Record<string, ColumnDefinition>>): void;
+    debugWriteOutputTables(result: Record<string, {
+        query: string;
+    }[]>): void;
 }

package/dist/SqlBucketDescriptor.js

@@ -1,20 +1,12 @@
-import { mergeBucketParameterQueriers } from './BucketParameterQuerier.js';
 import { BucketSourceType } from './BucketSource.js';
 import { IdSequence } from './IdSequence.js';
 import { SqlDataQuery } from './SqlDataQuery.js';
 import { SqlParameterQuery } from './SqlParameterQuery.js';
 export class SqlBucketDescriptor {
     name;
-    bucketParameters;
-    constructor(name) {
-        this.name = name;
-    }
-    get type() {
-        return BucketSourceType.SYNC_RULE;
-    }
-    get subscribedToByDefault() {
-        return true;
-    }
+    bucketParametersInternal = null;
+    subscribedToByDefault = true;
+    dataSource = new BucketDefinitionDataSource(this);
     /**
      * source table -> queries
      */
@@ -22,11 +14,29 @@ export class SqlBucketDescriptor {
     parameterQueries = [];
     globalParameterQueries = [];
     parameterIdSequence = new IdSequence();
+    constructor(name) {
+        this.name = name;
+    }
+    get type() {
+        return BucketSourceType.SYNC_RULE;
+    }
+    get bucketParameters() {
+        return this.bucketParametersInternal ?? [];
+    }
+    get dataSources() {
+        return [this.dataSource];
+    }
+    get parameterIndexLookupCreators() {
+        return this.parameterQueries;
+    }
+    get parameterQuerierSources() {
+        return [...this.parameterQueries, ...this.globalParameterQueries];
+    }
     addDataQuery(sql, options, compatibility) {
-        if (this.bucketParameters == null) {
+        if (this.bucketParametersInternal == null) {
             throw new Error('Bucket parameters must be defined');
         }
-        const dataRows = SqlDataQuery.fromSql(this.name, this.bucketParameters, sql, options, compatibility);
+        const dataRows = SqlDataQuery.fromSql(this.bucketParametersInternal, sql, options, compatibility);
         this.dataQueries.push(dataRows);
         return {
             parsed: true,
@@ -34,12 +44,13 @@ export class SqlBucketDescriptor {
         };
     }
     addParameterQuery(sql, options) {
-        const parameterQuery = SqlParameterQuery.fromSql(this.name, sql, options, this.parameterIdSequence.nextId());
-        if (this.bucketParameters == null) {
-            this.bucketParameters = parameterQuery.bucketParameters;
+        const parameterQuery = SqlParameterQuery.fromSql(this.name, sql, options, this.parameterIdSequence.nextId(), this.dataSource);
+        if (this.bucketParametersInternal == null) {
+            this.bucketParametersInternal = parameterQuery.bucketParameters;
         }
         else {
-            if (new Set([...parameterQuery.bucketParameters, ...this.bucketParameters]).size != this.bucketParameters.length) {
+            if (new Set([...parameterQuery.bucketParameters, ...this.bucketParametersInternal]).size !=
+                this.bucketParametersInternal.length) {
                 throw new Error('Bucket parameters must match for each parameter query within a bucket');
             }
         }
@@ -54,89 +65,83 @@ export class SqlBucketDescriptor {
             errors: parameterQuery.errors
         };
     }
-    evaluateRow(options) {
-        let results = [];
-        for (let query of this.dataQueries) {
-            if (!query.applies(options.sourceTable)) {
-                continue;
-            }
-            results.push(...query.evaluateRow(options.sourceTable, options.record, options.bucketIdTransformer));
-        }
-        return results;
+    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()
+                };
+            })
+        };
     }
-    evaluateParameterRow(sourceTable, row) {
-        let results = [];
-        for (let query of this.parameterQueries) {
-            if (query.applies(sourceTable)) {
-                results.push(...query.evaluateParameterRow(row));
+    hydrate(params) {
+        const hydratedParameterQueriers = this.parameterQueries.map((querier) => querier.createParameterQuerierSource(params));
+        const hydratedGlobalParameterQueriers = this.globalParameterQueries.map((querier) => querier.createParameterQuerierSource(params));
+        return {
+            definition: this,
+            pushBucketParameterQueriers: (result, options) => {
+                for (let querier of hydratedParameterQueriers) {
+                    querier.pushBucketParameterQueriers(result, options);
+                }
+                for (let querier of hydratedGlobalParameterQueriers) {
+                    querier.pushBucketParameterQueriers(result, options);
+                }
             }
-        }
-        return results;
+        };
+    }
+}
+export class BucketDefinitionDataSource {
+    descriptor;
+    constructor(descriptor) {
+        this.descriptor = descriptor;
     }
     /**
-     * @deprecated Use `pushBucketParameterQueriers` instead and merge at the top-level.
+     * For debug use only.
      */
-    getBucketParameterQuerier(options) {
-        const queriers = [];
-        this.pushBucketParameterQueriers({ queriers, errors: [] }, options);
-        return mergeBucketParameterQueriers(queriers);
-    }
-    pushBucketParameterQueriers(result, options) {
-        const reasons = [this.bucketInclusionReason()];
-        const staticBuckets = this.getStaticBucketDescriptions(options.globalParameters, reasons, options.bucketIdTransformer);
-        const staticQuerier = {
-            staticBuckets,
-            hasDynamicBuckets: false,
-            parameterQueryLookups: [],
-            queryDynamicBucketDescriptions: async () => []
-        };
-        result.queriers.push(staticQuerier);
-        if (this.parameterQueries.length == 0) {
-            return;
-        }
-        const dynamicQueriers = this.parameterQueries.map((query) => query.getBucketParameterQuerier(options.globalParameters, reasons, options.bucketIdTransformer));
-        result.queriers.push(...dynamicQueriers);
+    get bucketParameters() {
+        return this.descriptor.bucketParameters;
+    }
+    get uniqueName() {
+        return this.descriptor.name;
     }
-    getStaticBucketDescriptions(parameters, reasons, transformer) {
+    evaluateRow(options) {
         let results = [];
-        for (let query of this.globalParameterQueries) {
-            for (const desc of query.getStaticBucketDescriptions(parameters, transformer)) {
-                results.push({
-                    ...desc,
-                    definition: this.name,
-                    inclusion_reasons: reasons
-                });
+        for (let query of this.descriptor.dataQueries) {
+            if (!query.applies(options.sourceTable)) {
+                continue;
             }
+            results.push(...query.evaluateRow(options.sourceTable, options.record));
         }
         return results;
     }
-    hasDynamicBucketQueries() {
-        return this.parameterQueries.length > 0;
-    }
     getSourceTables() {
         let result = new Set();
-        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;
     }
-    bucketInclusionReason() {
-        return 'default';
-    }
     tableSyncsData(table) {
-        for (let query of this.dataQueries) {
-            if (query.applies(table)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    tableSyncsParameters(table) {
-        for (let query of this.parameterQueries) {
+        for (let query of this.descriptor.dataQueries) {
             if (query.applies(table)) {
                 return true;
             }
@@ -144,12 +149,12 @@ export class SqlBucketDescriptor {
         return false;
     }
     resolveResultSets(schema, tables) {
-        for (let query of this.dataQueries) {
+        for (let query of this.descriptor.dataQueries) {
             query.resolveResultSets(schema, tables);
         }
     }
     debugWriteOutputTables(result) {
-        for (let q of this.dataQueries) {
+        for (let q of this.descriptor.dataQueries) {
             result[q.table.sqlName] ??= [];
             const r = {
                 query: q.sql
@@ -157,33 +162,5 @@ export class SqlBucketDescriptor {
             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()
-                };
-            })
-        };
-    }
 }
 //# sourceMappingURL=SqlBucketDescriptor.js.map

package/dist/SqlBucketDescriptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlBucketDescriptor.js","sourceRoot":"","sources":["../src/SqlBucketDescriptor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqlBucketDescriptor.js","sourceRoot":"","sources":["../src/SqlBucketDescriptor.ts"],"names":[],"mappings":"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"}

package/dist/SqlDataQuery.d.ts

@@ -1,13 +1,13 @@
 import { BaseSqlDataQuery, BaseSqlDataQueryOptions } from './BaseSqlDataQuery.js';
+import { CompatibilityContext } from './compatibility.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { SyncRulesOptions } from './SqlSyncRules.js';
-import { BucketIdTransformer, EvaluationResult, ParameterMatchClause, SqliteRow } from './types.js';
-import { CompatibilityContext } from './compatibility.js';
+import { ParameterMatchClause, UnscopedEvaluationResult, SqliteRow } from './types.js';
 export interface SqlDataQueryOptions extends BaseSqlDataQueryOptions {
     filter: ParameterMatchClause;
 }
 export declare class SqlDataQuery extends BaseSqlDataQuery {
-    static fromSql(descriptorName: string, bucketParameters: string[], sql: string, options: SyncRulesOptions, compatibility: CompatibilityContext): SqlDataQuery;
+    static fromSql(bucketParameters: string[], sql: string, options: SyncRulesOptions, compatibility: CompatibilityContext): SqlDataQuery;
     /**
      * The query WHERE clause.
      *
@@ -17,5 +17,5 @@ export declare class SqlDataQuery extends BaseSqlDataQuery {
      */
     readonly filter: ParameterMatchClause;
     constructor(options: SqlDataQueryOptions);
-    evaluateRow(table: SourceTableInterface, row: SqliteRow, bucketIdTransformer: BucketIdTransformer): EvaluationResult[];
+    evaluateRow(table: SourceTableInterface, row: SqliteRow): UnscopedEvaluationResult[];
 }

package/dist/SqlDataQuery.js

@@ -7,9 +7,9 @@ import { AvailableTable, SqlTools } from './sql_filters.js';
 import { checkUnsupportedFeatures, isClauseError } from './sql_support.js';
 import { TablePattern } from './TablePattern.js';
 import { TableQuerySchema } from './TableQuerySchema.js';
-import { getBucketId, isSelectStatement } from './utils.js';
+import { isSelectStatement, serializeBucketParameters } from './utils.js';
 export class SqlDataQuery extends BaseSqlDataQuery {
-    static fromSql(descriptorName, bucketParameters, sql, options, compatibility) {
+    static fromSql(bucketParameters, sql, options, compatibility) {
         const parsed = parse(sql, { locationTracking: true });
         const schema = options.schema;
         let errors = [];
@@ -131,7 +131,6 @@ export class SqlDataQuery extends BaseSqlDataQuery {
             sql,
             filter,
             columns: q.columns ?? [],
-            descriptorName,
             bucketParameters,
             tools,
             errors,
@@ -150,13 +149,13 @@ export class SqlDataQuery extends BaseSqlDataQuery {
         super(options);
         this.filter = options.filter;
     }
-    evaluateRow(table, row, bucketIdTransformer) {
+    evaluateRow(table, row) {
         return this.evaluateRowWithOptions({
             table,
             row,
-            bucketIds: (tables) => {
+            serializedBucketParameters: (tables) => {
                 const bucketParameters = this.filter.filterRow(tables);
-                return bucketParameters.map((params) => getBucketId(this.descriptorName, this.bucketParameters, params, bucketIdTransformer));
+                return bucketParameters.map((params) => serializeBucketParameters(this.bucketParameters, params));
             }
         });
     }