Inlined arrays fixed

barsdeveloper · Mar 25, 2024 · c14212b · c14212b
1 parent 77a583e
commit c14212b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/dist/ueblueprint.js b/dist/ueblueprint.js
@@ -3083,7 +3083,7 @@ class Grammar {
     /**
      * @template T
      * @param {AttributeInfo<T>} attribute
-     * @returns {Parsernostrum<DescribedType<T>>}
+     * @returns {Parsernostrum<T>}
      */
     static grammarFor(attribute, type = attribute?.type, defaultGrammar = this.unknownValue) {
         let result = defaultGrammar;
@@ -3104,6 +3104,7 @@ class Grammar {
                     : Parsernostrum.alt(acc, cur)
                 );
         } else if (type instanceof MirroredEntity) {
+            // @ts-expect-error
             return this.grammarFor(undefined, type.getTargetType())
                 .map(v => new MirroredEntity(type.type, () => v))
         } else if (attribute?.constructor === Object) {
@@ -6125,7 +6126,7 @@ class Serializer {
                 } else {
                     result += attributeSeparator;
                 }
-                if (attributes[key]?.inlined) {
+                if (AttributeInfo.getAttribute(entity, key, "inlined")) {
                     result += this.doWrite(
                         value,
                         insideString,
@@ -6134,7 +6135,7 @@ class Serializer {
                         attributeSeparator,
                         false,
                         attributeValueConjunctionSign,
-                        attributes[key].type instanceof Array
+                        AttributeInfo.getAttribute(entity, key, "type") instanceof Array
                             ? k => attributeKeyPrinter(`${keyValue}${k}`)
                             : k => attributeKeyPrinter(`${keyValue}.${k}`)
                     );

diff --git a/dist/ueblueprint.min.js b/dist/ueblueprint.min.js
diff --git a/js/serialization/Serializer.js b/js/serialization/Serializer.js
@@ -96,7 +96,7 @@ export default class Serializer {
                 } else {
                     result += attributeSeparator
                 }
-                if (attributes[key]?.inlined) {
+                if (AttributeInfo.getAttribute(entity, key, "inlined")) {
                     result += this.doWrite(
                         value,
                         insideString,
@@ -105,7 +105,7 @@ export default class Serializer {
                         attributeSeparator,
                         false,
                         attributeValueConjunctionSign,
-                        attributes[key].type instanceof Array
+                        AttributeInfo.getAttribute(entity, key, "type") instanceof Array
                             ? k => attributeKeyPrinter(`${keyValue}${k}`)
                             : k => attributeKeyPrinter(`${keyValue}.${k}`)
                     )