Simplify attribute prefix

js/serialization/ObjectSerializer.js

@@ -7,7 +7,7 @@ import SerializerFactory from "./SerializerFactory.js"
 export default class ObjectSerializer extends Serializer {
 
     constructor() {
-        super(ObjectEntity, undefined, "   ", "\n", false)
+        super(ObjectEntity, undefined, "\n", false, undefined, k => `   ${k}`)
     }
 
     showProperty(entity, key) {
@@ -43,7 +43,6 @@ export default class ObjectSerializer extends Serializer {
     }
 
     /**
-     * @protected
      * @param {ObjectEntity} entity
      * @param {Boolean} insideString
      * @returns {String}
@@ -52,7 +51,6 @@ export default class ObjectSerializer extends Serializer {
         entity,
         insideString,
         wrap = this.wrap,
-        attributePrefix = this.attributePrefix,
         attributeSeparator = this.attributeSeparator,
         trailingSeparator = this.trailingSeparator,
         attributeValueConjunctionSign = this.attributeValueConjunctionSign,
@@ -65,9 +63,8 @@ export default class ObjectSerializer extends Serializer {
             + super.doWrite(entity, insideString)
             + entity.CustomProperties.map(pin =>
                 this.attributeSeparator
-                + this.attributePrefix
-                + "CustomProperties "
-                + SerializerFactory.getSerializer(PinEntity).write(pin)
+                + "   CustomProperties "
+                + SerializerFactory.getSerializer(PinEntity).doWrite(pin, insideString)
             )
                 .join("")
             + "\nEnd Object\n"

js/serialization/Serializer.js

@@ -11,24 +11,22 @@ import Utility from "../Utility.js"
 /** @template {AnyValue} T */
 export default class Serializer {
 
-    /** @type {(v: String, entityType: AnyValueConstructor) => String} */
-    static bracketsWrapped = ((v, entityType) => `(${v})`)
     /** @type {(v: String) => String} */
-    static same = (v => v)
+    static bracketsWrapped = (v => `(${v})`)
+    /** @type {(v: String) => String} */
+    static same = v => v
 
     /** @param {AnyValueConstructor} entityType */
     constructor(
         entityType,
         wrap = Serializer.same,
-        attributePrefix = "",
         attributeSeparator = ",",
         trailingSeparator = false,
         attributeValueConjunctionSign = "=",
-        attributeKeyPrinter = k => k
+        attributeKeyPrinter = Serializer.same
     ) {
         this.entityType = entityType
         this.wrap = wrap
-        this.attributePrefix = attributePrefix
         this.attributeSeparator = attributeSeparator
         this.trailingSeparator = trailingSeparator
         this.attributeValueConjunctionSign = attributeValueConjunctionSign
@@ -49,7 +47,6 @@ export default class Serializer {
     }
 
     /**
-     * @protected
      * @param {String} value
      * @returns {T}
      */
@@ -63,7 +60,6 @@ export default class Serializer {
     }
 
     /**
-     * @protected
      * @param {T} entity
      * @param {Boolean} insideString
      * @returns {String}
@@ -72,7 +68,6 @@ export default class Serializer {
         entity,
         insideString,
         wrap = this.wrap,
-        attributePrefix = this.attributePrefix,
         attributeSeparator = this.attributeSeparator,
         trailingSeparator = this.trailingSeparator,
         attributeValueConjunctionSign = this.attributeValueConjunctionSign,
@@ -99,7 +94,6 @@ export default class Serializer {
                         value,
                         insideString,
                         Serializer.same,
-                        attributePrefix,
                         attributeSeparator,
                         false,
                         attributeValueConjunctionSign,
@@ -110,8 +104,7 @@ export default class Serializer {
                     continue
                 }
                 result +=
-                    attributePrefix
-                    + attributeKeyPrinter(key)
+                    attributeKeyPrinter(key)
                     + this.attributeValueConjunctionSign
                     + (
                         isSerialized
@@ -127,10 +120,7 @@ export default class Serializer {
         return wrap(result, entity.constructor)
     }
 
-    /**
-     * @protected
-     * @param {Boolean} insideString
-     */
+    /** @param {Boolean} insideString */
     doWriteValue(value, insideString) {
         const type = Utility.getType(value)
         // @ts-expect-error

js/serialization/initializeSerializerFactory.js

@@ -121,7 +121,7 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         InvariantTextEntity,
-        new Serializer(InvariantTextEntity, v => `${InvariantTextEntity.lookbehind}(${v})`, "", ", ", false, "", _ => "")
+        new Serializer(InvariantTextEntity, v => `${InvariantTextEntity.lookbehind}(${v})`, ", ", false, "", _ => "")
     )
 
     SerializerFactory.registerSerializer(
@@ -136,7 +136,7 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         LocalizedTextEntity,
-        new Serializer(LocalizedTextEntity, v => `${LocalizedTextEntity.lookbehind}(${v})`, "", ", ", false, "", _ => "")
+        new Serializer(LocalizedTextEntity, v => `${LocalizedTextEntity.lookbehind}(${v})`, ", ", false, "", _ => "")
     )
 
     SerializerFactory.registerSerializer(
@@ -173,12 +173,12 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         PinEntity,
-        new Serializer(PinEntity, v => `${PinEntity.lookbehind} (${v})`, "", ",", true)
+        new Serializer(PinEntity, v => `${PinEntity.lookbehind} (${v})`, ",", true)
     )
 
     SerializerFactory.registerSerializer(
         PinReferenceEntity,
-        new Serializer(PinReferenceEntity, v => v, "", " ", false, "", _ => "")
+        new Serializer(PinReferenceEntity, Serializer.same, " ", false, "", _ => "")
     )
 
     SerializerFactory.registerSerializer(