@leofcoin/codec-format-interface 1.2.6 → 1.3.0

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@leofcoin/codec-format-interface",
-  "version": "1.2.6",
+  "version": "1.3.0",
   "description": "",
   "main": "dist/index.js",
-  "module": "src/index.js",
+  "module": "dist/module.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "c": "rollup -c"
@@ -24,7 +24,6 @@
     "@vandeurenglenn/base58": "^1.1.0",
     "@vandeurenglenn/is-hex": "^1.0.0",
     "keccak": "^3.0.2",
-    "protons": "^2.0.1",
     "varint": "^6.0.0"
   },
   "devDependencies": {

package/rollup.config.js

@@ -1,7 +1,19 @@
+import resolve from 'rollup-plugin-node-resolve'
+import commonjs from 'rollup-plugin-commonjs'
 export default [{
   input: ['src/index.js'],
   output: [{
     dir: 'dist',
     format: 'cjs'
   }]
+}, {
+  input: ['src/index.js'],
+  output: [{
+    file: 'dist/module.js',
+    format: 'es'
+  }],
+  plugins: [
+    commonjs(),
+    resolve()
+  ]
 }]

package/src/basic-interface.js

@@ -3,12 +3,12 @@ import bs58 from '@vandeurenglenn/base58';
 import isHex from '@vandeurenglenn/is-hex';
 
 export default class BasicInterface {
-  #handleDecode() {
+  handleDecode() {
     if (!this.decode) throw new Error('bad implementation: needs decode func')
     return this.decode()
   }
 
-  #handleEncode() {
+  handleEncode() {
     if (!this.encode) throw new Error('bad implementation: needs encode func')
     return this.encode()
   }
@@ -26,7 +26,7 @@ export default class BasicInterface {
    */
   fromBs32(encoded) {
     this.encoded = bs32.decode(encoded)
-    return this.#handleDecode()
+    return this.handleDecode()
   }
 
   /**
@@ -34,7 +34,7 @@ export default class BasicInterface {
    */
   fromBs58(encoded) {
     this.encoded = bs58.decode(encoded)
-    return this.#handleDecode()
+    return this.handleDecode()
   }
 
   async toArray() {
@@ -47,12 +47,12 @@ export default class BasicInterface {
 
   fromString(string) {
     this.encoded = new Uint8Array(string.split(','))
-    return this.#handleDecode()
+    return this.handleDecode()
   }
 
   fromArray(array) {
     this.encoded = new Uint8Array([...array])
-    return this.#handleDecode()
+    return this.handleDecode()
   }
 
   /**
@@ -60,7 +60,7 @@ export default class BasicInterface {
    */
   fromEncoded(encoded) {
     this.encoded = encoded
-    return this.#handleDecode()
+    return this.handleDecode()
   }
 
   /**
@@ -68,11 +68,11 @@ export default class BasicInterface {
    */
   fromHex(encoded) {
     this.encoded = Buffer.from(encoded, 'hex')
-    return this.#handleDecode()
+    return this.handleDecode()
   }
 
   async toString(encoding = 'utf8') {
-    if (!this.encoded) await this.#handleEncode()
+    if (!this.encoded) await this.handleEncode()
     return this.encoded.toString(encoding)
   }
 
@@ -87,7 +87,7 @@ export default class BasicInterface {
    * @return {String} encoded
    */
   async toBs32() {
-    if (!this.encoded) await this.#handleEncode()
+    if (!this.encoded) await this.handleEncode()
     return bs32.encode(this.encoded)
   }
 
@@ -95,7 +95,7 @@ export default class BasicInterface {
    * @return {String} encoded
    */
   async toBs58() {
-    if (!this.encoded) await this.#handleEncode()
+    if (!this.encoded) await this.handleEncode()
     return bs58.encode(this.encoded)
   }
 

package/src/codec-format-interface.js

@@ -1,25 +1,20 @@
 import BasicInterface from './basic-interface.js'
 import Codec from './codec.js';
 import Hash from './codec-hash.js'
-let protons
 
 export default class FormatInterface extends BasicInterface {
-  async #importProtons() {
-    let importee = await import(/* webpackChunkName: "protons" */ 'protons')
-    return importee.default
-  }
 
   async protoEncode(data) {
-    if (!protons) protons = await this.#importProtons()
-    return protons(this.proto)[this.messageName].encode(data)
+    // check schema
+    return new TextEncoder().encode(data)
   }
 
   async protoDecode(data) {
-    if (!protons) protons = await this.#importProtons()
-    return protons(this.proto)[this.messageName].decode(data)
+    // check schema
+    return new TextDecoder().decode(data)
   }
 
-  async #init(buffer) {
+  async init(buffer) {
     if (buffer instanceof Uint8Array) await this.fromUint8Array(buffer)
     else if (buffer instanceof ArrayBuffer) await this.fromArrayBuffer(buffer)
     else if (buffer?.name === this.name) return buffer
@@ -44,7 +39,7 @@ export default class FormatInterface extends BasicInterface {
     this.proto = proto
     this.hashFormat = options.hashFormat || 'bs32'
     if (options.name) this.name = options.name
-    return this.#init(buffer)
+    return this.init(buffer)
   }
 
   /**
@@ -72,6 +67,11 @@ export default class FormatInterface extends BasicInterface {
     encoded = encoded.slice(discoCodec.codecBuffer.length)
     this.name = discoCodec.name
     this.decoded = await this.protoDecode(encoded)
+    try {
+      this.decoded = JSON.parse(this.decoded)
+    } catch {
+      
+    }
     return this.decoded
   }
 
@@ -81,7 +81,7 @@ export default class FormatInterface extends BasicInterface {
   async encode(decoded) {
     if (!decoded) decoded = this.decoded;
     const codec = new Codec(this.name)
-    const encoded = await this.protoEncode(decoded)
+    const encoded = await this.protoEncode(typeof decoded === 'object' ? JSON.stringify(decoded) : decoded)
     const uint8Array = new Uint8Array(encoded.length + codec.codecBuffer.length)
     uint8Array.set(codec.codecBuffer)
     uint8Array.set(encoded, codec.codecBuffer.length)

package/src/index.js

@@ -1,5 +1,11 @@
-export { default as BasicInterface } from './basic-interface.js'
-export { default as FormatInterface } from './codec-format-interface.js'
-export { default as CodecHash } from './codec-hash.js'
-export { default as Codec } from './codec.js'
-export { default as codecs } from './codecs.js'
+import basicInterface from './basic-interface.js'
+import formatInterface from './codec-format-interface.js'
+import codecHash from './codec-hash.js'
+import codec from './codec.js'
+import codecs from './codecs.js'
+
+export const BasicInterface = basicInterface
+export const FormatInterface = formatInterface
+export const CodecHash = codecHash
+export const Codec = codec
+export const Codecs = codecs