Refactoring

js/serialization/CustomSerializer.js

@@ -1,14 +1,14 @@
-import GeneralSerializer from "./GeneralSerializer"
-
-export default class CustomSerializer extends GeneralSerializer {
-
-    constructor(objectWriter, entityType) {
-        super(undefined, entityType)
-        this.objectWriter = objectWriter
-    }
-
-    write(object) {
-        let result = this.objectWriter(object)
-        return result
-    }
-}
+import GeneralSerializer from "./GeneralSerializer"
+
+export default class CustomSerializer extends GeneralSerializer {
+
+    constructor(objectWriter, entityType) {
+        super(undefined, entityType)
+        this.objectWriter = objectWriter
+    }
+
+    write(object) {
+        let result = this.objectWriter(object)
+        return result
+    }
+}

js/serialization/Grammar.js

@@ -113,25 +113,28 @@ export default class Grammar {
         }
     }
     // Meta grammar
-    static CreateAttributeGrammar = (r, attributeGrammar, attributeSupplier, valueSeparator = P.string("=").trim(P.optWhitespace)) =>
-        attributeGrammar.skip(valueSeparator)
+    static CreateAttributeGrammar = (r, entityType, valueSeparator = P.string("=").trim(P.optWhitespace)) =>
+        r.AttributeName.skip(valueSeparator)
             .chain(attributeName => {
                 const attributeKey = attributeName.split(".")
-                const attribute = attributeSupplier(attributeKey)
+                const attribute = Utility.objectGet(entityType.attributes, attributeKey)
                 let attributeValueGrammar = Grammar.getGrammarForType(r, attribute, r.AttributeAnyValue)
+                // Returns attributeSetter: a function called with an object as argument that will set the correct attribute value
                 return attributeValueGrammar.map(attributeValue =>
                     entity => Utility.objectSet(entity, attributeKey, attributeValue, true)
-                ) // returns attributeSetter:  a function called with an object as argument that will set the correct attribute value
+                )
             })
     // Meta grammar
-    static CreateMultiAttributeGrammar = (r, keyGrammar, entityType, attributeSupplier) =>
+    static CreateMultiAttributeGrammar = (r, entityType) =>
         /**
          * Basically this creates a parser that looks for a string like 'Key (A=False,B="Something",)'
          * Then it populates an object of type EntityType with the attribute values found inside the parentheses.
          */
         P.seqMap(
-            P.seq(keyGrammar, P.optWhitespace, P.string("(")),
-            Grammar.CreateAttributeGrammar(r, r.AttributeName, attributeSupplier)
+            entityType.lookbehind
+                ? P.seq(P.string(entityType.lookbehind), P.optWhitespace, P.string("("))
+                : P.string("("),
+            Grammar.CreateAttributeGrammar(r, entityType)
                 .trim(P.optWhitespace)
                 .sepBy(P.string(","))
                 .skip(P.regex(/,?/).then(P.optWhitespace)), // Optional trailing comma
@@ -141,18 +144,8 @@ export default class Grammar {
                 attributes.forEach(attributeSetter => attributeSetter(result))
                 return result
             })
-    FunctionReference = r => Grammar.CreateMultiAttributeGrammar(
-        r,
-        P.succeed(),
-        FunctionReferenceEntity,
-        attributeKey => Utility.objectGet(FunctionReferenceEntity.attributes, attributeKey)
-    )
-    Pin = r => Grammar.CreateMultiAttributeGrammar(
-        r,
-        P.string("Pin"),
-        PinEntity,
-        attributeKey => Utility.objectGet(PinEntity.attributes, attributeKey)
-    )
+    FunctionReference = r => Grammar.CreateMultiAttributeGrammar(r, FunctionReferenceEntity)
+    Pin = r => Grammar.CreateMultiAttributeGrammar(r, PinEntity)
     CustomProperties = r =>
         P.string("CustomProperties")
             .then(P.whitespace)
