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

tests/resources/Entity3.js

@@ -1,74 +1,58 @@
-import AttributeInfo from "../../js/entity/AttributeInfo.js"
+import AlternativesEntity from "../../js/entity/AlternativesEntity.js"
+import ArrayEntity from "../../js/entity/ArrayEntity.js"
+import BooleanEntity from "../../js/entity/BooleanEntity.js"
 import IEntity from "../../js/entity/IEntity.js"
-import Union from "../../js/entity/Union.js"
+import NullEntity from "../../js/entity/NullEntity.js"
+import NumberEntity from "../../js/entity/NumberEntity.js"
+import StringEntity from "../../js/entity/StringEntity.js"
 import Entity1 from "./Entity1.js"
 import Entity2 from "./Entity2.js"
 
 export default class Entity3 extends IEntity {
 
+    static attributeSeparator = "\n"
+    static keySeparator = ": "
+    static printKey = k => `    ${k}`
+    static wrap = (entity, v) => `[[\n${v}\n]]`
     static attributes = {
-        alpha: AttributeInfo.createValue(32),
-        bravo: new AttributeInfo({
-            type: Number,
-            default: 78,
-        }),
-        charlie: new AttributeInfo({
-            type: String,
-            default: "Charlie",
-        }),
-        delta: new AttributeInfo({
-            type: String,
-            default: null,
-        }),
-        echo: AttributeInfo.createValue("echo"),
-        foxtrot: AttributeInfo.createValue(false),
-        golf: AttributeInfo.createValue([]),
-        hotel: new AttributeInfo({
-            type: Array,
-            default: null,
-        }),
-        india: new AttributeInfo({
-            type: [Number],
-            default: () => [],
-        }),
-        juliett: new AttributeInfo({
-            type: [String],
-            default: ["a", "b", "c", "d", "e"],
-        }),
-        kilo: new AttributeInfo({
-            type: [Boolean],
-            default: () => [true, false, false, true, true],
-        }),
-        lima: AttributeInfo.createType(String),
-        mike: new AttributeInfo({
-            type: new Union(Number, String, Array),
-            default: "Bar",
-        }),
-        november: new AttributeInfo({
-            type: new Union(Number, String, Array),
-            default: 0,
-        }),
-        oscar: new AttributeInfo({
-            type: Entity1,
-            default: () => new Entity1()
-        }),
-        papa: new AttributeInfo({
-            type: Entity1,
-            default: () => new Entity1({ a: 12, b: 13 }),
-        }),
-        quebec: new AttributeInfo({
-            default: 0, // will assign undefined because it does not satisfy the predicate
-            predicate: v => v >= 1 && v <= 10,
-        }),
-        romeo: new AttributeInfo({
-            type: Entity1,
-            default: new Entity1(),
-            inlined: true,
-        }),
-        sierra: new AttributeInfo({
-            type: Entity2,
-            default: new Entity2(),
-            inlined: true,
-        }),
+        ...super.attributes,
+        alpha: NumberEntity.withDefault(type => new type(32)),
+        bravo: NumberEntity.withDefault(type => new type(78)),
+        charlie: StringEntity.withDefault(type => new type("Charlie")),
+        delta: StringEntity.withDefault(type => new NullEntity()),
+        echo: StringEntity.withDefault(type => new type("echo")),
+        foxtrot: BooleanEntity.withDefault(),
+        golf: ArrayEntity.of(StringEntity).withDefault(),
+        hotel: ArrayEntity.of(NumberEntity).withDefault(() => new NullEntity()),
+        india: ArrayEntity.of(NumberEntity).withDefault(),
+        juliett: ArrayEntity.of(StringEntity).withDefault(type => new type([
+            new StringEntity("a"),
+            new StringEntity("b"),
+            new StringEntity("c"),
+            new StringEntity("d"),
+            new StringEntity("e"),
+        ])),
+        kilo: ArrayEntity.of(BooleanEntity).withDefault(type => new type([
+            new BooleanEntity(true),
+            new BooleanEntity(),
+            new BooleanEntity(),
+            new BooleanEntity(true),
+            new BooleanEntity(true),
+        ])),
+        lima: StringEntity,
+        mike: AlternativesEntity
+            .accepting(NumberEntity, StringEntity, ArrayEntity)
+            .withDefault(type => new StringEntity("Bar")),
+        november: AlternativesEntity
+            .accepting(NumberEntity, StringEntity, ArrayEntity)
+            .withDefault(type => new NumberEntity(0)),
+        oscar: Entity1.withDefault(),
+        papa: Entity1.withDefault(type => new type({
+            a: new NumberEntity(12),
+            b: new NumberEntity(13),
+        })),
+        quebec: NumberEntity,
+        romeo: Entity1.withDefault().flagInlined(),
+        sierra: Entity2.withDefault().flagInlined(),
     }
 }