weavedb-node-client 0.13.5 → 0.18.2

package/index.js

@@ -1,4 +1,14 @@
-const { init, all, complement, isNil, is, last, includes } = require("ramda")
+const {
+  dissoc,
+  isEmpty,
+  init,
+  all,
+  complement,
+  isNil,
+  is,
+  last,
+  includes,
+} = require("ramda")
 const Base = require("weavedb-base")
 const PROTO_PATH = __dirname + "/weavedb.proto"
 const grpc = require("@grpc/grpc-js")
@@ -97,16 +107,7 @@ class SDK extends Base {
     if (!isNil(EthWallet)) this.setEthWallet(EthWallet)
   }
 
-  parseQuery(func, query) {
-    let nocache = false
-    if (includes(func)(reads) && is(Boolean, last(query))) {
-      nocache = last(query)
-      query = init(query)
-    }
-    return { nocache, query }
-  }
-
-  async _request(func, query, nocache, bundle, relay = false) {
+  async write(func, query, nocache, bundle, relay = false) {
     if (!includes(func)(reads)) {
       nocache = false
       if (relay) {
@@ -115,7 +116,7 @@ class SDK extends Base {
     }
     const request = {
       method: `${func}@${this.contractTxId}`,
-      query: JSON.stringify(query),
+      query: JSON.stringify(isNil(query) ? "" : query),
       nocache,
     }
     const _query = () =>
@@ -134,37 +135,23 @@ class SDK extends Base {
         })
       })
     let q = await _query()
-    if (isNil(q.err)) {
-      return q.result
-    } else {
-      throw new Error(q.err)
-    }
-  }
-
-  async request(func, ...query) {
-    let nocache = false
-    ;({ nocache, query } = this.parseQuery(func, query))
-    return await this._request(func, query, nocache)
-  }
-
-  async getNonce(addr) {
-    return this.request("getNonce", addr, true)
-  }
-
-  async getIds(tx) {
-    return this.request("getIds", tx)
+    if (!isNil(q.err)) throw new Error(q.err)
+    return q.result
   }
 
-  async getAddressLink(address) {
-    return this.request("getAddressLink", address)
-  }
+  async read(params, nocache) {
+    let query = dissoc("function")(params)
+    if (isEmpty(query)) {
+      query = null
+    } else if (!isNil(query.query)) {
+      query = query.query
+    }
 
-  async getVersion() {
-    return this.request("getAddressLink")
+    return await this.write(params.function, query, nocache)
   }
 
-  async getEvolve() {
-    return this.request("getEvolve")
+  async getNonce(addr) {
+    return this.readQuery("getNonce", addr, true)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weavedb-node-client",
-  "version": "0.13.5",
+  "version": "0.18.2",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -11,6 +11,6 @@
     "@grpc/proto-loader": "^0.5.0",
     "arweave": "^1.12.2",
     "ramda": "^0.28.0",
-    "weavedb-base": "^0.13.1"
+    "weavedb-base": "^0.18.1"
   }
 }