Fix more tsts

Author: simolus3

packages/service-core-tests/src/test-utils/general-utils.ts

@@ -1,5 +1,5 @@
 import { storage, utils } from '@powersync/service-core';
-import { SqlSyncRules } from '@powersync/service-sync-rules';
+import { GetQuerierOptions, RequestParameters, SqlSyncRules } from '@powersync/service-sync-rules';
 import * as bson from 'bson';
 
 export const ZERO_LSN = '0/0';
@@ -102,3 +102,11 @@ function getFirst(
 export function rid(id: string): bson.UUID {
   return utils.getUuidReplicaIdentityBson({ id: id }, [{ name: 'id', type: 'VARCHAR', typeId: 25 }]);
 }
+
+export function querierOptions(globalParameters: RequestParameters): GetQuerierOptions {
+  return {
+    globalParameters,
+    hasDefaultStreams: true,
+    streams: {}
+  };
+}

packages/service-core-tests/src/tests/register-data-storage-tests.ts

@@ -8,6 +8,7 @@ import {
 import { ParameterLookup, RequestParameters } from '@powersync/service-sync-rules';
 import { expect, test, describe, beforeEach } from 'vitest';
 import * as test_utils from '../test-utils/test-utils-index.js';
+import { SqlBucketDescriptor } from '@powersync/service-sync-rules/src/SqlBucketDescriptor.js';
 
 export const TEST_TABLE = test_utils.makeTestTable('test', ['id']);
 
@@ -411,19 +412,21 @@ bucket_definitions:
 
     const parameters = new RequestParameters({ sub: 'u1' }, {});
 
-    const q1 = sync_rules.bucketDescriptors[0].parameterQueries[0];
+    const q1 = (sync_rules.bucketSources[0] as SqlBucketDescriptor).parameterQueries[0];
 
     const lookups = q1.getLookups(parameters);
     expect(lookups).toEqual([ParameterLookup.normalized('by_workspace', '1', ['u1'])]);
 
     const parameter_sets = await checkpoint.getParameterSets(lookups);
     expect(parameter_sets).toEqual([{ workspace_id: 'workspace1' }]);
 
-    const buckets = await sync_rules.getBucketParameterQuerier(parameters).queryDynamicBucketDescriptions({
-      getParameterSets(lookups) {
-        return checkpoint.getParameterSets(lookups);
-      }
-    });
+    const buckets = await sync_rules
+      .getBucketParameterQuerier(test_utils.querierOptions(parameters))
+      .queryDynamicBucketDescriptions({
+        getParameterSets(lookups) {
+          return bucketStorage.getParameterSets(lookups);
+        }
+      });
     expect(buckets).toEqual([{ bucket: 'by_workspace["workspace1"]', priority: 3 }]);
   });
 
@@ -482,7 +485,7 @@ bucket_definitions:
 
     const parameters = new RequestParameters({ sub: 'unknown' }, {});
 
-    const q1 = sync_rules.bucketDescriptors[0].parameterQueries[0];
+    const q1 = (sync_rules.bucketSources[0] as SqlBucketDescriptor).parameterQueries[0];
 
     const lookups = q1.getLookups(parameters);
     expect(lookups).toEqual([ParameterLookup.normalized('by_public_workspace', '1', [])]);
@@ -491,11 +494,13 @@ bucket_definitions:
     parameter_sets.sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
     expect(parameter_sets).toEqual([{ workspace_id: 'workspace1' }, { workspace_id: 'workspace3' }]);
 
