@lionweb/delta-protocol-common 0.7.1 → 0.7.2-beta.1

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

@@ -51,7 +51,7 @@ import {
     ReferenceDeletedDelta,
     serializeNodeBases
 } from "@lionweb/class-core"
-import { nodeBaseReader } from "@lionweb/class-core/dist/serializer.js"
+import { nodeBaseReader, propertyValueSerializerWith } from "@lionweb/class-core/dist/serializer.js"
 import { builtinPropertyValueSerializer, metaPointerFor, PropertyValueSerializer, serializedRef } from "@lionweb/core"
 import { LionWebId } from "@lionweb/json"
 import {
@@ -98,289 +98,295 @@ import {
 export type DeltaToCommandTranslator = (delta: IDelta, commandId: LionWebId) => Command | undefined
 
 /**
- * @return a {@link IDelta delta} as a {@link Command command} with the given `commandId`.
+ * @return a {@link DeltaToCommandTranslator} function instance
+ * that translates a given {@link IDelta `delta`} into a {@link Command command} with the given `commandId`.
+ * Serialization of primitively-typed values is governed by the given {@link PropertyValueSerializer `primitiveValueSerializer`},
+ * which defaults to the {@link builtinPropertyValueSerializer}.
  */
-export const deltaToCommandTranslator = (propertyValueSerializer: PropertyValueSerializer = builtinPropertyValueSerializer) => {
+export const deltaToCommandTranslator = (
+    primitiveValueSerializer: PropertyValueSerializer = builtinPropertyValueSerializer
+) => {
+    const propertyValueSerializer = propertyValueSerializerWith({ primitiveValueSerializer })
 
-        const translated: DeltaToCommandTranslator = (delta, commandId) => {
-            const completed = <CT extends Command>(
-                commandName: CT["messageKind"],
-                partialCommand: Omit<CT, "messageKind" | "commandId" | "protocolMessages">
-            ) => ({
-                messageKind: commandName,
-                commandId,
-                ...partialCommand,
-                protocolMessages: []
-            })
-
-            // in order of the specification (§ 6.5):
+    const translated: DeltaToCommandTranslator = (delta, commandId) => {
+        const completed = <CT extends Command>(
+            commandName: CT["messageKind"],
+            partialCommand: Omit<CT, "messageKind" | "commandId" | "protocolMessages">
+        ) => ({
+            messageKind: commandName,
+            commandId,
+            ...partialCommand,
+            protocolMessages: []
+        })
 
-            if (delta instanceof PartitionAddedDelta) {
-                return completed<AddPartitionCommand>("AddPartition", { // § 6.5.2.1
-                    newPartition: serializeNodeBases([delta.newPartition])
-                })
-            }
-            if (delta instanceof PartitionDeletedDelta) {
-                return completed<DeletePartitionCommand>("DeletePartition", { // § 6.5.2.2
-                    deletedPartition: delta.deletedPartition.id
-                })
-            }
-            if (delta instanceof PropertyAddedDelta) {
-                return completed<AddPropertyCommand>("AddProperty", { // § 6.5.4.1
-                    node: delta.node.id,
-                    property: metaPointerFor(delta.property),
-                    newValue: propertyValueSerializer.serializeValue(delta.value, delta.property)!
-                })
-            }
-            if (delta instanceof PropertyDeletedDelta) {
-                return completed<DeletePropertyCommand>("DeleteProperty", { // § 6.5.4.2
-                    node: delta.node.id,
-                    property: metaPointerFor(delta.property)
-                })
-            }
-            if (delta instanceof PropertyChangedDelta) {
-                return completed<ChangePropertyCommand>("ChangeProperty", { // § 6.5.4.3
-                    node: delta.node.id,
-                    property: metaPointerFor(delta.property),
-                    newValue: propertyValueSerializer.serializeValue(delta.newValue, delta.property)!
-                })
-            }
-            if (delta instanceof ChildAddedDelta) {
-                return completed<AddChildCommand>("AddChild", { // § 6.5.5.1
-                    parent: delta.parent.id,
-                    newChild: serializeNodeBases([delta.newChild]),
-                    containment: metaPointerFor(delta.containment),
-                    index: delta.index
-                })
-            }
-            if (delta instanceof ChildDeletedDelta) {
-                return completed<DeleteChildCommand>("DeleteChild", { // § 6.5.5.2
-                    parent: delta.parent.id,
-                    containment: metaPointerFor(delta.containment),
-                    index: delta.index,
-                    deletedChild: delta.deletedChild.id
-                })
-            }
-            if (delta instanceof ChildReplacedDelta) {
-                return completed<ReplaceChildCommand>("ReplaceChild", { // § 6.5.5.3
-                    newChild: serializeNodeBases([delta.newChild]),
-                    parent: delta.parent.id,
-                    containment: metaPointerFor(delta.containment),
-                    index: delta.index,
-                    replacedChild: delta.replacedChild.id
-                })
-            }
-            if (delta instanceof ChildMovedFromOtherContainmentDelta) {
-                return completed<MoveChildFromOtherContainmentCommand>("MoveChildFromOtherContainment", { // § 6.5.5.4
-                    newParent: delta.newParent.id,
-                    newContainment: metaPointerFor(delta.newContainment),
-                    newIndex: delta.newIndex,
-                    movedChild: delta.movedChild.id
-                })
-            }
-            if (delta instanceof ChildMovedFromOtherContainmentInSameParentDelta) {
-                return completed<MoveChildFromOtherContainmentInSameParentCommand>("MoveChildFromOtherContainmentInSameParent", { // § 6.5.5.5
-                    newContainment: metaPointerFor(delta.newContainment),
-                    newIndex: delta.newIndex,
-                    movedChild: delta.movedChild.id,
-                    parent: delta.parent.id,
-                    oldContainment: metaPointerFor(delta.oldContainment),
-                    oldIndex: delta.oldIndex
-                })
-            }
-            if (delta instanceof ChildMovedInSameContainmentDelta) {
-                return completed<MoveChildInSameContainmentCommand>("MoveChildInSameContainment", { // § 6.5.5.6
-                    newIndex: delta.newIndex,
-                    movedChild: delta.movedChild.id
-                })
-            }
-            if (delta instanceof ChildMovedAndReplacedFromOtherContainmentDelta) {
-                return completed<MoveAndReplaceChildFromOtherContainmentCommand>("MoveAndReplaceChildFromOtherContainment", { // § 6.5.5.7
-                    newParent: delta.newParent.id,
-                    newContainment: metaPointerFor(delta.newContainment),
-                    newIndex: delta.newIndex,
-                    replacedChild: delta.replacedChild.id,
-                    movedChild: delta.movedChild.id
-                })
-            }
-            if (delta instanceof ChildMovedAndReplacedFromOtherContainmentInSameParentDelta) {
-                return completed<MoveAndReplaceChildFromOtherContainmentInSameParentCommand>("MoveAndReplaceChildFromOtherContainmentInSameParent", { // § 6.5.5.8
-                    newContainment: metaPointerFor(delta.newContainment),
-                    newIndex: delta.newIndex,
-                    replacedChild: delta.replacedChild.id,
-                    movedChild: delta.movedChild.id
-                })
-            }
-            if (delta instanceof ChildMovedAndReplacedInSameContainmentDelta) {
-                return completed<MoveAndReplaceChildInSameContainmentCommand>("MoveAndReplaceChildInSameContainment", { // § 6.5.5.9
-                    newIndex: delta.newIndex,
-                    replacedChild: delta.replacedChild.id
-                })
-            }
-            if (delta instanceof AnnotationAddedDelta) {
-                return completed<AddAnnotationCommand>("AddAnnotation", { // § 6.5.6.1
-                    parent: delta.parent.id,
-                    index: delta.index,
-                    newAnnotation: serializeNodeBases([delta.newAnnotation])
-                })
-            }
-            if (delta instanceof AnnotationDeletedDelta) {
-                return completed<DeleteAnnotationCommand>("DeleteAnnotation", { // § 6.5.6.2
-                    parent: delta.parent.id,
-                    deletedAnnotation: delta.deletedAnnotation.id,
-                    index: delta.index
-                })
-            }
-            if (delta instanceof AnnotationReplacedDelta) {
-                return completed<ReplaceAnnotationCommand>("ReplaceAnnotation", { // § 6.5.6.3
-                    newAnnotation: serializeNodeBases([delta.newAnnotation]),
-                    parent: delta.parent.id,
-                    index: delta.index,
-                    replacedAnnotation: delta.replacedAnnotation.id
-                })
-            }
-            if (delta instanceof AnnotationMovedFromOtherParentDelta) {
-                return completed<MoveAnnotationFromOtherParentCommand>("MoveAnnotationFromOtherParent", { // § 6.5.6.4
-                    newParent: delta.newParent.id,
-                    newIndex: delta.newIndex,
-                    movedAnnotation: delta.movedAnnotation.id
-                })
-            }
-            if (delta instanceof AnnotationMovedInSameParentDelta) {
-                return completed<MoveAnnotationInSameParentCommand>("MoveAnnotationInSameParent", { // § 6.5.6.5
-                    newIndex: delta.newIndex,
-                    movedAnnotation: delta.movedAnnotation.id
-                })
-            }
-            if (delta instanceof AnnotationMovedAndReplacedFromOtherParentDelta) {
-                return completed<MoveAndReplaceAnnotationFromOtherParentCommand>("MoveAndReplaceAnnotationFromOtherParent", { // § 6.5.6.6
-                    newParent: delta.newParent.id,
-                    newIndex: delta.newIndex,
-                    replacedAnnotation: delta.replacedAnnotation.id,
-                    movedAnnotation: delta.movedAnnotation.id
-                })
-            }
-            if (delta instanceof AnnotationMovedAndReplacedInSameParentDelta) {
-                return completed<MoveAndReplaceAnnotationInSameParentCommand>("MoveAndReplaceAnnotationInSameParent", { // § 6.5.6.7
-                    newIndex: delta.newIndex,
-                    replacedAnnotation: delta.replacedAnnotation.id,
-                    movedAnnotation: delta.movedAnnotation.id
-                })
-            }
-            if (delta instanceof ReferenceAddedDelta) {
-                return completed<AddReferenceCommand>("AddReference", { // § 6.5.7.1
-                    parent: delta.parent.id,
-                    reference: metaPointerFor(delta.reference),
-                    index: delta.index,
-                    newTarget: serializedRef(delta.newTarget),
-                    newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!)!
-                })
-            }
-            if (delta instanceof ReferenceDeletedDelta) {
-                return completed<DeleteReferenceCommand>("DeleteReference", { // § 6.5.7.2
-                    parent: delta.parent.id,
-                    reference: metaPointerFor(delta.reference),
-                    index: delta.index,
-                    deletedTarget: serializedRef(delta.deletedTarget),
-                    deletedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.deletedTarget!)!
-                })
-            }
-            if (delta instanceof ReferenceChangedDelta) {
-                return completed<ChangeReferenceCommand>("ChangeReference", { // § 6.5.7.3
-                    parent: delta.parent.id,
-                    reference: metaPointerFor(delta.reference),
-                    index: delta.index,
-                    oldTarget: serializedRef(delta.oldTarget),
-                    oldResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!)!,
-                    newTarget: serializedRef(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: serializedRef(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: serializedRef(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: serializedRef(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: serializedRef(delta.replacedTarget),
-                    replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
-                    oldParent: delta.oldParent.id,
-                    oldReference: metaPointerFor(delta.oldReference),
-                    oldIndex: delta.oldIndex,
-                    movedTarget: serializedRef(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: serializedRef(delta.replacedTarget),
-                    replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
-                    oldReference: metaPointerFor(delta.oldReference),
-                    oldIndex: delta.oldIndex,
-                    movedTarget: serializedRef(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: serializedRef(delta.movedTarget),
-                    movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!,
-                    newIndex: delta.newIndex,
-                    replacedTarget: serializedRef(delta.replacedTarget),
-                    replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!
-                })
-            }
-            if (delta instanceof CompositeDelta) {
-                return completed<CompositeCommand>("CompositeCommand", { // § 6.5.8.1
-                    parts: delta.parts
-                        .map((part, index) => translated(part, `${commandId}-${index}`))  // TODO  inject proper ID generator!
-                        .filter((command) => command !== undefined) as Command[]
-                })
-            }
-            if (delta instanceof NoOpDelta) {
-                return undefined
-            }
+        // in order of the specification (§ 6.5):
 
-            throw new Error(`can't handle delta of type ${delta.constructor.name}`)
+        if (delta instanceof PartitionAddedDelta) {
+            return completed<AddPartitionCommand>("AddPartition", { // § 6.5.2.1
+                newPartition: serializeNodeBases([delta.newPartition])
+            })
+        }
+        if (delta instanceof PartitionDeletedDelta) {
+            return completed<DeletePartitionCommand>("DeletePartition", { // § 6.5.2.2
+                deletedPartition: delta.deletedPartition.id
+            })
+        }
+        if (delta instanceof PropertyAddedDelta) {
+            return completed<AddPropertyCommand>("AddProperty", { // § 6.5.4.1
+                node: delta.node.id,
+                property: metaPointerFor(delta.property),
+                newValue: propertyValueSerializer.serializeValue(delta.value, delta.property)!
+            })
+        }
+        if (delta instanceof PropertyDeletedDelta) {
+            return completed<DeletePropertyCommand>("DeleteProperty", { // § 6.5.4.2
+                node: delta.node.id,
+                property: metaPointerFor(delta.property)
+            })
+        }
+        if (delta instanceof PropertyChangedDelta) {
+            return completed<ChangePropertyCommand>("ChangeProperty", { // § 6.5.4.3
+                node: delta.node.id,
+                property: metaPointerFor(delta.property),
+                newValue: propertyValueSerializer.serializeValue(delta.newValue, delta.property)!
+            })
+        }
+        if (delta instanceof ChildAddedDelta) {
+            return completed<AddChildCommand>("AddChild", { // § 6.5.5.1
+                parent: delta.parent.id,
+                newChild: serializeNodeBases([delta.newChild]),
+                containment: metaPointerFor(delta.containment),
+                index: delta.index
+            })
+        }
+        if (delta instanceof ChildDeletedDelta) {
+            return completed<DeleteChildCommand>("DeleteChild", { // § 6.5.5.2
+                parent: delta.parent.id,
+                containment: metaPointerFor(delta.containment),
+                index: delta.index,
+                deletedChild: delta.deletedChild.id
+            })
+        }
+        if (delta instanceof ChildReplacedDelta) {
+            return completed<ReplaceChildCommand>("ReplaceChild", { // § 6.5.5.3
+                newChild: serializeNodeBases([delta.newChild]),
+                parent: delta.parent.id,
+                containment: metaPointerFor(delta.containment),
+                index: delta.index,
+                replacedChild: delta.replacedChild.id
+            })
+        }
+        if (delta instanceof ChildMovedFromOtherContainmentDelta) {
+            return completed<MoveChildFromOtherContainmentCommand>("MoveChildFromOtherContainment", { // § 6.5.5.4
+                newParent: delta.newParent.id,
+                newContainment: metaPointerFor(delta.newContainment),
+                newIndex: delta.newIndex,
+                movedChild: delta.movedChild.id
+            })
+        }
+        if (delta instanceof ChildMovedFromOtherContainmentInSameParentDelta) {
+            return completed<MoveChildFromOtherContainmentInSameParentCommand>("MoveChildFromOtherContainmentInSameParent", { // § 6.5.5.5
+                newContainment: metaPointerFor(delta.newContainment),
+                newIndex: delta.newIndex,
+                movedChild: delta.movedChild.id,
+                parent: delta.parent.id,
+                oldContainment: metaPointerFor(delta.oldContainment),
+                oldIndex: delta.oldIndex
+            })
+        }
+        if (delta instanceof ChildMovedInSameContainmentDelta) {
+            return completed<MoveChildInSameContainmentCommand>("MoveChildInSameContainment", { // § 6.5.5.6
+                newIndex: delta.newIndex,
+                movedChild: delta.movedChild.id
+            })
+        }
+        if (delta instanceof ChildMovedAndReplacedFromOtherContainmentDelta) {
+            return completed<MoveAndReplaceChildFromOtherContainmentCommand>("MoveAndReplaceChildFromOtherContainment", { // § 6.5.5.7
+                newParent: delta.newParent.id,
+                newContainment: metaPointerFor(delta.newContainment),
+                newIndex: delta.newIndex,
+                replacedChild: delta.replacedChild.id,
+                movedChild: delta.movedChild.id
+            })
+        }
+        if (delta instanceof ChildMovedAndReplacedFromOtherContainmentInSameParentDelta) {
+            return completed<MoveAndReplaceChildFromOtherContainmentInSameParentCommand>("MoveAndReplaceChildFromOtherContainmentInSameParent", { // § 6.5.5.8
+                newContainment: metaPointerFor(delta.newContainment),
+                newIndex: delta.newIndex,
+                replacedChild: delta.replacedChild.id,
+                movedChild: delta.movedChild.id
+            })
+        }
+        if (delta instanceof ChildMovedAndReplacedInSameContainmentDelta) {
+            return completed<MoveAndReplaceChildInSameContainmentCommand>("MoveAndReplaceChildInSameContainment", { // § 6.5.5.9
+                newIndex: delta.newIndex,
+                replacedChild: delta.replacedChild.id
+            })
+        }
+        if (delta instanceof AnnotationAddedDelta) {
+            return completed<AddAnnotationCommand>("AddAnnotation", { // § 6.5.6.1
+                parent: delta.parent.id,
+                index: delta.index,
+                newAnnotation: serializeNodeBases([delta.newAnnotation])
+            })
+        }
+        if (delta instanceof AnnotationDeletedDelta) {
+            return completed<DeleteAnnotationCommand>("DeleteAnnotation", { // § 6.5.6.2
+                parent: delta.parent.id,
+                deletedAnnotation: delta.deletedAnnotation.id,
+                index: delta.index
+            })
+        }
+        if (delta instanceof AnnotationReplacedDelta) {
+            return completed<ReplaceAnnotationCommand>("ReplaceAnnotation", { // § 6.5.6.3
+                newAnnotation: serializeNodeBases([delta.newAnnotation]),
+                parent: delta.parent.id,
+                index: delta.index,
+                replacedAnnotation: delta.replacedAnnotation.id
+            })
+        }
+        if (delta instanceof AnnotationMovedFromOtherParentDelta) {
+            return completed<MoveAnnotationFromOtherParentCommand>("MoveAnnotationFromOtherParent", { // § 6.5.6.4
+                newParent: delta.newParent.id,
+                newIndex: delta.newIndex,
+                movedAnnotation: delta.movedAnnotation.id
+            })
+        }
+        if (delta instanceof AnnotationMovedInSameParentDelta) {
+            return completed<MoveAnnotationInSameParentCommand>("MoveAnnotationInSameParent", { // § 6.5.6.5
+                newIndex: delta.newIndex,
+                movedAnnotation: delta.movedAnnotation.id
+            })
+        }
+        if (delta instanceof AnnotationMovedAndReplacedFromOtherParentDelta) {
+            return completed<MoveAndReplaceAnnotationFromOtherParentCommand>("MoveAndReplaceAnnotationFromOtherParent", { // § 6.5.6.6
+                newParent: delta.newParent.id,
+                newIndex: delta.newIndex,
+                replacedAnnotation: delta.replacedAnnotation.id,
+                movedAnnotation: delta.movedAnnotation.id
+            })
+        }
+        if (delta instanceof AnnotationMovedAndReplacedInSameParentDelta) {
+            return completed<MoveAndReplaceAnnotationInSameParentCommand>("MoveAndReplaceAnnotationInSameParent", { // § 6.5.6.7
+                newIndex: delta.newIndex,
+                replacedAnnotation: delta.replacedAnnotation.id,
+                movedAnnotation: delta.movedAnnotation.id
+            })
+        }
+        if (delta instanceof ReferenceAddedDelta) {
+            return completed<AddReferenceCommand>("AddReference", { // § 6.5.7.1
+                parent: delta.parent.id,
+                reference: metaPointerFor(delta.reference),
+                index: delta.index,
+                newTarget: serializedRef(delta.newTarget),
+                newResolveInfo: nodeBaseReader.resolveInfoFor!(delta.newTarget!)!
+            })
+        }
+        if (delta instanceof ReferenceDeletedDelta) {
+            return completed<DeleteReferenceCommand>("DeleteReference", { // § 6.5.7.2
+                parent: delta.parent.id,
+                reference: metaPointerFor(delta.reference),
+                index: delta.index,
+                deletedTarget: serializedRef(delta.deletedTarget),
+                deletedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.deletedTarget!)!
+            })
+        }
+        if (delta instanceof ReferenceChangedDelta) {
+            return completed<ChangeReferenceCommand>("ChangeReference", { // § 6.5.7.3
+                parent: delta.parent.id,
+                reference: metaPointerFor(delta.reference),
+                index: delta.index,
+                oldTarget: serializedRef(delta.oldTarget),
+                oldResolveInfo: nodeBaseReader.resolveInfoFor!(delta.oldTarget!)!,
+                newTarget: serializedRef(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: serializedRef(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: serializedRef(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: serializedRef(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: serializedRef(delta.replacedTarget),
+                replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
+                oldParent: delta.oldParent.id,
+                oldReference: metaPointerFor(delta.oldReference),
+                oldIndex: delta.oldIndex,
+                movedTarget: serializedRef(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: serializedRef(delta.replacedTarget),
+                replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!,
+                oldReference: metaPointerFor(delta.oldReference),
+                oldIndex: delta.oldIndex,
+                movedTarget: serializedRef(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: serializedRef(delta.movedTarget),
+                movedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.movedTarget!)!,
+                newIndex: delta.newIndex,
+                replacedTarget: serializedRef(delta.replacedTarget),
+                replacedResolveInfo: nodeBaseReader.resolveInfoFor!(delta.replacedTarget!)!
+            })
+        }
+        if (delta instanceof CompositeDelta) {
+            return completed<CompositeCommand>("CompositeCommand", { // § 6.5.8.1
+                parts: delta.parts
+                    .map((part, index) => translated(part, `${commandId}-${index}`))  // TODO  inject proper ID generator!
+                    .filter((command) => command !== undefined) as Command[]
+            })
+        }
+        if (delta instanceof NoOpDelta) {
+            return undefined
         }
 
-        return translated
+        throw new Error(`can't handle delta of type ${delta.constructor.name}`)
     }
 
+    return translated
+}
+

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

@@ -95,7 +95,7 @@ import {
     ReferenceChangedEvent,
     ReferenceDeletedEvent
 } from "../payload/index.js"
-import { nodeBaseReader } from "@lionweb/class-core/dist/serializer.js"
+import { nodeBaseReader, propertyValueSerializerWith } from "@lionweb/class-core/dist/serializer.js"
 
 
 const allIdsOfDescendantsFrom = (node: INodeBase) =>
@@ -118,13 +118,14 @@ export type DeltaToEventTranslator = (
 
 
 /**
- * @return a {@link DeltaToEventTranslator} instance using the given {@link PropertyValueSerializer}
- * (with that defaulting to the {@link builtinPropertyValueSerializer}).
+ * @return a {@link DeltaToEventTranslator} instance using the given {@link PropertyValueSerializer},
+ * that's solely used to serialize primitive values, and defaults to the {@link builtinPropertyValueSerializer}.
  */
 export const deltaToEventTranslator = (
-    propertyValueSerializer: PropertyValueSerializer = builtinPropertyValueSerializer
-): DeltaToEventTranslator =>
-    (delta, lastUsedSequenceNumber) => {
+    primitiveValueSerializer: PropertyValueSerializer = builtinPropertyValueSerializer
+): DeltaToEventTranslator => {
+    const propertyValueSerializer = propertyValueSerializerWith({ primitiveValueSerializer })
+    return (delta, lastUsedSequenceNumber) => {
 
         let sequenceNumber = lastUsedSequenceNumber
         const completed = <ET extends Event>(
@@ -445,4 +446,5 @@ export const deltaToEventTranslator = (
 
         return [translated(delta), sequenceNumber]
     }
+}
 

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

@@ -128,6 +128,12 @@ export const eventToDeltaTranslator = (
             ref === unresolved ? unresolved : idMapping.fromId(ref)
 
         switch (event.messageKind) {
+            /*
+             * Note: `messageKind` is a property of the `Message` type,
+             * which is an interface and not a sum type,
+             * so the switching on it is *not* type-safe,
+             * and you don't get any assist (completion, exhaustive-check) on the message kind.
+             */
 
             // in order of the specification (§ 6.6):
 
@@ -378,7 +384,7 @@ export const eventToDeltaTranslator = (
             case "NoOp": { // § 6.6.7.2
                 return new NoOpDelta()
             }
-            case "Error": { // § 6.6.7.3
+            case "ErrorEvent": { // § 6.6.7.3
                 return undefined
             }