Mirrored entities

2026-04-14 10:47:34 +08:00 · 2023-05-03 21:14:01 +02:00
parent fff40b7619
commit 4eb1ff2a7c
9 changed files with 291 additions and 127 deletions
--- a/cypress/e2e/materialNodes.cy.js
+++ b/cypress/e2e/materialNodes.cy.js
@@ -44,6 +44,48 @@ const tests = [
                    .to.deep.equal(Configuration.pinColor.green)
            }
    },
+    {
+        name: "Comment",
+        value: String.raw`
+            Begin Object Class=/Script/UnrealEd.MaterialGraphNode_Comment Name="MaterialGraphNode_Comment_0" ExportPath=/Script/UnrealEd.MaterialGraphNode_Comment'"/Engine/Transient.M_CobbleStone_Smooth:MaterialGraph_0.MaterialGraphNode_Comment_0"'
+                Begin Object Class=/Script/Engine.MaterialExpressionComment Name="MaterialExpressionComment_0" ExportPath=/Script/Engine.MaterialExpressionComment'"/Engine/Transient.M_CobbleStone_Smooth:MaterialGraph_0.MaterialGraphNode_Comment_0.MaterialExpressionComment_0"'
+                End Object
+                Begin Object Name="MaterialExpressionComment_0" ExportPath=/Script/Engine.MaterialExpressionComment'"/Engine/Transient.M_CobbleStone_Smooth:MaterialGraph_0.MaterialGraphNode_Comment_0.MaterialExpressionComment_0"'
+                    SizeX=249
+                    SizeY=165
+                    Text="Comment"
+                    MaterialExpressionEditorX=-5920
+                    MaterialExpressionEditorY=-704
+                    MaterialExpressionGuid=E21961B2B09144CF8607171C9D1E3489
+                End Object
+                MaterialExpressionComment=/Script/Engine.MaterialExpressionComment'"MaterialExpressionComment_0"'
+                bCommentBubbleVisible_InDetailsPanel=False
+                NodePosX=-5920
+                NodePosY=-704
+                NodeWidth=249
+                NodeHeight=165
+                bCommentBubblePinned=False
+                bCommentBubbleVisible=False
+                NodeComment="Comment"
+                NodeGuid=A04CE0EEECF047A4918AC9B13818854E
+            End Object
+        `,
+        color: Configuration.nodeColors.yellow,
+        icon: false,
+        pins: 5,
+        pinName: ["X", "Y"],
+        delegate: false,
+        development: false,
+        additionalTest:
+            /** @param {import("../../js/element/NodeElement.js").default} node */
+            node => {
+                /** @typedef {import("../../js/element/PinElement.js").default} PinElement */
+                expect(/** @type {PinElement} */(node.querySelectorAll("ueb-pin")[3]).getColor())
+                    .to.deep.equal(Configuration.pinColor.red)
+                expect(/** @type {PinElement} */(node.querySelectorAll("ueb-pin")[4]).getColor())
+                    .to.deep.equal(Configuration.pinColor.green)
+            }
+    },
 ]

 generateNodeTests(tests)
--- a/dist/ueblueprint.js
+++ b/dist/ueblueprint.js
@@ -434,6 +434,48 @@ class ComputedType {
    }
 }

