@syncular/server 0.0.5-44 → 0.0.6-101

package/dist/subscriptions/cache.js

@@ -0,0 +1,206 @@
+import { sql } from 'kysely';
+const DEFAULT_SCOPE_CACHE_PARTITION_ID = 'default';
+const DEFAULT_MEMORY_SCOPE_CACHE_TTL_MS = 30_000;
+const DEFAULT_MEMORY_SCOPE_CACHE_MAX_ENTRIES = 5_000;
+const DEFAULT_DATABASE_SCOPE_CACHE_TTL_MS = 60_000;
+const DEFAULT_DATABASE_SCOPE_CACHE_TABLE = 'sync_scope_cache';
+export function createDefaultScopeCacheKey(args) {
+    const partitionId = args.auth.partitionId ?? DEFAULT_SCOPE_CACHE_PARTITION_ID;
+    return `${partitionId}\u0000${args.auth.actorId}\u0000${args.table}`;
+}
+function cloneScopeValues(scopes) {
+    const cloned = {};
+    for (const [key, value] of Object.entries(scopes)) {
+        if (typeof value === 'string') {
+            cloned[key] = value;
+            continue;
+        }
+        cloned[key] = [...value];
+    }
+    return cloned;
+}
+function parseScopeValues(value) {
+    let parsed;
+    try {
+        parsed = JSON.parse(value);
+    }
+    catch {
+        return null;
+    }
+    if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return null;
+    }
+    const out = {};
+    for (const [scopeKey, scopeValue] of Object.entries(parsed)) {
+        if (typeof scopeValue === 'string') {
+            out[scopeKey] = scopeValue;
+            continue;
+        }
+        if (Array.isArray(scopeValue) &&
+            scopeValue.every((item) => typeof item === 'string')) {
+            out[scopeKey] = [...scopeValue];
+            continue;
+        }
+        return null;
+    }
+    return out;
+}
+export function createMemoryScopeCache(options) {
+    const ttlMs = options?.ttlMs ?? DEFAULT_MEMORY_SCOPE_CACHE_TTL_MS;
+    const maxEntries = options?.maxEntries ?? DEFAULT_MEMORY_SCOPE_CACHE_MAX_ENTRIES;
+    const now = options?.now ?? Date.now;
+    const buckets = new WeakMap();
+    function getBucket(db) {
+        const existing = buckets.get(db);
+        if (existing) {
+            return existing;
+        }
+        const created = new Map();
+        buckets.set(db, created);
+        return created;
+    }
+    function evictOldest(bucket) {
+        while (bucket.size > maxEntries) {
+            const oldestKey = bucket.keys().next().value;
+            if (!oldestKey) {
+                return;
+            }
+            bucket.delete(oldestKey);
+        }
+    }
+    return {
+        name: 'memory',
+        async get(args) {
+            const bucket = getBucket(args.db);
+            const entry = bucket.get(args.cacheKey);
+            if (!entry) {
+                return null;
+            }
+            const nowMs = now();
+            if (entry.expiresAt <= nowMs) {
+                bucket.delete(args.cacheKey);
+                return null;
+            }
+            return cloneScopeValues(entry.scopes);
+        },
+        async set(args) {
+            const bucket = getBucket(args.db);
+            if (ttlMs <= 0) {
+                bucket.delete(args.cacheKey);
+                return;
+            }
+            if (bucket.has(args.cacheKey)) {
+                bucket.delete(args.cacheKey);
+            }
+            bucket.set(args.cacheKey, {
+                scopes: cloneScopeValues(args.scopes),
+                expiresAt: now() + ttlMs,
+            });
+            evictOldest(bucket);
+        },
+        async delete(args) {
+            const bucket = getBucket(args.db);
+            bucket.delete(args.cacheKey);
+        },
+    };
+}
+export function createDatabaseScopeCache(options) {
+    const tableName = options?.tableName ?? DEFAULT_DATABASE_SCOPE_CACHE_TABLE;
+    const ttlMs = options?.ttlMs ?? DEFAULT_DATABASE_SCOPE_CACHE_TTL_MS;
+    const autoCreateTable = options?.autoCreateTable ?? true;
+    const now = options?.now ?? (() => new Date());
+    const schemaReady = new WeakMap();
+    async function ensureTable(db) {
+        if (!autoCreateTable) {
+            return;
+        }
+        const existing = schemaReady.get(db);
+        if (existing) {
+            await existing;
+            return;
+        }
+        const pending = sql `
+      CREATE TABLE IF NOT EXISTS ${sql.table(tableName)} (
+        cache_key TEXT PRIMARY KEY,
+        scope_values TEXT NOT NULL,
+        expires_at TEXT NOT NULL,
+        created_at TEXT NOT NULL
+      )
+    `
+            .execute(db)
+            .then(() => undefined);
+        schemaReady.set(db, pending);
+        try {
+            await pending;
+        }
+        catch (error) {
+            schemaReady.delete(db);
+            throw error;
+        }
+    }
+    async function removeCacheRow(args) {
+        await sql `
+      DELETE FROM ${sql.table(tableName)}
+      WHERE cache_key = ${args.cacheKey}
+    `.execute(args.db);
+    }
+    return {
+        name: 'database',
+        async get(args) {
+            await ensureTable(args.db);
+            const rows = await sql `
+        SELECT scope_values, expires_at
+        FROM ${sql.table(tableName)}
+        WHERE cache_key = ${args.cacheKey}
+        LIMIT 1
+      `.execute(args.db);
+            const row = rows.rows[0];
+            if (!row) {
+                return null;
+            }
+            const nowIso = now().toISOString();
+            if (row.expires_at <= nowIso) {
+                await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
+                return null;
+            }
+            const parsed = parseScopeValues(row.scope_values);
+            if (!parsed) {
+                await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
+                return null;
+            }
+            return parsed;
+        },
+        async set(args) {
+            await ensureTable(args.db);
+            if (ttlMs <= 0) {
+                await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
+                return;
+            }
+            const createdAt = now();
+            const expiresAt = new Date(createdAt.getTime() + ttlMs);
+            await sql `
+        INSERT INTO ${sql.table(tableName)} (
+          cache_key,
+          scope_values,
+          expires_at,
+          created_at
+        )
+        VALUES (
+          ${args.cacheKey},
+          ${JSON.stringify(cloneScopeValues(args.scopes))},
+          ${expiresAt.toISOString()},
+          ${createdAt.toISOString()}
+        )
+        ON CONFLICT (cache_key) DO UPDATE SET
+          scope_values = EXCLUDED.scope_values,
+          expires_at = EXCLUDED.expires_at,
+          created_at = EXCLUDED.created_at
+      `.execute(args.db);
+        },
+        async delete(args) {
+            await ensureTable(args.db);
+            await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
+        },
+    };
+}
+//# sourceMappingURL=cache.js.map

