From 9d6b49870942ea282d4e978074cdf224aa864aa1 Mon Sep 17 00:00:00 2001 From: barsdeveloper Date: Sat, 1 Apr 2023 15:44:03 +0200 Subject: [PATCH] Details fixed --- dist/ueblueprint.js | 23 +++++++++++------------ js/element/NodeElement.js | 2 +- js/element/PinElement.js | 12 ++++++------ js/entity/IEntity.js | 3 +-- js/entity/PinEntity.js | 8 ++++---- js/entity/UnknownKeysEntity.js | 4 ++-- js/serialization/ISerializer.js | 1 - 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dist/ueblueprint.js b/dist/ueblueprint.js index c749507..819d04f 100755 --- a/dist/ueblueprint.js +++ b/dist/ueblueprint.js @@ -878,7 +878,6 @@ class Utility { /** * @typedef {(entity: IEntity) => AnyValue} ValueSupplier - * @typedef {(entity: IEntity) => AnyValueConstructor} TypeSupplier * @typedef {IEntity | String | Number | BigInt | Boolean} AnySimpleValue * @typedef {AnySimpleValue | AnySimpleValue[]} AnyValue * @typedef {{ @@ -886,7 +885,7 @@ class Utility { * }} AttributeDeclarations * @typedef {typeof IEntity} EntityConstructor * @typedef {{ - * type?: AnyValueConstructor | AnyValueConstructor[] | UnionType | TypeSupplier, + * type?: AnyValueConstructor | AnyValueConstructor[] | UnionType | ComputedType, * value?: AnyValue | ValueSupplier, * showDefault?: Boolean, * nullable?: Boolean, @@ -2138,12 +2137,12 @@ class PinEntity extends IEntity { linkTo(targetObjectName, targetPinEntity) { const linkFound = this.LinkedTo?.some(pinReferenceEntity => pinReferenceEntity.objectName.toString() == targetObjectName - && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity["PinId"].valueOf() + && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity.PinId.valueOf() ); if (!linkFound) { (this.LinkedTo ??= []).push(new PinReferenceEntity({ objectName: targetObjectName, - pinGuid: targetPinEntity["PinId"], + pinGuid: targetPinEntity.PinId, })); return true } @@ -2157,7 +2156,7 @@ class PinEntity extends IEntity { unlinkFrom(targetObjectName, targetPinEntity) { const indexElement = this.LinkedTo?.findIndex(pinReferenceEntity => { return pinReferenceEntity.objectName.toString() == targetObjectName - && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity["PinId"].valueOf() + && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity.PinId.valueOf() }); if (indexElement >= 0) { this.LinkedTo.splice(indexElement, 1); @@ -7435,7 +7434,7 @@ class NodeElement extends ISelectableDraggableElement { for (let targetPinReference of sourcePinElement.getLinks()) { this.blueprint.getPin(targetPinReference).redirectLink(sourcePinElement, new PinReferenceEntity({ objectName: name, - pinGuid: sourcePinElement.entity["PinId"], + pinGuid: sourcePinElement.entity.PinId, })); } } @@ -9265,9 +9264,9 @@ class PinElement extends IElement { nodeElement = undefined ) { super.initialize(entity, template); - this.pinId = this.entity["PinId"]; + this.pinId = this.entity.PinId; this.pinType = this.entity.getType(); - this.advancedView = this.entity["bAdvancedView"]; + this.advancedView = this.entity.bAdvancedView; this.defaultValue = this.entity.getDefaultValue(); this.color = PinElement.properties.color.converter.fromAttribute(this.getColor().toString()); this.isLinked = false; @@ -9289,12 +9288,12 @@ class PinElement extends IElement { /** @return {GuidEntity} */ getPinId() { - return this.entity["PinId"] + return this.entity.PinId } /** @returns {String} */ getPinName() { - return this.entity["PinName"] + return this.entity.PinName } getPinDisplayName() { @@ -9332,7 +9331,7 @@ class PinElement extends IElement { /** @param {T} value */ setDefaultValue(value) { - this.entity["DefaultValue"] = value; + this.entity.DefaultValue = value; this.defaultValue = value; } @@ -9398,7 +9397,7 @@ class PinElement extends IElement { redirectLink(originalPinElement, newReference) { const index = this.getLinks().findIndex(pinReference => pinReference.objectName.toString() == originalPinElement.getNodeElement().getNodeName() - && pinReference.pinGuid.valueOf() == originalPinElement.entity["PinId"].valueOf() + && pinReference.pinGuid.valueOf() == originalPinElement.entity.PinId.valueOf() ); if (index >= 0) { this.entity.LinkedTo[index] = newReference; diff --git a/js/element/NodeElement.js b/js/element/NodeElement.js index f1a47d8..de5c6bc 100644 --- a/js/element/NodeElement.js +++ b/js/element/NodeElement.js @@ -265,7 +265,7 @@ export default class NodeElement extends ISelectableDraggableElement { for (let targetPinReference of sourcePinElement.getLinks()) { this.blueprint.getPin(targetPinReference).redirectLink(sourcePinElement, new PinReferenceEntity({ objectName: name, - pinGuid: sourcePinElement.entity["PinId"], + pinGuid: sourcePinElement.entity.PinId, })) } } diff --git a/js/element/PinElement.js b/js/element/PinElement.js index d288ca8..5c2ff9a 100644 --- a/js/element/PinElement.js +++ b/js/element/PinElement.js @@ -136,9 +136,9 @@ export default class PinElement extends IElement { nodeElement = undefined ) { super.initialize(entity, template) - this.pinId = this.entity["PinId"] + this.pinId = this.entity.PinId this.pinType = this.entity.getType() - this.advancedView = this.entity["bAdvancedView"] + this.advancedView = this.entity.bAdvancedView this.defaultValue = this.entity.getDefaultValue() this.color = PinElement.properties.color.converter.fromAttribute(this.getColor().toString()) this.isLinked = false @@ -160,12 +160,12 @@ export default class PinElement extends IElement { /** @return {GuidEntity} */ getPinId() { - return this.entity["PinId"] + return this.entity.PinId } /** @returns {String} */ getPinName() { - return this.entity["PinName"] + return this.entity.PinName } getPinDisplayName() { @@ -203,7 +203,7 @@ export default class PinElement extends IElement { /** @param {T} value */ setDefaultValue(value) { - this.entity["DefaultValue"] = value + this.entity.DefaultValue = value this.defaultValue = value } @@ -269,7 +269,7 @@ export default class PinElement extends IElement { redirectLink(originalPinElement, newReference) { const index = this.getLinks().findIndex(pinReference => pinReference.objectName.toString() == originalPinElement.getNodeElement().getNodeName() - && pinReference.pinGuid.valueOf() == originalPinElement.entity["PinId"].valueOf() + && pinReference.pinGuid.valueOf() == originalPinElement.entity.PinId.valueOf() ) if (index >= 0) { this.entity.LinkedTo[index] = newReference diff --git a/js/entity/IEntity.js b/js/entity/IEntity.js index cc658b5..7cc9e37 100644 --- a/js/entity/IEntity.js +++ b/js/entity/IEntity.js @@ -5,7 +5,6 @@ import Utility from "../Utility.js" /** * @typedef {(entity: IEntity) => AnyValue} ValueSupplier - * @typedef {(entity: IEntity) => AnyValueConstructor} TypeSupplier * @typedef {IEntity | String | Number | BigInt | Boolean} AnySimpleValue * @typedef {AnySimpleValue | AnySimpleValue[]} AnyValue * @typedef {{ @@ -13,7 +12,7 @@ import Utility from "../Utility.js" * }} AttributeDeclarations * @typedef {typeof IEntity} EntityConstructor * @typedef {{ - * type?: AnyValueConstructor | AnyValueConstructor[] | UnionType | TypeSupplier, + * type?: AnyValueConstructor | AnyValueConstructor[] | UnionType | ComputedType, * value?: AnyValue | ValueSupplier, * showDefault?: Boolean, * nullable?: Boolean, diff --git a/js/entity/PinEntity.js b/js/entity/PinEntity.js index 76ac784..734ed56 100755 --- a/js/entity/PinEntity.js +++ b/js/entity/PinEntity.js @@ -1,4 +1,5 @@ import ByteEntity from "./ByteEntity.js" +import ComputedType from "./ComputedType.js" import Configuration from "../Configuration.js" import EnumEntity from "./EnumEntity.js" import FormatTextEntity from "./FormatTextEntity.js" @@ -21,7 +22,6 @@ import UnionType from "./UnionType.js" import Utility from "../Utility.js" import Vector2DEntity from "./Vector2DEntity.js" import VectorEntity from "./VectorEntity.js" -import ComputedType from "./ComputedType.js" /** * @typedef {import("./IEntity").AnyValue} AnyValue @@ -242,12 +242,12 @@ export default class PinEntity extends IEntity { linkTo(targetObjectName, targetPinEntity) { const linkFound = this.LinkedTo?.some(pinReferenceEntity => pinReferenceEntity.objectName.toString() == targetObjectName - && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity["PinId"].valueOf() + && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity.PinId.valueOf() ) if (!linkFound) { (this.LinkedTo ??= []).push(new PinReferenceEntity({ objectName: targetObjectName, - pinGuid: targetPinEntity["PinId"], + pinGuid: targetPinEntity.PinId, })) return true } @@ -261,7 +261,7 @@ export default class PinEntity extends IEntity { unlinkFrom(targetObjectName, targetPinEntity) { const indexElement = this.LinkedTo?.findIndex(pinReferenceEntity => { return pinReferenceEntity.objectName.toString() == targetObjectName - && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity["PinId"].valueOf() + && pinReferenceEntity.pinGuid.valueOf() == targetPinEntity.PinId.valueOf() }) if (indexElement >= 0) { this.LinkedTo.splice(indexElement, 1) diff --git a/js/entity/UnknownKeysEntity.js b/js/entity/UnknownKeysEntity.js index a8ed42d..64e31b3 100644 --- a/js/entity/UnknownKeysEntity.js +++ b/js/entity/UnknownKeysEntity.js @@ -3,10 +3,10 @@ import IEntity from "./IEntity.js" export default class UnknownKeysEntity extends IEntity { static attributes = { - lookbehind: - { + lookbehind: { value: "", showDefault: false, + ignore: true, }, } diff --git a/js/serialization/ISerializer.js b/js/serialization/ISerializer.js index d19b00b..3963d18 100644 --- a/js/serialization/ISerializer.js +++ b/js/serialization/ISerializer.js @@ -1,6 +1,5 @@ import SerializerFactory from "./SerializerFactory.js" import Utility from "../Utility.js" -import IEntity from "../entity/IEntity.js" /** * @typedef {import("../entity/IEntity").EntityConstructor} EntityConstructor