@lionweb/delta-protocol-common 0.8.0-beta.2 → 0.8.0-beta.4

package/src/payload/event-types.ts

@@ -280,146 +280,6 @@ export interface ReferenceChangedEvent extends Event {
     oldResolveInfo: string | null
 }
 
-/** § 6.6.6.4 */
-export interface EntryMovedFromOtherReferenceEvent extends Event {
-    messageKind: "EntryMovedFromOtherReference"
-    newParent: LionWebId
-    newReference: LionWebJsonMetaPointer
-    newIndex: number
-    oldParent: LionWebId
-    oldReference: LionWebJsonMetaPointer
-    oldIndex: number
-    movedTarget: LionWebId | null
-    movedResolveInfo: string | null
-}
-
-/** § 6.6.6.5 */
-export interface EntryMovedFromOtherReferenceInSameParentEvent extends Event {
-    messageKind: "EntryMovedFromOtherReferenceInSameParent"
-    parent: LionWebId
-    newReference: LionWebJsonMetaPointer
-    newIndex: number
-    oldReference: LionWebJsonMetaPointer
-    oldIndex: number
-    movedTarget: LionWebId | null
-    movedResolveInfo: string | null
-}
-
-/** § 6.6.6.6 */
-export interface EntryMovedInSameReferenceEvent extends Event {
-    messageKind: "EntryMovedInSameReference"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    oldIndex: number
-    newIndex: number
-    movedTarget: LionWebId | null
-    movedResolveInfo: string | null
-}
-
-/** § 6.6.6.7 */
-export interface EntryMovedAndReplacedFromOtherReferenceEvent extends Event {
-    messageKind: "EntryMovedAndReplacedFromOtherReference"
-    newParent: LionWebId
-    newReference: LionWebJsonMetaPointer
-    newIndex: number
-    movedTarget: LionWebId | null
-    movedResolveInfo: string | null
-    oldParent: LionWebId
-    oldReference: LionWebJsonMetaPointer
-    oldIndex: number
-    replacedTarget: LionWebId | null
-    replacedResolveInfo: string | null
-}
-
-/** § 6.6.6.8 */
-export interface EntryMovedAndReplacedFromOtherReferenceInSameParentEvent extends Event {
-    messageKind: "EntryMovedAndReplacedFromOtherReferenceInSameParent"
-    parent: LionWebId
-    newReference: LionWebJsonMetaPointer
-    newIndex: number
-    movedTarget: LionWebId | null
-    movedResolveInfo: string | null
-    oldReference: LionWebJsonMetaPointer
-    oldIndex: number
-    replacedTarget: LionWebId | null
-    replacedResolveInfo: string | null
-}
-
-/** § 6.6.6.9 */
-export interface EntryMovedAndReplacedInSameReferenceEvent extends Event {
-    messageKind: "EntryMovedAndReplacedInSameReference"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    newIndex: number
-    movedTarget: LionWebId | null
-    movedResolveInfo: string | null
-    oldIndex: number
-    replacedTarget: LionWebId | null
-    replacedResolveInfo: string | null
-}
-
-/** § 6.6.6.10 */
-export interface ReferenceResolveInfoAddedEvent extends Event {
-    messageKind: "ReferenceResolveInfoAdded"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    index: number
-    newResolveInfo: string
-    target: LionWebId
-}
-
-/** § 6.6.6.11 */
-export interface ReferenceResolveInfoDeletedEvent extends Event {
-    messageKind: "ReferenceResolveInfoDeleted"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    index: number
-    deletedResolveInfo: string
-    target: LionWebId
-}
-
-/** § 6.6.6.12 */
-export interface ReferenceResolveInfoChangedEvent extends Event {
-    messageKind: "ReferenceResolveInfoChanged"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    index: number
-    newResolveInfo: string
-    target: LionWebId | null
-    oldResolveInfo: string
-}
-
-/** § 6.6.6.13 */
-export interface ReferenceTargetAddedEvent extends Event {
-    messageKind: "ReferenceTargetAdded"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    index: number
-    newTarget: LionWebId | null
-    resolveInfo: string
-}
-
-/** § 6.6.6.14 */
-export interface ReferenceTargetDeletedEvent extends Event {
-    messageKind: "ReferenceTargetDeleted"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    index: number
-    resolveInfo: string | null
-    deletedTarget: LionWebId
-}
-
-/** § 6.6.6.15 */
-export interface ReferenceTargetChangedEvent extends Event {
-    messageKind: "ReferenceTargetChanged"
-    parent: LionWebId
-    reference: LionWebJsonMetaPointer
-    index: number
-    newTarget: LionWebId
-    resolveInfo: string | null
-    replacedTarget: LionWebId
-}
-
 /** § 6.6.7.1 */
 export interface CompositeEvent extends Event {
     messageKind: "CompositeEvent"
@@ -474,18 +334,6 @@ const eventMessageKinds = mapFrom(
         "ReferenceAdded",
         "ReferenceDeleted",
         "ReferenceChanged",
-        "EntryMovedFromOtherReference",
-        "EntryMovedFromOtherReferenceInSameParent",
-        "EntryMovedInSameReference",
-        "EntryMovedAndReplacedFromOtherReference",
-        "EntryMovedAndReplacedFromOtherReferenceInSameParent",
-        "EntryMovedAndReplacedInSameReference",
-        "ReferenceResolveInfoAdded",
-        "ReferenceResolveInfoDeleted",
-        "ReferenceResolveInfoChanged",
-        "ReferenceTargetAdded",
-        "ReferenceTargetDeleted",
-        "ReferenceTargetChanged",
         "CompositeEvent",
         "NoOp",
         "ErrorEvent"

package/src/payload/query-types.ts

@@ -110,17 +110,6 @@ export interface GetAvailableIdsResponse extends QueryMessage {
 }
 
 
-export interface GetAvailableIdsRequest extends QueryMessage {
-    messageKind: "GetAvailableIdsRequest"
-    count: number
-}
-
-export interface GetAvailableIdsResponse extends QueryMessage {
-    messageKind: "GetAvailableIdsResponse"
-    ids: LionWebId[]
-}
-
-
 export interface ListPartitionsRequest extends QueryMessage {
     messageKind: "ListPartitionsRequest"
 }

package/src/translators/delta-to-command.ts

@@ -33,26 +33,21 @@ import {
     ChildMovedInSameContainmentDelta,
     ChildReplacedDelta,
     CompositeDelta,
-    EntryMovedAndReplacedFromOtherReferenceDelta,
-    EntryMovedAndReplacedFromOtherReferenceInSameParentDelta,
-    EntryMovedAndReplacedInSameReferenceDelta,
-    EntryMovedFromOtherReferenceDelta,
-    EntryMovedFromOtherReferenceInSameParentDelta,
-    EntryMovedInSameReferenceDelta,
     IDelta,
     idFrom,
+    nodeBaseReader,
     NoOpDelta,
     PartitionAddedDelta,
     PartitionDeletedDelta,
     PropertyAddedDelta,
     PropertyChangedDelta,
     PropertyDeletedDelta,
+    propertyValueSerializerWith,
     ReferenceAddedDelta,
     ReferenceChangedDelta,
     ReferenceDeletedDelta,
     serializeNodeBases
 } from "@lionweb/class-core"
-import { nodeBaseReader, propertyValueSerializerWith } from "@lionweb/class-core/dist/serializer.js"
 import { builtinPropertyValueSerializer, metaPointerFor, PropertyValueSerializer } from "@lionweb/core"
 import { LionWebId } from "@lionweb/json"
 import {
@@ -75,17 +70,11 @@ import {
     MoveAndReplaceChildFromOtherContainmentCommand,
     MoveAndReplaceChildFromOtherContainmentInSameParentCommand,
     MoveAndReplaceChildInSameContainmentCommand,
-    MoveAndReplaceEntryFromOtherReferenceCommand,
-    MoveAndReplaceEntryFromOtherReferenceInSameParentCommand,
-    MoveAndReplaceEntryInSameReferenceCommand,
     MoveAnnotationFromOtherParentCommand,
     MoveAnnotationInSameParentCommand,
     MoveChildFromOtherContainmentCommand,
     MoveChildFromOtherContainmentInSameParentCommand,
     MoveChildInSameContainmentCommand,
-    MoveEntryFromOtherReferenceCommand,
-    MoveEntryFromOtherReferenceInSameParentCommand,
-    MoveEntryInSameReferenceCommand,
     ReplaceAnnotationCommand,
     ReplaceChildCommand
 } from "../payload/index.js"
@@ -280,7 +269,7 @@ export const deltaToCommandTranslator = (
                 reference: metaPointerFor(delta.reference),
                 index: delta.index,
                 newTarget: idFrom(delta.newTarget),
-                newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!)!
+                newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!, delta.reference)!
             })
         }
         if (delta instanceof ReferenceDeletedDelta) {
@@ -289,7 +278,7 @@ export const deltaToCommandTranslator = (
                 reference: metaPointerFor(delta.reference),
                 index: delta.index,
                 deletedTarget: idFrom(delta.deletedTarget),
-                deletedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.deletedTarget!)!
+                deletedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.deletedTarget!, delta.reference)!
             })
         }
         if (delta instanceof ReferenceChangedDelta) {
@@ -298,80 +287,9 @@ export const deltaToCommandTranslator = (
                 reference: metaPointerFor(delta.reference),
                 index: delta.index,
                 oldTarget: idFrom(delta.oldTarget),
-                oldResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!)!,
+                oldResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!, delta.reference)!,
                 newTarget: idFrom(delta.newTarget),
