wao 0.14.5 → 0.14.6

package/cjs/ao.js

@@ -1545,6 +1545,124 @@ var AO = /*#__PURE__*/function () {
       }
       return deploy;
     }()
+  }, {
+    key: "var",
+    value: function () {
+      var _var2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22(_ref26) {
+        var pid, data, _ref26$json, json, _ref26$pretty, pretty, _yield$this$dry2, _var3, _yield$this$dry3, _var4;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
+            case 0:
+              pid = _ref26.pid, data = _ref26.data, _ref26$json = _ref26.json, json = _ref26$json === void 0 ? true : _ref26$json, _ref26$pretty = _ref26.pretty, pretty = _ref26$pretty === void 0 ? false : _ref26$pretty;
+              if (!json) {
+                _context22.next = 31;
+                break;
+              }
+              _context22.next = 4;
+              return this.dry({
+                act: "Eval",
+                data: "require(\"json\").encode(".concat(data, ")"),
+                pid: pid
+              });
+            case 4:
+              _context22.t3 = _yield$this$dry2 = _context22.sent;
+              _context22.t2 = _context22.t3 === null;
+              if (_context22.t2) {
+                _context22.next = 8;
+                break;
+              }
+              _context22.t2 = _yield$this$dry2 === void 0;
+            case 8:
+              _context22.t1 = _context22.t2;
+              if (_context22.t1) {
+                _context22.next = 11;
+                break;
+              }
+              _context22.t1 = (_yield$this$dry2 = _yield$this$dry2.res) === null || _yield$this$dry2 === void 0;
+            case 11:
+              _context22.t0 = _context22.t1;
+              if (_context22.t0) {
+                _context22.next = 14;
+                break;
+              }
+              _context22.t0 = (_yield$this$dry2 = _yield$this$dry2.Output) === null || _yield$this$dry2 === void 0;
+            case 14:
+              if (!_context22.t0) {
+                _context22.next = 18;
+                break;
+              }
+              _context22.t4 = void 0;
+              _context22.next = 19;
+              break;
+            case 18:
+              _context22.t4 = _yield$this$dry2.data;
+            case 19:
+              _var3 = _context22.t4;
+              if (!_var3) {
+                _context22.next = 28;
+                break;
+              }
+              _context22.prev = 21;
+              return _context22.abrupt("return", JSON.parse(strip(_var3)));
+            case 25:
+              _context22.prev = 25;
+              _context22.t5 = _context22["catch"](21);
+              return _context22.abrupt("return", strip(_var3));
+            case 28:
+              return _context22.abrupt("return", _var3);
+            case 31:
+              _context22.next = 33;
+              return this.dry({
+                act: "Eval",
+                data: data,
+                pid: pid
+              });
+            case 33:
+              _context22.t9 = _yield$this$dry3 = _context22.sent;
+              _context22.t8 = _context22.t9 === null;
+              if (_context22.t8) {
+                _context22.next = 37;
+                break;
+              }
+              _context22.t8 = _yield$this$dry3 === void 0;
+            case 37:
+              _context22.t7 = _context22.t8;
+              if (_context22.t7) {
+                _context22.next = 40;
+                break;
+              }
+              _context22.t7 = (_yield$this$dry3 = _yield$this$dry3.res) === null || _yield$this$dry3 === void 0;
+            case 40:
+              _context22.t6 = _context22.t7;
+              if (_context22.t6) {
+                _context22.next = 43;
+                break;
+              }
+              _context22.t6 = (_yield$this$dry3 = _yield$this$dry3.Output) === null || _yield$this$dry3 === void 0;
+            case 43:
+              if (!_context22.t6) {
+                _context22.next = 47;
+                break;
+              }
+              _context22.t10 = void 0;
+              _context22.next = 48;
+              break;
+            case 47:
+              _context22.t10 = _yield$this$dry3.data;
+            case 48:
+              _var4 = _context22.t10;
+              return _context22.abrupt("return", pretty ? _var4 : strip(_var4));
+            case 50:
+            case "end":
+              return _context22.stop();
+          }
+        }, _callee22, this, [[21, 25]]);
+      }));
+      function _var(_x25) {
+        return _var2.apply(this, arguments);
+      }
+      return _var;
+    }()
   }, {
     key: "p",
     value: function p(pid) {
@@ -1552,6 +1670,9 @@ var AO = /*#__PURE__*/function () {
     }
   }]);
 }();
