wao 0.15.4 → 0.15.5

package/cjs/utils.js

@@ -294,6 +294,7 @@ var _getTagVal2 = function _getTagVal(get, res, from) {
     }
   } else {
     var _res$Messages2;
+    var i = 0;
     var _iterator5 = _createForOfIteratorHelper((_res$Messages2 = res.Messages) !== null && _res$Messages2 !== void 0 ? _res$Messages2 : []),
       _step5;
     try {
@@ -310,7 +311,12 @@ var _getTagVal2 = function _getTagVal(get, res, from) {
           if (v.Data) out = v.Data;
           try {
             if (_get.json || _get === true) out = JSON.parse(out);
-          } catch (e) {}
+          } catch (e) {
+            out = null;
+          }
+          if (out !== null && typeof _get.match === "function") {
+            if (!_get.match(out, i, res)) out = null;
+          }
         } else if (_typeof(_get) === "object" && typeof _get.name === "string") {
           var _v$Tags;
           var _from2 = null;
@@ -319,9 +325,15 @@ var _getTagVal2 = function _getTagVal(get, res, from) {
           out = getTag((_v$Tags = v.Tags) !== null && _v$Tags !== void 0 ? _v$Tags : [], _get.name);
           try {
             if (_get.json) out = JSON.parse(out);
-          } catch (e) {}
+          } catch (e) {
+            out = null;
+          }
+          if (out !== null && typeof _get.match === "function") {
+            if (!_get.match(out, i, res)) out = null;
+          }
         } else out = getTag((_v$Tags2 = v.Tags) !== null && _v$Tags2 !== void 0 ? _v$Tags2 : [], _get);
         if (out) break;
+        i++;
       }
     } catch (err) {
       _iterator5.e(err);

package/esm/utils.js

@@ -168,6 +168,7 @@ const _getTagVal = (get, res, from) => {
     out = {}
     for (const k in _get.obj ?? {}) out[k] = _getTagVal(_get.obj[k], res, from)
   } else {
+    let i = 0
     for (const v of res.Messages ?? []) {
       if (typeof _get === "object" && isNil(_get.name) && isNil(_get.data)) {
         _get.data = true
@@ -182,7 +183,12 @@ const _getTagVal = (get, res, from) => {
         if (v.Data) out = v.Data
         try {
           if (_get.json || _get === true) out = JSON.parse(out)
-        } catch (e) {}
+        } catch (e) {
+          out = null
+        }
+        if (out !== null && typeof _get.match === "function") {
+          if (!_get.match(out, i, res)) out = null
+        }
       } else if (typeof _get === "object" && typeof _get.name === "string") {
         let _from = null
         if (is(Object, _get) && _get.from) _from = _get.from
@@ -190,9 +196,15 @@ const _getTagVal = (get, res, from) => {
         out = getTag(v.Tags ?? [], _get.name)
         try {
           if (_get.json) out = JSON.parse(out)
-        } catch (e) {}
+        } catch (e) {
+          out = null
+        }
+        if (out !== null && typeof _get.match === "function") {
+          if (!_get.match(out, i, res)) out = null
+        }
       } else out = getTag(v.Tags ?? [], _get)
       if (out) break
+      i++
     }
   }
   return out

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"