Merge remote-tracking branch 'origin/master' into mirrored-object-reference-fix

js/entity/BlueprintEntity.js

@@ -15,7 +15,7 @@ export default class BlueprintEntity extends ObjectEntity {
 
     /** @param {ObjectEntity} entity */
     getHomonymObjectEntity(entity) {
-        const name = entity.getObjectName(false)
+        const name = entity.getObjectName()
         return this.#objectEntities.find(entity => entity.getObjectName() == name)
     }
 

js/entity/IEntity.js

@@ -61,6 +61,14 @@ export default class IEntity {
         this.#ignored = value
     }
 
+    #inlined = /** @type {typeof IEntity} */(this.constructor).inlined
+    get inlined() {
+        return this.#inlined
+    }
+    set inlined(value) {
+        this.#inlined = value
+    }
+
     #quoted
     get quoted() {
         return this.#quoted ?? /** @type {typeof IEntity} */(this.constructor).quoted ?? false
@@ -331,7 +339,7 @@ export default class IEntity {
             if (keyValue.length && (Self.attributes[key]?.quoted || value.quoted)) {
                 keyValue = `"${keyValue}"`
             }
-            if (valueType.inlined) {
+            if (value.inlined) {
                 const inlinedPrintKey = valueType.className() === "ArrayEntity"
                     ? k => printKey(`${keyValue}${k}`)
                     : k => printKey(`${keyValue}.${k}`)

js/entity/PinEntity.js

@@ -89,11 +89,11 @@ export default class PinEntity extends IEntity {
         AutogeneratedDefaultValue: StringEntity,
         DefaultObject: ObjectReferenceEntity,
         PersistentGuid: GuidEntity,
-        bHidden: BooleanEntity.withDefault(),
-        bNotConnectable: BooleanEntity.withDefault(),
-        bDefaultValueIsReadOnly: BooleanEntity.withDefault(),
-        bDefaultValueIsIgnored: BooleanEntity.withDefault(),
-        bAdvancedView: BooleanEntity.withDefault(),
+        bHidden: BooleanEntity,
+        bNotConnectable: BooleanEntity,
+        bDefaultValueIsReadOnly: BooleanEntity,
+        bDefaultValueIsIgnored: BooleanEntity,
+        bAdvancedView: BooleanEntity,
         bOrphanedPin: BooleanEntity,
     }
     static grammar = this.createGrammar()

js/entity/PinTypeEntity.js

@@ -12,7 +12,7 @@ export default class PinTypeEntity extends IEntity {
     static attributes = {
         ...super.attributes,
         PinCategory: StringEntity.withDefault(),
-        PinSubCategory: StringEntity.withDefault(),
+        PinSubCategory: StringEntity,
         PinSubCategoryObject: ObjectReferenceEntity,
         PinSubCategoryMemberReference: FunctionReferenceEntity,
         ContainerType: SymbolEntity,

js/entity/UnknownPinEntity.js

@@ -1,15 +1,22 @@
 import P from "parsernostrum"
 import Grammar from "../serialization/Grammar.js"
+import GuidEntity from "./GuidEntity.js"
 import PinEntity from "./PinEntity.js"
 
 export default class UnknownPinEntity extends PinEntity {
 
+    static attributes = {
+        ...super.attributes,
+        PinId: GuidEntity
+    }
+
     static grammar = this.createGrammar()
 
     /** @returns {P<UnknownPinEntity>} */
     static createGrammar() {
         return P.seq(
-            P.reg(new RegExp(`(${Grammar.Regex.Symbol.source})\\s*\\(\\s*`), 1),
+            // Lookbehind
+            P.reg(new RegExp(`(${Grammar.Regex.Symbol.source}\\s*)\\(\\s*`), 1),
             Grammar.createAttributeGrammar(this).sepBy(Grammar.commaSeparation),
             P.reg(/\s*(?:,\s*)?\)/)
         ).map(([lookbehind, attributes, _2]) => {