@leofcoin/codec-format-interface 1.7.6 → 1.7.8

package/exports/basic-interface.d.ts

@@ -1,7 +1,9 @@
+import type { base58String } from '@vandeurenglenn/base58';
+import type { base32String } from '@vandeurenglenn/base32';
 export default class BasicInterface {
     #private;
-    keys: string[];
     name: string;
+    get keys(): string[];
     get encoded(): Uint8Array;
     set encoded(value: Uint8Array);
     get decoded(): object;
@@ -27,7 +29,7 @@ export default class BasicInterface {
     /**
      * @return {String} encoded
      */
-    toBs32(): string;
+    toBs32(): base32String;
     /**
      * @return {String} encoded
      */

package/exports/basic-interface.js

@@ -1,4 +1,4 @@
-import bs32 from '@vandeurenglenn/base32';
+import base32 from '@vandeurenglenn/base32';
 import base58 from '@vandeurenglenn/base58';
 import isHex from '@vandeurenglenn/is-hex';
 import proto from '@vandeurenglenn/proto-array';
@@ -7,9 +7,13 @@ import { fromBase58, fromHex, toHex, toBase32, toBase58 } from '@vandeurenglenn/
 class BasicInterface {
     #encoded;
     #decoded;
-    keys;
     name;
     #proto;
+    get keys() {
+        // handles proto keys
+        // protokey -> key
+        return Object.keys(this.#proto).map((key) => (key.endsWith('?') ? key.split('?')[0] : key));
+    }
     get encoded() {
         if (!this.#encoded)
             this.#encoded = this.encode();
@@ -28,7 +32,6 @@ class BasicInterface {
     }
     set proto(value) {
         this.#proto = value;
-        this.keys = Object.keys(value);
     }
     get proto() {
         return this.#proto;
@@ -54,13 +57,13 @@ class BasicInterface {
         return isHex(string);
     }
     isBase32(string) {
-        return bs32.isBase32(string);
+        return base32.isBase32(string);
     }
     isBase58(string) {
         return base58.isBase58(string);
     }
     fromBs32(encoded) {
-        return this.decode(bs32.decode(encoded));
+        return this.decode(base32.decode(encoded));
     }
     fromBs58(encoded) {
         return this.decode(fromBase58(encoded));
@@ -74,7 +77,7 @@ class BasicInterface {
     }
     fromString(string) {
         const array = string.split(',');
-        const arrayLike = array.map(string => Number(string));
+        const arrayLike = array.map((string) => Number(string));
         return this.decode(Uint8Array.from(arrayLike));
     }
     fromHex(string) {
@@ -94,7 +97,10 @@ class BasicInterface {
     toHex() {
         if (!this.encoded)
             this.encode();
-        return toHex(this.encoded.toString().split(',').map(number => Number(number)));
+        return toHex(this.encoded
+            .toString()
+            .split(',')
+            .map((number) => Number(number)));
     }
     /**
      * @return {String} encoded

package/exports/codec-format-interface.d.ts

@@ -1,5 +1,5 @@
-import BasicInterface from "./basic-interface.js";
-import Hash from "./codec-hash.js";
+import BasicInterface from './basic-interface.js';
+import Hash from './codec-hash.js';
 export default class FormatInterface extends BasicInterface implements FormatInterface {
     #private;
     hashFormat: string;
@@ -17,6 +17,11 @@ export default class FormatInterface extends BasicInterface implements FormatInt
         name?: string;
     });
     get format(): string;
+    beforeHashing(decoded: {
+        [index: string]: any;
+    }): {
+        [index: string]: any;
+    };
     /**
      * @return {PeernetHash}
      */

package/exports/codec-format-interface.js

@@ -19,7 +19,7 @@ class FormatInterface extends BasicInterface {
             this.fromUint8Array(buffer);
         else if (buffer instanceof ArrayBuffer)
             this.fromArrayBuffer(buffer);
-        else if (typeof buffer === "string") {
+        else if (typeof buffer === 'string') {
             if (this.isHex(buffer))
                 this.fromHex(buffer);
             else if (this.isBase58(buffer))
@@ -85,7 +85,7 @@ class FormatInterface extends BasicInterface {
     constructor(buffer, proto, options) {
         super();
         this.proto = proto;
-        this.hashFormat = options?.hashFormat ? options.hashFormat : "bs32";
+        this.hashFormat = options?.hashFormat ? options.hashFormat : 'bs32';
         if (options?.name)
             this.name = options.name;
         this.init(buffer);
@@ -94,13 +94,16 @@ class FormatInterface extends BasicInterface {
         const upper = this.hashFormat.charAt(0).toUpperCase();
         return `${upper}${this.hashFormat.substring(1, this.hashFormat.length)}`;
     }
+    beforeHashing(decoded) {
+        delete decoded.hash;
+        return decoded;
+    }
     /**
      * @return {PeernetHash}
      */
     get peernetHash() {
-        const decoded = this.decoded;
+        const decoded = this.beforeHashing({ ...this.decoded });
         // @ts-ignore
-        delete decoded.hash;
         return new CodecHash(decoded, { name: this.name });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/codec-format-interface",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "description": "",
   "type": "module",
   "exports": {