@polkadot/api-base 17.0.1 → 17.0.2

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@polkadot/api-base', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '17.0.1' };
+exports.packageInfo = { name: '@polkadot/api-base', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '17.0.2' };

package/cjs/types/storage.d.ts

@@ -4,6 +4,10 @@ import type { Hash } from '@polkadot/types/interfaces';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { AnyFunction, AnyTuple, Callback, Codec, IStorageKey } from '@polkadot/types/types';
 import type { ApiTypes, DropLast, EmptyBase, MethodResult, PaginationOptions, PromiseOrObs, ReturnCodec, UnsubscribePromise } from './base.js';
+declare const storageEntryResult: unique symbol;
+interface StorageEntryResult<R extends Codec> {
+    readonly [storageEntryResult]?: R;
+}
 type StorageEntryObservableMulti<R extends Codec = Codec> = <T extends Codec = R>(args: unknown[]) => Observable<T[]>;
 interface StorageEntryPromiseMulti<R extends Codec = Codec> {
     <T extends Codec = R>(args: unknown[]): Promise<T[]>;
@@ -57,18 +61,27 @@ export interface StorageEntryBaseAt<ApiType extends ApiTypes, F extends AnyFunct
 }
 export type QueryableModuleStorage<ApiType extends ApiTypes> = Record<string, QueryableStorageEntry<ApiType, AnyTuple>>;
 export type QueryableModuleStorageAt<ApiType extends ApiTypes> = Record<string, QueryableStorageEntryAt<ApiType, AnyTuple>>;
-export type QueryableStorageMultiArg<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType> | [
-    QueryableStorageEntry<ApiType>,
-    ...unknown[]
-];
-export type QueryableStorageMultiBase<ApiType extends ApiTypes> = <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[]) => Observable<T>;
+export type QueryableStorageMultiArg<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType> | readonly [QueryableStorageEntry<ApiType>, ...unknown[]];
+type QueryableStorageMultiCallResult<Call> = Call extends readonly [infer Entry, ...unknown[]] ? Entry extends StorageEntryResult<infer R> ? R : Codec : Call extends StorageEntryResult<infer R> ? R : Codec;
+type QueryableStorageMultiResult<ApiType extends ApiTypes, Calls extends readonly QueryableStorageMultiArg<ApiType>[]> = {
+    -readonly [Index in keyof Calls]: QueryableStorageMultiCallResult<Calls[Index]>;
+};
+type QueryableStorageMultiReturn<ApiType extends ApiTypes, T extends Codec[], Calls extends readonly QueryableStorageMultiArg<ApiType>[]> = [
+    T
+] extends [never] ? QueryableStorageMultiResult<ApiType, Calls> : T;
+export interface QueryableStorageMultiBase<ApiType extends ApiTypes> {
+    <T extends Codec[] = never, Calls extends readonly QueryableStorageMultiArg<ApiType>[] = readonly QueryableStorageMultiArg<ApiType>[]>(calls: readonly [...Calls]): Observable<QueryableStorageMultiReturn<ApiType, T, Calls>>;
+    <T extends Codec[] = Codec[]>(calls: readonly QueryableStorageMultiArg<ApiType>[]): Observable<T>;
+}
 export interface QueryableStorageMultiPromise<ApiType extends ApiTypes> {
-    <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[], callback: Callback<T>): UnsubscribePromise;
-    <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[]): Promise<T>;
+    <T extends Codec[] = never, Calls extends readonly QueryableStorageMultiArg<ApiType>[] = readonly QueryableStorageMultiArg<ApiType>[]>(calls: readonly [...Calls], callback: Callback<QueryableStorageMultiReturn<ApiType, T, Calls>>): UnsubscribePromise;
+    <T extends Codec[] = Codec[]>(calls: readonly QueryableStorageMultiArg<ApiType>[], callback: Callback<T>): UnsubscribePromise;
+    <T extends Codec[] = never, Calls extends readonly QueryableStorageMultiArg<ApiType>[] = readonly QueryableStorageMultiArg<ApiType>[]>(calls: readonly [...Calls]): Promise<QueryableStorageMultiReturn<ApiType, T, Calls>>;
+    <T extends Codec[] = Codec[]>(calls: readonly QueryableStorageMultiArg<ApiType>[]): Promise<T>;
 }
 export type QueryableStorageMulti<ApiType extends ApiTypes> = ApiType extends 'rxjs' ? QueryableStorageMultiBase<ApiType> : QueryableStorageMultiPromise<ApiType>;
-export type AugmentedQuery<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBase<ApiType, F, A>;
-export type AugmentedQueryAt<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBaseAt<ApiType, F, A>;
+export type AugmentedQuery<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBase<ApiType, F, A> & StorageEntryResult<ReturnCodec<F>>;
+export type AugmentedQueryAt<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBaseAt<ApiType, F, A> & StorageEntryResult<ReturnCodec<F>>;
 export type AugmentedQueryDoubleMap<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = AugmentedQuery<ApiType, F, A>;
 export interface AugmentedQueries<ApiType extends ApiTypes> extends EmptyBase<ApiType> {
 }

package/package.json

@@ -18,7 +18,7 @@
     "./cjs/packageDetect.js"
   ],
   "type": "module",
