zkjson 0.5.0 → 0.5.2

package/decoder-v2.js

@@ -7,7 +7,7 @@ const {
   base64,
 } = require("./utils.js")
 
-module.exports = class decoder {
+class decoder {
   constructor() {
     this.c = 0
     this.json = null
@@ -65,10 +65,10 @@ module.exports = class decoder {
       this.getKflags()
       this.getKlinks()
       this.getKeyLens()
+      this.getKeys()
       this.getTypes()
       this.getBools()
       this.getNums()
-      this.getKeys()
       this.build()
     }
   }
@@ -115,9 +115,11 @@ module.exports = class decoder {
       }
     }
   }
+
   getLen() {
     this.len = this.short()
   }
+
   show() {
     console.log()
     console.log("len", this.len)
@@ -129,6 +131,7 @@ module.exports = class decoder {
     console.log("keys", this.keys)
     console.log()
   }
+
   getVflags() {
     let i = 0
     while (i < this.len) {
@@ -137,6 +140,7 @@ module.exports = class decoder {
       i++
     }
   }
+
   getKflags() {
     let i = 0
     while (i < this.key_length - 1) {
@@ -201,6 +205,7 @@ module.exports = class decoder {
     prev = val
     return prev
   }
+
   addKlink(diff, val, prev) {
     val -= 1
     if (diff) {
@@ -371,7 +376,7 @@ module.exports = class decoder {
             this.keys.push([code])
           } else {
             let key = ""
-            for (let i2 = 0; i2 < len - 2; i2++) key += base64_rev[this.n(6)]
+            for (let i2 = 0; i2 < len - 1; i2++) key += base64_rev[this.n(6)]
             this.keys.push(key)
           }
         } else {
@@ -379,7 +384,7 @@ module.exports = class decoder {
             this.keys.push("")
           } else {
             let key = ""
-            for (let i2 = 0; i2 < len - 2; i2++) {
+            for (let i2 = 0; i2 < len - 1; i2++) {
               key += String.fromCharCode(Number(this.leb128()))
             }
             this.keys.push(key)
@@ -590,3 +595,10 @@ module.exports = class decoder {
     }
   }
 }
+
+function decode_x(v, d) {
+  d.decode(v)
+  return d.json
+}
+
+module.exports = { decoder, decode_x }

package/encoder-v2.js

@@ -492,6 +492,14 @@ class u8 {
     } else this.leb128_vals(v)
   }
 
+  short_nums(v) {
+    if (v < 16) {
+      const d = v < 4 ? 2 : this.fastBits(v)
+      this.add_nums(d - 2, 2)
+      this.add_nums(v, d)
+    } else this.leb128_nums(v)
+  }
+
   short_kvals(v) {
     if (v < 16) {
       const d = v < 4 ? 2 : this.fastBits(v)
@@ -641,10 +649,10 @@ class u8 {
     writeBuffer(this.kflags, this.kflags_len)
     writeBuffer(this.klinks, this.klinks_len)
     writeBuffer(this.keys, this.keys_len)
+    writeBuffer(this.kvals, this.kvals_len)
     writeBuffer(this.types, this.types_len)
     writeBuffer(this.bools, this.bools_len)
     writeBuffer(this.nums, this.nums_len)
-    writeBuffer(this.kvals, this.kvals_len)
     writeBuffer(this.vals, this.vals_len)
 
     if (padBits > 0) writeBits(0, padBits)
@@ -676,7 +684,7 @@ function pushPathStr(u, v2, prev = null) {
       if (is64) ktype = 2
     }
     u.add_keys(ktype, 2)
-    u.push_keylen(len + 2)
+    u.push_keylen(len + 1)
     if (ktype === 3) for (let v of codes2) u.leb128_2_kvals(v)
     else for (let v of codes) u.add_kvals(v, 6)
   }
@@ -686,7 +694,6 @@ function pushPathStr(u, v2, prev = null) {
 function pushPathNum(u, prev = null, keylen) {
   if (u.dcount > 0) u.push_klink(prev === null ? 0 : prev + 1)
   u.add_keys(keylen, 2)
-  const id = keylen === 0 ? u.iid++ : u.oid++
   u.dcount++
 }
 
@@ -876,9 +883,4 @@ function _encode_x(
   }
 }
 
-function decode_x(v, d) {
-  d.decode(v)
-  return d.json
-}
-
-module.exports = { encode_x, decode_x, u8 }
+module.exports = { encode_x, u8 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zkjson",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Zero Knowledge Provable JSON",
   "main": "index.js",
   "license": "MIT",