Ma/ueblueprint
1
0
Fork 0
mirror of https://github.com/barsdeveloper/ueblueprint.git synced 2026-02-16 10:54:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix keys order for unknown values

Browse Source
This commit is contained in:
barsdeveloper
2022-04-12 23:07:06 +02:00
parent f71edf1a3c
commit f29119809f
4 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dist/ueblueprint.js vendored
View File

@@ -1046,6 +1046,29 @@ class Utility {
gridSize * Math.round(location[1] / gridSize)
]
}
/**
* @template T
* @param {Array<T>} a
* @param {Array<T>} b
*/
static mergeArrays(a = [], b = []) {
let result = [];
for (let j = 0; j < b.length; ++j) {
for (let i = 0; i < a.length; ++i) {
if (a[i] == b[j]) {
result.push(...a.splice(0, i), ...b.splice(0, j), ...a.splice(0, 1));
j = 0;
i = 0;
b.shift();
break
}
}
}
return [...(new Set(result.concat(...a, ...b)))]
}
}
// @ts-check
@@ -1071,7 +1094,10 @@ class IEntity {
const defineAllAttributes = (prefix, target, properties, values) => {
let fullKey = prefix.concat("");
const last = fullKey.length - 1;
for (let property of Object.getOwnPropertyNames(properties)) {
for (let property of Utility.mergeArrays(
Object.getOwnPropertyNames(properties),
Object.getOwnPropertyNames(values ?? {})
)) {
fullKey[last] = property;
let defaultValue = properties[property];
const defaultType = (defaultValue instanceof TypeInitialization)
@@ -1099,7 +1125,7 @@ class IEntity {
}
if (defaultValue instanceof TypeInitialization) {
if (!defaultValue.showDefault) {
target[property] = undefined; // to preserve the order
target[property] = undefined; // Declare undefined to preserve the order or attributes
continue
}
defaultValue = defaultValue.value;
@@ -1492,6 +1518,7 @@ class ObjectEntity extends IEntity {
NodePosX: IntegerEntity,
NodePosY: IntegerEntity,
AdvancedPinDisplay: new TypeInitialization(IdentifierEntity, false, null),
EnabledState: new TypeInitialization(IdentifierEntity, false, null),
NodeGuid: GuidEntity,
ErrorType: new TypeInitialization(IntegerEntity, false),
ErrorMsg: new TypeInitialization(String, false, ""),
@@ -1512,6 +1539,7 @@ class ObjectEntity extends IEntity {
/** @type {IntegerEntity} */ this.NodePosX;
/** @type {IntegerEntity} */ this.NodePosY;
/** @type {IdentifierEntity} */ this.AdvancedPinDisplay;
/** @type {IdentifierEntity} */ this.EnabledState;
/** @type {GuidEntity} */ this.NodeGuid;
/** @type {IntegerEntity} */ this.ErrorType;
/** @type {String} */ this.ErrorMsg;

23
js/Utility.js
View File

@@ -118,4 +118,27 @@ export default class Utility {
gridSize * Math.round(location[1] / gridSize)
]
}
/**
* @template T
* @param {Array<T>} a
* @param {Array<T>} b
*/
static mergeArrays(a = [], b = []) {
let result = []
for (let j = 0; j < b.length; ++j) {
for (let i = 0; i < a.length; ++i) {
if (a[i] == b[j]) {
result.push(...a.splice(0, i), ...b.splice(0, j), ...a.splice(0, 1))
j = 0
i = 0
b.shift()
break
}
}
}
return [...(new Set(result.concat(...a, ...b)))]
}
}

5
js/entity/IEntity.js
View File

@@ -24,7 +24,10 @@ export default class IEntity {
const defineAllAttributes = (prefix, target, properties, values) => {
let fullKey = prefix.concat("")
const last = fullKey.length - 1
for (let property of Object.getOwnPropertyNames(properties)) {
for (let property of Utility.mergeArrays(
Object.getOwnPropertyNames(properties),
Object.getOwnPropertyNames(values ?? {})
)) {
fullKey[last] = property
let defaultValue = properties[property]
const defaultType = (defaultValue instanceof TypeInitialization)

2
js/entity/ObjectEntity.js
View File

@@ -23,6 +23,7 @@ export default class ObjectEntity extends IEntity {
NodePosX: IntegerEntity,
NodePosY: IntegerEntity,
AdvancedPinDisplay: new TypeInitialization(IdentifierEntity, false, null),
EnabledState: new TypeInitialization(IdentifierEntity, false, null),
NodeGuid: GuidEntity,
ErrorType: new TypeInitialization(IntegerEntity, false),
ErrorMsg: new TypeInitialization(String, false, ""),
@@ -43,6 +44,7 @@ export default class ObjectEntity extends IEntity {
/** @type {IntegerEntity} */ this.NodePosX
/** @type {IntegerEntity} */ this.NodePosY
/** @type {IdentifierEntity} */ this.AdvancedPinDisplay
/** @type {IdentifierEntity} */ this.EnabledState
/** @type {GuidEntity} */ this.NodeGuid
/** @type {IntegerEntity} */ this.ErrorType
/** @type {String} */ this.ErrorMsg