@powersync/service-sync-rules 0.29.9 → 0.30.0

package/dist/sync_plan/serialize.js

@@ -0,0 +1,209 @@
+import { TablePattern } from '../TablePattern.js';
+/**
+ * Serializes a sync plan into a simple JSON object.
+ *
+ * While {@link SyncPlan}s are already serializable for the most part, it contains a graph of references from e.g.
+ * queriers to bucket creators. To represent this efficiently, we assign numbers to referenced elements while
+ * serializing instead of duplicating definitions.
+ */
+export function serializeSyncPlan(plan) {
+    const dataSourceIndex = new Map();
+    const bucketIndex = new Map();
+    const parameterIndex = new Map();
+    const expandingLookups = new Map();
+    function serializeTablePattern(pattern) {
+        return {
+            connection: pattern.connectionTag,
+            schema: pattern.schema,
+            table: pattern.tablePattern
+        };
+    }
+    function serializeDataSources() {
+        return plan.dataSources.map((source, i) => {
+            dataSourceIndex.set(source, i);
+            return {
+                hash: source.hashCode,
+                table: serializeTablePattern(source.sourceTable),
+                outputTableName: source.outputTableName,
+                filters: source.filters,
+                partitionBy: source.parameters,
+                columns: source.columns
+            };
+        });
+    }
+    function serializeParameterIndexes() {
+        return plan.parameterIndexes.map((source, i) => {
+            parameterIndex.set(source, i);
+            return {
+                hash: source.hashCode,
+                table: serializeTablePattern(source.sourceTable),
+                filters: source.filters,
+                partitionBy: source.parameters,
+                output: source.outputs,
+                lookupScope: source.defaultLookupScope
+            };
+        });
+    }
+    function serializeParameterValue(value) {
+        if (value.type == 'request') {
+            return { type: 'request', expr: value.expr };
+        }
+        else if (value.type == 'lookup') {
+            return { type: 'lookup', lookup: expandingLookups.get(value.lookup), resultIndex: value.resultIndex };
+        }
+        else {
+            return { type: 'intersection', values: value.values.map(serializeParameterValue) };
+        }
+    }
+    function serializeStreamQuerier(source) {
+        const stages = [];
+        source.lookupStages.map((stage, stageIndex) => {
+            stages.push(stage.map((e, indexInStage) => {
+                const ref = {
+                    stageId: stageIndex,
+                    idInStage: indexInStage
+                };
+                let mapped;
+                if (e.type == 'parameter') {
+                    mapped = {
+                        type: 'parameter',
+                        lookup: parameterIndex.get(e.lookup),
+                        instantiation: e.instantiation.map(serializeParameterValue)
+                    };
+                }
+                else {
+                    mapped = {
+                        type: 'table_valued',
+                        functionName: e.functionName,
+                        functionInputs: e.functionInputs,
+                        outputs: e.outputs,
+                        filters: e.filters
+                    };
+                }
+                expandingLookups.set(e, ref);
+                return mapped;
+            }));
+        });
+        return {
+            requestFilters: source.requestFilters,
+            lookupStages: stages,
+            bucket: bucketIndex.get(source.bucket),
+            sourceInstantiation: source.sourceInstantiation.map(serializeParameterValue)
+        };
+    }
+    return {
+        version: 'unstable', // TODO: Mature to 1 before storing in bucket storage
+        dataSources: serializeDataSources(),
+        buckets: plan.buckets.map((bkt, index) => {
+            bucketIndex.set(bkt, index);
+            return {
+                hash: bkt.hashCode,
+                uniqueName: bkt.uniqueName,
+                sources: bkt.sources.map((e) => dataSourceIndex.get(e))
+            };
+        }),
+        parameterIndexes: serializeParameterIndexes(),
+        streams: plan.streams.map((s) => ({
+            stream: s.stream,
+            queriers: s.queriers.map(serializeStreamQuerier)
+        }))
+    };
+}
+export function deserializeSyncPlan(serialized) {
+    // TODO: Mature to version 1
+    if (serialized.version != 'unstable') {
+        throw new Error('Unknown sync plan version passed to deserializeSyncPlan()');
+    }
+    function deserializeTablePattern(pattern) {
+        return new TablePattern(`${pattern.connection}.${pattern.schema}`, pattern.table);
+    }
+    const plan = serialized;
+    const dataSources = plan.dataSources.map((source) => {
+        return {
+            hashCode: source.hash,
+            sourceTable: deserializeTablePattern(source.table),
+            outputTableName: source.outputTableName,
+            filters: source.filters,
+            parameters: source.partitionBy,
+            columns: source.columns
+        };
+    });
+    const buckets = plan.buckets.map((bkt) => {
+        return {
+            hashCode: bkt.hash,
+            uniqueName: bkt.uniqueName,
+            sources: bkt.sources.map((idx) => dataSources[idx])
+        };
+    });
+    const parameterIndexes = plan.parameterIndexes.map((source) => {
+        return {
+            hashCode: source.hash,
+            sourceTable: deserializeTablePattern(source.table),
+            filters: source.filters,
+            parameters: source.partitionBy,
+            outputs: source.output,
+            defaultLookupScope: source.lookupScope
+        };
+    });
+    function deserializeParameterValue(stages, value) {
+        switch (value.type) {
+            case 'request':
+                return value;
+            case 'lookup':
+                return {
+                    type: 'lookup',
+                    lookup: stages[value.lookup.stageId][value.lookup.idInStage],
+                    resultIndex: value.resultIndex
+                };
+            case 'intersection':
+                return { type: 'intersection', values: value.values.map((v) => deserializeParameterValue(stages, v)) };
+        }
+    }
+    function deserializeExpandingLookup(stages, source) {
+        switch (source.type) {
+            case 'parameter':
+                return {
+                    type: 'parameter',
+                    lookup: parameterIndexes[source.lookup],
+                    instantiation: source.instantiation.map((v) => deserializeParameterValue(stages, v))
+                };
+            case 'table_valued':
+                return {
+                    type: 'table_valued',
+                    functionName: source.functionName,
+                    functionInputs: source.functionInputs,
+                    outputs: source.outputs,
+                    filters: source.filters
+                };
+        }
+    }
+    function deserializeStreamQuerier(source) {
+        const lookupStages = [];
+        for (const serializedStage of source.lookupStages) {
+            const stage = [];
+            for (const serializedElement of serializedStage) {
+                stage.push(deserializeExpandingLookup(lookupStages, serializedElement));
+            }
+            lookupStages.push(stage);
+        }
+        return {
+            requestFilters: source.requestFilters,
+            lookupStages,
+            bucket: buckets[source.bucket],
+            sourceInstantiation: source.sourceInstantiation.map((v) => deserializeParameterValue(lookupStages, v))
+        };
+    }
+    const streams = plan.streams.map((source) => {
+        return {
+            stream: source.stream,
+            queriers: source.queriers.map(deserializeStreamQuerier)
+        };
+    });
+    return {
+        dataSources,
+        buckets,
+        parameterIndexes,
+        streams
+    };
+}
+//# sourceMappingURL=serialize.js.map

