@powersync/service-core 0.8.8 → 0.10.0

package/test/src/__snapshots__/sync.test.ts.snap

@@ -56,21 +56,21 @@ exports[`sync - mongodb > compacting data - invalidate checkpoint 2`] = `
       "data": [
         {
           "checksum": 1859363232n,
-          "data": "{\\"id\\":\\"t1\\",\\"description\\":\\"Test 1b\\"}",
+          "data": "{"id":"t1","description":"Test 1b"}",
           "object_id": "t1",
           "object_type": "test",
           "op": "PUT",
           "op_id": "3",
-          "subkey": "6544e3899293153fa7b38331/117ab485-4b42-58a2-ab32-0053a22c3423",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
         },
         {
           "checksum": 3028503153n,
-          "data": "{\\"id\\":\\"t2\\",\\"description\\":\\"Test 2b\\"}",
+          "data": "{"id":"t2","description":"Test 2b"}",
           "object_id": "t2",
           "object_type": "test",
           "op": "PUT",
           "op_id": "4",
-          "subkey": "6544e3899293153fa7b38331/ec27c691-b47a-5d92-927a-9944feb89eee",
+          "subkey": "13423353-9f27-59b4-baf0-64a5e09f1769",
         },
       ],
       "has_more": false,
@@ -146,21 +146,21 @@ exports[`sync - mongodb > sync global data 1`] = `
       "data": [
         {
           "checksum": 920318466n,
-          "data": "{\\"id\\":\\"t1\\",\\"description\\":\\"Test 1\\"}",
+          "data": "{"id":"t1","description":"Test 1"}",
           "object_id": "t1",
           "object_type": "test",
           "op": "PUT",
           "op_id": "1",
-          "subkey": "6544e3899293153fa7b38331/117ab485-4b42-58a2-ab32-0053a22c3423",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
         },
         {
           "checksum": 3280762209n,
-          "data": "{\\"id\\":\\"t2\\",\\"description\\":\\"Test 2\\"}",
+          "data": "{"id":"t2","description":"Test 2"}",
           "object_id": "t2",
           "object_type": "test",
           "op": "PUT",
           "op_id": "2",
-          "subkey": "6544e3899293153fa7b38331/ec27c691-b47a-5d92-927a-9944feb89eee",
+          "subkey": "13423353-9f27-59b4-baf0-64a5e09f1769",
         },
       ],
       "has_more": false,
@@ -199,7 +199,7 @@ exports[`sync - mongodb > sync legacy non-raw data 1`] = `
           "checksum": 3442149460n,
           "data": {
             "description": "Test
-\\"string\\"",
+"string"",
             "id": "t1",
             "large_num": 12345678901234567890n,
           },
@@ -207,7 +207,7 @@ exports[`sync - mongodb > sync legacy non-raw data 1`] = `
           "object_type": "test",
           "op": "PUT",
           "op_id": "1",
-          "subkey": "6544e3899293153fa7b38331/117ab485-4b42-58a2-ab32-0053a22c3423",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
         },
       ],
       "has_more": false,
@@ -268,12 +268,12 @@ exports[`sync - mongodb > sync updates to global data 2`] = `
       "data": [
         {
           "checksum": 920318466n,
-          "data": "{\\"id\\":\\"t1\\",\\"description\\":\\"Test 1\\"}",
+          "data": "{"id":"t1","description":"Test 1"}",
           "object_id": "t1",
           "object_type": "test",
           "op": "PUT",
           "op_id": "1",
-          "subkey": "6544e3899293153fa7b38331/117ab485-4b42-58a2-ab32-0053a22c3423",
+          "subkey": "e5aa2ddc-1328-58fa-a000-0b5ed31eaf1a",
         },
       ],
       "has_more": false,
@@ -311,12 +311,12 @@ exports[`sync - mongodb > sync updates to global data 3`] = `
       "data": [
         {
           "checksum": 3280762209n,
-          "data": "{\\"id\\":\\"t2\\",\\"description\\":\\"Test 2\\"}",
+          "data": "{"id":"t2","description":"Test 2"}",
           "object_id": "t2",
           "object_type": "test",
           "op": "PUT",
           "op_id": "2",
-          "subkey": "6544e3899293153fa7b38331/ec27c691-b47a-5d92-927a-9944feb89eee",
+          "subkey": "13423353-9f27-59b4-baf0-64a5e09f1769",
         },
       ],
       "has_more": false,

