wao 0.5.6 → 0.6.1

package/cjs/gql.js

@@ -20,7 +20,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var full = "id anchor signature recipient owner { address key } fee { winston ar } quantity { winston ar } data { size type } tags { name value } block { id timestamp height previous } parent { id }";
+var full = "id anchor signature recipient owner { address key } fee { winston ar } quantity { winston ar } data { size type } tags { name value } block { id timestamp height previous } parent { id } bundledIn { id }";
 var full_blocks = "id timestamp height previous";
 var subs = {
   owner: ["address", "key"],
@@ -29,7 +29,8 @@ var subs = {
   data: ["size", "type"],
   tags: ["name", "value"],
   block: ["id", "timestamp", "height", "previous"],
-  parent: ["id"]
+  parent: ["id"],
+  bundledIn: ["id"]
 };
 var field = function field(key) {
   var val = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
@@ -140,7 +141,11 @@ var query = function query() {
   }
   if (opt.first) cond.push("first: ".concat(opt.first));
   if (opt.after) cond.push("after: \"".concat(opt.after, "\""));
-  if (opt.asc) cond.push("sort: HEIGHT_ASC");
+  if (opt.asc) {
+    cond.push("sort: HEIGHT_ASC");
+  } else {
+    cond.push("sort: HEIGHT_DESC");
+  }
   var _cond = "";
   if (cond.length > 0) _cond = "(".concat(cond.join(", "), ")");
   var fields = [];
@@ -172,7 +177,7 @@ var query = function query() {
     }
   }
   var _fields = fields.length > 0 ? fields.join(" ") : full;
-  return "query {\n  transactions ".concat(_cond, "{\n    edges { cursor node { ").concat(_fields, " } }\n  }\n}");
+  return "query {\n  transactions ".concat(_cond, "{\n    pageInfo { hasNextPage }\n    edges { cursor node { ").concat(_fields, " } }\n  }\n}");
 };
 var query_blocks = function query_blocks() {
   var _height2, _height3;
@@ -230,7 +235,7 @@ var query_blocks = function query_blocks() {
     }
   }
   var _fields = fields.length > 0 ? fields.join(" ") : full_blocks;
-  return "query {\n  blocks ".concat(_cond, "{\n    edges { cursor node { ").concat(_fields, " } }\n  }\n}");
+  return "query {\n  blocks ".concat(_cond, "{\n    pageInfo { hasNextPage }\n    edges { cursor node { ").concat(_fields, " } }\n  }\n}");
 };
 var GQL = exports["default"] = /*#__PURE__*/function () {
   function GQL() {
@@ -262,11 +267,14 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
               });
             case 2:
               json = _context.sent;
-              return _context.abrupt("return", (0, _ramda.map)(function (v) {
-                return _objectSpread({
-                  cursor: v.cursor
-                }, v.node);
-              })(json.data[tar].edges));
+              return _context.abrupt("return", {
+                isNext: json.data[tar].pageInfo.hasNextPage,
+                data: (0, _ramda.map)(function (v) {
+                  return _objectSpread({
+                    cursor: v.cursor
+                  }, v.node);
+                })(json.data[tar].edges)
+              });
             case 4:
             case "end":
               return _context.stop();
@@ -286,6 +294,8 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
         var opt,
           query,
           tar,
+          _yield$this$_fetch,
+          isNext,
           data,
           cursor,
           next,
@@ -299,13 +309,15 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
               _context3.next = 5;
               return this._fetch(query, tar);
             case 5:
-              data = _context3.sent;
+              _yield$this$_fetch = _context3.sent;
+              isNext = _yield$this$_fetch.isNext;
+              data = _yield$this$_fetch.data;
               if (!(opt.next === true)) {
-                _context3.next = 13;
+                _context3.next = 15;
                 break;
               }
               cursor = null;
-              if (data.length > 0) cursor = (0, _ramda.last)(data).cursor;
+              if (isNext && data.length > 0) cursor = (0, _ramda.last)(data).cursor;
               next = !cursor ? null : /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
                 var _opt;
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -327,9 +339,9 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
                 data: data,
                 next: next
               });
