wao 0.2.0 → 0.2.1

package/cjs/ao.js

@@ -89,9 +89,10 @@ var AO = /*#__PURE__*/function () {
       _ref4$scheduler = _ref4.scheduler,
       scheduler = _ref4$scheduler === void 0 ? _utils.srcs.scheduler : _ref4$scheduler,
       aoconnect = _ref4.aoconnect,
-      in_memory = _ref4.in_memory,
       _ref4$ar = _ref4.ar,
-      ar = _ref4$ar === void 0 ? {} : _ref4$ar;
+      ar = _ref4$ar === void 0 ? {} : _ref4$ar,
+      _ref4$in_memory = _ref4.in_memory,
+      in_memory = _ref4$in_memory === void 0 ? false : _ref4$in_memory;
     _classCallCheck(this, AO);
     if (!module) {
       switch (module_type) {
@@ -110,23 +111,20 @@ var AO = /*#__PURE__*/function () {
       var _ar = _typeof(ar) === "object" ? ar : {};
       this.ar = new _ar2["default"](ar);
     }
-    this.in_memory = in_memory;
-    if (aoconnect) {
-      if (in_memory) {} else {
-        var _connect = (0, _aoconnect.connect)(aoconnect),
-          _results = _connect.results,
-          _assign = _connect.assign,
-          _result = _connect.result,
-          _message = _connect.message,
-          _spawn = _connect.spawn,
-          _dryrun = _connect.dryrun;
-        this.assign = _assign;
-        this.result = _result;
-        this.results = _results;
-        this.message = _message;
-        this.spawn = _spawn;
-        this.dryrun = _dryrun;
-      }
+    if (in_memory) {} else if (aoconnect) {
+      var _connect = (0, _aoconnect.connect)(aoconnect),
+        _results = _connect.results,
+        _assign = _connect.assign,
+        _result = _connect.result,
+        _message = _connect.message,
+        _spawn = _connect.spawn,
+        _dryrun = _connect.dryrun;
+      this.assign = _assign;
+      this.result = _result;
+      this.results = _results;
+      this.message = _message;
+      this.spawn = _spawn;
+      this.dryrun = _dryrun;
     } else {
       this.assign = _aoconnect.assign;
       this.result = _aoconnect.result;
@@ -646,7 +644,7 @@ var AO = /*#__PURE__*/function () {
                           _context9.next = 10;
                           break;
                         }
-                        if (_this3.local) {
+                        if (_this3.in_memory) {
                           _context9.next = 6;
                           break;
                         }
@@ -665,7 +663,7 @@ var AO = /*#__PURE__*/function () {
                         }
                         return _context9.abrupt("return", txs);
                       case 12:
-                        if (!_this3.local) {
+                        if (!_this3.in_memory) {
                           _context9.next = 15;
                           break;
                         }

package/cjs/tao.js

@@ -6,12 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _ao = _interopRequireDefault(require("./ao.js"));
+var _utils = require("./utils.js");
+var _ar = _interopRequireDefault(require("./ar.js"));
+var _aoconnect = require("./aoconnect.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -26,44 +30,49 @@ function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new T
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
 var AO = /*#__PURE__*/function (_MAO) {
   function AO() {
+    var _this;
+    var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, AO);
-    return _callSuper(this, AO, arguments);
+    _this = _callSuper(this, AO, [_objectSpread(_objectSpread({}, opt), {}, {
+      in_memory: true
+    })]);
+    _this.in_memory = true;
+    var _connect = (0, _aoconnect.connect)(),
+      accounts = _connect.accounts,
+      modules = _connect.modules,
+      results = _connect.results,
+      assign = _connect.assign,
+      result = _connect.result,
+      message = _connect.message,
+      spawn = _connect.spawn,
+      dryrun = _connect.dryrun,
+      txs = _connect.txs;
+    _this.module = modules.aos_2_0_1;
+    _this.assign = assign;
+    _this.result = result;
+    _this.results = results;
+    _this.message = message;
+    _this.spawn = spawn;
+    _this.dryrun = dryrun;
+    _this.ar.txs = txs;
+    _this.accounts = accounts;
+    return _this;
   }
   _inherits(AO, _MAO);
   return _createClass(AO, [{
     key: "init",
     value: function () {
       var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(jwk) {
-        var _jwk, v, _v$connect, accounts, modules, results, assign, result, message, spawn, dryrun, txs;
+        var _this$accounts;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!this.in_memory) {
-                _context.next = 14;
-                break;
-              }
+              if (!jwk && (_this$accounts = this.accounts) !== null && _this$accounts !== void 0 && _this$accounts[0]) jwk = this.accounts[0].jwk;
               _context.next = 3;
-              return Promise.resolve().then(function () {
-                return _interopRequireWildcard(require("./aoconnect.js"));
-              });
-            case 3:
-              v = _context.sent;
-              _v$connect = v.connect(), accounts = _v$connect.accounts, modules = _v$connect.modules, results = _v$connect.results, assign = _v$connect.assign, result = _v$connect.result, message = _v$connect.message, spawn = _v$connect.spawn, dryrun = _v$connect.dryrun, txs = _v$connect.txs;
-              this.module = modules.aos_2_0_1;
-              this.assign = assign;
-              this.result = result;
-              this.results = results;
-              this.message = message;
-              this.spawn = spawn;
-              this.dryrun = dryrun;
-              this.ar.txs = txs;
-              (_jwk = jwk) !== null && _jwk !== void 0 ? _jwk : jwk = accounts[0].jwk;
-            case 14:
-              _context.next = 16;
               return this.ar.init(jwk);
-            case 16:
+            case 3:
               return _context.abrupt("return", this);
-            case 17:
+            case 4:
             case "end":
               return _context.stop();
           }

package/esm/ao.js

@@ -64,8 +64,8 @@ class AO {
     module_type = "aos2",
     scheduler = srcs.scheduler,
     aoconnect,
-    in_memory,
     ar = {},
+    in_memory = false,
   } = {}) {
     if (!module) {
       switch (module_type) {
@@ -86,19 +86,16 @@ class AO {
       let _ar = typeof ar === "object" ? ar : {}
       this.ar = new AR(ar)
     }
-    this.in_memory = in_memory
-    if (aoconnect) {
-      if (in_memory) {
-      } else {
-        const { results, assign, result, message, spawn, dryrun } =
-          connect(aoconnect)
-        this.assign = assign
-        this.result = result
-        this.results = results
-        this.message = message
-        this.spawn = spawn
-        this.dryrun = dryrun
-      }
+    if (in_memory) {
+    } else if (aoconnect) {
+      const { results, assign, result, message, spawn, dryrun } =
+        connect(aoconnect)
+      this.assign = assign
+      this.result = result
+      this.results = results
+      this.message = message
+      this.spawn = spawn
+      this.dryrun = dryrun
     } else {
       this.assign = assign
       this.result = result
@@ -371,12 +368,12 @@ class AO {
       const getRef = async (ref, txs = []) => {
         let ex = exRef(ref, txs)
         if (!ex) {
-          if (!this.local) await wait(1000)
+          if (!this.in_memory) await wait(1000)
           txs = await this.ar.txs(pid)
           ex = exRef(ref, txs)
         }
         if (ex) return txs
-        if (this.local) await wait(1)
+        if (this.in_memory) await wait(1)
         return Date.now() - start < (this.local ? timeout / 1000 : timeout)
           ? await getRef(ref)
           : []

package/esm/tao.js

@@ -1,30 +1,36 @@
 import MAO from "./ao.js"
+import { srcs } from "./utils.js"
+import AR from "./ar.js"
+import { connect } from "./aoconnect.js"
 
 class AO extends MAO {
+  constructor(opt = {}) {
+    super({ ...opt, in_memory: true })
+    this.in_memory = true
+    const {
+      accounts,
+      modules,
+      results,
+      assign,
+      result,
+      message,
+      spawn,
+      dryrun,
+      txs,
+    } = connect()
+    this.module = modules.aos_2_0_1
+    this.assign = assign
+    this.result = result
+    this.results = results
+    this.message = message
+    this.spawn = spawn
+    this.dryrun = dryrun
+    this.ar.txs = txs
+    this.accounts = accounts
+  }
+
   async init(jwk) {
-    if (this.in_memory) {
-      const v = await import("./aoconnect.js")
-      const {
-        accounts,
-        modules,
-        results,
-        assign,
-        result,
-        message,
-        spawn,
-        dryrun,
-        txs,
-      } = v.connect()
-      this.module = modules.aos_2_0_1
-      this.assign = assign
-      this.result = result
-      this.results = results
-      this.message = message
-      this.spawn = spawn
-      this.dryrun = dryrun
-      this.ar.txs = txs
-      jwk ??= accounts[0].jwk
-    }
+    if (!jwk && this.accounts?.[0]) jwk = this.accounts[0].jwk
     await this.ar.init(jwk)
     return this
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",