@syncular/client 0.0.1 → 0.0.2-126

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (83) hide show
  1. package/README.md +23 -0
  2. package/dist/blobs/index.js +3 -3
  3. package/dist/client.d.ts +10 -5
  4. package/dist/client.d.ts.map +1 -1
  5. package/dist/client.js +70 -21
  6. package/dist/client.js.map +1 -1
  7. package/dist/conflicts.d.ts.map +1 -1
  8. package/dist/conflicts.js +1 -7
  9. package/dist/conflicts.js.map +1 -1
  10. package/dist/create-client.d.ts +5 -1
  11. package/dist/create-client.d.ts.map +1 -1
  12. package/dist/create-client.js +22 -10
  13. package/dist/create-client.js.map +1 -1
  14. package/dist/engine/SyncEngine.d.ts +24 -2
  15. package/dist/engine/SyncEngine.d.ts.map +1 -1
  16. package/dist/engine/SyncEngine.js +290 -43
  17. package/dist/engine/SyncEngine.js.map +1 -1
  18. package/dist/engine/index.js +2 -2
  19. package/dist/engine/types.d.ts +16 -4
  20. package/dist/engine/types.d.ts.map +1 -1
  21. package/dist/handlers/create-handler.d.ts +15 -5
  22. package/dist/handlers/create-handler.d.ts.map +1 -1
  23. package/dist/handlers/create-handler.js +35 -24
  24. package/dist/handlers/create-handler.js.map +1 -1
  25. package/dist/handlers/types.d.ts +5 -5
  26. package/dist/handlers/types.d.ts.map +1 -1
  27. package/dist/index.js +19 -19
  28. package/dist/migrate.d.ts +1 -1
  29. package/dist/migrate.d.ts.map +1 -1
  30. package/dist/migrate.js +148 -28
  31. package/dist/migrate.js.map +1 -1
  32. package/dist/mutations.d.ts +3 -1
  33. package/dist/mutations.d.ts.map +1 -1
  34. package/dist/mutations.js +93 -18
  35. package/dist/mutations.js.map +1 -1
  36. package/dist/outbox.d.ts.map +1 -1
  37. package/dist/outbox.js +1 -11
  38. package/dist/outbox.js.map +1 -1
  39. package/dist/plugins/incrementing-version.d.ts +1 -1
  40. package/dist/plugins/incrementing-version.js +2 -2
  41. package/dist/plugins/index.js +2 -2
  42. package/dist/proxy/dialect.js +1 -1
  43. package/dist/proxy/driver.js +1 -1
  44. package/dist/proxy/index.js +4 -4
  45. package/dist/proxy/mutations.js +1 -1
  46. package/dist/pull-engine.d.ts +29 -3
  47. package/dist/pull-engine.d.ts.map +1 -1
  48. package/dist/pull-engine.js +314 -78
  49. package/dist/pull-engine.js.map +1 -1
  50. package/dist/push-engine.d.ts.map +1 -1
  51. package/dist/push-engine.js +28 -3
  52. package/dist/push-engine.js.map +1 -1
  53. package/dist/query/QueryContext.js +1 -1
  54. package/dist/query/index.js +3 -3
  55. package/dist/query/tracked-select.d.ts +2 -1
  56. package/dist/query/tracked-select.d.ts.map +1 -1
  57. package/dist/query/tracked-select.js +1 -1
  58. package/dist/schema.d.ts +2 -2
  59. package/dist/schema.d.ts.map +1 -1
  60. package/dist/sync-loop.d.ts +5 -1
  61. package/dist/sync-loop.d.ts.map +1 -1
  62. package/dist/sync-loop.js +167 -18
  63. package/dist/sync-loop.js.map +1 -1
  64. package/package.json +30 -6
  65. package/src/client.test.ts +369 -0
  66. package/src/client.ts +101 -22
  67. package/src/conflicts.ts +1 -10
  68. package/src/create-client.ts +33 -5
  69. package/src/engine/SyncEngine.test.ts +157 -0
  70. package/src/engine/SyncEngine.ts +359 -40
  71. package/src/engine/types.ts +22 -4
  72. package/src/handlers/create-handler.ts +86 -37
  73. package/src/handlers/types.ts +10 -4
  74. package/src/migrate.ts +215 -33
  75. package/src/mutations.ts +143 -21
  76. package/src/outbox.ts +1 -15
  77. package/src/plugins/incrementing-version.ts +2 -2
  78. package/src/pull-engine.test.ts +147 -0
  79. package/src/pull-engine.ts +392 -77
  80. package/src/push-engine.ts +33 -1
  81. package/src/query/tracked-select.ts +1 -1
  82. package/src/schema.ts +2 -2
  83. package/src/sync-loop.ts +215 -19
