wao 0.4.8 → 0.4.10

package/cjs/tao.js

@@ -31,6 +31,38 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+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 log = "\nlocal json = require(\"json\")\nao = ao or {}\n\nfunction ao.log(...)\n    local args = {...}\n    local txt = json.encode(args)\n    if type(ao.outbox.Output) == 'string' then\n      ao.outbox.Output = {ao.outbox.Output}\n    end\n    table.insert(ao.outbox.Output, txt)\n    ao.outbox.Logs = ao.outbox.Logs or {}\n    table.insert(ao.outbox.Logs, txt)\nend\n\nfunction ao.result(result)\n    if ao.outbox.Error or result.Error then\n      return { Error = result.Error or ao.outbox.Error, Output = ao.outbox.Logs }\n    end\n    return {\n        Output = ao.outbox.Logs or result.Output or ao.outbox.Output,\n        Messages = ao.outbox.Messages,\n        Spawns = ao.outbox.Spawns,\n        Assignments = ao.outbox.Assignments,\n    }\nend\n";
+var renderLogs = function renderLogs(logs) {
+  if ((0, _ramda.is)(Array, logs) && logs.length > 0) {
+    var _iterator = _createForOfIteratorHelper(logs),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var v = _step.value;
+        var l = v;
+        try {
+          var _console;
+          var p = JSON.parse(v);
+          if (JSON.stringify(p) === v) l = p;
+          (_console = console).log.apply(_console, _toConsumableArray(l));
+        } catch (e) {
+          console.log(l);
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+};
 var AO = /*#__PURE__*/function (_MAO) {
   function AO() {
     var _this;
@@ -53,11 +85,67 @@ var AO = /*#__PURE__*/function (_MAO) {
       mem = _connect.mem;
     _this.module = mem.modules.aos2_0_1;
     _this.assign = assign;
-    _this.result = result;
+    _this.result = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return result.apply(void 0, _args);
+          case 2:
+            res = _context.sent;
+            renderLogs(res.Output);
+            return _context.abrupt("return", res);
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
     _this.results = results;
     _this.message = message;
-    _this.spawn = spawn;
-    _this.dryrun = dryrun;
+    _this.spawn = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var res,
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return spawn.apply(void 0, _args2);
+          case 2:
+            res = _context2.sent;
+            _context2.next = 5;
+            return _this.load({
+              data: log,
+              pid: res
+            });
+          case 5:
+            return _context2.abrupt("return", res);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    _this.dryrun = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var res,
+        _args3 = arguments;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return dryrun.apply(void 0, _args3);
+          case 2:
+            res = _context3.sent;
+            renderLogs(res.Output);
+            return _context3.abrupt("return", res);
+          case 5:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
     _this.monitor = monitor;
     _this.unmonitor = unmonitor;
     _this.mem = mem;
@@ -70,20 +158,20 @@ var AO = /*#__PURE__*/function (_MAO) {
   return _createClass(AO, [{
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(jwk) {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(jwk) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!jwk && this.acc[0]) jwk = this.acc[0].jwk;
-              _context.next = 3;
+              _context4.next = 3;
               return this.ar.init(jwk);
             case 3:
-              return _context.abrupt("return", this);
+              return _context4.abrupt("return", this);
             case 4:
             case "end":
-              return _context.stop();
+              return _context4.stop();
           }
-        }, _callee, this);
+        }, _callee4, this);
       }));
       function init(_x) {
         return _init.apply(this, arguments);
@@ -93,26 +181,26 @@ var AO = /*#__PURE__*/function (_MAO) {
   }, {
     key: "postModule",
     value: function () {
-      var _postModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var data, _ref$tags, tags, jwk, err, _yield$this$ar$checkW, t, _tags, signer, _yield$this$ar$datait, id, owner;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _postModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref4) {
+        var data, _ref4$tags, tags, jwk, err, _yield$this$ar$checkW, t, _tags, signer, _yield$this$ar$datait, id, owner;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              data = _ref.data, _ref$tags = _ref.tags, tags = _ref$tags === void 0 ? {} : _ref$tags, jwk = _ref.jwk;
+              data = _ref4.data, _ref4$tags = _ref4.tags, tags = _ref4$tags === void 0 ? {} : _ref4$tags, jwk = _ref4.jwk;
               err = null;
-              _context2.next = 4;
+              _context5.next = 4;
               return this.ar.checkWallet({
                 jwk: jwk
               });
             case 4:
-              _yield$this$ar$checkW = _context2.sent;
+              _yield$this$ar$checkW = _context5.sent;
               jwk = _yield$this$ar$checkW.jwk;
               err = _yield$this$ar$checkW.err;
               if (!err) {
-                _context2.next = 9;
+                _context5.next = 9;
                 break;
               }
-              return _context2.abrupt("return", {
+              return _context5.abrupt("return", {
                 err: err
               });
             case 9:
@@ -128,17 +216,17 @@ var AO = /*#__PURE__*/function (_MAO) {
               });
               _tags = (0, _utils.buildTags)(null, t);
               signer = (0, _aoconnect.createDataItemSigner)(jwk);
-              _context2.next = 14;
+              _context5.next = 14;
               return this.ar.dataitem({
                 tags: _tags,
                 data: data,
                 signer: signer
               });
             case 14:
-              _yield$this$ar$datait = _context2.sent;
+              _yield$this$ar$datait = _context5.sent;
               id = _yield$this$ar$datait.id;
               owner = _yield$this$ar$datait.owner;
-              _context2.next = 19;
+              _context5.next = 19;
               return this.ar.post({
                 data: data,
                 tags: t,
@@ -149,12 +237,12 @@ var AO = /*#__PURE__*/function (_MAO) {
                 data: data,
                 format: t["Module-Format"]
               };
-              return _context2.abrupt("return", id);
+              return _context5.abrupt("return", id);
             case 21:
             case "end":
-              return _context2.stop();
+              return _context5.stop();
           }
-        }, _callee2, this);
+        }, _callee5, this);
       }));
       function postModule(_x2) {
         return _postModule.apply(this, arguments);

package/esm/tao.js

@@ -4,7 +4,50 @@ import { srcs, buildTags } from "./utils.js"
 import AR from "./tar.js"
 import { connect } from "./aoconnect.js"
 import { acc } from "./test.js"
-import { mergeLeft } from "ramda"
+import { mergeLeft, is, map } from "ramda"
+
+let log = `
+local json = require("json")
+ao = ao or {}
+
+function ao.log(...)
+    local args = {...}
+    local txt = json.encode(args)
+    if type(ao.outbox.Output) == 'string' then
+      ao.outbox.Output = {ao.outbox.Output}
+    end
+    table.insert(ao.outbox.Output, txt)
+    ao.outbox.Logs = ao.outbox.Logs or {}
+    table.insert(ao.outbox.Logs, txt)
+end
+
+function ao.result(result)
+    if ao.outbox.Error or result.Error then
+      return { Error = result.Error or ao.outbox.Error, Output = ao.outbox.Logs }
+    end
+    return {
+        Output = ao.outbox.Logs or result.Output or ao.outbox.Output,
+        Messages = ao.outbox.Messages,
+        Spawns = ao.outbox.Spawns,
+        Assignments = ao.outbox.Assignments,
+    }
+end
+`
+
+const renderLogs = logs => {
+  if (is(Array, logs) && logs.length > 0) {
+    for (const v of logs) {
+      let l = v
+      try {
+        const p = JSON.parse(v)
+        if (JSON.stringify(p) === v) l = p
+        console.log(...l)
+      } catch (e) {
+        console.log(l)
+      }
+    }
+  }
+}
 
 class AO extends MAO {
   constructor(opt = {}) {
@@ -24,11 +67,24 @@ class AO extends MAO {
     } = connect(opt.mem)
     this.module = mem.modules.aos2_0_1
     this.assign = assign
-    this.result = result
+    this.result = async (...opt) => {
+      const res = await result(...opt)
+      renderLogs(res.Output)
+      return res
+    }
+
     this.results = results
     this.message = message
-    this.spawn = spawn
-    this.dryrun = dryrun
+    this.spawn = async (...opt) => {
+      const res = await spawn(...opt)
+      await this.load({ data: log, pid: res })
+      return res
+    }
+    this.dryrun = async (...opt) => {
+      const res = await dryrun(...opt)
+      renderLogs(res.Output)
+      return res
+    }
     this.monitor = monitor
     this.unmonitor = unmonitor
     this.mem = mem

package/package.json

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