Several fixes for the attribute order

dist/ueblueprint.js

@@ -138,7 +138,6 @@ class Configuration {
         dynamicCast: "/Script/BlueprintGraph.K2Node_DynamicCast",
         eAttachmentRule: "/Script/Engine.EAttachmentRule",
         edGraph: "/Script/Engine.EdGraph",
-        edGraphPinDeprecated: "/Script/Engine.EdGraphPin_Deprecated",
         eDrawDebugTrace: "/Script/Engine.EDrawDebugTrace",
         eMaterialSamplerType: "/Script/Engine.EMaterialSamplerType",
         enum: "/Script/CoreUObject.Enum",
@@ -3373,20 +3372,6 @@ class ObjectReferenceEntity extends IEntity {
         return new ObjectReferenceEntity({ type: "None", path: "" })
     }
 
-    sanitize() {
-        if (this.type && !this.type.startsWith("/")) {
-            let deprecatedType = this.type + "_Deprecated";
-            let path = Object.keys(Configuration.paths)
-                .find(type => {
-                    const name = Utility.getNameFromPath(Configuration.paths[type]);
-                    return name === this.type || name === deprecatedType
-                });
-            if (path) {
-                this.type = Configuration.paths[path];
-            }
-        }
-    }
-
     getName() {
         return Utility.getNameFromPath(this.path.replace(/_C$/, ""))
     }
@@ -4833,123 +4818,127 @@ class ObjectEntity extends IEntity {
     }
     static attributes = {
         ...super.attributes,
+        Class: AttributeInfo.createType(ObjectReferenceEntity),
+        Name: AttributeInfo.createType(String),
+        Archetype: AttributeInfo.createType(ObjectReferenceEntity),
+        ExportPath: AttributeInfo.createType(ObjectReferenceEntity),
         R: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
         G: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
         B: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
         A: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
-        AdvancedPinDisplay: AttributeInfo.createType(IdentifierEntity),
-        Archetype: AttributeInfo.createType(ObjectReferenceEntity),
-        AxisKey: AttributeInfo.createType(SymbolEntity),
-        bAlt: AttributeInfo.createType(Boolean),
-        bCanRenameNode: AttributeInfo.createType(Boolean),
-        bColorCommentBubble: AttributeInfo.createType(Boolean),
-        bCommand: AttributeInfo.createType(Boolean),
-        bCommentBubblePinned: AttributeInfo.createType(Boolean),
-        bCommentBubbleVisible_InDetailsPanel: AttributeInfo.createType(Boolean),
-        bCommentBubbleVisible: AttributeInfo.createType(Boolean),
-        bConsumeInput: AttributeInfo.createType(Boolean),
-        bControl: AttributeInfo.createType(Boolean),
-        bExecuteWhenPaused: AttributeInfo.createType(Boolean),
-        bExposeToLibrary: AttributeInfo.createType(Boolean),
-        bInternalEvent: AttributeInfo.createType(Boolean),
-        bIsCaseSensitive: AttributeInfo.createType(Boolean),
-        bIsConstFunc: AttributeInfo.createType(Boolean),
-        bIsPureFunc: AttributeInfo.createType(Boolean),
-        BlueprintElementInstance: AttributeInfo.createType(ObjectReferenceEntity),
+        ObjectRef: AttributeInfo.createType(ObjectReferenceEntity),
         BlueprintElementType: AttributeInfo.createType(ObjectReferenceEntity),
-        bOverrideFunction: AttributeInfo.createType(Boolean),
-        bOverrideParentBinding: AttributeInfo.createType(Boolean),
-        bShift: AttributeInfo.createType(Boolean),
-        Class: AttributeInfo.createType(ObjectReferenceEntity),
-        CommentColor: AttributeInfo.createType(LinearColorEntity),
-        ComponentPropertyName: AttributeInfo.createType(String),
-        CustomFunctionName: AttributeInfo.createType(String),
-        CustomProperties: AttributeInfo.createType([new Union(PinEntity, UnknownPinEntity)]),
-        DelegateOwnerClass: AttributeInfo.createType(ObjectReferenceEntity),
+        BlueprintElementInstance: AttributeInfo.createType(ObjectReferenceEntity),
+        PinTags: new AttributeInfo({
+            type: [null],
+            inlined: true,
+        }),
+        PinNames: new AttributeInfo({
+            type: [String],
+            inlined: true,
+        }),
+        AxisKey: AttributeInfo.createType(SymbolEntity),
+        InputAxisKey: AttributeInfo.createType(SymbolEntity),
+        InputName: AttributeInfo.createType(String),
+        InputType: AttributeInfo.createType(SymbolEntity),
+        NumAdditionalInputs: AttributeInfo.createType(Number),
+        bIsPureFunc: AttributeInfo.createType(Boolean),
+        bIsConstFunc: AttributeInfo.createType(Boolean),
+        bIsCaseSensitive: AttributeInfo.createType(Boolean),
+        VariableReference: AttributeInfo.createType(VariableReferenceEntity),
+        SelfContextInfo: AttributeInfo.createType(SymbolEntity),
         DelegatePropertyName: AttributeInfo.createType(String),
-        DelegateReference: AttributeInfo.createType(VariableReferenceEntity),
-        EnabledState: AttributeInfo.createType(IdentifierEntity),
+        DelegateOwnerClass: AttributeInfo.createType(ObjectReferenceEntity),
+        ComponentPropertyName: AttributeInfo.createType(String),
+        EventReference: AttributeInfo.createType(FunctionReferenceEntity),
+        FunctionReference: AttributeInfo.createType(FunctionReferenceEntity),
+        CustomFunctionName: AttributeInfo.createType(String),
+        TargetType: AttributeInfo.createType(ObjectReferenceEntity),
+        MacroGraphReference: AttributeInfo.createType(MacroGraphReferenceEntity),
         Enum: AttributeInfo.createType(ObjectReferenceEntity),
         EnumEntries: new AttributeInfo({
             type: [String],
             inlined: true,
         }),
-        ErrorMsg: AttributeInfo.createType(String),
-        ErrorType: AttributeInfo.createType(IntegerEntity),
-        EventReference: AttributeInfo.createType(FunctionReferenceEntity),
-        ExportPath: AttributeInfo.createType(ObjectReferenceEntity),
-        FunctionReference: AttributeInfo.createType(FunctionReferenceEntity),
-        Graph: AttributeInfo.createType(ObjectReferenceEntity),
-        HiGenGridSize: AttributeInfo.createType(SymbolEntity),
-        InputAxisKey: AttributeInfo.createType(SymbolEntity),
         InputKey: AttributeInfo.createType(SymbolEntity),
-        InputName: AttributeInfo.createType(String),
+        MaterialFunction: AttributeInfo.createType(ObjectReferenceEntity),
+        bOverrideFunction: AttributeInfo.createType(Boolean),
+        bInternalEvent: AttributeInfo.createType(Boolean),
+        bConsumeInput: AttributeInfo.createType(Boolean),
+        bExecuteWhenPaused: AttributeInfo.createType(Boolean),
+        bOverrideParentBinding: AttributeInfo.createType(Boolean),
+        bControl: AttributeInfo.createType(Boolean),
+        bAlt: AttributeInfo.createType(Boolean),
+        bShift: AttributeInfo.createType(Boolean),
+        bCommand: AttributeInfo.createType(Boolean),
+        CommentColor: AttributeInfo.createType(LinearColorEntity),
+        bCommentBubbleVisible_InDetailsPanel: AttributeInfo.createType(Boolean),
+        bColorCommentBubble: AttributeInfo.createType(Boolean),
+        ProxyFactoryFunctionName: AttributeInfo.createType(String),
+        ProxyFactoryClass: AttributeInfo.createType(ObjectReferenceEntity),
+        ProxyClass: AttributeInfo.createType(ObjectReferenceEntity),
+        StructType: AttributeInfo.createType(ObjectReferenceEntity),
+        MaterialExpression: AttributeInfo.createType(ObjectReferenceEntity),
+        MaterialExpressionComment: AttributeInfo.createType(ObjectReferenceEntity),
+        MoveMode: AttributeInfo.createType(SymbolEntity),
+        TimelineName: AttributeInfo.createType(String),
+        TimelineGuid: AttributeInfo.createType(GuidEntity),
+        SizeX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        SizeY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        Text: AttributeInfo.createType(new MirroredEntity(String)),
+        MaterialExpressionEditorX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        MaterialExpressionEditorY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        NodeTitle: AttributeInfo.createType(String),
+        NodeTitleColor: AttributeInfo.createType(LinearColorEntity),
+        PositionX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        PositionY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        SettingsInterface: AttributeInfo.createType(ObjectReferenceEntity),
+        PCGNode: AttributeInfo.createType(ObjectReferenceEntity),
+        HiGenGridSize: AttributeInfo.createType(SymbolEntity),
+        Operation: AttributeInfo.createType(SymbolEntity),
+        NodePosX: AttributeInfo.createType(IntegerEntity),
+        NodePosY: AttributeInfo.createType(IntegerEntity),
+        NodeHeight: AttributeInfo.createType(IntegerEntity),
+        NodeWidth: AttributeInfo.createType(IntegerEntity),
+        Graph: AttributeInfo.createType(ObjectReferenceEntity),
+        SubgraphInstance: AttributeInfo.createType(String),
         InputPins: new AttributeInfo({
             type: [ObjectReferenceEntity],
             inlined: true,
         }),
-        InputType: AttributeInfo.createType(SymbolEntity),
-        MacroGraphReference: AttributeInfo.createType(MacroGraphReferenceEntity),
-        MaterialExpression: AttributeInfo.createType(ObjectReferenceEntity),
-        MaterialExpressionComment: AttributeInfo.createType(ObjectReferenceEntity),
-        MaterialExpressionEditorX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        MaterialExpressionEditorY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        MaterialFunction: AttributeInfo.createType(ObjectReferenceEntity),
-        MoveMode: AttributeInfo.createType(SymbolEntity),
-        Name: AttributeInfo.createType(String),
-        Node: AttributeInfo.createType(new MirroredEntity(ObjectReferenceEntity)),
-        NodeComment: AttributeInfo.createType(String),
-        NodeGuid: AttributeInfo.createType(GuidEntity),
-        NodeHeight: AttributeInfo.createType(IntegerEntity),
-        NodePosX: AttributeInfo.createType(IntegerEntity),
-        NodePosY: AttributeInfo.createType(IntegerEntity),
-        NodeTitle: AttributeInfo.createType(String),
-        NodeTitleColor: AttributeInfo.createType(LinearColorEntity),
-        NodeWidth: AttributeInfo.createType(IntegerEntity),
-        NumAdditionalInputs: AttributeInfo.createType(Number),
-        ObjectRef: AttributeInfo.createType(ObjectReferenceEntity),
-        Operation: AttributeInfo.createType(SymbolEntity),
         OutputPins: new AttributeInfo({
             type: [ObjectReferenceEntity],
             inlined: true,
         }),
-        PCGNode: AttributeInfo.createType(ObjectReferenceEntity),
-        PinNames: new AttributeInfo({
-            type: [String],
-            inlined: true,
-        }),
-        PinTags: new AttributeInfo({
-            type: [null],
-            inlined: true,
-        }),
-        PositionX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        PositionY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        ProxyClass: AttributeInfo.createType(ObjectReferenceEntity),
-        ProxyFactoryClass: AttributeInfo.createType(ObjectReferenceEntity),
-        ProxyFactoryFunctionName: AttributeInfo.createType(String),
-        SelfContextInfo: AttributeInfo.createType(SymbolEntity),
-        SettingsInterface: AttributeInfo.createType(ObjectReferenceEntity),
-        SizeX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        SizeY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        StructType: AttributeInfo.createType(ObjectReferenceEntity),
-        SubgraphInstance: AttributeInfo.createType(String),
-        TargetType: AttributeInfo.createType(ObjectReferenceEntity),
-        Text: AttributeInfo.createType(new MirroredEntity(String)),
-        TimelineGuid: AttributeInfo.createType(GuidEntity),
-        TimelineName: AttributeInfo.createType(String),
-        VariableReference: AttributeInfo.createType(VariableReferenceEntity),
+        bExposeToLibrary: AttributeInfo.createType(Boolean),
+        bCanRenameNode: AttributeInfo.createType(Boolean),
+        bCommentBubblePinned: AttributeInfo.createType(Boolean),
+        bCommentBubbleVisible: AttributeInfo.createType(Boolean),
+        NodeComment: AttributeInfo.createType(String),
+        AdvancedPinDisplay: AttributeInfo.createType(IdentifierEntity),
+        DelegateReference: AttributeInfo.createType(VariableReferenceEntity),
+        EnabledState: AttributeInfo.createType(IdentifierEntity),
+        NodeGuid: AttributeInfo.createType(GuidEntity),
+        ErrorType: AttributeInfo.createType(IntegerEntity),
+        ErrorMsg: AttributeInfo.createType(String),
+        Node: AttributeInfo.createType(new MirroredEntity(ObjectReferenceEntity)),
+        CustomProperties: AttributeInfo.createType([new Union(PinEntity, UnknownPinEntity)]),
     }
     static nameRegex = /^(\w+?)(?:_(\d+))?$/
     static sequencerScriptingNameRegex = /\/Script\/SequencerScripting\.MovieSceneScripting(.+)Channel/
@@ -4987,6 +4976,7 @@ class ObjectEntity extends IEntity {
                                 if (!values.attributes) {
                                     IEntity.defineAttributes(values, {});
                                 }
+                                Utility.objectSet(values, ["attributes", symbol, "type"], [currentValue.constructor]);
                                 Utility.objectSet(values, ["attributes", symbol, "inlined"], true);
                             }
                         }
