@powersync/service-module-postgres-storage 0.17.0 → 0.19.0

package/dist/types/models/CurrentData.js

@@ -1,3 +1,4 @@
+import { orNull } from '@powersync/service-types';
 import * as t from 'ts-codec';
 import { bigint, hexBuffer, jsonb, pgwire_number } from '../codecs.js';
 export const CurrentBucket = t.object({
@@ -20,6 +21,6 @@ export const V3CurrentData = t.object({
     lookups: t.array(hexBuffer),
     source_key: hexBuffer,
     source_table: t.string,
-    pending_delete: t.Null.or(bigint)
+    pending_delete: orNull(bigint)
 });
 //# sourceMappingURL=CurrentData.js.map

package/dist/types/models/CurrentData.js.map

@@ -1 +1 @@
-{"version":3,"file":"CurrentData.js","sourceRoot":"","sources":["../../../src/types/models/CurrentData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEvE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,CAAC,CAAC,MAAM;IAChB,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,EAAE,EAAE,CAAC,CAAC,MAAM;CACb,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACtC,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,aAAa;IACvB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,CAAC,CAAC,MAAM;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACtC,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,aAAa;IACvB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,CAAC,CAAC,MAAM;IACtB,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;CAClC,CAAC,CAAC"}
+{"version":3,"file":"CurrentData.js","sourceRoot":"","sources":["../../../src/types/models/CurrentData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEvE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,CAAC,CAAC,MAAM;IAChB,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,EAAE,EAAE,CAAC,CAAC,MAAM;CACb,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACtC,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,aAAa;IACvB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,CAAC,CAAC,MAAM;CACvB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACtC,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,aAAa;IACvB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;IAC3B,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,CAAC,CAAC,MAAM;IACtB,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC;CAC/B,CAAC,CAAC"}

package/dist/types/models/SdkReporting.d.ts

@@ -7,15 +7,15 @@ export declare const Sdks: t.ObjectCodec<{
 export type Sdks = t.Encoded<typeof Sdks>;
 export declare const SdkReporting: t.ObjectCodec<{
     users: t.Codec<bigint, string | number, string, t.CodecProps>;
-    sdks: t.Union<t.Codec<{
+    sdks: t.OptionalCodec<t.Codec<{
         data: {
             sdk: string;
             clients: number;
             users: number;
         }[];
-    } | undefined, {
+    } | null, {
         data: string;
-    } | undefined, string, t.CodecProps>, t.Codec<null, null, t.CodecType.Null, t.CodecProps>>;
+    } | null, string, t.CodecProps>>;
 }>;
 export type SdkReporting = t.Encoded<typeof SdkReporting>;
 export type SdkReportingDecoded = t.Decoded<typeof SdkReporting>;

package/dist/types/models/SdkReporting.js

@@ -1,3 +1,4 @@
+import { orNull } from '@powersync/service-types';
 import * as t from 'ts-codec';
 import { bigint, jsonb } from '../codecs.js';
 export const Sdks = t.object({
@@ -7,11 +8,8 @@ export const Sdks = t.object({
 });
 export const SdkReporting = t.object({
     users: bigint,
-    sdks: t
-        .object({
+    sdks: orNull(t.object({
         data: jsonb(t.array(Sdks))
-    })
-        .optional()
-        .or(t.Null)
+    })).optional()
 });
 //# sourceMappingURL=SdkReporting.js.map

package/dist/types/models/SdkReporting.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdkReporting.js","sourceRoot":"","sources":["../../../src/types/models/SdkReporting.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,GAAG,EAAE,CAAC,CAAC,MAAM;IACb,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM;CAChB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,CAAC;SACJ,MAAM,CAAC;QACN,IAAI,EAAE,KAAK,CAAS,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KACnC,CAAC;SACD,QAAQ,EAAE;SACV,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;CACd,CAAC,CAAC"}
+{"version":3,"file":"SdkReporting.js","sourceRoot":"","sources":["../../../src/types/models/SdkReporting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,GAAG,EAAE,CAAC,CAAC,MAAM;IACb,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,KAAK,EAAE,CAAC,CAAC,MAAM;CAChB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM;IACb,IAAI,EAAE,MAAM,CACV,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,KAAK,CAAS,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KACnC,CAAC,CACH,CAAC,QAAQ,EAAE;CACb,CAAC,CAAC"}

package/dist/types/models/SourceTable.d.ts

@@ -1,3 +1,4 @@
+import { JsonValue } from '@powersync/service-core';
 import * as t from 'ts-codec';
 export type StoredRelationId = {
     object_id: string | number | undefined;
@@ -11,24 +12,28 @@ export declare const ColumnDescriptor: t.ObjectCodec<{
     /**
      *  Some data sources have a type id that can be used to identify the type of the column
      */
-    typeId: t.OptionalCodec<t.Codec<number, number, string, t.CodecProps>>;
+    type_oid: t.OptionalCodec<t.Codec<number, number, string, t.CodecProps>>;
 }>;
 export declare const SourceTable: t.ObjectCodec<{
     id: t.IdentityCodec<t.CodecType.String>;
     group_id: t.Codec<number, number, "pg_number", t.CodecProps>;
     connection_id: t.Codec<bigint, string | number, string, t.CodecProps>;
-    relation_id: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<StoredRelationId, string, string, t.CodecProps>>;
+    relation_id: t.Codec<StoredRelationId | null, string | null>;
     schema_name: t.IdentityCodec<t.CodecType.String>;
     table_name: t.IdentityCodec<t.CodecType.String>;
-    replica_id_columns: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<{
+    replica_id_columns: t.Codec<{
         name: string;
         type?: string | undefined;
-        typeId?: number | undefined;
-    }[], string, string, t.CodecProps>>;
+        type_oid?: number | undefined;
+    }[] | null, string | null>;
     snapshot_done: t.IdentityCodec<t.CodecType.Boolean>;
-    snapshot_total_estimated_count: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<bigint, string | number, string, t.CodecProps>>;
-    snapshot_replicated_count: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<bigint, string | number, string, t.CodecProps>>;
-    snapshot_last_key: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Buffer<ArrayBuffer>, string, "hexBuffer", t.CodecProps>>;
+    snapshot_total_estimated_count: t.Codec<bigint | null, string | number | null>;
+    snapshot_replicated_count: t.Codec<bigint | null, string | number | null>;
+    snapshot_last_key: t.Codec<Buffer<ArrayBuffer> | null, string | null>;
+    /**
+     * Source-specific metadata. Null for legacy records.
+     */
+    source_metadata: t.Codec<JsonValue, string | null>;
 }>;
 export type SourceTable = t.Encoded<typeof SourceTable>;
 export type SourceTableDecoded = t.Decoded<typeof SourceTable>;

package/dist/types/models/SourceTable.js

@@ -1,3 +1,4 @@
+import { orNull } from '@powersync/service-types';
 import * as t from 'ts-codec';
 import { bigint, hexBuffer, jsonb, jsonb_raw, pgwire_number } from '../codecs.js';
 export const ColumnDescriptor = t.object({
@@ -9,19 +10,23 @@ export const ColumnDescriptor = t.object({
     /**
      *  Some data sources have a type id that can be used to identify the type of the column
      */
-    typeId: t.number.optional()
+    type_oid: t.number.optional()
 });
 export const SourceTable = t.object({
     id: t.string,
     group_id: pgwire_number,
     connection_id: bigint,
-    relation_id: t.Null.or(jsonb_raw()),
+    relation_id: orNull(jsonb_raw()),
     schema_name: t.string,
     table_name: t.string,
-    replica_id_columns: t.Null.or(jsonb(t.array(ColumnDescriptor))),
+    replica_id_columns: orNull(jsonb(t.array(ColumnDescriptor))),
     snapshot_done: t.boolean,
-    snapshot_total_estimated_count: t.Null.or(bigint),
-    snapshot_replicated_count: t.Null.or(bigint),
-    snapshot_last_key: t.Null.or(hexBuffer)
+    snapshot_total_estimated_count: orNull(bigint),
+    snapshot_replicated_count: orNull(bigint),
+    snapshot_last_key: orNull(hexBuffer),
+    /**
+     * Source-specific metadata. Null for legacy records.
+     */
+    source_metadata: orNull(jsonb_raw())
 });
 //# sourceMappingURL=SourceTable.js.map

package/dist/types/models/SourceTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"SourceTable.js","sourceRoot":"","sources":["../../../src/types/models/SourceTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAMlF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,IAAI,EAAE,CAAC,CAAC,MAAM;IACd;;OAEG;IACH,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;IACzB;;OAEG;IACH,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,EAAE,EAAE,CAAC,CAAC,MAAM;IACZ,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,MAAM;IACrB,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAoB,CAAC;IACrD,WAAW,EAAE,CAAC,CAAC,MAAM;IACrB,UAAU,EAAE,CAAC,CAAC,MAAM;IACpB,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC/D,aAAa,EAAE,CAAC,CAAC,OAAO;IACxB,8BAA8B,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;IACjD,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;IAC5C,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC;CACxC,CAAC,CAAC"}
+{"version":3,"file":"SourceTable.js","sourceRoot":"","sources":["../../../src/types/models/SourceTable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAMlF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,IAAI,EAAE,CAAC,CAAC,MAAM;IACd;;OAEG;IACH,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;IACzB;;OAEG;IACH,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,EAAE,EAAE,CAAC,CAAC,MAAM;IACZ,QAAQ,EAAE,aAAa;IACvB,aAAa,EAAE,MAAM;IACrB,WAAW,EAAE,MAAM,CAAC,SAAS,EAAoB,CAAC;IAClD,WAAW,EAAE,CAAC,CAAC,MAAM;IACrB,UAAU,EAAE,CAAC,CAAC,MAAM;IACpB,kBAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC5D,aAAa,EAAE,CAAC,CAAC,OAAO;IACxB,8BAA8B,EAAE,MAAM,CAAC,MAAM,CAAC;IAC9C,yBAAyB,EAAE,MAAM,CAAC,MAAM,CAAC;IACzC,iBAAiB,EAAE,MAAM,CAAC,SAAS,CAAC;IACpC;;OAEG;IACH,eAAe,EAAE,MAAM,CAAC,SAAS,EAAa,CAAC;CAChD,CAAC,CAAC"}

package/dist/types/models/SyncRules.d.ts

@@ -12,42 +12,43 @@ export declare const SyncRules: t.ObjectCodec<{
     /**
      * May be set if snapshot_done = false, if the replication stream requires it.
      */
-    snapshot_lsn: t.Union<t.Codec<null, null, string, t.CodecProps>, t.IdentityCodec<t.CodecType.String>>;
+    snapshot_lsn: t.Codec<string | null, string | null>;
     /**
      * The last consistent checkpoint.
      *
      * There may be higher OpIds used in the database if we're in the middle of replicating a large transaction.
      */
-    last_checkpoint: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<bigint, string | number, string, t.CodecProps>>;
+    last_checkpoint: t.Codec<bigint | null, string | number | null>;
     /**
      * The LSN associated with the last consistent checkpoint.
      */
-    last_checkpoint_lsn: t.Union<t.Codec<null, null, string, t.CodecProps>, t.IdentityCodec<t.CodecType.String>>;
+    last_checkpoint_lsn: t.Codec<string | null, string | null>;
     /**
      * If set, no new checkpoints may be created < this value.
      */
-    no_checkpoint_before: t.Union<t.Codec<null, null, string, t.CodecProps>, t.IdentityCodec<t.CodecType.String>>;
+    no_checkpoint_before: t.Codec<string | null, string | null>;
     slot_name: t.IdentityCodec<t.CodecType.String>;
     /**
      * Last time we persisted a checkpoint.
      *
      * This may be old if no data is incoming.
      */
-    last_checkpoint_ts: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string | import("@powersync/service-sync-rules").DateTimeValue, string, t.CodecProps>>;
+    last_checkpoint_ts: t.Codec<Date | null, string | import("@powersync/service-sync-rules").DateTimeValue | null>;
     /**
      * Last time we persisted a checkpoint or keepalive.
      *
      * This should stay fairly current while replicating.
      */
-    last_keepalive_ts: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string | import("@powersync/service-sync-rules").DateTimeValue, string, t.CodecProps>>;
+    last_keepalive_ts: t.Codec<Date | null, string | import("@powersync/service-sync-rules").DateTimeValue | null>;
     /**
      * If an error is stopping replication, it will be stored here.
      */
-    last_fatal_error: t.Union<t.Codec<null, null, string, t.CodecProps>, t.IdentityCodec<t.CodecType.String>>;
-    keepalive_op: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<bigint, string | number, string, t.CodecProps>>;
+    last_fatal_error: t.Codec<string | null, string | null>;
+    keepalive_op: t.Codec<bigint | null, string | number | null>;
     storage_version: t.OptionalCodec<t.Codec<number | null, number | null, string, t.CodecProps>>;
+    version_label: t.OptionalCodec<t.Codec<string | null, string | null, string, t.CodecProps>>;
     content: t.IdentityCodec<t.CodecType.String>;
-    sync_plan: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<{
+    sync_plan: t.Codec<{
         plan: any;
         compatibility: {
             edition: number;
@@ -64,7 +65,7 @@ export declare const SyncRules: t.ObjectCodec<{
             } | undefined;
             ts?: string | undefined;
         }[] | undefined;
-    }, import("@powersync/service-jsonbig").JsonContainer>>;
+    } | null, import("@powersync/service-jsonbig").JsonContainer | null>;
 }>;
 export type SyncRules = t.Encoded<typeof SyncRules>;
 export type SyncRulesDecoded = t.Decoded<typeof SyncRules>;

package/dist/types/models/SyncRules.js

@@ -1,5 +1,5 @@
 import { framework, storage } from '@powersync/service-core';
-import { ReplicationError } from '@powersync/service-types';
+import { orNull, ReplicationError } from '@powersync/service-types';
 import * as t from 'ts-codec';
 import { bigint, pgwire_number } from '../codecs.js';
 import { jsonContainerObject } from './json.js';
@@ -15,42 +15,43 @@ export const SyncRules = t.object({
     /**
      * May be set if snapshot_done = false, if the replication stream requires it.
      */
-    snapshot_lsn: t.Null.or(t.string),
+    snapshot_lsn: orNull(t.string),
     /**
      * The last consistent checkpoint.
      *
      * There may be higher OpIds used in the database if we're in the middle of replicating a large transaction.
      */
-    last_checkpoint: t.Null.or(bigint),
+    last_checkpoint: orNull(bigint),
     /**
      * The LSN associated with the last consistent checkpoint.
      */
-    last_checkpoint_lsn: t.Null.or(t.string),
+    last_checkpoint_lsn: orNull(t.string),
     /**
      * If set, no new checkpoints may be created < this value.
      */
-    no_checkpoint_before: t.Null.or(t.string),
+    no_checkpoint_before: orNull(t.string),
     slot_name: t.string,
     /**
      * Last time we persisted a checkpoint.
      *
      * This may be old if no data is incoming.
      */
-    last_checkpoint_ts: t.Null.or(framework.codecs.date),
+    last_checkpoint_ts: orNull(framework.codecs.date),
     /**
      * Last time we persisted a checkpoint or keepalive.
      *
      * This should stay fairly current while replicating.
      */
-    last_keepalive_ts: t.Null.or(framework.codecs.date),
+    last_keepalive_ts: orNull(framework.codecs.date),
     /**
      * If an error is stopping replication, it will be stored here.
      */
-    last_fatal_error: t.Null.or(t.string),
-    keepalive_op: t.Null.or(bigint),
-    storage_version: t.Null.or(pgwire_number).optional(),
+    last_fatal_error: orNull(t.string),
+    keepalive_op: orNull(bigint),
+    storage_version: orNull(pgwire_number).optional(),
+    version_label: orNull(t.string).optional(),
     content: t.string,
-    sync_plan: t.Null.or(jsonContainerObject(t.object({
+    sync_plan: orNull(jsonContainerObject(t.object({
         plan: t.any,
         compatibility: t.object({
             edition: t.number,

package/dist/types/models/SyncRules.js.map

@@ -1 +1 @@
-{"version":3,"file":"SyncRules.js","sourceRoot":"","sources":["../../../src/types/models/SyncRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,EAAE,EAAE,aAAa;IACjB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;IACpC;;;;OAIG;IACH,aAAa,EAAE,CAAC,CAAC,OAAO;IACxB;;OAEG;IACH,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACjC;;;;OAIG;IACH,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;IAClC;;OAEG;IACH,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACxC;;OAEG;IACH,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACzC,SAAS,EAAE,CAAC,CAAC,MAAM;IACnB;;;;OAIG;IACH,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;IACpD;;;;OAIG;IACH,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;IACnD;;OAEG;IACH,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IACrC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;IAC/B,eAAe,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;IACpD,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAClB,mBAAmB,CACjB,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,GAAG;QACX,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC;YACtB,OAAO,EAAE,CAAC,CAAC,MAAM;YACjB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9B,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;SAC3C,CAAC;QACF,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE;KAC7C,CAAC,CACH,CACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"SyncRules.js","sourceRoot":"","sources":["../../../src/types/models/SyncRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,EAAE,EAAE,aAAa;IACjB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;IACpC;;;;OAIG;IACH,aAAa,EAAE,CAAC,CAAC,OAAO;IACxB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAC9B;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC;IAC/B;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACrC;;OAEG;IACH,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACtC,SAAS,EAAE,CAAC,CAAC,MAAM;IACnB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;IACjD;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;IAChD;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;IACjD,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAC1C,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,SAAS,EAAE,MAAM,CACf,mBAAmB,CACjB,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,GAAG;QACX,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC;YACtB,OAAO,EAAE,CAAC,CAAC,MAAM;YACjB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9B,qBAAqB,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;SAC3C,CAAC;QACF,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE;KAC7C,CAAC,CACH,CACF;CACF,CAAC,CAAC"}

package/dist/types/models/WriteCheckpoint.d.ts

@@ -3,7 +3,7 @@ export declare const WriteCheckpoint: t.ObjectCodec<{
     user_id: t.IdentityCodec<t.CodecType.String>;
     lsns: t.Codec<Record<string, string>, string, string, t.CodecProps>;
     write_checkpoint: t.Codec<bigint, string | number, string, t.CodecProps>;
-    checkpoint_requested_at: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string | import("@powersync/service-sync-rules").DateTimeValue, string, t.CodecProps>>;
+    checkpoint_requested_at: t.Codec<Date | null, string | import("@powersync/service-sync-rules").DateTimeValue | null>;
 }>;
 export type WriteCheckpoint = t.Encoded<typeof WriteCheckpoint>;
 export type WriteCheckpointDecoded = t.Decoded<typeof WriteCheckpoint>;
@@ -11,7 +11,7 @@ export declare const CustomWriteCheckpoint: t.ObjectCodec<{
     user_id: t.IdentityCodec<t.CodecType.String>;
     write_checkpoint: t.Codec<bigint, string | number, string, t.CodecProps>;
     sync_rules_id: t.Codec<bigint, string | number, string, t.CodecProps>;
-    checkpoint_requested_at: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string | import("@powersync/service-sync-rules").DateTimeValue, string, t.CodecProps>>;
+    checkpoint_requested_at: t.Codec<Date | null, string | import("@powersync/service-sync-rules").DateTimeValue | null>;
 }>;
 export type CustomWriteCheckpoint = t.Encoded<typeof CustomWriteCheckpoint>;
 export type CustomWriteCheckpointDecoded = t.Decoded<typeof CustomWriteCheckpoint>;

package/dist/types/models/WriteCheckpoint.js

@@ -1,16 +1,17 @@
 import { framework } from '@powersync/service-core';
+import { orNull } from '@powersync/service-types';
 import * as t from 'ts-codec';
 import { bigint, jsonb } from '../codecs.js';
 export const WriteCheckpoint = t.object({
     user_id: t.string,
     lsns: jsonb(t.record(t.string)),
     write_checkpoint: bigint,
-    checkpoint_requested_at: t.Null.or(framework.codecs.date)
+    checkpoint_requested_at: orNull(framework.codecs.date)
 });
 export const CustomWriteCheckpoint = t.object({
     user_id: t.string,
     write_checkpoint: bigint,
     sync_rules_id: bigint,
-    checkpoint_requested_at: t.Null.or(framework.codecs.date)
+    checkpoint_requested_at: orNull(framework.codecs.date)
 });
 //# sourceMappingURL=WriteCheckpoint.js.map

package/dist/types/models/WriteCheckpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"WriteCheckpoint.js","sourceRoot":"","sources":["../../../src/types/models/WriteCheckpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/B,gBAAgB,EAAE,MAAM;IACxB,uBAAuB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;CAC1D,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,gBAAgB,EAAE,MAAM;IACxB,aAAa,EAAE,MAAM;IACrB,uBAAuB,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;CAC1D,CAAC,CAAC"}
+{"version":3,"file":"WriteCheckpoint.js","sourceRoot":"","sources":["../../../src/types/models/WriteCheckpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/B,gBAAgB,EAAE,MAAM;IACxB,uBAAuB,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;CACvD,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,MAAM;IACjB,gBAAgB,EAAE,MAAM;IACxB,aAAa,EAAE,MAAM;IACrB,uBAAuB,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;CACvD,CAAC,CAAC"}

package/dist/types/types.d.ts

@@ -32,6 +32,7 @@ export type OperationBatchLimits = t.Encoded<typeof OperationBatchLimits>;
 export declare const PostgresStorageConfig: t.Intersection<t.Codec<{
     type: string;
     max_pool_size?: number | undefined;
+    default_storage_version?: number | undefined;
 } & {
     type: "postgresql";
     id?: string | undefined;
@@ -54,6 +55,7 @@ export declare const PostgresStorageConfig: t.Intersection<t.Codec<{
 }, {
     type: string;
     max_pool_size?: number | undefined;
+    default_storage_version?: number | undefined;
 } & {
     type: "postgresql";
     id?: string | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powersync/service-module-postgres-storage",
   "repository": "https://github.com/powersync-ja/powersync-service",
-  "version": "0.17.0",
+  "version": "0.19.0",
   "license": "FSL-1.1-ALv2",
   "type": "module",
   "publishConfig": {
@@ -16,17 +16,17 @@
     "lru-cache": "^10.2.2",
     "ts-codec": "^1.3.0",
     "uuid": "^14.0.0",
-    "@powersync/lib-service-postgres": "0.5.3",
-    "@powersync/lib-services-framework": "0.10.0",
-    "@powersync/service-core": "1.24.0",
-    "@powersync/service-types": "0.17.0",
+    "@powersync/lib-services-framework": "0.10.1",
+    "@powersync/service-core": "1.26.0",
+    "@powersync/service-types": "0.18.0",
+    "@powersync/lib-service-postgres": "0.5.4",
+    "@powersync/service-jpgwire": "0.21.23",
     "@powersync/service-jsonbig": "0.17.13",
-    "@powersync/service-jpgwire": "0.21.22",
-    "@powersync/service-sync-rules": "0.40.0"
+    "@powersync/service-sync-rules": "0.41.0"
   },
   "devDependencies": {
     "typescript": "~6.0.3",
-    "@powersync/service-core-tests": "0.18.0"
+    "@powersync/service-core-tests": "0.18.1"
   },
   "scripts": {
     "build": "tsc -b",

package/src/migrations/scripts/1784900000000-source-metadata.ts

@@ -0,0 +1,31 @@
+import { migrations } from '@powersync/service-core';
+
+import { openMigrationDB } from '../migration-utils.js';
+
+export const up: migrations.PowerSyncMigrationFunction = async (context) => {
+  const {
+    service_context: { configuration }
+  } = context;
+  await using client = openMigrationDB(configuration.storage);
+
+  await client.transaction(async (db) => {
+    await db.sql`
+      ALTER TABLE source_tables
+      ADD COLUMN source_metadata JSONB
+    `.execute();
+  });
+};
+
+export const down: migrations.PowerSyncMigrationFunction = async (context) => {
+  const {
+    service_context: { configuration }
+  } = context;
+  await using client = openMigrationDB(configuration.storage);
+
+  await client.transaction(async (db) => {
+    await db.sql`
+      ALTER TABLE source_tables
+      DROP COLUMN source_metadata
+    `.execute();
+  });
+};

package/src/migrations/scripts/1788000000000-sync-config-version-label.ts

@@ -0,0 +1,18 @@
+import { migrations } from '@powersync/service-core';
+import { openMigrationDB } from '../migration-utils.js';
+
+export const up: migrations.PowerSyncMigrationFunction = async (context) => {
+  const {
+    service_context: { configuration }
+  } = context;
+  await using client = openMigrationDB(configuration.storage);
+  await client.sql`ALTER TABLE sync_rules ADD COLUMN version_label TEXT`.execute();
+};
+
+export const down: migrations.PowerSyncMigrationFunction = async (context) => {
+  const {
+    service_context: { configuration }
+  } = context;
+  await using client = openMigrationDB(configuration.storage);
+  await client.sql`ALTER TABLE sync_rules DROP COLUMN version_label`.execute();
+};

package/src/storage/PostgresBucketStorageFactory.ts

@@ -15,6 +15,7 @@ export type PostgresBucketStorageOptions = {
   config: NormalizedPostgresStorageConfig;
   replicationStreamNamePrefix: string;
   checksumCacheTtlMs?: number;
+  defaultStorageVersion?: number;
 };
 
 export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
@@ -78,7 +79,8 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
       return {
         operations_size_bytes: 0,
         parameters_size_bytes: 0,
-        replication_size_bytes: 0
+        replication_size_bytes: 0,
+        object_storage_size_bytes: 0
       };
     }
 
@@ -104,7 +106,8 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
     return {
       operations_size_bytes: Number(sizes!.operations_size_bytes),
       parameters_size_bytes: Number(sizes!.parameter_size_bytes),
-      replication_size_bytes: Number(sizes!.v1_current_size_bytes) + Number(sizes!.v3_current_size_bytes)
+      replication_size_bytes: Number(sizes!.v1_current_size_bytes) + Number(sizes!.v3_current_size_bytes),
+      object_storage_size_bytes: 0
     };
   }
 
@@ -156,12 +159,15 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
 
   async updateSyncRules(options: storage.UpdateSyncRulesOptions): Promise<PostgresPersistedReplicationStream> {
     const storageVersion =
-      options.storageVersion ?? options.config.parsed.config.storageVersion ?? storage.CURRENT_STORAGE_VERSION;
+      options.storageVersion ??
+      options.config.parsed.config.storageVersion ??
+      this.options.defaultStorageVersion ??
+      storage.CURRENT_STORAGE_VERSION;
     const storageConfig = storage.STORAGE_VERSION_CONFIG[storageVersion];
-    if (storageConfig == null) {
+    if (storageConfig == null || storageVersion >= storage.STORAGE_VERSION_4) {
       throw new framework.ServiceError(
         framework.ErrorCode.PSYNC_S1005,
-        `Unsupported storage version ${storageVersion}`
+        `Unsupported storage version ${storageVersion} for PostgreSQL storage`
       );
     }
     await this.initializeStorageVersion(storageConfig);
@@ -187,7 +193,8 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
             sync_plan,
             state,
             slot_name,
-            storage_version
+            storage_version,
+            version_label
           )
         VALUES
           (
@@ -211,7 +218,8 @@ export class PostgresBucketStorageFactory extends storage.BucketStorageFactory {
               '_',
               ${{ type: 'varchar', value: crypto.randomBytes(2).toString('hex') }}
             ),
-            ${{ type: 'int4', value: storageVersion }}
+            ${{ type: 'int4', value: storageVersion }},
+            ${{ type: 'varchar', value: options.version_label ?? null }}
           )
         RETURNING
           *

package/src/storage/PostgresStorageProvider.ts

@@ -28,7 +28,8 @@ export class PostgresStorageProvider implements storage.StorageProvider {
     const storageFactory = new PostgresBucketStorageFactory({
       config: normalizedConfig,
       replicationStreamNamePrefix: options.resolvedConfig.slot_name_prefix,
-      checksumCacheTtlMs: options.resolvedConfig.api_parameters.bucket_count_cache_ttl_minutes * 60_000
+      checksumCacheTtlMs: options.resolvedConfig.api_parameters.bucket_count_cache_ttl_minutes * 60_000,
+      defaultStorageVersion: decodedConfig.default_storage_version
     });
 
     const reportStorageFactory = new PostgresReportStorage({

package/src/storage/PostgresSyncRulesStorage.ts

@@ -4,6 +4,8 @@ import {
   BucketChecksum,
   CHECKPOINT_INVALIDATE_ALL,
   CheckpointChanges,
+  CompactInitialReplicationOptions,
+  CompactInitialReplicationResults,
   GetCheckpointChangesOptions,
   InternalOpId,
   internalToExternalOpId,
@@ -11,11 +13,10 @@ import {
   maxLsn,
   ParameterSetLimitExceededError,
   PartialChecksum,
-  PopulateChecksumCacheOptions,
-  PopulateChecksumCacheResults,
   ReplicationCheckpoint,
   storage,
   StorageVersionConfig,
+  SyncRuleState,
   utils,
   WatchWriteCheckpointOptions
 } from '@powersync/service-core';
@@ -94,7 +95,7 @@ export class PostgresSyncRulesStorage
     this.factory = options.factory;
     this.storageConfig = options.replicationStream.getStorageConfig();
     this.currentDataStore = new PostgresCurrentDataStore(this.storageConfig);
-    this.logger = options.replicationStream.logger;
+    this.logger = this.sync_rules.logger;
 
     this.writeCheckpointAPI = new PostgresWriteCheckpointAPI({
       db: this.db,
@@ -145,7 +146,19 @@ export class PostgresSyncRulesStorage
     `.execute();
   }
 
+  supportsIncrementalParameterCompaction(): boolean {
+    return false;
+  }
+
   async compact(options?: storage.CompactOptions): Promise<void> {
+    if (options?.incrementalOnly) {
+      // Not supported yet
+      this.logger.info('Incremental compacting is not supported on Postgres storage yet.');
+      return;
+    } else if (this.replicationStream.state != SyncRuleState.ACTIVE) {
+      this.logger.info(`Skipping compacting of replication stream in ${this.replicationStream.state} state.`);
+      return;
+    }
     let maxOpId = options?.maxOpId;
     if (maxOpId == null) {
       const checkpoint = await this.getCheckpoint();
@@ -160,7 +173,9 @@ export class PostgresSyncRulesStorage
     }).compact();
   }
 
-  async populatePersistentChecksumCache(_options: PopulateChecksumCacheOptions): Promise<PopulateChecksumCacheResults> {
+  async compactInitialReplication(
+    _options: CompactInitialReplicationOptions
+  ): Promise<CompactInitialReplicationResults> {
     // no-op - checksum cache is not implemented for Postgres yet
     return { buckets: 0 };
   }
@@ -172,8 +187,8 @@ export class PostgresSyncRulesStorage
     });
   }
 
-  setWriteCheckpointMode(mode: storage.WriteCheckpointMode): void {
-    return this.writeCheckpointAPI.setWriteCheckpointMode(mode);
+  setWriteCheckpointMode(config: storage.WriteCheckpointModeConfig): void {
+    return this.writeCheckpointAPI.setWriteCheckpointMode(config);
   }
 
   createManagedWriteCheckpoints(