@powersync/service-module-mongodb-storage 0.16.0 → 0.17.0

package/dist/storage/implementation/MongoPersistedSyncRules.d.ts

@@ -1,14 +1,14 @@
 import { storage } from '@powersync/service-core';
-import { HydratedSyncRules, HydrationState, SyncConfigWithErrors } from '@powersync/service-sync-rules';
+import { HydratedSyncConfig, HydrationState, SyncConfigWithErrors } from '@powersync/service-sync-rules';
 import { BucketDefinitionMapping } from './BucketDefinitionMapping.js';
 import { StorageConfig } from './models.js';
 export declare class MongoPersistedSyncRules implements storage.PersistedSyncRules {
     readonly id: number;
-    readonly sync_rules: SyncConfigWithErrors;
+    readonly syncConfigWithErrors: SyncConfigWithErrors;
     readonly slot_name: string;
     private readonly mapping;
     private readonly storageConfig;
     readonly hydrationState: HydrationState;
-    constructor(id: number, sync_rules: SyncConfigWithErrors, slot_name: string, mapping: BucketDefinitionMapping | null, storageConfig: StorageConfig);
-    hydratedSyncRules(): HydratedSyncRules;
+    constructor(id: number, syncConfigWithErrors: SyncConfigWithErrors, slot_name: string, mapping: BucketDefinitionMapping | null, storageConfig: StorageConfig);
+    hydratedSyncConfig(): HydratedSyncConfig;
 }

package/dist/storage/implementation/MongoPersistedSyncRules.js

@@ -1,15 +1,16 @@
+import * as sqlite from 'node:sqlite';
 import { ServiceAssertionError } from '@powersync/lib-services-framework';