+/**
+ * @typedef {import("./IEntity.js").default} IEntity
+ * @typedef {import("./IEntity.js").EntityConstructor} EntityConstructor
+ */
+
+class MirroredEntity {
+
+    static attributes = {
+        type: {
+            ignored: true,
+        },
+        key: {
+            ignored: true,
+        },
+        getter: {
+            ignored: true,
+        },
+    }
+
+    /**
+     * @param {EntityConstructor} type
+     * @param {String} key
+     */
+    constructor(type, key, getter = () => null) {
+        this.type = type;
+        this.key = key;
+        this.getter = getter;
+    }
+
+    get() {
+        return this.getter()
+    }
+
+    getTargetType() {
+        const result = this.type.attributes[this.key].type;
+        if (result instanceof MirroredEntity) {
+            return result.getTargetType()
+        }
+        return result
+    }
+}
+
 /**
 * @typedef {import("../entity/IEntity.js").default} IEntity
 * @typedef {import("../entity/IEntity.js").AnyValue} AnyValue
@@ -492,48 +534,6 @@ class UnionType {
    }
 }

-/**
- * @typedef {import("./IEntity.js").default} IEntity
- * @typedef {import("./IEntity.js").EntityConstructor} EntityConstructor
- */
-
-class MirroredEntity {
-
-    static attributes = {
-        type: {
-            ignored: true,
-        },
-        key: {
-            ignored: true,
-        },
-        getter: {
-            ignored: true,
-        },
-    }
-
-    /**
-     * @param {EntityConstructor} type
-     * @param {String} key
-     */
-    constructor(type, key, getter = () => null) {
-        this.type = type;
-        this.key = key;
-        this.getter = getter;
-    }
-
-    get() {
-        return this.getter()
-    }
-
-    getTargetType() {
-        const result = this.type.attributes[this.key].type;
-        if (result instanceof MirroredEntity) {
-            return result.getTargetType()
-        }
-        return result
-    }
-}
-
 /**
 * @typedef {import("./Blueprint.js").default} Blueprint
 * @typedef {import("./entity/IEntity.js").AnyValue} AnyValue
@@ -989,10 +989,16 @@ class Utility {
 }

 /**
- * @typedef {IEntity | String | Number | BigInt | Boolean} AnySimpleValue
+ * @template {AnyValue} T
+ * @typedef {(new (...any) => T) | StringConstructor | NumberConstructor | BigIntConstructor | BooleanConstructor
+ *     | ArrayConstructor} AnyValueConstructor
+*/
+
+/**
+ * @typedef {IEntity | MirroredEntity | String | Number | BigInt | Boolean} AnySimpleValue
 * @typedef {AnySimpleValue | AnySimpleValue[]} AnyValue
 * @typedef {(entity: IEntity) => AnyValue} ValueSupplier
- * @typedef {AnyValueConstructor<AnyValue> | AnyValueConstructor<AnyValue>[] | UnionType | UnionType[] | ComputedType} AttributeType
+ * @typedef {AnyValueConstructor<AnyValue> | AnyValueConstructor<AnyValue>[] | UnionType | UnionType[] | ComputedType | MirroredEntity} AttributeType
 * @typedef {{
 *     type?: AttributeType,
 *     default?: AnyValue | ValueSupplier,
@@ -1009,11 +1015,15 @@ class Utility {
 * }} AttributeDeclarations
 * @typedef {typeof IEntity} EntityConstructor
 */
