Ma/ueblueprint
1
0
Fork 0
mirror of https://github.com/barsdeveloper/ueblueprint.git synced 2026-05-19 04:07:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small refactoring

Browse Source
This commit is contained in:
barsdeveloper
2024-09-08 22:28:42 +02:00
parent 2114abef5c
commit 19ef3bd10e
43 changed files with 542 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
js/entity/IEntity.js
View File

@@ -52,7 +52,7 @@ export default class IEntity {
this.#lookbehind = value
}
#ignored = this.constructor.ignored
#ignored = /** @type {typeof IEntity} */(this.constructor).ignored
get ignored() {
return this.#ignored
}
@@ -62,15 +62,16 @@ export default class IEntity {
#quoted
get quoted() {
return /** @type {typeof IEntity} */(this.constructor).quoted ?? this.#quoted ?? false
return this.#quoted ?? /** @type {typeof IEntity} */(this.constructor).quoted ?? false
}
set quoted(value) {
this.#quoted = value
}
#trailing = this.constructor.trailing
/** @type {Boolean} */
#trailing
get trailing() {
return this.#trailing
return this.#trailing ?? /** @type {typeof IEntity} */(this.constructor).trailing ?? false
}
set trailing(value) {
this.#trailing = value
@@ -230,6 +231,16 @@ export default class IEntity {
return result
}
/**
* @template {typeof IEntity} T
* @this {T}
*/
static flagTrailing(value = true) {
const result = this.asUniqueClass()
result.trailing = value
return result
}
/**
* @protected
* @param {String} string
@@ -299,6 +310,7 @@ export default class IEntity {
attributeSeparator = Self.attributeSeparator,
wrap = Self.wrap,
) {
const isSelfOverriden = Self !== this.constructor
let result = ""
let first = true
const keys = this instanceof IEntity ? this.keys : Object.keys(this)
@@ -315,7 +327,7 @@ export default class IEntity {
result += attributeSeparator
}
let keyValue = this instanceof Array ? `(${key})` : key
if (keyValue.length && (Self.attributes[key]?.quoted === true || value.quoted === true)) {
if (keyValue.length && (Self.attributes[key]?.quoted || value.quoted)) {
keyValue = `"${keyValue}"`
}
if (valueType.inlined) {
@@ -340,7 +352,7 @@ export default class IEntity {
let serialization = value?.serialize(insideString, indentation)
result += serialization
}
if (this instanceof IEntity && this.trailing && result.length) {
if (this instanceof IEntity && (isSelfOverriden && Self.trailing || this.trailing) && result.length) {
result += attributeSeparator
}
return wrap(/** @type {IEntity} */(this), result)
@@ -356,6 +368,7 @@ export default class IEntity {
attributeSeparator = Self.attributeSeparator,
wrap = Self.wrap,
) {
const isSelfOverriden = Self !== this.constructor
let result = this instanceof Array
? IEntity.prototype.doSerialize.bind(this)(insideString, indentation, Self, printKey, keySeparator, attributeSeparator, wrap)
: this.doSerialize(insideString, indentation, Self, printKey, keySeparator, attributeSeparator, wrap)