Refactoring entities (#23)

* Still WIP

* WIP

* ArrayEntity parsing fixed

* Fix format text entity

* Tests for various entity classes and update entity class implementations

* More tests and fixed

* More entities fixed

* Simple entities serialization fixed

* Entities tests fixed

* Remove serialization bits

* Fix Function reference

* CustomProperties creating fixed

* WIP

* Better typing for grammars

* Decoding code fixes

* Fixing still

* Several fixes

* rename toString to serialize

* Several fixes

* More fixes

* Moving more stuff out of Utility

* Several fixes

* Fixing Linear color entity print

* Serialization fixes

* Fix serialization

* Method to compute grammar

* Renaming fix

* Fix array grammar and equality check

* Fix inlined keys

* Fix type

* Several serialization fixes

* Fix undefined dereference

* Several fixes

* More fixes and cleanup

* Fix keys quoting mechanism

* Fix natural number assignment

* Fix Int64 toString()

* Fix quoted keys for inlined arrays

* Fix PG pins

* Fix several test cases

* Types fixes

* New pin default value empty

* Fix non existing DefaultValue for variadic nodes

* Smaller fixes for crashes

* Fix link color when attached to knot

* Linking test and more reliability operations for adding pins

* Improve issue 18 test

* More tests and fixes

* Fix enum pin entity

* Remove failing test

js/entity/SimpleSerializationVectorEntity.js

@@ -1,26 +1,60 @@
-import Parsernostrum from "parsernostrum"
+import P from "parsernostrum"
+import NumberEntity from "./NumberEntity.js"
 import VectorEntity from "./VectorEntity.js"
 
 export default class SimpleSerializationVectorEntity extends VectorEntity {
 
+    static allowShortSerialization = false
+    static attributeSeparator = ", "
     static grammar = this.createGrammar()
 
     static createGrammar() {
-        const number = Parsernostrum.number.getParser().parser.regexp.source
-        return Parsernostrum.alt(
-            Parsernostrum.regArray(new RegExp(
-                "(" + number + ")"
-                + "\\s*,\\s*"
-                + "(" + number + ")"
-                + "\\s*,\\s*"
-                + "(" + number + ")"
-            ))
-                .map(([_0, x, y, z]) => new this({
-                    X: Number(x),
-                    Y: Number(y),
-                    Z: Number(z),
-                })),
-            VectorEntity.grammar
+        return /** @type {P<SimpleSerializationVectorEntity>} */(
+            P.alt(
+                P.regArray(new RegExp(
+                    `(${NumberEntity.numberRegexSource})`
+                    // If allow simple serialization then it can parse only a single number ...
+                    + (this.allowShortSerialization ? `(?:` : "")
+                    + String.raw`\s*,\s*`
+                    + `(${NumberEntity.numberRegexSource})`
+                    + String.raw`\s*,\s*`
+                    + `(${NumberEntity.numberRegexSource})`
+                    // ... that will be assigned to X and the rest is optional and set to 0
+                    + (this.allowShortSerialization ? `)?` : "")
+                ))
+                    .map(([_, x, xPrecision, y, yPrecision, z, zPrecision]) => new this({
+                        X: new (VectorEntity.attributes.X)(x, xPrecision?.length),
+                        Y: new (VectorEntity.attributes.Y)(y, yPrecision?.length),
+                        Z: new (VectorEntity.attributes.Z)(z, zPrecision?.length),
+                    })),
+                VectorEntity.grammar.map(v => new this({
+                    X: v.X,
+                    Y: v.Y,
+                    Z: v.Z,
+                }))
+            )
         )
     }
+
+    /**
+     * @template {typeof SimpleSerializationVectorEntity} T
+     * @this {T}
+     */
+    static flagAllowShortSerialization(value = true) {
+        const result = this.asUniqueClass()
+        if (value !== result.allowShortSerialization) {
+            result.allowShortSerialization = value
+            result.grammar = result.createGrammar()
+        }
+        return result
+    }
+
+    doSerialize() {
+        const attributeSeparator = /** @type {typeof SimpleSerializationVectorEntity} */(
+            this.constructor
+        ).attributeSeparator
+        return this.X.serialize() + attributeSeparator
+            + this.Y.serialize() + attributeSeparator
+            + this.Z.serialize() + (this.trailing ? attributeSeparator : "")
+    }
 }