-                newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!)!
-            })
-        }
-        if (delta instanceof EntryMovedFromOtherReferenceDelta) {
-            return completed<MoveEntryFromOtherReferenceCommand>("MoveEntryFromOtherReference", { // § 6.5.7.4
-                newParent: delta.newParent.id,
-                newReference: metaPointerFor(delta.newReference),
-                newIndex: delta.newIndex,
-                oldParent: delta.oldParent.id,
-                oldReference: metaPointerFor(delta.oldReference),
-                oldIndex: delta.oldIndex,
-                movedTarget: idFrom(delta.movedTarget),
-                movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-            })
-        }
-        if (delta instanceof EntryMovedFromOtherReferenceInSameParentDelta) {
-            return completed<MoveEntryFromOtherReferenceInSameParentCommand>("MoveEntryFromOtherReferenceInSameParent", { // § 6.5.7.5
-                parent: delta.parent.id,
-                newReference: metaPointerFor(delta.newReference),
-                newIndex: delta.newIndex,
-                oldIndex: delta.oldIndex,
-                movedTarget: idFrom(delta.movedTarget),
-                movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-            })
-        }
-        if (delta instanceof EntryMovedInSameReferenceDelta) {
-            return completed<MoveEntryInSameReferenceCommand>("MoveEntryInSameReference", { // § 6.5.7.6
-                parent: delta.parent.id,
-                reference: metaPointerFor(delta.reference),
-                oldIndex: delta.oldIndex,
-                newIndex: delta.newIndex,
-                movedTarget: idFrom(delta.movedTarget),
-                movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-            })
-        }
-        if (delta instanceof EntryMovedAndReplacedFromOtherReferenceDelta) {
-            return completed<MoveAndReplaceEntryFromOtherReferenceCommand>("MoveAndReplaceEntryFromOtherReference", { // § 6.5.7.7
-                newParent: delta.newParent.id,
-                newReference: metaPointerFor(delta.newReference),
-                newIndex: delta.newIndex,
-                replacedTarget: idFrom(delta.replacedTarget),
-                replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
-                oldParent: delta.oldParent.id,
-                oldReference: metaPointerFor(delta.oldReference),
-                oldIndex: delta.oldIndex,
-                movedTarget: idFrom(delta.movedTarget),
-                movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-            })
-        }
-        if (delta instanceof EntryMovedAndReplacedFromOtherReferenceInSameParentDelta) {
-            return completed<MoveAndReplaceEntryFromOtherReferenceInSameParentCommand>("MoveAndReplaceEntryFromOtherReferenceInSameParent", { // § 6.5.7.8
-                parent: delta.parent.id,
-                newReference: metaPointerFor(delta.newReference),
-                newIndex: delta.newIndex,
-                replacedTarget: idFrom(delta.replacedTarget),
-                replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
-                oldReference: metaPointerFor(delta.oldReference),
-                oldIndex: delta.oldIndex,
-                movedTarget: idFrom(delta.movedTarget),
-                movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-            })
-        }
-        if (delta instanceof EntryMovedAndReplacedInSameReferenceDelta) {
-            return completed<MoveAndReplaceEntryInSameReferenceCommand>("MoveAndReplaceEntryInSameReference", { // § 6.5.7.9
-                parent: delta.parent.id,
-                reference: metaPointerFor(delta.reference),
-                oldIndex: delta.oldIndex,
-                movedTarget: idFrom(delta.movedTarget),
-                movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!,
-                newIndex: delta.newIndex,
-                replacedTarget: idFrom(delta.replacedTarget),
-                replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!
+                newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!, delta.reference)!
             })
         }
         if (delta instanceof CompositeDelta) {

package/src/translators/delta-to-event.ts

@@ -34,21 +34,17 @@ import {
     ChildMovedInSameContainmentDelta,
     ChildReplacedDelta,
     CompositeDelta,
-    EntryMovedAndReplacedFromOtherReferenceDelta,
-    EntryMovedAndReplacedFromOtherReferenceInSameParentDelta,
-    EntryMovedAndReplacedInSameReferenceDelta,
-    EntryMovedFromOtherReferenceDelta,
-    EntryMovedFromOtherReferenceInSameParentDelta,
-    EntryMovedInSameReferenceDelta,
     IDelta,
     idFrom,
     INodeBase,
+    nodeBaseReader,
     NoOpDelta,
     PartitionAddedDelta,
     PartitionDeletedDelta,
     PropertyAddedDelta,
     PropertyChangedDelta,
     PropertyDeletedDelta,
+    propertyValueSerializerWith,
     ReferenceAddedDelta,
     ReferenceChangedDelta,
     ReferenceDeletedDelta,
@@ -74,12 +70,6 @@ import {
     ChildReplacedEvent,
     CommandSource,
     CompositeEvent,
-    EntryMovedAndReplacedFromOtherReferenceEvent,
-    EntryMovedAndReplacedFromOtherReferenceInSameParentEvent,
-    EntryMovedAndReplacedInSameReferenceEvent,
-    EntryMovedFromOtherReferenceEvent,
-    EntryMovedFromOtherReferenceInSameParentEvent,
-    EntryMovedInSameReferenceEvent,
     Event,
     NoOpEvent,
     PartitionAddedEvent,
@@ -92,7 +82,6 @@ import {
     ReferenceChangedEvent,
     ReferenceDeletedEvent
 } from "../payload/index.js"
-import { nodeBaseReader, propertyValueSerializerWith } from "@lionweb/class-core/dist/serializer.js"
 
 
 const allIdsOfDescendantsFrom = (node: INodeBase) =>
@@ -365,7 +354,7 @@ export const deltaToEventTranslator = (
                     reference: metaPointerFor(delta.reference),
                     index: delta.index,
                     newTarget: idFrom(delta.newTarget),
-                    newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!)!
+                    newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!, delta.reference)!
                 })
             }
             if (delta instanceof ReferenceDeletedDelta) {
@@ -374,7 +363,7 @@ export const deltaToEventTranslator = (
                     reference: metaPointerFor(delta.reference),
                     index: delta.index,
                     deletedTarget: idFrom(delta.deletedTarget),
-                    deletedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.deletedTarget!)!
+                    deletedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.deletedTarget!, delta.reference)!
                 })
             }
             if (delta instanceof ReferenceChangedDelta) {
@@ -383,81 +372,9 @@ export const deltaToEventTranslator = (
                     reference: metaPointerFor(delta.reference),
                     index: delta.index,
                     oldTarget: idFrom(delta.oldTarget),
-                    oldResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!)!,
+                    oldResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!, delta.reference)!,
                     newTarget: idFrom(delta.newTarget),