package/README.md ADDED
@@ -0,0 +1,23 @@
1
+ # @syncular/client
2
+
3
+ Client-side sync engine for Syncular with offline-first support: local outbox, incremental push/pull, conflict detection, subscriptions/scopes, and optional blobs/plugins.
4
+
5
+ ## Install
6
+
7
+ ```bash
8
+ npm install @syncular/client
9
+ ```
10
+
11
+ ## Documentation
12
+
13
+ - Client setup: https://syncular.dev/docs/build/client-setup
14
+ - Subscriptions (partial sync): https://syncular.dev/docs/introduction/subscriptions
15
+ - Commits & conflicts: https://syncular.dev/docs/introduction/commits
16
+
17
+ ## Links
18
+
19
+ - GitHub: https://github.com/syncular/syncular
20
+ - Issues: https://github.com/syncular/syncular/issues
21
+
22
+ > Status: Alpha. APIs and storage layouts may change between releases.
23
+
@@ -1,7 +1,7 @@
1
1
  /**
2
2
  * @syncular/client - Blob storage exports
3
3
  */
4
- export * from './manager';
5
- export * from './migrate';
6
- export * from './types';
4
+ export * from './manager.js';
5
+ export * from './migrate.js';
6
+ export * from './types.js';
7
7
  //# sourceMappingURL=index.js.map
package/dist/client.d.ts CHANGED
@@ -8,7 +8,7 @@
8
8
  * - Event-driven state management
9
9
  * - Conflict handling with events
10
10
  */
11
- import type { BlobRef, SyncTransport } from '@syncular/core';
11
+ import type { BlobRef, ColumnCodecDialect, ColumnCodecSource, SyncTransport } from '@syncular/core';
12
12
  import type { Kysely } from 'kysely';
13
13
  import type { OutboxStats, PresenceEntry, SyncResult } from './engine/types';
14
14
  import type { ClientTableRegistry } from './handlers/registry';
