zkjson 0.8.0 → 0.8.1

package/cjs/db.js

@@ -27,6 +27,13 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var to64 = function to64(hash) {
+  var n = BigInt(hash);
+  var hex = n.toString(16);
+  if (hex.length % 2) hex = "0" + hex;
+  var buf = Buffer.from(hex, "hex");
+  return buf.toString("base64");
+};
 var DB = exports["default"] = /*#__PURE__*/function () {
   function DB(_ref) {
     var _ref$size_val = _ref.size_val,
@@ -487,6 +494,13 @@ var DB = exports["default"] = /*#__PURE__*/function () {
       }
       return getInputs;
     }()
+  }, {
+    key: "hash",
+    value: function hash(format) {
+      var _hash = this.tree.F.toObject(this.tree.root);
+      if (format === "base64") return to64(_hash.toString());
+      return _hash.toString();
+    }
   }, {
     key: "getID",
     value: function getID(num) {

package/cjs/db_tree.js

@@ -18,6 +18,19 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var to64 = function to64(hash) {
+  var n = BigInt(hash);
+  var hex = n.toString(16);
+  if (hex.length % 2) hex = "0" + hex;
+  var buf = Buffer.from(hex, "hex");
+  return buf.toString("base64");
+};
+var from64 = function from64(b64) {
+  var buf = Buffer.from(b64, "base64");
+  var hex = buf.toString("hex");
+  var n = BigInt("0x" + hex);
+  return n.toString();
+};
 var DBTree = exports["default"] = /*#__PURE__*/function () {
   function DBTree(_ref) {
     var _ref$size_val = _ref.size_val,
@@ -70,6 +83,13 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
       }
       return init;
     }()
+  }, {
+    key: "hash",
+    value: function hash(format) {
+      var _hash = this.tree.F.toObject(this.tree.root);
+      if (format === "base64") return to64(_hash.toString());
+      return _hash.toString();
+    }
   }, {
     key: "exists",
     value: function () {
@@ -147,7 +167,6 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
     key: "addCollection",
     value: function () {
       var _addCollection = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(num) {
-        var _this$kv2;
         var id, col, _col, root;
         return _regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
@@ -188,18 +207,10 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
             case 6:
               id = _context4.v;
             case 7:
-              _col = new _collection_tree["default"]({
-                size_val: this.size_val,
-                size_path: this.size_path,
-                level: this.level,
-                size_json: this.size_json,
-                kv: (_this$kv2 = this.kv) === null || _this$kv2 === void 0 ? void 0 : _this$kv2.call(this, "dir_".concat(id))
-              });
               _context4.n = 8;
-              return _col.init();
+              return this.loadCol(id);
             case 8:
-              this.cols[id] = _col;
-              this.ids[id] = true;
+              _col = _context4.v;
               root = _col.tree.F.toObject(_col.tree.root).toString();
               _context4.n = 9;
               return this.tree.insert(id, [root]);
@@ -219,55 +230,140 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
     }()
   }, {
     key: "getColTree",
-    value: function getColTree(col) {
-      var _col = this.cols[col];
-      if (!_col) throw Error("collection doesn't exist");
-      return _col;
-    }
+    value: function () {
+      var _getColTree = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(col) {
+        var _col;
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
+            case 0:
+              _col = this.cols[col];
+              if (_col) {
+                _context5.n = 2;
+                break;
+              }
+              _context5.n = 1;
+              return this.loadCollection(col);
+            case 1:
+              return _context5.a(2, _context5.v);
+            case 2:
+              return _context5.a(2, _col);
+            case 3:
+              return _context5.a(2);
+          }
+        }, _callee5, this);
+      }));
+      function getColTree(_x4) {
+        return _getColTree.apply(this, arguments);
+      }
+      return getColTree;
+    }()
+  }, {
+    key: "loadCol",
+    value: function () {
+      var _loadCol = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(id) {
+        var _this$kv2;
+        var col;
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.n) {
+            case 0:
+              col = new _collection_tree["default"]({
+                size_val: this.size_val,
+                size_path: this.size_path,
+                level: this.level,
+                size_json: this.size_json,
+                kv: (_this$kv2 = this.kv) === null || _this$kv2 === void 0 ? void 0 : _this$kv2.call(this, "dir_".concat(id))
+              });
+              _context6.n = 1;
+              return col.init();
+            case 1:
+              this.cols[id] = col;
+              this.ids[id] = true;
+              return _context6.a(2, col);
+          }
+        }, _callee6, this);
+      }));
+      function loadCol(_x5) {
+        return _loadCol.apply(this, arguments);
+      }
+      return loadCol;
+    }()
+  }, {
+    key: "loadCollection",
+    value: function () {
+      var _loadCollection = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(id) {
+        var hit;
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
+            case 0:
+              _context7.n = 1;
+              return this.tree.find(id);
+            case 1:
+              hit = _context7.v;
+              if (!(!hit || !hit.found)) {
+                _context7.n = 2;
+                break;
+              }
+              throw Error("collection doesn't exist");
+            case 2:
+              _context7.n = 3;
+              return this.loadCol(id);
+            case 3:
+              return _context7.a(2, _context7.v);
+          }
+        }, _callee7, this);
+      }));
+      function loadCollection(_x6) {
+        return _loadCollection.apply(this, arguments);
+      }
+      return loadCollection;
+    }()
   }, {
     key: "insert",
     value: function () {
-      var _insert = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(col, _key, _val) {
+      var _insert = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(col, _key, _val) {
         var _col, update, res_doc, res_col;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.n) {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
             case 0:
-              _col = this.getColTree(col);
+              _context8.n = 1;
+              return this.getColTree(col);
+            case 1:
+              _col = _context8.v;
               update = false;
-              _context5.n = 1;
+              _context8.n = 2;
               return _col.get(_key);
-            case 1:
-              if (!_context5.v.found) {
-                _context5.n = 3;
+            case 2:
+              if (!_context8.v.found) {
+                _context8.n = 4;
                 break;
               }
               update = true;
-              _context5.n = 2;
+              _context8.n = 3;
               return _col.update(_key, _val);
-            case 2:
-              res_doc = _context5.v;
-              _context5.n = 5;
-              break;
             case 3:
-              _context5.n = 4;
-              return _col.insert(_key, _val);
+              res_doc = _context8.v;
+              _context8.n = 6;
+              break;
             case 4:
-              res_doc = _context5.v;
+              _context8.n = 5;
+              return _col.insert(_key, _val);
             case 5:
-              _context5.n = 6;
-              return this.updateDB(_col, col);
+              res_doc = _context8.v;
             case 6:
-              res_col = _context5.v;
-              return _context5.a(2, {
+              _context8.n = 7;
+              return this.updateDB(_col, col);
+            case 7:
+              res_col = _context8.v;
+              return _context8.a(2, {
                 update: update,
                 doc: res_doc,
                 col: res_col,
                 tree: _col.tree
               });
           }
-        }, _callee5, this);
+        }, _callee8, this);
       }));