-
 /**
- * @template {AnyValue} T
- * @typedef {(new () => T) | EntityConstructor | StringConstructor | NumberConstructor | BigIntConstructor
- *     | BooleanConstructor | ArrayConstructor} AnyValueConstructor
+ * @template T
+ * @typedef {{
+ *     (value: Boolean): BooleanConstructor,
+ *     (value: Number): NumberConstructor,
+ *     (value: String): StringConstructor,
+ *     (value: BigInt): BigIntConstructor,
+ *     (value: T): typeof value.constructor,
+ * }} TypeGetter
 */

 class IEntity {
@@ -1064,21 +1074,13 @@ class IEntity {
            let value = values[attributeName];
            let attribute = attributes[attributeName];

-            if (!suppressWarns) {
+            if (!suppressWarns && value !== undefined) {
                if (!(attributeName in attributes)) {
                    const typeName = value instanceof Array ? `[${value[0]?.constructor.name}]` : value.constructor.name;
                    console.warn(
                        `UEBlueprint: Attribute ${attributeName} (of type ${typeName}) in the serialized data is not `
                        + `defined in ${Self.name}.attributes`
                    );
-                } else if (
-                    valuesNames.length > 0
-                    && !(attributeName in values)
-                    && !(!attribute.showDefault || attribute.ignored)
-                ) {
-                    console.warn(
-                        `UEBlueprint: ${Self.name} will add attribute ${attributeName} missing from the serialized data`
-                    );
                }
            }

@@ -1135,10 +1137,17 @@ class IEntity {
                // Remember value can still be null
                if (value?.constructor === String && attribute.serialized && defaultType !== String) {
                    value = SerializerFactory
-                        .getSerializer(/** @type {AnyValueConstructor<*>} */(defaultType))
+                        // @ts-expect-error
+                        .getSerializer(defaultType)
                        .read(/** @type {String} */(value));
                }
-                assignAttribute(Utility.sanitize(value, /** @type {AnyValueConstructor<*>} */(defaultType)));
+                if (defaultType instanceof MirroredEntity && !(value instanceof MirroredEntity)) {
+                    value = undefined; // Value is discarded as it is mirrored from another one
+                    value = new MirroredEntity(defaultType.type, defaultType.key);
+                    this[attributeName] = value;
+                } else {
+                    assignAttribute(Utility.sanitize(value, /** @type {AnyValueConstructor<*>} */(defaultType)));
+                }
                continue // We have a value, need nothing more
            }
            if (defaultType instanceof UnionType) {
@@ -1150,17 +1159,18 @@ class IEntity {
                    defaultType = defaultType.getFirstType();
                }
            }
-            if (defaultValue === undefined) {
-                defaultValue = Utility.sanitize(new /** @type {AnyValueConstructor<*>} */(defaultType)());
-            }
-            if (!attribute.showDefault && !attribute.ignored) {
+            if (!attribute.showDefault) {
                assignAttribute(undefined); // Declare undefined to preserve the order of attributes
                continue
            }
+            // if (defaultValue === undefined) {
+            //     defaultValue = Utility.sanitize(new /** @type {AnyValueConstructor<*>} */(defaultType)())
+            // }
            if (attribute.serialized) {
                if (defaultType !== String && defaultValue.constructor === String) {
                    defaultValue = SerializerFactory
-                        .getSerializer(/** @type {AnyValueConstructor<*>} */(defaultType))
+                        // @ts-expect-error
+                        .getSerializer(defaultType)
                        .read(defaultValue);
                }
            }
@@ -1171,19 +1181,42 @@ class IEntity {
        }
    }

+    /** @param {AttributeType} attributeType */
+    static defaultValueProviderFromType(attributeType) {
+        if (attributeType === Boolean) {
+            return false
+        } else if (attributeType === Number) {
+            return 0
+        } else if (attributeType === BigInt) {
+            return 0n
+        } else if (attributeType === String) {
+            return ""
+        } else if (attributeType === Array || attributeType instanceof Array) {
+            return () => []
+        } else if (attributeType instanceof UnionType) {
+            return this.defaultValueProviderFromType(attributeType.getFirstType())
+        } else if (attributeType instanceof MirroredEntity) {
+            return () => new MirroredEntity(attributeType.type, attributeType.key, attributeType.getter)
+        } else if (attributeType instanceof ComputedType) {
+            return undefined
+        } else {
+            return () => new attributeType()
+        }
+    }
+
    /** @param {AttributeDeclarations} attributes */
    static cleanupAttributes(attributes, prefix = "") {
        for (const attributeName in attributes) {
+            attributes[attributeName] = {
+                ...IEntity.defaultAttribute,
+                ...attributes[attributeName],
+            };
            const attribute = /** @type {AttributeInformation} */(attributes[attributeName]);
            if (attribute.type === undefined && !(attribute.default instanceof Function)) {
                attribute.type = attribute.default instanceof Array
                    ? [Utility.getType(attribute.default[0])]
                    : Utility.getType(attribute.default);
            }
-            attributes[attributeName] = {
-                ...IEntity.defaultAttribute,
-                ...attribute,
-            };
            if (attribute.default === undefined) {
                if (attribute.type === undefined) {
                    throw new Error(
@@ -1191,10 +1224,12 @@ class IEntity {
                        + attributeName
                    )
                }
-                attribute[attributeName] = Utility.sanitize(undefined, attribute.type);
+                if (attribute.showDefault) {
+                    attribute.default = this.defaultValueProviderFromType(attribute.type);
+                }
            }
            if (attribute.default === null) {
-                attributes[attributeName].nullable = true;
+                attribute.nullable = true;
            }
        }
    }
@@ -1226,8 +1261,7 @@ class IEntity {
    }

    unexpectedKeys() {
-        return Object.keys(this).length
-            - Object.keys(/** @type {typeof IEntity} */(this.constructor).attributes).length
+        return Object.keys(this).length - Object.keys(/** @type {typeof IEntity} */(this.constructor).attributes).length
    }

    /** @param {IEntity} other */
@@ -2978,11 +3012,23 @@ class ObjectEntity extends IEntity {
            showDefault: false,
        },
        SizeX: {
-            type: IntegerEntity,
+            type: new MirroredEntity(ObjectEntity, "NodeWidth"),
            showDefault: false,
        },
        SizeY: {
-            type: IntegerEntity,
+            type: new MirroredEntity(ObjectEntity, "NodeHeight"),
+            showDefault: false,
+        },
+        Text: {
+            type: new MirroredEntity(ObjectEntity, "NodeComment"),
+            showDefault: false,
+        },
+        MaterialExpressionEditorX: {
+            type: new MirroredEntity(ObjectEntity, "NodePosX"),
+            showDefault: false,
+        },
+        MaterialExpressionEditorY: {
+            type: new MirroredEntity(ObjectEntity, "NodePosY"),
            showDefault: false,
        },
        NodePosX: {
@@ -3103,7 +3149,7 @@ class ObjectEntity extends IEntity {
        }
    }

-    constructor(values, suppressWarns = false) {
+    constructor(values = {}, suppressWarns = false) {
        let keys = Object.keys(values);
        if (keys.some(k => k.startsWith(Configuration.subObjectAttributeNamePrefix))) {
            let subObjectsValues = keys
@@ -3160,8 +3206,11 @@ class ObjectEntity extends IEntity {
        /** @type {SymbolEntity?} */ this.MoveMode;
        /** @type {String?} */ this.TimelineName;
        /** @type {GuidEntity?} */ this.TimelineGuid;
-        /** @type {IntegerEntity?} */ this.SizeX;
-        /** @type {IntegerEntity?} */ this.SizeY;
+        /** @type {MirroredEntity?} */ this.SizeX;
+        /** @type {MirroredEntity?} */ this.SizeY;
+        /** @type {MirroredEntity?} */ this.Text;
+        /** @type {MirroredEntity?} */ this.MaterialExpressionEditorX;
+        /** @type {MirroredEntity?} */ this.MaterialExpressionEditorY;
        /** @type {IntegerEntity} */ this.NodePosX;
        /** @type {IntegerEntity} */ this.NodePosY;
        /** @type {IntegerEntity?} */ this.NodeWidth;
@@ -3193,12 +3242,21 @@ class ObjectEntity extends IEntity {
                    });
            delete this["Pins"];
        }
-
-        this.Class.sanitize();
+        this.Class?.sanitize();
        if (this.MacroGraphReference) {
            this.MacroGraphReference.MacroGraph?.sanitize();
            this.MacroGraphReference.GraphBlueprint?.sanitize();
        }
+        /** @type {ObjectEntity} */
+        const materialSubobject = this.getMaterialSubobject();
+        if (materialSubobject) {
+            const obj = materialSubobject;
+            obj.SizeX && (obj.SizeX.getter = () => this.NodeWidth);
+            obj.SizeY && (obj.SizeY.getter = () => this.NodeHeight);
+            obj.Text && (obj.Text.getter = () => this.NodeComment);
+            obj.MaterialExpressionEditorX && (obj.MaterialExpressionEditorX.getter = () => this.NodePosX);
+            obj.MaterialExpressionEditorY && (obj.MaterialExpressionEditorY.getter = () => this.NodePosY);
+        }
    }

    getClass() {
@@ -3672,7 +3730,7 @@ class UnknownKeysEntity extends IEntity {
    static attributes = {
        lookbehind: {
            default: "",
-            showDefault: false,
+            showDefault: true,
            ignored: true,
        },
    }
@@ -4581,7 +4639,6 @@ class Serializer {
    /** @param {Boolean} insideString */
    doWriteValue(value, insideString, indentation = "") {
        const type = Utility.getType(value);
-        // @ts-expect-error
        const serializer = SerializerFactory.getSerializer(type);
        if (!serializer) {
            throw new Error(
@@ -7376,6 +7433,7 @@ class CommentNodeTemplate extends IResizeableTemplate {

    /** @param {NodeElement} element */
    initialize(element) {
+        super.initialize(element);
        if (element.entity.CommentColor) {
            this.#color.setFromRGBANumber(element.entity.CommentColor.toNumber());
            this.#color.setFromHSVA(
@@ -11095,7 +11153,10 @@ function initializeSerializerFactory() {

    SerializerFactory.registerSerializer(
        MirroredEntity,
-        new Serializer(MirroredEntity)
+        new CustomSerializer(
+            (v, insideString) => SerializerFactory.getSerializer(v.getTargetType()).write(v.get(), insideString),
+            MirroredEntity
+        )
    );

    SerializerFactory.registerSerializer(
--- a/dist/ueblueprint.min.js
+++ b/dist/ueblueprint.min.js
--- a/js/entity/IEntity.js
+++ b/js/entity/IEntity.js
@@ -1,13 +1,20 @@
 import ComputedType from "./ComputedType.js"
+import MirroredEntity from "./MirroredEntity.js"
 import SerializerFactory from "../serialization/SerializerFactory.js"
 import UnionType from "./UnionType.js"
 import Utility from "../Utility.js"

 /**
- * @typedef {IEntity | String | Number | BigInt | Boolean} AnySimpleValue
+ * @template {AnyValue} T
+ * @typedef {(new (...any) => T) | StringConstructor | NumberConstructor | BigIntConstructor | BooleanConstructor
+ *     | ArrayConstructor} AnyValueConstructor
+*/
+
+/**
+ * @typedef {IEntity | MirroredEntity | String | Number | BigInt | Boolean} AnySimpleValue
 * @typedef {AnySimpleValue | AnySimpleValue[]} AnyValue
 * @typedef {(entity: IEntity) => AnyValue} ValueSupplier
- * @typedef {AnyValueConstructor<AnyValue> | AnyValueConstructor<AnyValue>[] | UnionType | UnionType[] | ComputedType} AttributeType
+ * @typedef {AnyValueConstructor<AnyValue> | AnyValueConstructor<AnyValue>[] | UnionType | UnionType[] | ComputedType | MirroredEntity} AttributeType
 * @typedef {{
 *     type?: AttributeType,
 *     default?: AnyValue | ValueSupplier,
@@ -24,11 +31,15 @@ import Utility from "../Utility.js"
 * }} AttributeDeclarations
 * @typedef {typeof IEntity} EntityConstructor
 */
-
 /**
- * @template {AnyValue} T
- * @typedef {(new () => T) | EntityConstructor | StringConstructor | NumberConstructor | BigIntConstructor
- *     | BooleanConstructor | ArrayConstructor} AnyValueConstructor
+ * @template T
+ * @typedef {{
+ *     (value: Boolean): BooleanConstructor,
+ *     (value: Number): NumberConstructor,
+ *     (value: String): StringConstructor,
+ *     (value: BigInt): BigIntConstructor,
+ *     (value: T): typeof value.constructor,
+ * }} TypeGetter
 */

 export default class IEntity {
@@ -79,21 +90,13 @@ export default class IEntity {
            let value = values[attributeName]
            let attribute = attributes[attributeName]

-            if (!suppressWarns) {
+            if (!suppressWarns && value !== undefined) {
                if (!(attributeName in attributes)) {
                    const typeName = value instanceof Array ? `[${value[0]?.constructor.name}]` : value.constructor.name
                    console.warn(
                        `UEBlueprint: Attribute ${attributeName} (of type ${typeName}) in the serialized data is not `
                        + `defined in ${Self.name}.attributes`
                    )
-                } else if (
-                    valuesNames.length > 0
-                    && !(attributeName in values)
-                    && !(!attribute.showDefault || attribute.ignored)
-                ) {
-                    console.warn(
-                        `UEBlueprint: ${Self.name} will add attribute ${attributeName} missing from the serialized data`
-                    )
                }
            }

@@ -150,10 +153,17 @@ export default class IEntity {
                // Remember value can still be null
                if (value?.constructor === String && attribute.serialized && defaultType !== String) {
                    value = SerializerFactory
-                        .getSerializer(/** @type {AnyValueConstructor<*>} */(defaultType))
+                        // @ts-expect-error
+                        .getSerializer(defaultType)
                        .read(/** @type {String} */(value))
                }
-                assignAttribute(Utility.sanitize(value, /** @type {AnyValueConstructor<*>} */(defaultType)))
+                if (defaultType instanceof MirroredEntity && !(value instanceof MirroredEntity)) {
+                    value = undefined // Value is discarded as it is mirrored from another one
+                    value = new MirroredEntity(defaultType.type, defaultType.key)
+                    this[attributeName] = value
+                } else {
+                    assignAttribute(Utility.sanitize(value, /** @type {AnyValueConstructor<*>} */(defaultType)))
+                }
                continue // We have a value, need nothing more
            }
            if (defaultType instanceof UnionType) {
@@ -165,17 +175,18 @@ export default class IEntity {
                    defaultType = defaultType.getFirstType()
                }
            }
-            if (defaultValue === undefined) {
-                defaultValue = Utility.sanitize(new /** @type {AnyValueConstructor<*>} */(defaultType)())
-            }
-            if (!attribute.showDefault && !attribute.ignored) {
+            if (!attribute.showDefault) {
                assignAttribute(undefined) // Declare undefined to preserve the order of attributes
                continue
            }
+            // if (defaultValue === undefined) {
+            //     defaultValue = Utility.sanitize(new /** @type {AnyValueConstructor<*>} */(defaultType)())
+            // }
            if (attribute.serialized) {
                if (defaultType !== String && defaultValue.constructor === String) {
                    defaultValue = SerializerFactory
-                        .getSerializer(/** @type {AnyValueConstructor<*>} */(defaultType))
+                        // @ts-expect-error
+                        .getSerializer(defaultType)
                        .read(defaultValue)
                }
            }
@@ -186,19 +197,42 @@ export default class IEntity {
        }
    }

+    /** @param {AttributeType} attributeType */
+    static defaultValueProviderFromType(attributeType) {
+        if (attributeType === Boolean) {
+            return false
+        } else if (attributeType === Number) {
+            return 0
+        } else if (attributeType === BigInt) {
+            return 0n
+        } else if (attributeType === String) {
+            return ""
+        } else if (attributeType === Array || attributeType instanceof Array) {
+            return () => []
+        } else if (attributeType instanceof UnionType) {
+            return this.defaultValueProviderFromType(attributeType.getFirstType())
+        } else if (attributeType instanceof MirroredEntity) {
+            return () => new MirroredEntity(attributeType.type, attributeType.key, attributeType.getter)
+        } else if (attributeType instanceof ComputedType) {
+            return undefined
+        } else {
+            return () => new attributeType()
+        }
+    }
+
    /** @param {AttributeDeclarations} attributes */
    static cleanupAttributes(attributes, prefix = "") {
        for (const attributeName in attributes) {
+            attributes[attributeName] = {
+                ...IEntity.defaultAttribute,
+                ...attributes[attributeName],
+            }
            const attribute = /** @type {AttributeInformation} */(attributes[attributeName])
            if (attribute.type === undefined && !(attribute.default instanceof Function)) {
                attribute.type = attribute.default instanceof Array
                    ? [Utility.getType(attribute.default[0])]
                    : Utility.getType(attribute.default)
            }
-            attributes[attributeName] = {
-                ...IEntity.defaultAttribute,
-                ...attribute,
-            }
            if (attribute.default === undefined) {
                if (attribute.type === undefined) {
                    throw new Error(
@@ -206,10 +240,12 @@ export default class IEntity {
                        + attributeName
                    )
                }
-                attribute[attributeName] = Utility.sanitize(undefined, attribute.type)
+                if (attribute.showDefault) {
+                    attribute.default = this.defaultValueProviderFromType(attribute.type)
+                }
            }
            if (attribute.default === null) {
-                attributes[attributeName].nullable = true
+                attribute.nullable = true
            }
        }
    }
@@ -241,8 +277,7 @@ export default class IEntity {
    }

    unexpectedKeys() {
-        return Object.keys(this).length
-            - Object.keys(/** @type {typeof IEntity} */(this.constructor).attributes).length
+        return Object.keys(this).length - Object.keys(/** @type {typeof IEntity} */(this.constructor).attributes).length
    }

    /** @param {IEntity} other */
--- a/js/entity/ObjectEntity.js
+++ b/js/entity/ObjectEntity.js
@@ -1,5 +1,4 @@
 import Configuration from "../Configuration.js"
-import FormatTextEntity from "./FormatTextEntity.js"
 import FunctionReferenceEntity from "./FunctionReferenceEntity.js"
 import GuidEntity from "./GuidEntity.js"
 import IdentifierEntity from "./IdentifierEntity.js"
@@ -7,6 +6,7 @@ import IEntity from "./IEntity.js"
 import IntegerEntity from "./IntegerEntity.js"
 import LinearColorEntity from "./LinearColorEntity.js"
 import MacroGraphReferenceEntity from "./MacroGraphReferenceEntity.js"
+import MirroredEntity from "./MirroredEntity.js"
 import ObjectReferenceEntity from "./ObjectReferenceEntity.js"
 import PinEntity from "./PinEntity.js"
 import SVGIcon from "../SVGIcon.js"
@@ -15,7 +15,6 @@ import UnionType from "./UnionType.js"
 import UnknownPinEntity from "./UnknownPinEntity.js"
 import Utility from "../Utility.js"
 import VariableReferenceEntity from "./VariableReferenceEntity.js"
-import MirroredEntity from "./MirroredEntity.js"

 export default class ObjectEntity extends IEntity {

@@ -175,11 +174,23 @@ export default class ObjectEntity extends IEntity {
            showDefault: false,
        },
        SizeX: {
-            type: IntegerEntity,
+            type: new MirroredEntity(ObjectEntity, "NodeWidth"),
            showDefault: false,
        },
        SizeY: {
-            type: IntegerEntity,
+            type: new MirroredEntity(ObjectEntity, "NodeHeight"),
+            showDefault: false,
+        },
+        Text: {
+            type: new MirroredEntity(ObjectEntity, "NodeComment"),
+            showDefault: false,
+        },
+        MaterialExpressionEditorX: {
+            type: new MirroredEntity(ObjectEntity, "NodePosX"),
+            showDefault: false,
+        },
+        MaterialExpressionEditorY: {
+            type: new MirroredEntity(ObjectEntity, "NodePosY"),
            showDefault: false,
        },
        NodePosX: {
@@ -300,7 +311,7 @@ export default class ObjectEntity extends IEntity {
        }
    }

-    constructor(values, suppressWarns = false) {
+    constructor(values = {}, suppressWarns = false) {
        let keys = Object.keys(values)
        if (keys.some(k => k.startsWith(Configuration.subObjectAttributeNamePrefix))) {
            let subObjectsValues = keys
@@ -357,8 +368,11 @@ export default class ObjectEntity extends IEntity {
        /** @type {SymbolEntity?} */ this.MoveMode
        /** @type {String?} */ this.TimelineName
        /** @type {GuidEntity?} */ this.TimelineGuid
-        /** @type {IntegerEntity?} */ this.SizeX
-        /** @type {IntegerEntity?} */ this.SizeY
+        /** @type {MirroredEntity?} */ this.SizeX
+        /** @type {MirroredEntity?} */ this.SizeY
+        /** @type {MirroredEntity?} */ this.Text
+        /** @type {MirroredEntity?} */ this.MaterialExpressionEditorX
+        /** @type {MirroredEntity?} */ this.MaterialExpressionEditorY
        /** @type {IntegerEntity} */ this.NodePosX
        /** @type {IntegerEntity} */ this.NodePosY
        /** @type {IntegerEntity?} */ this.NodeWidth
@@ -390,12 +404,21 @@ export default class ObjectEntity extends IEntity {
                    })
            delete this["Pins"]
        }
-
-        this.Class.sanitize()
+        this.Class?.sanitize()
        if (this.MacroGraphReference) {
            this.MacroGraphReference.MacroGraph?.sanitize()
            this.MacroGraphReference.GraphBlueprint?.sanitize()
        }
+        /** @type {ObjectEntity} */
+        const materialSubobject = this.getMaterialSubobject()
+        if (materialSubobject) {
+            const obj = materialSubobject
+            obj.SizeX && (obj.SizeX.getter = () => this.NodeWidth)
+            obj.SizeY && (obj.SizeY.getter = () => this.NodeHeight)
+            obj.Text && (obj.Text.getter = () => this.NodeComment)
+            obj.MaterialExpressionEditorX && (obj.MaterialExpressionEditorX.getter = () => this.NodePosX)
+            obj.MaterialExpressionEditorY && (obj.MaterialExpressionEditorY.getter = () => this.NodePosY)
+        }
    }

    getClass() {
--- a/js/entity/UnknownKeysEntity.js
+++ b/js/entity/UnknownKeysEntity.js
@@ -5,7 +5,7 @@ export default class UnknownKeysEntity extends IEntity {
    static attributes = {
        lookbehind: {
            default: "",
-            showDefault: false,
+            showDefault: true,
            ignored: true,
        },
    }
--- a/js/serialization/Serializer.js
+++ b/js/serialization/Serializer.js
@@ -136,7 +136,6 @@ export default class Serializer {
    /** @param {Boolean} insideString */
    doWriteValue(value, insideString, indentation = "") {
        const type = Utility.getType(value)
-        // @ts-expect-error
        const serializer = SerializerFactory.getSerializer(type)
        if (!serializer) {
            throw new Error(
--- a/js/serialization/initializeSerializerFactory.js
+++ b/js/serialization/initializeSerializerFactory.js
@@ -164,7 +164,10 @@ export default function initializeSerializerFactory() {

    SerializerFactory.registerSerializer(
        MirroredEntity,
-        new Serializer(MirroredEntity)
+        new CustomSerializer(
+            (v, insideString) => SerializerFactory.getSerializer(v.getTargetType()).write(v.get(), insideString),
+            MirroredEntity
+        )
    )

    SerializerFactory.registerSerializer(
--- a/js/template/node/CommentNodeTemplate.js
+++ b/js/template/node/CommentNodeTemplate.js
@@ -16,6 +16,7 @@ export default class CommentNodeTemplate extends IResizeableTemplate {

    /** @param {NodeElement} element */
    initialize(element) {
+        super.initialize(element)
        if (element.entity.CommentColor) {
            this.#color.setFromRGBANumber(element.entity.CommentColor.toNumber())
            this.#color.setFromHSVA(