zkjson 0.1.22 → 0.1.24

package/encoder.js

@@ -220,7 +220,6 @@ function _encode(v, path = []) {
 
 function encode(json) {
   let flattened = _encode(json)
-
   flattened.sort((a, b) => {
     const isUndefined = v => typeof v == "undefined"
     const max = Math.max(a[0].length, b[0].length)

package/package.json

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

package/parse.js

@@ -116,6 +116,7 @@ const parse = (str, size = 100, digit = 9) => {
   var err = 0
   var json = _arr(size)
   var c = bn([0, size, 0, 0, 0, 0, 0, 0, 0])
+  var bare = 1
   while (c[5] == 0) {
     c = next(str, c)
     var s = c[0]
@@ -137,7 +138,7 @@ const parse = (str, size = 100, digit = 9) => {
               __ind = push(__ind, size, digit, _ind)
               path = pushArray(path, size, digit, __ind, size)
               ind = pop(ind, 5)
-              ind = push(ind, 5, digit, _ind + 1)
+              ind = push(ind, 5, digit, _ind + 1n)
             }
             json = concat(
               json,
@@ -150,9 +151,8 @@ const parse = (str, size = 100, digit = 9) => {
               size,
               digit,
             )
-            path = popArray(path, size, digit)
+            if (bare == 0) path = popArray(path, size, digit)
           }
-
           val = _arr(size)
           nextKey = 0
         }
@@ -204,14 +204,13 @@ const parse = (str, size = 100, digit = 9) => {
         if (s == 93) {
           if (last(ao, 5) != 2) err = 1
           ao = pop(ao, 5)
-          path = popArray(path, size, digit)
+          if (bare == 0) path = popArray(path, size, digit)
           arr--
           ind = pop(ind, 5)
         }
         if (s == 125) {
           if (last(ao, 5) != 1) err = 1
           ao = pop(ao, 5)
-          path = popArray(path, size, digit)
           obj--
         }
         isNum = 0
@@ -235,7 +234,10 @@ const parse = (str, size = 100, digit = 9) => {
       val = push(val, size, digit, s)
     } else {
       if (s != 32) {
-        if (s == 123 || s == 44) nextKey = 1
+        if (s == 123 || s == 44) {
+          bare = 0
+          nextKey = 1
+        }
         if (s == 123) {
           if (last(ao, 5) == 2) {
             var _ind = last(ind, 5)
@@ -244,7 +246,7 @@ const parse = (str, size = 100, digit = 9) => {
             __ind = push(__ind, size, digit, _ind)
             path = pushArray(path, size, digit, __ind, size)
             ind = pop(ind, 5)
-            ind = push(ind, 5, digit, _ind + 1)
+            ind = push(ind, 5, digit, _ind + 1n)
           }
           ao = push(ao, 5, digit, 1)
           obj++
@@ -252,7 +254,6 @@ const parse = (str, size = 100, digit = 9) => {
         if (s == 125) {
           if (last(ao, 5) != 1) err = 1
           ao = pop(ao, 5)
-          path = popArray(path, size, digit)
           obj--
         }
         if (s == 91) {
@@ -263,7 +264,7 @@ const parse = (str, size = 100, digit = 9) => {
             __ind = push(__ind, size, digit, _ind)
             path = pushArray(path, size, digit, __ind, size)
             ind = pop(ind, 5)
-            ind = push(ind, 5, digit, _ind + 1)
+            ind = push(ind, 5, digit, _ind + 1n)
           }
           ind = push(ind, 5, digit, 0)
           ao = push(ao, 5, digit, 2)

package/uint.js

@@ -78,7 +78,7 @@ function popArray(json, size, digit) {
   } else {
     alen = get(json, size, 0)
   }
-  if (alen == 1) return []
+  if (alen == 1) return arr(size)
   var len = get(json, size, alen)
   json = replace(json, size, digit, 0, alen - 1n)
   var _sum = sum(json, size, digit, 1, alen)
@@ -374,6 +374,9 @@ function push(json, size, digit, c, overflow = 8) {
   json = bn(json)
   c = bn(c)
   var i4 = 0n
+  for (var i = i4; i < size; i++) {
+    if (json[i] != 0) i4 = i
+  }
   var init = 0n
   while (c > 0 || init == 0) {
     init = 1
@@ -392,7 +395,6 @@ function push(json, size, digit, c, overflow = 8) {
     var appended = 0
     for (var i = i4; i < size; i++) {
       var d = digits(json[i])
-      if (d == 0) break
       var one = 0n
       var ones = 0n
       var nums = 0n
@@ -462,6 +464,9 @@ function push(json, size, digit, c, overflow = 8) {
   }
   return json
 }
+function str(arr) {
+  return arr.map(n => n.toString())
+}
 function bn(arr) {
   if (typeof arr == "number") return BigInt(arr)
   if (!Array.isArray(arr)) return arr