Mergin better performance branch

js/serialization/CustomSerializer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import GeneralSerializer from "./GeneralSerializer"
 
 /**

js/serialization/GeneralSerializer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import Grammar from "./Grammar"
 import ISerializer from "./ISerializer"
 

js/serialization/Grammar.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import FunctionReferenceEntity from "../entity/FunctionReferenceEntity"
 import GuidEntity from "../entity/GuidEntity"
 import IdentifierEntity from "../entity/IdentifierEntity"
@@ -124,9 +122,7 @@ export default class Grammar {
          * Then it populates an object of type EntityType with the attribute values found inside the parentheses.
          */
         P.seqMap(
-            // @ts-expect-error
             entityType.lookbehind
-                // @ts-expect-error
                 ? P.seq(P.string(entityType.lookbehind), P.optWhitespace, P.string("("))
                 : P.string("("),
             Grammar.createAttributeGrammar(r, entityType)
@@ -154,8 +150,14 @@ export default class Grammar {
     Boolean = r => P.alt(P.string("True"), P.string("False")).map(v => v === "True" ? true : false)
         .desc("either True or False")
 
+    HexDigit = r => P.regex(/[0-9a-fA-f]/).desc("hexadecimal digit")
+
     Number = r => P.regex(/[\-\+]?[0-9]+(?:\.[0-9]+)?/).map(Number).desc("a number")
 
+    NaturalNumber = r => P.regex(/0|[1-9]\d*/).map(Number).desc("a natural number")
+
+    ColorNumber = r => r.NaturalNumber.assert(n => 0 <= n && n < 256, "the color must be between 0 and 256 excluded")
+
     Word = r => P.regex(/[a-zA-Z]+/).desc("a word")
 
     String = r => P.regex(/(?:[^"\\]|\\.)*/).wrap(P.string('"'), P.string('"')).map(Utility.decodeString)
@@ -294,4 +296,66 @@ export default class Grammar {
 
     /** @returns {Parsimmon.Parser<ObjectEntity[]>} */
     MultipleObject = r => r.Object.sepBy1(P.whitespace).trim(P.optWhitespace)
+
+    /*   ---   Others   ---   */
+
+    LinearColorFromHex = r => P
+        .string("#")
+        .then(r.HexDigit.times(2).tie().times(3, 4))
+        .trim(P.optWhitespace)
+        .map(([R, G, B, A]) => new LinearColorEntity({
+            R: parseInt(R, 16) / 255,
+            G: parseInt(G, 16) / 255,
+            B: parseInt(B, 16) / 255,
+            A: A ? parseInt(A, 16) / 255 : 1,
+        }))
+
+    LinearColorFromRGBList = r => P.seqMap(
+        r.ColorNumber,
+        P.string(",").skip(P.optWhitespace),
+        r.ColorNumber,
+        P.string(",").skip(P.optWhitespace),
+        r.ColorNumber.map(Number),
+        (R, _, G, __, B) => new LinearColorEntity({
+            R: R / 255,
+            G: G / 255,
+            B: B / 255,
+            A: 1,
+        })
+    )
+
+    LinearColorFromRGB = r => P.string("rgb").then(
+        r.LinearColorFromRGBList.wrap(
+            P.regex(/\(\s*/),
+            P.regex(/\s*\)/)
+        )
+    )
+
+    LinearColorFromRGBA = r => P.string("rgba").then(
+        P.seqMap(
+            r.ColorNumber,
+            P.string(",").skip(P.optWhitespace),
+            r.ColorNumber,
+            P.string(",").skip(P.optWhitespace),
+            r.ColorNumber.map(Number),
+            P.string(",").skip(P.optWhitespace),
+            P.regex(/0?\.\d+|[01]/).map(Number),
+            (R, _, G, __, B, ___, A) => new LinearColorEntity({
+                R: R / 255,
+                G: G / 255,
+                B: B / 255,
+                A: A,
+            })
+        ).wrap(
+            P.regex(/\(\s*/),
+            P.regex(/\s*\)/)
+        )
+    )
+
+    LinearColorFromAnyColor = r => P.alt(
+        r.LinearColorFromRGBList,
+        r.LinearColorFromHex,
+        r.LinearColorFromRGB,
+        r.LinearColorFromRGBA
+    )
 }

js/serialization/ISerializer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import Grammar from "./Grammar"
 import IEntity from "../entity/IEntity"
 import Parsimmon from "parsimmon"

js/serialization/ObjectSerializer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import ISerializer from "./ISerializer"
 import ObjectEntity from "../entity/ObjectEntity"
 import PinEntity from "../entity/PinEntity"

js/serialization/PinSerializer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import PinEntity from "../entity/PinEntity"
 import Utility from "../Utility"
 import GeneralSerializer from "./GeneralSerializer"
@@ -16,7 +14,6 @@ export default class PinSerializer extends GeneralSerializer {
      */
     writeValue(value, fullKey, insideString) {
         if (value?.constructor === String && fullKey.length == 1 && fullKey[0] == "DefaultValue") {
-            // @ts-expect-error
             return `"${Utility.encodeInputString(value)}"`
         }
         return super.writeValue(value, fullKey, insideString)

js/serialization/SerializerFactory.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import Utility from "../Utility"
 
 export default class SerializerFactory {

js/serialization/ToStringSerializer.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import GeneralSerializer from "./GeneralSerializer"
 
 /**

js/serialization/initializeSerializerFactory.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import CustomSerializer from "./CustomSerializer"
 import FunctionReferenceEntity from "../entity/FunctionReferenceEntity"
 import GeneralSerializer from "./GeneralSerializer"
@@ -24,44 +22,40 @@ export default function initializeSerializerFactory() {
 
     const bracketsWrapped = v => `(${v})`
 
-    SerializerFactory.registerSerializer(
-        LinearColorEntity,
-        new GeneralSerializer(bracketsWrapped, LinearColorEntity)
-    )
-
-    SerializerFactory.registerSerializer(
-        ObjectEntity,
-        new ObjectSerializer()
-    )
-
-    SerializerFactory.registerSerializer(
-        PinEntity,
-        new PinSerializer()
-    )
-
     SerializerFactory.registerSerializer(
         FunctionReferenceEntity,
         new GeneralSerializer(bracketsWrapped, FunctionReferenceEntity)
     )
 
+    SerializerFactory.registerSerializer(GuidEntity, new ToStringSerializer(GuidEntity))
+
+    SerializerFactory.registerSerializer(IdentifierEntity, new ToStringSerializer(IdentifierEntity))
+
+    SerializerFactory.registerSerializer(IntegerEntity, new ToStringSerializer(IntegerEntity))
+
+    SerializerFactory.registerSerializer(
+        InvariantTextEntity,
+        new GeneralSerializer(v => `${InvariantTextEntity.lookbehind}(${v})`, InvariantTextEntity, "", ", ", false, "", _ => "")
+    )
+
     SerializerFactory.registerSerializer(
         KeyBindingEntity,
         new GeneralSerializer(bracketsWrapped, KeyBindingEntity)
     )
 
+    SerializerFactory.registerSerializer(
+        LinearColorEntity,
+        new GeneralSerializer(bracketsWrapped, LinearColorEntity)
+    )
+
     SerializerFactory.registerSerializer(
         LocalizedTextEntity,
         new GeneralSerializer(v => `${LocalizedTextEntity.lookbehind}(${v})`, LocalizedTextEntity, "", ", ", false, "", _ => "")
     )
 
     SerializerFactory.registerSerializer(
-        InvariantTextEntity,
-        new GeneralSerializer(v => `${InvariantTextEntity.lookbehind}(${v})`, InvariantTextEntity, "", ", ", false, "", _ => "")
-    )
-
-    SerializerFactory.registerSerializer(
-        PinReferenceEntity,
-        new GeneralSerializer(v => v, PinReferenceEntity, "", " ", false, "", _ => "")
+        ObjectEntity,
+        new ObjectSerializer()
     )
 
     SerializerFactory.registerSerializer(
@@ -77,11 +71,15 @@ export default function initializeSerializerFactory() {
         )
     )
 
-    SerializerFactory.registerSerializer(IdentifierEntity, new ToStringSerializer(IdentifierEntity))
-
     SerializerFactory.registerSerializer(PathSymbolEntity, new ToStringSerializer(PathSymbolEntity))
 
-    SerializerFactory.registerSerializer(GuidEntity, new ToStringSerializer(GuidEntity))
+    SerializerFactory.registerSerializer(
+        PinReferenceEntity,
+        new GeneralSerializer(v => v, PinReferenceEntity, "", " ", false, "", _ => "")
+    )
 
-    SerializerFactory.registerSerializer(IntegerEntity, new ToStringSerializer(IntegerEntity))
+    SerializerFactory.registerSerializer(
+        PinEntity,
+        new PinSerializer()
+    )
 }