@dedot/api 0.17.0 → 0.17.1-next.9d03d21b.3

package/cjs/client/BaseSubstrateClient.js

@@ -325,7 +325,7 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
     setSigner(signer) {
         this._options.signer = signer;
     }
-    async queryMulti(queries, callback) {
+    async internalQueryMulti(queries, callback, blockHash) {
         // Extract keys from queries
         const keys = queries.map((q) => q.fn.rawKey(...(q.args || [])));
         const decodeValue = (query, rawValue) => {
@@ -341,10 +341,19 @@ class BaseSubstrateClient extends index_js_2.JsonRpcClient {
             });
         }
         else {
-            const results = await this.getStorageQuery().query(keys);
+            const results = await this.getStorageQuery().query(keys, blockHash);
             return queries.map((q, i) => decodeValue(q.fn, results[keys[i]]));
         }
     }
+    async queryMulti(queries, callback) {
+        // If a callback is provided, set up a subscription
+        if (callback) {
+            return this.internalQueryMulti(queries, callback);
+        }
+        else {
+            return this.internalQueryMulti(queries);
+        }
+    }
     getStorageQuery() {
         throw new Error('Unimplemented!');
     }

package/cjs/client/DedotClient.js

@@ -235,6 +235,10 @@ class DedotClient// prettier-end-here
         api.query = (0, proxychain_js_1.newProxyChain)({ executor: new index_js_1.StorageQueryExecutorV2(api, this.chainHead) });
         api.call = (0, proxychain_js_1.newProxyChain)({ executor: new index_js_1.RuntimeApiExecutorV2(api, this.chainHead) });
         api.view = (0, proxychain_js_1.newProxyChain)({ executor: new index_js_1.ViewFunctionExecutorV2(api, this.chainHead) });
+        // @ts-ignore Add queryMulti implementation for at-block queries
+        api.queryMulti = (queries) => {
+            return this.internalQueryMulti(queries, undefined, hash);
+        };
         this._apiAtCache.set(hash, api);
         return api;
     }

package/cjs/client/LegacyClient.js

@@ -255,6 +255,10 @@ class LegacyClient// prettier-end-here
         api.call = (0, proxychain_js_1.newProxyChain)({ executor: new index_js_1.RuntimeApiExecutor(api) });
         api.events = (0, proxychain_js_1.newProxyChain)({ executor: new index_js_1.EventExecutor(api) });
         api.errors = (0, proxychain_js_1.newProxyChain)({ executor: new index_js_1.ErrorExecutor(api) });
+        // @ts-ignore Add queryMulti implementation for at-block queries
+        api.queryMulti = (queries) => {
+            return this.internalQueryMulti(queries, undefined, hash);
+        };
         this._apiAtCache.set(hash, api);
         return api;
     }

package/client/BaseSubstrateClient.d.ts

@@ -77,6 +77,10 @@ export declare abstract class BaseSubstrateClient<Rv extends RpcVersion, ChainAp
     get tx(): ChainApi[Rv]['tx'];
     at<ChainApiAt extends GenericSubstrateApi = ChainApi[Rv]>(hash: BlockHash): Promise<ISubstrateClientAt<ChainApiAt>>;
     setSigner(signer?: InjectedSigner): void;