+function strip(str) {
+  return str.replace(/\x1B\[[0-9;]*[JKmsu]/g, "");
+}
 var getParams = function getParams(tags, opts) {
   var _tags = tags;
   var _opts = opts;
@@ -1578,24 +1699,24 @@ var Process = /*#__PURE__*/function () {
   return _createClass(Process, [{
     key: "load",
     value: function () {
-      var _load2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+      var _load2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
         var opt,
-          _args22 = arguments;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+          _args23 = arguments;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              opt = _args22.length > 0 && _args22[0] !== undefined ? _args22[0] : {};
-              _context22.next = 3;
+              opt = _args23.length > 0 && _args23[0] !== undefined ? _args23[0] : {};
+              _context23.next = 3;
               return this.ao.load(_objectSpread({
                 pid: this.pid
               }, opt));
             case 3:
-              return _context22.abrupt("return", _context22.sent);
+              return _context23.abrupt("return", _context23.sent);
             case 4:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, this);
+        }, _callee23, this);
       }));
       function load() {
         return _load2.apply(this, arguments);
@@ -1605,27 +1726,27 @@ var Process = /*#__PURE__*/function () {
   }, {
     key: "msg",
     value: function () {
-      var _msg2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23(act, tags, opts) {
+      var _msg2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24(act, tags, opts) {
         var _getParams, _tags, _opts;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               _getParams = getParams(tags, opts), _tags = _getParams._tags, _opts = _getParams._opts;
-              _context23.next = 3;
+              _context24.next = 3;
               return this.ao.msg(_objectSpread({
                 pid: this.pid,
                 act: act,
                 tags: _tags
               }, _opts));
             case 3:
-              return _context23.abrupt("return", _context23.sent);
+              return _context24.abrupt("return", _context24.sent);
             case 4:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23, this);
+        }, _callee24, this);
       }));
