@polkadot/types-codec 7.4.2-7 → 7.5.2-0

package/extended/Map.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/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { compactFromU8a, compactToU8a, isHex, isObject, isU8a, logger, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
@@ -81,36 +79,19 @@ function decodeMap(registry, keyType, valType, value) {
   throw new Error('Map: cannot decode type');
 }
 
-var _KeyClass = /*#__PURE__*/_classPrivateFieldLooseKey("KeyClass");
-
-var _ValClass = /*#__PURE__*/_classPrivateFieldLooseKey("ValClass");
-
-var _type = /*#__PURE__*/_classPrivateFieldLooseKey("type");
-
 export class CodecMap extends Map {
+  #KeyClass;
+  #ValClass;
+  #type;
+
   constructor(registry, keyType, valType, rawValue, type = 'HashMap') {
     const [decoded, decodedLength] = decodeMap(registry, keyType, valType, rawValue);
     super(type === 'BTreeMap' ? sortMap(decoded) : decoded);
-    this.registry = void 0;
-    this.createdAtHash = void 0;
-    Object.defineProperty(this, _KeyClass, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _ValClass, {
-      writable: true,
-      value: void 0
-    });
-    this.initialU8aLength = void 0;
-    Object.defineProperty(this, _type, {
-      writable: true,
-      value: void 0
-    });
     this.registry = registry;
     this.initialU8aLength = decodedLength;
-    _classPrivateFieldLooseBase(this, _KeyClass)[_KeyClass] = typeToConstructor(registry, keyType);
-    _classPrivateFieldLooseBase(this, _ValClass)[_ValClass] = typeToConstructor(registry, valType);
-    _classPrivateFieldLooseBase(this, _type)[_type] = type;
+    this.#KeyClass = typeToConstructor(registry, keyType);
+    this.#ValClass = typeToConstructor(registry, valType);
+    this.#type = type;
   }
   /**
    * @description The length of the value when encoded as a Uint8Array
@@ -192,7 +173,7 @@ export class CodecMap extends Map {
 
 
   toRawType() {
-    return `${_classPrivateFieldLooseBase(this, _type)[_type]}<${this.registry.getClassName(_classPrivateFieldLooseBase(this, _KeyClass)[_KeyClass]) || new (_classPrivateFieldLooseBase(this, _KeyClass)[_KeyClass])(this.registry).toRawType()},${this.registry.getClassName(_classPrivateFieldLooseBase(this, _ValClass)[_ValClass]) || new (_classPrivateFieldLooseBase(this, _ValClass)[_ValClass])(this.registry).toRawType()}>`;
+    return `${this.#type}<${this.registry.getClassName(this.#KeyClass) || new this.#KeyClass(this.registry).toRawType()},${this.registry.getClassName(this.#ValClass) || new this.#ValClass(this.registry).toRawType()}>`;
   }
   /**
    * @description Returns the string representation of the value

package/extended/Range.js

@@ -1,27 +1,21 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { Tuple } from "../base/Tuple.js";
 
-var _rangeName = /*#__PURE__*/_classPrivateFieldLooseKey("rangeName");
-
 /**
  * @name Range
  * @description
  * Rust `Range<T>` representation
  */
 export class Range extends Tuple {
+  #rangeName;
+
   constructor(registry, Type, value, rangeName = 'Range') {
     super(registry, {
       end: Type,
       start: Type
     }, value);
-    Object.defineProperty(this, _rangeName, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldLooseBase(this, _rangeName)[_rangeName] = rangeName;
+    this.#rangeName = rangeName;
   }
 
   static with(Types) {
@@ -54,7 +48,7 @@ export class Range extends Tuple {
 
 
   toRawType() {
-    return `${_classPrivateFieldLooseBase(this, _rangeName)[_rangeName]}<${this.start.toRawType()}>`;
+    return `${this.#rangeName}<${this.start.toRawType()}>`;
   }
 
 }

package/extended/WrapperKeepOpaque.cjs

@@ -34,15 +34,18 @@ function decodeRaw(registry, typeName, value) {
   }
 
   const instance = new Type(registry, value);
-  return [Type, instance, instance.toHex()];
+  return [Type, instance, (0, _util.compactAddLength)(instance.toU8a())];
 }
 
 var _Type = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("Type");
 
 var _decoded = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("decoded");
 
+var _opaqueName = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("opaqueName");
+
 class WrapperKeepOpaque extends _Bytes.Bytes {
   constructor(registry, typeName, value) {
+    let opaqueName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'WrapperKeepOpaque';
     const [Type, decoded, u8a] = decodeRaw(registry, typeName, value);
     super(registry, u8a);
     Object.defineProperty(this, _Type, {
@@ -53,8 +56,13 @@ class WrapperKeepOpaque extends _Bytes.Bytes {
       writable: true,
       value: void 0
     });
+    Object.defineProperty(this, _opaqueName, {
+      writable: true,
+      value: void 0
+    });
     (0, _classPrivateFieldLooseBase2.default)(this, _Type)[_Type] = Type;
     (0, _classPrivateFieldLooseBase2.default)(this, _decoded)[_decoded] = decoded;
+    (0, _classPrivateFieldLooseBase2.default)(this, _opaqueName)[_opaqueName] = opaqueName;
   }
 
   static with(Type) {
@@ -87,7 +95,7 @@ class WrapperKeepOpaque extends _Bytes.Bytes {
 
 
   toRawType() {
-    return `WrapperKeepOpaque<${this.registry.getClassName((0, _classPrivateFieldLooseBase2.default)(this, _Type)[_Type]) || ((0, _classPrivateFieldLooseBase2.default)(this, _decoded)[_decoded] ? (0, _classPrivateFieldLooseBase2.default)(this, _decoded)[_decoded].toRawType() : new ((0, _classPrivateFieldLooseBase2.default)(this, _Type)[_Type])(this.registry).toRawType())}>`;
+    return `${(0, _classPrivateFieldLooseBase2.default)(this, _opaqueName)[_opaqueName]}<${this.registry.getClassName((0, _classPrivateFieldLooseBase2.default)(this, _Type)[_Type]) || ((0, _classPrivateFieldLooseBase2.default)(this, _decoded)[_decoded] ? (0, _classPrivateFieldLooseBase2.default)(this, _decoded)[_decoded].toRawType() : new ((0, _classPrivateFieldLooseBase2.default)(this, _Type)[_Type])(this.registry).toRawType())}>`;
   }
   /**
    * @description Converts the Object to to a string (either decoded or bytes)
@@ -103,7 +111,7 @@ class WrapperKeepOpaque extends _Bytes.Bytes {
 
 
   unwrap() {
-    return (0, _util.assertReturn)((0, _classPrivateFieldLooseBase2.default)(this, _decoded)[_decoded], 'WrapperKeepOpaque: unwrapping an undecodable value');
+    return (0, _util.assertReturn)((0, _classPrivateFieldLooseBase2.default)(this, _decoded)[_decoded], () => `${(0, _classPrivateFieldLooseBase2.default)(this, _opaqueName)[_opaqueName]}: unwrapping an undecodable value`);
   }
 
 }

package/extended/WrapperKeepOpaque.d.ts

@@ -1,8 +1,9 @@
-import type { AnyJson, AnyU8a, Codec, CodecClass, Registry } from '../types';
+import type { AnyJson, Codec, CodecClass, Registry } from '../types';
 import { Bytes } from './Bytes';
+declare type OpaqueName = 'WrapperKeepOpaque' | 'WrapperOpaque';
 export declare class WrapperKeepOpaque<T extends Codec> extends Bytes {
     #private;
-    constructor(registry: Registry, typeName: CodecClass<T> | string, value?: AnyU8a | Codec);
+    constructor(registry: Registry, typeName: CodecClass<T> | string, value?: unknown, opaqueName?: OpaqueName);
     static with<T extends Codec>(Type: CodecClass<T> | string): CodecClass<WrapperKeepOpaque<T>>;
     /**
      * @description Checks if the wrapper is decodable
@@ -25,3 +26,4 @@ export declare class WrapperKeepOpaque<T extends Codec> extends Bytes {
      */
     unwrap(): T;
 }
+export {};

package/extended/WrapperKeepOpaque.js

@@ -1,8 +1,6 @@
-import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
-import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { assertReturn, compactStripLength, isHex, isU8a } from '@polkadot/util';
+import { assertReturn, compactAddLength, compactStripLength, isHex, isU8a } from '@polkadot/util';
 import { Raw } from "../native/Raw.js";
 import { typeToConstructor } from "../utils/index.js";
 import { Bytes } from "./Bytes.js";
@@ -20,27 +18,20 @@ function decodeRaw(registry, typeName, value) {
   }
 
   const instance = new Type(registry, value);
-  return [Type, instance, instance.toHex()];
+  return [Type, instance, compactAddLength(instance.toU8a())];
 }
 
-var _Type = /*#__PURE__*/_classPrivateFieldLooseKey("Type");
-
-var _decoded = /*#__PURE__*/_classPrivateFieldLooseKey("decoded");
-
 export class WrapperKeepOpaque extends Bytes {
-  constructor(registry, typeName, value) {
+  #Type;
+  #decoded;
+  #opaqueName;
+
+  constructor(registry, typeName, value, opaqueName = 'WrapperKeepOpaque') {
     const [Type, decoded, u8a] = decodeRaw(registry, typeName, value);
     super(registry, u8a);
-    Object.defineProperty(this, _Type, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _decoded, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldLooseBase(this, _Type)[_Type] = Type;
-    _classPrivateFieldLooseBase(this, _decoded)[_decoded] = decoded;
+    this.#Type = Type;
+    this.#decoded = decoded;
+    this.#opaqueName = opaqueName;
   }
 
   static with(Type) {
@@ -57,7 +48,7 @@ export class WrapperKeepOpaque extends Bytes {
 
 
   get isDecoded() {
-    return !!_classPrivateFieldLooseBase(this, _decoded)[_decoded];
+    return !!this.#decoded;
   }
   /**
    * @description Converts the Object to to a human-friendly JSON, with additional fields, expansion and formatting of information
@@ -65,7 +56,7 @@ export class WrapperKeepOpaque extends Bytes {
 
 
   toHuman(isExtended) {
-    return _classPrivateFieldLooseBase(this, _decoded)[_decoded] ? _classPrivateFieldLooseBase(this, _decoded)[_decoded].toHuman(isExtended) : super.toHuman();
+    return this.#decoded ? this.#decoded.toHuman(isExtended) : super.toHuman();
   }
   /**
    * @description Returns the base runtime type name for this instance
@@ -73,7 +64,7 @@ export class WrapperKeepOpaque extends Bytes {
 
 
   toRawType() {
-    return `WrapperKeepOpaque<${this.registry.getClassName(_classPrivateFieldLooseBase(this, _Type)[_Type]) || (_classPrivateFieldLooseBase(this, _decoded)[_decoded] ? _classPrivateFieldLooseBase(this, _decoded)[_decoded].toRawType() : new (_classPrivateFieldLooseBase(this, _Type)[_Type])(this.registry).toRawType())}>`;
+    return `${this.#opaqueName}<${this.registry.getClassName(this.#Type) || (this.#decoded ? this.#decoded.toRawType() : new this.#Type(this.registry).toRawType())}>`;
   }
   /**
    * @description Converts the Object to to a string (either decoded or bytes)
@@ -81,7 +72,7 @@ export class WrapperKeepOpaque extends Bytes {
 
 
   toString() {
-    return _classPrivateFieldLooseBase(this, _decoded)[_decoded] ? _classPrivateFieldLooseBase(this, _decoded)[_decoded].toString() : super.toString();
+    return this.#decoded ? this.#decoded.toString() : super.toString();
   }
   /**
    * @description Returns the decoded that the WrapperKeepOpaque represents (if available), throws if non-decodable
@@ -89,7 +80,7 @@ export class WrapperKeepOpaque extends Bytes {
 
 
   unwrap() {
-    return assertReturn(_classPrivateFieldLooseBase(this, _decoded)[_decoded], 'WrapperKeepOpaque: unwrapping an undecodable value');
+    return assertReturn(this.#decoded, () => `${this.#opaqueName}: unwrapping an undecodable value`);
   }
 
 }

package/extended/WrapperOpaque.cjs

@@ -5,28 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.WrapperOpaque = void 0;
 
-var _util = require("@polkadot/util");
-
-var _Base = require("../base/Base.cjs");
-
-var _index = require("../utils/index.cjs");
+var _WrapperKeepOpaque = require("./WrapperKeepOpaque.cjs");
 
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-function decodeRaw(registry, Type, value) {
-  const Clazz = (0, _index.typeToConstructor)(registry, Type);
-
-  if ((0, _util.isU8a)(value)) {
-    const [, u8a] = (0, _util.compactStripLength)(value);
-    return new Clazz(registry, u8a);
-  }
-
-  return new Clazz(registry, value);
-}
-
-class WrapperOpaque extends _Base.Base {
-  constructor(registry, Type, value) {
-    super(registry, decodeRaw(registry, Type, value));
+class WrapperOpaque extends _WrapperKeepOpaque.WrapperKeepOpaque {
+  constructor(registry, typeName, value) {
+    super(registry, typeName, value, 'WrapperOpaque');
   }
 
   static with(Type) {
@@ -38,21 +23,12 @@ class WrapperOpaque extends _Base.Base {
     };
   }
   /**
-   * @description Returns the base runtime type name for this instance
-   */
-
-
-  toRawType() {
-    return `WrapperOpaque<${this.inner.toRawType()}>`;
-  }
-  /**
-   * @description The length of the value when encoded as a Uint8Array
+   * @description The inner value for this wrapper, in all cases it _should_ be decodable (unlike KeepOpaque)
    */
 
 
-  toU8a(isBare) {
-    const u8a = super.toU8a(isBare);
-    return isBare ? u8a : (0, _util.compactAddLength)(u8a);
+  get inner() {
+    return this.unwrap();
   }
 
 }

package/extended/WrapperOpaque.d.ts

@@ -1,14 +1,10 @@
 import type { Codec, CodecClass, Registry } from '../types';
-import { Base } from '../base/Base';
-export declare class WrapperOpaque<T extends Codec> extends Base<T> {
-    constructor(registry: Registry, Type: CodecClass<T> | string, value?: unknown);
-    static with<T extends Codec>(Type: CodecClass<T> | string): CodecClass<WrapperOpaque<T>>;
+import { WrapperKeepOpaque } from './WrapperKeepOpaque';
+export declare class WrapperOpaque<T extends Codec> extends WrapperKeepOpaque<T> {
+    constructor(registry: Registry, typeName: CodecClass<T> | string, value?: unknown);
+    static with<T extends Codec>(Type: CodecClass<T> | string): CodecClass<WrapperKeepOpaque<T>>;
     /**
-     * @description Returns the base runtime type name for this instance
+     * @description The inner value for this wrapper, in all cases it _should_ be decodable (unlike KeepOpaque)
      */
-    toRawType(): string;
-    /**
-     * @description The length of the value when encoded as a Uint8Array
-     */
-    toU8a(isBare?: boolean): Uint8Array;
+    get inner(): T;
 }

package/extended/WrapperOpaque.js

@@ -1,23 +1,9 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import { compactAddLength, compactStripLength, isU8a } from '@polkadot/util';
-import { Base } from "../base/Base.js";
-import { typeToConstructor } from "../utils/index.js";
-
-function decodeRaw(registry, Type, value) {
-  const Clazz = typeToConstructor(registry, Type);
-
-  if (isU8a(value)) {
-    const [, u8a] = compactStripLength(value);
-    return new Clazz(registry, u8a);
-  }
-
-  return new Clazz(registry, value);
-}
-
-export class WrapperOpaque extends Base {
-  constructor(registry, Type, value) {
-    super(registry, decodeRaw(registry, Type, value));
+import { WrapperKeepOpaque } from "./WrapperKeepOpaque.js";
+export class WrapperOpaque extends WrapperKeepOpaque {
+  constructor(registry, typeName, value) {
+    super(registry, typeName, value, 'WrapperOpaque');
   }
 
   static with(Type) {
@@ -29,21 +15,12 @@ export class WrapperOpaque extends Base {
     };
   }
   /**
-   * @description Returns the base runtime type name for this instance
-   */
-
-
-  toRawType() {
-    return `WrapperOpaque<${this.inner.toRawType()}>`;
-  }
-  /**
-   * @description The length of the value when encoded as a Uint8Array
+   * @description The inner value for this wrapper, in all cases it _should_ be decodable (unlike KeepOpaque)
    */
 
 
-  toU8a(isBare) {
-    const u8a = super.toU8a(isBare);
-    return isBare ? u8a : compactAddLength(u8a);
+  get inner() {
+    return this.unwrap();
   }
 
 }

package/native/Bool.js

@@ -24,8 +24,6 @@ export class bool extends Boolean {
   // eslint-disable-next-line @typescript-eslint/ban-types
   constructor(registry, value = false) {
     super(decodeBool(value));
-    this.registry = void 0;
-    this.createdAtHash = void 0;
     this.registry = registry;
   }
   /**

package/native/Date.js

@@ -29,8 +29,6 @@ function decodeDate(value) {
 export class CodecDate extends Date {
   constructor(registry, value = 0) {
     super(decodeDate(value));
-    this.registry = void 0;
-    this.createdAtHash = void 0;
     this.registry = registry;
   }
   /**

package/native/Json.js

@@ -21,8 +21,6 @@ export class Json extends Map {
   constructor(registry, value) {
     const decoded = decodeJson(value);
     super(decoded);
-    this.registry = void 0;
-    this.createdAtHash = void 0;
     this.registry = registry;
     objectProperties(this, decoded.map(([k]) => k), k => this.get(k));
   }

package/native/Raw.js

@@ -14,9 +14,6 @@ import { assert, isAscii, isUndefined, isUtf8, u8aToHex, u8aToString, u8aToU8a }
 export class Raw extends Uint8Array {
   constructor(registry, value, initialU8aLength) {
     super(u8aToU8a(value));
-    this.registry = void 0;
-    this.createdAtHash = void 0;
-    this.initialU8aLength = void 0;
     this.registry = registry;
     this.initialU8aLength = initialU8aLength;
   }

package/native/Set.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/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { assert, BN, bnToBn, bnToU8a, isBn, isNumber, isString, isU8a, isUndefined, objectProperties, stringify, stringPascalCase, u8aToBn, u8aToHex, u8aToU8a } from '@polkadot/util';
@@ -76,36 +74,15 @@ function decodeSet(setValues, value = 0, bitLength) {
  */
 
 
-var _allowed = /*#__PURE__*/_classPrivateFieldLooseKey("allowed");
-
-var _byteLength = /*#__PURE__*/_classPrivateFieldLooseKey("byteLength");
-
 export class CodecSet extends Set {
+  #allowed;
+  #byteLength;
+
   constructor(registry, setValues, value, bitLength = 8) {
     super(decodeSet(setValues, value, bitLength));
-    this.registry = void 0;
-    this.createdAtHash = void 0;
-    Object.defineProperty(this, _allowed, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _byteLength, {
-      writable: true,
-      value: void 0
-    });
-
-    this.add = key => {
-      // ^^^ add = () property done to assign this instance's this, otherwise Set.add creates "some" chaos
-      // we have the isUndefined(this._setValues) in here as well, add is used internally
-      // in the Set constructor (so it is undefined at this point, and should allow)
-      assert(isUndefined(_classPrivateFieldLooseBase(this, _allowed)[_allowed]) || !isUndefined(_classPrivateFieldLooseBase(this, _allowed)[_allowed][key]), () => `Set: Invalid key '${key}' on add`);
-      super.add(key);
-      return this;
-    };
-
     this.registry = registry;
-    _classPrivateFieldLooseBase(this, _allowed)[_allowed] = setValues;
-    _classPrivateFieldLooseBase(this, _byteLength)[_byteLength] = bitLength / 8;
+    this.#allowed = setValues;
+    this.#byteLength = bitLength / 8;
   }
 
   static with(values, bitLength) {
@@ -130,7 +107,7 @@ export class CodecSet extends Set {
 
 
   get encodedLength() {
-    return _classPrivateFieldLooseBase(this, _byteLength)[_byteLength];
+    return this.#byteLength;
   }
   /**
    * @description returns a hash of the contents
@@ -162,16 +139,25 @@ export class CodecSet extends Set {
 
 
   get valueEncoded() {
-    return encodeSet(_classPrivateFieldLooseBase(this, _allowed)[_allowed], this.strings);
+    return encodeSet(this.#allowed, this.strings);
   }
   /**
    * @description adds a value to the Set (extended to allow for validity checking)
    */
 
 
+  add = key => {
+    // ^^^ add = () property done to assign this instance's this, otherwise Set.add creates "some" chaos
+    // we have the isUndefined(this._setValues) in here as well, add is used internally
+    // in the Set constructor (so it is undefined at this point, and should allow)
+    assert(isUndefined(this.#allowed) || !isUndefined(this.#allowed[key]), () => `Set: Invalid key '${key}' on add`);
+    super.add(key);
+    return this;
+  };
   /**
    * @description Compares the value of the input to see if there is a match
    */
+
   eq(other) {
     if (Array.isArray(other)) {
       // we don't actually care about the order, sort the values
@@ -223,7 +209,7 @@ export class CodecSet extends Set {
 
   toRawType() {
     return stringify({
-      _set: _classPrivateFieldLooseBase(this, _allowed)[_allowed]
+      _set: this.#allowed
     });
   }
   /**
@@ -243,7 +229,7 @@ export class CodecSet extends Set {
 
   toU8a(isBare) {
     return bnToU8a(this.valueEncoded, {
-      bitLength: _classPrivateFieldLooseBase(this, _byteLength)[_byteLength] * 8,
+      bitLength: this.#byteLength * 8,
       isLe: true
     });
   }

package/native/Struct.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/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { assert, isBoolean, isFunction, isHex, isObject, isU8a, isUndefined, objectProperties, stringCamelCase, stringify, u8aConcat, u8aToHex, u8aToU8a } from '@polkadot/util';
@@ -70,35 +68,19 @@ function decodeStructFromObject(registry, Types, value, jsonMap) {
  */
 
 
-var _registry = /*#__PURE__*/_classPrivateFieldLooseKey("registry");
-
-var _jsonMap = /*#__PURE__*/_classPrivateFieldLooseKey("jsonMap");
-
-var _Types = /*#__PURE__*/_classPrivateFieldLooseKey("Types");
-
 export class Struct extends Map {
+  #registry;
+  #jsonMap;
+  #Types;
+
   constructor(registry, Types, value, jsonMap = new Map()) {
     const typeMap = mapToTypeMap(registry, Types);
     const [decoded, decodedLength] = isU8a(value) ? decodeU8a(registry, value, typeMap, true) : isHex(value) ? decodeU8a(registry, u8aToU8a(value), typeMap, true) : value instanceof Struct ? [value, 0] : decodeStructFromObject(registry, typeMap, value || {}, jsonMap);
     super(decoded);
-    Object.defineProperty(this, _registry, {
-      writable: true,
-      value: void 0
-    });
-    this.createdAtHash = void 0;
-    this.initialU8aLength = void 0;
-    Object.defineProperty(this, _jsonMap, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _Types, {
-      writable: true,
-      value: void 0
-    });
-    _classPrivateFieldLooseBase(this, _registry)[_registry] = registry;
+    this.#registry = registry;
     this.initialU8aLength = decodedLength;
-    _classPrivateFieldLooseBase(this, _jsonMap)[_jsonMap] = jsonMap;
-    _classPrivateFieldLooseBase(this, _Types)[_Types] = typeMap;
+    this.#jsonMap = jsonMap;
+    this.#Types = typeMap;
   }
 
   static with(Types, jsonMap) {
@@ -117,7 +99,7 @@ export class Struct extends Map {
 
 
   get defKeys() {
-    return Object.keys(_classPrivateFieldLooseBase(this, _Types)[_Types]);
+    return Object.keys(this.#Types);
   }
 
   getT(key) {
@@ -144,7 +126,7 @@ export class Struct extends Map {
 
   get Type() {
     const result = {};
-    const defs = Object.entries(_classPrivateFieldLooseBase(this, _Types)[_Types]);
+    const defs = Object.entries(this.#Types);
 
     for (let i = 0; i < defs.length; i++) {
       const [key, Type] = defs[i];
@@ -177,7 +159,7 @@ export class Struct extends Map {
   }
 
   get registry() {
-    return _classPrivateFieldLooseBase(this, _registry)[_registry];
+    return this.#registry;
   }
   /**
    * @description Compares the value of the input to see if there is a match
@@ -243,7 +225,7 @@ export class Struct extends Map {
     const json = {};
 
     for (const [k, v] of this.entries()) {
-      const jsonKey = _classPrivateFieldLooseBase(this, _jsonMap)[_jsonMap].get(k) || k;
+      const jsonKey = this.#jsonMap.get(k) || k;
       json[jsonKey] = v && v.toJSON();
     }
 
@@ -255,7 +237,7 @@ export class Struct extends Map {
 
 
   toRawType() {
-    return stringify(typesToMap(this.registry, _classPrivateFieldLooseBase(this, _Types)[_Types]));
+    return stringify(typesToMap(this.registry, this.#Types));
   }
   /**
    * @description Returns the string representation of the value