@polkadot/rpc-core 6.4.3-6 → 6.4.3-7

package/bundle.cjs

@@ -225,15 +225,19 @@ class RpcCore {
   }
 
   _memomize(creator, def) {
-    const memoized = (0, _util.memoize)(creator('scale'), {
+    const memoOpts = {
       getInstanceId: () => (0, _classPrivateFieldLooseBase2.default)(this, _instanceId)[_instanceId]
-    });
-    memoized.json = creator('json');
-    memoized.raw = creator('raw');
+    };
+    const memoized = (0, _util.memoize)(creator(true), memoOpts);
+    memoized.raw = (0, _util.memoize)(creator(false), memoOpts);
     memoized.meta = def;
     return memoized;
   }
 
+  _formatResult(isScale, registry, blockHash, method, def, params, result) {
+    return isScale ? this._formatOutput(registry, blockHash, method, def, params, result) : result;
+  }
+
   _createMethodSend(section, method, def) {
     const rpcName = def.endpoint || `${section}_${method}`;
     const hashIndex = def.params.findIndex(({
@@ -241,24 +245,24 @@ class RpcCore {
     }) => isHistoric);
     let memoized = null; // execute the RPC call, doing a registry swap for historic as applicable
 
-    const callWithRegistry = async (outputAs, values) => {
+    const callWithRegistry = async (isScale, values) => {
       const blockHash = hashIndex === -1 ? null : values[hashIndex];
       const {
         registry
-      } = outputAs === 'scale' && blockHash && (0, _classPrivateFieldLooseBase2.default)(this, _getBlockRegistry)[_getBlockRegistry] ? await (0, _classPrivateFieldLooseBase2.default)(this, _getBlockRegistry)[_getBlockRegistry]((0, _util.u8aToU8a)(blockHash)) : {
+      } = isScale && blockHash && (0, _classPrivateFieldLooseBase2.default)(this, _getBlockRegistry)[_getBlockRegistry] ? await (0, _classPrivateFieldLooseBase2.default)(this, _getBlockRegistry)[_getBlockRegistry]((0, _util.u8aToU8a)(blockHash)) : {
         registry: (0, _classPrivateFieldLooseBase2.default)(this, _registryDefault)[_registryDefault]
       };
 
       const params = this._formatInputs(registry, null, def, values);
 
-      const data = await this.provider.send(rpcName, params.map(param => param.toJSON()));
-      return outputAs === 'scale' ? this._formatOutput(registry, blockHash, method, def, params, data) : registry.createType(outputAs === 'raw' ? 'Raw' : 'Json', data);
+      const result = await this.provider.send(rpcName, params.map(p => p.toJSON()));
+      return this._formatResult(isScale, registry, blockHash, method, def, params, result);
     };
 
-    const creator = outputAs => (...values) => {
-      const isDelayed = outputAs === 'scale' && hashIndex !== -1 && !!values[hashIndex];
+    const creator = isScale => (...values) => {
+      const isDelayed = isScale && hashIndex !== -1 && !!values[hashIndex];
       return new _rxjs.Observable(observer => {
-        callWithRegistry(outputAs, values).then(value => {
+        callWithRegistry(isScale, values).then(value => {
           observer.next(value);
           observer.complete();
         }).catch(error => {
@@ -303,7 +307,7 @@ class RpcCore {
     const subType = `${section}_${updateType}`;
     let memoized = null;
 
-    const creator = outputAs => (...values) => {
+    const creator = isScale => (...values) => {
       return new _rxjs.Observable(observer => {
         // Have at least an empty promise, as used in the unsubscribe
         let subscriptionPromise = Promise.resolve(null);
@@ -318,7 +322,7 @@ class RpcCore {
         try {
           const params = this._formatInputs(registry, null, def, values);
 
-          const paramsJson = params.map(param => param.toJSON());
+          const paramsJson = params.map(p => p.toJSON());
 
           const update = (error, result) => {
             if (error) {
@@ -327,7 +331,7 @@ class RpcCore {
             }
 
             try {
-              observer.next(outputAs === 'scale' ? this._formatOutput(registry, null, method, def, params, result) : registry.createType(outputAs === 'raw' ? 'Raw' : 'Json', result));
+              observer.next(this._formatResult(isScale, registry, null, method, def, params, result));
             } catch (error) {
               observer.error(error);
             }

package/bundle.d.ts

@@ -58,6 +58,7 @@ export declare class RpcCore {
     addUserInterfaces<Section extends keyof RpcInterface>(userRpc: Record<string, Record<string, DefinitionRpc | DefinitionRpcSub>>): void;
     private _createInterface;
     private _memomize;
+    private _formatResult;
     private _createMethodSend;
     private _createSubscriber;
     private _createMethodSubscribe;

package/bundle.js

@@ -190,15 +190,19 @@ export class RpcCore {
   }
 
   _memomize(creator, def) {
-    const memoized = memoize(creator('scale'), {
+    const memoOpts = {
       getInstanceId: () => _classPrivateFieldLooseBase(this, _instanceId)[_instanceId]
-    });
-    memoized.json = creator('json');
-    memoized.raw = creator('raw');
+    };
+    const memoized = memoize(creator(true), memoOpts);
+    memoized.raw = memoize(creator(false), memoOpts);
     memoized.meta = def;
     return memoized;
   }
 
+  _formatResult(isScale, registry, blockHash, method, def, params, result) {
+    return isScale ? this._formatOutput(registry, blockHash, method, def, params, result) : result;
+  }
+
   _createMethodSend(section, method, def) {
     const rpcName = def.endpoint || `${section}_${method}`;
     const hashIndex = def.params.findIndex(({
@@ -206,24 +210,24 @@ export class RpcCore {
     }) => isHistoric);
     let memoized = null; // execute the RPC call, doing a registry swap for historic as applicable
 
-    const callWithRegistry = async (outputAs, values) => {
+    const callWithRegistry = async (isScale, values) => {
       const blockHash = hashIndex === -1 ? null : values[hashIndex];
       const {
         registry
-      } = outputAs === 'scale' && blockHash && _classPrivateFieldLooseBase(this, _getBlockRegistry)[_getBlockRegistry] ? await _classPrivateFieldLooseBase(this, _getBlockRegistry)[_getBlockRegistry](u8aToU8a(blockHash)) : {
+      } = isScale && blockHash && _classPrivateFieldLooseBase(this, _getBlockRegistry)[_getBlockRegistry] ? await _classPrivateFieldLooseBase(this, _getBlockRegistry)[_getBlockRegistry](u8aToU8a(blockHash)) : {
         registry: _classPrivateFieldLooseBase(this, _registryDefault)[_registryDefault]
       };
 
       const params = this._formatInputs(registry, null, def, values);
 
-      const data = await this.provider.send(rpcName, params.map(param => param.toJSON()));
-      return outputAs === 'scale' ? this._formatOutput(registry, blockHash, method, def, params, data) : registry.createType(outputAs === 'raw' ? 'Raw' : 'Json', data);
+      const result = await this.provider.send(rpcName, params.map(p => p.toJSON()));
+      return this._formatResult(isScale, registry, blockHash, method, def, params, result);
     };
 
-    const creator = outputAs => (...values) => {
-      const isDelayed = outputAs === 'scale' && hashIndex !== -1 && !!values[hashIndex];
+    const creator = isScale => (...values) => {
+      const isDelayed = isScale && hashIndex !== -1 && !!values[hashIndex];
       return new Observable(observer => {
-        callWithRegistry(outputAs, values).then(value => {
+        callWithRegistry(isScale, values).then(value => {
           observer.next(value);
           observer.complete();
         }).catch(error => {
@@ -268,7 +272,7 @@ export class RpcCore {
     const subType = `${section}_${updateType}`;
     let memoized = null;
 
-    const creator = outputAs => (...values) => {
+    const creator = isScale => (...values) => {
       return new Observable(observer => {
         // Have at least an empty promise, as used in the unsubscribe
         let subscriptionPromise = Promise.resolve(null);
@@ -283,7 +287,7 @@ export class RpcCore {
         try {
           const params = this._formatInputs(registry, null, def, values);
 
-          const paramsJson = params.map(param => param.toJSON());
+          const paramsJson = params.map(p => p.toJSON());
 
           const update = (error, result) => {
             if (error) {
@@ -292,7 +296,7 @@ export class RpcCore {
             }
 
             try {
-              observer.next(outputAs === 'scale' ? this._formatOutput(registry, null, method, def, params, result) : registry.createType(outputAs === 'raw' ? 'Raw' : 'Json', result));
+              observer.next(this._formatResult(isScale, registry, null, method, def, params, result));
             } catch (error) {
               observer.error(error);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "6.4.3-6",
+  "version": "6.4.3-7",
   "type": "module",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
@@ -20,8 +20,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@polkadot/rpc-provider": "6.4.3-6",
-    "@polkadot/types": "6.4.3-6",
+    "@polkadot/rpc-provider": "6.4.3-7",
+    "@polkadot/types": "6.4.3-7",
     "@polkadot/util": "^7.5.1",
     "rxjs": "^7.4.0"
   },

package/packageInfo.cjs

@@ -9,6 +9,6 @@ exports.packageInfo = void 0;
 // Auto-generated by @polkadot/dev, do not edit
 const packageInfo = {
   name: '@polkadot/rpc-core',
-  version: '6.4.3-6'
+  version: '6.4.3-7'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -3,5 +3,5 @@
 // Auto-generated by @polkadot/dev, do not edit
 export const packageInfo = {
   name: '@polkadot/rpc-core',
-  version: '6.4.3-6'
+  version: '6.4.3-7'
 };

package/types.d.ts

@@ -1,10 +1,8 @@
 import type { Observable } from 'rxjs';
-import type { Json, Raw } from '@polkadot/types';
 import type { Codec, DefinitionRpc } from '@polkadot/types/types';
 export * from './types.jsonrpc';
 export interface RpcInterfaceMethod {
     <T extends Codec>(...params: unknown[]): Observable<T>;
-    json(...params: unknown[]): Observable<Json>;
-    raw(...params: unknown[]): Observable<Raw>;
+    raw(...params: unknown[]): Observable<unknown>;
     meta: DefinitionRpc;
 }

package/types.jsonrpc.d.ts

@@ -1,4 +1,7 @@
+import type { Observable } from 'rxjs';
 import type { AnyFunction } from '@polkadot/types/types';
 export interface RpcInterface {
 }
-export declare type AugmentedRpc<F extends AnyFunction> = F;
+export declare type AugmentedRpc<F extends AnyFunction> = F & {
+    raw: <T>(...params: Parameters<F>) => Observable<T>;
+};