@polkadot/rpc-core 7.4.2-9 → 7.5.2-10

package/bundle.cjs

@@ -278,10 +278,16 @@ class RpcCore {
           observer.complete();
         });
         return () => {
-          var _memoized;
-
           // delete old results from cache
-          (_memoized = memoized) === null || _memoized === void 0 ? void 0 : _memoized.unmemoize(...values);
+          if (isScale) {
+            var _memoized;
+
+            (_memoized = memoized) === null || _memoized === void 0 ? void 0 : _memoized.unmemoize(...values);
+          } else {
+            var _memoized2;
+
+            (_memoized2 = memoized) === null || _memoized2 === void 0 ? void 0 : _memoized2.raw.unmemoize(...values);
+          }
         };
       }).pipe((0, _rxjs.publishReplay)(1), // create a Replay(1)
       isDelayed ? (0, _index.refCountDelay)() // Unsubscribe after delay
@@ -363,10 +369,17 @@ class RpcCore {
 
 
         return () => {
-          var _memoized2;
-
           // Delete from cache, so old results don't hang around
-          (_memoized2 = memoized) === null || _memoized2 === void 0 ? void 0 : _memoized2.unmemoize(...values); // Unsubscribe from provider
+          if (isScale) {
+            var _memoized3;
+
+            (_memoized3 = memoized) === null || _memoized3 === void 0 ? void 0 : _memoized3.unmemoize(...values);
+          } else {
+            var _memoized4;
+
+            (_memoized4 = memoized) === null || _memoized4 === void 0 ? void 0 : _memoized4.raw.unmemoize(...values);
+          } // Unsubscribe from provider
+
 
           subscriptionPromise.then(subscriptionId => (0, _util.isNull)(subscriptionId) ? Promise.resolve(false) : _this.provider.unsubscribe(subType, unsubName, subscriptionId)).catch(error => logErrorMessage(method, def, error));
         };

package/bundle.js

@@ -1,5 +1,3 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
 // Copyright 2017-2022 @polkadot/rpc-core authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { Observable, publishReplay, refCount } from 'rxjs';
@@ -68,44 +66,24 @@ function isTreatAsHex(key) {
  */
 
 
-var _instanceId = /*#__PURE__*/_classPrivateFieldLooseKey("instanceId");
-
-var _registryDefault = /*#__PURE__*/_classPrivateFieldLooseKey("registryDefault");
-
-var _getBlockRegistry = /*#__PURE__*/_classPrivateFieldLooseKey("getBlockRegistry");
-
-var _storageCache = /*#__PURE__*/_classPrivateFieldLooseKey("storageCache");
-
 export class RpcCore {
+  #instanceId;
+  #registryDefault;
+  #getBlockRegistry;
+  #storageCache = new Map();
+  mapping = new Map();
+  sections = [];
   /**
    * @constructor
    * Default constructor for the Api Object
    * @param  {ProviderInterface} provider An API provider using HTTP or WebSocket
    */
+
   constructor(instanceId, registry, provider, userRpc = {}) {
-    Object.defineProperty(this, _instanceId, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _registryDefault, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _getBlockRegistry, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _storageCache, {
-      writable: true,
-      value: new Map()
-    });
-    this.mapping = new Map();
-    this.provider = void 0;
-    this.sections = [];
     // eslint-disable-next-line @typescript-eslint/unbound-method
     assert(provider && isFunction(provider.send), 'Expected Provider to API create');
-    _classPrivateFieldLooseBase(this, _instanceId)[_instanceId] = instanceId;
-    _classPrivateFieldLooseBase(this, _registryDefault)[_registryDefault] = registry;
+    this.#instanceId = instanceId;
+    this.#registryDefault = registry;
     this.provider = provider;
     const sectionNames = Object.keys(rpcDefinitions); // these are the base keys (i.e. part of jsonrpc)
 
@@ -143,8 +121,8 @@ export class RpcCore {
 
 
   setRegistrySwap(registrySwap) {
-    _classPrivateFieldLooseBase(this, _getBlockRegistry)[_getBlockRegistry] = memoize(registrySwap, {
-      getInstanceId: () => _classPrivateFieldLooseBase(this, _instanceId)[_instanceId]
+    this.#getBlockRegistry = memoize(registrySwap, {
+      getInstanceId: () => this.#instanceId
     });
   }
 
@@ -183,7 +161,7 @@ export class RpcCore {
 
   _memomize(creator, def) {
     const memoOpts = {
-      getInstanceId: () => _classPrivateFieldLooseBase(this, _instanceId)[_instanceId]
+      getInstanceId: () => this.#instanceId
     };
     const memoized = memoize(creator(true), memoOpts);
     memoized.raw = memoize(creator(false), memoOpts);
@@ -206,8 +184,8 @@ export class RpcCore {
       const blockHash = hashIndex === -1 ? null : values[hashIndex];
       const {
         registry
-      } = isScale && blockHash && _classPrivateFieldLooseBase(this, _getBlockRegistry)[_getBlockRegistry] ? await _classPrivateFieldLooseBase(this, _getBlockRegistry)[_getBlockRegistry](u8aToU8a(blockHash)) : {
-        registry: _classPrivateFieldLooseBase(this, _registryDefault)[_registryDefault]
+      } = isScale && blockHash && this.#getBlockRegistry ? await this.#getBlockRegistry(u8aToU8a(blockHash)) : {
+        registry: this.#registryDefault
       };
 
       const params = this._formatInputs(registry, null, def, values); // only cache .at(<blockHash>) queries, e.g. where valid blockHash was supplied
@@ -229,10 +207,16 @@ export class RpcCore {
           observer.complete();
         });
         return () => {
-          var _memoized;
-
           // delete old results from cache
-          (_memoized = memoized) === null || _memoized === void 0 ? void 0 : _memoized.unmemoize(...values);
+          if (isScale) {
+            var _memoized;
+
+            (_memoized = memoized) === null || _memoized === void 0 ? void 0 : _memoized.unmemoize(...values);
+          } else {
+            var _memoized2;
+
+            (_memoized2 = memoized) === null || _memoized2 === void 0 ? void 0 : _memoized2.raw.unmemoize(...values);
+          }
         };
       }).pipe(publishReplay(1), // create a Replay(1)
       isDelayed ? refCountDelay() // Unsubscribe after delay
@@ -269,8 +253,7 @@ export class RpcCore {
       return new Observable(observer => {
         // Have at least an empty promise, as used in the unsubscribe
         let subscriptionPromise = Promise.resolve(null);
-
-        const registry = _classPrivateFieldLooseBase(this, _registryDefault)[_registryDefault];
+        const registry = this.#registryDefault;
 
         const errorHandler = error => {
           logErrorMessage(method, def, error);
@@ -307,10 +290,17 @@ export class RpcCore {
 
 
         return () => {
-          var _memoized2;
-
           // Delete from cache, so old results don't hang around
-          (_memoized2 = memoized) === null || _memoized2 === void 0 ? void 0 : _memoized2.unmemoize(...values); // Unsubscribe from provider
+          if (isScale) {
+            var _memoized3;
+
+            (_memoized3 = memoized) === null || _memoized3 === void 0 ? void 0 : _memoized3.unmemoize(...values);
+          } else {
+            var _memoized4;
+
+            (_memoized4 = memoized) === null || _memoized4 === void 0 ? void 0 : _memoized4.raw.unmemoize(...values);
+          } // Unsubscribe from provider
+
 
           subscriptionPromise.then(subscriptionId => isNull(subscriptionId) ? Promise.resolve(false) : this.provider.unsubscribe(subType, unsubName, subscriptionId)).catch(error => logErrorMessage(method, def, error));
         };
@@ -381,14 +371,13 @@ export class RpcCore {
     //   - if a single result value, don't fill - it is not an update hole
     //   - fallback to an empty option in all cases
 
-    const value = isUndefined(found) ? witCache && _classPrivateFieldLooseBase(this, _storageCache)[_storageCache].get(hexKey) || null : found[1];
+    const value = isUndefined(found) ? witCache && this.#storageCache.get(hexKey) || null : found[1];
     const isEmpty = isNull(value);
     const input = isEmpty || isTreatAsHex(key) ? value : u8aToU8a(value); // store the retrieved result - the only issue with this cache is that there is no
     // clearing of it, so very long running processes (not just a couple of hours, longer)
     // will increase memory beyond what is allowed.
 
-    _classPrivateFieldLooseBase(this, _storageCache)[_storageCache].set(hexKey, value);
-
+    this.#storageCache.set(hexKey, value);
     return this._newType(registry, blockHash, key, input, isEmpty, entryIndex);
   }
 

package/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.4.2-9",
+  "version": "7.5.2-10",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",
@@ -91,10 +91,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@polkadot/rpc-augment": "7.4.2-9",
-    "@polkadot/rpc-provider": "7.4.2-9",
-    "@polkadot/types": "7.4.2-9",
-    "@polkadot/util": "^8.3.2",
+    "@polkadot/rpc-augment": "7.5.2-10",
+    "@polkadot/rpc-provider": "7.5.2-10",
+    "@polkadot/types": "7.5.2-10",
+    "@polkadot/util": "^8.3.3",
     "rxjs": "^7.5.2"
   }
 }

package/packageInfo.cjs

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/rpc-core',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '7.4.2-9'
+  version: '7.5.2-10'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/rpc-core',
   path: new URL('.', import.meta.url).pathname,
   type: 'esm',
-  version: '7.4.2-9'
+  version: '7.5.2-10'
 };