@@ -5062,23 +5052,18 @@ class ObjectEntity extends IEntity {
             .map(([_0, first, remaining, _4]) => [first, ...remaining])
     }
 
+    /** @type {String} */
+    #class
+
     constructor(values = {}, suppressWarns = false) {
-        let keys = Object.keys(values);
-        if (keys.some(k => k.startsWith(Configuration.subObjectAttributeNamePrefix))) {
-            let subObjectsValues = keys
-                .filter(k => k.startsWith(Configuration.subObjectAttributeNamePrefix))
-                .reduce(
-                    (acc, k) => {
-                        acc[k] = values[k];
-                        return acc
-                    },
-                    {}
-                );
-            // Reorder sub objects to be the first entries
-            values = {
-                ...subObjectsValues,
-                ...values,
-            };
+        if ("NodePosX" in values !== "NodePosY" in values) {
+            const entries = Object.entries(values);
+            const [key, position] = "NodePosX" in values
+                ? ["NodePosY", Object.keys(values).indexOf("NodePosX") + 1]
+                : ["NodePosX", Object.keys(values).indexOf("NodePosY")];
+            const entry = [key, new (AttributeInfo.getAttribute(values, key, "type", ObjectEntity))()];
+            entries.splice(position, 0, entry);
+            values = Object.fromEntries(entries);
         }
         super(values, suppressWarns);
 
@@ -5150,25 +5135,20 @@ class ObjectEntity extends IEntity {
         /** @type {VariableReferenceEntity} */ this.DelegateReference;
         /** @type {VariableReferenceEntity} */ this.VariableReference;
 
-        // Legacy nodes cleanup
+        // Legacy nodes pins
         if (this["Pins"] instanceof Array) {
-            this["Pins"]
-                .forEach(
-                    /** @param {ObjectReferenceEntity} objectReference */
-                    objectReference => {
-                        const pinObject = this[Configuration.subObjectAttributeNameFromReference(objectReference, true)];
-                        if (pinObject) {
-                            const pinEntity = PinEntity.fromLegacyObject(pinObject);
-                            pinEntity.LinkedTo = [];
-                            this.getCustomproperties(true).push(pinEntity);
-                        }
-                    });
-            delete this["Pins"];
-        }
-        this.Class?.sanitize();
-        if (this.MacroGraphReference) {
-            this.MacroGraphReference.MacroGraph?.sanitize();
-            this.MacroGraphReference.GraphBlueprint?.sanitize();
+            this["Pins"].forEach(
+                /** @param {ObjectReferenceEntity} objectReference */
+                objectReference => {
+                    const pinObject = this[Configuration.subObjectAttributeNameFromReference(objectReference, true)];
+                    if (pinObject) {
+                        const pinEntity = PinEntity.fromLegacyObject(pinObject);
+                        pinEntity.LinkedTo = [];
+                        this.getCustomproperties(true).push(pinEntity);
+                        Utility.objectSet(this, ["attributes", "CustomProperties", "ignored"], true);
+                    }
+                }
+            );
         }
         /** @type {ObjectEntity} */
         const materialSubobject = this.getMaterialSubobject();
@@ -5228,9 +5208,19 @@ class ObjectEntity extends IEntity {
     }
 
     getClass() {
-        return (this.Class?.path ? this.Class.path : this.Class?.type)
-            ?? (this.ExportPath?.path ? this.ExportPath.path : this.ExportPath?.type)
-            ?? ""
+        if (!this.#class) {
+            this.#class = (this.Class?.path ? this.Class.path : this.Class?.type)
+                ?? (this.ExportPath?.path ? this.ExportPath.path : this.ExportPath?.type)
+                ?? "";
+            if (this.#class && !this.#class.startsWith("/")) {
+                // Old path names did not start with /Script or /Engine, check tests/resources/LegacyNodes.js
+                let path = Object.values(Configuration.paths).find(path => path.endsWith("." + this.#class));
+                if (path) {
+                    this.#class = path;
+                }
+            }
+        }
+        return this.#class
     }
 
     getType() {
@@ -6027,7 +6017,7 @@ class ObjectEntity extends IEntity {
                 newPin.PinId = GuidEntity.generateGuid();
                 newPin.PinName = pinNameFromIndex(index, min, max);
                 newPin.PinToolTip = undefined;
-                this.CustomProperties.push(newPin);
+                this.getCustomproperties(true).push(newPin);
                 return newPin
             }
         }
@@ -6278,13 +6268,15 @@ class ObjectSerializer extends Serializer {
                 attributeValueConjunctionSign,
                 key => entity[key] instanceof ObjectEntity ? "" : attributeKeyPrinter(key)
             )
-            + entity.getCustomproperties().map(pin =>
-                moreIndentation
-                + attributeKeyPrinter("CustomProperties ")
-                + SerializerFactory.getSerializer(PinEntity).doWrite(pin, insideString)
-                + this.attributeSeparator
+            + (!AttributeInfo.getAttribute(entity, "CustomProperties", "ignored")
+                ? entity.getCustomproperties().map(pin =>
+                    moreIndentation
+                    + attributeKeyPrinter("CustomProperties ")
+                    + SerializerFactory.getSerializer(PinEntity).doWrite(pin, insideString)
+                    + this.attributeSeparator
+                ).join("")
+                : ""
             )
-                .join("")
             + indentation + "End Object";
         return result
     }
@@ -7859,9 +7851,7 @@ class KnotEntity extends ObjectEntity {
         values.Class = new ObjectReferenceEntity(Configuration.paths.knot);
         values.Name = "K2Node_Knot";
         const inputPinEntity = new PinEntity(
-            {
-                PinName: "InputPin",
-            },
+            { PinName: "InputPin" },
             true
         );
         const outputPinEntity = new PinEntity(
@@ -7875,7 +7865,7 @@ class KnotEntity extends ObjectEntity {
             inputPinEntity.copyTypeFrom(pinReferenceForType);
             outputPinEntity.copyTypeFrom(pinReferenceForType);
         }
-        values.CustomProperties = [inputPinEntity, outputPinEntity];
+        values["CustomProperties"] = [inputPinEntity, outputPinEntity];
         super(values, true);
     }
 }

js/Configuration.js

@@ -114,7 +114,6 @@ export default class Configuration {
         dynamicCast: "/Script/BlueprintGraph.K2Node_DynamicCast",
         eAttachmentRule: "/Script/Engine.EAttachmentRule",
         edGraph: "/Script/Engine.EdGraph",
-        edGraphPinDeprecated: "/Script/Engine.EdGraphPin_Deprecated",
         eDrawDebugTrace: "/Script/Engine.EDrawDebugTrace",
         eMaterialSamplerType: "/Script/Engine.EMaterialSamplerType",
         enum: "/Script/CoreUObject.Enum",

js/entity/ObjectEntity.js

@@ -3,6 +3,7 @@ import Configuration from "../Configuration.js"
 import SVGIcon from "../SVGIcon.js"
 import Utility from "../Utility.js"
 import Grammar from "../serialization/Grammar.js"
+import AttributeInfo from "./AttributeInfo.js"
 import FunctionReferenceEntity from "./FunctionReferenceEntity.js"
 import GuidEntity from "./GuidEntity.js"
 import IEntity from "./IEntity.js"
@@ -17,7 +18,6 @@ import SymbolEntity from "./SymbolEntity.js"
 import Union from "./Union.js"
 import UnknownPinEntity from "./UnknownPinEntity.js"
 import VariableReferenceEntity from "./VariableReferenceEntity.js"
-import AttributeInfo from "./AttributeInfo.js"
 
 export default class ObjectEntity extends IEntity {
 
@@ -51,123 +51,127 @@ export default class ObjectEntity extends IEntity {
     }
     static attributes = {
         ...super.attributes,
+        Class: AttributeInfo.createType(ObjectReferenceEntity),
+        Name: AttributeInfo.createType(String),
+        Archetype: AttributeInfo.createType(ObjectReferenceEntity),
+        ExportPath: AttributeInfo.createType(ObjectReferenceEntity),
         R: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
         G: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
         B: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
         A: new AttributeInfo({
+            type: new Union(Boolean, Number),
             default: false,
             silent: true,
         }),
-        AdvancedPinDisplay: AttributeInfo.createType(IdentifierEntity),
-        Archetype: AttributeInfo.createType(ObjectReferenceEntity),
-        AxisKey: AttributeInfo.createType(SymbolEntity),
-        bAlt: AttributeInfo.createType(Boolean),
-        bCanRenameNode: AttributeInfo.createType(Boolean),
-        bColorCommentBubble: AttributeInfo.createType(Boolean),
-        bCommand: AttributeInfo.createType(Boolean),
-        bCommentBubblePinned: AttributeInfo.createType(Boolean),
-        bCommentBubbleVisible_InDetailsPanel: AttributeInfo.createType(Boolean),
-        bCommentBubbleVisible: AttributeInfo.createType(Boolean),
-        bConsumeInput: AttributeInfo.createType(Boolean),
-        bControl: AttributeInfo.createType(Boolean),
-        bExecuteWhenPaused: AttributeInfo.createType(Boolean),
-        bExposeToLibrary: AttributeInfo.createType(Boolean),
-        bInternalEvent: AttributeInfo.createType(Boolean),
-        bIsCaseSensitive: AttributeInfo.createType(Boolean),
-        bIsConstFunc: AttributeInfo.createType(Boolean),
-        bIsPureFunc: AttributeInfo.createType(Boolean),
-        BlueprintElementInstance: AttributeInfo.createType(ObjectReferenceEntity),
+        ObjectRef: AttributeInfo.createType(ObjectReferenceEntity),
         BlueprintElementType: AttributeInfo.createType(ObjectReferenceEntity),
-        bOverrideFunction: AttributeInfo.createType(Boolean),
-        bOverrideParentBinding: AttributeInfo.createType(Boolean),
-        bShift: AttributeInfo.createType(Boolean),
-        Class: AttributeInfo.createType(ObjectReferenceEntity),
-        CommentColor: AttributeInfo.createType(LinearColorEntity),
-        ComponentPropertyName: AttributeInfo.createType(String),
-        CustomFunctionName: AttributeInfo.createType(String),
-        CustomProperties: AttributeInfo.createType([new Union(PinEntity, UnknownPinEntity)]),
-        DelegateOwnerClass: AttributeInfo.createType(ObjectReferenceEntity),
+        BlueprintElementInstance: AttributeInfo.createType(ObjectReferenceEntity),
+        PinTags: new AttributeInfo({
+            type: [null],
+            inlined: true,
+        }),
+        PinNames: new AttributeInfo({
+            type: [String],
+            inlined: true,
+        }),
+        AxisKey: AttributeInfo.createType(SymbolEntity),
+        InputAxisKey: AttributeInfo.createType(SymbolEntity),
+        InputName: AttributeInfo.createType(String),
+        InputType: AttributeInfo.createType(SymbolEntity),
+        NumAdditionalInputs: AttributeInfo.createType(Number),
+        bIsPureFunc: AttributeInfo.createType(Boolean),
+        bIsConstFunc: AttributeInfo.createType(Boolean),
+        bIsCaseSensitive: AttributeInfo.createType(Boolean),
+        VariableReference: AttributeInfo.createType(VariableReferenceEntity),
+        SelfContextInfo: AttributeInfo.createType(SymbolEntity),
         DelegatePropertyName: AttributeInfo.createType(String),
-        DelegateReference: AttributeInfo.createType(VariableReferenceEntity),
-        EnabledState: AttributeInfo.createType(IdentifierEntity),
+        DelegateOwnerClass: AttributeInfo.createType(ObjectReferenceEntity),
+        ComponentPropertyName: AttributeInfo.createType(String),
+        EventReference: AttributeInfo.createType(FunctionReferenceEntity),
+        FunctionReference: AttributeInfo.createType(FunctionReferenceEntity),
+        CustomFunctionName: AttributeInfo.createType(String),
+        TargetType: AttributeInfo.createType(ObjectReferenceEntity),
+        MacroGraphReference: AttributeInfo.createType(MacroGraphReferenceEntity),
         Enum: AttributeInfo.createType(ObjectReferenceEntity),
         EnumEntries: new AttributeInfo({
             type: [String],
             inlined: true,
         }),
-        ErrorMsg: AttributeInfo.createType(String),
-        ErrorType: AttributeInfo.createType(IntegerEntity),
-        EventReference: AttributeInfo.createType(FunctionReferenceEntity),
-        ExportPath: AttributeInfo.createType(ObjectReferenceEntity),
-        FunctionReference: AttributeInfo.createType(FunctionReferenceEntity),
-        Graph: AttributeInfo.createType(ObjectReferenceEntity),
-        HiGenGridSize: AttributeInfo.createType(SymbolEntity),
-        InputAxisKey: AttributeInfo.createType(SymbolEntity),
         InputKey: AttributeInfo.createType(SymbolEntity),
-        InputName: AttributeInfo.createType(String),
+        MaterialFunction: AttributeInfo.createType(ObjectReferenceEntity),
+        bOverrideFunction: AttributeInfo.createType(Boolean),
+        bInternalEvent: AttributeInfo.createType(Boolean),
+        bConsumeInput: AttributeInfo.createType(Boolean),
+        bExecuteWhenPaused: AttributeInfo.createType(Boolean),
+        bOverrideParentBinding: AttributeInfo.createType(Boolean),
+        bControl: AttributeInfo.createType(Boolean),
+        bAlt: AttributeInfo.createType(Boolean),
+        bShift: AttributeInfo.createType(Boolean),
+        bCommand: AttributeInfo.createType(Boolean),
+        CommentColor: AttributeInfo.createType(LinearColorEntity),
+        bCommentBubbleVisible_InDetailsPanel: AttributeInfo.createType(Boolean),
+        bColorCommentBubble: AttributeInfo.createType(Boolean),
+        ProxyFactoryFunctionName: AttributeInfo.createType(String),
+        ProxyFactoryClass: AttributeInfo.createType(ObjectReferenceEntity),
+        ProxyClass: AttributeInfo.createType(ObjectReferenceEntity),
+        StructType: AttributeInfo.createType(ObjectReferenceEntity),
+        MaterialExpression: AttributeInfo.createType(ObjectReferenceEntity),
+        MaterialExpressionComment: AttributeInfo.createType(ObjectReferenceEntity),
+        MoveMode: AttributeInfo.createType(SymbolEntity),
+        TimelineName: AttributeInfo.createType(String),
+        TimelineGuid: AttributeInfo.createType(GuidEntity),
+        SizeX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        SizeY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        Text: AttributeInfo.createType(new MirroredEntity(String)),
+        MaterialExpressionEditorX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        MaterialExpressionEditorY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        NodeTitle: AttributeInfo.createType(String),
+        NodeTitleColor: AttributeInfo.createType(LinearColorEntity),
+        PositionX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        PositionY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
+        SettingsInterface: AttributeInfo.createType(ObjectReferenceEntity),
+        PCGNode: AttributeInfo.createType(ObjectReferenceEntity),
+        HiGenGridSize: AttributeInfo.createType(SymbolEntity),
+        Operation: AttributeInfo.createType(SymbolEntity),
+        NodePosX: AttributeInfo.createType(IntegerEntity),
+        NodePosY: AttributeInfo.createType(IntegerEntity),
+        NodeHeight: AttributeInfo.createType(IntegerEntity),
+        NodeWidth: AttributeInfo.createType(IntegerEntity),
+        Graph: AttributeInfo.createType(ObjectReferenceEntity),
+        SubgraphInstance: AttributeInfo.createType(String),
         InputPins: new AttributeInfo({
             type: [ObjectReferenceEntity],
             inlined: true,
         }),
-        InputType: AttributeInfo.createType(SymbolEntity),
-        MacroGraphReference: AttributeInfo.createType(MacroGraphReferenceEntity),
-        MaterialExpression: AttributeInfo.createType(ObjectReferenceEntity),
-        MaterialExpressionComment: AttributeInfo.createType(ObjectReferenceEntity),
-        MaterialExpressionEditorX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        MaterialExpressionEditorY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        MaterialFunction: AttributeInfo.createType(ObjectReferenceEntity),
-        MoveMode: AttributeInfo.createType(SymbolEntity),
-        Name: AttributeInfo.createType(String),
-        Node: AttributeInfo.createType(new MirroredEntity(ObjectReferenceEntity)),
-        NodeComment: AttributeInfo.createType(String),
-        NodeGuid: AttributeInfo.createType(GuidEntity),
-        NodeHeight: AttributeInfo.createType(IntegerEntity),
-        NodePosX: AttributeInfo.createType(IntegerEntity),
-        NodePosY: AttributeInfo.createType(IntegerEntity),
-        NodeTitle: AttributeInfo.createType(String),
-        NodeTitleColor: AttributeInfo.createType(LinearColorEntity),
-        NodeWidth: AttributeInfo.createType(IntegerEntity),
-        NumAdditionalInputs: AttributeInfo.createType(Number),
-        ObjectRef: AttributeInfo.createType(ObjectReferenceEntity),
-        Operation: AttributeInfo.createType(SymbolEntity),
         OutputPins: new AttributeInfo({
             type: [ObjectReferenceEntity],
             inlined: true,
         }),
-        PCGNode: AttributeInfo.createType(ObjectReferenceEntity),
-        PinNames: new AttributeInfo({
-            type: [String],
-            inlined: true,
-        }),
-        PinTags: new AttributeInfo({
-            type: [null],
-            inlined: true,
-        }),
-        PositionX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        PositionY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        ProxyClass: AttributeInfo.createType(ObjectReferenceEntity),
-        ProxyFactoryClass: AttributeInfo.createType(ObjectReferenceEntity),
-        ProxyFactoryFunctionName: AttributeInfo.createType(String),
-        SelfContextInfo: AttributeInfo.createType(SymbolEntity),
-        SettingsInterface: AttributeInfo.createType(ObjectReferenceEntity),
-        SizeX: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        SizeY: AttributeInfo.createType(new MirroredEntity(IntegerEntity)),
-        StructType: AttributeInfo.createType(ObjectReferenceEntity),
-        SubgraphInstance: AttributeInfo.createType(String),
-        TargetType: AttributeInfo.createType(ObjectReferenceEntity),
-        Text: AttributeInfo.createType(new MirroredEntity(String)),
-        TimelineGuid: AttributeInfo.createType(GuidEntity),
-        TimelineName: AttributeInfo.createType(String),
-        VariableReference: AttributeInfo.createType(VariableReferenceEntity),
+        bExposeToLibrary: AttributeInfo.createType(Boolean),
+        bCanRenameNode: AttributeInfo.createType(Boolean),
+        bCommentBubblePinned: AttributeInfo.createType(Boolean),
+        bCommentBubbleVisible: AttributeInfo.createType(Boolean),
+        NodeComment: AttributeInfo.createType(String),
+        AdvancedPinDisplay: AttributeInfo.createType(IdentifierEntity),
+        DelegateReference: AttributeInfo.createType(VariableReferenceEntity),
+        EnabledState: AttributeInfo.createType(IdentifierEntity),
+        NodeGuid: AttributeInfo.createType(GuidEntity),
+        ErrorType: AttributeInfo.createType(IntegerEntity),
+        ErrorMsg: AttributeInfo.createType(String),
+        Node: AttributeInfo.createType(new MirroredEntity(ObjectReferenceEntity)),
+        CustomProperties: AttributeInfo.createType([new Union(PinEntity, UnknownPinEntity)]),
     }
     static nameRegex = /^(\w+?)(?:_(\d+))?$/
     static sequencerScriptingNameRegex = /\/Script\/SequencerScripting\.MovieSceneScripting(.+)Channel/
@@ -205,6 +209,7 @@ export default class ObjectEntity extends IEntity {
                                 if (!values.attributes) {
                                     IEntity.defineAttributes(values, {})
                                 }
+                                Utility.objectSet(values, ["attributes", symbol, "type"], [currentValue.constructor])
                                 Utility.objectSet(values, ["attributes", symbol, "inlined"], true)
                             }
                         }
@@ -280,23 +285,18 @@ export default class ObjectEntity extends IEntity {
             .map(([_0, first, remaining, _4]) => [first, ...remaining])
     }
 
+    /** @type {String} */
+    #class
+
     constructor(values = {}, suppressWarns = false) {
-        let keys = Object.keys(values)
-        if (keys.some(k => k.startsWith(Configuration.subObjectAttributeNamePrefix))) {
-            let subObjectsValues = keys
-                .filter(k => k.startsWith(Configuration.subObjectAttributeNamePrefix))
-                .reduce(
-                    (acc, k) => {
-                        acc[k] = values[k]
-                        return acc
-                    },
-                    {}
-                )
-            // Reorder sub objects to be the first entries
-            values = {
-                ...subObjectsValues,
-                ...values,
-            }
+        if ("NodePosX" in values !== "NodePosY" in values) {
+            const entries = Object.entries(values)
+            const [key, position] = "NodePosX" in values
+                ? ["NodePosY", Object.keys(values).indexOf("NodePosX") + 1]
+                : ["NodePosX", Object.keys(values).indexOf("NodePosY")]
+            const entry = [key, new (AttributeInfo.getAttribute(values, key, "type", ObjectEntity))()]
+            entries.splice(position, 0, entry)
+            values = Object.fromEntries(entries)
         }
         super(values, suppressWarns)
 
@@ -368,25 +368,20 @@ export default class ObjectEntity extends IEntity {
         /** @type {VariableReferenceEntity} */ this.DelegateReference
         /** @type {VariableReferenceEntity} */ this.VariableReference
 
-        // Legacy nodes cleanup
+        // Legacy nodes pins
         if (this["Pins"] instanceof Array) {
-            this["Pins"]
-                .forEach(
-                    /** @param {ObjectReferenceEntity} objectReference */
-                    objectReference => {
-                        const pinObject = this[Configuration.subObjectAttributeNameFromReference(objectReference, true)]
-                        if (pinObject) {
-                            const pinEntity = PinEntity.fromLegacyObject(pinObject)
-                            pinEntity.LinkedTo = []
-                            this.getCustomproperties(true).push(pinEntity)
-                        }
-                    })
-            delete this["Pins"]
-        }
-        this.Class?.sanitize()
-        if (this.MacroGraphReference) {
-            this.MacroGraphReference.MacroGraph?.sanitize()
-            this.MacroGraphReference.GraphBlueprint?.sanitize()
+            this["Pins"].forEach(
+                /** @param {ObjectReferenceEntity} objectReference */
+                objectReference => {
+                    const pinObject = this[Configuration.subObjectAttributeNameFromReference(objectReference, true)]
+                    if (pinObject) {
+                        const pinEntity = PinEntity.fromLegacyObject(pinObject)
+                        pinEntity.LinkedTo = []
+                        this.getCustomproperties(true).push(pinEntity)
+                        Utility.objectSet(this, ["attributes", "CustomProperties", "ignored"], true)
+                    }
+                }
+            )
         }
         /** @type {ObjectEntity} */
         const materialSubobject = this.getMaterialSubobject()
@@ -447,9 +442,19 @@ export default class ObjectEntity extends IEntity {
     }
 
     getClass() {
-        return (this.Class?.path ? this.Class.path : this.Class?.type)
-            ?? (this.ExportPath?.path ? this.ExportPath.path : this.ExportPath?.type)
-            ?? ""
+        if (!this.#class) {
+            this.#class = (this.Class?.path ? this.Class.path : this.Class?.type)
+                ?? (this.ExportPath?.path ? this.ExportPath.path : this.ExportPath?.type)
+                ?? ""
+            if (this.#class && !this.#class.startsWith("/")) {
+                // Old path names did not start with /Script or /Engine, check tests/resources/LegacyNodes.js
+                let path = Object.values(Configuration.paths).find(path => path.endsWith("." + this.#class))
+                if (path) {
+                    this.#class = path
+                }
+            }
+        }
+        return this.#class
     }
 
     getType() {
@@ -1246,7 +1251,7 @@ export default class ObjectEntity extends IEntity {
                 newPin.PinId = GuidEntity.generateGuid()
                 newPin.PinName = pinNameFromIndex(index, min, max)
                 newPin.PinToolTip = undefined
-                this.CustomProperties.push(newPin)
+                this.getCustomproperties(true).push(newPin)
                 return newPin
             }
         }

js/entity/ObjectReferenceEntity.js

@@ -74,20 +74,6 @@ export default class ObjectReferenceEntity extends IEntity {
         return new ObjectReferenceEntity({ type: "None", path: "" })
     }
 
-    sanitize() {
-        if (this.type && !this.type.startsWith("/")) {
-            let deprecatedType = this.type + "_Deprecated"
-            let path = Object.keys(Configuration.paths)
-                .find(type => {
-                    const name = Utility.getNameFromPath(Configuration.paths[type])
-                    return name === this.type || name === deprecatedType
-                })
-            if (path) {
-                this.type = Configuration.paths[path]
-            }
-        }
-    }
-
     getName() {
         return Utility.getNameFromPath(this.path.replace(/_C$/, ""))
     }

js/entity/objects/KnotEntity.js

@@ -13,9 +13,7 @@ export default class KnotEntity extends ObjectEntity {
         values.Class = new ObjectReferenceEntity(Configuration.paths.knot)
         values.Name = "K2Node_Knot"
         const inputPinEntity = new PinEntity(
-            {
-                PinName: "InputPin",
-            },
+            { PinName: "InputPin" },
             true
         )
         const outputPinEntity = new PinEntity(
@@ -29,7 +27,7 @@ export default class KnotEntity extends ObjectEntity {
             inputPinEntity.copyTypeFrom(pinReferenceForType)
             outputPinEntity.copyTypeFrom(pinReferenceForType)
         }
-        values.CustomProperties = [inputPinEntity, outputPinEntity]
+        values["CustomProperties"] = [inputPinEntity, outputPinEntity]
         super(values, true)
     }
 }

js/serialization/ObjectSerializer.js

@@ -1,4 +1,5 @@
 import Configuration from "../Configuration.js"
+import AttributeInfo from "../entity/AttributeInfo.js"
 import ObjectEntity from "../entity/ObjectEntity.js"
 import PinEntity from "../entity/PinEntity.js"
 import Grammar from "./Grammar.js"
@@ -88,13 +89,15 @@ export default class ObjectSerializer extends Serializer {
                 attributeValueConjunctionSign,
                 key => entity[key] instanceof ObjectEntity ? "" : attributeKeyPrinter(key)
             )
-            + entity.getCustomproperties().map(pin =>
-                moreIndentation
-                + attributeKeyPrinter("CustomProperties ")
-                + SerializerFactory.getSerializer(PinEntity).doWrite(pin, insideString)
-                + this.attributeSeparator
+            + (!AttributeInfo.getAttribute(entity, "CustomProperties", "ignored")
+                ? entity.getCustomproperties().map(pin =>
+                    moreIndentation
+                    + attributeKeyPrinter("CustomProperties ")
+                    + SerializerFactory.getSerializer(PinEntity).doWrite(pin, insideString)
+                    + this.attributeSeparator
+                ).join("")
+                : ""
             )
-                .join("")
             + indentation + "End Object"
         return result
     }

tests/entities.spec.js

@@ -173,14 +173,14 @@ test("Entity5", () => {
         EntityF,
         new Serializer(UnknownKeysEntity, (entity, string) => `${entity.lookbehind ?? ""}(${string})`)
     )
-    expect(entity = SerializerFactory.getSerializer(Entity5).read(entity5Value1)).toEqual({
+    expect(entity = SerializerFactory.getSerializer(Entity5).read(entity5Value1)).toEqual(new Entity5({
         key1: "Value 1",
-        key2: {
+        key2: new EntityF({
             lookbehind: "Foo",
             arg1: 55,
             arg2: "Argument 2",
-        },
-    })
+        }),
+    }))
     expect(entity.key2).toBeInstanceOf(EntityF)
     expect(SerializerFactory.getSerializer(Entity5).write(entity)).toBe(entity5Value1)
 })

tests/nodes.spec.js

@@ -43,6 +43,7 @@ for (const nodeTest of nodeTests) {
                 }
             )
         }
+
         test(
             `${nodeTest.name}: Has correct delegate`,
             async ({ blueprintPage }) => {
@@ -56,6 +57,7 @@ for (const nodeTest of nodeTests) {
                 }
             }
         )
+
         if (nodeTest.title) {
             test(
                 `${nodeTest.name}: Has title ${nodeTest.title}`,
@@ -64,6 +66,7 @@ for (const nodeTest of nodeTests) {
                 ).toBe(nodeTest.title)
             )
         }
+
         if (nodeTest.subtitle) {
             test(
                 `${nodeTest.name}: Has expected subtitle ${nodeTest.subtitle}`,
@@ -71,6 +74,7 @@ for (const nodeTest of nodeTests) {
                     .toHaveText(nodeTest.subtitle, { useInnerText: true })
             )
         }
+
         if (nodeTest.size) {
             test(
                 `${nodeTest.name}: Has approximately the expected size`,
@@ -94,6 +98,7 @@ for (const nodeTest of nodeTests) {
                 }
             )
         }
+
         if (nodeTest.icon !== undefined) {
             test(
                 `${nodeTest.name}: Has the correct icon`,
@@ -104,6 +109,7 @@ for (const nodeTest of nodeTests) {
                 ).toBe(nodeTest.icon?.strings.join(""))
             )
         }
+
         if (nodeTest.pins !== undefined) {
             test(
                 `${nodeTest.name}: Has ${nodeTest.pins} pins`,
@@ -114,6 +120,7 @@ for (const nodeTest of nodeTests) {
                 ).toBe(nodeTest.pins)
             )
         }
+
         if (nodeTest.pinNames) {
             test(
                 `${nodeTest.name}: Has correct pin names`,
@@ -124,12 +131,14 @@ for (const nodeTest of nodeTests) {
                 }
             )
         }
+
         test(
             `${nodeTest.name}: Expected development`,
             async ({ blueprintPage }) => expect(
                 await blueprintPage.node.evaluate(node => node.entity.isDevelopmentOnly())
             ).toBe(nodeTest.development)
         )
+
         test(
             `${nodeTest.name}: Maintains the order of attributes`,
             async ({ blueprintPage }) => {
@@ -144,6 +153,7 @@ for (const nodeTest of nodeTests) {
                 expect(serialized).toMatch(Utility.getFirstWordOrder(words))
             }
         )
+
         if (nodeTest.variadic) {
             test(
                 `${nodeTest.name}: Can add new pins`,
@@ -155,6 +165,7 @@ for (const nodeTest of nodeTests) {
                 }
             )
         }
+
         if (nodeTest.additionalTest) {
             test(
                 `${nodeTest.name}: Additional tests`,

tests/resources/Entity5.js

@@ -1,4 +1,5 @@
 import AttributeInfo from "../../js/entity/AttributeInfo.js"
+import IntegerEntity from "../../js/entity/IntegerEntity.js"
 import ObjectEntity from "../../js/entity/ObjectEntity.js"
 import EntityF from "./EntityF.js"
 
@@ -8,6 +9,11 @@ export default class Entity5 extends ObjectEntity {
     static attributes = {
         key1: AttributeInfo.createType(String),
         key2: AttributeInfo.createType(EntityF),
+        key3: new AttributeInfo({
+            type: IntegerEntity,
+            default: new IntegerEntity(5),
+            silent: true,
+        }),
     }
     static grammar = this.createGrammar()
 }

tests/resources/FlowControlNodes.js

@@ -387,6 +387,7 @@ export default class FlowControlNodes extends NodeTests {
                         PinNames(13)="Case_13"
                         PinNames(14)="Case_14"
                         NodePosX=-512
+                        NodePosY=-384
                         NodeGuid=ED658BB7B62F438C9C4C8241FE7333E0
                         CustomProperties Pin (PinId=6272078D163F42A0972D3D5DE4267F93,PinName="Default",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=3C1FB3CA71024EC183146491615C75D6,PinName="execute",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)

tests/resources/InputNodes.js

@@ -183,6 +183,7 @@ export default class InputNodes extends NodeTests {
                     Begin Object Class=/Script/InputBlueprintNodes.K2Node_InputDebugKey Name="K2Node_InputDebugKey_10"
                         InputKey=Touch10
                         NodePosX=192
+                        NodePosY=-304
                         NodeGuid=85DC056DAA9A4DB78F7883B8F67DCF59
                         CustomProperties Pin (PinId=267ABB8DF21844FB8F6E0CFA990C4E5E,PinName="Pressed",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=3FF391B8B11F4F26828B55863EFB48FD,PinName="Released",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -296,6 +297,7 @@ export default class InputNodes extends NodeTests {
                         EventReference=(MemberParent=/Script/CoreUObject.Package'"/Script/Engine"')
                         CustomFunctionName="InpAxisKeyEvt_MouseWheelAxis_K2Node_InputAxisKeyEvent_2"
                         NodePosX=240
+                        NodePosY=-192
                         NodeGuid=E3FF073E85B34FC4B188CD7BD68D6B9B
                         CustomProperties Pin (PinId=5770618DFA054880BF33DD39844DE3F8,PinName="OutputDelegate",Direction="EGPD_Output",PinType.PinCategory="delegate",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(MemberParent=/Script/Engine.BlueprintGeneratedClass'"/Temp/Untitled_1.Untitled_C"',MemberName="InpAxisKeyEvt_MouseWheelAxis_K2Node_InputAxisKeyEvent_2"),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=AEC4EBC2FF5744538B93F21321891828,PinName="then",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -512,6 +514,7 @@ export default class InputNodes extends NodeTests {
                     Begin Object Class=/Script/BlueprintGraph.K2Node_InputKey Name="K2Node_InputKey_2"
                         InputKey=Three
                         NodePosX=-288
+                        NodePosY=240
                         NodeGuid=86A598DB8EA1471C854A3233595FDD72
                         CustomProperties Pin (PinId=14495EF676334DE08F813AE8B458849A,PinName="Pressed",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=0B11504E947F4FF184AC6371CB59D825,PinName="Released",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -532,6 +535,7 @@ export default class InputNodes extends NodeTests {
                     Begin Object Class=/Script/BlueprintGraph.K2Node_InputKey Name="K2Node_InputKey_4"
                         InputKey=Four
                         NodePosX=416
+                        NodePosY=16
                         NodeGuid=C0E7B79B3B85408C9FFAFE71B71FD21F
                         CustomProperties Pin (PinId=28E3A745210949D0864CC441BB0F529C,PinName="Pressed",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=F8A89129B85C44CABFC5082369EEDA65,PinName="Released",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -678,6 +682,7 @@ export default class InputNodes extends NodeTests {
                 value: String.raw`
                     Begin Object Class=/Script/InputBlueprintNodes.K2Node_InputDebugKey Name="K2Node_InputDebugKey_2"
                         InputKey=Four
+                        NodePosX=32
                         NodePosY=160
                         NodeGuid=10A6E414241D451ABCCDD93A5DC731EC
                         CustomProperties Pin (PinId=2F11C0CFA4334DC69E85B9E319A4535D,PinName="Pressed",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -700,6 +705,7 @@ export default class InputNodes extends NodeTests {
                     Begin Object Class=/Script/BlueprintGraph.K2Node_InputKey Name="K2Node_InputKey_9"
                         InputKey=NumPadOne
                         NodePosX=-240
+                        NodePosY=64
                         NodeGuid=1B61D1A914354095A8A8420B68656463
                         CustomProperties Pin (PinId=2F18160D6E56431D8A81ACD578E0131C,PinName="Pressed",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=0957F9CBAC034E2EBD87B15904B75FF1,PinName="Released",Direction="EGPD_Output",PinType.PinCategory="exec",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)

tests/resources/IssuesNodes1.js

@@ -57,7 +57,7 @@ export default class IssuesNodes1 extends NodeTests {
                     }
                     await relevantPins[0].locator('input[type="checkbox"]').uncheck() // Uncheck "R"
                     await relevantPins[2].locator('input[type="checkbox"]').check() // Check "B"
-                    await relevantPins[4].locator('input[type="checkbox"]').check() // Check "A"
+                    await relevantPins[3].locator('input[type="checkbox"]').check() // Check "A"
                     await relevantPins[2].locator('input[type="checkbox"]').uncheck() // Uncheck "B"
                     await relevantPins[2].locator('input[type="checkbox"]').check() // Check "B"
                     expect(node.locator(".ueb-node-name")).toHaveText("Mask ( B A )")
@@ -83,10 +83,10 @@ export default class IssuesNodes1 extends NodeTests {
                             AdvancedPinDisplay=Shown
                             NodeGuid=54A40610EEC646A0954F310727D1B888
                             CustomProperties Pin (PinId=DC3859AB4C8C12645EEA1AA4E500A637,PinName="Input",PinFriendlyName=NSLOCTEXT("MaterialGraphNode", "Space", " "),PinType.PinCategory="required",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
-                            CustomProperties Pin (PinId=D5C8F4DF4AFE5EEB605ED382CD5744DE,PinName="R",PinType.PinCategory="optional",PinType.PinSubCategory="bool",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="true",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=True,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
+                            CustomProperties Pin (PinId=D5C8F4DF4AFE5EEB605ED382CD5744DE,PinName="R",PinType.PinCategory="optional",PinType.PinSubCategory="bool",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="false",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=True,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
                             CustomProperties Pin (PinId=7E43455B4D2232C4E99BB098631CAFCE,PinName="G",PinType.PinCategory="optional",PinType.PinSubCategory="bool",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="false",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=True,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
-                            CustomProperties Pin (PinId=46CEC6754365CB39F9FC39944B40D5C6,PinName="B",PinType.PinCategory="optional",PinType.PinSubCategory="bool",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="false",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=True,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
-                            CustomProperties Pin (PinId=F658E76C400B0AF242DFE292C92702C8,PinName="A",PinType.PinCategory="optional",PinType.PinSubCategory="bool",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="false",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=True,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
+                            CustomProperties Pin (PinId=46CEC6754365CB39F9FC39944B40D5C6,PinName="B",PinType.PinCategory="optional",PinType.PinSubCategory="bool",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="true",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=True,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
+                            CustomProperties Pin (PinId=F658E76C400B0AF242DFE292C92702C8,PinName="A",PinType.PinCategory="optional",PinType.PinSubCategory="bool",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="true",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=True,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=True,bOrphanedPin=False,)
                             CustomProperties Pin (PinId=2EC8C8234D570AB2A03DB59A1FF65987,PinName="Output",PinFriendlyName=NSLOCTEXT("MaterialGraphNode", "Space", " "),Direction="EGPD_Output",PinType.PinCategory="",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         End Object
                     `

tests/resources/LegacyNodes.js

@@ -1,6 +1,5 @@
 import Configuration from "../../js/Configuration.js"
 import SVGIcon from "../../js/SVGIcon.js"
-import { expect } from "../fixtures/test.js"
 import NodeTests from "./NodeTests.js"
 
 export default class LegacyNodes extends NodeTests {
@@ -58,29 +57,6 @@ export default class LegacyNodes extends NodeTests {
                 pinNames: ["A", "B", "Is A"],
                 delegate: false,
                 development: false,
-                additionalTest: async node => {
-                    expect(await node.evaluate(node => node.entity.Class.type))
-                        .toBe("/Script/BlueprintGraph.K2Node_MacroInstance")
-                    expect(await node.evaluate(node => node.entity.MacroGraphReference.MacroGraph.type))
-                        .toBe("/Script/Engine.EdGraph")
-                    expect(await node.evaluate(node => node.entity.MacroGraphReference.MacroGraph.path))
-                        .toBe("/Engine/EditorBlueprintResources/StandardMacros.StandardMacros:FlipFlop")
-                    expect(await node.evaluate(node => node.entity.MacroGraphReference.GraphBlueprint.type))
-                        .toBe("/Script/Engine.Blueprint")
-                    expect(await node.evaluate(node => node.entity.MacroGraphReference.GraphBlueprint.path))
-                        .toBe("/Engine/EditorBlueprintResources/StandardMacros.StandardMacros")
-                    expect(await node.evaluate(
-                        (node, subObjectAttributeNamePrefix) => Object.keys(node.entity)
-                            .filter(k => k.startsWith(subObjectAttributeNamePrefix))
-                            .map(k => /** @type {ObjectEntity} */(node.entity[k]))
-                            .filter(v => v.Class)
-                            .map(objectEntity => objectEntity.getType())
-                        ,
-                        Configuration.subObjectAttributeNamePrefix
-                    ))
-                        .toStrictEqual(Array(4).fill(Configuration.paths.edGraphPinDeprecated))
-                    expect(await node.evaluate(node => node.getPinEntities().length)).toBe(4)
-                }
             },
         ])
     }

tests/resources/MaterialNodes.js

@@ -77,7 +77,7 @@ export default class MaterialNodes extends NodeTests {
                 }
             },
             {
-                name: "Constance2Vector",
+                name: "Constant2Vector",
                 title: "0.1,23.9",
                 value: String.raw`
                     Begin Object Class=/Script/UnrealEd.MaterialGraphNode Name="MaterialGraphNode_42" ExportPath=/Script/UnrealEd.MaterialGraphNode'"/Engine/Transient.M_Brick_Cut_Stone:MaterialGraph_0.MaterialGraphNode_42"'

tests/resources/OperationsNodes.js

@@ -1,5 +1,4 @@
 import SVGIcon from "../../js/SVGIcon.js"
-import PinElement from "../../js/element/PinElement.js"
 import { expect } from "../fixtures/test.js"
 import NodeTests from "./NodeTests.js"
 
@@ -14,6 +13,7 @@ export default class OperationsNodes extends NodeTests {
                         bIsPureFunc=True
                         FunctionReference=(MemberParent=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',MemberName="Less_TimespanTimespan")
                         NodePosX=-192
+                        NodePosY=256
                         NodeGuid=2CF3423BF9604C71957BE3EFDFD9DAFF
                         CustomProperties Pin (PinId=84732B8AE02247EB898E6FB149457E6A,PinName="A",PinType.PinCategory="wildcard",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=8218DDBA01704149AD5FE655CE9FAD07,PinName="B",PinType.PinCategory="wildcard",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -92,6 +92,7 @@ export default class OperationsNodes extends NodeTests {
                         "bIsPureFunc"=True
                         "FunctionReference"=(MemberParent=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',MemberName="Greater_TimespanTimespan")
                         "NodePosX"=-288
+                        "NodePosY"=256
                         "NodeGuid"=F7FABC9C44966BAAC491D4AE6E588CCC
                         CustomProperties Pin (PinId=E5B7684F4812610A60F5E8A1217BD592,PinName="A",PinType.PinCategory="wildcard",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=62516570444A943984F804A683C737A1,PinName="B",PinType.PinCategory="wildcard",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -255,6 +256,7 @@ export default class OperationsNodes extends NodeTests {
                         bIsPureFunc=True
                         FunctionReference=(MemberParent=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',MemberName="Or_IntInt")
                         NodePosX=-128
+                        NodePosY=16
                         NodeGuid=06CD76925AB9409989EA7D87CE23D6F5
                         CustomProperties Pin (PinId=F8954C94C4174CDD84E8B12E07AF3C8E,PinName="self",PinFriendlyName=NSLOCTEXT("K2Node", "Target", "Target"),PinToolTip="Target\nKismet Math Library Object Reference",PinType.PinCategory="object",PinType.PinSubCategory="",PinType.PinSubCategoryObject=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultObject="/Script/Engine.Default__KismetMathLibrary",PersistentGuid=00000000000000000000000000000000,bHidden=True,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=13660D801D69401399CD1A1F5A35433B,PinName="A",PinToolTip="A\nInteger",PinType.PinCategory="int",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="0",AutogeneratedDefaultValue="0",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -286,6 +288,7 @@ export default class OperationsNodes extends NodeTests {
                         bIsPureFunc=True
                         FunctionReference=(MemberParent=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',MemberName="Or_Int64Int64")
                         NodePosX=128
+                        NodePosY=64
                         NodeGuid=490A54B477EA44128BA4024490F503F3
                         CustomProperties Pin (PinId=EE1E4196F1554E14A0288F9F68BF25D9,PinName="self",PinFriendlyName=NSLOCTEXT("K2Node", "Target", "Target"),PinToolTip="Target\nKismet Math Library Object Reference",PinType.PinCategory="object",PinType.PinSubCategory="",PinType.PinSubCategoryObject=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultObject="/Script/Engine.Default__KismetMathLibrary",PersistentGuid=00000000000000000000000000000000,bHidden=True,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=64AB191561114DA58FA423353A7EAA14,PinName="A",PinToolTip="A\nInteger64",PinType.PinCategory="int64",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="0",AutogeneratedDefaultValue="0",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -368,6 +371,7 @@ export default class OperationsNodes extends NodeTests {
                         bIsPureFunc=True
                         FunctionReference=(MemberParent=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',MemberName="Xor_IntInt")
                         NodePosX=-128
+                        NodePosY=32
                         NodeGuid=81529F08A6E045D6BD6C8BF368729C14
                         CustomProperties Pin (PinId=1C2B19C61AC54A92835DDA0AD0750F2E,PinName="self",PinFriendlyName=NSLOCTEXT("K2Node", "Target", "Target"),PinToolTip="Target\nKismet Math Library Object Reference",PinType.PinCategory="object",PinType.PinSubCategory="",PinType.PinSubCategoryObject=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultObject="/Script/Engine.Default__KismetMathLibrary",PersistentGuid=00000000000000000000000000000000,bHidden=True,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=153EAE01EAD44FBC9A23A088F3F2BCDD,PinName="A",PinToolTip="A\nInteger",PinType.PinCategory="int",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="0",AutogeneratedDefaultValue="0",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -396,6 +400,7 @@ export default class OperationsNodes extends NodeTests {
                         bIsPureFunc=True
                         FunctionReference=(MemberParent=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',MemberName="Xor_Int64Int64")
                         NodePosX=128
+                        NodePosY=256
                         NodeGuid=A95FABA8132C4BC0B4E35D2CAB877B7D
                         CustomProperties Pin (PinId=93AD25D5F9E846CFA01F5684AA015EFA,PinName="self",PinFriendlyName=NSLOCTEXT("K2Node", "Target", "Target"),PinToolTip="Target\nKismet Math Library Object Reference",PinType.PinCategory="object",PinType.PinSubCategory="",PinType.PinSubCategoryObject=/Script/CoreUObject.Class'"/Script/Engine.KismetMathLibrary"',PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultObject="/Script/Engine.Default__KismetMathLibrary",PersistentGuid=00000000000000000000000000000000,bHidden=True,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=06FE8043E6454053B2F89474C4C028B5,PinName="A",PinToolTip="A\nInteger64",PinType.PinCategory="int64",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,DefaultValue="0",AutogeneratedDefaultValue="0",PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
@@ -449,6 +454,7 @@ export default class OperationsNodes extends NodeTests {
                         "bIsPureFunc"=True
                         "FunctionReference"=(MemberParent=/Script/CoreUObject.Class'"/Script/GameplayTags.BlueprintGameplayTagLibrary"',MemberName="NotEqual_GameplayTagContainer")
                         "NodePosX"=-256
+                        "NodePosY"=128
                         "NodeGuid"=29F5E14B4509543D59F652854F3B6AB6
                         CustomProperties Pin (PinId=815D7F344EC326D3E021F68BB4D9B3AD,PinName="A",PinToolTip="A\nWildcard",PinType.PinCategory="wildcard",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)
                         CustomProperties Pin (PinId=3B762DCB4AA262D90BA202939BDB049D,PinName="B",PinToolTip="B\nWildcard",PinType.PinCategory="wildcard",PinType.PinSubCategory="",PinType.PinSubCategoryObject=None,PinType.PinSubCategoryMemberReference=(),PinType.PinValueType=(),PinType.ContainerType=None,PinType.bIsReference=False,PinType.bIsConst=False,PinType.bIsWeakPointer=False,PinType.bIsUObjectWrapper=False,PinType.bSerializeAsSinglePrecisionFloat=False,PersistentGuid=00000000000000000000000000000000,bHidden=False,bNotConnectable=False,bDefaultValueIsReadOnly=False,bDefaultValueIsIgnored=False,bAdvancedView=False,bOrphanedPin=False,)