-      function insert(_x4, _x5, _x6) {
+      function insert(_x7, _x8, _x9) {
         return _insert.apply(this, arguments);
       }
       return insert;
@@ -275,21 +371,21 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "updateDB",
     value: function () {
-      var _updateDB = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(_col, col) {
+      var _updateDB = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(_col, col) {
         var root, colD;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
             case 0:
               root = _col.tree.F.toObject(_col.tree.root).toString();
               colD = col;
-              _context6.n = 1;
+              _context9.n = 1;
               return this.tree.update(colD, [root]);
             case 1:
-              return _context6.a(2, _context6.v);
+              return _context9.a(2, _context9.v);
           }
-        }, _callee6, this);
+        }, _callee9, this);
       }));
-      function updateDB(_x7, _x8) {
+      function updateDB(_x0, _x1) {
         return _updateDB.apply(this, arguments);
       }
       return updateDB;
@@ -297,29 +393,32 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function () {
-      var _update = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(col, _key, _val) {
+      var _update = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(col, _key, _val) {
         var _col, res_doc, res_col;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.n) {
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.n) {
             case 0:
-              _col = this.getColTree(col);
-              _context7.n = 1;
-              return _col.update(_key, _val);
+              _context0.n = 1;
+              return this.getColTree(col);
             case 1:
-              res_doc = _context7.v;
-              _context7.n = 2;
-              return this.updateDB(_col, col);
+              _col = _context0.v;
+              _context0.n = 2;
+              return _col.update(_key, _val);
             case 2:
-              res_col = _context7.v;
-              return _context7.a(2, {
+              res_doc = _context0.v;
+              _context0.n = 3;
+              return this.updateDB(_col, col);
+            case 3:
+              res_col = _context0.v;
+              return _context0.a(2, {
                 doc: res_doc,
                 col: res_col,
                 tree: _col.tree
               });
           }
-        }, _callee7, this);
+        }, _callee0, this);
       }));