@@ -169,7 +162,7 @@ export default class Grammar {
         P
             .alt(
                 r.CustomProperties,
-                Grammar.CreateAttributeGrammar(r, r.AttributeName, attributeKey => Utility.objectGet(ObjectEntity.attributes, attributeKey))
+                Grammar.CreateAttributeGrammar(r, ObjectEntity)
             )
             .sepBy1(P.whitespace),
         P.seq(r.WhitespaceNewline, P.string("End"), P.whitespace, P.string("Object")),

js/serialization/ToStringSerializer.js

@@ -1,13 +1,13 @@
-import GeneralSerializer from "./GeneralSerializer"
-
-export default class ToStringSerializer extends GeneralSerializer {
-
-    constructor(entityType) {
-        super(undefined, entityType)
-    }
-
-    write(object) {
-        let result = object.toString()
-        return result
-    }
-}
+import GeneralSerializer from "./GeneralSerializer"
+
+export default class ToStringSerializer extends GeneralSerializer {
+
+    constructor(entityType) {
+        super(undefined, entityType)
+    }
+
+    write(object) {
+        let result = object.toString()
+        return result
+    }
+}

js/serialization/initializeSerializerFactory.js

@@ -1,50 +1,50 @@
-import CustomSerializer from "./CustomSerializer"
-import FunctionReferenceEntity from "../entity/FunctionReferenceEntity"
-import GeneralSerializer from "./GeneralSerializer"
-import GuidEntity from "../entity/GuidEntity"
-import IntegerEntity from "../entity/IntegerEntity"
-import LocalizedTextEntity from "../entity/LocalizedTextEntity"
-import ObjectEntity from "../entity/ObjectEntity"
-import ObjectReferenceEntity from "../entity/ObjectReferenceEntity"
-import ObjectSerializer from "./ObjectSerializer"
-import PathSymbolEntity from "../entity/PathSymbolEntity"
-import PinEntity from "../entity/PinEntity"
-import PinReferenceEntity from "../entity/PinReferenceEntity"
-import SerializerFactory from "./SerializerFactory"
-import ToStringSerializer from "./ToStringSerializer"
-
-export default function initializeSerializerFactory() {
-    SerializerFactory.registerSerializer(
-        ObjectEntity,
-        new ObjectSerializer()
-    )
-    SerializerFactory.registerSerializer(
-        PinEntity,
-        new GeneralSerializer(v => `Pin (${v})`, PinEntity, "", ",", true)
-    )
-    SerializerFactory.registerSerializer(
-        FunctionReferenceEntity,
-        new GeneralSerializer(v => `(${v})`, FunctionReferenceEntity, "", ",", false)
-    )
-    SerializerFactory.registerSerializer(
-        LocalizedTextEntity,
-        new GeneralSerializer(v => `NSLOCTEXT(${v})`, LocalizedTextEntity, "", ",", false, "", _ => "")
-    )
-    SerializerFactory.registerSerializer(
-        PinReferenceEntity,
-        new GeneralSerializer(v => v, PinReferenceEntity, "", " ", false, "", _ => "")
-    )
-    SerializerFactory.registerSerializer(
-        ObjectReferenceEntity,
-        new CustomSerializer(
-            /** @param {ObjectReferenceEntity} objectReference */
-            objectReference => (objectReference.type ?? "") + (
-                objectReference.path
-                    ? objectReference.type ? `'"${objectReference.path}"'` : objectReference.path
-                    : ""
-            ))
-    )
-    SerializerFactory.registerSerializer(PathSymbolEntity, new ToStringSerializer(PathSymbolEntity))
-    SerializerFactory.registerSerializer(GuidEntity, new ToStringSerializer(GuidEntity))
-    SerializerFactory.registerSerializer(IntegerEntity, new ToStringSerializer(IntegerEntity))
-}
+import CustomSerializer from "./CustomSerializer"
+import FunctionReferenceEntity from "../entity/FunctionReferenceEntity"
+import GeneralSerializer from "./GeneralSerializer"
+import GuidEntity from "../entity/GuidEntity"
+import IntegerEntity from "../entity/IntegerEntity"
+import LocalizedTextEntity from "../entity/LocalizedTextEntity"
+import ObjectEntity from "../entity/ObjectEntity"
+import ObjectReferenceEntity from "../entity/ObjectReferenceEntity"
+import ObjectSerializer from "./ObjectSerializer"
+import PathSymbolEntity from "../entity/PathSymbolEntity"
+import PinEntity from "../entity/PinEntity"
+import PinReferenceEntity from "../entity/PinReferenceEntity"
+import SerializerFactory from "./SerializerFactory"
+import ToStringSerializer from "./ToStringSerializer"
+
+export default function initializeSerializerFactory() {
+    SerializerFactory.registerSerializer(
+        ObjectEntity,
+        new ObjectSerializer()
+    )
+    SerializerFactory.registerSerializer(
+        PinEntity,
+        new GeneralSerializer(v => `Pin (${v})`, PinEntity, "", ",", true)
+    )
+    SerializerFactory.registerSerializer(
+        FunctionReferenceEntity,
+        new GeneralSerializer(v => `(${v})`, FunctionReferenceEntity, "", ",", false)
+    )
+    SerializerFactory.registerSerializer(
+        LocalizedTextEntity,
+        new GeneralSerializer(v => `NSLOCTEXT(${v})`, LocalizedTextEntity, "", ",", false, "", _ => "")
+    )
+    SerializerFactory.registerSerializer(
+        PinReferenceEntity,
+        new GeneralSerializer(v => v, PinReferenceEntity, "", " ", false, "", _ => "")
+    )
+    SerializerFactory.registerSerializer(
+        ObjectReferenceEntity,
+        new CustomSerializer(
+            /** @param {ObjectReferenceEntity} objectReference */
+            objectReference => (objectReference.type ?? "") + (
+                objectReference.path
+                    ? objectReference.type ? `'"${objectReference.path}"'` : objectReference.path
+                    : ""
+            ))
+    )
+    SerializerFactory.registerSerializer(PathSymbolEntity, new ToStringSerializer(PathSymbolEntity))
+    SerializerFactory.registerSerializer(GuidEntity, new ToStringSerializer(GuidEntity))
+    SerializerFactory.registerSerializer(IntegerEntity, new ToStringSerializer(IntegerEntity))
+}