package/dist/subscriptions/cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/subscriptions/cache.ts"],"names":[],"mappings":"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"}

package/dist/subscriptions/index.d.ts

@@ -1,2 +1,3 @@
+export * from './cache';
 export * from './resolve';
 //# sourceMappingURL=index.d.ts.map

package/dist/subscriptions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}

package/dist/subscriptions/index.js

@@ -1,2 +1,3 @@
+export * from './cache.js';
 export * from './resolve.js';
 //# sourceMappingURL=index.js.map

package/dist/subscriptions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}

package/dist/subscriptions/resolve.d.ts

@@ -1,7 +1,9 @@
 import { type ScopeValues, type SyncSubscriptionRequest } from '@syncular/core';
 import type { Kysely } from 'kysely';
-import type { TableRegistry } from '../handlers/registry';
+import { type ServerHandlerCollection } from '../handlers/collection';
+import type { SyncServerAuth } from '../handlers/types';
 import type { SyncCoreDb } from '../schema';
+import { type ScopeCacheBackend } from './cache';
 export declare class InvalidSubscriptionScopeError extends Error {
     constructor(message: string);
 }
@@ -26,10 +28,11 @@ export interface ResolvedSubscription {
  * 3. Intersect requested scopes with allowed scopes
  * 4. Mark as revoked if no effective scopes
  */
-export declare function resolveEffectiveScopesForSubscriptions<DB extends SyncCoreDb>(args: {
+export declare function resolveEffectiveScopesForSubscriptions<DB extends SyncCoreDb, Auth extends SyncServerAuth>(args: {
     db: Kysely<DB>;
-    actorId: string;
+    auth: Auth;
     subscriptions: SyncSubscriptionRequest[];
-    handlers: TableRegistry<DB>;
+    handlers: ServerHandlerCollection<DB, Auth>;
+    scopeCache?: ScopeCacheBackend;
 }): Promise<ResolvedSubscription[]>;
 //# sourceMappingURL=resolve.d.ts.map

package/dist/subscriptions/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC7B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC9B;AAgGD;;;;;;;;GAQG;AACH,wBAAsB,sCAAsC,CAC1D,EAAE,SAAS,UAAU,EACrB,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,uBAAuB,EAAE,CAAC;IACzC,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;CAC7B,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAoGlC"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC7B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAA8B,KAAK,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE7E,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC9B;AAgGD;;;;;;;;GAQG;AACH,wBAAsB,sCAAsC,CAC1D,EAAE,SAAS,UAAU,EACrB,IAAI,SAAS,cAAc,EAC3B,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,aAAa,EAAE,uBAAuB,EAAE,CAAC;IACzC,QAAQ,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5C,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAyKlC"}

package/dist/subscriptions/resolve.js

@@ -1,4 +1,6 @@
 import { extractScopeVars, } from '@syncular/core';
+import { getServerHandler, } from '../handlers/collection.js';
+import { createDefaultScopeCacheKey } from './cache.js';
 export class InvalidSubscriptionScopeError extends Error {
     constructor(message) {
         super(message);
@@ -90,6 +92,7 @@ function validateScopeKeys(args) {
 export async function resolveEffectiveScopesForSubscriptions(args) {
     const out = [];
     const seenIds = new Set();
+    const requestScopeCache = new Map();
     for (const sub of args.subscriptions) {
         if (!sub.id || typeof sub.id !== 'string') {
             throw new InvalidSubscriptionScopeError('Subscription id is required');
@@ -101,7 +104,7 @@ export async function resolveEffectiveScopesForSubscriptions(args) {
         if (!sub.table || typeof sub.table !== 'string') {
             throw new InvalidSubscriptionScopeError(`Subscription ${sub.id} requires a table name`);
         }
-        const handler = args.handlers.get(sub.table);
+        const handler = getServerHandler(args.handlers, sub.table);
         if (!handler) {
             throw new InvalidSubscriptionScopeError(`Unknown table: ${sub.table} for subscription ${sub.id}`);
         }
@@ -114,18 +117,78 @@ export async function resolveEffectiveScopesForSubscriptions(args) {
             subscriptionId: sub.id,
             table: sub.table,
         });
-        // Get allowed scopes from the handler
+        // Resolve allowed scopes with request-local memoization first, then
+        // optional shared cache backend, then table handler.
+        const scopeCacheKey = createDefaultScopeCacheKey({
+            auth: args.auth,
+            table: sub.table,
+        });
         let allowed;
-        try {
-            allowed = await handler.resolveScopes({
-                db: args.db,
-                actorId: args.actorId,
-            });
+        if (requestScopeCache.has(scopeCacheKey)) {
+            allowed = requestScopeCache.get(scopeCacheKey) ?? null;
+        }
+        else {
+            allowed = null;
+            let sharedCacheHit = false;
+            if (args.scopeCache) {
+                try {
+                    const cachedAllowed = await args.scopeCache.get({
+                        db: args.db,
+                        auth: args.auth,
+                        table: sub.table,
+                        cacheKey: scopeCacheKey,
+                    });
+                    if (cachedAllowed !== null) {
+                        allowed = cachedAllowed;
+                        sharedCacheHit = true;
+                    }
+                }
+                catch (cacheErr) {
+                    console.error(`[scopeCache.get] Failed for table ${sub.table}, subscription ${sub.id}:`, cacheErr);
+                }
+            }
+            if (!sharedCacheHit) {
+                try {
+                    allowed = await handler.resolveScopes({
+                        db: args.db,
+                        actorId: args.auth.actorId,
+                        auth: args.auth,
+                    });
+                }
+                catch (resolveErr) {
+                    // Scope resolution failed - mark subscription as revoked
+                    // rather than failing the entire pull
+                    console.error(`[resolveScopes] Failed for table ${sub.table}, subscription ${sub.id}:`, resolveErr);
+                    requestScopeCache.set(scopeCacheKey, null);
+                    out.push({
+                        id: sub.id,
+                        table: sub.table,
+                        scopes: {},
+                        params: sub.params,
+                        cursor: sub.cursor,
+                        bootstrapState: sub.bootstrapState ?? null,
+                        status: 'revoked',
+                    });
+                    continue;
+                }
+                if (args.scopeCache && allowed !== null) {
+                    try {
+                        await args.scopeCache.set({
+                            db: args.db,
+                            auth: args.auth,
+                            table: sub.table,
+                            cacheKey: scopeCacheKey,
+                            scopes: allowed,
+                        });
+                    }
+                    catch (cacheErr) {
+                        console.error(`[scopeCache.set] Failed for table ${sub.table}, subscription ${sub.id}:`, cacheErr);
+                    }
+                }
+            }
+            requestScopeCache.set(scopeCacheKey, allowed);
         }
-        catch (resolveErr) {
-            // Scope resolution failed - mark subscription as revoked
-            // rather than failing the entire pull
-            console.error(`[resolveScopes] Failed for table ${sub.table}, subscription ${sub.id}:`, resolveErr);
+        if (!allowed) {
             out.push({
                 id: sub.id,
                 table: sub.table,

package/dist/subscriptions/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"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"}

package/dist/sync.d.ts

@@ -0,0 +1,21 @@
+import type { ColumnCodecDialect, ColumnCodecSource, ScopeDefinition } from '@syncular/core';
+import { type CreateServerHandlerOptions } from './handlers';
+import type { ServerTableHandler, SyncServerAuth } from './handlers/types';
+import type { SyncCoreDb } from './schema';
+type SharedTableName<ServerDB, ClientDB> = keyof ServerDB & keyof ClientDB & string;
+export type ServerSyncHandlerOptionsForTable<ServerDB extends SyncCoreDb, ClientDB, TableName extends SharedTableName<ServerDB, ClientDB>, Auth extends SyncServerAuth, ScopeDefs extends readonly ScopeDefinition[]> = Omit<CreateServerHandlerOptions<ServerDB, ClientDB, TableName, Auth, ScopeDefs>, 'codecs' | 'codecDialect'>;
+export interface ServerSyncConfig<ServerDB extends SyncCoreDb = SyncCoreDb, Auth extends SyncServerAuth = SyncServerAuth> {
+    authenticate: (request: Request) => Promise<Auth | null> | Auth | null;
+    handlers: ServerTableHandler<ServerDB, Auth>[];
+}
+export interface DefineServerSyncOptions<Auth extends SyncServerAuth> {
+    authenticate: (request: Request) => Promise<Auth | null> | Auth | null;
+    codecs?: ColumnCodecSource;
+    codecDialect?: ColumnCodecDialect;
+}
+export interface ServerSyncBuilder<ServerDB extends SyncCoreDb, ClientDB, ScopeDefs extends readonly ScopeDefinition[], Auth extends SyncServerAuth> extends ServerSyncConfig<ServerDB, Auth> {
+    addHandler<TableName extends SharedTableName<ServerDB, ClientDB>>(options: ServerSyncHandlerOptionsForTable<ServerDB, ClientDB, TableName, Auth, ScopeDefs>): this;
+}
+export declare function defineServerSync<ServerDB extends SyncCoreDb, ClientDB, ScopeDefs extends readonly ScopeDefinition[], Auth extends SyncServerAuth>(options: DefineServerSyncOptions<Auth>): ServerSyncBuilder<ServerDB, ClientDB, ScopeDefs, Auth>;
+export {};
+//# sourceMappingURL=sync.d.ts.map

package/dist/sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EAChB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,KAAK,0BAA0B,EAEhC,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,KAAK,eAAe,CAAC,QAAQ,EAAE,QAAQ,IAAI,MAAM,QAAQ,GACvD,MAAM,QAAQ,GACd,MAAM,CAAC;AAET,MAAM,MAAM,gCAAgC,CAC1C,QAAQ,SAAS,UAAU,EAC3B,QAAQ,EACR,SAAS,SAAS,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACrD,IAAI,SAAS,cAAc,EAC3B,SAAS,SAAS,SAAS,eAAe,EAAE,IAC1C,IAAI,CACN,0BAA0B,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EAC1E,QAAQ,GAAG,cAAc,CAC1B,CAAC;AAEF,MAAM,WAAW,gBAAgB,CAC/B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,IAAI,SAAS,cAAc,GAAG,cAAc;IAE5C,YAAY,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IACvE,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;CAChD;AAED,MAAM,WAAW,uBAAuB,CAAC,IAAI,SAAS,cAAc;IAClE,YAAY,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IACvE,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED,MAAM,WAAW,iBAAiB,CAChC,QAAQ,SAAS,UAAU,EAC3B,QAAQ,EACR,SAAS,SAAS,SAAS,eAAe,EAAE,EAC5C,IAAI,SAAS,cAAc,CAC3B,SAAQ,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC;IACxC,UAAU,CAAC,SAAS,SAAS,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC9D,OAAO,EAAE,gCAAgC,CACvC,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,SAAS,CACV,GACA,IAAI,CAAC;CACT;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,UAAU,EAC3B,QAAQ,EACR,SAAS,SAAS,SAAS,eAAe,EAAE,EAC5C,IAAI,SAAS,cAAc,EAE3B,OAAO,EAAE,uBAAuB,CAAC,IAAI,CAAC,GACrC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAmCxD"}

package/dist/sync.js

@@ -0,0 +1,23 @@
+import { createServerHandler, } from './handlers/index.js';
+export function defineServerSync(options) {
+    const handlers = [];
+    const registeredTables = new Set();
+    const sync = {
+        authenticate: options.authenticate,
+        handlers,
+        addHandler(handlerOptions) {
+            if (registeredTables.has(handlerOptions.table)) {
+                throw new Error(`Server table handler already registered: ${handlerOptions.table}`);
+            }
+            handlers.push(createServerHandler({
+                ...handlerOptions,
+                codecs: options.codecs,
+                codecDialect: options.codecDialect,
+            }));
+            registeredTables.add(handlerOptions.table);
+            return sync;
+        },
+    };
+    return sync;
+}
+//# sourceMappingURL=sync.js.map

package/dist/sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,mBAAmB,GACpB,MAAM,YAAY,CAAC;AAkDpB,MAAM,UAAU,gBAAgB,CAM9B,OAAsC,EACkB;IACxD,MAAM,QAAQ,GAAyC,EAAE,CAAC;IAC1D,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,MAAM,IAAI,GAA2D;QACnE,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,QAAQ;QACR,UAAU,CACR,cAMC,EACD;YACA,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CACb,4CAA4C,cAAc,CAAC,KAAK,EAAE,CACnE,CAAC;YACJ,CAAC;YAED,QAAQ,CAAC,IAAI,CACX,mBAAmB,CAAC;gBAClB,GAAG,cAAc;gBACjB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,YAAY,EAAE,OAAO,CAAC,YAAY;aACnC,CAAC,CACH,CAAC;YACF,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QAAA,CACb;KACF,CAAC;IAEF,OAAO,IAAI,CAAC;AAAA,CACb"}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@syncular/server",
-  "version": "0.0.5-44",
+  "version": "0.0.6-101",
   "description": "Server-side sync engine with push/pull, pruning, and snapshot support",
-  "license": "MIT",
+  "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
   "homepage": "https://syncular.dev",
   "repository": {
@@ -62,7 +62,7 @@
     "release": "bunx syncular-publish"
   },
   "dependencies": {
-    "@syncular/core": "0.0.5-44"
+    "@syncular/core": "0.0.6-101"
   },
   "peerDependencies": {
     "kysely": "^0.28.0",

package/src/dialect/base.ts

@@ -5,7 +5,7 @@
  * database-specific sync dialect implementations.
  */
 
-import type { ScopeValues, StoredScopes } from '@syncular/core';
+import type { ScopeValues, SqlFamily, StoredScopes } from '@syncular/core';
 import type { Kysely, RawBuilder, Transaction } from 'kysely';
 import { sql } from 'kysely';
 import type { SyncChangeRow, SyncCommitRow, SyncCoreDb } from '../schema';
@@ -28,8 +28,10 @@ import type {
  * Genuinely different methods (DDL, transaction control, scope filtering,
  * compaction) remain abstract for each dialect to implement.
  */
-export abstract class BaseServerSyncDialect implements ServerSyncDialect {
-  abstract readonly name: string;
+export abstract class BaseServerSyncDialect<F extends SqlFamily = SqlFamily>
+  implements ServerSyncDialect<F>
+{
+  abstract readonly family: F;
   abstract readonly supportsForUpdate: boolean;
   abstract readonly supportsSavepoints: boolean;
 

package/src/dialect/types.ts

@@ -5,7 +5,12 @@
  * Supports the new JSONB scopes model.
  */
 
-import type { ScopeValues, StoredScopes, SyncOp } from '@syncular/core';
+import type {
+  ScopeValues,
+  SqlFamily,
+  StoredScopes,
+  SyncOp,
+} from '@syncular/core';
 import type { Kysely, Transaction } from 'kysely';
 import type { SyncChangeRow, SyncCommitRow, SyncCoreDb } from '../schema';
 
@@ -17,11 +22,6 @@ export type DbExecutor<DB extends SyncCoreDb = SyncCoreDb> =
   | Kysely<DB>
   | Transaction<DB>;
 
-/**
- * Supported dialect names.
- */
-export type ServerSyncDialectName = string;
-
 export interface IncrementalPullRowsArgs {
   table: string;
   scopes: ScopeValues;
@@ -44,8 +44,11 @@ export interface IncrementalPullRow {
   scopes: StoredScopes;
 }
 
-export interface ServerSyncDialect {
-  readonly name: ServerSyncDialectName;
+export type ServerSqliteDialect = ServerSyncDialect<'sqlite'>;
+export type ServerPostgresDialect = ServerSyncDialect<'postgres'>;
+
+export interface ServerSyncDialect<F extends SqlFamily = SqlFamily> {
+  readonly family: F;
 
   /** Create sync tables + indexes (idempotent) */
   ensureSyncSchema<DB extends SyncCoreDb>(db: Kysely<DB>): Promise<void>;