From c05cb79005e2cec68250ce9fb47d80575ff54fa3 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Fri, 17 Jun 2022 16:56:02 +0200
Subject: [PATCH] Adjust PortableRegistry objectSpread (#4947)

---
 .../PortableRegistry/PortableRegistry.ts       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/types/src/metadata/PortableRegistry/PortableRegistry.ts b/packages/types/src/metadata/PortableRegistry/PortableRegistry.ts
index a99791ff85..ed97e55e1d 100644
--- a/packages/types/src/metadata/PortableRegistry/PortableRegistry.ts
+++ b/packages/types/src/metadata/PortableRegistry/PortableRegistry.ts
@@ -781,7 +781,7 @@ export class PortableRegistry extends Struct implements ILookup {
         {},
         typeDef,
         lookupIndex === -1
-          ? {}
+          ? null
           : {
             lookupIndex,
             lookupName: this.#names[lookupIndex],
@@ -799,18 +799,18 @@ export class PortableRegistry extends Struct implements ILookup {
       {
         info: isTuple // Tuple check first
           ? TypeDefInfo.Tuple
-          : TypeDefInfo.Struct
+          : TypeDefInfo.Struct,
+        sub
       },
       alias.size
         ? { alias }
         : null,
       lookupIndex === -1
-        ? {}
+        ? null
         : {
           lookupIndex,
           lookupName: this.#names[lookupIndex]
-        },
-      { sub }
+        }
     ));
   }
 
@@ -832,12 +832,11 @@ export class PortableRegistry extends Struct implements ILookup {
         }
 
         sub[i] = objectSpread(
-          {},
-          typeDef,
           {
             docs: sanitizeDocs(docs),
             name: nameField
           },
+          typeDef,
           typeName.isSome
             ? { typeName: sanitize(typeName.unwrap()) }
             : null
@@ -850,12 +849,11 @@ export class PortableRegistry extends Struct implements ILookup {
 
   #extractHistoric (_: number, type: Type): TypeDef {
     return objectSpread(
-      {},
-      getTypeDef(type),
       {
         displayName: type.toString(),
         isFromSi: true
-      }
+      },
+      getTypeDef(type)
     );
   }