-            case 13:
+            case 15:
               return _context3.abrupt("return", data);
-            case 14:
+            case 16:
             case "end":
               return _context3.stop();
           }

package/cjs/helpers.js

@@ -4,12 +4,13 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setup = exports.ok = exports.fail = exports.Src = void 0;
+exports.setup = exports.ok = exports.fail = exports.Testnet = exports.Src = void 0;
 var _index = require("./index.js");
 var _assert = _interopRequireDefault(require("assert"));
 var _aoconnect3 = require("@permaweb/aoconnect");
 var _path = require("path");
 var _fs = require("fs");
+var _utils = require("./utils.js");
 var _yargs = _interopRequireDefault(require("yargs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -77,6 +78,45 @@ var Src = exports.Src = /*#__PURE__*/function () {
     });
   }
   return _createClass(Src, [{
+    key: "init",
+    value: function () {
+      var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(dir) {
+        var _dir;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (this.dir) {
+                _context2.next = 9;
+                break;
+              }
+              if (!((_dir = dir) !== null && _dir !== void 0)) {
+                _context2.next = 5;
+                break;
+              }
+              _dir;
+              _context2.next = 8;
+              break;
+            case 5:
+              _context2.next = 7;
+              return dirname();
+            case 7:
+              dir = _context2.sent;
+            case 8:
+              this.dir = (0, _path.resolve)(dir, "lua");
+            case 9:
+              return _context2.abrupt("return", this);
+            case 10:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function init(_x) {
+        return _init.apply(this, arguments);
+      }
+      return init;
+    }()
+  }, {
     key: "data",
     value: function data(file) {
       var ext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "lua";
@@ -85,43 +125,136 @@ var Src = exports.Src = /*#__PURE__*/function () {
   }, {
     key: "upload",
     value: function () {
-      var _upload = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file) {
+      var _upload = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(file) {
         var ext,
           res,
-          _args2 = arguments;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              ext = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : "lua";
-              _context2.next = 3;
+              ext = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : "lua";
+              _context3.next = 3;
               return this.ar.post({
                 data: this.data(file, ext)
               });
             case 3:
-              res = _context2.sent;
-              return _context2.abrupt("return", res.err ? null : res.id);
+              res = _context3.sent;
+              return _context3.abrupt("return", res.err ? null : res.id);
             case 5:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function upload(_x) {
+      function upload(_x2) {
         return _upload.apply(this, arguments);
       }
       return upload;
     }()
   }]);
 }();
+var Testnet = exports.Testnet = /*#__PURE__*/function () {
+  function Testnet() {
+    var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref3$port = _ref3.port,
+      port = _ref3$port === void 0 ? 4000 : _ref3$port,
+      arweave = _ref3.arweave,
+      aoconnect = _ref3.aoconnect,
+      _ref3$docker = _ref3.docker,
+      docker = _ref3$docker === void 0 ? false : _ref3$docker;
+    _classCallCheck(this, Testnet);
+    this.docker = docker;
+    this.arweave = arweave !== null && arweave !== void 0 ? arweave : {
+      port: port
+    };
+    this.aoconnect = aoconnect !== null && aoconnect !== void 0 ? aoconnect : (0, _utils.optAO)(port);
+    this.ar = new _index.AR(this.arweave);
+  }
+  return _createClass(Testnet, [{
+    key: "init",
+    value: function () {
+      var _init2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(jwk) {
+        var _yield$this$ao$postMo, id, _yield$this$ao$postSc, scheduler;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return fetch(this.aoconnect.SU_URL).then(function (r) {
+                return r.json();
+              });
+            case 2:
+              this.authority = _context4.sent.address;
+              _context4.next = 5;
+              return new Src({
+                ar: this.ar
+              }).init();
+            case 5:
+              this.src = _context4.sent;
+              _context4.next = 8;
+              return this.ar.init(jwk);
+            case 8:
+              this.jwk = this.ar.jwk;
+              this.addr = this.ar.addr;
+              this.gql = this.ar.gql;
+              _context4.next = 13;
+              return this.src.upload("aos2_0_1", "wasm");
+            case 13:
+              this.module_src = _context4.sent;
+              _context4.next = 16;
+              return new _index.AO({
+                ar: this.ar,
+                aoconnect: this.aoconnect,
+                authority: this.authority
+              }).init(this.ar.jwk);
+            case 16:
+              this.ao = _context4.sent;
+              _context4.t0 = this.ao;
+              _context4.next = 20;
+              return this.ar.data(this.module_src);
+            case 20:
+              _context4.t1 = _context4.sent;
+              _context4.t2 = {
+                data: _context4.t1,
+                overwrite: true
+              };
+              _context4.next = 24;
+              return _context4.t0.postModule.call(_context4.t0, _context4.t2);
+            case 24:
+              _yield$this$ao$postMo = _context4.sent;
+              id = _yield$this$ao$postMo.id;
+              this.module = id;
+              _context4.next = 29;
+              return this.ao.postScheduler({
+                url: this.docker ? "http://su" : this.aoconnect.SU_URL,
+                overwrite: true
+              });
+            case 29:
+              _yield$this$ao$postSc = _context4.sent;
+              scheduler = _yield$this$ao$postSc.scheduler;
+              this.scheduler = scheduler;
+              return _context4.abrupt("return", this);
+            case 33:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function init(_x3) {
+        return _init2.apply(this, arguments);
+      }
+      return init;
+    }()
+  }]);
+}();
 var setup = exports.setup = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
     var _arweave, _aoconnect, _aoconnect$CU_URL, _aoconnect2;
-    var _ref4,
+    var _ref5,
       aoconnect,
       arweave,
-      _ref4$cacheDir,
+      _ref5$cacheDir,
       cacheDir,
-      _ref4$targets,
+      _ref5$targets,
       targets,
       opt,
       dir,
@@ -146,32 +279,32 @@ var setup = exports.setup = /*#__PURE__*/function () {
       _yield$ao$postSchedul,
       scheduler,
       ao2,
-      _args3 = arguments;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+      _args5 = arguments;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          _ref4 = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {}, aoconnect = _ref4.aoconnect, arweave = _ref4.arweave, _ref4$cacheDir = _ref4.cacheDir, cacheDir = _ref4$cacheDir === void 0 ? ".cache" : _ref4$cacheDir, _ref4$targets = _ref4.targets, targets = _ref4$targets === void 0 ? {
+          _ref5 = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, aoconnect = _ref5.aoconnect, arweave = _ref5.arweave, _ref5$cacheDir = _ref5.cacheDir, cacheDir = _ref5$cacheDir === void 0 ? ".cache" : _ref5$cacheDir, _ref5$targets = _ref5.targets, targets = _ref5$targets === void 0 ? {
             profile: false,
             note: false,
             asset: false
-          } : _ref4$targets;
+          } : _ref5$targets;
           if (targets.asset || targets.note) targets.profile = true;
           opt = null;
           console.error = function () {};
           console.warn = function () {};
-          _context3.t0 = _path.resolve;
-          _context3.next = 8;
+          _context5.t0 = _path.resolve;
+          _context5.next = 8;
           return dirname();
         case 8:
-          _context3.t1 = _context3.sent;
-          dir = (0, _context3.t0)(_context3.t1, "lua");
-          _context3.t2 = _path.resolve;
-          _context3.next = 13;
+          _context5.t1 = _context5.sent;
+          dir = (0, _context5.t0)(_context5.t1, "lua");
+          _context5.t2 = _path.resolve;
+          _context5.next = 13;
           return dirname();
         case 13:
-          _context3.t3 = _context3.sent;
-          _context3.t4 = cacheDir;
-          _cacheDir = (0, _context3.t2)(_context3.t3, _context3.t4);
+          _context5.t3 = _context5.sent;
+          _context5.t4 = cacheDir;
+          _cacheDir = (0, _context5.t2)(_context5.t3, _context5.t4);
           optPath = "".concat(_cacheDir, "/opt.json");
           if (cache && !reset) {
             try {
@@ -185,29 +318,28 @@ var setup = exports.setup = /*#__PURE__*/function () {
             }
           }
           if (!opt) {
-            _context3.next = 32;
+            _context5.next = 32;
             break;
           }
-          _context3.next = 21;
+          _context5.next = 21;
           return new _index.AR(opt.ar).init(opt.jwk);
         case 21:
-          _ar = _context3.sent;
+          _ar = _context5.sent;
           _src = new Src({
             ar: _ar,
-            readFileSync: _fs.readFileSync,
             dir: dir
           });
-          _context3.next = 25;
+          _context5.next = 25;
           return new _index.AO(opt.ao).init(opt.jwk);
         case 25:
-          _ao = _context3.sent;
-          _context3.next = 28;
+          _ao = _context5.sent;
+          _context5.next = 28;
           return new _index.AO(opt.ao2).init(opt.jwk);
         case 28:
-          _ao2 = _context3.sent;
+          _ao2 = _context5.sent;
           console.log("cache:\t", optPath);
           console.log("addr:\t", _ar.addr);
-          return _context3.abrupt("return", {
+          return _context5.abrupt("return", {
             opt: opt,
             ar: _ar,
             ao2: _ao2,
@@ -219,18 +351,13 @@ var setup = exports.setup = /*#__PURE__*/function () {
           (_arweave = arweave) !== null && _arweave !== void 0 ? _arweave : arweave = {
             port: 4000
           };
-          (_aoconnect = aoconnect) !== null && _aoconnect !== void 0 ? _aoconnect : aoconnect = {
-            MU_URL: "http://localhost:4002",
-            CU_URL: "http://localhost:4004",
-            GATEWAY_URL: "http://localhost:4000"
-          };
+          (_aoconnect = aoconnect) !== null && _aoconnect !== void 0 ? _aoconnect : aoconnect = (0, _utils.optAO)(4000);
           ar = new _index.AR(arweave);
-          _context3.next = 37;
+          _context5.next = 37;
           return ar.gen("10");
         case 37:
           src = new Src({
             ar: ar,
-            readFileSync: _fs.readFileSync,
             dir: dir
           });
           opt = {
@@ -238,81 +365,81 @@ var setup = exports.setup = /*#__PURE__*/function () {
             jwk: ar.jwk
           };
           if (!(!auth && /localhost/.test((_aoconnect$CU_URL = (_aoconnect2 = aoconnect) === null || _aoconnect2 === void 0 ? void 0 : _aoconnect2.CU_URL) !== null && _aoconnect$CU_URL !== void 0 ? _aoconnect$CU_URL : ""))) {
-            _context3.next = 43;
+            _context5.next = 43;
             break;
           }
-          _context3.next = 42;
+          _context5.next = 42;
           return fetch(aoconnect.CU_URL).then(function (r) {
             return r.json();
           });
         case 42:
-          auth = _context3.sent.address;
+          auth = _context5.sent.address;
         case 43:
-          _context3.next = 45;
+          _context5.next = 45;
           return src.upload("sqlite", "wasm");
         case 45:
-          wasm = _context3.sent;
-          _context3.next = 48;
+          wasm = _context5.sent;
+          _context5.next = 48;
           return src.upload("aos", "wasm");
         case 48:
-          wasm2 = _context3.sent;
-          _context3.next = 51;
+          wasm2 = _context5.sent;
+          _context5.next = 51;
           return src.upload("aos2_0_1", "wasm");
         case 51:
-          wasm_aos2 = _context3.sent;
+          wasm_aos2 = _context5.sent;
           ao = new _index.AO({
             aoconnect: aoconnect,
             ar: ar,
             authority: auth
           });
-          _context3.t5 = ao;
-          _context3.next = 56;
+          _context5.t5 = ao;
+          _context5.next = 56;
           return ar.data(wasm_aos2);
         case 56:
-          _context3.t6 = _context3.sent;
-          _context3.t7 = {
-            data: _context3.t6
+          _context5.t6 = _context5.sent;
+          _context5.t7 = {
+            data: _context5.t6
           };
-          _context3.next = 60;
-          return _context3.t5.postModule.call(_context3.t5, _context3.t7);
+          _context5.next = 60;
+          return _context5.t5.postModule.call(_context5.t5, _context5.t7);
         case 60:
-          _yield$ao$postModule = _context3.sent;
+          _yield$ao$postModule = _context5.sent;
           module_aos2 = _yield$ao$postModule.id;
-          _context3.t8 = ao;
-          _context3.next = 65;
+          _context5.t8 = ao;
+          _context5.next = 65;
           return ar.data(wasm);
         case 65:
-          _context3.t9 = _context3.sent;
-          _context3.t10 = {
-            data: _context3.t9,
+          _context5.t9 = _context5.sent;
+          _context5.t10 = {
+            data: _context5.t9,
             overwrite: true
           };
-          _context3.next = 69;
-          return _context3.t8.postModule.call(_context3.t8, _context3.t10);
+          _context5.next = 69;
+          return _context5.t8.postModule.call(_context5.t8, _context5.t10);
         case 69:
-          _yield$ao$postModule2 = _context3.sent;
+          _yield$ao$postModule2 = _context5.sent;
           module_sqlite = _yield$ao$postModule2.id;
-          _context3.t11 = ao;
-          _context3.next = 74;
+          _context5.t11 = ao;
+          _context5.next = 74;
           return ar.data(wasm2);
         case 74:
-          _context3.t12 = _context3.sent;
-          _context3.t13 = {
-            data: _context3.t12,
+          _context5.t12 = _context5.sent;
+          _context5.t13 = {
+            data: _context5.t12,
             overwrite: true
           };
-          _context3.next = 78;
-          return _context3.t11.postModule.call(_context3.t11, _context3.t13);
+          _context5.next = 78;
+          return _context5.t11.postModule.call(_context5.t11, _context5.t13);
         case 78:
-          _yield$ao$postModule3 = _context3.sent;
+          _yield$ao$postModule3 = _context5.sent;
           module = _yield$ao$postModule3.id;
-          _context3.next = 82;
+          _context5.next = 82;
           return ao.postScheduler({
             url: "http://su",
             overwrite: true
           });
         case 82:
-          _yield$ao$postSchedul = _context3.sent;
+          _yield$ao$postSchedul = _context5.sent;
           scheduler = _yield$ao$postSchedul.scheduler;
           opt.ao = {
             module: module_sqlite,
@@ -323,7 +450,7 @@ var setup = exports.setup = /*#__PURE__*/function () {
           };
 
           // ao2
-          _context3.next = 87;
+          _context5.next = 87;
           return new _index.AO({
             aoconnect: aoconnect,
             ar: ar,
@@ -332,7 +459,7 @@ var setup = exports.setup = /*#__PURE__*/function () {
             scheduler: scheduler
           }).init(ar.jwk);
         case 87:
-          ao2 = _context3.sent;
+          ao2 = _context5.sent;
           opt.ao2 = {
             module: module_aos2,
             scheduler: scheduler,
@@ -352,7 +479,7 @@ var setup = exports.setup = /*#__PURE__*/function () {
             if (!(0, _fs.existsSync)(_cacheDir)) (0, _fs.mkdirSync)(_cacheDir);
             (0, _fs.writeFileSync)(optPath, JSON.stringify(opt));
           }
-          return _context3.abrupt("return", {
+          return _context5.abrupt("return", {
             opt: opt,
             ao: ao,
             ar: ar,
@@ -361,12 +488,12 @@ var setup = exports.setup = /*#__PURE__*/function () {
           });
         case 95:
         case "end":
-          return _context3.stop();
+          return _context5.stop();
       }
-    }, _callee3);
+    }, _callee5);
   }));
   return function setup() {
-    return _ref3.apply(this, arguments);
+    return _ref4.apply(this, arguments);
   };
 }();
 var ok = exports.ok = function ok(obj) {