package/dist/sync_plan/serialize.js.map

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

package/dist/types/custom_sqlite_value.d.ts

@@ -1,6 +1,6 @@
 import { CompatibilityContext } from '../compatibility.js';
-import { SqliteValue } from '../types.js';
 import { SqliteValueType } from '../ExpressionType.js';
+import { SqliteValue } from '../types.js';
 /**
  * A value that decays into a {@link SqliteValue} in a context-specific way.
  *

package/dist/types/time.d.ts

@@ -1,7 +1,24 @@
 import { SqliteValueType } from '../ExpressionType.js';
-import { CompatibilityContext } from '../compatibility.js';
+import { CompatibilityContext, TimeValuePrecision } from '../compatibility.js';
 import { SqliteValue } from '../types.js';
 import { CustomSqliteValue } from './custom_sqlite_value.js';
+export interface DateTimeSourceOptions {
+    /**
+     * The amount of sub-second digits provided by the source database.
+     *
+     * We can't infer this by parsing the iso representation alone, since trailing zeroes might be omitted from the
+     * representation.
+     */
+    subSecondPrecision: TimeValuePrecision;
+    /**
+     * The default precision to use when rendering {@link DateTimeValue}s in a compatibility context that doesn't have a
+     * {@link CompatibilityContext.maxTimeValuePrecision} set.
+     *
+     * This is usually the same as {@link subSecondPrecision}, except for MySQL, where we can provide microseconds
+     * precision but default to milliseconds.
+     */
+    defaultSubSecondPrecision: TimeValuePrecision;
+}
 /**
  * In old versions of the sync service, timestamp values were formatted with a space between the date and time
  * components.
@@ -12,7 +29,8 @@ import { CustomSqliteValue } from './custom_sqlite_value.js';
 export declare class DateTimeValue extends CustomSqliteValue {
     readonly iso8601Representation: string;
     private readonly fixedLegacyRepresentation;
-    constructor(iso8601Representation: string, fixedLegacyRepresentation?: string | undefined);
+    private readonly options;
+    constructor(iso8601Representation: string, fixedLegacyRepresentation: string | undefined, options: DateTimeSourceOptions);
     get legacyRepresentation(): string;
     get sqliteType(): SqliteValueType;
     toSqliteValue(context: CompatibilityContext): string;
@@ -25,9 +43,10 @@ export declare class DateTimeValue extends CustomSqliteValue {
  */
 export declare class TimeValue extends CustomSqliteValue {
     readonly timeSeconds: string;
-    readonly fraction: string | undefined;
-    constructor(timeSeconds: string, fraction?: string | undefined);
-    static parse(value: string): TimeValue | null;
+    readonly fraction: string;
+    private readonly options;
+    constructor(timeSeconds: string, fraction: string, options: DateTimeSourceOptions);
+    static parse(value: string, options: DateTimeSourceOptions): TimeValue | null;
     toSqliteValue(context: CompatibilityContext): SqliteValue;
     get sqliteType(): SqliteValueType;
 }