-      function update(_x9, _x0, _x1) {
+      function update(_x10, _x11, _x12) {
         return _update.apply(this, arguments);
       }
       return update;
@@ -327,29 +426,32 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "delete",
     value: function () {
-      var _delete2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(col, _key) {
+      var _delete2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(col, _key) {
         var _col, res_doc, res_col;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.n) {
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
             case 0:
-              _col = this.getColTree(col);
-              _context8.n = 1;
-              return _col["delete"](_key);
+              _context1.n = 1;
+              return this.getColTree(col);
             case 1:
-              res_doc = _context8.v;
-              _context8.n = 2;
-              return this.updateDB(_col, col);
+              _col = _context1.v;
+              _context1.n = 2;
+              return _col["delete"](_key);
             case 2:
-              res_col = _context8.v;
-              return _context8.a(2, {
+              res_doc = _context1.v;
+              _context1.n = 3;
+              return this.updateDB(_col, col);
+            case 3:
+              res_col = _context1.v;
+              return _context1.a(2, {
                 doc: res_doc,
                 col: res_col,
                 tree: _col.tree
               });
           }
-        }, _callee8, this);
+        }, _callee1, this);
       }));
-      function _delete(_x10, _x11) {
+      function _delete(_x13, _x14) {
         return _delete2.apply(this, arguments);
       }
       return _delete;
@@ -357,20 +459,23 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function () {
-      var _get = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(col, _key) {
+      var _get = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(col, _key) {
         var _col;
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.n) {
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.n) {
             case 0:
-              _col = this.getColTree(col);
-              _context9.n = 1;
-              return _col.get(_key);
+              _context10.n = 1;
+              return this.getColTree(col);
             case 1:
-              return _context9.a(2, _context9.v);
+              _col = _context10.v;
+              _context10.n = 2;
+              return _col.get(_key);
+            case 2:
+              return _context10.a(2, _context10.v);
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
-      function get(_x12, _x13) {
+      function get(_x15, _x16) {
         return _get.apply(this, arguments);
       }
       return get;
@@ -378,18 +483,18 @@ var DBTree = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "getCol",
     value: function () {
-      var _getCol = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(col) {
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.n) {
+      var _getCol = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(col) {
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             case 0:
-              _context0.n = 1;
+              _context11.n = 1;
               return this.tree.find(col);
             case 1:
-              return _context0.a(2, _context0.v);
+              return _context11.a(2, _context11.v);
           }
-        }, _callee0, this);
+        }, _callee11, this);
       }));
