refactor: temporary remove call options from argument

tien · Jun 18, 2024 · 0a0ec9b · 0a0ec9b
1 parent 6ddd644
commit 0a0ec9b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/apps/example/index.html b/apps/example/index.html
@@ -1,8 +1,9 @@
 <!doctype html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8" />
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Reactive DOT demo</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/packages/core/src/QueryBuilder.ts b/packages/core/src/QueryBuilder.ts
@@ -9,15 +9,17 @@ type InferPapiStorageEntry<T> = T extends {
   ? { args: Args; response: Response }
   : { args: unknown[]; response: unknown };
 
-type InferPapiStorageEntryWithKeys<T> = T extends {
-  getEntries: (...args: infer Args) => infer Response;
+type InferPapiStorageEntries<T> = T extends {
+  getEntries: (...args: [...infer Args, infer Options]) => infer Response;
 }
-  ? { args: Args; response: Response }
-  : { args: unknown[]; response: unknown };
+  ? { args: Args; options: Options; response: Response }
+  : { args: unknown[]; options: unknown; response: unknown };
 
-type InferPapiRuntimeCall<T> = T extends (...args: infer Args) => infer Response
-  ? { args: Args; response: Response }
-  : { args: unknown[]; response: unknown };
+type InferPapiRuntimeCall<T> = T extends (
+  ...args: [...infer Args, infer Options]
+) => infer Response
+  ? { args: Args; options: Options; response: Response }
+  : { args: unknown[]; options: unknown; response: unknown };
 
 type InferPapiConstantEntry<T> = T extends {
   (): Promise<infer Payload>;
@@ -55,7 +57,7 @@ export type StorageReadInstruction<
 export type StorageEntriesReadInstruction<
   TPallet extends keyof TypedApi<TDescriptor>["query"],
   TStorage extends keyof TypedApi<TDescriptor>["query"][TPallet],
-  TArguments extends InferPapiStorageEntryWithKeys<
+  TArguments extends InferPapiStorageEntries<
     TypedApi<TDescriptor>["query"][TPallet][TStorage]
   >["args"],
   TDescriptor extends ChainDefinition = CommonDescriptor,
@@ -117,7 +119,7 @@ type StorageEntriesReadResponse<
     TDescriptor
   >,
   TDescriptor extends ChainDefinition = CommonDescriptor,
-> = InferPapiStorageEntryWithKeys<
+> = InferPapiStorageEntries<
   TypedApi<TDescriptor>["query"][TInstruction["pallet"]][TInstruction["storage"]]
 >["response"];
 
@@ -261,7 +263,7 @@ export default class Query<
     TPallet extends keyof TypedApi<TDescriptor>["query"],
     TStorage extends keyof TypedApi<TDescriptor>["query"][TPallet],
     TArguments extends Array<
-      InferPapiStorageEntryWithKeys<
+      InferPapiStorageEntries<
         TypedApi<TDescriptor>["query"][TPallet][TStorage]
       >["args"]
     >,