-      function msg(_x25, _x26, _x27) {
+      function msg(_x26, _x27, _x28) {
         return _msg2.apply(this, arguments);
       }
       return msg;
@@ -1633,27 +1754,27 @@ var Process = /*#__PURE__*/function () {
   }, {
     key: "dry",
     value: function () {
-      var _dry2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24(act, tags, opts) {
+      var _dry2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25(act, tags, opts) {
         var _getParams2, _tags, _opts;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               _getParams2 = getParams(tags, opts), _tags = _getParams2._tags, _opts = _getParams2._opts;
-              _context24.next = 3;
+              _context25.next = 3;
               return this.ao.dry(_objectSpread({
                 pid: this.pid,
                 act: act,
                 tags: _tags
               }, _opts));
             case 3:
-              return _context24.abrupt("return", _context24.sent);
+              return _context25.abrupt("return", _context25.sent);
             case 4:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function dry(_x28, _x29, _x30) {
+      function dry(_x29, _x30, _x31) {
         return _dry2.apply(this, arguments);
       }
       return dry;
@@ -1661,28 +1782,28 @@ var Process = /*#__PURE__*/function () {
   }, {
     key: "m",
     value: function () {
-      var _m = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+      var _m = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
         var res,
-          _args25 = arguments;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+          _args26 = arguments;
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context25.next = 2;
-              return this.msg.apply(this, _args25);
+              _context26.next = 2;
+              return this.msg.apply(this, _args26);
             case 2:
-              res = _context25.sent;
+              res = _context26.sent;
               if (!res.err) {
-                _context25.next = 5;
+                _context26.next = 5;
                 break;
               }
               throw Error(res.err);
             case 5:
-              return _context25.abrupt("return", res.out);
+              return _context26.abrupt("return", res.out);
             case 6:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
       function m() {
         return _m.apply(this, arguments);
@@ -1692,34 +1813,66 @@ var Process = /*#__PURE__*/function () {
   }, {
     key: "d",
     value: function () {
-      var _d = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
+      var _d = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee27() {
         var res,
-          _args26 = arguments;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+          _args27 = arguments;
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              _context26.next = 2;
-              return this.dry.apply(this, _args26);
+              _context27.next = 2;
+              return this.dry.apply(this, _args27);
             case 2:
-              res = _context26.sent;
+              res = _context27.sent;
               if (!res.err) {
-                _context26.next = 5;
+                _context27.next = 5;
                 break;
               }
               throw Error(res.err);
             case 5:
-              return _context26.abrupt("return", res.out);
+              return _context27.abrupt("return", res.out);
             case 6:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
       function d() {
         return _d.apply(this, arguments);
       }
       return d;
     }()
+  }, {
+    key: "v",
+    value: function () {
+      var _v2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee28(data) {
+        var json,
+          pretty,
+          _args28 = arguments;
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
+            case 0:
+              json = _args28.length > 1 && _args28[1] !== undefined ? _args28[1] : true;
+              pretty = _args28.length > 2 && _args28[2] !== undefined ? _args28[2] : false;
+              _context28.next = 4;
+              return this.ao["var"]({
+                pid: this.pid,
+                data: data,
+                json: json,
+                pretty: pretty
+              });
+            case 4:
+              return _context28.abrupt("return", _context28.sent);
+            case 5:
+            case "end":
+              return _context28.stop();
+          }
+        }, _callee28, this);
+      }));
+      function v(_x32) {
+        return _v2.apply(this, arguments);
+      }
+      return v;
+    }()
   }]);
 }();
 var _default = exports["default"] = AO;

package/esm/ao.js

@@ -59,7 +59,7 @@ const getHash = res =>
       Messages: res.Messages ?? [],
       Spawns: res.Spawns ?? [],
       Assignments: res.Assignments ?? [],
-    }),
+    })
   )
 
 function createDataItemSigner2(wallet) {
@@ -597,7 +597,7 @@ class AO {
         if (typeof text === "number") text = Number(text).toString()
         _data = _data.replace(
           new RegExp(`\<${k}\>`, "g"),
-          text.replace(/'/g, "\\'"),
+          text.replace(/'/g, "\\'")
         )
       }
       out = _data
@@ -707,11 +707,43 @@ class AO {
     if (result.pid) result.p = this.p(result.pid)
     return result
   }
+  async var({ pid, data, json = true, pretty = false }) {
+    if (json) {
+      const _var = (
+        await this.dry({
+          act: "Eval",
+          data: `require("json").encode(${data})`,
+          pid,
+        })
+      )?.res?.Output?.data
+      if (_var) {
+        try {
+          return JSON.parse(strip(_var))
+        } catch (e) {
+          return strip(_var)
+        }
+      }
+      return _var
+    } else {
+      const _var = (
+        await this.dry({
+          act: "Eval",
+          data,
+          pid,
+        })
+      )?.res?.Output?.data
+      return pretty ? _var : strip(_var)
+    }
+  }
   p(pid) {
     return new Process(pid, this)
   }
 }
 
+function strip(str) {
+  return str.replace(/\x1B\[[0-9;]*[JKmsu]/g, "")
+}
+
 const getParams = (tags, opts) => {
   let _tags = tags
   let _opts = opts
@@ -760,6 +792,9 @@ class Process {
     if (res.err) throw Error(res.err)
     return res.out
   }
+  async v(data, json = true, pretty = false) {
+    return await this.ao.var({ pid: this.pid, data, json, pretty })
+  }
 }
 
 export default AO

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"
@@ -26,12 +26,12 @@
     }
   },
   "dependencies": {
-    "aoconnect-wao": "https://gitpkg.vercel.app/weavedb/ao/connect?abd2992689dc5983d5cd48b38fb997b0532f192a&scripts.postinstall=npm%20install%20--ignore-scripts%20%26%26%20npm%20run%20build",
     "@babel/plugin-transform-modules-commonjs": "^7.24.8",
     "@bokuweb/zstd-wasm": "^0.0.22",
     "@dha-team/arbundles": "^1.0.1",
     "@permaweb/ao-loader": "^0.0.44",
     "@permaweb/aoconnect": "^0.0.62",
+    "aoconnect-wao": "https://gitpkg.vercel.app/weavedb/ao/connect?abd2992689dc5983d5cd48b38fb997b0532f192a&scripts.postinstall=npm%20install%20--ignore-scripts%20%26%26%20npm%20run%20build",
     "arbundles": "^0.11.1",
     "arjson": "^0.0.2",
     "arweave": "^1.15.1",