Names refactoring

js/serialization/CustomSerializer.js

@@ -1,4 +1,4 @@
-import ISerializer from "./ISerializer.js"
+import Serializer from "./Serializer.js"
 
 /**
  * @typedef {import("../entity/IEntity").AnyValue} AnyValue
@@ -7,9 +7,9 @@ import ISerializer from "./ISerializer.js"
 
 /**
  * @template {AnyValue} T
- * @extends {ISerializer<T>}
+ * @extends {Serializer<T>}
  */
-export default class CustomSerializer extends ISerializer {
+export default class CustomSerializer extends Serializer {
 
     #objectWriter
 

js/serialization/ObjectSerializer.js

@@ -1,10 +1,10 @@
 import Grammar from "./Grammar.js"
-import ISerializer from "./ISerializer.js"
+import Serializer from "./Serializer.js"
 import ObjectEntity from "../entity/ObjectEntity.js"
 import PinEntity from "../entity/PinEntity.js"
 import SerializerFactory from "./SerializerFactory.js"
 
-export default class ObjectSerializer extends ISerializer {
+export default class ObjectSerializer extends Serializer {
 
     constructor() {
         super(ObjectEntity, undefined, "   ", "\n", false)

js/serialization/Serializer.js

@@ -4,13 +4,13 @@ import SerializerFactory from "./SerializerFactory.js"
 import Utility from "../Utility.js"
 
 /**
- * @typedef {import("../entity/IEntity").EntityConstructor} EntityConstructor
- * @typedef {import("../entity/IEntity").AnyValue} AnyValue
- * @typedef {import("../entity/IEntity").AnyValueConstructor<*>} AnyValueConstructor
+ * @typedef {import("../entity/IEntity.js").EntityConstructor} EntityConstructor
+ * @typedef {import("../entity/IEntity.js").AnyValue} AnyValue
+ * @typedef {import("../entity/IEntity.js").AnyValueConstructor<*>} AnyValueConstructor
  */
 
 /** @template {AnyValue} T */
-export default class ISerializer {
+export default class Serializer {
 
     /** @type {(v: String, entityType: AnyValueConstructor) => String} */
     static bracketsWrapped = ((v, entityType) => `(${v})`)
@@ -20,7 +20,7 @@ export default class ISerializer {
     /** @param {AnyValueConstructor} entityType */
     constructor(
         entityType,
-        wrap = ISerializer.bracketsWrapped,
+        wrap = Serializer.bracketsWrapped,
         attributePrefix = "",
         attributeSeparator = ",",
         trailingSeparator = false,
@@ -94,7 +94,7 @@ export default class ISerializer {
                     result += this.doWrite(
                         value,
                         insideString,
-                        ISerializer.notWrapped,
+                        Serializer.notWrapped,
                         `${attributePrefix}${key}.`,
                         attributeSeparator,
                         trailingSeparator,
@@ -122,8 +122,8 @@ export default class ISerializer {
                     + this.attributeValueConjunctionSign
                     + (
                         isSerialized
-                        ? `"${this.doWriteValue(value, true)}"`
-                        : this.doWriteValue(value, insideString)
+                            ? `"${this.doWriteValue(value, true)}"`
+                            : this.doWriteValue(value, insideString)
                     )
             }
         }

js/serialization/SerializerFactory.js

@@ -9,18 +9,18 @@
  */
 /**
  * @template {AnyValue} T
- * @typedef {import("./ISerializer").default<T>} ISerializer
+ * @typedef {import("./Serializer").default<T>} Serializer
  */
 
 export default class SerializerFactory {
 
-    /** @type {Map<AnyValueConstructor<AnyValue>, ISerializer<AnyValue>>} */
+    /** @type {Map<AnyValueConstructor<AnyValue>, Serializer<AnyValue>>} */
     static #serializers = new Map()
 
     /**
      * @template {AnyValue} T
      * @param {AnyValueConstructor<T>} entity
-     * @param {ISerializer<T>} object
+     * @param {Serializer<T>} object
      */
     static registerSerializer(entity, object) {
         SerializerFactory.#serializers.set(entity, object)
@@ -29,7 +29,7 @@ export default class SerializerFactory {
     /**
      * @template {AnyValue} T
      * @param {new () => T} entity
-     * @returns {ISerializer<T>}
+     * @returns {Serializer<T>}
      */
     static getSerializer(entity) {
         // @ts-expect-error

js/serialization/ToStringSerializer.js

@@ -1,4 +1,4 @@
-import ISerializer from "./ISerializer.js"
+import Serializer from "./Serializer.js"
 import Utility from "../Utility.js"
 
 /**
@@ -8,9 +8,9 @@ import Utility from "../Utility.js"
 
 /**
  * @template {AnyValue} T
- * @extends {ISerializer<T>}
+ * @extends {Serializer<T>}
  */
-export default class ToStringSerializer extends ISerializer {
+export default class ToStringSerializer extends Serializer {
 
     /** @param {AnyValueConstructor} entityType */
     constructor(entityType) {

js/serialization/initializeSerializerFactory.js

@@ -7,7 +7,7 @@ import IdentifierEntity from "../entity/IdentifierEntity.js"
 import Integer64Entity from "../entity/Integer64Entity.js"
 import IntegerEntity from "../entity/IntegerEntity.js"
 import InvariantTextEntity from "../entity/InvariantTextEntity.js"
-import ISerializer from "./ISerializer.js"
+import Serializer from "./Serializer.js"
 import KeyBindingEntity from "../entity/KeyBindingEntity.js"
 import LinearColorEntity from "../entity/LinearColorEntity.js"
 import LocalizedTextEntity from "../entity/LocalizedTextEntity.js"
@@ -96,7 +96,7 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         FunctionReferenceEntity,
-        new ISerializer(FunctionReferenceEntity, ISerializer.bracketsWrapped)
+        new Serializer(FunctionReferenceEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
@@ -121,27 +121,27 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         InvariantTextEntity,
-        new ISerializer(InvariantTextEntity, v => `${InvariantTextEntity.lookbehind}(${v})`, "", ", ", false, "", _ => "")
+        new Serializer(InvariantTextEntity, v => `${InvariantTextEntity.lookbehind}(${v})`, "", ", ", false, "", _ => "")
     )
 
     SerializerFactory.registerSerializer(
         KeyBindingEntity,
-        new ISerializer(KeyBindingEntity, ISerializer.bracketsWrapped)
+        new Serializer(KeyBindingEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
         LinearColorEntity,
-        new ISerializer(LinearColorEntity, ISerializer.bracketsWrapped)
+        new Serializer(LinearColorEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
         LocalizedTextEntity,
-        new ISerializer(LocalizedTextEntity, v => `${LocalizedTextEntity.lookbehind}(${v})`, "", ", ", false, "", _ => "")
+        new Serializer(LocalizedTextEntity, v => `${LocalizedTextEntity.lookbehind}(${v})`, "", ", ", false, "", _ => "")
     )
 
     SerializerFactory.registerSerializer(
         MacroGraphReferenceEntity,
-        new ISerializer(MacroGraphReferenceEntity, ISerializer.bracketsWrapped)
+        new Serializer(MacroGraphReferenceEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
@@ -173,17 +173,17 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         PinEntity,
-        new ISerializer(PinEntity, v => `${PinEntity.lookbehind} (${v})`, "", ",", true)
+        new Serializer(PinEntity, v => `${PinEntity.lookbehind} (${v})`, "", ",", true)
     )
 
     SerializerFactory.registerSerializer(
         PinReferenceEntity,
-        new ISerializer(PinReferenceEntity, v => v, "", " ", false, "", _ => "")
+        new Serializer(PinReferenceEntity, v => v, "", " ", false, "", _ => "")
     )
 
     SerializerFactory.registerSerializer(
         TerminalTypeEntity,
-        new ISerializer(TerminalTypeEntity, ISerializer.bracketsWrapped)
+        new Serializer(TerminalTypeEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
@@ -193,7 +193,7 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         RotatorEntity,
-        new ISerializer(RotatorEntity, ISerializer.bracketsWrapped)
+        new Serializer(RotatorEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
@@ -239,21 +239,21 @@ export default function initializeSerializerFactory() {
 
     SerializerFactory.registerSerializer(
         UnknownKeysEntity,
-        new ISerializer(UnknownKeysEntity, (string, entity) => `${entity.lookbehind ?? ""}(${string})`)
+        new Serializer(UnknownKeysEntity, (string, entity) => `${entity.lookbehind ?? ""}(${string})`)
     )
 
     SerializerFactory.registerSerializer(
         VariableReferenceEntity,
-        new ISerializer(VariableReferenceEntity, ISerializer.bracketsWrapped)
+        new Serializer(VariableReferenceEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
         Vector2DEntity,
-        new ISerializer(Vector2DEntity, ISerializer.bracketsWrapped)
+        new Serializer(Vector2DEntity, Serializer.bracketsWrapped)
     )
 
     SerializerFactory.registerSerializer(
         VectorEntity,
-        new ISerializer(VectorEntity, ISerializer.bracketsWrapped)
+        new Serializer(VectorEntity, Serializer.bracketsWrapped)
     )
 }