package/test/src/auth.test.ts

@@ -1,11 +1,11 @@
-import { describe, expect, test } from 'vitest';
-import { StaticKeyCollector } from '../../src/auth/StaticKeyCollector.js';
+import { CachedKeyCollector } from '@/auth/CachedKeyCollector.js';
+import { KeyResult } from '@/auth/KeyCollector.js';
+import { KeySpec } from '@/auth/KeySpec.js';
+import { KeyStore } from '@/auth/KeyStore.js';
+import { RemoteJWKSCollector } from '@/auth/RemoteJWKSCollector.js';
+import { StaticKeyCollector } from '@/auth/StaticKeyCollector.js';
 import * as jose from 'jose';
-import { KeyStore } from '../../src/auth/KeyStore.js';
-import { KeySpec } from '../../src/auth/KeySpec.js';
-import { RemoteJWKSCollector } from '../../src/auth/RemoteJWKSCollector.js';
-import { KeyResult } from '../../src/auth/KeyCollector.js';
-import { CachedKeyCollector } from '../../src/auth/CachedKeyCollector.js';
+import { describe, expect, test } from 'vitest';
 
 const publicKey: jose.JWK = {
   use: 'sig',

package/test/src/broadcast_iterable.test.ts

@@ -1,3 +1,4 @@
+import { BroadcastIterable, IterableSource } from '@/sync/BroadcastIterable.js';
 import { AsyncIterableX, interval } from 'ix/asynciterable/index.js';
 import { delayEach } from 'ix/asynciterable/operators/delayeach.js';
 import { take } from 'ix/asynciterable/operators/take.js';
@@ -5,7 +6,6 @@ import { wrapWithAbort } from 'ix/asynciterable/operators/withabort.js';
 import { toArray } from 'ix/asynciterable/toarray.js';
 import * as timers from 'timers/promises';
 import { describe, expect, test } from 'vitest';
-import { BroadcastIterable, IterableSource } from '../../src/sync/BroadcastIterable.js';
 
 describe('BroadcastIterable', () => {
   test('should iterate', async () => {

package/test/src/compacting.test.ts

@@ -1,9 +1,9 @@
-import { SqlSyncRules } from '@powersync/service-sync-rules';
-import { describe, expect, test } from 'vitest';
-import { makeTestTable, MONGO_STORAGE_FACTORY } from './util.js';
-import { oneFromAsync } from './wal_stream_utils.js';
+import { SaveOperationTag } from '@/storage/BucketStorage.js';
 import { MongoCompactOptions } from '@/storage/mongo/MongoCompactor.js';
-import { reduceBucket, validateCompactedBucket, validateBucket } from './bucket_validation.js';
+import { describe, expect, test } from 'vitest';
+import { validateCompactedBucket } from './bucket_validation.js';
+import { oneFromAsync } from './stream_utils.js';
+import { BATCH_OPTIONS, makeTestTable, MONGO_STORAGE_FACTORY, rid, testRules } from './util.js';
 
 const TEST_TABLE = makeTestTable('test', ['id']);
 
@@ -18,37 +18,40 @@ function compactTests(compactOptions: MongoCompactOptions) {
   const factory = MONGO_STORAGE_FACTORY;
 
   test('compacting (1)', async () => {
-    const sync_rules = SqlSyncRules.fromYaml(`
+    const sync_rules = testRules(`
 bucket_definitions:
   global:
     data: [select * from test]
     `);
 
-    const storage = (await factory()).getInstance({ id: 1, sync_rules, slot_name: 'test' });
+    const storage = (await factory()).getInstance(sync_rules);
 
-    const result = await storage.startBatch({}, async (batch) => {
+    const result = await storage.startBatch(BATCH_OPTIONS, async (batch) => {
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'insert',
+        tag: SaveOperationTag.INSERT,
         after: {
           id: 't1'
-        }
+        },
+        afterReplicaId: rid('t1')
       });
 
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'insert',
+        tag: SaveOperationTag.INSERT,
         after: {
           id: 't2'
-        }
+        },
+        afterReplicaId: rid('t2')
       });
 
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'update',
+        tag: SaveOperationTag.UPDATE,
         after: {
           id: 't2'
-        }
+        },
+        afterReplicaId: rid('t2')
       });
     });
 
@@ -112,45 +115,49 @@ bucket_definitions:
   });
 
   test('compacting (2)', async () => {
-    const sync_rules = SqlSyncRules.fromYaml(`
+    const sync_rules = testRules(`
 bucket_definitions:
   global:
     data: [select * from test]
     `);
 
-    const storage = (await factory()).getInstance({ id: 1, sync_rules, slot_name: 'test' });
+    const storage = (await factory()).getInstance(sync_rules);
 
-    const result = await storage.startBatch({}, async (batch) => {
+    const result = await storage.startBatch(BATCH_OPTIONS, async (batch) => {
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'insert',
+        tag: SaveOperationTag.INSERT,
         after: {
           id: 't1'
-        }
+        },
+        afterReplicaId: rid('t1')
       });
 
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'insert',
+        tag: SaveOperationTag.INSERT,
         after: {
           id: 't2'
-        }
+        },
+        afterReplicaId: rid('t2')
       });
 
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'delete',
+        tag: SaveOperationTag.DELETE,
         before: {
           id: 't1'
-        }
+        },
+        beforeReplicaId: rid('t1')
       });
 
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'update',
+        tag: SaveOperationTag.UPDATE,
         after: {
           id: 't2'
-        }
+        },
+        afterReplicaId: rid('t2')
       });
     });
 
