@framers/sql-storage-adapter 0.4.2 → 0.5.1

package/dist/features/sync/conflicts/conflictResolver.d.ts

@@ -0,0 +1,222 @@
+/**
+ * Conflict Detection and Resolution.
+ *
+ * Provides conflict detection using vector clocks and
+ * configurable resolution strategies with UI hooks.
+ *
+ * @packageDocumentation
+ */
+import type { VectorClockData } from '../protocol/vectorClock';
+/**
+ * Conflict resolution strategy.
+ */
+export type ConflictStrategy = 'last-write-wins' | 'local-wins' | 'remote-wins' | 'merge' | 'manual';
+/**
+ * Resolution decision for a conflict.
+ */
+export type ResolutionDecision = 'use_local' | 'use_remote' | 'use_merged' | 'keep_both' | 'defer';
+/**
+ * Represents a sync conflict between local and remote data.
+ */
+export interface SyncConflict {
+    /** Unique conflict identifier */
+    conflictId: string;
+    /** Table where conflict occurred */
+    tableName: string;
+    /** Primary key of the conflicting record */
+    recordId: string;
+    /** Local version of the data */
+    localData: Record<string, unknown>;
+    /** Remote version of the data */
+    remoteData: Record<string, unknown>;
+    /** Local vector clock */
+    localClock: VectorClockData;
+    /** Remote vector clock */
+    remoteClock: VectorClockData;
+    /** Local device ID */
+    localDeviceId: string;
+    /** Remote device ID */
+    remoteDeviceId: string;
+    /** When the conflict was detected */
+    detectedAt: number;
+    /** Fields that differ between versions */
+    conflictingFields: string[];
+    /** Conflict status */
+    status: 'pending' | 'resolved' | 'deferred';
+}
+/**
+ * Resolution result after conflict is resolved.
+ */
+export interface ConflictResolution {
+    /** How the conflict was resolved */
+    decision: ResolutionDecision;
+    /** Merged data if decision is 'use_merged' */
+    mergedData?: Record<string, unknown>;
+    /** Merged vector clock */
+    mergedClock: VectorClockData;
+    /** Who/what resolved the conflict */
+    resolvedBy: 'auto' | 'user' | 'strategy';
+    /** Resolution timestamp */
+    resolvedAt: number;
+    /** Optional reason for the resolution */
+    reason?: string;
+}
+/**
+ * UI hooks for conflict resolution.
+ */
+export interface ConflictUIHooks {
+    /**
+     * Called when a conflict requires manual resolution.
+     * Return the resolution decision from the UI.
+     */
+    onConflictNeedsResolution?: (conflict: SyncConflict) => Promise<ConflictResolution>;
+    /**
+     * Called when a conflict is detected (before auto-resolution).
+     */
+    onConflictDetected?: (conflict: SyncConflict) => void;
+    /**
+     * Called after a conflict is resolved.
+     */
+    onConflictResolved?: (conflict: SyncConflict, resolution: ConflictResolution) => void;
+    /**
+     * Called when auto-merge fails and manual intervention is needed.
+     */
+    onMergeFailed?: (conflict: SyncConflict, error: Error) => void;
+}
+/**
+ * Configuration for the conflict resolver.
+ */
+export interface ConflictResolverOptions {
+    /** Default resolution strategy */
+    defaultStrategy: ConflictStrategy;
+    /** Per-table strategy overrides */
+    tableStrategies?: Record<string, ConflictStrategy>;
+    /** Per-field merge functions for 'merge' strategy */
+    fieldMergers?: Record<string, FieldMerger>;
+    /** UI hooks for manual resolution */
+    hooks?: ConflictUIHooks;
+    /** Maximum time to wait for manual resolution (ms) */
+    manualResolutionTimeout?: number;
+    /** Auto-resolve conflicts older than this (ms) */
+    autoResolveAfter?: number;
+}
+/**
+ * Function to merge a single field.
+ */
+export type FieldMerger = (fieldName: string, localValue: unknown, remoteValue: unknown, localTimestamp: number, remoteTimestamp: number) => unknown;
+/**
+ * Built-in field mergers.
+ */
+export declare const FieldMergers: {
+    /**
+     * Use the most recent value based on timestamp.
+     */
+    lastWriteWins: FieldMerger;
+    /**
+     * For numeric fields, take the maximum value.
+     */
+    max: FieldMerger;
+    /**
+     * For numeric fields, sum the values.
+     */
+    sum: FieldMerger;
+    /**
+     * For arrays, union the values.
+     */
+    union: FieldMerger;
+    /**
+     * For strings, concatenate with separator.
+     */
+    concat: FieldMerger;
+};
+/**
+ * Conflict resolver for cross-platform sync.
+ *
+ * Detects conflicts using vector clock comparison and resolves
+ * them using configurable strategies or UI hooks.
+ *
+ * @example
+ * ```typescript
+ * const resolver = new ConflictResolver({
+ *   defaultStrategy: 'last-write-wins',
+ *   tableStrategies: {
+ *     notes: 'merge',
+ *     settings: 'local-wins',
+ *   },
+ *   hooks: {
+ *     onConflictNeedsResolution: async (conflict) => {
+ *       return showConflictDialog(conflict);
+ *     },
+ *   },
+ * });
+ *
+ * const resolution = await resolver.resolve(conflict);
+ * ```
+ */
+export declare class ConflictResolver {
+    private _options;
+    private _pendingConflicts;
+    private _resolvedConflicts;
+    constructor(options: ConflictResolverOptions);
+    /**
+     * Detect if there is a conflict between local and remote data.
+     */
+    detectConflict(tableName: string, recordId: string, localData: Record<string, unknown>, remoteData: Record<string, unknown>, localClock: VectorClockData, remoteClock: VectorClockData, localDeviceId: string, remoteDeviceId: string): SyncConflict | null;
+    /**
+     * Resolve a conflict using the configured strategy.
+     */
+    resolve(conflict: SyncConflict): Promise<ConflictResolution>;
+    /**
+     * Get pending conflicts.
+     */
+    getPendingConflicts(): SyncConflict[];
+    /**
+     * Get a specific pending conflict.
+     */
+    getConflict(conflictId: string): SyncConflict | undefined;
+    /**
+     * Manually resolve a conflict with a user decision.
+     */
+    resolveManually(conflictId: string, decision: ResolutionDecision, mergedData?: Record<string, unknown>): Promise<ConflictResolution>;
+    /**
+     * Auto-resolve old conflicts that have been pending too long.
+     */
+    autoResolveStale(): ConflictResolution[];
+    /**
+     * Get the resolution strategy for a table.
+     */
+    private _getStrategy;
+    /**
+     * Find fields that differ between local and remote data.
+     */
+    private _findConflictingFields;
+    /**
+     * Check if two values are equal (deep comparison for objects/arrays).
+     */
+    private _valuesEqual;
+    /**
+     * Resolve using last-write-wins strategy.
+     */
+    private _resolveLastWriteWins;
+    /**
+     * Resolve using local-wins strategy.
+     */
+    private _resolveLocalWins;
+    /**
+     * Resolve using remote-wins strategy.
+     */
+    private _resolveRemoteWins;
+    /**
+     * Resolve using field-level merge strategy.
+     */
+    private _resolveMerge;
+    /**
+     * Resolve using manual/UI strategy.
+     */
+    private _resolveManual;
+}
+/**
+ * Create a conflict resolver instance.
+ */
+export declare const createConflictResolver: (options: ConflictResolverOptions) => ConflictResolver;
+//# sourceMappingURL=conflictResolver.d.ts.map