+    protected internalQueryMulti(queries: {
+        fn: GenericStorageQuery;
+        args?: any[];
+    }[], callback?: Callback<any[]>, blockHash?: BlockHash): Promise<any[] | Unsub>;
     /**
      * Query multiple storage items in a single call
      *

package/client/BaseSubstrateClient.js

@@ -321,7 +321,7 @@ export class BaseSubstrateClient extends JsonRpcClient {
     setSigner(signer) {
         this._options.signer = signer;
     }
-    async queryMulti(queries, callback) {
+    async internalQueryMulti(queries, callback, blockHash) {
         // Extract keys from queries
         const keys = queries.map((q) => q.fn.rawKey(...(q.args || [])));
         const decodeValue = (query, rawValue) => {
@@ -337,10 +337,19 @@ export class BaseSubstrateClient extends JsonRpcClient {
             });
         }
         else {
-            const results = await this.getStorageQuery().query(keys);
+            const results = await this.getStorageQuery().query(keys, blockHash);
             return queries.map((q, i) => decodeValue(q.fn, results[keys[i]]));
         }
     }
+    async queryMulti(queries, callback) {
+        // If a callback is provided, set up a subscription
+        if (callback) {
+            return this.internalQueryMulti(queries, callback);
+        }
+        else {
+            return this.internalQueryMulti(queries);
+        }
+    }
     getStorageQuery() {
         throw new Error('Unimplemented!');
     }

package/client/DedotClient.js

@@ -1,7 +1,7 @@
 import { $H256, $RuntimeVersion, PortableRegistry } from '@dedot/codecs';
 import { u32 } from '@dedot/shape';
-import { assert, concatU8a, noop, twox64Concat, u8aToHex, xxhashAsU8a, DedotError } from '@dedot/utils';
-import { ConstantExecutor, ErrorExecutor, EventExecutor, RuntimeApiExecutorV2, StorageQueryExecutorV2, ViewFunctionExecutorV2, TxExecutorV2, } from '../executor/index.js';
+import { assert, concatU8a, DedotError, noop, twox64Concat, u8aToHex, xxhashAsU8a } from '@dedot/utils';
+import { ConstantExecutor, ErrorExecutor, EventExecutor, RuntimeApiExecutorV2, StorageQueryExecutorV2, TxExecutorV2, ViewFunctionExecutorV2, } from '../executor/index.js';
 import { Archive, ChainHead, ChainSpec, Transaction, TransactionWatch } from '../json-rpc/index.js';
 import { newProxyChain } from '../proxychain.js';
 import { NewStorageQuery } from '../storage/index.js';
@@ -232,6 +232,10 @@ export class DedotClient// prettier-end-here
         api.query = newProxyChain({ executor: new StorageQueryExecutorV2(api, this.chainHead) });
         api.call = newProxyChain({ executor: new RuntimeApiExecutorV2(api, this.chainHead) });
         api.view = newProxyChain({ executor: new ViewFunctionExecutorV2(api, this.chainHead) });
+        // @ts-ignore Add queryMulti implementation for at-block queries
+        api.queryMulti = (queries) => {
+            return this.internalQueryMulti(queries, undefined, hash);
+        };
         this._apiAtCache.set(hash, api);
         return api;
     }

package/client/LegacyClient.js

@@ -252,6 +252,10 @@ export class LegacyClient// prettier-end-here
         api.call = newProxyChain({ executor: new RuntimeApiExecutor(api) });
         api.events = newProxyChain({ executor: new EventExecutor(api) });
         api.errors = newProxyChain({ executor: new ErrorExecutor(api) });
+        // @ts-ignore Add queryMulti implementation for at-block queries
+        api.queryMulti = (queries) => {
+            return this.internalQueryMulti(queries, undefined, hash);
+        };
         this._apiAtCache.set(hash, api);
         return api;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.17.0",
+  "version": "0.17.1-next.9d03d21b.3+9d03d21b",
   "description": "A delightful JavaScript/TypeScript client for Polkadot & Substrate",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -13,13 +13,13 @@
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dedot/codecs": "0.17.0",
-    "@dedot/providers": "0.17.0",
-    "@dedot/runtime-specs": "0.17.0",
-    "@dedot/shape": "0.17.0",
-    "@dedot/storage": "0.17.0",
-    "@dedot/types": "0.17.0",
-    "@dedot/utils": "0.17.0"
+    "@dedot/codecs": "0.17.1-next.9d03d21b.3+9d03d21b",
+    "@dedot/providers": "0.17.1-next.9d03d21b.3+9d03d21b",
+    "@dedot/runtime-specs": "0.17.1-next.9d03d21b.3+9d03d21b",
+    "@dedot/shape": "0.17.1-next.9d03d21b.3+9d03d21b",
+    "@dedot/storage": "0.17.1-next.9d03d21b.3+9d03d21b",
+    "@dedot/types": "0.17.1-next.9d03d21b.3+9d03d21b",
+    "@dedot/utils": "0.17.1-next.9d03d21b.3+9d03d21b"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
@@ -48,7 +48,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "77e751248ad7bca0cb374e17e65afef791fb3e4d",
+  "gitHead": "9d03d21b0b652b14222301b64682940047514172",
   "module": "./index.js",
   "types": "./index.d.ts"
 }

package/types.d.ts

@@ -99,6 +99,28 @@ export interface IGenericSubstrateClient<ChainApi extends GenericSubstrateApi =
     events: ChainApi['events'];
     errors: ChainApi['errors'];
     view: ChainApi['view'];
+    /**
+     * Query multiple storage items in a single call
+     *
+     * This method allows you to query multiple storage items in a single call with type safety
+     * for both the query functions and their results.
+     *
+     * @example
+     * // One-time query with type-safe results
+     * const [balance, blockNumber] = await client.queryMulti([
+     *   { fn: client.query.system.account, args: [ALICE] },
+     *   { fn: client.query.system.number, args: [] }
+     * ]);
+     *
+     * @template Fns Array of storage query functions
+     * @param queries - Array of query specifications, each with a function and optional arguments
+     * @returns Array of decoded values with proper types
+     */
+    queryMulti<Fns extends GenericStorageQuery[]>(queries: {
+        [K in keyof Fns]: Query<Fns[K]>;
+    }): Promise<{
+        [K in keyof Fns]: QueryFnResult<Fns[K]>;
+    }>;
 }
 /**
  * A generic interface for Substrate clients at a specific block
@@ -128,10 +150,30 @@ export interface ISubstrateClient<ChainApi extends GenericSubstrateApi = Generic
      */
     setSigner(signer?: InjectedSigner): void;
     /**
-     * Perform multiple storage queries in parallel
-     * @param queries - An array of query objects
-     * @param callback - Optional callback function to handle results
-     * @returns A promise resolving to an array of results or an Unsub function
+     * Query multiple storage items in a single call or subscribe to multiple storage items
+     *
+     * This method allows you to query multiple storage items in a single call or set up a subscription
+     * to multiple storage items. It provides type safety for both the query functions and their results.
+     *
+     * @example
+     * // One-time query with type-safe results
+     * const [balance, blockNumber] = await client.queryMulti([
+     *   { fn: client.query.system.account, args: [ALICE] },
+     *   { fn: client.query.system.number, args: [] }
+     * ]);
+     *
+     * // Subscription with callback
+     * const unsub = await client.queryMulti([
+     *   { fn: client.query.system.account, args: [ALICE] },
+     *   { fn: client.query.system.number, args: [] }
+     * ], (results) => {
+     *   console.log('Balance:', results[0], 'Block number:', results[1]);
+     * });
+     *
+     * @template Fns Array of storage query functions
+     * @param queries - Array of query specifications, each with a function and optional arguments
+     * @param callback - Optional callback for subscription-based queries
+     * @returns For one-time queries: Array of decoded values with proper types; For subscriptions: Unsubscribe function
      */
     queryMulti<Fns extends GenericStorageQuery[]>(queries: {
         [K in keyof Fns]: Query<Fns[K]>;