@keepkit/core 0.28.5 → 0.28.7

package/dist/{chunk-NZLAW4LY.js → chunk-SLH4DFYQ.js}

@@ -61,18 +61,22 @@ async function removeKeepItems(storage, ids) {
   for (const id of ids) await storage.remove(id);
 }
 function mergeKeepItemLists(remoteItems, localItems) {
-  const byId = new Map(remoteItems.map((item) => [item.id, item]));
+  const byScopeAndId = new Map(remoteItems.map((item) => [itemStorageKey(item), item]));
   for (const localItem of localItems) {
-    const remoteItem = byId.get(localItem.id);
+    const key = itemStorageKey(localItem);
+    const remoteItem = byScopeAndId.get(key);
     if (!remoteItem) {
-      byId.set(localItem.id, localItem);
+      byScopeAndId.set(key, localItem);
       continue;
     }
     const content = localItem.updatedAt > remoteItem.updatedAt ? localItem : remoteItem;
     const lastOpenedAt = remoteItem.lastOpenedAt === void 0 ? localItem.lastOpenedAt : localItem.lastOpenedAt === void 0 ? remoteItem.lastOpenedAt : Math.max(remoteItem.lastOpenedAt, localItem.lastOpenedAt);
-    byId.set(localItem.id, lastOpenedAt === void 0 ? content : { ...content, lastOpenedAt });
+    byScopeAndId.set(key, lastOpenedAt === void 0 ? content : { ...content, lastOpenedAt });
   }
-  return [...byId.values()].sort((a, b) => b.updatedAt - a.updatedAt);
+  return [...byScopeAndId.values()].sort((a, b) => b.updatedAt - a.updatedAt);
+}
+function itemStorageKey(item) {
+  return JSON.stringify([item.scope?.tenantId ?? null, item.scope?.userId ?? null, item.id]);
 }
 function isKeepItem(value) {
   if (!isRecord(value)) return false;
@@ -82,7 +86,7 @@ function isKeepItemArray(value) {
   return Array.isArray(value) && value.every(isKeepItem);
 }
 function isKeepCollectionDefinition(value) {
-  return isRecord(value) && typeof value.id === "string" && value.id.trim().length > 0 && typeof value.name === "string" && value.name.trim().length > 0 && (value.scope === void 0 || isSyncScope(value.scope));
+  return isRecord(value) && typeof value.id === "string" && value.id.trim().length > 0 && typeof value.name === "string" && value.name.trim().length > 0 && (value.revision === void 0 || typeof value.revision === "string") && (value.updatedAt === void 0 || typeof value.updatedAt === "number" && Number.isFinite(value.updatedAt)) && (value.scope === void 0 || isSyncScope(value.scope));
 }
 function isKeepCollectionMembership(value) {
   return isRecord(value) && typeof value.collectionId === "string" && value.collectionId.trim().length > 0 && typeof value.itemId === "string" && value.itemId.trim().length > 0 && typeof value.order === "number" && Number.isInteger(value.order) && Number.isFinite(value.order) && value.order >= 0 && (value.scope === void 0 || isSyncScope(value.scope));
@@ -96,7 +100,7 @@ function isSyncScope(value) {
 
 // src/features/persistence/scope.ts
 function getKeepScopeKey(scope) {
-  if (!scope?.userId && !scope?.tenantId) return "";
+  if (scope?.userId === void 0 && scope?.tenantId === void 0) return "";
   return `:${encodeURIComponent(scope.tenantId ?? "_")}:${encodeURIComponent(scope.userId ?? "_")}`;
 }
 function isSameKeepScope(left, right) {
@@ -143,37 +147,66 @@ var ScopedStorageAdapter = class {
     const scoped = items.map((item) => ({ ...item, ...this.scope ? { scope: this.scope } : {} }));
     const ids = new Set(scoped.map((item) => item.id));
     const next = current.filter((item) => !ids.has(item.id) || !isSameKeepScope(item.scope, this.scope));
-    await writeAll(this.base, [...next, ...scoped]);
+    await writeAll(this.base, [...next, ...scoped], this.scope);
   }
   async remove(id) {
     const current = await this.base.getAll();
     await writeAll(
       this.base,
-      current.filter((item) => item.id !== id || !isSameKeepScope(item.scope, this.scope))
+      current.filter((item) => item.id !== id || !isSameKeepScope(item.scope, this.scope)),
+      this.scope
     );
+    await this.removeMembershipsForItems([id]);
   }
   async removeMany(ids) {
     const idSet = new Set(ids);
     const current = await this.base.getAll();
     await writeAll(
       this.base,
-      current.filter((item) => !idSet.has(item.id) || !isSameKeepScope(item.scope, this.scope))
+      current.filter((item) => !idSet.has(item.id) || !isSameKeepScope(item.scope, this.scope)),
+      this.scope
     );
+    await this.removeMembershipsForItems([...idSet]);
   }
   async clear() {
     const current = await this.base.getAll();
+    const removedIds = current.filter((item) => isSameKeepScope(item.scope, this.scope)).map((item) => item.id);
     await writeAll(
       this.base,
-      current.filter((item) => !isSameKeepScope(item.scope, this.scope))
+      current.filter((item) => !isSameKeepScope(item.scope, this.scope)),
+      this.scope
     );
+    if (removedIds.length > 0) await this.removeMembershipsForItems(removedIds);
+    await this.clearMembershipsForScope();
   }
   async merge(items) {
-    await this.setMany(items);
-    return this.getAll();
+    const scopedItems = items.map((item) => ({ ...item, ...this.scope ? { scope: this.scope } : {} }));
+    const merged = mergeKeepItemLists(await this.getAll(), scopedItems);
+    await this.setMany(merged);
+    return merged;
   }
   subscribe(listener) {
     return this.base.subscribe?.(listener) ?? (() => void 0);
   }
+  async removeMembershipsForItems(ids) {
+    if (!this.base.getCollectionMemberships || !this.base.removeCollectionMembership || ids.length === 0) return;
+    const removedIds = new Set(ids);
+    const memberships = await this.base.getCollectionMemberships();
+    for (const membership of memberships) {
+      if (removedIds.has(membership.itemId) && isSameKeepScope(membership.scope, this.scope)) {
+        await this.base.removeCollectionMembership(membership.collectionId, membership.itemId, this.scope);
+      }
+    }
+  }
+  async clearMembershipsForScope() {
+    if (!this.base.getCollectionMemberships || !this.base.removeCollectionMembership) return;
+    const memberships = await this.base.getCollectionMemberships();
+    for (const membership of memberships) {
+      if (isSameKeepScope(membership.scope, this.scope)) {
+        await this.base.removeCollectionMembership(membership.collectionId, membership.itemId, this.scope);
+      }
+    }
+  }
 };
 function createScopedStorageAdapter(base, scope) {
   return new ScopedStorageAdapter(base, scope);
@@ -193,32 +226,38 @@ var ScopedSyncQueueAdapter = class {
     const ids = new Set(scoped.map((operation) => operation.operationId));
     await this.base.setMany([
       ...current.filter(
-        (operation) => !ids.has(operation.operationId) && !isSameKeepScope(operation.scope, this.scope)
+        (operation) => !ids.has(operation.operationId) || !isSameKeepScope(operation.scope, this.scope)
       ),
       ...scoped
     ]);
   }
-  remove(operationIds) {
-    return this.base.remove(operationIds);
+  async remove(operationIds) {
+    const ids = new Set(operationIds);
+    const scopedIds = (await this.base.getAll()).filter((operation) => ids.has(operation.operationId) && isSameKeepScope(operation.scope, this.scope)).map((operation) => operation.operationId);
+    await this.base.remove(scopedIds);
   }
-  clear() {
-    return this.base.getAll().then(
-      (operations) => this.base.setMany(operations.filter((operation) => !isSameKeepScope(operation.scope, this.scope)))
-    );
+  async clear() {
+    const operationIds = (await this.base.getAll()).filter((operation) => isSameKeepScope(operation.scope, this.scope)).map((operation) => operation.operationId);
+    await this.base.remove(operationIds);
   }
 };
-async function writeAll(base, items) {
+async function writeAll(base, items, scope) {
+  const existing = await base.getAll();
+  const desiredItems = new Set(items.filter((item) => isSameKeepScope(item.scope, scope)).map(itemStorageKey2));
+  const removedIds = existing.filter((item) => isSameKeepScope(item.scope, scope) && !desiredItems.has(itemStorageKey2(item))).map((item) => item.id);
+  if (removedIds.length > 0) {
+    if (base.removeMany) await base.removeMany(removedIds, scope);
+    else await Promise.all(removedIds.map((id) => base.remove(id, scope)));
+  }
   if (base.setMany) {
     await base.setMany(items);
     return;
   }
-  const existing = await base.getAll();
-  const ids = new Set(items.map((item) => item.id));
-  for (const item of existing) {
-    if (!ids.has(item.id)) await base.remove(item.id);
-  }
   for (const item of items) await base.set(item);
 }
+function itemStorageKey2(item) {
+  return JSON.stringify([item.scope?.tenantId ?? null, item.scope?.userId ?? null, item.id]);
+}
 
 // src/storage/sync.ts
 var DEFAULT_SYNC_QUEUE_KEY = "keepkit:sync-queue";
@@ -381,11 +420,12 @@ var SyncStorageAdapter = class {
     };
     this.local = options.local;
     this.remote = options.remote;
-    this.queue = options.queue ?? createDefaultQueue(options);
+    this.scope = getSyncScope(options);
+    const queue = options.queue ?? createDefaultQueue(options);
+    this.queue = this.scope ? new ScopedSyncQueueAdapter(queue, this.scope) : queue;
     this.clientId = options.clientId ?? createId();
     this.now = options.now ?? Date.now;
     this.resolveConflict = options.resolveConflict;
-    this.scope = getSyncScope(options);
     this.maxRetries = Math.max(0, options.maxRetries ?? 3);
     this.retryDelayMs = Math.max(0, options.retryDelayMs ?? 0);
     this.retryBackoff = Math.max(1, options.retryBackoff ?? 2);
@@ -402,7 +442,13 @@ var SyncStorageAdapter = class {
       this.setCollection = async (collection) => {
         const scopedCollection = { ...collection, ...this.scope ? { scope: this.scope } : {} };
         if (this.remote.pushCollection) {
-          const operation = this.createCollectionOperation("upsert", scopedCollection.id, scopedCollection);
+          const current = (await this.getCollections?.())?.find((entry) => entry.id === scopedCollection.id);
+          const operation = this.createCollectionOperation(
+            "upsert",
+            scopedCollection.id,
+            scopedCollection,
+            current?.revision
+          );
           await this.enqueueBeforeLocalWrite(operation);
           try {
             await setCollection(scopedCollection);
@@ -418,13 +464,16 @@ var SyncStorageAdapter = class {
         this.notifyDataListeners();
       };
       this.removeCollection = async (id) => {
+        const memberships = await this.getCollectionMemberships?.() ?? [];
+        const membershipOperations = this.remote.pushMembership ? memberships.filter((membership) => membership.collectionId === id).map((membership) => this.createMembershipOperation("remove", membership.collectionId, membership.itemId)) : [];
         if (this.remote.pushCollection) {
-          const operation = this.createCollectionOperation("remove", id);
-          await this.enqueueBeforeLocalWrite(operation);
+          const current = (await this.getCollections?.())?.find((collection) => collection.id === id);
+          const operation = this.createCollectionOperation("remove", id, void 0, current?.revision);
+          await this.enqueueManyBeforeLocalWrite([...membershipOperations, operation]);
           try {
             await removeCollection(id, this.scope);
           } catch (cause) {
-            await this.removeQueued(operation.operationId);
+            await this.removeQueued([operation.operationId, ...membershipOperations.map((entry) => entry.operationId)]);
             throw cause;
           }
           this.notifyDataListeners();
@@ -445,11 +494,36 @@ var SyncStorageAdapter = class {
         return scope ? memberships.filter((membership) => sameScope(membership.scope, scope)) : memberships;
       };
       this.setCollectionMembership = async (membership) => {
-        await setMembership({ ...membership, ...this.scope ? { scope: this.scope } : {} });
+        const scoped = { ...membership, ...this.scope ? { scope: this.scope } : {} };
+        if (this.remote.pushMembership) {
+          const operation = this.createMembershipOperation("upsert", scoped.collectionId, scoped.itemId, scoped);
+          await this.enqueueBeforeLocalWrite(operation);
+          try {
+            await setMembership(scoped);
+          } catch (cause) {
+            await this.removeQueued(operation.operationId);
+            throw cause;
+          }
+          this.setPendingState();
+        } else {
+          await setMembership(scoped);
+        }
         this.notifyDataListeners();
       };
       this.removeCollectionMembership = async (collectionId, itemId) => {
-        await removeMembership(collectionId, itemId, this.scope);
+        if (this.remote.pushMembership) {
+          const operation = this.createMembershipOperation("remove", collectionId, itemId);
+          await this.enqueueBeforeLocalWrite(operation);
+          try {
+            await removeMembership(collectionId, itemId, this.scope);
+          } catch (cause) {
+            await this.removeQueued(operation.operationId);
+            throw cause;
+          }
+          this.setPendingState();
+        } else {
+          await removeMembership(collectionId, itemId, this.scope);
+        }
         this.notifyDataListeners();
       };
     }
@@ -493,11 +567,13 @@ var SyncStorageAdapter = class {
   }
   async remove(id) {
     const operation = this.createOperation("remove", id);
-    await this.enqueueBeforeLocalWrite(operation);
+    const memberships = await this.getCollectionMemberships?.() ?? [];
+    const membershipOperations = this.remote.pushMembership ? memberships.filter((membership) => membership.itemId === id).map((membership) => this.createMembershipOperation("remove", membership.collectionId, membership.itemId)) : [];
+    await this.enqueueManyBeforeLocalWrite([...membershipOperations, operation]);
     try {
-      await this.local.remove(id);
+      await this.local.remove(id, this.scope);
     } catch (cause) {
-      await this.removeQueued(operation.operationId);
+      await this.removeQueued([operation.operationId, ...membershipOperations.map((entry) => entry.operationId)]);
       throw cause;
     }
     this.notifyDataListeners();
@@ -505,11 +581,15 @@ var SyncStorageAdapter = class {
   }
   async removeMany(ids) {
     const operations = [...new Set(ids)].map((id) => this.createOperation("remove", id));
-    await this.enqueueManyBeforeLocalWrite(operations);
+    const idSet = new Set(ids);
+    const memberships = await this.getCollectionMemberships?.() ?? [];
+    const membershipOperations = this.remote.pushMembership ? memberships.filter((membership) => idSet.has(membership.itemId)).map((membership) => this.createMembershipOperation("remove", membership.collectionId, membership.itemId)) : [];
+    await this.enqueueManyBeforeLocalWrite([...membershipOperations, ...operations]);
     try {
-      await removeKeepItems(this.local, ids);
+      if (this.local.removeMany) await this.local.removeMany(ids, this.scope);
+      else await Promise.all(ids.map((id) => this.local.remove(id, this.scope)));
     } catch (cause) {
-      await this.removeQueued(operations.map((operation) => operation.operationId));
+      await this.removeQueued([...operations, ...membershipOperations].map((operation) => operation.operationId));
       throw cause;
     }
     this.notifyDataListeners();
@@ -518,9 +598,17 @@ var SyncStorageAdapter = class {
   async clear() {
     const items = await this.getAll();
     await this.removeMany(items.map((item) => item.id));
-    await this.local.clear();
+    if (!this.scope) await this.local.clear();
   }
   async merge(localItems) {
+    if (this.scope) {
+      const merged2 = mergeKeepItemLists(
+        await this.getAll(),
+        localItems.map((item) => this.applyScope(item))
+      );
+      await this.setMany(localItems);
+      return merged2;
+    }
     const merged = this.local.merge ? await this.local.merge(localItems) : mergeKeepItemLists(await this.local.getAll(), localItems);
     if (!this.local.merge) await persistKeepItems(this.local, merged);
     await this.setMany(localItems);
@@ -569,6 +657,47 @@ var SyncStorageAdapter = class {
     });
     if (resolution !== "remote" && this.queueItems.length > 0) await this.flushSync();
   }
+  async resolveCollectionSyncConflict(id, resolution, collection) {
+    await this.loadQueue();
+    const conflict = (this.state.collectionConflicts ?? []).find((entry) => entry.operation.id === id);
+    if (!conflict) return;
+    if (!this.local.getCollections || !this.local.setCollection || !this.local.removeCollection) {
+      throw new Error("KeepKit collection storage is unavailable.");
+    }
+    if (resolution === "remote") {
+      if (conflict.deleted) await this.local.removeCollection(id, this.scope);
+      else {
+        if (!conflict.collection) throw new Error("Remote collection conflict is missing its selected definition.");
+        await this.local.setCollection({
+          ...conflict.collection,
+          ...conflict.revision ? { revision: conflict.revision } : {},
+          ...this.scope ? { scope: this.scope } : {}
+        });
+      }
+      await this.removeQueued(conflict.operation.operationId);
+      this.updateState({
+        collectionConflicts: (this.state.collectionConflicts ?? []).filter((entry) => entry.operation.id !== id)
+      });
+      return;
+    }
+    if (collection && collection.id !== id) {
+      throw new TypeError("KeepKit collection conflict resolution must use the requested collection ID.");
+    }
+    const chosen = collection ?? (await this.getCollections?.())?.find((entry) => entry.id === id);
+    const retry = {
+      ...conflict.operation,
+      operationId: `${this.clientId}:${this.now()}:${createId()}`,
+      ...conflict.operation.type === "upsert" && chosen ? { collection: { ...chosen, ...this.scope ? { scope: this.scope } : {} } } : {},
+      createdAt: this.now(),
+      baseRevision: conflict.revision,
+      attempts: 0
+    };
+    await this.replaceQueued(conflict.operation, retry);
+    this.updateState({
+      collectionConflicts: (this.state.collectionConflicts ?? []).filter((entry) => entry.operation.id !== id)
+    });
+    await this.flushSync();
+  }
   dispose() {
     this.disposed = true;
     if (this.onlineHandler) window.removeEventListener("online", this.onlineHandler);
@@ -589,7 +718,29 @@ var SyncStorageAdapter = class {
       try {
         if (isCollectionSyncOperation(operation)) {
           if (!this.remote.pushCollection) throw new Error("Remote sync driver does not support collection sync.");
-          await this.pushCollectionWithRetry(operation);
+          const result2 = await this.pushCollectionWithRetry(operation);
+          if (result2?.type === "conflict" && result2.resolution === "manual") {
+            const conflict = createCollectionSyncConflict(operation, result2);
+            this.updateState({
+              status: "conflict",
+              collectionConflicts: [
+                ...(this.state.collectionConflicts ?? []).filter((entry) => entry.operation.id !== operation.id),
+                conflict
+              ]
+            });
+            continue;
+          }
+          await this.applyCollectionPushResult(operation, result2);
+          await this.removeQueued(operation.operationId);
+          this.updateState({
+            status: this.queueItems.length > 0 ? "syncing" : "synced",
+            lastSyncedAt: this.now()
+          });
+          continue;
+        }
+        if (isMembershipSyncOperation(operation)) {
+          if (!this.remote.pushMembership) throw new Error("Remote sync driver does not support membership sync.");
+          await this.pushMembershipWithRetry(operation);
           await this.removeQueued(operation.operationId);
           this.updateState({
             status: this.queueItems.length > 0 ? "syncing" : "synced",
@@ -661,7 +812,7 @@ var SyncStorageAdapter = class {
       ...this.scope ? { scope: this.scope } : {}
     };
   }
-  createCollectionOperation(type, id, collection) {
+  createCollectionOperation(type, id, collection, baseRevision) {
     return {
       operationId: `${this.clientId}:${this.now()}:${createId()}`,
       type,
@@ -669,6 +820,20 @@ var SyncStorageAdapter = class {
       id,
       ...collection ? { collection } : {},
       createdAt: this.now(),
+      ...baseRevision ? { baseRevision } : {},
+      ...this.scope ? { scope: this.scope } : {}
+    };
+  }
+  createMembershipOperation(type, collectionId, itemId, membership) {
+    return {
+      operationId: `${this.clientId}:${this.now()}:${createId()}`,
+      type,
+      entity: "membership",
+      id: getMembershipId(collectionId, itemId),
+      collectionId,
+      itemId,
+      ...membership ? { membership } : {},
+      createdAt: this.now(),
       ...this.scope ? { scope: this.scope } : {}
     };
   }
@@ -692,7 +857,48 @@ var SyncStorageAdapter = class {
     let attempt = 0;
     while (true) {
       try {
-        await this.remote.pushCollection?.({ ...operation, attempts: attempt });
+        return await this.remote.pushCollection?.({ ...operation, attempts: attempt });
+      } catch (error) {
+        if (isKeepSyncAuthError(error) || attempt >= this.maxRetries) throw error;
+        attempt += 1;
+        const delay = this.retryDelayMs * this.retryBackoff ** (attempt - 1);
+        if (delay > 0) await wait(delay);
+      }
+    }
+  }
+  async applyCollectionPushResult(operation, result) {
+    if (!this.local.getCollections || !this.local.setCollection || !this.local.removeCollection) return;
+    if (!result) return;
+    const outcome = result.type === "conflict" ? result.resolution : "remote";
+    if (outcome === "manual") return;
+    const deleted = outcome === "local" ? operation.type === "remove" : result.deleted ?? (operation.type === "remove" && outcome === "remote");
+    if (deleted) {
+      await this.local.removeCollection(operation.id, this.scope);
+    } else if (result.type === "synced" || outcome === "remote" || outcome === "local") {
+      const current = (outcome === "local" ? operation.collection : result.collection) ?? (await this.getCollections?.())?.find((entry) => entry.id === operation.id);
+      if (!current) return;
+      await this.local.setCollection({
+        ...current,
+        ...result.revision ? { revision: result.revision } : current.revision ? { revision: current.revision } : {},
+        ...this.scope ? { scope: this.scope } : {}
+      });
+    }
+    if (result.type === "conflict") {
+      const conflict = createCollectionSyncConflict(operation, result);
+      this.updateState({
+        status: "conflict",
+        collectionConflicts: [
+          ...(this.state.collectionConflicts ?? []).filter((entry) => entry.operation.id !== operation.id),
+          conflict
+        ]
+      });
+    }
+  }
+  async pushMembershipWithRetry(operation) {
+    let attempt = 0;
+    while (true) {
+      try {
+        await this.remote.pushMembership?.({ ...operation, attempts: attempt });
         return;
       } catch (error) {
         if (isKeepSyncAuthError(error) || attempt >= this.maxRetries) throw error;
@@ -771,7 +977,7 @@ var SyncStorageAdapter = class {
     });
   }
   async pullRemote() {
-    if (!this.remote.pull && !this.remote.pullCollections) return true;
+    if (!this.remote.pull && !this.remote.pullCollections && !this.remote.pullMemberships) return true;
     try {
       if (this.remote.pull) {
         const remoteItems = await this.remote.pull();
@@ -805,7 +1011,7 @@ var SyncStorageAdapter = class {
         const localCollections = await this.local.getCollections();
         const pendingIds = new Set(this.queueItems.filter(isCollectionSyncOperation).map((operation) => operation.id));
         const remoteById = new Map(
-          remoteCollections.filter((collection) => !this.scope || sameScope(collection.scope, this.scope)).map((collection) => [collection.id, collection])
+          remoteCollections.filter((collection) => !this.scope || !collection.scope || sameScope(collection.scope, this.scope)).map((collection) => [collection.id, collection])
         );
         for (const collection of remoteById.values()) {
           if (pendingIds.has(collection.id)) continue;
@@ -818,6 +1024,32 @@ var SyncStorageAdapter = class {
         }
         this.notifyDataListeners();
       }
+      if (this.remote.pullMemberships && this.getCollections && this.local.getCollectionMemberships && this.local.setCollectionMembership && this.local.removeCollectionMembership) {
+        const remoteMemberships = await this.remote.pullMemberships();
+        const localMemberships = await this.local.getCollectionMemberships();
+        const pendingIds = new Set(this.queueItems.filter(isMembershipSyncOperation).map((operation) => operation.id));
+        const itemIds = new Set((await this.getAll()).map((item) => item.id));
+        const collectionIds = new Set((await this.getCollections()).map((collection) => collection.id));
+        const remoteById = new Map(
+          remoteMemberships.filter((membership) => {
+            if (this.scope && membership.scope && !sameScope(membership.scope, this.scope)) return false;
+            if (!itemIds.has(membership.itemId)) return false;
+            return collectionIds.has(membership.collectionId);
+          }).map((membership) => [getMembershipId(membership.collectionId, membership.itemId), membership])
+        );
+        for (const membership of remoteById.values()) {
+          const id = getMembershipId(membership.collectionId, membership.itemId);
+          if (pendingIds.has(id)) continue;
+          await this.local.setCollectionMembership({ ...membership, ...this.scope ? { scope: this.scope } : {} });
+        }
+        for (const membership of localMemberships) {
+          const id = getMembershipId(membership.collectionId, membership.itemId);
+          if (pendingIds.has(id) || remoteById.has(id)) continue;
+          if (this.scope && !sameScope(membership.scope, this.scope)) continue;
+          await this.local.removeCollectionMembership(membership.collectionId, membership.itemId, this.scope);
+        }
+        this.notifyDataListeners();
+      }
       return true;
     } catch (error) {
       this.updateState({ status: "error", error });
@@ -844,11 +1076,27 @@ function isCollectionSyncOperation(value) {
   if (!isRecord(value)) return false;
   return typeof value.operationId === "string" && value.entity === "collection" && (value.type === "upsert" || value.type === "remove") && typeof value.id === "string" && typeof value.createdAt === "number" && (value.collection === void 0 || isKeepCollectionDefinition(value.collection));
 }
+function isMembershipSyncOperation(value) {
+  if (!isRecord(value)) return false;
+  return typeof value.operationId === "string" && value.entity === "membership" && (value.type === "upsert" || value.type === "remove") && typeof value.id === "string" && typeof value.collectionId === "string" && typeof value.itemId === "string" && typeof value.createdAt === "number" && (value.membership === void 0 || isKeepCollectionMembership(value.membership)) && (value.type !== "upsert" || isKeepCollectionMembership(value.membership));
+}
 function isSyncQueueOperation(value) {
-  return isSyncOperation(value) || isCollectionSyncOperation(value);
+  return isSyncOperation(value) || isCollectionSyncOperation(value) || isMembershipSyncOperation(value);
 }
 function getQueueIdentity(operation) {
-  return `${operation.entity === "collection" ? "collection" : "item"}:${operation.id}`;
+  return `${operation.entity ?? "item"}:${operation.id}`;
+}
+function getMembershipId(collectionId, itemId) {
+  return `${collectionId}\0${itemId}`;
+}
+function createCollectionSyncConflict(operation, result) {
+  const details = {
+    operation,
+    resolution: result.resolution,
+    ...result.revision ? { revision: result.revision } : {}
+  };
+  if (result.deleted) return { ...details, deleted: true };
+  return { ...details, deleted: false, collection: result.collection };
 }
 function createId() {
   if (typeof crypto !== "undefined" && "randomUUID" in crypto) return crypto.randomUUID();
@@ -931,6 +1179,7 @@ var FallbackStorageAdapter = class {
     this.migrateFallbackOnEmpty = options.migrateFallbackOnEmpty ?? false;
     this.mirrorWrites = options.mirrorWrites ?? false;
     this.storageKey = options.fallback.storageKey ?? options.primary.storageKey;
+    this.scope = options.primary.scope ?? options.fallback.scope;
     if (this.primary.getCollections && this.primary.setCollection && this.primary.removeCollection && this.fallback.getCollections && this.fallback.setCollection && this.fallback.removeCollection) {
       const fallbackGetCollections = this.fallback.getCollections.bind(this.fallback);
       this.getCollections = async () => {
@@ -985,12 +1234,12 @@ var FallbackStorageAdapter = class {
       (adapter) => adapter.setMany ? adapter.setMany(items) : Promise.all(items.map((item) => adapter.set(item))).then(() => void 0)
     );
   }
-  remove(id) {
-    return this.executeWrite((adapter) => adapter.remove(id));
+  remove(id, scope) {
+    return this.executeWrite((adapter) => adapter.remove(id, scope));
   }
-  removeMany(ids) {
+  removeMany(ids, scope) {
     return this.executeWrite(
-      (adapter) => adapter.removeMany ? adapter.removeMany(ids) : Promise.all(ids.map((id) => adapter.remove(id))).then(() => void 0)
+      (adapter) => adapter.removeMany ? adapter.removeMany(ids, scope) : Promise.all(ids.map((id) => adapter.remove(id, scope))).then(() => void 0)
     );
   }
   clear() {
@@ -1114,8 +1363,8 @@ function createStorageAdapter(options) {
     } : {},
     set: async (item) => options.set(item),
     ...setMany ? { setMany: async (items) => setMany(items) } : {},
-    remove: async (id) => options.remove(id),
-    ...removeMany ? { removeMany: async (ids) => removeMany(ids) } : {},
+    remove: async (id, scope) => options.remove(id, scope),
+    ...removeMany ? { removeMany: async (ids, scope) => removeMany(ids, scope) } : {},
     clear: async () => options.clear(),
     ...merge ? { merge: async (items) => merge(items) } : {},
     ...subscribe ? {
@@ -1205,6 +1454,9 @@ var LocalStorageAdapter = class {
     );
   }
   async getCollectionMemberships() {
+    return this.readMemberships();
+  }
+  readMemberships() {
     if (!this.storage) return [];
     const storageKey = `${this.storageKey}:memberships`;
     let raw;
@@ -1227,12 +1479,12 @@ var LocalStorageAdapter = class {
   }
   async setCollectionMembership(membership) {
     if (!isKeepCollectionMembership(membership)) throw new Error("Collection membership is invalid.");
-    const current = await this.getCollectionMemberships();
+    const current = this.readMemberships();
     const sameMembership = (entry) => entry.collectionId === membership.collectionId && entry.itemId === membership.itemId && isSameKeepScope(entry.scope, membership.scope);
     await this.writeMemberships([...current.filter((entry) => !sameMembership(entry)), membership], "set");
   }
   async removeCollectionMembership(collectionId, itemId, scope) {
-    const current = await this.getCollectionMemberships();
+    const current = this.readMemberships();
     await this.writeMemberships(
       current.filter(
         (entry) => entry.collectionId !== collectionId || entry.itemId !== itemId || !isSameKeepScope(entry.scope, scope)
@@ -1245,24 +1497,37 @@ var LocalStorageAdapter = class {
   }
   async setMany(items) {
     const current = await this.getAll();
-    const byId = new Map(current.map((item) => [item.id, item]));
-    for (const item of items) byId.set(item.id, item);
-    this.write([...byId.values()], "set");
+    const byScopeAndId = new Map(current.map((item) => [getItemStorageKey(item), item]));
+    for (const item of items) byScopeAndId.set(getItemStorageKey(item), item);
+    this.write([...byScopeAndId.values()], "set");
   }
-  async remove(id) {
-    await this.removeMany([id]);
+  async remove(id, scope) {
+    await this.removeMany([id], scope);
   }
-  async removeMany(ids) {
+  async removeMany(ids, scope) {
     const idSet = new Set(ids);
     const items = await this.getAll();
     this.write(
-      items.filter((item) => !idSet.has(item.id)),
+      items.filter((item) => !idSet.has(item.id) || scope !== void 0 && !isSameKeepScope(item.scope, scope)),
       "remove"
     );
+    const memberships = await this.getCollectionMemberships();
+    const membershipIds = memberships.filter(
+      (membership) => idSet.has(membership.itemId) && (scope === void 0 || isSameKeepScope(membership.scope, scope))
+    );
+    for (const membership of membershipIds) {
+      await this.removeCollectionMembership(membership.collectionId, membership.itemId, membership.scope);
+    }
   }
   async clear() {
     if (!this.storage) return;
     try {
+      const items = await this.getAll();
+      if (items.length > 0) await this.removeMany(items.map((item) => item.id));
+      const memberships = await this.getCollectionMemberships();
+      for (const membership of memberships) {
+        await this.removeCollectionMembership(membership.collectionId, membership.itemId, membership.scope);
+      }
       this.storage.removeItem(this.storageKey);
     } catch (cause) {
       throw new KeepStorageAccessError({
@@ -1344,7 +1609,7 @@ var IndexedDBAdapter = class {
       if (!isKeepItemArray(value)) {
         throw new KeepStorageParseError({ operation: "getAll", storageKey: this.storageKey });
       }
-      return value;
+      return value.map(decodeIndexedDBItem);
     } catch (cause) {
       if (cause instanceof KeepStorageParseError) throw cause;
       throw new KeepStorageAccessError({ operation: "getAll", storageKey: this.storageKey, cause });
@@ -1415,9 +1680,12 @@ var IndexedDBAdapter = class {
     const database = await this.open("set");
     if (!database) return;
     try {
+      const identities = new Set(items.map(getItemIdentity));
+      const previous = (await this.getAll()).filter((item) => identities.has(getItemIdentity(item)));
       const transaction = database.transaction(this.storeName, "readwrite");
       const objectStore = transaction.objectStore(this.storeName);
-      for (const item of items) objectStore.put(item);
+      for (const item of previous) objectStore.delete(getStoredIndexedDBItemId(item));
+      for (const item of items) objectStore.put(encodeIndexedDBItem(item));
       await transactionToPromise2(transaction);
       this.notifySubscribers();
     } catch (cause) {
@@ -1427,17 +1695,25 @@ var IndexedDBAdapter = class {
       throw new KeepStorageAccessError({ operation: "set", storageKey: this.storageKey, cause });
     }
   }
-  async remove(id) {
-    return this.removeMany([id]);
+  async remove(id, scope) {
+    return this.removeMany([id], scope);
   }
-  async removeMany(ids) {
+  async removeMany(ids, scope) {
     const database = await this.open("remove");
     if (!database) return;
     try {
+      const idSet = new Set(ids);
+      const removableIds = (await this.getAll()).filter((item) => idSet.has(item.id) && (scope === void 0 || isSameKeepScope(item.scope, scope))).map(getStoredIndexedDBItemId);
       const transaction = database.transaction(this.storeName, "readwrite");
       const objectStore = transaction.objectStore(this.storeName);
-      for (const id of new Set(ids)) objectStore.delete(id);
+      for (const id of removableIds) objectStore.delete(id);
       await transactionToPromise2(transaction);
+      const memberships = await this.getCollectionMemberships();
+      for (const membership of memberships) {
+        if (idSet.has(membership.itemId) && (scope === void 0 || isSameKeepScope(membership.scope, scope))) {
+          await this.removeCollectionMembership(membership.collectionId, membership.itemId, membership.scope);
+        }
+      }
       this.notifySubscribers();
     } catch (cause) {
       throw new KeepStorageAccessError({ operation: "remove", storageKey: this.storageKey, cause });
@@ -1447,6 +1723,12 @@ var IndexedDBAdapter = class {
     const database = await this.open("clear");
     if (!database) return;
     try {
+      const items = await this.getAll();
+      if (items.length > 0) await this.removeMany(items.map((item) => item.id));
+      const memberships = await this.getCollectionMemberships();
+      for (const membership of memberships) {
+        await this.removeCollectionMembership(membership.collectionId, membership.itemId, membership.scope);
+      }
       const transaction = database.transaction(this.storeName, "readwrite");
       transaction.objectStore(this.storeName).clear();
       await transactionToPromise2(transaction);
@@ -1563,9 +1845,39 @@ var IndexedDBAdapter = class {
     });
   }
 };
+var indexedDBStoredItemId = /* @__PURE__ */ Symbol("keepkit.indexeddb-stored-item-id");
+function encodeIndexedDBItem(item) {
+  if (!item.scope) return item;
+  return {
+    ...item,
+    id: createScopedIndexedDBItemId(item),
+    __keepkitOriginalId: item.id
+  };
+}
+function decodeIndexedDBItem(item) {
+  const originalId = item.__keepkitOriginalId;
+  const isEncoded = typeof originalId === "string" && item.scope !== void 0 && item.id === createScopedIndexedDBItemId({ ...item, id: originalId });
+  const { __keepkitOriginalId: _encodedOriginalId, ...record } = item;
+  const decoded = isEncoded ? { ...record, id: originalId } : item;
+  Object.defineProperty(decoded, indexedDBStoredItemId, { value: item.id });
+  return decoded;
+}
+function getStoredIndexedDBItemId(item) {
+  return item[indexedDBStoredItemId] ?? createScopedIndexedDBItemId(item);
+}
+function createScopedIndexedDBItemId(item) {
+  if (!item.scope) return item.id;
+  return `\0keepkit-scope:${JSON.stringify([item.scope.tenantId ?? null, item.scope.userId ?? null, item.id])}`;
+}
+function getItemIdentity(item) {
+  return JSON.stringify([item.scope?.tenantId ?? null, item.scope?.userId ?? null, item.id]);
+}
 function collectionKey(id, scope) {
   return JSON.stringify([scope?.tenantId ?? null, scope?.userId ?? null, id]);
 }
+function getItemStorageKey(item) {
+  return JSON.stringify([item.scope?.tenantId ?? null, item.scope?.userId ?? null, item.id]);
+}
 function membershipKey(collectionId, itemId, scope) {
   return JSON.stringify([scope?.tenantId ?? null, scope?.userId ?? null, collectionId, itemId]);
 }
@@ -1638,4 +1950,4 @@ export {
   LocalStorageAdapter,
   IndexedDBAdapter
 };
-//# sourceMappingURL=chunk-NZLAW4LY.js.map
+//# sourceMappingURL=chunk-SLH4DFYQ.js.map