Still WIP

js/entity/ObjectReferenceEntity.js

@@ -1,73 +1,71 @@
-import Parsernostrum from "parsernostrum"
+import P from "parsernostrum"
 import Utility from "../Utility.js"
 import Grammar from "../serialization/Grammar.js"
-import AttributeInfo from "./AttributeInfo.js"
 import IEntity from "./IEntity.js"
 
 export default class ObjectReferenceEntity extends IEntity {
 
-    static attributes = {
-        ...super.attributes,
-        type: new AttributeInfo({
-            default: "",
-            serialized: true,
-        }),
-        path: new AttributeInfo({
-            default: "",
-            serialized: true,
-        }),
-        _full: new AttributeInfo({
-            ignored: true,
-        }),
-    }
-    static quoted = Parsernostrum.regArray(new RegExp(
+    static #quotedParser = P.regArray(new RegExp(
         `'"(${Grammar.Regex.InsideString.source})"'`
         + "|"
         + `'(${Grammar.Regex.InsideSingleQuotedString.source})'`
     )).map(([_0, a, b]) => a ?? b)
-    static path = this.quoted.getParser().parser.regexp.source + "|" + Grammar.Regex.Path.source
-    static typeReference = Parsernostrum.reg(
+    static typeReference = P.reg(
         new RegExp(Grammar.Regex.Path.source + "|" + Grammar.symbol.getParser().regexp.source)
     )
-    static fullReferenceGrammar = Parsernostrum.regArray(
+    static fullReferenceGrammar = P.regArray(
         new RegExp(
             "(" + this.typeReference.getParser().regexp.source + ")"
-            + "(?:" + this.quoted.getParser().parser.regexp.source + ")"
+            + "(?:" + this.#quotedParser.getParser().parser.regexp.source + ")"
         )
-    ).map(([_full, type, ...path]) => new this({ type, path: path.find(v => v), _full }))
-    static fullReferenceSerializedGrammar = Parsernostrum.regArray(
+    ).map(([full, type, ...path]) => new this(type, path.find(v => v), full))
+    static fullReferenceSerializedGrammar = P.regArray(
         new RegExp(
             '"(' + Grammar.Regex.InsideString.source + "?)"
             + "(?:'(" + Grammar.Regex.InsideSingleQuotedString.source + `?)')?"`
         )
-    ).map(([_full, type, path]) => new this({ type, path, _full }))
-    static typeReferenceGrammar = this.typeReference.map(v => new this({ type: v, path: "", _full: v }))
-    static grammar = this.createGrammar()
+    ).map(([full, type, path]) => new this(type, path, full))
+    static typeReferenceGrammar = this.typeReference.map(v => new this(v, "", v))
+    static grammar = P.alt(
+        this.fullReferenceSerializedGrammar,
+        this.fullReferenceGrammar,
+        this.typeReferenceGrammar,
+    )
 
-    constructor(values = {}) {
-        if (values.constructor === String) {
-            values = {
-                path: values
-            }
-        }
-        super(values)
-        if (!values._full || values._full.length === 0) {
-            this._full = `"${this.type + (this.path ? (`'${this.path}'`) : "")}"`
-        }
-        /** @type {String} */ this.type
-        /** @type {String} */ this.path
+    #type
+    get type() {
+        return this.#type
+    }
+    set type(value) {
+        this.#type = value
     }
 
-    static createGrammar() {
-        return Parsernostrum.alt(
-            this.fullReferenceSerializedGrammar,
-            this.fullReferenceGrammar,
-            this.typeReferenceGrammar,
-        )
+    #path
+    get path() {
+        return this.#path
+    }
+    set path(value) {
+        this.#path = value
+    }
+
+    #full
+    get full() {
+        return this.#full
+    }
+    set full(value) {
+        this.#full = value
+    }
+
+
+    constructor(type = "None", path = "", full = null) {
+        super()
+        this.#type = type
+        this.#path = path
+        this.#full = full ?? `"${this.type + (this.path ? (`'${this.path}'`) : "")}"`
     }
 
     static createNoneInstance() {
-        return new ObjectReferenceEntity({ type: "None", path: "" })
+        return new ObjectReferenceEntity("None")
     }
 
     getName(dropCounter = false) {
@@ -75,6 +73,6 @@ export default class ObjectReferenceEntity extends IEntity {
     }
 
     toString() {
-        return this._full
+        return this.full
     }
 }