wao 0.4.3 → 0.4.5

package/cjs/aoconnect.js

@@ -69,13 +69,13 @@ var connect = exports.connect = function connect(mem) {
     });
     return output;
   };
-  var genMsg = function genMsg(p, data, Tags, from, owner) {
-    var dry = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var genMsg = function genMsg(Id, p, data, Tags, from, Owner) {
+    var dry = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     if (!dry) p.height += 1;
     return {
-      Id: p.height,
+      Id: Id,
       Target: p.id,
-      Owner: owner,
+      Owner: Owner,
       Data: data !== null && data !== void 0 && data.length ? data : "",
       "Block-Height": p.height.toString(),
       Timestamp: Date.now().toString(),
@@ -329,7 +329,7 @@ var connect = exports.connect = function connect(mem) {
             }
             data = "";
             if (_tags["On-Boot"] === "Data") data = (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "";else data = (_mem$msgs$_tags$OnBo = (_mem$msgs$_tags$OnBo2 = mem.msgs[_tags["On-Boot"]]) === null || _mem$msgs$_tags$OnBo2 === void 0 ? void 0 : _mem$msgs$_tags$OnBo2.data) !== null && _mem$msgs$_tags$OnBo !== void 0 ? _mem$msgs$_tags$OnBo : "";
-            msg = genMsg(p, data, opt.tags, owner, _test.mu.addr, true);
+            msg = genMsg(id, p, data, opt.tags, owner, _test.mu.addr, true);
             _env = genEnv({
               pid: p.id,
               owner: p.owner,
@@ -455,7 +455,7 @@ var connect = exports.connect = function connect(mem) {
             return ar.postItem(item, _test.su.jwk);
           case 14:
             _context3.prev = 14;
-            msg = genMsg(p, (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "", _opt.tags, (_ref8 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref8 !== void 0 ? _ref8 : owner, _test.mu.addr);
+            msg = genMsg(opt.message, p, (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "", _opt.tags, (_ref8 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref8 !== void 0 ? _ref8 : owner, _test.mu.addr);
             _env = genEnv({
               pid: p.id,
               owner: p.owner,
@@ -842,7 +842,7 @@ var connect = exports.connect = function connect(mem) {
               id = _yield$ar$dataitem5.id;
               owner = _yield$ar$dataitem5.owner;
               _context10.prev = 6;
-              msg = genMsg(p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);
+              msg = genMsg(id, p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);
               _env = genEnv({
                 pid: p.id,
                 owner: p.owner,

package/cjs/utils.js

@@ -375,6 +375,7 @@ var mergeChecks = exports.mergeChecks = function mergeChecks(check1, check2, che
   } else return check1 || check2;
 };
 var isOutComplete = exports.isOutComplete = function isOutComplete(out, get) {
+  if ((0, _ramda.isNil)(get)) return true;
   if ((0, _ramda.isNil)(out)) return false;
   var _get = modGet(get);
   if (_get.obj) {

package/esm/aoconnect.js

@@ -44,12 +44,12 @@ export const connect = mem => {
     return output
   }
 
-  const genMsg = (p, data, Tags, from, owner, dry = false) => {
+  const genMsg = (Id, p, data, Tags, from, Owner, dry = false) => {
     if (!dry) p.height += 1
     return {
-      Id: p.height,
+      Id,
       Target: p.id,
-      Owner: owner,
+      Owner,
       Data: data?.length ? data : "",
       "Block-Height": p.height.toString(),
       Timestamp: Date.now().toString(),
@@ -167,7 +167,7 @@ export const connect = mem => {
       let data = ""
       if (_tags["On-Boot"] === "Data") data = opt.data ?? ""
       else data = mem.msgs[_tags["On-Boot"]]?.data ?? ""
-      let msg = genMsg(p, data, opt.tags, owner, mu.addr, true)
+      let msg = genMsg(id, p, data, opt.tags, owner, mu.addr, true)
       const _env = genEnv({
         pid: p.id,
         owner: p.owner,
@@ -263,6 +263,7 @@ export const connect = mem => {
     await ar.postItem(item, su.jwk)
     try {
       const msg = genMsg(
+        opt.message,
         p,
         _opt.data ?? "",
         _opt.tags,
@@ -398,7 +399,15 @@ export const connect = mem => {
       const p = mem.env[opt.process]
       const { id, owner } = await ar.dataitem({ ...opt, target: opt.process })
       try {
-        const msg = genMsg(p, opt.data ?? "", opt.tags, owner, mu.addr, true)
+        const msg = genMsg(
+          id,
+          p,
+          opt.data ?? "",
+          opt.tags,
+          owner,
+          mu.addr,
+          true,
+        )
         const _env = genEnv({
           pid: p.id,
           owner: p.owner,

package/esm/utils.js

@@ -235,6 +235,7 @@ const mergeChecks = (check1, check2, check) => {
 }
 
 const isOutComplete = (out, get) => {
+  if (isNil(get)) return true
   if (isNil(out)) return false
   const _get = modGet(get)
   if (_get.obj) {

package/package.json

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