@anfenn/dync 1.0.1 → 1.0.2

package/src/core/tableEnhancers.ts

@@ -140,7 +140,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
 
             await state.addPendingChange({
                 action: SyncAction.Create,
-                stateKey: tableName,
+                tableName,
                 localId,
                 changes: syncedItem,
                 before: null,
@@ -175,7 +175,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
 
             await state.addPendingChange({
                 action: isUpdate ? SyncAction.Update : SyncAction.Create,
-                stateKey: tableName,
+                tableName,
                 localId,
                 id: existingRecord?.id,
                 changes: syncedItem,
@@ -206,7 +206,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
             if (result > 0) {
                 await state.addPendingChange({
                     action: SyncAction.Update,
-                    stateKey: tableName,
+                    tableName,
                     localId: key,
                     id: record.id,
                     changes: updatedChanges,
@@ -234,7 +234,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
                 deletedLocalId = record._localId;
                 await state.addPendingChange({
                     action: SyncAction.Remove,
-                    stateKey: tableName,
+                    tableName,
                     localId: record._localId,
                     id: record.id,
                     changes: null,
@@ -268,7 +268,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
             for (const syncedItem of syncedItems) {
                 await state.addPendingChange({
                     action: SyncAction.Create,
-                    stateKey: tableName,
+                    tableName,
                     localId: syncedItem._localId,
                     changes: syncedItem,
                     before: null,
@@ -314,7 +314,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
                 const existing = existingMap.get(syncedItem._localId);
                 await state.addPendingChange({
                     action: existing ? SyncAction.Update : SyncAction.Create,
-                    stateKey: tableName,
+                    tableName,
                     localId: syncedItem._localId,
                     id: existing?.id,
                     changes: syncedItem,
@@ -364,7 +364,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
                     updatedKeys.push(record._localId);
                     await state.addPendingChange({
                         action: SyncAction.Update,
-                        stateKey: tableName,
+                        tableName,
                         localId: record._localId,
                         id: record.id,
                         changes,
@@ -398,7 +398,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
                     deletedLocalIds.push(record._localId);
                     await state.addPendingChange({
                         action: SyncAction.Remove,
-                        stateKey: tableName,
+                        tableName,
                         localId: record._localId,
                         id: record.id,
                         changes: null,
@@ -428,7 +428,7 @@ export function enhanceSyncTable<T>({ table, tableName, withTransaction, state,
                     deletedLocalIds.push(record._localId);
                     await state.addPendingChange({
                         action: SyncAction.Remove,
-                        stateKey: tableName,
+                        tableName,
                         localId: record._localId,
                         id: record.id,
                         changes: null,

package/src/index.shared.ts

@@ -492,8 +492,8 @@ class DyncBase<_TStoreMap = Record<string, any>> {
             return;
         }
 
-        await this.withTransaction('rw', [conflict.stateKey, DYNC_STATE_TABLE], async (tables) => {
-            const txTable = tables[conflict.stateKey]!;
+        await this.withTransaction('rw', [conflict.tableName, DYNC_STATE_TABLE], async (tables) => {
+            const txTable = tables[conflict.tableName]!;
             if (!keepLocal) {
                 const item = await txTable.get(localId);
                 if (item) {
@@ -509,7 +509,7 @@ class DyncBase<_TStoreMap = Record<string, any>> {
 
                 await this.state.setState((syncState) => ({
                     ...syncState,
-                    pendingChanges: syncState.pendingChanges.filter((p) => !(p.localId === localId && p.stateKey === conflict.stateKey)),
+                    pendingChanges: syncState.pendingChanges.filter((p) => !(p.localId === localId && p.tableName === conflict.tableName)),
                 }));
             }
 

package/src/types.ts

@@ -97,7 +97,7 @@ export interface BatchSync {
 export type MissingRemoteRecordStrategy = 'ignore' | 'delete-local-record' | 'insert-remote-record';
 export type ConflictResolutionStrategy = 'local-wins' | 'remote-wins' | 'try-shallow-merge';
 
-export type AfterRemoteAddCallback = (stateKey: string, item: SyncedRecord) => void;
+export type AfterRemoteAddCallback = (tableName: string, item: SyncedRecord) => void;
 export type MissingRemoteRecordDuringUpdateCallback = (strategy: MissingRemoteRecordStrategy, item: SyncedRecord) => void;
 
 export interface SyncOptions {
@@ -157,7 +157,7 @@ export enum SyncAction {
 
 export interface PendingChange {
     action: SyncAction;
-    stateKey: string;
+    tableName: string;
     localId: string;
     id?: any;
     version: number;
@@ -167,7 +167,7 @@ export interface PendingChange {
 }
 
 export interface Conflict {
-    stateKey: string;
+    tableName: string;
     fields: FieldConflict[];
 }