@@ -213,51 +220,54 @@ bucket_definitions:
   });
 
   test('compacting (3)', async () => {
-    const sync_rules = SqlSyncRules.fromYaml(`
+    const sync_rules = testRules(`
 bucket_definitions:
   global:
     data: [select * from test]
     `);
 
-    const storage = (await factory()).getInstance({ id: 1, sync_rules, slot_name: 'test' });
+    const storage = (await factory()).getInstance(sync_rules);
 
-    const result = await storage.startBatch({}, async (batch) => {
+    const result = await storage.startBatch(BATCH_OPTIONS, async (batch) => {
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'insert',
+        tag: SaveOperationTag.INSERT,
         after: {
           id: 't1'
-        }
+        },
+        afterReplicaId: 't1'
       });
 
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'insert',
+        tag: SaveOperationTag.INSERT,
         after: {
           id: 't2'
-        }
+        },
+        afterReplicaId: 't2'
       });
 
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'delete',
+        tag: SaveOperationTag.DELETE,
         before: {
           id: 't1'
-        }
+        },
+        beforeReplicaId: 't1'
       });
     });
 
     const checkpoint1 = result!.flushed_op;
     const checksumBefore = await storage.getChecksums(checkpoint1, ['global[]']);
-    console.log('before', checksumBefore);
 
-    const result2 = await storage.startBatch({}, async (batch) => {
+    const result2 = await storage.startBatch(BATCH_OPTIONS, async (batch) => {
       await batch.save({
         sourceTable: TEST_TABLE,
-        tag: 'delete',
+        tag: SaveOperationTag.DELETE,
         before: {
           id: 't2'
-        }
+        },
+        beforeReplicaId: 't2'
       });
     });
     const checkpoint2 = result2!.flushed_op;
@@ -271,7 +281,7 @@ bucket_definitions:
     expect(batchAfter.targetOp).toEqual(4n);
     expect(dataAfter).toMatchObject([
       {
-        checksum: 857217610,
+        checksum: 1874612650,
         op: 'CLEAR',
         op_id: '4'
       }
@@ -279,7 +289,7 @@ bucket_definitions:
     expect(checksumAfter.get('global[]')).toEqual({
       bucket: 'global[]',
       count: 1,
-      checksum: 857217610
+      checksum: 1874612650
     });
   });
 }