From 07c37656862584cb2b23138bbb48eb84753bcc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ti=E1=BA=BFn=20Nguy=E1=BB=85n=20Kh=E1=BA=AFc?=
 <tien.nguyenkhac@icloud.com>
Date: Wed, 12 Jun 2024 14:51:14 +1200
Subject: [PATCH] fix: incorrect multi payload type

---
 apps/example/src/App.tsx          |  3 +--
 packages/core/src/QueryBuilder.ts | 36 +++++++++++++++----------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/apps/example/src/App.tsx b/apps/example/src/App.tsx
index c6957193..a3ffad50 100644
--- a/apps/example/src/App.tsx
+++ b/apps/example/src/App.tsx
@@ -37,8 +37,7 @@ const Query = () => {
       .readStorage("Balances", "TotalIssuance", [])
       .readStorage("Staking", "ActiveEra", [])
       .readStorage("NominationPools", "TotalValueLocked", [])
-      .readStorages("NominationPools", "Metadata", [[0], [1], [2], [3], [4]])
-      .readStorage("Treasury", "ProposalCount", []),
+      .readStorages("NominationPools", "Metadata", [[0], [1], [2], [3], [4]]),
   );
 
   const bondingDurationMs =
diff --git a/packages/core/src/QueryBuilder.ts b/packages/core/src/QueryBuilder.ts
index d8bfdccd..e5505338 100644
--- a/packages/core/src/QueryBuilder.ts
+++ b/packages/core/src/QueryBuilder.ts
@@ -100,7 +100,7 @@ type ConstantFetchPayload<
   TypedApi<TDescriptor>["constants"][TInstruction["pallet"]][TInstruction["constant"]]
 >;
 
-type StorageReadPayload<
+type StorageReadResponse<
   TInstruction extends
     | StorageReadInstruction<any, any, any, TDescriptor>
     | MultiInstruction<StorageReadInstruction<any, any, any, TDescriptor>>,
@@ -109,7 +109,7 @@ type StorageReadPayload<
   TypedApi<TDescriptor>["query"][TInstruction["pallet"]][TInstruction["storage"]]
 >["response"];
 
-type StorageEntriesReadPayload<
+type StorageEntriesReadResponse<
   TInstruction extends StorageEntriesReadInstruction<
     any,
     any,
@@ -121,7 +121,7 @@ type StorageEntriesReadPayload<
   TypedApi<TDescriptor>["query"][TInstruction["pallet"]][TInstruction["storage"]]
 >["response"];
 
-type ApiCallPayload<
+type ApiCallResponse<
   TInstruction extends
     | ApiCallInstruction<any, any, any, TDescriptor>
     | MultiInstruction<ApiCallInstruction<any, any, any, TDescriptor>>,
@@ -139,42 +139,42 @@ export type InferInstructionResponse<
     : TInstruction extends MultiInstruction<
           StorageReadInstruction<any, any, any, TDescriptor>
         >
-      ? Array<StorageReadPayload<TInstruction, TDescriptor>>
+      ? Array<StorageReadResponse<TInstruction, TDescriptor>>
       : TInstruction extends StorageReadInstruction<any, any, any, TDescriptor>
-        ? StorageReadPayload<TInstruction, TDescriptor>
+        ? StorageReadResponse<TInstruction, TDescriptor>
         : TInstruction extends StorageEntriesReadInstruction<
               any,
               any,
               any,
               TDescriptor
             >
-          ? StorageEntriesReadPayload<TInstruction, TDescriptor>
+          ? StorageEntriesReadResponse<TInstruction, TDescriptor>
           : TInstruction extends MultiInstruction<
                 ApiCallInstruction<any, any, any, TDescriptor>
               >
-            ? Array<ApiCallPayload<TInstruction, TDescriptor>>
+            ? Array<ApiCallResponse<TInstruction, TDescriptor>>
             : TInstruction extends ApiCallInstruction<
                   any,
                   any,
                   any,
                   TDescriptor
                 >
-              ? ApiCallPayload<TInstruction, TDescriptor>
+              ? ApiCallResponse<TInstruction, TDescriptor>
               : never;
 
+type ResponsePayload<T> =
+  T extends Promise<infer Payload>
+    ? Payload
+    : T extends Observable<infer Payload>
+      ? Payload
+      : T extends Array<infer Element>
+        ? Array<ResponsePayload<Element>>
+        : unknown;
+
 export type InferInstructionPayload<
   TInstruction extends QueryInstruction,
   TDescriptor extends ChainDefinition = ReDotDescriptor,
-> =
-  InferInstructionResponse<TInstruction, TDescriptor> extends Promise<
-    infer Payload
-  >
-    ? Payload
-    : InferInstructionResponse<TInstruction, TDescriptor> extends Observable<
-          infer Payload
-        >
-      ? Payload
-      : InferInstructionResponse<TInstruction, TDescriptor>;
+> = ResponsePayload<InferInstructionResponse<TInstruction, TDescriptor>>;
 
 export type InferInstructionsResponse<
   TInstructions extends QueryInstruction[],