-  "version": "17.0.1",
+  "version": "17.0.2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -255,8 +255,8 @@
     }
   },
   "dependencies": {
-    "@polkadot/rpc-core": "17.0.1",
-    "@polkadot/types": "17.0.1",
+    "@polkadot/rpc-core": "17.0.2",
+    "@polkadot/types": "17.0.2",
     "@polkadot/util": "^14.0.3",
     "rxjs": "^7.8.1",
     "tslib": "^2.8.1"

package/packageInfo.js

@@ -1 +1 @@
-export const packageInfo = { name: '@polkadot/api-base', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '17.0.1' };
+export const packageInfo = { name: '@polkadot/api-base', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '17.0.2' };

package/types/storage.d.ts

@@ -4,6 +4,10 @@ import type { Hash } from '@polkadot/types/interfaces';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { AnyFunction, AnyTuple, Callback, Codec, IStorageKey } from '@polkadot/types/types';
 import type { ApiTypes, DropLast, EmptyBase, MethodResult, PaginationOptions, PromiseOrObs, ReturnCodec, UnsubscribePromise } from './base.js';
+declare const storageEntryResult: unique symbol;
+interface StorageEntryResult<R extends Codec> {
+    readonly [storageEntryResult]?: R;
+}
 type StorageEntryObservableMulti<R extends Codec = Codec> = <T extends Codec = R>(args: unknown[]) => Observable<T[]>;
 interface StorageEntryPromiseMulti<R extends Codec = Codec> {
     <T extends Codec = R>(args: unknown[]): Promise<T[]>;
@@ -57,18 +61,27 @@ export interface StorageEntryBaseAt<ApiType extends ApiTypes, F extends AnyFunct
 }
 export type QueryableModuleStorage<ApiType extends ApiTypes> = Record<string, QueryableStorageEntry<ApiType, AnyTuple>>;
 export type QueryableModuleStorageAt<ApiType extends ApiTypes> = Record<string, QueryableStorageEntryAt<ApiType, AnyTuple>>;
-export type QueryableStorageMultiArg<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType> | [
-    QueryableStorageEntry<ApiType>,
-    ...unknown[]
-];
-export type QueryableStorageMultiBase<ApiType extends ApiTypes> = <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[]) => Observable<T>;
+export type QueryableStorageMultiArg<ApiType extends ApiTypes> = QueryableStorageEntry<ApiType> | readonly [QueryableStorageEntry<ApiType>, ...unknown[]];
+type QueryableStorageMultiCallResult<Call> = Call extends readonly [infer Entry, ...unknown[]] ? Entry extends StorageEntryResult<infer R> ? R : Codec : Call extends StorageEntryResult<infer R> ? R : Codec;
+type QueryableStorageMultiResult<ApiType extends ApiTypes, Calls extends readonly QueryableStorageMultiArg<ApiType>[]> = {
+    -readonly [Index in keyof Calls]: QueryableStorageMultiCallResult<Calls[Index]>;
+};
+type QueryableStorageMultiReturn<ApiType extends ApiTypes, T extends Codec[], Calls extends readonly QueryableStorageMultiArg<ApiType>[]> = [
+    T
+] extends [never] ? QueryableStorageMultiResult<ApiType, Calls> : T;
+export interface QueryableStorageMultiBase<ApiType extends ApiTypes> {
+    <T extends Codec[] = never, Calls extends readonly QueryableStorageMultiArg<ApiType>[] = readonly QueryableStorageMultiArg<ApiType>[]>(calls: readonly [...Calls]): Observable<QueryableStorageMultiReturn<ApiType, T, Calls>>;
+    <T extends Codec[] = Codec[]>(calls: readonly QueryableStorageMultiArg<ApiType>[]): Observable<T>;
+}
 export interface QueryableStorageMultiPromise<ApiType extends ApiTypes> {
-    <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[], callback: Callback<T>): UnsubscribePromise;
-    <T extends Codec[]>(calls: QueryableStorageMultiArg<ApiType>[]): Promise<T>;
+    <T extends Codec[] = never, Calls extends readonly QueryableStorageMultiArg<ApiType>[] = readonly QueryableStorageMultiArg<ApiType>[]>(calls: readonly [...Calls], callback: Callback<QueryableStorageMultiReturn<ApiType, T, Calls>>): UnsubscribePromise;
+    <T extends Codec[] = Codec[]>(calls: readonly QueryableStorageMultiArg<ApiType>[], callback: Callback<T>): UnsubscribePromise;
+    <T extends Codec[] = never, Calls extends readonly QueryableStorageMultiArg<ApiType>[] = readonly QueryableStorageMultiArg<ApiType>[]>(calls: readonly [...Calls]): Promise<QueryableStorageMultiReturn<ApiType, T, Calls>>;
+    <T extends Codec[] = Codec[]>(calls: readonly QueryableStorageMultiArg<ApiType>[]): Promise<T>;
 }
 export type QueryableStorageMulti<ApiType extends ApiTypes> = ApiType extends 'rxjs' ? QueryableStorageMultiBase<ApiType> : QueryableStorageMultiPromise<ApiType>;
-export type AugmentedQuery<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBase<ApiType, F, A>;
-export type AugmentedQueryAt<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBaseAt<ApiType, F, A>;
+export type AugmentedQuery<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBase<ApiType, F, A> & StorageEntryResult<ReturnCodec<F>>;
+export type AugmentedQueryAt<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = MethodResult<ApiType, F> & StorageEntryBaseAt<ApiType, F, A> & StorageEntryResult<ReturnCodec<F>>;
 export type AugmentedQueryDoubleMap<ApiType extends ApiTypes, F extends AnyFunction, A extends AnyTuple = AnyTuple> = AugmentedQuery<ApiType, F, A>;
 export interface AugmentedQueries<ApiType extends ApiTypes> extends EmptyBase<ApiType> {
 }