@@ -50,7 +50,7 @@ export interface ClientOptions<DB extends SyncClientDb> {
50
50
  /** Subscriptions to sync */
51
51
  subscriptions: Array<{
52
52
  id: string;
53
- shape: string;
53
+ table: string;
54
54
  scopes?: Record<string, string | string[]>;
55
55
  params?: Record<string, unknown>;
56
56
  }>;
@@ -70,6 +70,10 @@ export interface ClientOptions<DB extends SyncClientDb> {
70
70
  versionColumn?: string;
71
71
  /** Optional: Columns to omit from sync */
72
72
  omitColumns?: string[];
73
+ /** Optional: Column codec resolver */
74
+ columnCodecs?: ColumnCodecSource;
75
+ /** Optional: Codec dialect override (default: 'sqlite') */
76
+ codecDialect?: ColumnCodecDialect;
73
77
  }
74
78
  export interface ClientState {
75
79
  /** Client ID */
@@ -196,7 +200,7 @@ type ClientEventHandler<E extends ClientEventType> = (payload: ClientEventPayloa
196
200
  * tableHandlers,
197
201
  * clientId: 'device-123',
198
202
  * actorId: 'user-456',
199
- * subscriptions: [{ id: 'tasks', shape: 'tasks', scopes: { user_id: 'user-456' } }],
203
+ * subscriptions: [{ id: 'tasks', table: 'tasks', scopes: { user_id: 'user-456' } }],
200
204
  * });
201
205
  *
202
206
  * await client.start();
@@ -213,6 +217,7 @@ export declare class Client<DB extends SyncClientDb = SyncClientDb> {
213
217
  private engine;
214
218
  private started;
215
219
  private destroyed;
220
+ private emittedConflictIds;
216
221
  private eventListeners;
217
222
  private outboxStats;
218
223
  /** Mutations API (always available) */
@@ -248,7 +253,7 @@ export declare class Client<DB extends SyncClientDb = SyncClientDb> {
248
253
  */
249
254
  updateSubscriptions(subscriptions: Array<{
250
255
  id: string;
251
- shape: string;
256
+ table: string;
252
257
  scopes?: Record<string, string | string[]>;
253
258
  params?: Record<string, unknown>;
254
259
  }>): void;
@@ -257,7 +262,7 @@ export declare class Client<DB extends SyncClientDb = SyncClientDb> {
257
262
  */
258
263
  getSubscriptions(): Array<{
259
264
  id: string;
260
- shape: string;
265
+ table: string;
261
266
  scopes: Record<string, string | string[]>;
262
267
  params: Record<string, unknown>;
263
268
  }>;
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
package/dist/client.js CHANGED
@@ -9,10 +9,10 @@
9
9
  * - Conflict handling with events
10
10
  */
11
11
  import { sql } from 'kysely';
12
- import { ensureClientBlobSchema } from './blobs/migrate';
13
- import { SyncEngine } from './engine/SyncEngine';
14
- import { ensureClientSyncSchema } from './migrate';
15
- import { createMutationsApi, createOutboxCommit, } from './mutations';
12
+ import { ensureClientBlobSchema } from './blobs/migrate.js';
13
+ import { SyncEngine } from './engine/SyncEngine.js';
14
+ import { ensureClientSyncSchema } from './migrate.js';
15
+ import { createMutationsApi, createOutboxCommit, } from './mutations.js';
16
16
  // ============================================================================
17
17
  // Client Class
18
18
  // ============================================================================
@@ -30,7 +30,7 @@ import { createMutationsApi, createOutboxCommit, } from './mutations';
30
30
  * tableHandlers,
31
31
  * clientId: 'device-123',
32
32
  * actorId: 'user-456',
33
- * subscriptions: [{ id: 'tasks', shape: 'tasks', scopes: { user_id: 'user-456' } }],
33
+ * subscriptions: [{ id: 'tasks', table: 'tasks', scopes: { user_id: 'user-456' } }],
34
34
  * });
35
35
  *
36
36
  * await client.start();
@@ -47,6 +47,7 @@ export class Client {
47
47
  engine = null;
48
48
  started = false;
49
49
  destroyed = false;
50
+ emittedConflictIds = new Set();
50
51
  eventListeners = new Map();
51
52
  outboxStats = {
52
53
  pending: 0,
@@ -67,6 +68,8 @@ export class Client {
67
68
  idColumn: options.idColumn ?? 'id',
68
69
  versionColumn: options.versionColumn ?? 'server_version',
69
70
  omitColumns: options.omitColumns ?? [],
71
+ columnCodecs: options.columnCodecs,
72
+ codecDialect: options.codecDialect,
70
73
  });
71
74
  this.mutations = createMutationsApi(commitFn);
72
75
  // Create blob client if storage provided
@@ -112,12 +115,12 @@ export class Client {
112
115
  this.engine = new SyncEngine({
113
116
  db: this.options.db,
114
117
  transport: this.options.transport,
115
- shapes: this.options.tableHandlers,
118
+ handlers: this.options.tableHandlers,
116
119
  clientId: this.options.clientId,
117
120
  actorId: this.options.actorId,
118
121
  subscriptions: this.options.subscriptions.map((s) => ({
119
122
  id: s.id,
120
- shape: s.shape,
123
+ table: s.table,
121
124
  scopes: s.scopes ?? {},
122
125
  params: s.params ?? {},
123
126
  })),
@@ -169,7 +172,7 @@ export class Client {
169
172
  if (this.engine) {
170
173
  this.engine.updateSubscriptions(subscriptions.map((s) => ({
171
174
  id: s.id,
172
- shape: s.shape,
175
+ table: s.table,
173
176
  scopes: s.scopes ?? {},
174
177
  params: s.params ?? {},
175
178
  })));
@@ -181,7 +184,7 @@ export class Client {
181
184
  getSubscriptions() {
182
185
  return this.options.subscriptions.map((s) => ({
183
186
  id: s.id,
184
- shape: s.shape,
187
+ table: s.table,
185
188
  scopes: s.scopes ?? {},
186
189
  params: s.params ?? {},
187
190
  }));
@@ -262,7 +265,9 @@ export class Client {
262
265
  * Resolve a conflict.
263
266
  */
264
267
  async resolveConflict(id, resolution) {
265
- const { resolveConflict } = await import('./conflicts');
268
+ const { resolveConflict } = await import('./conflicts.js');
269
+ const pendingBeforeResolve = await this.getConflicts();
270
+ const resolvedConflict = pendingBeforeResolve.find((c) => c.id === id);
266
271
  // For 'keep-local' and 'keep-server', we just mark it resolved
267
272
  // For 'custom', we would need to apply the payload - but that requires
268
273
  // creating a new mutation, which the user should do separately
@@ -270,11 +275,9 @@ export class Client {
270
275
  ? `custom:${JSON.stringify(resolution.payload)}`
271
276
  : resolution.strategy;
272
277
  await resolveConflict(this.options.db, { id, resolution: resolutionStr });
273
- // Get the conflict for the event
274
- const conflicts = await this.getConflicts();
275
- const resolved = conflicts.find((c) => c.id === id);
276
- if (resolved) {
277
- this.emit('conflict:resolved', resolved);
278
+ this.emittedConflictIds.delete(id);
279
+ if (resolvedConflict) {
280
+ this.emit('conflict:resolved', resolvedConflict);
278
281
  }
279
282
  }
280
283
  // ===========================================================================
@@ -479,7 +482,17 @@ export class Client {
479
482
  }
480
483
  async checkForNewConflicts() {
481
484
  const conflicts = await this.getConflicts();
485
+ const activeIds = new Set(conflicts.map((conflict) => conflict.id));
486
+ for (const id of this.emittedConflictIds) {
487
+ if (!activeIds.has(id)) {
488
+ this.emittedConflictIds.delete(id);
489
+ }
490
+ }
482
491
  for (const conflict of conflicts) {
492
+ if (this.emittedConflictIds.has(conflict.id)) {
493
+ continue;
494
+ }
495
+ this.emittedConflictIds.add(conflict.id);
483
496
  this.emit('conflict:new', conflict);
484
497
  }
485
498
  }
@@ -509,6 +522,8 @@ export class Client {
509
522
  createBlobClient(storage, transport) {
510
523
  const db = this.options.db;
511
524
  const blobs = transport.blobs;
525
+ const staleUploadingTimeoutMs = 30_000;
526
+ const maxUploadRetries = 3;
512
527
  return {
513
528
  async store(data, options) {
514
529
  const bytes = await toUint8Array(data);
@@ -670,26 +685,56 @@ export class Client {
670
685
  async processUploadQueue() {
671
686
  let uploaded = 0;
672
687
  let failed = 0;
688
+ const now = Date.now();
689
+ const staleThreshold = now - staleUploadingTimeoutMs;
690
+ await sql `
691
+ update ${sql.table('sync_blob_outbox')}
692
+ set
693
+ ${sql.ref('status')} = ${sql.val('failed')},
694
+ ${sql.ref('attempt_count')} = ${sql.ref('attempt_count')} + ${sql.val(1)},
695
+ ${sql.ref('error')} = ${sql.val('Upload timed out while in uploading state')},
696
+ ${sql.ref('updated_at')} = ${sql.val(now)}
697
+ where ${sql.ref('status')} = ${sql.val('uploading')}
698
+ and ${sql.ref('updated_at')} < ${sql.val(staleThreshold)}
699
+ and ${sql.ref('attempt_count')} + ${sql.val(1)} >= ${sql.val(maxUploadRetries)}
700
+ `.execute(db);
701
+ await sql `
702
+ update ${sql.table('sync_blob_outbox')}
703
+ set
704
+ ${sql.ref('status')} = ${sql.val('pending')},
705
+ ${sql.ref('attempt_count')} = ${sql.ref('attempt_count')} + ${sql.val(1)},
706
+ ${sql.ref('error')} = ${sql.val('Upload timed out while in uploading state; retrying')},
707
+ ${sql.ref('updated_at')} = ${sql.val(now)}
708
+ where ${sql.ref('status')} = ${sql.val('uploading')}
709
+ and ${sql.ref('updated_at')} < ${sql.val(staleThreshold)}
710
+ and ${sql.ref('attempt_count')} + ${sql.val(1)} < ${sql.val(maxUploadRetries)}
711
+ `.execute(db);
673
712
  const pendingResult = await sql `
674
713
  select
675
714
  ${sql.ref('hash')},
676
715
  ${sql.ref('size')},
677
716
  ${sql.ref('mime_type')},
678
- ${sql.ref('body')}
717
+ ${sql.ref('body')},
718
+ ${sql.ref('attempt_count')}
679
719
  from ${sql.table('sync_blob_outbox')}
680
720
  where ${sql.ref('status')} = ${sql.val('pending')}
721
+ and ${sql.ref('attempt_count')} < ${sql.val(maxUploadRetries)}
681
722
  limit ${sql.val(10)}
682
723
  `.execute(db);
683
724
  const pending = pendingResult.rows;
684
725
  for (const item of pending) {
726
+ const nextAttemptCount = item.attempt_count + 1;
685
727
  try {
686
728
  // Mark as uploading
687
729
  await sql `
688
730
  update ${sql.table('sync_blob_outbox')}
689
731
  set
690
732
  ${sql.ref('status')} = ${sql.val('uploading')},
733
+ ${sql.ref('attempt_count')} = ${sql.val(nextAttemptCount)},
734
+ ${sql.ref('error')} = ${sql.val(null)},
691
735
  ${sql.ref('updated_at')} = ${sql.val(Date.now())}
692
736
  where ${sql.ref('hash')} = ${sql.val(item.hash)}
737
+ and ${sql.ref('status')} = ${sql.val('pending')}
693
738
  `.execute(db);
694
739
  // Initiate upload
695
740
  const initResult = await blobs.initiateUpload({
@@ -710,7 +755,10 @@ export class Client {
710
755
  throw new Error(`Upload failed: ${uploadResponse.statusText}`);
711
756
  }
712
757
  // Complete
713
- await blobs.completeUpload(item.hash);
758
+ const completeResult = await blobs.completeUpload(item.hash);
759
+ if (!completeResult.ok) {
760
+ throw new Error(completeResult.error ?? 'Failed to complete blob upload');
761
+ }
714
762
  }
715
763
  // Mark as complete
716
764
  await sql `
@@ -720,17 +768,18 @@ export class Client {
720
768
  uploaded++;
721
769
  }
722
770
  catch (err) {
723
- // Mark as failed
771
+ const nextStatus = nextAttemptCount >= maxUploadRetries ? 'failed' : 'pending';
724
772
  await sql `
725
773
  update ${sql.table('sync_blob_outbox')}
726
774
  set
727
- ${sql.ref('status')} = ${sql.val('failed')},
775
+ ${sql.ref('status')} = ${sql.val(nextStatus)},
728
776
  ${sql.ref('error')} = ${sql.val(err instanceof Error ? err.message : 'Unknown error')},
729
- ${sql.ref('attempt_count')} = ${sql.ref('attempt_count')} + ${sql.val(1)},
730
777
  ${sql.ref('updated_at')} = ${sql.val(Date.now())}
731
778
  where ${sql.ref('hash')} = ${sql.val(item.hash)}
732
779
  `.execute(db);
733
- failed++;
780
+ if (nextStatus === 'failed') {
781
+ failed++;
782
+ }
734
783
  }
735
784
  }
736
785
  return { uploaded, failed };
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../src/conflicts.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAuB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAqC7C,wBAAsB,gCAAgC,CAAC,EAAE,SAAS,YAAY,EAC5E,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EACd,IAAI,EAAE;IACJ,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,MAAM,CAAC,CA6EjB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,EAAE,SAAS,YAAY,EAChE,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,GACb,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAmB/B;AAED,wBAAsB,eAAe,CAAC,EAAE,SAAS,YAAY,EAC3D,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EACd,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,OAAO,CAAC,IAAI,CAAC,CASf"}
1
+ {"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../src/conflicts.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAuB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA2B7C,wBAAsB,gCAAgC,CAAC,EAAE,SAAS,YAAY,EAC5E,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EACd,IAAI,EAAE;IACJ,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GACA,OAAO,CAAC,MAAM,CAAC,CA6EjB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,EAAE,SAAS,YAAY,EAChE,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,GACb,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAmB/B;AAED,wBAAsB,eAAe,CAAC,EAAE,SAAS,YAAY,EAC3D,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,EACd,IAAI,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD,OAAO,CAAC,IAAI,CAAC,CASf"}
package/dist/conflicts.js CHANGED
@@ -1,14 +1,8 @@
1
1
  /**
2
2
  * @syncular/client - Sync conflict storage helpers
3
3
  */
4
+ import { randomId } from '@syncular/core';
4
5
  import { sql } from 'kysely';
5
- function randomId() {
6
- if (typeof crypto !== 'undefined' &&
7
- typeof crypto.randomUUID === 'function') {
8
- return crypto.randomUUID();
9
- }
10
- return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
11
- }
12
6
  function messageFromResult(r) {
13
7
  if (r.status === 'conflict') {
14
8
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../src/conflicts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../src/conflicts.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@
7
7
  * - subscriptions: derived from handler.subscribe (no separate param)
8
8
  * - clientId: auto-generated (no longer required)
9
9
  */
10
- import type { SyncTransport } from '@syncular/core';
10
+ import type { ColumnCodecDialect, ColumnCodecSource, SyncTransport } from '@syncular/core';
11
11
  import type { Kysely } from 'kysely';
12
12
  import { Client } from './client';
13
13
  import type { ClientTableHandler } from './handlers/types';
@@ -67,6 +67,10 @@ interface CreateClientOptions<DB extends SyncClientDb> {
67
67
  plugins?: import('./plugins').SyncClientPlugin[];
68
68
  /** Optional: State ID for multi-tenant scenarios */
69
69
  stateId?: string;
70
+ /** Optional: Column codec resolver */
71
+ columnCodecs?: ColumnCodecSource;
72
+ /** Optional: Codec dialect override (default: 'sqlite') */
73
+ codecDialect?: ColumnCodecDialect;
70
74
  /** Optional: Auto-start sync (default: true) */
71
75
  autoStart?: boolean;
72
76
  }
@@ -1 +1 @@
1
- {"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAGV,aAAa,EACd,MAAM,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA4C7C,UAAU,mBAAmB,CAAC,EAAE,SAAS,YAAY;IACnD,+BAA+B;IAC/B,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAEf;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzC;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAEhB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iDAAiD;IACjD,SAAS,CAAC,EAAE,aAAa,CAAC;IAE1B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE5E,mCAAmC;IACnC,IAAI,CAAC,EAAE;QACL,qDAAqD;QACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,8CAA8C;QAC9C,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IAEF,2CAA2C;IAC3C,WAAW,CAAC,EAAE,OAAO,UAAU,EAAE,iBAAiB,CAAC;IAEnD,6BAA6B;IAC7B,OAAO,CAAC,EAAE,OAAO,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAEjD,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,gDAAgD;IAChD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,kBAAkB,CAAC,EAAE,SAAS,YAAY;IAClD,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,gBAAgB;IAChB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,iCAAiC;IACjC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,YAAY,CAAC,EAAE,SAAS,YAAY,EACxD,OAAO,EAAE,mBAAmB,CAAC,EAAE,CAAC,GAC/B,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAmHjC"}
1
+ {"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../src/create-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAGjB,aAAa,EACd,MAAM,gBAAgB,CAAC;AAGxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAqD7C,UAAU,mBAAmB,CAAC,EAAE,SAAS,YAAY;IACnD,+BAA+B;IAC/B,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAEf;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzC;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAEhB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iDAAiD;IACjD,SAAS,CAAC,EAAE,aAAa,CAAC;IAE1B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE5E,mCAAmC;IACnC,IAAI,CAAC,EAAE;QACL,qDAAqD;QACrD,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,8CAA8C;QAC9C,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IAEF,2CAA2C;IAC3C,WAAW,CAAC,EAAE,OAAO,UAAU,EAAE,iBAAiB,CAAC;IAEnD,6BAA6B;IAC7B,OAAO,CAAC,EAAE,OAAO,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAEjD,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,sCAAsC;IACtC,YAAY,CAAC,EAAE,iBAAiB,CAAC;IAEjC,2DAA2D;IAC3D,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAElC,gDAAgD;IAChD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,kBAAkB,CAAC,EAAE,SAAS,YAAY;IAClD,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,gBAAgB;IAChB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,iCAAiC;IACjC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,YAAY,CAAC,EAAE,SAAS,YAAY,EACxD,OAAO,EAAE,mBAAmB,CAAC,EAAE,CAAC,GAC/B,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CA8HjC"}
@@ -9,10 +9,10 @@
9
9
  */
10
10
  import { extractScopeVars } from '@syncular/core';
11
11
  import { createHttpTransport } from '@syncular/transport-http';
12
- import { Client } from './client';
13
- import { createClientHandler } from './handlers/create-handler';
14
- import { ClientTableRegistry } from './handlers/registry';
15
- import { randomUUID } from './utils/id';
12
+ import { Client } from './client.js';
13
+ import { createClientHandler } from './handlers/create-handler.js';
14
+ import { ClientTableRegistry } from './handlers/registry.js';
15
+ import { randomUUID } from './utils/id.js';
16
16
  function deriveDefaultSubscriptionScopes(args) {
17
17
  const patterns = args.handler.scopePatterns ?? [];
18
18
  const vars = new Set();
@@ -34,10 +34,12 @@ function deriveDefaultSubscriptionScopes(args) {
34
34
  * Auto-generate a simple handler for a table.
35
35
  * Uses 'id' as primary key and provided scopes.
36
36
  */
37
- function createAutoHandler(table, scopes) {
37
+ function createAutoHandler(table, scopes, options) {
38
38
  return createClientHandler({
39
39
  table: table,
40
40
  scopes: scopes,
41
+ columnCodecs: options.columnCodecs,
42
+ codecDialect: options.codecDialect,
41
43
  });
42
44
  }
43
45
  /**
@@ -73,7 +75,7 @@ function createAutoHandler(table, scopes) {
73
75
  * ```
74
76
  */
75
77
  export async function createClient(options) {
76
- const { db, url = '/api/sync', handlers: providedHandlers, tables, scopes, actorId, clientId = randomUUID(), transport: customTransport, getHeaders, sync = {}, blobStorage, plugins, stateId, autoStart = true, } = options;
78
+ const { db, url = '/api/sync', handlers: providedHandlers, tables, scopes, actorId, clientId = randomUUID(), transport: customTransport, getHeaders, sync = {}, blobStorage, plugins, stateId, columnCodecs, codecDialect, autoStart = true, } = options;
77
79
  // Validate options
78
80
  if (!providedHandlers && !tables) {
79
81
  throw new Error('Either handlers or tables must be provided');
@@ -83,7 +85,10 @@ export async function createClient(options) {
83
85
  }
84
86
  // Auto-generate handlers from tables if needed
85
87
  const handlers = providedHandlers ??
86
- tables.map((table) => createAutoHandler(table, scopes));
88
+ tables.map((table) => createAutoHandler(table, scopes, {
89
+ columnCodecs,
90
+ codecDialect,
91
+ }));
87
92
  // Build registry from handlers array
88
93
  const tableHandlers = new ClientTableRegistry();
89
94
  for (const handler of handlers) {
@@ -116,20 +121,25 @@ export async function createClient(options) {
116
121
  });
117
122
  return {
118
123
  id: handler.table,
119
- shape: handler.table,
124
+ table: handler.table,
120
125
  scopes,
121
126
  params: {},
122
127
  };
123
128
  }
124
129
  // Custom subscription config
125
- const scopes = sub.scopes ?? {};
130
+ const scopes = {};
131
+ for (const [scopeKey, scopeValue] of Object.entries(sub.scopes ?? {})) {
132
+ if (scopeValue === undefined)
133
+ continue;
134
+ scopes[scopeKey] = scopeValue;
135
+ }
126
136
  if (Object.keys(scopes).length === 0) {
127
137
  throw new Error(`Handler "${handler.table}" subscription scopes cannot be empty. ` +
128
138
  'Set subscribe: false or provide subscribe.scopes.');
129
139
  }
130
140
  return {
131
141
  id: handler.table,
132
- shape: handler.table,
142
+ table: handler.table,
133
143
  scopes,
134
144
  params: sub.params ?? {},
135
145
  };
@@ -146,6 +156,8 @@ export async function createClient(options) {
146
156
  blobStorage,
147
157
  plugins,
148
158
  stateId,
159
+ columnCodecs,
160
+ codecDialect,
149
161
  realtimeEnabled: sync.realtime ?? true,
150
162
  pollIntervalMs: sync.pollIntervalMs,
151
163
  });