@contember/bindx 0.1.52 → 0.1.53

package/src/handles/HasManyListHandle.ts

@@ -284,7 +284,8 @@ export class HasManyListHandle<TEntity extends object = object, TSelected = TEnt
 	 * Only called when parent's embedded data has changed (re-fetch detected).
 	 */
 	private ensureItemSnapshots(listData: Array<Record<string, unknown>>): void {
-		for (const itemData of listData) {
+		for (const embeddedItem of listData) {
+			const itemData = this.store.resolveServerOccurrence(embeddedItem)
 			const itemId = itemData['id'] as string
 			if (!itemId) continue
 
@@ -406,23 +407,18 @@ export class HasManyListHandle<TEntity extends object = object, TSelected = TEnt
 
 	/**
 	 * Checks if the list is dirty (items added/removed/moved/connected/disconnected).
+	 *
+	 * Pending writes belong to the relation, not to this view, so a sibling view's
+	 * unsaved change reports here too — persisting either view sends the whole
+	 * relation, and a view claiming to be clean while pushing its sibling's writes
+	 * would be incoherent. Only the manual ordering is this view's own.
 	 */
 	get isDirty(): boolean {
 		this.materializeEmbeddedItems()
 
-		const state = this.store.getHasMany(
-			this.entityType,
-			this.entityId,
-			this.fieldName,
-			this.alias,
-		)
-
-		if (!state) return false
-
 		return (
-			state.plannedRemovals.size > 0 ||
-			state.plannedAdditions.size > 0 ||
-			state.orderedIds !== null
+			this.store.hasPendingHasManyWrites(this.entityType, this.entityId, this.fieldName)
+			|| this.store.hasExplicitHasManyOrder(this.entityType, this.entityId, this.fieldName, this.alias)
 		)
 	}
 
@@ -452,7 +448,7 @@ export class HasManyListHandle<TEntity extends object = object, TSelected = TEnt
 	disconnect(itemId: string): void {
 		this.materializeEmbeddedItems()
 		this.dispatcher.dispatch(
-			removeFromList(this.entityType, this.entityId, this.fieldName, itemId, 'disconnect', this.alias),
+			removeFromList(this.entityType, this.entityId, this.fieldName, itemId, 'disconnect'),
 		)
 	}
 
@@ -464,7 +460,7 @@ export class HasManyListHandle<TEntity extends object = object, TSelected = TEnt
 	delete(itemId: string): void {
 		this.materializeEmbeddedItems()
 		this.dispatcher.dispatch(
-			removeFromList(this.entityType, this.entityId, this.fieldName, itemId, 'delete', this.alias),
+			removeFromList(this.entityType, this.entityId, this.fieldName, itemId, 'delete'),
 		)
 	}
 
@@ -503,7 +499,7 @@ export class HasManyListHandle<TEntity extends object = object, TSelected = TEnt
 	remove(itemId: string): void {
 		this.materializeEmbeddedItems()
 		this.dispatcher.dispatch(
-			removeFromList(this.entityType, this.entityId, this.fieldName, itemId, this.resolveRemovalType(), this.alias),
+			removeFromList(this.entityType, this.entityId, this.fieldName, itemId, this.resolveRemovalType()),
 		)
 	}
 
@@ -541,6 +537,9 @@ export class HasManyListHandle<TEntity extends object = object, TSelected = TEnt
 	/**
 	 * Resets the has-many relation to server state.
 	 * Clears all planned connections and removals.
+	 *
+	 * Relation-level, like {@link isDirty}: planned removals carry no view, so a
+	 * per-view reset could not know which of them to drop.
 	 */
 	reset(): void {
 		this.materializeEmbeddedItems()
@@ -548,7 +547,6 @@ export class HasManyListHandle<TEntity extends object = object, TSelected = TEnt
 			this.entityType,
 			this.entityId,
 			this.fieldName,
-			this.alias,
 		)
 	}
 

package/src/handles/HasOneHandle.ts

@@ -418,11 +418,13 @@ export class HasOneHandle<TEntity extends object = object, TSelected = TEntity>
 			return
 		}
 
+		const occurrence = this.store.resolveServerOccurrence(embeddedData as Record<string, unknown>)
+
 		// Skip if embedded data values match existing serverData — avoids overwriting
 		// unpersisted local mutations when a re-fetch returns the same server data
 		// (e.g. polling). A new reference with identical values means no actual change.
 		const existing = this.store.getEntitySnapshot(this.targetType, id)
-		if (existing?.serverData && embeddedDataMatchesSnapshot(embeddedData as Record<string, unknown>, existing.serverData as Record<string, unknown>)) {
+		if (existing?.serverData && embeddedDataMatchesSnapshot(occurrence, existing.serverData as Record<string, unknown>)) {
 			this.store.markEmbeddedDataPropagated(this.entityType, this.entityId, this.dataFieldName, embeddedData)
 			return
 		}
@@ -435,7 +437,7 @@ export class HasOneHandle<TEntity extends object = object, TSelected = TEntity>
 		this.store.refreshServerData(
 			this.targetType,
 			id,
-			embeddedData as Record<string, unknown>,
+			occurrence,
 			true, // skipNotify - called during render, data already exists embedded in parent
 		)
 		this.store.markEmbeddedDataPropagated(this.entityType, this.entityId, this.dataFieldName, embeddedData)

package/src/index.ts

@@ -250,6 +250,12 @@ export type {
 export type {
 	StoredRelationState,
 	StoredHasManyState,
+	HasManyView,
+	HasManyViewMembership,
+	PlannedHasManyAddition,
+	HasManyAdditionKind,
+	HasManyRelationProjection,
+	HasManyViewProjection,
 	EntityMeta,
 } from './store/SnapshotStore.js'