-import { CompatibilityOption, DEFAULT_HYDRATION_STATE, versionedHydrationState } from '@powersync/service-sync-rules';
+import { CompatibilityOption, DEFAULT_HYDRATION_STATE, nodeSqlite, versionedHydrationState } from '@powersync/service-sync-rules';
 export class MongoPersistedSyncRules {
     id;
-    sync_rules;
+    syncConfigWithErrors;
     slot_name;
     mapping;
     storageConfig;
     hydrationState;
-    constructor(id, sync_rules, slot_name, mapping, storageConfig) {
+    constructor(id, syncConfigWithErrors, slot_name, mapping, storageConfig) {
         this.id = id;
-        this.sync_rules = sync_rules;
+        this.syncConfigWithErrors = syncConfigWithErrors;
         this.slot_name = slot_name;
         this.mapping = mapping;
         this.storageConfig = storageConfig;
@@ -19,7 +20,7 @@ export class MongoPersistedSyncRules {
             }
             this.hydrationState = new MongoHydrationState(this.mapping, this.id);
         }
-        else if (!this.sync_rules.config.compatibility.isEnabled(CompatibilityOption.versionedBucketIds) &&
+        else if (!this.syncConfigWithErrors.config.compatibility.isEnabled(CompatibilityOption.versionedBucketIds) &&
             !this.storageConfig.versionedBuckets) {
             this.hydrationState = DEFAULT_HYDRATION_STATE;
         }
@@ -27,8 +28,11 @@ export class MongoPersistedSyncRules {
             this.hydrationState = versionedHydrationState(this.id);
         }
     }
-    hydratedSyncRules() {
-        return this.sync_rules.config.hydrate({ hydrationState: this.hydrationState });
+    hydratedSyncConfig() {
+        return this.syncConfigWithErrors.config.hydrate({
+            hydrationState: this.hydrationState,
+            sqlite: nodeSqlite(sqlite)
+        });
     }
 }
 class MongoHydrationState {
@@ -42,7 +46,6 @@ class MongoHydrationState {
         // Keep this aligned with versionedHydrationState() for now.
         //
         // Previous Mongo-specific behavior:
-        // const defId = this.mapping.bucketSourceId(source);
         // return {
         //   bucketPrefix: defId,
         //   source

package/dist/storage/implementation/MongoPersistedSyncRules.js.map

@@ -1 +1 @@
-{"version":3,"file":"MongoPersistedSyncRules.js","sourceRoot":"","sources":["../../../src/storage/implementation/MongoPersistedSyncRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAGL,mBAAmB,EACnB,uBAAuB,EAKvB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAIvC,MAAM,OAAO,uBAAuB;IAIhB;IACA;IACA;IACC;IACA;IAPH,cAAc,CAAiB;IAE/C,YACkB,EAAU,EACV,UAAgC,EAChC,SAAiB,EAChB,OAAuC,EACvC,aAA4B;QAJ7B,OAAE,GAAF,EAAE,CAAQ;QACV,eAAU,GAAV,UAAU,CAAsB;QAChC,cAAS,GAAT,SAAS,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAgC;QACvC,kBAAa,GAAb,aAAa,CAAe;QAE7C,IAAI,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;YAC/C,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,qBAAqB,CAAC,oCAAoC,CAAC,CAAC;YACxE,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;aAAM,IACL,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,mBAAmB,CAAC,kBAAkB,CAAC;YACvF,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EACpC,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,uBAAuB,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACjF,CAAC;CACF;AAED,MAAM,mBAAmB;IAEJ;IACA;IAFnB,YACmB,OAAgC,EAChC,OAAe;QADf,YAAO,GAAP,OAAO,CAAyB;QAChC,YAAO,GAAP,OAAO,CAAQ;IAC/B,CAAC;IAEJ,oBAAoB,CAAC,MAAwB;QAC3C,4DAA4D;QAC5D,EAAE;QACF,oCAAoC;QACpC,qDAAqD;QACrD,WAAW;QACX,yBAAyB;QACzB,WAAW;QACX,KAAK;QACL,OAAO;YACL,YAAY,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE;YACpD,MAAM;SACP,CAAC;IACJ,CAAC;IAED,4BAA4B,CAAC,MAAmC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACrD,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,EAAE;YACX,MAAM;SACP,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"MongoPersistedSyncRules.js","sourceRoot":"","sources":["../../../src/storage/implementation/MongoPersistedSyncRules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAGL,mBAAmB,EACnB,uBAAuB,EAGvB,UAAU,EAIV,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AAIvC,MAAM,OAAO,uBAAuB;IAIhB;IACA;IACA;IACC;IACA;IAPH,cAAc,CAAiB;IAE/C,YACkB,EAAU,EACV,oBAA0C,EAC1C,SAAiB,EAChB,OAAuC,EACvC,aAA4B;QAJ7B,OAAE,GAAF,EAAE,CAAQ;QACV,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAgC;QACvC,kBAAa,GAAb,aAAa,CAAe;QAE7C,IAAI,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;YAC/C,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,qBAAqB,CAAC,oCAAoC,CAAC,CAAC;YACxE,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;aAAM,IACL,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,mBAAmB,CAAC,kBAAkB,CAAC;YACjG,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EACpC,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,uBAAuB,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC;YAC9C,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,mBAAmB;IAEJ;IACA;IAFnB,YACmB,OAAgC,EAChC,OAAe;QADf,YAAO,GAAP,OAAO,CAAyB;QAChC,YAAO,GAAP,OAAO,CAAQ;IAC/B,CAAC;IAEJ,oBAAoB,CAAC,MAAwB;QAC3C,4DAA4D;QAC5D,EAAE;QACF,oCAAoC;QACpC,WAAW;QACX,yBAAyB;QACzB,WAAW;QACX,KAAK;QACL,OAAO;YACL,YAAY,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE;YACpD,MAAM;SACP,CAAC;IACJ,CAAC;IAED,4BAA4B,CAAC,MAAmC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACrD,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,EAAE;YACX,MAAM;SACP,CAAC;IACJ,CAAC;CACF"}

package/dist/storage/implementation/MongoPersistedSyncRulesContent.d.ts

@@ -1,15 +1,29 @@
 import { mongo } from '@powersync/lib-service-mongodb';
 import { storage } from '@powersync/service-core';
+import * as bson from 'bson';
+import { ReplicationStreamDocumentV3, SyncConfigDefinition } from '../storage-index.js';
 import { BucketDefinitionMapping } from './BucketDefinitionMapping.js';
 import { MongoSyncRulesLock } from './MongoSyncRulesLock.js';
 import { PowerSyncMongo } from './db.js';
-import { SyncRuleDocument } from './models.js';
-export declare class MongoPersistedSyncRulesContent extends storage.PersistedSyncRulesContent {
-    private db;
+import { SyncRuleDocumentV1 } from './v1/models.js';
+declare abstract class MongoPersistedSyncRulesContentBase extends storage.PersistedSyncRulesContent {
+    protected readonly db: PowerSyncMongo;
     current_lock: MongoSyncRulesLock | null;
     readonly mapping: BucketDefinitionMapping;
-    constructor(db: PowerSyncMongo, doc: mongo.WithId<SyncRuleDocument>);
+    readonly syncConfigId: bson.ObjectId | null;
+    protected constructor(db: PowerSyncMongo, options: ConstructorParameters<typeof storage.PersistedSyncRulesContent>[0] & {
+        mapping: BucketDefinitionMapping;
+        syncConfigId: bson.ObjectId | null;
+    });
     getStorageConfig(): import("./models.js").StorageConfig;
     parsed(options: storage.ParseSyncRulesOptions): storage.PersistedSyncRules;
-    lock(): Promise<MongoSyncRulesLock>;
+    lock(session?: mongo.ClientSession): Promise<MongoSyncRulesLock>;
 }
+export declare class MongoPersistedSyncRulesContentV1 extends MongoPersistedSyncRulesContentBase {
+    constructor(db: PowerSyncMongo, doc: SyncRuleDocumentV1);
+}
+export declare class MongoPersistedSyncRulesContentV3 extends MongoPersistedSyncRulesContentBase {
+    readonly syncConfigId: bson.ObjectId;
+    constructor(db: PowerSyncMongo, doc: ReplicationStreamDocumentV3, config: SyncConfigDefinition);
+}
+export {};

package/dist/storage/implementation/MongoPersistedSyncRulesContent.js

@@ -1,14 +1,38 @@
-import { storage } from '@powersync/service-core';
+import { ServiceAssertionError } from '@powersync/lib-services-framework';
+import { storage, SyncRuleState } from '@powersync/service-core';
 import { BucketDefinitionMapping } from './BucketDefinitionMapping.js';
 import { MongoPersistedSyncRules } from './MongoPersistedSyncRules.js';
 import { MongoSyncRulesLock } from './MongoSyncRulesLock.js';
 import { getMongoStorageConfig } from './models.js';
-export class MongoPersistedSyncRulesContent extends storage.PersistedSyncRulesContent {
+class MongoPersistedSyncRulesContentBase extends storage.PersistedSyncRulesContent {
     db;
     current_lock = null;
     mapping;
+    syncConfigId;
+    constructor(db, options) {
+        const { mapping, syncConfigId, ...base } = options;
+        super(base);
+        this.db = db;
+        this.mapping = mapping;
+        this.syncConfigId = syncConfigId;
+    }
+    getStorageConfig() {
+        return getMongoStorageConfig(this.storageVersion);
+    }
+    parsed(options) {
+        const parsed = super.parsed(options);
+        const storageConfig = this.getStorageConfig();
+        return new MongoPersistedSyncRules(parsed.id, parsed.syncConfigWithErrors, parsed.slot_name, storageConfig.incrementalReprocessing ? this.mapping : null, storageConfig);
+    }
+    async lock(session) {
+        const lock = await MongoSyncRulesLock.createLock(this.db.versioned(this.getStorageConfig()), this, session);
+        this.current_lock = lock;
+        return lock;
+    }
+}
+export class MongoPersistedSyncRulesContentV1 extends MongoPersistedSyncRulesContentBase {
     constructor(db, doc) {
-        super({
+        super(db, {
             id: doc._id,
             sync_rules_content: doc.content,
             compiled_plan: doc.serialized_plan ?? null,
@@ -19,24 +43,34 @@ export class MongoPersistedSyncRulesContent extends storage.PersistedSyncRulesCo
             last_fatal_error_ts: doc.last_fatal_error_ts,
             last_checkpoint_ts: doc.last_checkpoint_ts,
             last_keepalive_ts: doc.last_keepalive_ts,
-            active: doc.state == 'ACTIVE',
-            storageVersion: doc.storage_version ?? storage.LEGACY_STORAGE_VERSION
+            active: doc.state == SyncRuleState.ACTIVE,
+            storageVersion: doc.storage_version ?? storage.LEGACY_STORAGE_VERSION,
+            mapping: new BucketDefinitionMapping(),
+            syncConfigId: null
         });
-        this.db = db;
-        this.mapping = BucketDefinitionMapping.fromSyncRules(doc);
     }
-    getStorageConfig() {
-        return getMongoStorageConfig(this.storageVersion);
-    }
-    parsed(options) {
-        const parsed = super.parsed(options);
-        const storageConfig = this.getStorageConfig();
-        return new MongoPersistedSyncRules(parsed.id, parsed.sync_rules, parsed.slot_name, storageConfig.incrementalReprocessing ? this.mapping : null, storageConfig);
-    }
-    async lock() {
-        const lock = await MongoSyncRulesLock.createLock(this.db.versioned(this.getStorageConfig()), this);
-        this.current_lock = lock;
-        return lock;
+}
+export class MongoPersistedSyncRulesContentV3 extends MongoPersistedSyncRulesContentBase {
+    constructor(db, doc, config) {
+        const state = doc.sync_configs.find((c) => c._id.equals(config._id));
+        if (state == null) {
+            throw new ServiceAssertionError(`Cannot find sync config ${config._id} in replication stream ${doc._id}`);
+        }
+        super(db, {
+            id: doc._id,
+            sync_rules_content: config.content,
+            compiled_plan: config.serialized_plan ?? null,
+            last_checkpoint_lsn: state?.last_checkpoint_lsn ?? null,
+            slot_name: doc.slot_name ?? `powersync_${doc._id}`,
+            last_fatal_error: doc.last_fatal_error,
+            last_fatal_error_ts: doc.last_fatal_error_ts,
+            last_checkpoint_ts: doc.last_checkpoint_ts,
+            last_keepalive_ts: doc.last_keepalive_ts,
+            active: doc.state == SyncRuleState.ACTIVE && state.state == SyncRuleState.ACTIVE,
+            storageVersion: doc.storage_version,
+            mapping: BucketDefinitionMapping.fromSyncConfig(config),
+            syncConfigId: config._id
+        });
     }
 }
 //# sourceMappingURL=MongoPersistedSyncRulesContent.js.map

package/dist/storage/implementation/MongoPersistedSyncRulesContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"MongoPersistedSyncRulesContent.js","sourceRoot":"","sources":["../../../src/storage/implementation/MongoPersistedSyncRulesContent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,aAAa,CAAC;AAEtE,MAAM,OAAO,8BAA+B,SAAQ,OAAO,CAAC,yBAAyB;IAKzE;IAJH,YAAY,GAA8B,IAAI,CAAC;IACtC,OAAO,CAA0B;IAEjD,YACU,EAAkB,EAC1B,GAAmC;QAEnC,KAAK,CAAC;YACJ,EAAE,EAAE,GAAG,CAAC,GAAG;YACX,kBAAkB,EAAE,GAAG,CAAC,OAAO;YAC/B,aAAa,EAAE,GAAG,CAAC,eAAe,IAAI,IAAI;YAC1C,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;YAC5C,uBAAuB;YACvB,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,aAAa,GAAG,CAAC,GAAG,EAAE;YAClD,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;YAC5C,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;YAC1C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,QAAQ;YAC7B,cAAc,EAAE,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,sBAAsB;SACtE,CAAC,CAAC;QAhBK,OAAE,GAAF,EAAE,CAAgB;QAiB1B,IAAI,CAAC,OAAO,GAAG,uBAAuB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5D,CAAC;IAED,gBAAgB;QACd,OAAO,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,OAAsC;QAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9C,OAAO,IAAI,uBAAuB,CAChC,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,SAAS,EAChB,aAAa,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAC3D,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACnG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"MongoPersistedSyncRulesContent.js","sourceRoot":"","sources":["../../../src/storage/implementation/MongoPersistedSyncRulesContent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAe,kCAAmC,SAAQ,OAAO,CAAC,yBAAyB;IAMpE;IALd,YAAY,GAA8B,IAAI,CAAC;IACtC,OAAO,CAA0B;IACjC,YAAY,CAAuB;IAEnD,YACqB,EAAkB,EACrC,OAGC;QAED,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QACnD,KAAK,CAAC,IAAI,CAAC,CAAC;QAPO,OAAE,GAAF,EAAE,CAAgB;QAQrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,gBAAgB;QACd,OAAO,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,OAAsC;QAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9C,OAAO,IAAI,uBAAuB,CAChC,MAAM,CAAC,EAAE,EACT,MAAM,CAAC,oBAAoB,EAC3B,MAAM,CAAC,SAAS,EAChB,aAAa,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAC3D,aAAa,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA6B;QACtC,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5G,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,MAAM,OAAO,gCAAiC,SAAQ,kCAAkC;IACtF,YAAY,EAAkB,EAAE,GAAuB;QACrD,KAAK,CAAC,EAAE,EAAE;YACR,EAAE,EAAE,GAAG,CAAC,GAAG;YACX,kBAAkB,EAAE,GAAG,CAAC,OAAO;YAC/B,aAAa,EAAE,GAAG,CAAC,eAAe,IAAI,IAAI;YAC1C,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;YAC5C,uBAAuB;YACvB,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,aAAa,GAAG,CAAC,GAAG,EAAE;YAClD,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;YAC5C,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;YAC1C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM;YACzC,cAAc,EAAE,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,sBAAsB;YACrE,OAAO,EAAE,IAAI,uBAAuB,EAAE;YACtC,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,gCAAiC,SAAQ,kCAAkC;IAGtF,YAAY,EAAkB,EAAE,GAAgC,EAAE,MAA4B;QAC5F,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACrE,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAqB,CAAC,2BAA2B,MAAM,CAAC,GAAG,0BAA0B,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5G,CAAC;QACD,KAAK,CAAC,EAAE,EAAE;YACR,EAAE,EAAE,GAAG,CAAC,GAAG;YACX,kBAAkB,EAAE,MAAM,CAAC,OAAO;YAClC,aAAa,EAAE,MAAM,CAAC,eAAe,IAAI,IAAI;YAE7C,mBAAmB,EAAE,KAAK,EAAE,mBAAmB,IAAI,IAAI;YACvD,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,aAAa,GAAG,CAAC,GAAG,EAAE;YAClD,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;YACtC,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;YAC5C,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;YAC1C,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM;YAChF,cAAc,EAAE,GAAG,CAAC,eAAe;YACnC,OAAO,EAAE,uBAAuB,CAAC,cAAc,CAAC,MAAM,CAAC;YACvD,YAAY,EAAE,MAAM,CAAC,GAAG;SACzB,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/storage/implementation/MongoSyncBucketStorage.d.ts

@@ -1,17 +1,17 @@
 import { mongo } from '@powersync/lib-service-mongodb';
 import { BaseObserver, DO_NOT_LOG, Logger } from '@powersync/lib-services-framework';
 import { CheckpointChanges, GetCheckpointChangesOptions, InternalOpId, PopulateChecksumCacheOptions, PopulateChecksumCacheResults, ReplicationCheckpoint, storage, utils, WatchWriteCheckpointOptions } from '@powersync/service-core';
-import { HydratedSyncRules, ParameterLookupRows, ScopedParameterLookup } from '@powersync/service-sync-rules';
+import { HydratedSyncConfig, ParameterLookupRows, ScopedParameterLookup } from '@powersync/service-sync-rules';
 import * as bson from 'bson';
 import { MongoBucketStorage } from '../MongoBucketStorage.js';
 import { MongoSyncBucketStorageContext } from './common/MongoSyncBucketStorageContext.js';
 import type { VersionedPowerSyncMongo } from './db.js';
-import { CommonSourceTableDocument, StorageConfig } from './models.js';
+import { StorageConfig } from './models.js';
 import { MongoBucketBatchOptions } from './MongoBucketBatch.js';
 import { MongoChecksumOptions, MongoChecksums } from './MongoChecksums.js';
 import { MongoCompactOptions, MongoCompactor } from './MongoCompactor.js';
 import { MongoParameterCompactor } from './MongoParameterCompactor.js';
-import { MongoPersistedSyncRulesContent } from './MongoPersistedSyncRulesContent.js';
+import { MongoPersistedSyncRulesContentV1 } from './MongoPersistedSyncRulesContent.js';
 export interface MongoSyncBucketStorageOptions {
     checksumOptions?: Omit<MongoChecksumOptions, 'storageConfig' | 'mapping'>;
     storageConfig: StorageConfig;
@@ -20,11 +20,17 @@ interface InternalCheckpointChanges extends CheckpointChanges {
     updatedWriteCheckpoints: Map<string, bigint>;
     invalidateWriteCheckpoints: boolean;
 }
+interface WriterSyncState {
+    lastCheckpointLsn: string | null;
+    resumeFromLsn: string | null;
+    keepaliveOp: InternalOpId | null;
+    syncConfigId?: bson.ObjectId | null;
+}
 export declare abstract class MongoSyncBucketStorage extends BaseObserver<storage.SyncRulesBucketStorageListener> implements storage.SyncRulesBucketStorage {
     #private;
     readonly factory: MongoBucketStorage;
     readonly group_id: number;
-    protected readonly sync_rules: MongoPersistedSyncRulesContent;
+    protected readonly sync_rules: MongoPersistedSyncRulesContentV1;
     readonly slot_name: string;
     readonly db: VersionedPowerSyncMongo;
     [DO_NOT_LOG]: boolean;
@@ -32,7 +38,8 @@ export declare abstract class MongoSyncBucketStorage extends BaseObserver<storag
     private parsedSyncRulesCache;
     private writeCheckpointAPI;
     readonly logger: Logger;
-    constructor(factory: MongoBucketStorage, group_id: number, sync_rules: MongoPersistedSyncRulesContent, slot_name: string, writeCheckpointMode: storage.WriteCheckpointMode | undefined, options: MongoSyncBucketStorageOptions);
+    readonly storageConfig: StorageConfig;
+    constructor(factory: MongoBucketStorage, group_id: number, sync_rules: MongoPersistedSyncRulesContentV1, slot_name: string, writeCheckpointMode: storage.WriteCheckpointMode | undefined, options: MongoSyncBucketStorageOptions);
     /**
      * Not for external use - public here for tests only.
      *
@@ -47,31 +54,35 @@ export declare abstract class MongoSyncBucketStorage extends BaseObserver<storag
     setWriteCheckpointMode(mode: storage.WriteCheckpointMode): void;
     createManagedWriteCheckpoint(checkpoint: storage.ManagedWriteCheckpointOptions): Promise<bigint>;
     lastWriteCheckpoint(filters: storage.SyncStorageLastWriteCheckpointFilters): Promise<bigint | null>;
-    getParsedSyncRules(options: storage.ParseSyncRulesOptions): HydratedSyncRules;
+    getParsedSyncRules(options: storage.ParseSyncRulesOptions): HydratedSyncConfig;
     getCheckpoint(): Promise<storage.ReplicationCheckpoint>;
+    protected abstract fetchCheckpointState(session: mongo.ClientSession): Promise<{
+        checkpoint: bigint;
+        lsn: string | null;
+    } | null>;
     getCheckpointInternal(): Promise<storage.ReplicationCheckpoint | null>;
     protected abstract initializeVersionStorage(): Promise<void>;
     private initializeStorage;
     protected abstract createWriterImpl(batchOptions: MongoBucketBatchOptions): storage.BucketStorageBatch;
+    protected abstract getWriterSyncState(): Promise<WriterSyncState>;
     createWriter(options: storage.CreateWriterOptions): Promise<storage.BucketStorageBatch>;
     startBatch(options: storage.CreateWriterOptions, callback: (batch: storage.BucketStorageBatch) => Promise<void>): Promise<storage.FlushedResult | null>;
-    protected abstract sourceTableBaseId(): Partial<CommonSourceTableDocument>;
-    protected abstract augmentCreatedSourceTableDocument(createDoc: CommonSourceTableDocument, options: storage.ResolveTableOptions, candidateSourceTable: storage.SourceTable): void;
-    protected abstract initializeResolvedSourceRecords(sourceTableId: bson.ObjectId): Promise<void>;
-    resolveTable(options: storage.ResolveTableOptions): Promise<storage.ResolveTableResult>;
     protected abstract getParameterSetsImpl(checkpoint: MongoReplicationCheckpoint, lookups: ScopedParameterLookup[], limit: number): Promise<ParameterLookupRows[]>;
     getParameterSets(checkpoint: MongoReplicationCheckpoint, lookups: ScopedParameterLookup[], limit: number): Promise<ParameterLookupRows[]>;
     protected abstract getBucketDataBatchImpl(checkpoint: utils.InternalOpId, dataBuckets: storage.BucketDataRequest[], options?: storage.BucketDataBatchOptions): AsyncIterable<storage.SyncBucketDataChunk>;
     getBucketDataBatch(checkpoint: utils.InternalOpId, dataBuckets: storage.BucketDataRequest[], options?: storage.BucketDataBatchOptions): AsyncIterable<storage.SyncBucketDataChunk>;
     getChecksums(checkpoint: utils.InternalOpId, buckets: storage.BucketChecksumRequest[]): Promise<utils.ChecksumMap>;
     clearChecksumCache(): void;
+    protected abstract terminateSyncRuleState(): Promise<void>;
     terminate(options?: storage.TerminateOptions): Promise<void>;
+    protected abstract getStatusImpl(): Promise<storage.SyncRuleStatus>;
     getStatus(): Promise<storage.SyncRuleStatus>;
     protected abstract clearBucketData(signal?: AbortSignal): Promise<void>;
     protected abstract clearParameterIndexes(signal?: AbortSignal): Promise<void>;
     protected abstract clearSourceRecords(signal?: AbortSignal): Promise<void>;
     protected abstract clearBucketState(signal?: AbortSignal): Promise<void>;
     protected abstract clearSourceTables(signal?: AbortSignal): Promise<void>;
+    protected abstract clearSyncRuleState(): Promise<void>;
     clear(options?: storage.ClearStorageOptions): Promise<void>;
     protected clearDeleteMany(label: string, operation: () => Promise<mongo.DeleteResult>, signal?: AbortSignal): Promise<void>;
     reportError(e: any): Promise<void>;

package/dist/storage/implementation/MongoSyncBucketStorage.js

@@ -1,7 +1,6 @@
 import * as lib_mongo from '@powersync/lib-service-mongodb';
 import { BaseObserver, DO_NOT_LOG, ReplicationAbortedError, ServiceAssertionError } from '@powersync/lib-services-framework';
-import { BroadcastIterable, CHECKPOINT_INVALIDATE_ALL, maxLsn, mergeAsyncIterables, storage } from '@powersync/service-core';
-import * as bson from 'bson';
+import { BroadcastIterable, CHECKPOINT_INVALIDATE_ALL, mergeAsyncIterables, storage } from '@powersync/service-core';
 import { LRUCache } from 'lru-cache';
 import * as timers from 'timers/promises';
 import { retryOnMongoMaxTimeMSExpired } from '../../utils/util.js';
@@ -27,6 +26,7 @@ export class MongoSyncBucketStorage extends BaseObserver {
     parsedSyncRulesCache;
     writeCheckpointAPI;
     logger;
+    storageConfig;
     #storageInitialized = false;
     constructor(factory, group_id, sync_rules, slot_name, writeCheckpointMode, options) {
         super();
@@ -34,7 +34,8 @@ export class MongoSyncBucketStorage extends BaseObserver {
         this.group_id = group_id;
         this.sync_rules = sync_rules;
         this.slot_name = slot_name;
-        this.db = factory.db.versioned(sync_rules.getStorageConfig());
+        this.storageConfig = options.storageConfig;
+        this.db = factory.db.versioned(this.storageConfig);
         this.checksums = this.createMongoChecksums(options);
         this.writeCheckpointAPI = new MongoWriteCheckpointAPI({
             db: this.db,
@@ -71,7 +72,7 @@ export class MongoSyncBucketStorage extends BaseObserver {
     getParsedSyncRules(options) {
         const { parsed, options: cachedOptions } = this.parsedSyncRulesCache ?? {};
         if (!parsed || options.defaultSchema != cachedOptions?.defaultSchema) {
-            this.parsedSyncRulesCache = { parsed: this.sync_rules.parsed(options).hydratedSyncRules(), options };
+            this.parsedSyncRulesCache = { parsed: this.sync_rules.parsed(options).hydratedSyncConfig(), options };
         }
         return this.parsedSyncRulesCache.parsed;
     }
@@ -80,18 +81,15 @@ export class MongoSyncBucketStorage extends BaseObserver {
     }
     async getCheckpointInternal() {
         return await this.db.client.withSession({ snapshot: true }, async (session) => {
-            const doc = await this.db.sync_rules.findOne({ _id: this.group_id }, {
-                session,
-                projection: { _id: 1, state: 1, last_checkpoint: 1, last_checkpoint_lsn: 1, snapshot_done: 1 }
-            });
-            if (!doc?.snapshot_done || !['ACTIVE', 'ERRORED'].includes(doc.state)) {
+            const state = await this.fetchCheckpointState(session);
+            if (state == null) {
                 return null;
             }
             const snapshotTime = session.snapshotTime;
             if (snapshotTime == null) {
                 throw new ServiceAssertionError('Missing snapshotTime in getCheckpoint()');
             }
-            return new MongoReplicationCheckpoint(this, doc.last_checkpoint ?? 0n, doc.last_checkpoint_lsn ?? null, snapshotTime);
+            return new MongoReplicationCheckpoint(this, state.checkpoint, state.lsn, snapshotTime);
         });
     }
     async initializeStorage() {
@@ -104,23 +102,22 @@ export class MongoSyncBucketStorage extends BaseObserver {
     }
     async createWriter(options) {
         await this.initializeStorage();
-        const doc = await this.db.sync_rules.findOne({
-            _id: this.group_id
-        }, { projection: { last_checkpoint_lsn: 1, no_checkpoint_before: 1, keepalive_op: 1, snapshot_lsn: 1 } });
-        const checkpoint_lsn = doc?.last_checkpoint_lsn ?? null;
+        const state = await this.getWriterSyncState();
         const batchOptions = {
             logger: options.logger ?? this.logger,
             db: this.db,
-            syncRules: this.sync_rules.parsed(options).hydratedSyncRules(),
+            syncRules: this.sync_rules.parsed(options).hydratedSyncConfig(),
             mapping: this.sync_rules.mapping,
             groupId: this.group_id,
             slotName: this.slot_name,
-            lastCheckpointLsn: checkpoint_lsn,
-            resumeFromLsn: maxLsn(checkpoint_lsn, doc?.snapshot_lsn),
-            keepaliveOp: doc?.keepalive_op ? BigInt(doc.keepalive_op) : null,
+            lastCheckpointLsn: state.lastCheckpointLsn,
+            resumeFromLsn: state.resumeFromLsn,
+            keepaliveOp: state.keepaliveOp,
             storeCurrentData: options.storeCurrentData,
             skipExistingRows: options.skipExistingRows ?? false,
             markRecordUnavailable: options.markRecordUnavailable,
+            hooks: options.hooks,
+            syncConfigId: state.syncConfigId,
             tracer: options.tracer
         };
         const writer = this.createWriterImpl(batchOptions);
@@ -133,109 +130,6 @@ export class MongoSyncBucketStorage extends BaseObserver {
         await writer.flush();
         return writer.last_flushed_op != null ? { flushed_op: writer.last_flushed_op } : null;
     }
-    async resolveTable(options) {
-        const { group_id, connection_id, connection_tag, entity_descriptor } = options;
-        const { schema, name, objectId, replicaIdColumns } = entity_descriptor;
-        const normalizedReplicaIdColumns = replicaIdColumns.map((column) => ({
-            name: column.name,
-            type: column.type,
-            type_oid: column.typeId
-        }));
-        let result = null;
-        let initializeSourceRecordsFor = null;
-        const baseId = this.sourceTableBaseId();
-        await this.db.client.withSession(async (session) => {
-            const col = this.db.commonSourceTables(group_id);
-            let filter = {
-                ...baseId,
-                connection_id: connection_id,
-                schema_name: schema,
-                table_name: name,
-                replica_id_columns2: normalizedReplicaIdColumns
-            };
-            if (objectId != null) {
-                filter.relation_id = objectId;
-            }
-            let doc = await col.findOne(filter, { session });
-            if (doc == null) {
-                const candidateSourceTable = new storage.SourceTable({
-                    id: new bson.ObjectId(),
-                    connectionTag: connection_tag,
-                    objectId: objectId,
-                    schema: schema,
-                    name: name,
-                    replicaIdColumns: replicaIdColumns,
-                    snapshotComplete: false
-                });
-                const createDoc = {
-                    _id: candidateSourceTable.id,
-                    ...baseId,
-                    connection_id: connection_id,
-                    relation_id: objectId,
-                    schema_name: schema,
-                    table_name: name,
-                    replica_id_columns: null,
-                    replica_id_columns2: normalizedReplicaIdColumns,
-                    snapshot_done: false,
-                    snapshot_status: undefined
-                };
-                this.augmentCreatedSourceTableDocument(createDoc, options, candidateSourceTable);
-                doc = createDoc;
-                await col.insertOne(doc, { session });
-                initializeSourceRecordsFor = doc._id;
-            }
-            const sourceTable = new storage.SourceTable({
-                id: doc._id,
-                connectionTag: connection_tag,
-                objectId: objectId,
-                schema: schema,
-                name: name,
-                replicaIdColumns: replicaIdColumns,
-                snapshotComplete: doc.snapshot_done ?? true
-            });
-            sourceTable.syncEvent = options.sync_rules.tableTriggersEvent(sourceTable);
-            sourceTable.syncData = options.sync_rules.tableSyncsData(sourceTable);
-            sourceTable.syncParameters = options.sync_rules.tableSyncsParameters(sourceTable);
-            sourceTable.snapshotStatus =
-                doc.snapshot_status == null
-                    ? undefined
-                    : {
-                        lastKey: doc.snapshot_status.last_key?.buffer ?? null,
-                        totalEstimatedCount: doc.snapshot_status.total_estimated_count,
-                        replicatedCount: doc.snapshot_status.replicated_count
-                    };
-            let dropTables = [];
-            let truncateFilter = [{ schema_name: schema, table_name: name }];
-            if (objectId != null) {
-                truncateFilter.push({ relation_id: objectId });
-            }
-            const truncate = await col
-                .find({
-                ...baseId,
-                connection_id: connection_id,
-                _id: { $ne: doc._id },
-                $or: truncateFilter
-            }, { session })
-                .toArray();
-            dropTables = truncate.map((doc) => new storage.SourceTable({
-                id: doc._id,
-                connectionTag: connection_tag,
-                objectId: doc.relation_id,
-                schema: doc.schema_name,
-                name: doc.table_name,
-                replicaIdColumns: doc.replica_id_columns2?.map((c) => ({ name: c.name, typeOid: c.type_oid, type: c.type })) ?? [],
-                snapshotComplete: doc.snapshot_done ?? true
-            }));
-            result = {
-                table: sourceTable,
-                dropTables: dropTables
-            };
-        });
-        if (initializeSourceRecordsFor != null) {
-            await this.initializeResolvedSourceRecords(initializeSourceRecordsFor);
-        }
-        return result;
-    }
     async getParameterSets(checkpoint, lookups, limit) {
         return this.getParameterSetsImpl(checkpoint, lookups, limit);
     }
@@ -252,57 +146,18 @@ export class MongoSyncBucketStorage extends BaseObserver {
         if (!options || options?.clearStorage) {
             await this.clear(options);
         }
-        await this.db.sync_rules.updateOne({
-            _id: this.group_id
-        }, {
-            $set: {
-                state: storage.SyncRuleState.TERMINATED,
-                persisted_lsn: null,
-                snapshot_done: false
-            }
-        });
+        await this.terminateSyncRuleState();
         await this.db.notifyCheckpoint();
     }
     async getStatus() {
-        const doc = await this.db.sync_rules.findOne({
-            _id: this.group_id
-        }, {
-            projection: {
-                snapshot_done: 1,
-                last_checkpoint_lsn: 1,
-                state: 1,
-                snapshot_lsn: 1
-            }
-        });
-        if (doc == null) {
-            throw new ServiceAssertionError('Cannot find replication stream status');
-        }
-        return {
-            snapshot_done: doc.snapshot_done,
-            snapshot_lsn: doc.snapshot_lsn ?? null,
-            active: doc.state == 'ACTIVE',
-            checkpoint_lsn: doc.last_checkpoint_lsn
-        };
+        return this.getStatusImpl();
     }
     async clear(options) {
         const signal = options?.signal;
         if (signal?.aborted) {
             throw new ReplicationAbortedError('Aborted clearing data', signal.reason);
         }
-        await this.db.sync_rules.updateOne({
-            _id: this.group_id
-        }, {
-            $set: {
-                snapshot_done: false,
-                persisted_lsn: null,
-                last_checkpoint_lsn: null,
-                last_checkpoint: null,
-                no_checkpoint_before: null
-            },
-            $unset: {
-                snapshot_lsn: 1
-            }
-        }, { maxTimeMS: lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS });
+        await this.clearSyncRuleState();
         await this.clearBucketData(signal);
         await this.clearParameterIndexes(signal);
         await this.clearSourceRecords(signal);