-                    newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!)!
-                })
-            }
-            if (delta instanceof EntryMovedFromOtherReferenceDelta) {
-                return completed<EntryMovedFromOtherReferenceEvent>("EntryMovedFromOtherReference", { // § 6.6.6.4
-                    newParent: delta.newParent.id,
-                    newReference: metaPointerFor(delta.newReference),
-                    newIndex: delta.newIndex,
-                    oldParent: delta.oldParent.id,
-                    oldReference: metaPointerFor(delta.oldReference),
-                    oldIndex: delta.oldIndex,
-                    movedTarget: idFrom(delta.movedTarget),
-                    movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-                })
-            }
-            if (delta instanceof EntryMovedFromOtherReferenceInSameParentDelta) {
-                return completed<EntryMovedFromOtherReferenceInSameParentEvent>("EntryMovedFromOtherReferenceInSameParent", { // § 6.6.6.5
-                    parent: delta.parent.id,
-                    newReference: metaPointerFor(delta.newReference),
-                    newIndex: delta.newIndex,
-                    oldReference: metaPointerFor(delta.oldReference),
-                    oldIndex: delta.oldIndex,
-                    movedTarget: idFrom(delta.movedTarget),
-                    movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-                })
-            }
-            if (delta instanceof EntryMovedInSameReferenceDelta) {
-                return completed<EntryMovedInSameReferenceEvent>("EntryMovedInSameReference", { // § 6.6.6.6
-                    parent: delta.parent.id,
-                    reference: metaPointerFor(delta.reference),
-                    oldIndex: delta.oldIndex,
-                    newIndex: delta.newIndex,
-                    movedTarget: idFrom(delta.movedTarget),
-                    movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-                })
-            }
-            if (delta instanceof EntryMovedAndReplacedFromOtherReferenceDelta) {
-                return completed<EntryMovedAndReplacedFromOtherReferenceEvent>("EntryMovedAndReplacedFromOtherReference", { // § 6.6.6.7
-                    newParent: delta.newParent.id,
-                    newReference: metaPointerFor(delta.newReference),
-                    newIndex: delta.newIndex,
-                    replacedTarget: idFrom(delta.replacedTarget),
-                    replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
-                    oldParent: delta.oldParent.id,
-                    oldReference: metaPointerFor(delta.oldReference),
-                    oldIndex: delta.oldIndex,
-                    movedTarget: idFrom(delta.movedTarget),
-                    movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-                })
-            }
-            if (delta instanceof EntryMovedAndReplacedFromOtherReferenceInSameParentDelta) {
-                return completed<EntryMovedAndReplacedFromOtherReferenceInSameParentEvent>("EntryMovedAndReplacedFromOtherReferenceInSameParent", { // § 6.6.6.8
-                    parent: delta.parent.id,
-                    newReference: metaPointerFor(delta.newReference),
-                    newIndex: delta.newIndex,
-                    replacedTarget: idFrom(delta.replacedTarget),
-                    replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
-                    oldReference: metaPointerFor(delta.oldReference),
-                    oldIndex: delta.oldIndex,
-                    movedTarget: idFrom(delta.movedTarget),
-                    movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!
-                })
-            }
-            if (delta instanceof EntryMovedAndReplacedInSameReferenceDelta) {
-                return completed<EntryMovedAndReplacedInSameReferenceEvent>("EntryMovedAndReplacedInSameReference", { // § 6.6.6.9
-                    parent: delta.parent.id,
-                    reference: metaPointerFor(delta.reference),
-                    oldIndex: delta.oldIndex,
-                    movedTarget: idFrom(delta.movedTarget),
-                    movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!,
-                    newIndex: delta.newIndex,
-                    replacedTarget: idFrom(delta.replacedTarget),
-                    replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!
+                    newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!, delta.reference)!
                 })
             }
             if (delta instanceof CompositeDelta) {

package/src/translators/event-to-delta.ts

@@ -34,14 +34,9 @@ import {
     ChildReplacedDelta,
     CompositeDelta,
     Deserializer,
-    EntryMovedAndReplacedFromOtherReferenceDelta,
-    EntryMovedAndReplacedFromOtherReferenceInSameParentDelta,
-    EntryMovedAndReplacedInSameReferenceDelta,
-    EntryMovedFromOtherReferenceDelta,
-    EntryMovedFromOtherReferenceInSameParentDelta,
-    EntryMovedInSameReferenceDelta,
     IDelta,
     IdMapping,
+    IdOrNull,
     ILanguageBase,
     INodeBase,
     NoOpDelta,
@@ -59,9 +54,9 @@ import {
     builtinPropertyValueDeserializer,
     featureResolversFor,
     PropertyValueDeserializer,
-    unresolved
+    referenceToSet
 } from "@lionweb/core"
-import { LionWebId, LionWebJsonChunk } from "@lionweb/json"
+import { LionWebJsonChunk } from "@lionweb/json"
 import {
     AnnotationAddedEvent,
     AnnotationDeletedEvent,
@@ -80,12 +75,6 @@ import {
     ChildMovedInSameContainmentEvent,
     ChildReplacedEvent,
     CompositeEvent,
-    EntryMovedAndReplacedFromOtherReferenceEvent,
-    EntryMovedAndReplacedFromOtherReferenceInSameParentEvent,
-    EntryMovedAndReplacedInSameReferenceEvent,
-    EntryMovedFromOtherReferenceEvent,
-    EntryMovedFromOtherReferenceInSameParentEvent,
-    EntryMovedInSameReferenceEvent,
     Event,
     PartitionAddedEvent,
     PartitionDeletedEvent,
@@ -124,8 +113,8 @@ export const eventToDeltaTranslator = (
             return roots[0]
         }
         const { resolvedPropertyFrom, resolvedContainmentFrom, resolvedReferenceFrom } = featureResolversFor(languageBases.map(({language}) => language));
-        const resolvedRefTo = (ref: LionWebId | typeof unresolved) =>
-            ref === unresolved ? unresolved : idMapping.fromId(ref)
+        const resolvedRefTo = (ref: IdOrNull) =>
+            ref === null ? referenceToSet() : idMapping.fromId(ref)
 
         switch (event.messageKind) {
             /*
@@ -304,75 +293,6 @@ export const eventToDeltaTranslator = (
                 const resolvedNewTarget = resolvedRefTo(newTarget)
                 return new ReferenceChangedDelta(resolvedParent, resolvedReference, index, resolvedNewTarget, resolvedOldTarget)
             }
-            case "EntryMovedFromOtherReference": { // § 6.6.6.4
-                const { newParent, newReference, newIndex, oldParent, oldReference, oldIndex, movedTarget } = event as EntryMovedFromOtherReferenceEvent
-                const resolvedNewParent = idMapping.fromId(newParent)
-                const resolvedNewReference = resolvedReferenceFrom(newReference, resolvedNewParent.classifier)
-                const resolvedOldParent = idMapping.fromId(oldParent)
-                const resolvedOldReference = resolvedReferenceFrom(oldReference, resolvedOldParent.classifier)
-                const resolvedMovedTarget = resolvedRefTo(movedTarget)
-                return new EntryMovedFromOtherReferenceDelta(resolvedOldParent, resolvedOldReference, oldIndex, resolvedNewParent, resolvedNewReference, newIndex, resolvedMovedTarget)
-            }
-            case "EntryMovedFromOtherReferenceInSameParent": { // § 6.6.6.5
-                const { parent, oldReference, oldIndex, newReference, newIndex, movedTarget } = event as EntryMovedFromOtherReferenceInSameParentEvent
-                const resolvedParent = idMapping.fromId(parent)
-                const resolvedOldReference = resolvedReferenceFrom(oldReference, resolvedParent.classifier)
-                const resolvedNewReference = resolvedReferenceFrom(newReference, resolvedParent.classifier)
-                const resolvedMovedTarget = resolvedRefTo(movedTarget)
-                return new EntryMovedFromOtherReferenceInSameParentDelta(resolvedParent, resolvedOldReference, oldIndex, resolvedNewReference, newIndex, resolvedMovedTarget)
-            }
-            case "EntryMovedInSameReference": { // § 6.6.6.6
-                const { parent, reference, oldIndex, newIndex, movedTarget } = event as EntryMovedInSameReferenceEvent
-                const resolvedParent = idMapping.fromId(parent)
-                const resolvedReference = resolvedReferenceFrom(reference, resolvedParent.classifier)
-                const resolvedMovedTarget = resolvedRefTo(movedTarget)
-                return new EntryMovedInSameReferenceDelta(resolvedParent, resolvedReference, oldIndex, newIndex, resolvedMovedTarget)
-            }
-            case "EntryMovedAndReplacedFromOtherReference": { // § 6.6.6.7
-                const { newParent, newReference, newIndex, movedTarget, oldParent, oldReference, oldIndex, replacedTarget } = event as EntryMovedAndReplacedFromOtherReferenceEvent
-                const resolvedNewParent = idMapping.fromId(newParent)
-                const resolvedNewReference = resolvedReferenceFrom(newReference, resolvedNewParent.classifier)
-                const resolvedMovedTarget = resolvedRefTo(movedTarget)
-                const resolvedOldParent = idMapping.fromId(oldParent)
-                const resolvedOldReference = resolvedReferenceFrom(oldReference, resolvedOldParent.classifier)
-                const resolvedReplacedTarget = resolvedRefTo(replacedTarget)
-                return new EntryMovedAndReplacedFromOtherReferenceDelta(resolvedNewParent, resolvedNewReference, newIndex, resolvedMovedTarget, resolvedOldParent, resolvedOldReference, oldIndex, resolvedReplacedTarget)
-            }
-            case "EntryMovedAndReplacedFromOtherReferenceInSameParent": { // § 6.6.6.8
-                const { parent, oldReference, oldIndex, newReference, newIndex, movedTarget, replacedTarget } = event as EntryMovedAndReplacedFromOtherReferenceInSameParentEvent
-                const resolvedParent = idMapping.fromId(parent)
-                const resolvedOldReference = resolvedReferenceFrom(oldReference, resolvedParent.classifier)
-                const resolvedNewReference = resolvedReferenceFrom(newReference, resolvedParent.classifier)
-                const resolvedMovedTarget = resolvedRefTo(movedTarget)
-                const resolvedReplacedTarget= resolvedRefTo(replacedTarget)
-                return new EntryMovedAndReplacedFromOtherReferenceInSameParentDelta(resolvedParent, resolvedOldReference, oldIndex, resolvedNewReference, newIndex, resolvedMovedTarget, resolvedReplacedTarget)
-            }
-            case "EntryMovedAndReplacedInSameReference": { // § 6.6.6.9
-                const { parent, reference, oldIndex, newIndex, movedTarget, replacedTarget } = event as EntryMovedAndReplacedInSameReferenceEvent
-                const resolvedParent = idMapping.fromId(parent)
-                const resolvedReference = resolvedReferenceFrom(reference, resolvedParent.classifier)
-                const resolvedMovedTarget = resolvedRefTo(movedTarget)
-                const resolvedReplacedTarget = resolvedRefTo(replacedTarget)
-                return new EntryMovedAndReplacedInSameReferenceDelta(resolvedParent, resolvedReference, oldIndex, newIndex, resolvedMovedTarget, resolvedReplacedTarget)
-            }
-            case "ReferenceResolveInfoAdded": { // § 6.6.6.10
-                return undefined
-            }
-            case "ReferenceResolveInfoDeleted": { // § 6.6.6.11
-                return undefined
-            }
-            case "ReferenceResolveInfoChanged": { // § 6.6.6.12
-                return undefined
-            }
-            case "ReferenceTargetAdded": { // § 6.6.6.13
-                return undefined
-            }
-            case "ReferenceTargetDeleted": { // § 6.6.6.14
-                return undefined
-            }
-            case "ReferenceTargetChanged": { // § 6.6.6.15
-                return undefined
-            }
             case "CompositeEvent": { // § 6.6.7.1
                 const { parts } = event as CompositeEvent
                 return new CompositeDelta(