package/dist/types/time.js

@@ -1,4 +1,4 @@
-import { CompatibilityOption } from '../compatibility.js';
+import { CompatibilityOption, TimeValuePrecision } from '../compatibility.js';
 import { CustomSqliteValue } from './custom_sqlite_value.js';
 /**
  * In old versions of the sync service, timestamp values were formatted with a space between the date and time
@@ -10,11 +10,13 @@ import { CustomSqliteValue } from './custom_sqlite_value.js';
 export class DateTimeValue extends CustomSqliteValue {
     iso8601Representation;
     fixedLegacyRepresentation;
+    options;
     // YYYY-MM-DDThh:mm:ss.sss / YYYY-MM-DDThh:mm:ss.sssZ
-    constructor(iso8601Representation, fixedLegacyRepresentation = undefined) {
+    constructor(iso8601Representation, fixedLegacyRepresentation = undefined, options) {
         super();
         this.iso8601Representation = iso8601Representation;
         this.fixedLegacyRepresentation = fixedLegacyRepresentation;
+        this.options = options;
     }
     // YYYY-MM-DD hh:mm:ss.sss / YYYY-MM-DD hh:mm:ss.sssZ
     get legacyRepresentation() {
@@ -24,9 +26,25 @@ export class DateTimeValue extends CustomSqliteValue {
         return 'text';
     }
     toSqliteValue(context) {
-        return context.isEnabled(CompatibilityOption.timestampsIso8601)
-            ? this.iso8601Representation
-            : this.legacyRepresentation;
+        if (context.isEnabled(CompatibilityOption.timestampsIso8601)) {
+            return renderSubseconds(() => {
+                // Match the `.123` subsecond part and/or a `Z` suffix.
+                const matchSubSeconds = /(?:\.(\d+))?([zZ]?)$/.exec(this.iso8601Representation);
+                if (matchSubSeconds == null || matchSubSeconds[0].length == 0) {
+                    return [this.iso8601Representation, '', ''];
+                }
+                else {
+                    return [
+                        this.iso8601Representation.slice(0, -matchSubSeconds[0].length),
+                        matchSubSeconds[1] ?? '',
+                        matchSubSeconds[2] ?? ''
+                    ];
+                }
+            }, this.options, context);
+        }
+        else {
+            return this.legacyRepresentation;
+        }
     }
 }
 /**
@@ -38,30 +56,67 @@ export class DateTimeValue extends CustomSqliteValue {
 export class TimeValue extends CustomSqliteValue {
     timeSeconds;
     fraction;
-    constructor(timeSeconds, fraction = undefined) {
+    options;
+    constructor(timeSeconds, fraction, options) {
         super();
         this.timeSeconds = timeSeconds;
         this.fraction = fraction;
+        this.options = options;
     }
-    static parse(value) {
-        const match = /^([\d:]+)(\.\d+)?$/.exec(value);
+    static parse(value, options) {
+        const match = /^([\d:]+)(?:\.(\d+))?$/.exec(value);
         if (match == null) {
             return null;
         }
         const [_, timeSeconds, fraction] = match;
-        return new TimeValue(timeSeconds, fraction);
+        return new TimeValue(timeSeconds, fraction, options);
     }
     toSqliteValue(context) {
         if (context.isEnabled(CompatibilityOption.timestampsIso8601)) {
-            const fraction = this.fraction?.padEnd(7, '0') ?? '.000000';
-            return `${this.timeSeconds}${fraction}`;
+            return renderSubseconds(() => [this.timeSeconds, this.fraction ?? '', ''], this.options, context);
         }
         else {
-            return `${this.timeSeconds}${this.fraction ?? ''}`;
+            if (this.fraction) {
+                return `${this.timeSeconds}.${this.fraction}`;
+            }
+            else {
+                return this.timeSeconds;
+            }
         }
     }
     get sqliteType() {
         return 'text';
     }
 }
+/**
+ * Renders a time value with a designated precision.
+ *
+ * @param split Returns the original time value, split into the part before the sub-second fraction and the subsecond
+ * fraction. The `.` separator should not be part of either string.
+ * @param options Information about precision overred by the source database.
+ * @param context The {@link CompatibilityContext} to take into consideration.
+ * @returns The rendered value.
+ */
+function renderSubseconds(split, options, context) {
+    const maxPrecision = context.maxTimeValuePrecision ?? options.defaultSubSecondPrecision;
+    const maxSubSecondDigits = Math.min(maxPrecision.subSecondDigits, options.subSecondPrecision.subSecondDigits);
+    // Note: We are deliberately not rounding here, we always trim precision away. Rounding would require a parsed date
+    // with subsecond precision, which is just painful in JS. Maybe with the temporal API in Node 25...
+    let [withoutSubseconds, subseconds, suffix] = split();
+    if (maxPrecision == TimeValuePrecision.seconds) {
+        // Avoid a trailing `.` if we only care about seconds.
+        return `${withoutSubseconds}${suffix}`;
+    }
+    if (subseconds.length > maxSubSecondDigits) {
+        // Trim unwanted precision.
+        subseconds = subseconds.substring(0, maxSubSecondDigits);
+    }
+    else if (subseconds.length < maxSubSecondDigits) {
+        // Let's say we had a source database stripping trailing zeroes from the subsecond field. Perhaps the
+        // subSecondPrecision is generally micros, but one value has .123456 and one has .1234 instead of .123400. For
+        // consistency, we pad those value.
+        subseconds = subseconds.padEnd(maxSubSecondDigits, '0');
+    }
+    return `${withoutSubseconds}.${subseconds}${suffix}`;
+}
 //# sourceMappingURL=time.js.map

