zkjson 0.1.20 → 0.1.21

package/package.json

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

package/parse.js

@@ -1,17 +1,9 @@
-const { length, next, arr: _arr, push, pop, last } = require("./uint")
+const { toArray,concat, sum, get, popArray, pushArray, length, next, arr: _arr, push, pop, last } = require("./uint")
 const _null_ = [110, 117, 108, 108]
 const _true_ = [116, 114, 117, 101]
 const _false_ = [102, 97, 108, 115, 101]
 
-const eql = (a, b) => {
-  if (a.length != b.length) return 0
-  for (let i = 0; i < b.length; i++) {
-    if (a[i] != b[i]) return 0
-  }
-  return 1
-}
-
-const eql2 = (a, b, blen, size = 100) => {
+const eql = (a, b, blen, size = 100) => {
   var alen = length(a, size)
   if (alen != blen) return 0
   var c = [0, size, 0, 0, 0, 0, 0, 0, 0]
@@ -22,64 +14,28 @@ const eql2 = (a, b, blen, size = 100) => {
   return 1
 }
 
-const constVal = (_v, type) => {
-  let val = []
-  val.push(type)
-  if (type == 1) {
-    if (eql(_v, _true_) == 1) {
-      val.push(1)
-    } else {
-      val.push(0)
-    }
-  } else if (type == 3) {
-    val.push(_v.length)
-    for (let v of _v) {
-      val.push(v)
-    }
-  } else if (type == 2) {
-    if (_v[0] == 45) {
-      val.push(0)
-    } else {
-      val.push(1)
-    }
-    let after = 0
-    let right = 0
-    let digits = 0
-    for (let v of _v) {
-      if (v == 46) {
-        after = 1
-      } else if (v != 45) {
-        if (after == 1) right += 1
-        digits = digits * 10 + (v - 48)
-      }
-    }
-    val.push(right)
-    val.push(digits)
-  }
-  return val
-}
 
-const constVal2 = (_v, type, size) => {
+const constVal = (_v, type, size) => {
   var val = _arr(size)
-  push(val, size, 9, type)
+  val = push(val, size, 9, type)
   if (type == 1) {
-    if (eql2(_v, _true_, 4, size) == 1) {
-      push(val, size, 9, 1)
+    if (eql(_v, _true_, 4, size) == 1) {
+      val = push(val, size, 9, 1)
     } else {
-      push(val, size, 9, 0)
+      val = push(val, size, 9, 0)
     }
   } else if (type == 3) {
-    push(length(_v, size))
+    val = push(val, size, 9, length(_v, size))
     var c = [0, size, 0, 0, 0, 0, 0, 0, 0]
     while (c[5] == 0) {
       c = next(_v, c)
-      push(val, size, 9, c[0])
+      val = push(val, size, 9, c[0])
     }
   } else if (type == 2) {
-    if (_v[0] == 45) {
-      push(val, size, 9, 0)
+    if (get(_v, size, 0) == 45) {
+      val = push(val, size, 9, 0)
     } else {
-      push(val, size, 9, 1)
+      val = push(val, size, 9, 1)
     }
     let after = 0
     let right = 0
@@ -94,58 +50,57 @@ const constVal2 = (_v, type, size) => {
         digits = digits * 10 + (c[0] - 48)
       }
     }
-    push(val, size, 9, right)
-    push(val, size, 9, digits)
+    val = push(val, size, 9, right)
+    val = push(val, size, 9, digits)
   }
   return val
 }
 
-const constPath = p => {
-  let pth = [p.length]
-  for (let _v of p) {
-    if (Array.isArray(_v)) {
-      pth.push(_v.length)
-      for (let v2 of _v) pth.push(v2)
-    } else {
-      pth.push(0)
-      pth.push(0)
-      pth.push(_v)
+const constPath = (p, size) => {
+  var pth2 = _arr(size)
+  var len = get(p,size,0);
+  pth2 =  push(pth2,size,9,len)
+  for(var i = 0;i < len; i++){
+    var len2 = get(p,size,i + 1);
+    var _sum = sum(p, size, 9, 1, 1 + i)
+    var first = get(p, size, 1 + len + _sum)
+    if(first == 0){
+      pth2 = push(pth2,size,9,0)
+    }else{
+      pth2 = push(pth2,size,9,len2)
+    }
+    for(var i2 = 0;i2 < len2; i2++){
+      var v = get(p, size, 1 + len + _sum + i2)
+      pth2 = push(pth2,size,9,v)
     }
   }
-  return pth
+  return pth2
 }
 
-const constPath2 = (p, size) => {
-  let pth = [p.length]
-  var pth2 = _arr(size)
-  for (let _v of p) {
-    if (Array.isArray(_v)) {
-      pth.push(_v.length)
-      for (let v2 of _v) pth.push(v2)
-    } else {
-      pth.push(0)
-      pth.push(0)
-      pth.push(_v)
+const isNumber = (val,size, digit) =>{
+  var len = length(val, size)
+  var c = [0, size, 0, 0, 0, 0, 0, 0, 0]
+    while (c[5] == 0) {
+      c = next(val, c)
+      if(c[0] == 47 || c[0] < 45 || c[0] > 57) return false
     }
-  }
-  return pth2
+  
+  return true
 }
 
 const parse = (str, size = 100) => {
-  var val = []
-  var val2 = _arr(size)
+  var val = _arr(size)
   var inVal = 0
   var isNum = 0
   var esc = 0
   var nextKey = 0
   var arr = 0
   var obj = 0
-  var path = []
-  var path2 = _arr(size)
+  var path = _arr(size)
   var ao = _arr(5)
   var ind = _arr(5)
   var err = 0
-  var json = []
+  var json = _arr(size)
   let c = [0, size, 0, 0, 0, 0, 0, 0, 0]
   while (c[5] == 0) {
     c = next(str, c)
@@ -155,84 +110,82 @@ const parse = (str, size = 100) => {
         esc = 1
       } else if (s == 34) {
         if (esc == 1) {
-          val.push(s)
-          push(val2, size, 9, s)
+          val = push(val, size, 9, s)
         } else {
           inVal = 0
           if (nextKey == 1 && last(ao, 5) == 1) {
-            path.push(val) // val push
+            path = pushArray(path,size,9,val,size)
           } else {
             if (last(ao, 5) == 2) {
               var _ind = last(ind, 5)
-              path.push(_ind)
+              var __ind = _arr(size)
+              __ind = push(__ind, size, 9, 0)
+              __ind = push(__ind, size, 9, _ind)
+              path = pushArray(path, size, 9, __ind, size)
               ind = pop(ind, 5)
-              push(ind, 5, 9, _ind + 1)
+              ind = push(ind, 5, 9, _ind + 1)
             }
-            // console.log("val: ", `< ${path.join(".")} >`, val)
-            //console.log(constVal2(val2, 3, size))
-            json.push([constPath(path), constVal(val, 3)])
-            path.pop()
+            json = concat(json, concat(constPath(path, size),constVal(val,3,size),size,9), size,9);
+            popArray(path, size, 9)
           }
 
-          val = []
-          val2 = _arr(size)
+          val = _arr(size)
           nextKey = 0
         }
         esc = 0
       } else {
-        val.push(s)
-        push(val2, size, 9, s)
+        push(val, size, 9, s)
         esc = 0
       }
     } else if (isNum == 1) {
       if (s == 44 || s == 32 || s == 125 || s == 93) {
         if (last(ao, 5) == 2) {
           var _ind = last(ind, 5)
-          path.push(_ind)
+          var __ind = _arr(size)
+          __ind = push(__ind, size, 9, 0)
+          __ind = push(__ind, size, 9, _ind)
+          path = pushArray(path, size, 9, __ind, size)
           ind = pop(ind, 5)
-          push(ind, 5, 9, _ind + 1)
+          ind = push(ind, 5, 9, _ind + 1)
+
         }
         if (
-          eql2(val2, _true_, 4, size) == 0 &&
-          eql2(val2, _false_, 5, size) == 0 &&
-          eql2(val2, _null_, 4, size) == 0 &&
-          Number.isNaN(+val)
+          eql(val, _true_, 4, size) == 0 &&
+          eql(val, _false_, 5, size) == 0 &&
+            eql(val, _null_, 4, size) == 0 &&
+            isNumber(val, size, 9) == 0
         ) {
           err = 1
         }
-        // console.log("val: ", `< ${path.join(".")} >`, val)
         var type = 2
-        if (eql2(val2, _null_, 4, size) == 1) {
+        if (eql(val, _null_, 4, size) == 1) {
           type = 0
         } else if (
-          eql2(val2, _true_, 4, size) == 1 ||
-          eql2(val2, _false_, 5, size)
+          eql(val, _true_, 4, size) == 1 ||
+          eql(val, _false_, 5, size) == 1
         ) {
           type = 1
         }
-        //console.log(constVal2(val2, type, size))
-        json.push([constPath(path), constVal(val, type)])
-        path.pop()
+        json = concat(json, concat(constPath(path, size),constVal(val,type,size),size,9), size,9);
+        popArray(path, size, 9)
         if (s == 93) {
           if (last(ao, 5) != 2) err = 1
           ao.pop()
-          path.pop()
+          popArray(path, size, 9)
           arr--
           pop(ind, 5)
         }
         if (s == 125) {
           if (last(ao, 5) != 1) err = 1
           pop(ao, 5)
-          path.pop()
+          popArray(path, size, 9)
           obj--
         }
         isNum = 0
-        val = []
-        val2 = _arr(size)
+        val = _arr(size)
         if (s == 44) nextKey = 1
       } else {
-        val.push(s)
-        push(val2, size, 9, s)
+        val = push(val, size, 9, s)
       }
     } else if (s == 34) {
       inVal = 1
@@ -246,69 +199,75 @@ const parse = (str, size = 100) => {
       s != 125
     ) {
       isNum = 1
-      val.push(s)
-      push(val2, size, 9, s)
+      val = push(val, size, 9, s)
     } else {
       if (s != 32) {
         if (s == 123 || s == 44) nextKey = 1
         if (s == 123) {
           if (last(ao, 5) == 2) {
             var _ind = last(ind, 5)
-            path.push(_ind)
+            var __ind = _arr(size)
+            __ind = push(__ind, size, 9, 0)
+            __ind = push(__ind, size, 9, _ind)
+            path = pushArray(path, size, 9, __ind, size)
             ind = pop(ind, 5)
-            push(ind, 5, 9, _ind + 1)
+            ind = push(ind, 5, 9, _ind + 1)
           }
-          push(ao, 5, 9, 1)
+          ao = push(ao, 5, 9, 1)
           obj++
         }
         if (s == 125) {
           if (last(ao, 5) != 1) err = 1
           pop(ao, 5)
-          path.pop()
+          popArray(path, size, 9)
           obj--
         }
         if (s == 91) {
           if (last(ao, 5) == 2) {
             var _ind = last(ind, 5)
-            path.push(_ind)
+            var __ind = _arr(size)
+            __ind = push(__ind, size, 9, 0)
+            __ind = push(__ind, size, 9, _ind)
+            path = pushArray(path, size, 9, __ind, size)
             ind = pop(ind, 5)
-            push(ind, 5, 9, _ind + 1)
+            ind = push(ind, 5, 9, _ind + 1)
           }
-          push(ind, 5, 9, 0)
-          push(ao, 5, 9, 2)
+          ind = push(ind, 5, 9, 0)
+          ao = push(ao, 5, 9, 2)
           arr++
         }
         if (s == 93) {
           if (last(ao, 5) != 2) err = 1
-          pop(ao, 5)
-          pop(ind, 5)
-          path.pop()
+          ao = pop(ao, 5)
+          ind = pop(ind, 5)
+          path = popArray(path, size, 9)
           arr--
         }
       }
     }
   }
-
-  if (length(val2, size)) {
-    isNum = 0
-    // maybe need type this is only for bare values
-    //console.log(constVal2(val2, type, size))
-    json.push([constPath(path), constVal(val)])
-    //for (var v of path) json[json.length - 1][0].push(v)
+  if (length(val, size) != 0) {
+    var type = 4
+    if(eql(val,_null_,4,size) == 1){
+      type = 0
+      isNum = 0
+    }else if(
+      eql(val, _true_, 4, size) == 1 ||
+        eql(val, _false_, 5, size)
+    ){
+      type = 1
+      isNum = 0
+    } else if (isNumber(val, size, 9) == 1){
+      type = 2
+      isNum = 0
+    }
+    json = concat(json, concat(constPath(path, size),constVal(val,type, size), size, 9), size,9);
   }
   if (ao.length > 0) err = 1
   if (ind.length > 0) err = 1
   if (inVal) err = 1
   if (isNum) err = 1
-  var j = _arr(size)
-  for (var v of json) {
-    for (var v2 of v) {
-      for (var v3 of v2) {
-        j = push(j, size, 9, v3)
-      }
-    }
-  }
-  return j
+  return json
 }
 
 module.exports = { parse }

package/uint.js

@@ -86,13 +86,11 @@ const popArray = (json, size, digit) => {
 const length = (json, size) => {
   var _len = 0
   var c = [0, size, 0, 0, 0, 0, 0, 0, 0]
-  var nonzero = 0
   while (c[5] == 0) {
     c = next(json, c)
-    if (c[0] > 0) nonzero = 1
     _len++
   }
-  if (nonzero) {
+  if (json[0] != 0) {
     return _len
   } else {
     return 0
@@ -234,6 +232,18 @@ const unshift = (json, size, digit, num) => {
   return _arr
 }
 
+const concat = (json, json2, size, digit) => {
+  var c = [0, size, 0, 0, 0, 0, 0, 0, 0]
+  var i = 0
+  if (json2[0] !== 0) {
+    while (c[5] == 0) {
+      c = next(json2, c)
+      json = push(json, size, digit, c[0])
+      i++
+    }
+  }
+  return json
+}
 const pop = (json, size, overflow = 3) => {
   var l = 0
   var ll = 0
@@ -533,5 +543,6 @@ module.exports = {
   mul,
   arrGet,
   remove,
-  popArray
+  popArray,
+  concat
 }