-    const buckets = await sync_rules.getBucketParameterQuerier(parameters).queryDynamicBucketDescriptions({
-      getParameterSets(lookups) {
-        return checkpoint.getParameterSets(lookups);
-      }
-    });
+    const buckets = await sync_rules
+      .getBucketParameterQuerier(test_utils.querierOptions(parameters))
+      .queryDynamicBucketDescriptions({
+        getParameterSets(lookups) {
+          return bucketStorage.getParameterSets(lookups);
+        }
+      });
     buckets.sort((a, b) => a.bucket.localeCompare(b.bucket));
     expect(buckets).toEqual([
       { bucket: 'by_public_workspace["workspace1"]', priority: 3 },
@@ -573,15 +578,15 @@ bucket_definitions:
     const parameters = new RequestParameters({ sub: 'u1' }, {});
 
     // Test intermediate values - could be moved to sync_rules.test.ts
-    const q1 = sync_rules.bucketDescriptors[0].parameterQueries[0];
+    const q1 = (sync_rules.bucketSources[0] as SqlBucketDescriptor).parameterQueries[0];
     const lookups1 = q1.getLookups(parameters);
     expect(lookups1).toEqual([ParameterLookup.normalized('by_workspace', '1', [])]);
 
     const parameter_sets1 = await checkpoint.getParameterSets(lookups1);
     parameter_sets1.sort((a, b) => JSON.stringify(a).localeCompare(JSON.stringify(b)));
     expect(parameter_sets1).toEqual([{ workspace_id: 'workspace1' }]);
 
-    const q2 = sync_rules.bucketDescriptors[0].parameterQueries[1];
+    const q2 = (sync_rules.bucketSources[0] as SqlBucketDescriptor).parameterQueries[1];
     const lookups2 = q2.getLookups(parameters);
     expect(lookups2).toEqual([ParameterLookup.normalized('by_workspace', '2', ['u1'])]);
 
@@ -591,7 +596,7 @@ bucket_definitions:
 
     // Test final values - the important part
     const buckets = (
-      await sync_rules.getBucketParameterQuerier(parameters).queryDynamicBucketDescriptions({
+      await sync_rules.getBucketParameterQuerier(test_utils.querierOptions(parameters)).queryDynamicBucketDescriptions({
         getParameterSets(lookups) {
           return checkpoint.getParameterSets(lookups);
         }

packages/service-core-tests/src/tests/register-sync-tests.ts

@@ -89,8 +89,7 @@ export function registerSyncTests(factory: storage.TestStorageFactory) {
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 10 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 10 } as any
     });
 
     const lines = await consumeCheckpointLines(stream);
@@ -150,8 +149,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 10 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 10 } as any
     });
 
     const lines = await consumeCheckpointLines(stream);
@@ -213,8 +211,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 10 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 10 } as any
     });
 
     let sentCheckpoints = 0;
@@ -323,7 +320,6 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: 'user_one' }, {}),
       token: { sub: 'user_one', exp: Date.now() / 1000 + 100000 } as any
     });
 
@@ -464,8 +460,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 10 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 10 } as any
     });
 
     let sentRows = 0;
@@ -580,8 +575,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 100000 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 100000 } as any
     });
 
     const lines: any[] = [];
@@ -646,8 +640,7 @@ bucket_definitions:
         raw_data: false
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 10 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 10 } as any
     });
 
     const lines = await consumeCheckpointLines(stream);
@@ -675,8 +668,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: 0 } as any
+      token: { sub: '', exp: 0 } as any
     });
 
     const lines = await consumeCheckpointLines(stream);
@@ -706,8 +698,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 10 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 10 } as any
     });
     const iter = stream[Symbol.asyncIterator]();
     context.onTestFinished(() => {
@@ -780,8 +771,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: 'user1' }, {}),
-      token: { exp: Date.now() / 1000 + 100 } as any
+      token: { sub: 'user1', exp: Date.now() / 1000 + 100 } as any
     });
     const iter = stream[Symbol.asyncIterator]();
     context.onTestFinished(() => {
@@ -856,8 +846,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: 'user1' }, {}),
-      token: { exp: Date.now() / 1000 + 100 } as any
+      token: { sub: 'user1', exp: Date.now() / 1000 + 100 } as any
     });
     const iter = stream[Symbol.asyncIterator]();
     context.onTestFinished(() => {
@@ -923,8 +912,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: 'user1' }, {}),
-      token: { exp: Date.now() / 1000 + 100 } as any
+      token: { sub: 'user1', exp: Date.now() / 1000 + 100 } as any
     });
     const iter = stream[Symbol.asyncIterator]();
     context.onTestFinished(() => {
@@ -991,8 +979,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: exp } as any
+      token: { sub: '', exp: exp } as any
     });
     const iter = stream[Symbol.asyncIterator]();
     context.onTestFinished(() => {
@@ -1054,8 +1041,7 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: '' }, {}),
-      token: { exp: Date.now() / 1000 + 10 } as any
+      token: { sub: '', exp: Date.now() / 1000 + 10 } as any
     });
 
     const iter = stream[Symbol.asyncIterator]();
@@ -1180,7 +1166,6 @@ bucket_definitions:
         raw_data: true
       },
       tracker,
-      syncParams: new RequestParameters({ sub: 'test' }, {}),
       token: { sub: 'test', exp: Date.now() / 1000 + 10 } as any
     };
     const stream1 = sync.streamResponse(params);