package/dist/types/time.js.map

@@ -1 +1 @@
-{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/types/time.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAEhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;;GAMG;AACH,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAIvC;IACQ;IAJnB,qDAAqD;IAErD,YACW,qBAA6B,EACrB,4BAAgD,SAAS;QAE1E,KAAK,EAAE,CAAC;QAHC,0BAAqB,GAArB,qBAAqB,CAAQ;QACrB,8BAAyB,GAAzB,yBAAyB,CAAgC;IAG5E,CAAC;IAED,qDAAqD;IACrD,IAAW,oBAAoB;QAC7B,OAAO,IAAI,CAAC,yBAAyB,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACxF,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,aAAa,CAAC,OAA6B;QACzC,OAAO,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,iBAAiB,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,qBAAqB;YAC5B,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC;IAChC,CAAC;CACF;AAED;;;;;GAKG;AACH,MAAM,OAAO,SAAU,SAAQ,iBAAiB;IAEnC;IACA;IAFX,YACW,WAAmB,EACnB,WAA+B,SAAS;QAEjD,KAAK,EAAE,CAAC;QAHC,gBAAW,GAAX,WAAW,CAAQ;QACnB,aAAQ,GAAR,QAAQ,CAAgC;IAGnD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,KAAa;QACxB,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,KAAY,CAAC;QAChD,OAAO,IAAI,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,OAA6B;QACzC,IAAI,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,SAAS,CAAC;YAC5D,OAAO,GAAG,IAAI,CAAC,WAAW,GAAG,QAAQ,EAAE,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;QACrD,CAAC;IACH,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
+{"version":3,"file":"time.js","sourceRoot":"","sources":["../../src/types/time.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -1,17 +1,13 @@
 import { JsonContainer } from '@powersync/service-jsonbig';
+import { BucketPriority } from './BucketDescription.js';
+import { ScopedParameterLookup, UnscopedParameterLookup } from './BucketParameterQuerier.js';
+import { CompatibilityContext } from './compatibility.js';
 import { ColumnDefinition } from './ExpressionType.js';
+import { RequestFunctionCall } from './request_functions.js';
 import { SourceTableInterface } from './SourceTableInterface.js';
 import { SyncRulesOptions } from './SqlSyncRules.js';
 import { TablePattern } from './TablePattern.js';
-import { BucketPriority } from './BucketDescription.js';
-import { ParameterLookup } from './BucketParameterQuerier.js';
 import { CustomSqliteValue } from './types/custom_sqlite_value.js';
-import { CompatibilityContext } from './compatibility.js';
-import { RequestFunctionCall } from './request_functions.js';
-export interface SyncRules {
-    evaluateRow(options: EvaluateRowOptions): EvaluationResult[];
-    evaluateParameterRow(table: SourceTableInterface, row: SqliteRow): EvaluatedParametersResult[];
-}
 export interface QueryParseOptions extends SyncRulesOptions {
     accept_potentially_dangerous_queries?: boolean;
     priority?: BucketPriority;
@@ -21,7 +17,16 @@ export interface StreamParseOptions extends QueryParseOptions {
     auto_subscribe?: boolean;
 }
 export interface EvaluatedParameters {
-    lookup: ParameterLookup;
+    lookup: ScopedParameterLookup;
+    /**
+     * Parameters used to generate bucket id. May be incomplete.
+     *
+     * JSON-serializable.
+     */
+    bucketParameters: Record<string, SqliteJsonValue>[];
+}
+export interface UnscopedEvaluatedParameters {
+    lookup: UnscopedParameterLookup;
     /**
      * Parameters used to generate bucket id. May be incomplete.
      *
@@ -30,6 +35,7 @@ export interface EvaluatedParameters {
     bucketParameters: Record<string, SqliteJsonValue>[];
 }
 export type EvaluatedParametersResult = EvaluatedParameters | EvaluationError;
+export type UnscopedEvaluatedParametersResult = UnscopedEvaluatedParameters | EvaluationError;
 export interface EvaluatedRow {
     bucket: string;
     /** Output table - may be different from input table. */
@@ -41,13 +47,41 @@ export interface EvaluatedRow {
     /** Must be JSON-serializable. */
     data: SqliteJsonRow;
 }
+/**
+ * Bucket data as evaluated by the BucketDataSource.
+ *
+ * The bucket name must still be resolved, external to this.
+ */
+export interface UnscopedEvaluatedRow {
+    /**
+     * Serialized evaluated parameters used to generate the bucket id. Serialized as a JSON array.
+     *
+     * Examples:
+     *  [] // no bucket parameters
+     *  [1] // single numeric parameter
+     *  [1,"foo"] // multiple parameters
+     *
+     * The bucket name is derived by using concetenating these parameters with the generated bucket name.
+     */
+    serializedBucketParameters: string;
+    /** Output table - may be different from input table. */
+    table: string;
+    /**
+     * Convenience attribute. Must match data.id.
+     */
+    id: string;
+    /** Must be JSON-serializable. */
+    data: SqliteJsonRow;
+}
 export interface EvaluationError {
     error: string;
 }
-export declare function isEvaluationError(e: any): e is EvaluationError;
+export declare function isEvaluationError(e: EvaluationResult | UnscopedEvaluationResult | EvaluatedParametersResult | UnscopedEvaluatedParametersResult): e is EvaluationError;
 export declare function isEvaluatedRow(e: EvaluationResult): e is EvaluatedRow;
+export declare function isSourceEvaluatedRow(e: UnscopedEvaluationResult): e is UnscopedEvaluatedRow;
 export declare function isEvaluatedParameters(e: EvaluatedParametersResult): e is EvaluatedParameters;
 export type EvaluationResult = EvaluatedRow | EvaluationError;
+export type UnscopedEvaluationResult = UnscopedEvaluatedRow | EvaluationError;
 export interface RequestJwtPayload {
     /**
      * user_id
@@ -101,6 +135,14 @@ export declare class RequestParameters implements ParameterValueSet {
  * Uint8Array is not supported.
  */
 export type SqliteJsonValue = number | string | bigint | null;
+/**
+ * A value that can be used as a bucket parameter.
+ *
+ * We don't support binary bucket parameters, so this needs to be a {@link SqliteJsonValue}. Further, bucket parameters
+ * are always instantiated through the `=` operator, and `NULL` values in SQLite don't compare via `=`. So, `null`
+ * values also aren't allowed as parameters.
+ */
+export type SqliteParameterValue = NonNullable<SqliteJsonValue>;
 /**
  * A value supported by the SQLite type system.
  */
@@ -190,21 +232,7 @@ export interface InputParameter {
      */
     parametersToLookupValue(parameters: ParameterValueSet): SqliteValue;
 }
-/**
- * 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 function without an opt-in.
- */
-export type BucketIdTransformer = (regularId: string) => string;
 export interface EvaluateRowOptions extends TableRow {
-    bucketIdTransformer: BucketIdTransformer;
 }
 /**
  * A row associated with the table it's coming from.

package/dist/types.js

@@ -1,12 +1,15 @@
 import { JSONBig } from '@powersync/service-jsonbig';
-import { toSyncRulesParameters } from './utils.js';
 import { CompatibilityContext } from './compatibility.js';
+import { toSyncRulesParameters } from './utils.js';
 export function isEvaluationError(e) {
     return typeof e.error == 'string';
 }
 export function isEvaluatedRow(e) {
     return typeof e.bucket == 'string';
 }
+export function isSourceEvaluatedRow(e) {
+    return typeof e.serializedBucketParameters == 'string';
+}
 export function isEvaluatedParameters(e) {
     return 'lookup' in e;
 }

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAiB,MAAM,4BAA4B,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAO1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAsFnD,MAAM,UAAU,iBAAiB,CAC/B,CAA8G;IAE9G,OAAO,OAAQ,CAAqB,CAAC,KAAK,IAAI,QAAQ,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,CAAmB;IAChD,OAAO,OAAQ,CAAkB,CAAC,MAAM,IAAI,QAAQ,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,CAA2B;IAC9D,OAAO,OAAQ,CAA0B,CAAC,0BAA0B,IAAI,QAAQ,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,CAA4B;IAChE,OAAO,QAAQ,IAAI,CAAC,CAAC;AACvB,CAAC;AAuCD,MAAM,OAAO,iBAAiB;IAC5B,kBAAkB,CAAgB;IAClC,qBAAqB,CAAgB;IACrC,cAAc,CAAgB;IAE9B;;OAEG;IACH,iBAAiB,CAAS;IAE1B,gBAAgB,CAAuB;IACvC,mBAAmB,CAAgB;IAEnC;;OAEG;IACH,eAAe,CAAS;IAExB,MAAM,CAAS;IAKf,YAAY,YAAmD,EAAE,gBAAsC;QACrG,IAAI,YAAY,YAAY,iBAAiB,EAAE,CAAC;YAC9C,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC;YAC1D,IAAI,CAAC,qBAAqB,GAAG,YAAY,CAAC,qBAAqB,CAAC;YAChE,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC;YAClD,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC,iBAAiB,CAAC;YACxD,IAAI,CAAC,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;YACpD,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,gBAAgB,CAAC;YACtD,IAAI,CAAC,mBAAmB,GAAG,YAAY,CAAC,mBAAmB,CAAC;YAC5D,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YAClC,OAAO;QACT,CAAC;QAED,iDAAiD;QACjD,MAAM,gBAAgB,GAAG,YAAY,CAAC,UAA6C,CAAC;QAEpF,MAAM,eAAe,GAAG;YACtB,GAAG,gBAAgB;YACnB,oDAAoD;YACpD,OAAO,EAAE,YAAY,CAAC,GAAG;SAC1B,CAAC;QAEF,gHAAgH;QAChH,iBAAiB;QACjB,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC;QACvC,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAChD,eAAe,EACf,oBAAoB,CAAC,4BAA4B,CAClD,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAEvD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC7D,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,gBAAiB,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;QAClH,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,MAAc;QAClC,IAAI,KAAK,IAAI,kBAAkB,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,KAAK,IAAI,iBAAiB,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,KAAK,IAAI,yBAAyB,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,yBAAyB,CAAC,MAA2B;QACnD,MAAM,KAAK,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC1C,KAAK,CAAC,gBAAgB,GAAG,MAAM,CAAC;QAChC,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEtD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA6MD,MAAM,UAAU,gCAAgC,CAAC,MAAsB;IACrE,OAAQ,MAAyC,CAAC,KAAK,IAAI,IAAI,CAAC;AAClE,CAAC"}

package/dist/utils.d.ts

@@ -1,9 +1,11 @@
 import { Replacer } from '@powersync/service-jsonbig';
 import { SelectFromStatement, Statement } from 'pgsql-ast-parser';
 import { CompatibilityContext } from './compatibility.js';
-import { BucketIdTransformer, DatabaseInputRow, DatabaseInputValue, SqliteInputRow, SqliteInputValue, SqliteJsonRow, SqliteJsonValue, SqliteRow, SqliteValue } from './types.js';
+import { BucketDataScope } from './HydrationState.js';
+import { DatabaseInputRow, DatabaseInputValue, SqliteInputRow, SqliteInputValue, SqliteJsonRow, SqliteJsonValue, SqliteParameterValue, SqliteRow, SqliteValue } from './types.js';
 export declare function isSelectStatement(q: Statement): q is SelectFromStatement;
-export declare function getBucketId(descriptor_id: string, bucket_parameters: string[], params: Record<string, SqliteJsonValue>, transformer: BucketIdTransformer): string;
+export declare function buildBucketName(scope: BucketDataScope, serializedParameters: string): string;
+export declare function serializeBucketParameters(bucketParameters: string[], params: Record<string, SqliteJsonValue>): string;
 /**
  * SqliteRow -> SqliteJsonRow.
  *
@@ -19,6 +21,7 @@ export declare function filterJsonRow(data: SqliteRow): SqliteJsonRow;
  */
 export declare function jsonValueToSqlite(fixedJsonBehavior: boolean, value: null | undefined | string | number | bigint | boolean | any): SqliteValue;
 export declare function isJsonValue(value: SqliteValue): value is SqliteJsonValue;
+export declare function isValidParameterValue(value: SqliteValue): value is SqliteParameterValue;
 /**
  * Map database row to SqliteRow for use in sync rules.
  */
@@ -49,3 +52,7 @@ export declare const JSONBucketNameSerialize: {
  * Lookup serialization must be number-agnostic. I.e. normalize numbers, instead of preserving numbers.
  */
 export declare function normalizeParameterValue(value: SqliteJsonValue): SqliteJsonValue;
+/**
+ * Extracts and normalizes the ID column from a row.
+ */
+export declare function idFromData(data: SqliteJsonRow): string;

package/dist/utils.js

@@ -2,13 +2,17 @@ import { JSONBig, JsonContainer, stringifyRaw } from '@powersync/service-jsonbig
 import { SyncRuleProcessingError as SyncRulesProcessingError } from './errors.js';
 import { SQLITE_FALSE, SQLITE_TRUE } from './sql_support.js';
 import { CustomArray, CustomObject, CustomSqliteValue } from './types/custom_sqlite_value.js';
+import { castAsText } from './sql_functions.js';
 export function isSelectStatement(q) {
     return q.type == 'select';
 }
-export function getBucketId(descriptor_id, bucket_parameters, params, transformer) {
+export function buildBucketName(scope, serializedParameters) {
+    return scope.bucketPrefix + serializedParameters;
+}
+export function serializeBucketParameters(bucketParameters, params) {
     // Important: REAL and INTEGER values matching the same number needs the same representation in the bucket name.
-    const paramArray = bucket_parameters.map((name) => params[`bucket.${name}`]);
-    return transformer(`${descriptor_id}${JSONBucketNameSerialize.stringify(paramArray)}`);
+    const paramArray = bucketParameters.map((name) => params[`bucket.${name}`]);
+    return JSONBucketNameSerialize.stringify(paramArray);
 }
 const DEPTH_LIMIT = 10;
 /**
@@ -54,6 +58,9 @@ export function jsonValueToSqlite(fixedJsonBehavior, value) {
 export function isJsonValue(value) {
     return value == null || typeof value == 'string' || typeof value == 'number' || typeof value == 'bigint';
 }
+export function isValidParameterValue(value) {
+    return value != null && isJsonValue(value);
+}
 function filterJsonData(data, context, depth = 0) {
     if (depth > DEPTH_LIMIT) {
         // This is primarily to prevent infinite recursion
@@ -210,4 +217,20 @@ export function normalizeParameterValue(value) {
     }
     return value;
 }
+/**
+ * Extracts and normalizes the ID column from a row.
+ */
+export function idFromData(data) {
+    let id = data.id;
+    if (typeof id != 'string') {
+        // While an explicit cast would be better, this covers against very common
+        // issues when initially testing out sync, for example when the id column is an
+        // auto-incrementing integer.
+        // If there is no id column, we use a blank id. This will result in the user syncing
+        // a single arbitrary row for this table - better than just not being able to sync
+        // anything.
+        id = castAsText(id) ?? '';
+    }
+    return id;
+}
 //# sourceMappingURL=utils.js.map