-      function getCol(_x14) {
+      function getCol(_x17) {
         return _getCol.apply(this, arguments);
       }
       return getCol;

package/esm/db.js

@@ -4,6 +4,14 @@ import { is, indexOf, range, isNil } from "ramda"
 import { pad, toSignal, encode, toIndex } from "./encoder.js"
 import Collection from "./collection.js"
 
+const to64 = hash => {
+  const n = BigInt(hash)
+  let hex = n.toString(16)
+  if (hex.length % 2) hex = "0" + hex
+  const buf = Buffer.from(hex, "hex")
+  return buf.toString("base64")
+}
+
 export default class DB {
   constructor({
     size_val = 8,
@@ -279,6 +287,12 @@ export default class DB {
       col_root,
     }
   }
+  hash(format) {
+    const _hash = this.tree.F.toObject(this.tree.root)
+    if (format === "base64") return to64(_hash.toString())
+    return _hash.toString()
+  }
+
   getID(num) {
     if (!isNil(num)) {
       if (indexOf(num)(this.ids) !== -1) {

package/esm/db_tree.js

@@ -2,6 +2,20 @@ import newMemEmptyTrie from "./newMemEmptyTrie.js"
 import { is, indexOf, isNil } from "ramda"
 import Collection from "./collection_tree.js"
 
+const to64 = hash => {
+  const n = BigInt(hash)
+  let hex = n.toString(16)
+  if (hex.length % 2) hex = "0" + hex
+  const buf = Buffer.from(hex, "hex")
+  return buf.toString("base64")
+}
+const from64 = b64 => {
+  const buf = Buffer.from(b64, "base64")
+  const hex = buf.toString("hex")
+  const n = BigInt("0x" + hex)
+  return n.toString()
+}
+
 export default class DBTree {
   constructor({
     size_val = 256,
@@ -30,6 +44,11 @@ export default class DBTree {
       if (!isNil(count)) this.count = count
     }
   }
+  hash(format) {
+    const _hash = this.tree.F.toObject(this.tree.root)
+    if (format === "base64") return to64(_hash.toString())
+    return _hash.toString()
+  }
   async exists(num) {
     const ex = this.ids[num] || (await this.tree.find(num)).found
     if (ex) this.ids[num] = true
@@ -57,16 +76,7 @@ export default class DBTree {
     } else {
       id = await this.getID(num)
     }
-    const _col = new Collection({
-      size_val: this.size_val,
-      size_path: this.size_path,
-      level: this.level,
-      size_json: this.size_json,
-      kv: this.kv?.(`dir_${id}`),
-    })
-    await _col.init()
-    this.cols[id] = _col
-    this.ids[id] = true
+    const _col = await this.loadCol(id)
     const root = _col.tree.F.toObject(_col.tree.root).toString()
     await this.tree.insert(id, [root])
     if (id === this.count) {
@@ -75,13 +85,32 @@ export default class DBTree {
     }
     return id
   }
-  getColTree(col) {
+  async getColTree(col) {
     const _col = this.cols[col]
-    if (!_col) throw Error("collection doesn't exist")
-    return _col
+    if (!_col) {
+      return await this.loadCollection(col)
+    } else return _col
+  }
+  async loadCol(id) {
+    const col = new Collection({
+      size_val: this.size_val,
+      size_path: this.size_path,
+      level: this.level,
+      size_json: this.size_json,
+      kv: this.kv?.(`dir_${id}`),
+    })
+    await col.init()
+    this.cols[id] = col
+    this.ids[id] = true
+    return col
+  }
+  async loadCollection(id) {
+    const hit = await this.tree.find(id)
+    if (!hit || !hit.found) throw Error("collection doesn't exist")
+    return await this.loadCol(id)
   }
   async insert(col, _key, _val) {
-    const _col = this.getColTree(col)
+    const _col = await this.getColTree(col)
     let update = false
     let res_doc
     if ((await _col.get(_key)).found) {
@@ -99,21 +128,21 @@ export default class DBTree {
     return await this.tree.update(colD, [root])
   }
   async update(col, _key, _val) {
-    const _col = this.getColTree(col)
+    const _col = await this.getColTree(col)
     const res_doc = await _col.update(_key, _val)
     const res_col = await this.updateDB(_col, col)
     return { doc: res_doc, col: res_col, tree: _col.tree }
   }
 
   async delete(col, _key) {
-    const _col = this.getColTree(col)
+    const _col = await this.getColTree(col)
     const res_doc = await _col.delete(_key)
     const res_col = await this.updateDB(_col, col)
     return { doc: res_doc, col: res_col, tree: _col.tree }
   }
 
   async get(col, _key) {
-    const _col = this.getColTree(col)
+    const _col = await this.getColTree(col)
     return await _col.get(_key)
   }
   async getCol(col) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zkjson",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Zero Knowledge Provable JSON",
   "exports": {
     ".": {