@polkadot/types-codec 7.5.1 → 7.5.2-0

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,6 +1,6 @@
 // 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";
@@ -18,18 +18,20 @@ function decodeRaw(registry, typeName, value) {
   }
 
   const instance = new Type(registry, value);
-  return [Type, instance, instance.toHex()];
+  return [Type, instance, compactAddLength(instance.toU8a())];
 }
 
 export class WrapperKeepOpaque extends Bytes {
   #Type;
   #decoded;
+  #opaqueName;
 
-  constructor(registry, typeName, value) {
+  constructor(registry, typeName, value, opaqueName = 'WrapperKeepOpaque') {
     const [Type, decoded, u8a] = decodeRaw(registry, typeName, value);
     super(registry, u8a);
     this.#Type = Type;
     this.#decoded = decoded;
+    this.#opaqueName = opaqueName;
   }
 
   static with(Type) {
@@ -62,7 +64,7 @@ export class WrapperKeepOpaque extends Bytes {
 
 
   toRawType() {
-    return `WrapperKeepOpaque<${this.registry.getClassName(this.#Type) || (this.#decoded ? this.#decoded.toRawType() : new this.#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)
@@ -78,7 +80,7 @@ export class WrapperKeepOpaque extends Bytes {
 
 
   unwrap() {
-    return assertReturn(this.#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/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.5.1",
+  "version": "7.5.2-0",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",

package/packageInfo.cjs

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/types-codec',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '7.5.1'
+  version: '7.5.2-0'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/types-codec',
   path: new URL('.', import.meta.url).pathname,
   type: 'esm',
-  version: '7.5.1'
+  version: '7.5.2-0'
 };