package/dist/features/sync/conflicts/conflictResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflictResolver.d.ts","sourceRoot":"","sources":["../../../../src/features/sync/conflicts/conflictResolver.ts"],"names":[],"mappings":"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"}

package/dist/features/sync/conflicts/conflictResolver.js

@@ -0,0 +1,396 @@
+/**
+ * Conflict Detection and Resolution.
+ *
+ * Provides conflict detection using vector clocks and
+ * configurable resolution strategies with UI hooks.
+ *
+ * @packageDocumentation
+ */
+import { compareClocks } from '../protocol/vectorClock.js';
+/**
+ * Built-in field mergers.
+ */
+export const FieldMergers = {
+    /**
+     * Use the most recent value based on timestamp.
+     */
+    lastWriteWins: ((_fieldName, localValue, remoteValue, localTimestamp, remoteTimestamp) => {
+        return localTimestamp >= remoteTimestamp ? localValue : remoteValue;
+    }),
+    /**
+     * For numeric fields, take the maximum value.
+     */
+    max: ((_fieldName, localValue, remoteValue) => {
+        const local = Number(localValue) || 0;
+        const remote = Number(remoteValue) || 0;
+        return Math.max(local, remote);
+    }),
+    /**
+     * For numeric fields, sum the values.
+     */
+    sum: ((_fieldName, localValue, remoteValue) => {
+        const local = Number(localValue) || 0;
+        const remote = Number(remoteValue) || 0;
+        return local + remote;
+    }),
+    /**
+     * For arrays, union the values.
+     */
+    union: ((_fieldName, localValue, remoteValue) => {
+        const local = Array.isArray(localValue) ? localValue : [];
+        const remote = Array.isArray(remoteValue) ? remoteValue : [];
+        return [...new Set([...local, ...remote])];
+    }),
+    /**
+     * For strings, concatenate with separator.
+     */
+    concat: ((_fieldName, localValue, remoteValue) => {
+        const local = String(localValue ?? '');
+        const remote = String(remoteValue ?? '');
+        if (!local)
+            return remote;
+        if (!remote)
+            return local;
+        if (local === remote)
+            return local;
+        return `${local}\n---\n${remote}`;
+    }),
+};
+/**
+ * Merge two vector clocks by taking max of each device's counter.
+ */
+function mergeVectorClocks(a, b) {
+    const merged = { ...a };
+    for (const [deviceId, value] of Object.entries(b)) {
+        merged[deviceId] = Math.max(merged[deviceId] ?? 0, value);
+    }
+    return merged;
+}
+/**
+ * Get total tick count from a vector clock.
+ */
+function getTotalTicks(clock) {
+    return Object.values(clock).reduce((sum, val) => sum + val, 0);
+}
+/**
+ * Conflict resolver for cross-platform sync.
+ *
+ * Detects conflicts using vector clock comparison and resolves
+ * them using configurable strategies or UI hooks.
+ *
+ * @example
+ * ```typescript
+ * const resolver = new ConflictResolver({
+ *   defaultStrategy: 'last-write-wins',
+ *   tableStrategies: {
+ *     notes: 'merge',
+ *     settings: 'local-wins',
+ *   },
+ *   hooks: {
+ *     onConflictNeedsResolution: async (conflict) => {
+ *       return showConflictDialog(conflict);
+ *     },
+ *   },
+ * });
+ *
+ * const resolution = await resolver.resolve(conflict);
+ * ```
+ */
+export class ConflictResolver {
+    constructor(options) {
+        this._pendingConflicts = new Map();
+        this._resolvedConflicts = new Map();
+        this._options = {
+            defaultStrategy: options.defaultStrategy,
+            tableStrategies: options.tableStrategies ?? {},
+            fieldMergers: options.fieldMergers ?? {},
+            hooks: options.hooks ?? {},
+            manualResolutionTimeout: options.manualResolutionTimeout ?? 300000, // 5 minutes
+            autoResolveAfter: options.autoResolveAfter ?? 0, // Disabled by default
+        };
+    }
+    /**
+     * Detect if there is a conflict between local and remote data.
+     */
+    detectConflict(tableName, recordId, localData, remoteData, localClock, remoteClock, localDeviceId, remoteDeviceId) {
+        // Compare vector clocks
+        const comparison = compareClocks(localClock, remoteClock);
+        // No conflict if one is clearly before the other
+        if (comparison === 'before' || comparison === 'after') {
+            return null;
+        }
+        // Concurrent changes - potential conflict
+        // Check if data actually differs
+        const conflictingFields = this._findConflictingFields(localData, remoteData);
+        if (conflictingFields.length === 0) {
+            // Same data, no conflict
+            return null;
+        }
+        const conflict = {
+            conflictId: `${tableName}:${recordId}:${Date.now()}`,
+            tableName,
+            recordId,
+            localData,
+            remoteData,
+            localClock,
+            remoteClock,
+            localDeviceId,
+            remoteDeviceId,
+            detectedAt: Date.now(),
+            conflictingFields,
+            status: 'pending',
+        };
+        this._pendingConflicts.set(conflict.conflictId, conflict);
+        this._options.hooks.onConflictDetected?.(conflict);
+        return conflict;
+    }
+    /**
+     * Resolve a conflict using the configured strategy.
+     */
+    async resolve(conflict) {
+        const strategy = this._getStrategy(conflict.tableName);
+        let resolution;
+        switch (strategy) {
+            case 'last-write-wins':
+                resolution = this._resolveLastWriteWins(conflict);
+                break;
+            case 'local-wins':
+                resolution = this._resolveLocalWins(conflict);
+                break;
+            case 'remote-wins':
+                resolution = this._resolveRemoteWins(conflict);
+                break;
+            case 'merge':
+                resolution = this._resolveMerge(conflict);
+                break;
+            case 'manual':
+                resolution = await this._resolveManual(conflict);
+                break;
+            default:
+                resolution = this._resolveLastWriteWins(conflict);
+        }
+        // Update conflict status
+        conflict.status = resolution.decision === 'defer' ? 'deferred' : 'resolved';
+        // Store resolution
+        this._resolvedConflicts.set(conflict.conflictId, resolution);
+        this._pendingConflicts.delete(conflict.conflictId);
+        // Notify hooks
+        this._options.hooks.onConflictResolved?.(conflict, resolution);
+        return resolution;
+    }
+    /**
+     * Get pending conflicts.
+     */
+    getPendingConflicts() {
+        return Array.from(this._pendingConflicts.values());
+    }
+    /**
+     * Get a specific pending conflict.
+     */
+    getConflict(conflictId) {
+        return this._pendingConflicts.get(conflictId);
+    }
+    /**
+     * Manually resolve a conflict with a user decision.
+     */
+    async resolveManually(conflictId, decision, mergedData) {
+        const conflict = this._pendingConflicts.get(conflictId);
+        if (!conflict) {
+            throw new Error(`Conflict not found: ${conflictId}`);
+        }
+        const resolution = {
+            decision,
+            mergedData,
+            mergedClock: mergeVectorClocks(conflict.localClock, conflict.remoteClock),
+            resolvedBy: 'user',
+            resolvedAt: Date.now(),
+        };
+        conflict.status = 'resolved';
+        this._resolvedConflicts.set(conflictId, resolution);
+        this._pendingConflicts.delete(conflictId);
+        this._options.hooks.onConflictResolved?.(conflict, resolution);
+        return resolution;
+    }
+    /**
+     * Auto-resolve old conflicts that have been pending too long.
+     */
+    autoResolveStale() {
+        if (this._options.autoResolveAfter <= 0) {
+            return [];
+        }
+        const now = Date.now();
+        const staleThreshold = now - this._options.autoResolveAfter;
+        const resolutions = [];
+        for (const conflict of this._pendingConflicts.values()) {
+            if (conflict.detectedAt < staleThreshold) {
+                // Auto-resolve with last-write-wins
+                const resolution = this._resolveLastWriteWins(conflict);
+                resolution.reason = 'Auto-resolved due to timeout';
+                conflict.status = 'resolved';
+                this._resolvedConflicts.set(conflict.conflictId, resolution);
+                this._pendingConflicts.delete(conflict.conflictId);
+                resolutions.push(resolution);
+                this._options.hooks.onConflictResolved?.(conflict, resolution);
+            }
+        }
+        return resolutions;
+    }
+    /**
+     * Get the resolution strategy for a table.
+     */
+    _getStrategy(tableName) {
+        return this._options.tableStrategies[tableName] ?? this._options.defaultStrategy;
+    }
+    /**
+     * Find fields that differ between local and remote data.
+     */
+    _findConflictingFields(localData, remoteData) {
+        const allKeys = new Set([
+            ...Object.keys(localData),
+            ...Object.keys(remoteData),
+        ]);
+        const conflicting = [];
+        for (const key of allKeys) {
+            // Skip metadata fields
+            if (key.startsWith('_'))
+                continue;
+            const localValue = localData[key];
+            const remoteValue = remoteData[key];
+            if (!this._valuesEqual(localValue, remoteValue)) {
+                conflicting.push(key);
+            }
+        }
+        return conflicting;
+    }
+    /**
+     * Check if two values are equal (deep comparison for objects/arrays).
+     */
+    _valuesEqual(a, b) {
+        if (a === b)
+            return true;
+        if (a === null || b === null)
+            return false;
+        if (typeof a !== typeof b)
+            return false;
+        if (typeof a === 'object') {
+            return JSON.stringify(a) === JSON.stringify(b);
+        }
+        return false;
+    }
+    /**
+     * Resolve using last-write-wins strategy.
+     */
+    _resolveLastWriteWins(conflict) {
+        // Use the clock's total ticks as a proxy for recency
+        const localTicks = getTotalTicks(conflict.localClock);
+        const remoteTicks = getTotalTicks(conflict.remoteClock);
+        // If clocks are equal, prefer remote (server-side typically more authoritative)
+        const useLocal = localTicks > remoteTicks;
+        return {
+            decision: useLocal ? 'use_local' : 'use_remote',
+            mergedClock: mergeVectorClocks(conflict.localClock, conflict.remoteClock),
+            resolvedBy: 'strategy',
+            resolvedAt: Date.now(),
+            reason: `Last-write-wins: ${useLocal ? 'local' : 'remote'} had higher clock (${useLocal ? localTicks : remoteTicks} ticks)`,
+        };
+    }
+    /**
+     * Resolve using local-wins strategy.
+     */
+    _resolveLocalWins(conflict) {
+        return {
+            decision: 'use_local',
+            mergedClock: mergeVectorClocks(conflict.localClock, conflict.remoteClock),
+            resolvedBy: 'strategy',
+            resolvedAt: Date.now(),
+            reason: 'Local-wins strategy',
+        };
+    }
+    /**
+     * Resolve using remote-wins strategy.
+     */
+    _resolveRemoteWins(conflict) {
+        return {
+            decision: 'use_remote',
+            mergedClock: mergeVectorClocks(conflict.localClock, conflict.remoteClock),
+            resolvedBy: 'strategy',
+            resolvedAt: Date.now(),
+            reason: 'Remote-wins strategy',
+        };
+    }
+    /**
+     * Resolve using field-level merge strategy.
+     */
+    _resolveMerge(conflict) {
+        try {
+            const mergedData = { ...conflict.localData };
+            // Use current timestamp for LWW fallback
+            const now = Date.now();
+            for (const field of conflict.conflictingFields) {
+                const merger = this._options.fieldMergers[field] ?? FieldMergers.lastWriteWins;
+                mergedData[field] = merger(field, conflict.localData[field], conflict.remoteData[field], now, now);
+            }
+            return {
+                decision: 'use_merged',
+                mergedData,
+                mergedClock: mergeVectorClocks(conflict.localClock, conflict.remoteClock),
+                resolvedBy: 'strategy',
+                resolvedAt: Date.now(),
+                reason: `Merged ${conflict.conflictingFields.length} conflicting fields`,
+            };
+        }
+        catch (error) {
+            this._options.hooks.onMergeFailed?.(conflict, error);
+            // Fallback to last-write-wins
+            return this._resolveLastWriteWins(conflict);
+        }
+    }
+    /**
+     * Resolve using manual/UI strategy.
+     */
+    async _resolveManual(conflict) {
+        const hook = this._options.hooks.onConflictNeedsResolution;
+        if (!hook) {
+            // No UI hook, fall back to last-write-wins
+            console.warn('[ConflictResolver] No UI hook for manual resolution, falling back to LWW');
+            return this._resolveLastWriteWins(conflict);
+        }
+        // Create a timeout promise
+        const timeout = new Promise((_, reject) => {
+            setTimeout(() => {
+                reject(new Error('Manual resolution timed out'));
+            }, this._options.manualResolutionTimeout);
+        });
+        try {
+            // Race between user resolution and timeout
+            const resolution = await Promise.race([
+                hook(conflict),
+                timeout,
+            ]);
+            return {
+                ...resolution,
+                mergedClock: mergeVectorClocks(conflict.localClock, conflict.remoteClock),
+                resolvedBy: 'user',
+                resolvedAt: Date.now(),
+            };
+        }
+        catch (error) {
+            console.warn('[ConflictResolver] Manual resolution failed:', error);
+            // Defer the conflict for later
+            return {
+                decision: 'defer',
+                mergedClock: conflict.localClock, // Keep local for now
+                resolvedBy: 'auto',
+                resolvedAt: Date.now(),
+                reason: `Manual resolution failed: ${error.message}`,
+            };
+        }
+    }
+}
+/**
+ * Create a conflict resolver instance.
+ */
+export const createConflictResolver = (options) => {
+    return new ConflictResolver(options);
+};
+//# sourceMappingURL=conflictResolver.js.map

package/dist/features/sync/conflicts/conflictResolver.js.map

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

package/dist/features/sync/conflicts/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Conflict Resolution Module.
+ *
+ * Provides conflict detection and resolution for cross-platform sync.
+ *
+ * @packageDocumentation
+ */
+export * from './conflictResolver';
+//# sourceMappingURL=index.d.ts.map

package/dist/features/sync/conflicts/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/features/sync/conflicts/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,oBAAoB,CAAC"}

package/dist/features/sync/conflicts/index.js

@@ -0,0 +1,9 @@
+/**
+ * Conflict Resolution Module.
+ *
+ * Provides conflict detection and resolution for cross-platform sync.
+ *
+ * @packageDocumentation
+ */
+export * from './conflictResolver.js';
+//# sourceMappingURL=index.js.map

package/dist/features/sync/conflicts/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/sync/conflicts/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,oBAAoB,CAAC"}