Still WIP

js/serialization/Grammar.js

@@ -4,7 +4,6 @@ import Utility from "../Utility.js"
 import AttributeInfo from "../entity/AttributeInfo.js"
 import IEntity from "../entity/IEntity.js"
 import MirroredEntity from "../entity/MirroredEntity.js"
-import Union from "../entity/Union.js"
 import Serializable from "./Serializable.js"
 
 export default class Grammar {
@@ -36,7 +35,6 @@ export default class Grammar {
     static null = Parsernostrum.reg(/\(\s*\)/).map(() => null)
     static true = Parsernostrum.reg(/true/i).map(() => true)
     static false = Parsernostrum.reg(/false/i).map(() => false)
-    static boolean = Parsernostrum.regArray(/(true)|false/i).map(v => v[1] ? true : false)
     static number = Parsernostrum.regArray(
         new RegExp(`(${Parsernostrum.number.getParser().parser.regexp.source})|(\\+?inf)|(-inf)`)
     ).map(([_0, n, plusInf, minusInf]) => n ? Number(n) : plusInf ? Number.POSITIVE_INFINITY : Number.NEGATIVE_INFINITY)

js/serialization/Serializable.js

@@ -2,10 +2,6 @@ import Parsernostrum from "parsernostrum"
 
 export default class Serializable {
 
-    static grammar = this.createGrammar()
-
-    /** @protected */
-    static createGrammar() {
-        return /** @type {Parsernostrum<any>} */(Parsernostrum.failure())
-    }
+    /** @type {Parsernostrum<any>} */
+    static grammar = Parsernostrum.failure()
 }

js/serialization/initializeSerializerFactory.js

@@ -32,7 +32,6 @@ import SimpleSerializationVector4DEntity from "../entity/SimpleSerializationVect
 import SimpleSerializationVectorEntity from "../entity/SimpleSerializationVectorEntity.js"
 import SymbolEntity from "../entity/SymbolEntity.js"
 import TerminalTypeEntity from "../entity/TerminalTypeEntity.js"
-import Union from "../entity/Union.js"
 import UnknownKeysEntity from "../entity/UnknownKeysEntity.js"
 import VariableReferenceEntity from "../entity/VariableReferenceEntity.js"
 import Vector2DEntity from "../entity/Vector2DEntity.js"
@@ -44,17 +43,22 @@ import ObjectSerializer from "./ObjectSerializer.js"
 import Serializer from "./Serializer.js"
 import SerializerFactory from "./SerializerFactory.js"
 import ToStringSerializer from "./ToStringSerializer.js"
+import BooleanEntity from "../entity/BooleanEntity.js"
+import NumberEntity from "../entity/NumberEntity.js"
+import StringEntity from "../entity/StringEntity.js"
+import ArrayEntity from "../entity/ArrayEntity.js"
+import AlternativesEntity from "../entity/AlternativesEntity.js"
 
 Grammar.unknownValue =
     Parsernostrum.alt(
         // Remember to keep the order, otherwise parsing might fail
-        Grammar.boolean,
+        BooleanEntity.grammar,
         GuidEntity.grammar,
-        Parsernostrum.str("None").map(() => new ObjectReferenceEntity({ type: "None" })),
+        Parsernostrum.str("None").map(() => ObjectReferenceEntity.createNoneInstance()),
         Grammar.null,
-        Grammar.number,
+        NumberEntity.grammar,
         ObjectReferenceEntity.fullReferenceGrammar,
-        Grammar.string,
+        StringEntity.grammar,
         LocalizedTextEntity.grammar,
         InvariantTextEntity.grammar,
         FormatTextEntity.grammar,
@@ -66,9 +70,9 @@ Grammar.unknownValue =
         Vector2DEntity.grammar,
         UnknownKeysEntity.grammar,
         SymbolEntity.grammar,
-        Grammar.grammarFor(undefined, [PinReferenceEntity]),
-        Grammar.grammarFor(undefined, [new Union(Number, String, SymbolEntity)]),
-        Parsernostrum.lazy(() => Grammar.grammarFor(undefined, [undefined])),
+        ArrayEntity.of(PinReferenceEntity).grammar,
+        ArrayEntity.of(AlternativesEntity.accepting(NumberEntity, StringEntity, SymbolEntity)).grammar,
+        Parsernostrum.lazy(() => ArrayEntity.createGrammar(Grammar.unknownValue)),
     )
 
 export default function initializeSerializerFactory() {
@@ -202,7 +206,7 @@ export default function initializeSerializerFactory() {
         new Serializer(MacroGraphReferenceEntity, Serializer.bracketsWrapped)
     )
 
-    SerializerFactory.registerSerializer(
+    SerializerFactory.registeOrSerializer(
         MirroredEntity,
         new CustomSerializer(
             (v, insideString) => SerializerFactory.getSerializer(v.getTargetType()).write(v.get(), insideString),