wao 0.27.0 → 0.27.2

package/cjs/encode.js

@@ -7,106 +7,28 @@ exports.enc = enc;
 var _base64url = _interopRequireDefault(require("base64url"));
 var _fastSha = require("fast-sha256");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-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 _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 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 _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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 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; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function isBytes(value) {
-  return value instanceof ArrayBuffer || ArrayBuffer.isView(value) || Buffer.isBuffer(value);
+  return value instanceof ArrayBuffer || ArrayBuffer.isView(value) || Buffer.isBuffer(value) || value && _typeof(value) === "object" && value.type === "Buffer" && Array.isArray(value.data);
 }
 function isPojo(value) {
   return !isBytes(value) && !Array.isArray(value) && !(value instanceof Blob) && _typeof(value) === "object" && value !== null;
 }
-function hbEncodeValue(value) {
-  if (isBytes(value)) {
-    var length = value.byteLength || value.length || 0;
-    if (length === 0) return ["empty-binary", ""];
-    return [undefined, value];
-  }
-  if (typeof value === "string") {
-    if (value.length === 0) return ["empty-string", ""];
-    return [undefined, value];
-  }
-  if (Array.isArray(value)) {
-    if (value.length === 0) return ["empty-list", "[]"];
-    var hasObjects = value.some(function (item) {
-      return isPojo(item);
-    });
-    if (hasObjects) {
-      return ["list_with_objects", value];
-    }
-    var items = value.map(function (item) {
-      if (typeof item === "string") {
-        return "\"".concat(item, "\"");
-      } else if (typeof item === "number") {
-        if (Number.isInteger(item)) {
-          return "\"(ao-type-integer) ".concat(item, "\"");
-        } else {
-          return "\"(ao-type-float) ".concat(item.toExponential(20).replace("e+0", "e+00"), "\"");
-        }
-      } else if (typeof item === "boolean") {
-        return "\"(ao-type-atom) \\\"".concat(item ? "true" : "false", "\\\"\"");
-      } else if (_typeof(item) === "symbol") {
-        var desc = item.description || "symbol";
-        return "\"(ao-type-atom) \\\"".concat(desc, "\\\"\"");
-      } else if (item === null) {
-        return "\"(ao-type-atom) \\\"null\\\"\"";
-      } else if (item === undefined) {
-        return "\"(ao-type-atom) \\\"undefined\\\"\"";
-      } else if (isBytes(item)) {
-        var _length = item.byteLength || item.length || 0;
-        if (_length === 0) {
-          return "\"\"";
-        } else {
-          var base64 = _base64url["default"].encode(Buffer.from(item));
-          return "\"(ao-type-binary) ".concat(base64, "\"");
-        }
-      } else if (Array.isArray(item)) {
-        var _hbEncodeValue = hbEncodeValue(item),
-          _hbEncodeValue2 = _slicedToArray(_hbEncodeValue, 2),
-          encoded = _hbEncodeValue2[1];
-        var escapedEncoded = encoded.replace(/"/g, '\\"');
-        return "\"(ao-type-list) ".concat(escapedEncoded, "\"");
-      } else {
-        return "\"".concat(String(item), "\"");
-      }
-    });
-    return ["list", items.join(", ")];
-  }
-  if (typeof value === "number") {
-    if (!Number.isInteger(value)) return ["float", "".concat(value)];
-    return ["integer", String(value)];
-  }
-  if (typeof value === "boolean") {
-    return ["atom", value ? "true" : "false"];
-  }
-  if (_typeof(value) === "symbol") {
-    var desc = value.description || "symbol";
-    return ["atom", desc];
-  }
-  if (value === null) return ["atom", "null"];
-  if (value === undefined) return ["atom", "undefined"];
-  if (isPojo(value)) {
-    throw new Error("Objects must be lifted");
-  }
-  throw new Error("Cannot encode value: ".concat(String(value)));
-}
 var MAX_HEADER_LENGTH = 4096;
-function encode_body_keys(bodyKeys) {
-  if (!bodyKeys || bodyKeys.length === 0) return "";
-  var items = bodyKeys.map(function (key) {
-    var escaped = key.replace(/"/g, '\\"');
-    return "\"".concat(escaped, "\"");
-  });
-  return items.join(", ");
-}
 function hasNewline(_x) {
   return _hasNewline.apply(this, arguments);
 }
@@ -191,139 +113,551 @@ function _sha() {
   }));
   return _sha.apply(this, arguments);
 }
-function collectParts(obj) {
-  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
-  var parts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var types = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  var _loop = function _loop() {
-    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-      key = _Object$entries$_i[0],
-      value = _Object$entries$_i[1];
-    var currentPath = path ? "".concat(path, "/").concat(key) : key;
-    if (value === null || value === undefined) {
-      if (!parts[path]) parts[path] = {};
-      parts[path][key] = value === null ? '"null"' : '"undefined"';
-      types[currentPath] = "atom";
-    } else if (isBytes(value)) {
-      if (!parts[path]) parts[path] = {};
-      parts[path][key] = value;
-      var length = value.byteLength || value.length || 0;
-      if (length === 0) {
-        types[currentPath] = "empty-binary";
-      }
-    } else if (typeof value === "string") {
-      if (value.length === 0) {
-        types[currentPath] = "empty-binary";
-        if (!parts[path]) parts[path] = {};
-        parts[path][key] = "";
+function formatFloat(num) {
+  var exp = num.toExponential(20);
+  exp = exp.replace(/e\+(\d)$/, "e+0$1");
+  exp = exp.replace(/e-(\d)$/, "e-0$1");
+  return exp;
+}
+function hasNonAscii(str) {
+  return /[^\x00-\x7F]/.test(str);
+}
+function encodeArrayItem(item) {
+  if (typeof item === "number") {
+    if (Number.isInteger(item)) {
+      return "\"(ao-type-integer) ".concat(item, "\"");
+    } else {
+      return "\"(ao-type-float) ".concat(formatFloat(item), "\"");
+    }
+  } else if (typeof item === "string") {
+    return "\"".concat(item, "\"");
+  } else if (item === null) {
+    return "\"(ao-type-atom) \\\"null\\\"\"";
+  } else if (item === undefined) {
+    return "\"(ao-type-atom) \\\"undefined\\\"\"";
+  } else if (_typeof(item) === "symbol") {
+    var desc = item.description || "Symbol.for()";
+    return "\"(ao-type-atom) \\\"".concat(desc, "\\\"\"");
+  } else if (typeof item === "boolean") {
+    return "\"(ao-type-atom) \\\"".concat(item, "\\\"\"");
+  } else if (Array.isArray(item)) {
+    var nestedItems = item.map(function (nestedItem) {
+      if (typeof nestedItem === "number") {
+        if (Number.isInteger(nestedItem)) {
+          return "\\\"(ao-type-integer) ".concat(nestedItem, "\\\"");
+        } else {
+          return "\\\"(ao-type-float) ".concat(formatFloat(nestedItem), "\\\"");
+        }
+      } else if (typeof nestedItem === "string") {
+        return "\\\"".concat(nestedItem, "\\\"");
+      } else if (nestedItem === null) {
+        return "\\\"(ao-type-atom) \\\\\\\"null\\\\\\\"\\\"";
+      } else if (nestedItem === undefined) {
+        return "\\\"(ao-type-atom) \\\\\\\"undefined\\\\\\\"\\\"";
+      } else if (_typeof(nestedItem) === "symbol") {
+        var _desc = nestedItem.description || "Symbol.for()";
+        return "\\\"(ao-type-atom) \\\\\\\"".concat(_desc, "\\\\\\\"\\\"");
+      } else if (typeof nestedItem === "boolean") {
+        return "\\\"(ao-type-atom) \\\\\\\"".concat(nestedItem, "\\\\\\\"\\\"");
+      } else if (Array.isArray(nestedItem)) {
+        // Handle nested arrays recursively
+        var deeperItems = nestedItem.map(function (deepItem) {
+          if (typeof deepItem === "number") {
+            if (Number.isInteger(deepItem)) {
+              return "\\\\\\\"(ao-type-integer) ".concat(deepItem, "\\\\\\\"");
+            } else {
+              return "\\\\\\\"(ao-type-float) ".concat(formatFloat(deepItem), "\\\\\\\"");
+            }
+          } else if (typeof deepItem === "string") {
+            return "\\\\\\\"".concat(deepItem, "\\\\\\\"");
+          } else if (Array.isArray(deepItem)) {
+            // Even deeper nesting - need to escape more
+            var deepestItems = deepItem.map(function (deepestItem) {
+              if (typeof deepestItem === "number") {
+                if (Number.isInteger(deepestItem)) {
+                  return "\\\\\\\\\\\\\\\"(ao-type-integer) ".concat(deepestItem, "\\\\\\\\\\\\\\\"");
+                } else {
+                  return "\\\\\\\\\\\\\\\"(ao-type-float) ".concat(formatFloat(deepestItem), "\\\\\\\\\\\\\\\"");
+                }
+              } else if (typeof deepestItem === "string") {
+                return "\\\\\\\\\\\\\\\"".concat(deepestItem, "\\\\\\\\\\\\\\\"");
+              } else {
+                return "\\\\\\\\\\\\\\\"".concat(String(deepestItem), "\\\\\\\\\\\\\\\"");
+              }
+            }).join(", ");
+            return "\\\\\\\"(ao-type-list) ".concat(deepestItems, "\\\\\\\"");
+          } else if (deepItem === null) {
+            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"null\\\\\\\\\\\\\\\"\\\\\\\"";
+          } else if (deepItem === undefined) {
+            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"undefined\\\\\\\\\\\\\\\"\\\\\\\"";
+          } else if (_typeof(deepItem) === "symbol") {
+            var _desc2 = deepItem.description || "Symbol.for()";
+            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"".concat(_desc2, "\\\\\\\\\\\\\\\"\\\\\\\"");
+          } else if (typeof deepItem === "boolean") {
+            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"".concat(deepItem, "\\\\\\\\\\\\\\\"\\\\\\\"");
+          } else {
+            return "\\\\\\\"".concat(String(deepItem), "\\\\\\\"");
+          }
+        }).join(", ");
+        return "\\\"(ao-type-list) ".concat(deeperItems, "\\\"");
       } else {
-        if (!parts[path]) parts[path] = {};
-        parts[path][key] = value;
+        return "\\\"".concat(String(nestedItem), "\\\"");
       }
-    } else if (Array.isArray(value)) {
-      if (value.length === 0) {
-        types[currentPath] = "empty-list";
-        if (!parts[path]) parts[path] = {};
-        parts[path][key] = "[]";
-      } else {
+    }).join(", ");
+    return "\"(ao-type-list) ".concat(nestedItems, "\"");
+  } else if (isBytes(item)) {
+    var buffer = toBuffer(item);
+    if (buffer.length === 0 || buffer.byteLength === 0) {
+      return "\"\"";
+    }
+    return "\"(ao-type-binary)\"";
+  } else if (isPojo(item)) {
+    var json = JSON.stringify(item);
+    var escaped = json.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    return "\"(ao-type-map) ".concat(escaped, "\"");
+  } else {
+    return "\"".concat(String(item), "\"");
+  }
+}
+function toBuffer(value) {
+  if (Buffer.isBuffer(value)) {
+    return value;
+  } else if (value && _typeof(value) === "object" && value.type === "Buffer" && Array.isArray(value.data)) {
+    return Buffer.from(value.data);
+  } else if (value instanceof ArrayBuffer || ArrayBuffer.isView(value)) {
+    return Buffer.from(value);
+  } else {
+    return Buffer.from(value);
+  }
+}
+function collectBodyKeys(obj) {
+  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+  console.log("=== collectBodyKeys START ===");
+  console.log("Input object:", JSON.stringify(obj));
+  var keys = [];
+  function traverse(current, path) {
+    console.log("[traverse] Called with path: \"".concat(path, "\""));
+    var hasSimpleFields = false;
+    var nestedPaths = [];
+    var hasArraysWithObjects = false;
+    var _loop = function _loop() {
+      var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+        key = _Object$entries$_i[0],
+        value = _Object$entries$_i[1];
+      var fullPath = path ? "".concat(path, "/").concat(key) : key;
+      if (Array.isArray(value)) {
+        console.log("[traverse] Found array at ".concat(fullPath, ", length: ").concat(value.length));
         var hasObjects = value.some(function (item) {
           return isPojo(item);
         });
-        if (hasObjects) {
-          // Arrays with objects: create separate parts for each indexed item
-          types[currentPath] = "list";
-          value.forEach(function (item, index) {
-            var indexKey = String(index + 1);
-            var indexPath = "".concat(currentPath, "/").concat(indexKey);
-            if (isPojo(item)) {
-              // Each object in the array becomes a separate part
-              if (!parts[indexPath]) parts[indexPath] = {};
-              for (var _i2 = 0, _Object$entries2 = Object.entries(item); _i2 < _Object$entries2.length; _i2++) {
-                var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
-                  objKey = _Object$entries2$_i[0],
-                  objValue = _Object$entries2$_i[1];
-                parts[indexPath][objKey] = objValue;
+        var hasNonObjects = value.some(function (item) {
+          return !isPojo(item);
+        });
+        if (value.length === 0) {
+          console.log("[traverse] Empty array at ".concat(fullPath, " - marking parent as having simple fields"));
+          hasSimpleFields = true;
+        } else if (hasObjects) {
+          hasArraysWithObjects = true;
+          // Check if we need special handling for mixed arrays
+          var hasEmptyStrings = value.some(function (item) {
+            return typeof item === "string" && item === "";
+          });
+          var hasEmptyObjects = value.some(function (item) {
+            return isPojo(item) && Object.keys(item).length === 0;
+          });
+          var hasNonEmptyObjects = value.some(function (item) {
+            return isPojo(item) && Object.keys(item).length > 0;
+          });
+
+          // Check if objects contain only empty values (not empty objects)
+          var hasObjectsWithOnlyEmptyValues = value.some(function (item) {
+            if (!isPojo(item) || Object.keys(item).length === 0) return false;
+            return Object.values(item).every(function (v) {
+              return typeof v === "string" && v === "" || Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
+            });
+          });
 
-                // Set types for object fields
-                var fieldPath = "".concat(indexPath, "/").concat(objKey);
-                if (typeof objValue === "number") {
-                  types[fieldPath] = Number.isInteger(objValue) ? "integer" : "float";
-                } else if (typeof objValue === "boolean") {
-                  types[fieldPath] = "atom";
-                } else if (_typeof(objValue) === "symbol") {
-                  types[fieldPath] = "atom";
-                  // Store the symbol's description for later use
-                  parts[indexPath][objKey] = objValue;
-                } else if (typeof objValue === "string" && objValue.length === 0) {
-                  types[fieldPath] = "empty-binary";
-                } else if (Array.isArray(objValue) && objValue.length === 0) {
-                  types[fieldPath] = "empty-list";
-                } else if (isPojo(objValue) && Object.keys(objValue).length === 0) {
-                  types[fieldPath] = "empty-message";
+          // Only use special handling if we have BOTH empty elements AND non-empty objects
+          if ((hasEmptyStrings || hasEmptyObjects) && hasNonEmptyObjects) {
+            // Special case: mixed array with empty strings/objects - only non-empty objects get parts
+            value.forEach(function (item, index) {
+              if (isPojo(item) && Object.keys(item).length > 0) {
+                var itemPath = "".concat(fullPath, "/").concat(index + 1);
+                keys.push(itemPath);
+                nestedPaths.push(itemPath);
+              }
+            });
+            if (hasNonObjects) {
+              hasSimpleFields = true;
+              keys.push(fullPath);
+            }
+          } else if (hasObjectsWithOnlyEmptyValues && !hasNonObjects) {
+            // Special case: objects that contain only empty values should get parts
+            value.forEach(function (item, index) {
+              if (isPojo(item)) {
+                var itemPath = "".concat(fullPath, "/").concat(index + 1);
+                keys.push(itemPath);
+                if (Object.keys(item).length > 0) {
+                  nestedPaths.push(itemPath);
                 }
               }
-            } else {
-              // Non-object items in the array
-              if (!parts[currentPath]) parts[currentPath] = {};
-              parts[currentPath][indexKey] = item;
-              if (typeof item === "number") {
-                types["".concat(currentPath, "/").concat(indexKey)] = Number.isInteger(item) ? "integer" : "float";
-              } else if (typeof item === "boolean") {
-                types["".concat(currentPath, "/").concat(indexKey)] = "atom";
+            });
+          } else {
+            // Normal case: all objects get parts
+            value.forEach(function (item, index) {
+              if (isPojo(item)) {
+                var itemPath = "".concat(fullPath, "/").concat(index + 1);
+                keys.push(itemPath);
+                if (Object.keys(item).length > 0) {
+                  nestedPaths.push(itemPath);
+                }
               }
+            });
+            if (hasNonObjects) {
+              hasSimpleFields = true;
+              keys.push(fullPath);
             }
-          });
+          }
         } else {
-          // Simple arrays without objects
-          var _hbEncodeValue3 = hbEncodeValue(value),
-            _hbEncodeValue4 = _slicedToArray(_hbEncodeValue3, 2),
-            type = _hbEncodeValue4[0],
-            encoded = _hbEncodeValue4[1];
-          if (!parts[path]) parts[path] = {};
-          parts[path][key] = encoded;
-          types[currentPath] = type || "list";
+          console.log("[traverse] Non-empty array without objects at ".concat(fullPath, " - marking as simple field"));
+          hasSimpleFields = true;
+        }
+      } else if (isPojo(value)) {
+        if (Object.keys(value).length === 0) {
+          console.log("[traverse] Empty object at ".concat(fullPath, " - marking parent as having simple fields"));
+          hasSimpleFields = true;
+        } else {
+          // Don't traverse into the object if it only contains empty values
+          var containsOnlyEmptyCollections = Object.entries(value).every(function (_ref) {
+            var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+            return Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0 || isBytes(v) && (v.length === 0 || v.byteLength === 0) || typeof v === "string" && v.length === 0;
+          });
+          if (containsOnlyEmptyCollections && Object.keys(value).length > 0) {
+            console.log("[traverse] Object at ".concat(fullPath, " contains only empty collections - adding as body key"));
+            keys.push(fullPath);
+          } else {
+            // Check if this object contains arrays with only empty elements
+            var hasArraysWithOnlyEmptyElements = Object.entries(value).some(function (_ref3) {
+              var _ref4 = _slicedToArray(_ref3, 2),
+                k = _ref4[0],
+                v = _ref4[1];
+              return Array.isArray(v) && v.length > 0 && v.every(function (item) {
+                return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+              });
+            });
+            if (hasArraysWithOnlyEmptyElements) {
+              // This object needs a body part to show its array types
+              console.log("[traverse] Object at ".concat(fullPath, " has arrays with empty elements - adding as body key"));
+              keys.push(fullPath);
+            }
+            console.log("[traverse] Non-empty object at ".concat(fullPath, " - will traverse into it"));
+            nestedPaths.push(fullPath);
+          }
+        }
+      } else if (isBytes(value)) {
+        var buffer = toBuffer(value);
+        if (buffer.length > 0) {
+          hasSimpleFields = true;
         }
+      } else if (typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null || value === undefined || _typeof(value) === "symbol") {
+        hasSimpleFields = true;
       }
-    } else if (isPojo(value)) {
-      if (Object.keys(value).length === 0) {
-        types[currentPath] = "empty-message";
-        if (!parts[path]) parts[path] = {};
-        parts[path][key] = "{}";
+    };
+    for (var _i = 0, _Object$entries = Object.entries(current); _i < _Object$entries.length; _i++) {
+      _loop();
+    }
+    if (hasSimpleFields) {
+      console.log("[traverse] Adding \"".concat(path, "\" to keys (has simple fields)"));
+      keys.push(path);
+    } else if (hasArraysWithObjects && path) {
+      // If the object only contains arrays with objects, we still need to add it as a body key
+      console.log("[traverse] Adding \"".concat(path, "\" to keys (contains arrays with objects)"));
+      keys.push(path);
+    }
+
+    // Check for arrays with only empty elements that need their own body parts
+    for (var _i2 = 0, _Object$entries2 = Object.entries(current); _i2 < _Object$entries2.length; _i2++) {
+      var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+        key = _Object$entries2$_i[0],
+        value = _Object$entries2$_i[1];
+      var fullPath = path ? "".concat(path, "/").concat(key) : key;
+      if (Array.isArray(value) && value.length > 0) {
+        var hasOnlyEmptyElements = value.every(function (item) {
+          return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+        });
+        if (hasOnlyEmptyElements) {
+          console.log("[traverse] Array at ".concat(fullPath, " has only empty elements - adding as body key"));
+          keys.push(fullPath);
+        }
+      }
+    }
+    for (var _i3 = 0, _nestedPaths = nestedPaths; _i3 < _nestedPaths.length; _i3++) {
+      var nestedPath = _nestedPaths[_i3];
+      var parts = nestedPath.split("/");
+      var nestedObj = obj;
+      var _iterator = _createForOfIteratorHelper(parts),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var part = _step.value;
+          if (/^\d+$/.test(part)) {
+            nestedObj = nestedObj[parseInt(part) - 1];
+          } else {
+            nestedObj = nestedObj[part];
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      if (isPojo(nestedObj)) {
+        traverse(nestedObj, nestedPath);
+      }
+    }
+  }
+  var objKeys = Object.keys(obj);
+  var _loop2 = function _loop2() {
+    var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i4], 2),
+      key = _Object$entries3$_i[0],
+      value = _Object$entries3$_i[1];
+    console.log("\n[main loop] Processing key: \"".concat(key, "\""));
+    console.log("[main loop] Value type: ".concat(Array.isArray(value) ? "array" : _typeof(value)));
+    console.log("[main loop] Array length: ".concat(Array.isArray(value) ? value.length : "N/A"));
+    if ((key === "data" || key === "body") && (typeof value === "string" || typeof value === "boolean" || typeof value === "number" || value === null || value === undefined || _typeof(value) === "symbol") && objKeys.length > 1) {
+      // Special handling: only add to body keys if there's no other data/body field with an object
+      if (key === "data" && obj.body && isPojo(obj.body) && Object.keys(obj.body).length > 0) {
+        console.log("[main loop] Skipping special data field");
+      } else if (key === "body" && obj.data && isPojo(obj.data) && Object.keys(obj.data).length > 0) {
+        console.log("[main loop] Skipping special body field");
       } else {
-        var hasOnlyEmptyChildren = Object.entries(value).every(function (_ref) {
-          var _ref2 = _slicedToArray(_ref, 2),
-            k = _ref2[0],
-            v = _ref2[1];
-          return Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
+        console.log("[main loop] Adding special data/body key: \"".concat(key, "\""));
+        keys.push(key);
+      }
+    } else if (Array.isArray(value)) {
+      if (value.length === 0) {
+        console.log("[main loop] SKIPPING empty array for key: \"".concat(key, "\""));
+        return 1; // continue
+      }
+      var hasObjects = value.some(function (item) {
+        return isPojo(item);
+      });
+      var hasArrays = value.some(function (item) {
+        return Array.isArray(item);
+      });
+      var hasNonObjects = value.some(function (item) {
+        return !isPojo(item);
+      });
+
+      // Check if this is an array of arrays containing objects
+      var hasArraysOfObjects = value.some(function (item) {
+        return Array.isArray(item) && item.some(function (subItem) {
+          return isPojo(subItem);
         });
-        if (hasOnlyEmptyChildren) {
-          if (!parts[currentPath]) parts[currentPath] = {};
+      });
+      console.log("[main loop] Array analysis: hasObjects=".concat(hasObjects, ", hasArrays=").concat(hasArrays, ", hasNonObjects=").concat(hasNonObjects, ", hasArraysOfObjects=").concat(hasArraysOfObjects));
+      if (value.length > 0) {
+        var bodyPartCounter = 1; // Start counting from 1
+
+        // Check for special mixed array case
+        var hasEmptyStrings = value.some(function (item) {
+          return typeof item === "string" && item === "";
+        });
+        var hasEmptyObjects = value.some(function (item) {
+          return isPojo(item) && Object.keys(item).length === 0;
+        });
+
+        // Check for objects that contain only empty values
+        var hasObjectsWithOnlyEmptyValues = value.some(function (item) {
+          if (!isPojo(item) || Object.keys(item).length === 0) return false;
+          return Object.values(item).every(function (v) {
+            return typeof v === "string" && v === "" || Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
+          });
+        });
+        if (hasArraysOfObjects) {
+          // Handle arrays of arrays containing objects
+          value.forEach(function (item, index) {
+            if (Array.isArray(item)) {
+              item.forEach(function (subItem, subIndex) {
+                if (isPojo(subItem)) {
+                  var path = "".concat(key, "/").concat(index + 1, "/").concat(subIndex + 1);
+                  console.log("[main loop] Adding nested object path: \"".concat(path, "\""));
+                  keys.push(path);
+                }
+              });
+            }
+            bodyPartCounter++;
+          });
+          // Always add the main array key
+          console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
+          keys.push(key);
+        } else if (hasObjects && (hasEmptyStrings || hasEmptyObjects) && !hasObjectsWithOnlyEmptyValues) {
+          // Special handling: only non-empty objects get parts
+          value.forEach(function (item, index) {
+            if (isPojo(item) && Object.keys(item).length > 0) {
+              var path = "".concat(key, "/").concat(bodyPartCounter);
+              console.log("[main loop] Adding non-empty object path: \"".concat(path, "\" (array index ").concat(index, ")"));
+              keys.push(path);
+              // Add paths for nested objects
+              for (var _i5 = 0, _Object$entries4 = Object.entries(item); _i5 < _Object$entries4.length; _i5++) {
+                var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
+                  nestedKey = _Object$entries4$_i[0],
+                  nestedValue = _Object$entries4$_i[1];
+                if (isPojo(nestedValue)) {
+                  var nestedPath = "".concat(key, "/").concat(bodyPartCounter, "/").concat(nestedKey);
+                  console.log("[main loop] Adding nested object path: \"".concat(nestedPath, "\""));
+                  keys.push(nestedPath);
+                }
+              }
+            }
+            bodyPartCounter++;
+          });
+          // Always add the main array key
+          console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
+          keys.push(key);
+        } else if (hasObjects) {
+          // Normal handling: all objects get parts (except if parent array has only empty elements)
+          var skipEmptyObjects = false;
+
+          // Check if this array contains only empty elements
+          var arrayHasOnlyEmptyElements = value.every(function (item) {
+            return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+          });
+          if (arrayHasOnlyEmptyElements) {
+            skipEmptyObjects = true;
+          }
+          value.forEach(function (item, index) {
+            if (isPojo(item)) {
+              // Skip empty objects if array has only empty elements
+              if (skipEmptyObjects && Object.keys(item).length === 0) {
+                bodyPartCounter++;
+                return;
+              }
+              var path = "".concat(key, "/").concat(bodyPartCounter);
+              console.log("[main loop] Adding object path: \"".concat(path, "\" (array index ").concat(index, ", empty=").concat(Object.keys(item).length === 0, ")"));
+              keys.push(path);
+              // Add paths for nested objects (but not empty ones)
+              if (Object.keys(item).length > 0) {
+                for (var _i6 = 0, _Object$entries5 = Object.entries(item); _i6 < _Object$entries5.length; _i6++) {
+                  var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2),
+                    nestedKey = _Object$entries5$_i[0],
+                    nestedValue = _Object$entries5$_i[1];
+                  if (isPojo(nestedValue) && Object.keys(nestedValue).length > 0) {
+                    var nestedPath = "".concat(key, "/").concat(bodyPartCounter, "/").concat(nestedKey);
+                    console.log("[main loop] Adding nested object path: \"".concat(nestedPath, "\""));
+                    keys.push(nestedPath);
+                  }
+                }
+              }
+            } else if (typeof item === "string" && item === "") {
+              // Empty strings may get parts in some formats
+              var _path = "".concat(key, "/").concat(bodyPartCounter);
+              console.log("[main loop] Adding empty string path: \"".concat(_path, "\" (array index ").concat(index, ")"));
+              keys.push(_path);
+            }
+            bodyPartCounter++;
+          });
+          // Don't add main array key for arrays with only objects containing empty values
+          if (!hasObjectsWithOnlyEmptyValues || value.some(function (item) {
+            return !isPojo(item);
+          })) {
+            // Check if array has only empty elements
+            var hasOnlyEmptyElements = value.every(function (item) {
+              return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+            });
+            if (!hasOnlyEmptyElements) {
+              // Always add the main array key
+              console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
+              keys.push(key);
+            }
+          }
+        } else {
+          // Check if array has only empty elements
+          var hasOnlyEmptyArraysOrObjects = value.every(function (item) {
+            return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+          });
+          if (hasOnlyEmptyArraysOrObjects && value.length > 0) {
+            // Always add the main array key for arrays with only empty elements
+            console.log("[main loop] ADDING main array key for empty elements: \"".concat(key, "\""));
+            keys.push(key);
+          } else if (!hasOnlyEmptyArraysOrObjects) {
+            // Always add the main array key
+            console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
+            keys.push(key);
+          }
         }
-        collectParts(value, currentPath, parts, types);
       }
-    } else if (_typeof(value) === "symbol") {
-      if (!parts[path]) parts[path] = {};
-      parts[path][key] = value.description || "symbol";
-      types[currentPath] = "atom";
-    } else if (typeof value === "boolean") {
-      if (!parts[path]) parts[path] = {};
-      parts[path][key] = value;
-      types[currentPath] = "atom";
-    } else {
-      if (!parts[path]) parts[path] = {};
-      parts[path][key] = value;
-      if (typeof value === "number") {
-        types[currentPath] = Number.isInteger(value) ? "integer" : "float";
+    } else if (isPojo(value)) {
+      console.log("[main loop] Processing object at key: \"".concat(key, "\""));
+      // Objects should be traversed, not have their fields individually added
+      traverse(value, key);
+    } else if (isBytes(value)) {
+      var buffer = toBuffer(value);
+      if (buffer.length > 0) {
+        console.log("[main loop] Adding key for non-empty bytes: \"".concat(key, "\""));
+        keys.push(key);
       }
+    } else if (typeof value === "string" && value.includes("\n")) {
+      console.log("[main loop] Adding key for string with newline: \"".concat(key, "\""));
+      keys.push(key);
+    } else if (typeof value === "string" && hasNonAscii(value)) {
+      console.log("[main loop] Adding key for non-ASCII string: \"".concat(key, "\""));
+      keys.push(key);
+    } else {
+      console.log("[main loop] Skipping key: \"".concat(key, "\" (no match)"));
     }
   };
-  for (var _i = 0, _Object$entries = Object.entries(obj); _i < _Object$entries.length; _i++) {
-    _loop();
+  for (var _i4 = 0, _Object$entries3 = Object.entries(obj); _i4 < _Object$entries3.length; _i4++) {
+    if (_loop2()) continue;
   }
-  return {
-    parts: parts,
-    types: types
-  };
+  var result = _toConsumableArray(new Set(keys)).filter(function (k) {
+    if (k === "") return false;
+
+    // Check if this is a path to an empty object inside an array with only empty elements
+    var parts = k.split("/");
+    if (parts.length >= 2 && /^\d+$/.test(parts[parts.length - 1])) {
+      // This is an array element path like "maps/1"
+      var arrayPath = parts.slice(0, -1).join("/");
+      var arrayValue = obj;
+
+      // Navigate to the array
+      var _iterator2 = _createForOfIteratorHelper(parts.slice(0, -1)),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var part = _step2.value;
+          if (/^\d+$/.test(part)) {
+            arrayValue = arrayValue[parseInt(part) - 1];
+          } else {
+            arrayValue = arrayValue[part];
+          }
+        }
+
+        // Check if this array contains only empty elements
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      if (Array.isArray(arrayValue)) {
+        var hasOnlyEmptyElements = arrayValue.every(function (item) {
+          return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+        });
+        if (hasOnlyEmptyElements) {
+          // Filter out paths to individual empty elements
+          console.log("[filter] Removing path to empty element: \"".concat(k, "\""));
+          return false;
+        }
+      }
+    }
+    return true;
+  });
+  console.log("\n=== collectBodyKeys RESULT ===");
+  console.log("Final bodyKeys:", JSON.stringify(result));
+  console.log("=== collectBodyKeys END ===\n");
+  return result;
 }
 function encode() {
   return _encode.apply(this, arguments);
@@ -331,717 +665,1043 @@ function encode() {
 function _encode() {
   _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var obj,
+      _processValue,
+      processedObj,
+      _i8,
+      _Object$entries7,
+      _Object$entries7$_i,
+      k,
+      v,
       objKeys,
       fieldName,
-      binaryData,
-      headers,
+      fieldValue,
+      _headers,
+      hasBodyBinary,
+      otherFields,
+      _headers2,
       bodyBuffer,
       bodyArrayBuffer,
       contentDigest,
       base64,
-      _headers,
-      types,
-      needsMultipart,
-      _i3,
-      _Object$entries3,
-      _Object$entries3$_i,
-      key,
-      value,
-      _hbEncodeValue5,
-      _hbEncodeValue6,
-      type,
-      encoded,
-      body,
+      _fieldName,
+      _fieldValue,
+      _headers3,
       _bodyBuffer,
       _bodyArrayBuffer,
       _contentDigest,
       _base,
-      _args3 = arguments;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+      _headers4,
+      bodyContent,
+      encoder,
+      encoded,
+      _contentDigest2,
+      _base2,
+      _headers5,
+      _encoder,
+      _encoded,
+      _contentDigest3,
+      _base3,
+      bodyKeys,
+      headers,
+      headerTypes,
+      _loop3,
+      _i9,
+      _Object$entries8,
+      _loop4,
+      _i10,
+      _Object$entries9,
+      allBodyKeysAreEmptyBinaries,
+      singleKey,
+      pathParts,
+      value,
+      _iterator4,
+      _step4,
+      part,
+      otherFieldsAreEmpty,
+      _bodyBuffer2,
+      _bodyArrayBuffer2,
+      _contentDigest4,
+      _base4,
+      sortedBodyKeys,
+      hasSpecialDataBody,
+      bodyParts,
+      _iterator5,
+      _step5,
+      _loop5,
+      _ret,
+      buffer,
+      specialPart,
+      partsContent,
+      allContent,
+      boundaryHash,
+      boundary,
+      finalParts,
+      i,
+      body,
+      finalContent,
+      _contentDigest5,
+      _base5,
+      _args6 = arguments;
+    return _regeneratorRuntime().wrap(function _callee3$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          obj = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
-          console.log("[encode] START with obj:", JSON.stringify(obj));
+          obj = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+          console.log("\n=== ENCODE START ===");
+          console.log("Encoding object:", JSON.stringify(obj));
+          _processValue = function processValue(value) {
+            if (_typeof(value) === "symbol") {
+              return value.description || "Symbol.for()";
+            } else if (Array.isArray(value)) {
+              return value.map(_processValue);
+            } else if (isPojo(value)) {
+              var result = {};
+              for (var _i7 = 0, _Object$entries6 = Object.entries(value); _i7 < _Object$entries6.length; _i7++) {
+                var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2),
+                  k = _Object$entries6$_i[0],
+                  v = _Object$entries6$_i[1];
+                result[k] = _processValue(v);
+              }
+              return result;
+            }
+            return value;
+          };
+          processedObj = {};
+          for (_i8 = 0, _Object$entries7 = Object.entries(obj); _i8 < _Object$entries7.length; _i8++) {
+            _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2), k = _Object$entries7$_i[0], v = _Object$entries7$_i[1];
+            processedObj[k] = _processValue(v);
+          }
           if (!(Object.keys(obj).length === 0)) {
-            _context3.next = 4;
+            _context6.next = 8;
             break;
           }
-          return _context3.abrupt("return", {
+          return _context6.abrupt("return", {
             headers: {},
             body: undefined
           });
-        case 4:
-          // Check if we have a simple binary field
+        case 8:
           objKeys = Object.keys(obj);
-          if (!(objKeys.length === 1 && isBytes(obj[objKeys[0]]))) {
-            _context3.next = 18;
+          if (!(objKeys.length === 1)) {
+            _context6.next = 16;
             break;
           }
-          // Single binary field - return it directly
           fieldName = objKeys[0];
-          binaryData = obj[fieldName];
-          headers = {};
-          bodyBuffer = Buffer.isBuffer(binaryData) ? binaryData : Buffer.from(binaryData);
-          bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
-          _context3.next = 13;
-          return sha256(bodyArrayBuffer);
-        case 13:
-          contentDigest = _context3.sent;
-          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
-          headers["content-digest"] = "sha-256=:".concat(base64, ":");
-          console.log("[encode] FINAL (simple binary field) - headers:", headers, "body:", binaryData);
-          return _context3.abrupt("return", {
-            headers: headers,
-            body: binaryData
-          });
-        case 18:
-          if (!("body" in obj && isBytes(obj.body))) {
-            _context3.next = 108;
+          fieldValue = obj[fieldName];
+          if (!(isBytes(fieldValue) && (fieldValue.length === 0 || fieldValue.byteLength === 0))) {
+            _context6.next = 16;
             break;
           }
           _headers = {};
-          types = [];
-          needsMultipart = false;
-          _i3 = 0, _Object$entries3 = Object.entries(obj);
-        case 23:
-          if (!(_i3 < _Object$entries3.length)) {
-            _context3.next = 95;
-            break;
-          }
-          _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2), key = _Object$entries3$_i[0], value = _Object$entries3$_i[1];
-          if (!(key === "body")) {
-            _context3.next = 27;
-            break;
-          }
-          return _context3.abrupt("continue", 92);
-        case 27:
-          if (!(value === null)) {
-            _context3.next = 32;
+          _headers["ao-types"] = "".concat(fieldName.toLowerCase(), "=\"empty-binary\"");
+          return _context6.abrupt("return", {
+            headers: _headers,
+            body: undefined
+          });
+        case 16:
+          if (obj.body && isBytes(obj.body) && (obj.body.length === 0 || obj.body.byteLength === 0) && objKeys.length > 1) {}
+          hasBodyBinary = obj.body && isBytes(obj.body);
+          otherFields = Object.keys(obj).filter(function (k) {
+            return k !== "body";
+          });
+          if (!(hasBodyBinary && otherFields.length === 0)) {
+            _context6.next = 29;
             break;
           }
-          _headers[key] = "null";
-          types.push("".concat(key, "=\"atom\""));
-          _context3.next = 92;
-          break;
-        case 32:
-          if (!(value === undefined)) {
-            _context3.next = 37;
+          _headers2 = {};
+          bodyBuffer = toBuffer(obj.body);
+          bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
+          _context6.next = 25;
+          return sha256(bodyArrayBuffer);
+        case 25:
+          contentDigest = _context6.sent;
+          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
+          _headers2["content-digest"] = "sha-256=:".concat(base64, ":");
+          return _context6.abrupt("return", {
+            headers: _headers2,
+            body: obj.body
+          });
+        case 29:
+          if (!(objKeys.length === 1)) {
+            _context6.next = 71;
             break;
           }
-          _headers[key] = "undefined";
-          types.push("".concat(key, "=\"atom\""));
-          _context3.next = 92;
-          break;
-        case 37:
-          if (!(typeof value === "string" && value.length === 0)) {
-            _context3.next = 41;
+          _fieldName = objKeys[0];
+          _fieldValue = obj[_fieldName];
+          if (!(isBytes(_fieldValue) && _fieldValue.length > 0)) {
+            _context6.next = 45;
             break;
           }
-          types.push("".concat(key, "=\"empty-binary\""));
-          _context3.next = 92;
-          break;
-        case 41:
-          if (!Array.isArray(value)) {
-            _context3.next = 57;
-            break;
+          _headers3 = {};
+          _bodyBuffer = toBuffer(_fieldValue);
+          _bodyArrayBuffer = _bodyBuffer.buffer.slice(_bodyBuffer.byteOffset, _bodyBuffer.byteOffset + _bodyBuffer.byteLength);
+          _context6.next = 38;
+          return sha256(_bodyArrayBuffer);
+        case 38:
+          _contentDigest = _context6.sent;
+          _base = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest));
+          _headers3["content-digest"] = "sha-256=:".concat(_base, ":");
+          if (_fieldName !== "body") {
+            _headers3["inline-body-key"] = _fieldName;
           }
-          if (!(value.length === 0)) {
-            _context3.next = 46;
+          return _context6.abrupt("return", {
+            headers: _headers3,
+            body: _fieldValue
+          });
+        case 45:
+          if (!((_fieldName === "data" || _fieldName === "body") && (typeof _fieldValue === "string" || typeof _fieldValue === "boolean" || typeof _fieldValue === "number" || _fieldValue === null || _fieldValue === undefined || _typeof(_fieldValue) === "symbol"))) {
+            _context6.next = 60;
             break;
           }
-          types.push("".concat(key, "=\"empty-list\""));
-          _context3.next = 55;
-          break;
-        case 46:
-          if (!value.some(function (item) {
-            return isPojo(item);
-          })) {
-            _context3.next = 52;
-            break;
+          _headers4 = {};
+          if (typeof _fieldValue === "string") {
+            bodyContent = _fieldValue;
+          } else if (typeof _fieldValue === "boolean") {
+            bodyContent = "\"".concat(_fieldValue, "\"");
+          } else if (typeof _fieldValue === "number") {
+            bodyContent = String(_fieldValue);
+          } else if (_fieldValue === null) {
+            bodyContent = '"null"';
+          } else if (_fieldValue === undefined) {
+            bodyContent = '"undefined"';
+          } else if (_typeof(_fieldValue) === "symbol") {
+            bodyContent = "\"".concat(_fieldValue.description || "Symbol.for()", "\"");
           }
-          // Arrays with objects need multipart
-          types.push("".concat(key, "=\"list\""));
-          needsMultipart = true;
-          return _context3.abrupt("break", 95);
+          encoder = new TextEncoder();
+          encoded = encoder.encode(bodyContent);
+          _context6.next = 52;
+          return sha256(encoded.buffer);
         case 52:
-          _hbEncodeValue5 = hbEncodeValue(value), _hbEncodeValue6 = _slicedToArray(_hbEncodeValue5, 2), type = _hbEncodeValue6[0], encoded = _hbEncodeValue6[1];
-          _headers[key] = encoded;
-          types.push("".concat(key, "=\"").concat(type, "\""));
-        case 55:
-          _context3.next = 92;
-          break;
-        case 57:
-          if (!isBytes(value)) {
-            _context3.next = 66;
-            break;
+          _contentDigest2 = _context6.sent;
+          _base2 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest2));
+          _headers4["content-digest"] = "sha-256=:".concat(_base2, ":");
+          if (typeof _fieldValue === "boolean" || _fieldValue === null || _fieldValue === undefined || _typeof(_fieldValue) === "symbol") {
+            _headers4["ao-types"] = "".concat(_fieldName.toLowerCase(), "=\"atom\"");
+          } else if (typeof _fieldValue === "number") {
+            _headers4["ao-types"] = "".concat(_fieldName.toLowerCase(), "=\"").concat(Number.isInteger(_fieldValue) ? "integer" : "float", "\"");
+          }
+          if (_fieldName !== "body") {
+            _headers4["inline-body-key"] = _fieldName;
           }
-          if (!(value.length === 0 || value.byteLength === 0)) {
-            _context3.next = 62;
+          return _context6.abrupt("return", {
+            headers: _headers4,
+            body: bodyContent
+          });
+        case 60:
+          if (!(typeof _fieldValue === "string" && hasNonAscii(_fieldValue))) {
+            _context6.next = 71;
             break;
           }
-          types.push("".concat(key, "=\"empty-binary\""));
-          _context3.next = 64;
-          break;
-        case 62:
-          needsMultipart = true;
-          return _context3.abrupt("break", 95);
-        case 64:
-          _context3.next = 92;
-          break;
+          _headers5 = {};
+          _encoder = new TextEncoder();
+          _encoded = _encoder.encode(_fieldValue);
+          _context6.next = 66;
+          return sha256(_encoded.buffer);
         case 66:
-          if (!(typeof value === "boolean")) {
-            _context3.next = 71;
-            break;
+          _contentDigest3 = _context6.sent;
+          _base3 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest3));
+          _headers5["content-digest"] = "sha-256=:".concat(_base3, ":");
+          if (_fieldName !== "body") {
+            _headers5["inline-body-key"] = _fieldName;
           }
-          _headers[key] = "\"".concat(value, "\"");
-          types.push("".concat(key, "=\"atom\""));
-          _context3.next = 92;
-          break;
+          return _context6.abrupt("return", {
+            headers: _headers5,
+            body: _fieldValue
+          });
         case 71:
-          if (!(_typeof(value) === "symbol")) {
-            _context3.next = 76;
-            break;
-          }
-          _headers[key] = value.description || "symbol";
-          types.push("".concat(key, "=\"atom\""));
-          _context3.next = 92;
-          break;
+          bodyKeys = collectBodyKeys(obj);
+          headers = {};
+          headerTypes = [];
+          _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
+            var _Object$entries8$_i, key, value, needsBody, hasNonAsciiItems, encodedItems;
+            return _regeneratorRuntime().wrap(function _loop3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2), key = _Object$entries8$_i[0], value = _Object$entries8$_i[1];
+                  needsBody = bodyKeys.includes(key) || bodyKeys.some(function (k) {
+                    return k.startsWith("".concat(key, "/"));
+                  });
+                  if (needsBody) {
+                    _context3.next = 43;
+                    break;
+                  }
+                  if (!(value === null)) {
+                    _context3.next = 8;
+                    break;
+                  }
+                  headers[key] = '"null"';
+                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+                  _context3.next = 41;
+                  break;
+                case 8:
+                  if (!(value === undefined)) {
+                    _context3.next = 13;
+                    break;
+                  }
+                  headers[key] = '"undefined"';
+                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+                  _context3.next = 41;
+                  break;
+                case 13:
+                  if (!(typeof value === "boolean")) {
+                    _context3.next = 18;
+                    break;
+                  }
+                  headers[key] = "\"".concat(value, "\"");
+                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+                  _context3.next = 41;
+                  break;
+                case 18:
+                  if (!(_typeof(value) === "symbol")) {
+                    _context3.next = 23;
+                    break;
+                  }
+                  headers[key] = "\"".concat(value.description || "Symbol.for()", "\"");
+                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+                  _context3.next = 41;
+                  break;
+                case 23:
+                  if (!(typeof value === "number")) {
+                    _context3.next = 28;
+                    break;
+                  }
+                  headers[key] = String(value);
+                  headerTypes.push("".concat(key.toLowerCase(), "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
+                  _context3.next = 41;
+                  break;
+                case 28:
+                  if (!(typeof value === "string")) {
+                    _context3.next = 40;
+                    break;
+                  }
+                  if (!(value.length === 0)) {
+                    _context3.next = 33;
+                    break;
+                  }
+                  headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+                  _context3.next = 38;
+                  break;
+                case 33:
+                  if (!hasNonAscii(value)) {
+                    _context3.next = 37;
+                    break;
+                  }
+                  return _context3.abrupt("return", 1);
+                case 37:
+                  headers[key] = value;
+                case 38:
+                  _context3.next = 41;
+                  break;
+                case 40:
+                  if (Array.isArray(value) && value.length === 0) {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-list\""));
+                  } else if (Array.isArray(value) && !value.some(function (item) {
+                    return isPojo(item);
+                  })) {
+                    hasNonAsciiItems = value.some(function (item) {
+                      return typeof item === "string" && hasNonAscii(item);
+                    });
+                    if (!hasNonAsciiItems) {
+                      encodedItems = value.map(function (item) {
+                        return encodeArrayItem(item);
+                      }).join(", ");
+                      headers[key] = encodedItems;
+                      headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
+                    }
+                  } else if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+                  } else if (isPojo(value) && Object.keys(value).length === 0) {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-message\""));
+                  }
+                case 41:
+                  _context3.next = 44;
+                  break;
+                case 43:
+                  if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+                  } else if (typeof value === "string" && value.length === 0) {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+                  } else if (Array.isArray(value) && value.length === 0) {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-list\""));
+                  } else if (isPojo(value) && Object.keys(value).length === 0) {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-message\""));
+                  } else if (typeof value === "boolean" || value === null || value === undefined || _typeof(value) === "symbol") {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+                  } else if (typeof value === "number") {
+                    headerTypes.push("".concat(key.toLowerCase(), "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
+                  }
+                case 44:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _loop3);
+          });
+          _i9 = 0, _Object$entries8 = Object.entries(obj);
         case 76:
-          if (!(typeof value === "number")) {
-            _context3.next = 81;
+          if (!(_i9 < _Object$entries8.length)) {
+            _context6.next = 83;
             break;
           }
-          _headers[key] = String(value);
-          types.push("".concat(key, "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
-          _context3.next = 92;
-          break;
-        case 81:
-          if (!(typeof value === "string")) {
-            _context3.next = 85;
+          return _context6.delegateYield(_loop3(), "t0", 78);
+        case 78:
+          if (!_context6.t0) {
+            _context6.next = 80;
             break;
           }
-          _headers[key] = value;
-          _context3.next = 92;
+          return _context6.abrupt("continue", 80);
+        case 80:
+          _i9++;
+          _context6.next = 76;
           break;
+        case 83:
+          _loop4 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop4() {
+            var _Object$entries9$_i, key, value;
+            return _regeneratorRuntime().wrap(function _loop4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
+                case 0:
+                  _Object$entries9$_i = _slicedToArray(_Object$entries9[_i10], 2), key = _Object$entries9$_i[0], value = _Object$entries9$_i[1];
+                  if (Array.isArray(value)) {
+                    if (bodyKeys.includes(key) || bodyKeys.some(function (k) {
+                      return k.startsWith("".concat(key, "/"));
+                    })) {
+                      if (!headerTypes.some(function (t) {
+                        return t.startsWith("".concat(key.toLowerCase(), "="));
+                      })) {
+                        headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
+                      }
+                    }
+                  }
+                case 2:
+                case "end":
+                  return _context4.stop();
+              }
+            }, _loop4);
+          });
+          _i10 = 0, _Object$entries9 = Object.entries(obj);
         case 85:
-          if (!(isPojo(value) && Object.keys(value).length === 0)) {
-            _context3.next = 89;
-            break;
-          }
-          types.push("".concat(key, "=\"empty-message\""));
-          _context3.next = 92;
-          break;
-        case 89:
-          if (!isPojo(value)) {
-            _context3.next = 92;
+          if (!(_i10 < _Object$entries9.length)) {
+            _context6.next = 90;
             break;
           }
-          needsMultipart = true;
-          return _context3.abrupt("break", 95);
-        case 92:
-          _i3++;
-          _context3.next = 23;
+          return _context6.delegateYield(_loop4(), "t1", 87);
+        case 87:
+          _i10++;
+          _context6.next = 85;
           break;
-        case 95:
-          if (!needsMultipart) {
-            _context3.next = 97;
+        case 90:
+          if (!(bodyKeys.length === 0)) {
+            _context6.next = 94;
             break;
           }
-          return _context3.abrupt("return", encodeMultipart(obj));
-        case 97:
-          if (types.length > 0) {
-            _headers["ao-types"] = types.sort().join(", ");
+          console.log("No bodyKeys, returning headers only");
+          if (headerTypes.length > 0) {
+            headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          body = obj.body;
-          _bodyBuffer = Buffer.isBuffer(body) ? body : Buffer.from(body);
-          _bodyArrayBuffer = _bodyBuffer.buffer.slice(_bodyBuffer.byteOffset, _bodyBuffer.byteOffset + _bodyBuffer.byteLength);
-          _context3.next = 103;
-          return sha256(_bodyArrayBuffer);
-        case 103:
-          _contentDigest = _context3.sent;
-          _base = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest));
-          _headers["content-digest"] = "sha-256=:".concat(_base, ":");
-          console.log("[encode] FINAL (simple body encoding) - headers:", _headers, "body:", body);
-          return _context3.abrupt("return", {
-            headers: _headers,
-            body: body
+          return _context6.abrupt("return", {
+            headers: headers,
+            body: undefined
           });
-        case 108:
-          return _context3.abrupt("return", encodeMultipart(obj));
-        case 109:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return _encode.apply(this, arguments);
-}
-function encodeMultipart(_x3) {
-  return _encodeMultipart.apply(this, arguments);
-}
-function _encodeMultipart() {
-  _encodeMultipart = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(obj) {
-    var _collectParts, parts, types, headers, bodyParts, bodyKeys, headerTypes, _i4, _Object$entries4, _Object$entries4$_i, key, value, _i5, _Object$entries5, _Object$entries5$_i, path, content, _i6, _Object$entries6, _Object$entries6$_i, _key, _value, length, valueStr, type, _i7, _Object$entries7, _Object$entries7$_i, _key2, _value2, _type, _i8, _Object$entries8, _Object$entries8$_i, _key3, _type2, inlineKey, _iterator, _step, _path, fieldValue, headerStr, headerBlob, dataBlob, _lines, _isInlineKey, _type3, _content, lines, binaryParts, isInlineKey, sortedKeys, partTypes, _iterator3, _step3, _key4, fullPath, _type4, _iterator4, _step4, _key5, _value3, _fullPath, _type5, symbolValue, allParts, _iterator5, _step5, binaryPart, partsForBoundary, _iterator2, _step2, part, partContent, allPartsContent, allPartsBuffer, hashResult, boundary, finalParts, i, body, finalContent, contentDigest, base64;
-    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
-        case 0:
-          _collectParts = collectParts(obj), parts = _collectParts.parts, types = _collectParts.types;
-          console.log("[encode] Parts:", parts, "Types:", types);
-          headers = {};
-          bodyParts = [];
-          bodyKeys = []; // Collect header types for arrays with objects
-          headerTypes = [];
-          for (_i4 = 0, _Object$entries4 = Object.entries(obj); _i4 < _Object$entries4.length; _i4++) {
-            _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2), key = _Object$entries4$_i[0], value = _Object$entries4$_i[1];
-            if (Array.isArray(value) && value.some(function (item) {
-              return isPojo(item);
-            })) {
-              headerTypes.push("".concat(key, "=\"list\""));
+        case 94:
+          allBodyKeysAreEmptyBinaries = bodyKeys.every(function (key) {
+            var pathParts = key.split("/");
+            var value = obj;
+            var _iterator3 = _createForOfIteratorHelper(pathParts),
+              _step3;
+            try {
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var part = _step3.value;
+                if (/^\d+$/.test(part)) {
+                  var index = parseInt(part) - 1;
+                  console.log("[Body part] Getting array element at index ".concat(index, " from part ").concat(part));
+                  value = value[index];
+                } else {
+                  value = value[part];
+                }
+              }
+            } catch (err) {
+              _iterator3.e(err);
+            } finally {
+              _iterator3.f();
             }
-          }
-          _i5 = 0, _Object$entries5 = Object.entries(parts);
-        case 8:
-          if (!(_i5 < _Object$entries5.length)) {
-            _context4.next = 57;
-            break;
-          }
-          _Object$entries5$_i = _slicedToArray(_Object$entries5[_i5], 2), path = _Object$entries5$_i[0], content = _Object$entries5$_i[1];
-          if (!(path === "")) {
-            _context4.next = 53;
-            break;
-          }
-          _i6 = 0, _Object$entries6 = Object.entries(content);
-        case 12:
-          if (!(_i6 < _Object$entries6.length)) {
-            _context4.next = 51;
-            break;
-          }
-          _Object$entries6$_i = _slicedToArray(_Object$entries6[_i6], 2), _key = _Object$entries6$_i[0], _value = _Object$entries6$_i[1];
-          if (!isBytes(_value)) {
-            _context4.next = 25;
-            break;
-          }
-          length = _value.byteLength || _value.length || 0;
-          if (!(length === 0)) {
-            _context4.next = 21;
-            break;
-          }
-          // Empty binaries stay in headers
-          console.log("[encode] Empty binary field ".concat(_key, " staying in headers"));
-          return _context4.abrupt("continue", 48);
-        case 21:
-          console.log("[encode] Binary field ".concat(_key, " going to body"));
-          bodyKeys.push(_key);
-        case 23:
-          _context4.next = 48;
-          break;
-        case 25:
-          valueStr = String(_value);
-          type = types[_key];
-          if (!(type === "empty-binary" && valueStr === "")) {
-            _context4.next = 29;
+            return isBytes(value) && (value.length === 0 || value.byteLength === 0);
+          });
+          if (!allBodyKeysAreEmptyBinaries) {
+            _context6.next = 98;
             break;
           }
-          return _context4.abrupt("continue", 48);
-        case 29:
-          _context4.next = 31;
-          return hasNewline(valueStr);
-        case 31:
-          _context4.t3 = !_context4.sent;
-          if (!_context4.t3) {
-            _context4.next = 34;
-            break;
+          if (headerTypes.length > 0) {
+            headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          _context4.t3 = !_key.includes("/");
-        case 34:
-          _context4.t2 = _context4.t3;
-          if (!_context4.t2) {
-            _context4.next = 37;
+          return _context6.abrupt("return", {
+            headers: headers,
+            body: undefined
+          });
+        case 98:
+          if (!(bodyKeys.length === 1)) {
+            _context6.next = 116;
             break;
           }
-          _context4.t2 = Buffer.from(valueStr).byteLength <= MAX_HEADER_LENGTH;
-        case 37:
-          _context4.t1 = _context4.t2;
-          if (!_context4.t1) {
-            _context4.next = 40;
-            break;
+          singleKey = bodyKeys[0];
+          pathParts = singleKey.split("/");
+          value = obj;
+          _iterator4 = _createForOfIteratorHelper(pathParts);
+          try {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              part = _step4.value;
+              if (/^\d+$/.test(part)) {
+                value = value[parseInt(part) - 1];
+              } else {
+                value = value[part];
+              }
+            }
+          } catch (err) {
+            _iterator4.e(err);
+          } finally {
+            _iterator4.f();
           }
-          _context4.t1 = !isPojo(_value);
-        case 40:
-          _context4.t0 = _context4.t1;
-          if (!_context4.t0) {
-            _context4.next = 43;
+          otherFieldsAreEmpty = Object.entries(obj).every(function (_ref5) {
+            var _ref6 = _slicedToArray(_ref5, 2),
+              key = _ref6[0],
+              val = _ref6[1];
+            if (key === singleKey) return true;
+            return Array.isArray(val) && val.length === 0 || isPojo(val) && Object.keys(val).length === 0 || isBytes(val) && (val.length === 0 || val.byteLength === 0) || typeof val === "string" && val.length === 0;
+          });
+          if (!(otherFieldsAreEmpty && isBytes(value) && value.length > 0)) {
+            _context6.next = 116;
             break;
           }
-          _context4.t0 = !(_key === "data" || _key === "body");
-        case 43:
-          if (!_context4.t0) {
-            _context4.next = 47;
-            break;
+          _bodyBuffer2 = toBuffer(value);
+          _bodyArrayBuffer2 = _bodyBuffer2.buffer.slice(_bodyBuffer2.byteOffset, _bodyBuffer2.byteOffset + _bodyBuffer2.byteLength);
+          _context6.next = 110;
+          return sha256(_bodyArrayBuffer2);
+        case 110:
+          _contentDigest4 = _context6.sent;
+          _base4 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest4));
+          headers["content-digest"] = "sha-256=:".concat(_base4, ":");
+          if (singleKey !== "body") {
+            headers["inline-body-key"] = singleKey;
           }
-          if (typeof _value === "number") {
-            headers[_key] = String(_value);
-          } else if (typeof _value === "boolean") {
-            headers[_key] = "\"".concat(_value, "\"");
-          } else if (_value === "[]" && type === "empty_list") {
-            headers[_key] = "[]";
-          } else if (_value === '"null"' || _value === '"undefined"') {
-            headers[_key] = _value;
-          } else {
-            headers[_key] = _value;
+          if (headerTypes.length > 0) {
+            headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          _context4.next = 48;
-          break;
-        case 47:
-          bodyKeys.push(_key);
-        case 48:
-          _i6++;
-          _context4.next = 12;
-          break;
-        case 51:
-          _context4.next = 54;
-          break;
-        case 53:
-          bodyKeys.push(path);
-        case 54:
-          _i5++;
-          _context4.next = 8;
-          break;
-        case 57:
-          console.log("[encode] Headers before filtering:", headers, "BodyKeys:", bodyKeys);
-          bodyKeys.sort();
+          return _context6.abrupt("return", {
+            headers: headers,
+            body: value
+          });
+        case 116:
+          // Sort body keys: main array comes first, then element parts by index
+          sortedBodyKeys = bodyKeys.sort(function (a, b) {
+            var aIsArrayElement = /\/\d+$/.test(a);
+            var bIsArrayElement = /\/\d+$/.test(b);
+            var aBase = a.split("/")[0];
+            var bBase = b.split("/")[0];
 
-          // Add types for values in headers
-          for (_i7 = 0, _Object$entries7 = Object.entries(headers); _i7 < _Object$entries7.length; _i7++) {
-            _Object$entries7$_i = _slicedToArray(_Object$entries7[_i7], 2), _key2 = _Object$entries7$_i[0], _value2 = _Object$entries7$_i[1];
-            _type = types[_key2];
-            if (_type) {
-              headerTypes.push("".concat(_key2, "=\"").concat(_type, "\""));
+            // If both are for the same array
+            if (aBase === bBase) {
+              // Main array comes before element parts
+              if (!aIsArrayElement && bIsArrayElement) {
+                return -1; // main array comes first
+              }
+              if (aIsArrayElement && !bIsArrayElement) {
+                return 1; // element parts come after
+              }
+              // Both are elements - sort by index
+              if (aIsArrayElement && bIsArrayElement) {
+                var aIndex = parseInt(a.split("/")[1]);
+                var bIndex = parseInt(b.split("/")[1]);
+                return aIndex - bIndex;
+              }
+              return a.localeCompare(b);
             }
-          }
 
-          // Add types for empty values not in headers
-          for (_i8 = 0, _Object$entries8 = Object.entries(types); _i8 < _Object$entries8.length; _i8++) {
-            _Object$entries8$_i = _slicedToArray(_Object$entries8[_i8], 2), _key3 = _Object$entries8$_i[0], _type2 = _Object$entries8$_i[1];
-            if (!_key3.includes("/") && _type2.startsWith("empty") && !headers[_key3]) {
-              headerTypes.push("".concat(_key3, "=\"").concat(_type2.replace("empty_", "empty-"), "\""));
+            // Different arrays, sort by base name
+            return a.localeCompare(b);
+          }); // Check if we have the special case where data contains body with bytes and body contains data with bytes
+          hasSpecialDataBody = sortedBodyKeys.includes("data") && sortedBodyKeys.includes("body") && obj.data && obj.data.body && isBytes(obj.data.body) && obj.body && obj.body.data && isBytes(obj.body.data);
+          headers["body-keys"] = sortedBodyKeys.map(function (k) {
+            return "\"".concat(k, "\"");
+          }).join(", ");
+          if (!hasSpecialDataBody) {
+            if (sortedBodyKeys.includes("body") && sortedBodyKeys.length === 1) {
+              headers["inline-body-key"] = "body";
             }
           }
           if (headerTypes.length > 0) {
             headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          if (!(bodyKeys.length > 0)) {
-            _context4.next = 185;
-            break;
-          }
-          headers["body-keys"] = encode_body_keys(bodyKeys);
-          if (bodyKeys.includes("data") || bodyKeys.includes("body")) {
-            inlineKey = bodyKeys.find(function (k) {
-              return k === "data" || k === "body";
-            });
-            headers["inline-body-key"] = inlineKey;
-          }
+          bodyParts = [];
+          _iterator5 = _createForOfIteratorHelper(sortedBodyKeys);
+          _context6.prev = 123;
+          _loop5 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop5() {
+            var bodyKey, lines, pathParts, value, parent, _i11, _part, _buffer, headerText, hasOnlyEmptyElements, hasOnlyNonEmptyObjects, hasOnlyEmptyObjects, hasObjects, hasArrays, nonObjectItems, _fieldLines, _partTypes, _isInline, orderedLines, _orderedLines, isLastBodyPart, hasOnlyTypes, indicesWithOwnParts, hasNestedObjectParts, fieldLines, partTypes, hasEmptyStrings, hasEmptyObjects, hasObjectsWithOnlyEmptyValues, isMixedArray, _isInline2, _orderedLines2, _iterator6, _step6, line, _orderedLines3, _iterator7, _step7, _line, isInline, content;
+            return _regeneratorRuntime().wrap(function _loop5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
+                case 0:
+                  bodyKey = _step5.value;
+                  console.log("\n[Body part] Processing bodyKey: ".concat(bodyKey));
+                  lines = [];
+                  pathParts = bodyKey.split("/");
+                  value = obj;
+                  parent = null;
+                  for (_i11 = 0; _i11 < pathParts.length; _i11++) {
+                    parent = value;
+                    _part = pathParts[_i11];
+                    if (/^\d+$/.test(_part)) {
+                      value = value[parseInt(_part) - 1];
+                    } else {
+                      value = value[_part];
+                    }
+                  }
+                  console.log("[Body part] Value at ".concat(bodyKey, ":"), JSON.stringify(value));
 
-          // Create multipart body parts
-          _iterator = _createForOfIteratorHelper(bodyKeys);
-          _context4.prev = 66;
-          _iterator.s();
-        case 68:
-          if ((_step = _iterator.n()).done) {
-            _context4.next = 133;
-            break;
-          }
-          _path = _step.value;
-          console.log("[encode] Processing bodyKey: ".concat(_path));
+                  // Special handling for empty strings in arrays
+                  if (!(typeof value === "string" && value === "" && pathParts.length > 1)) {
+                    _context5.next = 15;
+                    break;
+                  }
+                  console.log("[Body part] Creating part for empty string at ".concat(bodyKey));
+                  lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+                  lines.push("");
+                  lines.push("");
+                  bodyParts.push(new Blob([lines.join("\r\n")]));
+                  return _context5.abrupt("return", 0);
+                case 15:
+                  if (!isBytes(value)) {
+                    _context5.next = 22;
+                    break;
+                  }
+                  console.log("[Body part] Creating part for binary at ".concat(bodyKey));
+                  lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+                  _buffer = toBuffer(value);
+                  headerText = lines.join("\r\n") + "\r\n\r\n";
+                  bodyParts.push(new Blob([headerText, _buffer]));
+                  return _context5.abrupt("return", 0);
+                case 22:
+                  if (!Array.isArray(value)) {
+                    _context5.next = 52;
+                    break;
+                  }
+                  hasOnlyEmptyElements = value.length > 0 && value.every(function (item) {
+                    return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+                  });
+                  hasOnlyNonEmptyObjects = value.length > 0 && value.every(function (item) {
+                    return isPojo(item) && Object.keys(item).length > 0;
+                  });
+                  hasOnlyEmptyObjects = value.length > 0 && value.every(function (item) {
+                    return isPojo(item) && Object.keys(item).length === 0;
+                  });
+                  hasObjects = value.some(function (item) {
+                    return isPojo(item);
+                  });
+                  hasArrays = value.some(function (item) {
+                    return Array.isArray(item);
+                  });
+                  nonObjectItems = value.map(function (item, index) {
+                    return {
+                      item: item,
+                      index: index + 1
+                    };
+                  }).filter(function (_ref7) {
+                    var item = _ref7.item;
+                    return !isPojo(item);
+                  });
+                  if (!hasOnlyNonEmptyObjects) {
+                    _context5.next = 31;
+                    break;
+                  }
+                  return _context5.abrupt("return", 0);
+                case 31:
+                  if (!hasOnlyEmptyElements) {
+                    _context5.next = 38;
+                    break;
+                  }
+                  _fieldLines = [];
+                  _partTypes = []; // Process items for type information
+                  value.forEach(function (item, idx) {
+                    var index = idx + 1;
+                    if (Array.isArray(item) && item.length === 0) {
+                      _partTypes.push("".concat(index, "=\"empty-list\""));
+                    } else if (isPojo(item) && Object.keys(item).length === 0) {
+                      _partTypes.push("".concat(index, "=\"empty-message\""));
+                    } else if (typeof item === "string" && item === "") {
+                      _partTypes.push("".concat(index, "=\"empty-binary\""));
+                    }
+                  });
+                  _isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
+                  if (_isInline) {
+                    orderedLines = [];
+                    if (_partTypes.length > 0) {
+                      orderedLines.push("ao-types: ".concat(_partTypes.sort(function (a, b) {
+                        var aNum = parseInt(a.split("=")[0]);
+                        var bNum = parseInt(b.split("=")[0]);
+                        return aNum - bNum;
+                      }).join(", ")));
+                    }
+                    orderedLines.push("content-disposition: inline");
+                    orderedLines.push("");
+                    bodyParts.push(new Blob([orderedLines.join("\r\n")]));
+                  } else {
+                    _orderedLines = [];
+                    if (_partTypes.length > 0) {
+                      _orderedLines.push("ao-types: ".concat(_partTypes.sort(function (a, b) {
+                        var aNum = parseInt(a.split("=")[0]);
+                        var bNum = parseInt(b.split("=")[0]);
+                        return aNum - bNum;
+                      }).join(", ")));
+                    }
+                    _orderedLines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
 
-          // Handle root-level fields
-          if (_path.includes("/")) {
-            _context4.next = 94;
-            break;
-          }
-          // This is a root-level field
-          fieldValue = parts[""] && parts[""][_path];
-          console.log("[encode] Root field ".concat(_path, " value:"), fieldValue);
-          if (!(fieldValue !== undefined)) {
-            _context4.next = 94;
-            break;
-          }
-          if (!isBytes(fieldValue)) {
-            _context4.next = 84;
-            break;
-          }
-          // Binary field - create a simple multipart section
-          // The format should be:
-          // content-disposition: form-data;name="fieldname"
-          // [empty line]
-          // [binary data]
-          headerStr = "content-disposition: form-data;name=\"".concat(_path, "\"\r\n\r\n");
-          headerBlob = new Blob([headerStr]);
-          dataBlob = new Blob([fieldValue]);
-          bodyParts.push(new Blob([headerBlob, dataBlob]));
-          console.log("[encode] Added binary field ".concat(_path, " to bodyParts"));
-          return _context4.abrupt("continue", 131);
-        case 84:
-          // Non-binary root field that needs to go in body
-          _lines = []; // Check if this is an inline key
-          _isInlineKey = _path === "data" || _path === "body";
-          if (_isInlineKey) {
-            _lines.push("content-disposition: inline");
-          } else {
-            _lines.push("content-disposition: form-data;name=\"".concat(_path, "\""));
-          }
+                    // Check if this is the last body part
+                    isLastBodyPart = sortedBodyKeys.indexOf(bodyKey) === sortedBodyKeys.length - 1;
+                    hasOnlyTypes = _partTypes.length > 0 && _fieldLines.length === 0;
+                    if (isLastBodyPart && hasOnlyTypes) {
+                      // Don't add empty line for last part with only types
+                      bodyParts.push(new Blob([_orderedLines.join("\r\n")]));
+                    } else {
+                      _orderedLines.push("");
+                      bodyParts.push(new Blob([_orderedLines.join("\r\n")]));
+                    }
+                  }
+                  return _context5.abrupt("return", 0);
+                case 38:
+                  // Build list of which indices have their own parts
+                  indicesWithOwnParts = new Set();
+                  sortedBodyKeys.forEach(function (key) {
+                    if (key.startsWith(bodyKey + "/")) {
+                      var subPath = key.substring(bodyKey.length + 1);
+                      var match = subPath.match(/^(\d+)/);
+                      if (match) {
+                        indicesWithOwnParts.add(parseInt(match[1]));
+                      }
+                    }
+                  });
 
-          // Add the field type if available
-          _type3 = types[_path];
-          if (_type3) {
-            _lines.push("ao-types: ".concat(_path, "=\"").concat(_type3, "\""));
-          }
+                  // Check if this array contains sub-arrays with objects that have their own parts
+                  hasNestedObjectParts = sortedBodyKeys.some(function (key) {
+                    return key.startsWith(bodyKey + "/") && key.split("/").length > pathParts.length + 1;
+                  });
+                  fieldLines = [];
+                  partTypes = []; // For arrays that contain sub-arrays with objects, we need to add type info for the sub-arrays
+                  if (hasNestedObjectParts) {
+                    value.forEach(function (item, idx) {
+                      var index = idx + 1;
+                      if (Array.isArray(item)) {
+                        partTypes.push("".concat(index, "=\"list\""));
+                      }
+                    });
+                  }
 
-          // Add empty line before content
-          _lines.push("");
+                  // Check if this array has mixed content with empty strings/objects
+                  hasEmptyStrings = value.some(function (item) {
+                    return typeof item === "string" && item === "";
+                  });
+                  hasEmptyObjects = value.some(function (item) {
+                    return isPojo(item) && Object.keys(item).length === 0;
+                  }); // Check if we have objects with only empty values (like {empty: ""})
+                  hasObjectsWithOnlyEmptyValues = value.some(function (item) {
+                    if (!isPojo(item) || Object.keys(item).length === 0) return false;
+                    return Object.values(item).every(function (v) {
+                      return typeof v === "string" && v === "" || Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
+                    });
+                  });
+                  isMixedArray = hasObjects && (hasEmptyStrings || hasEmptyObjects) && !hasObjectsWithOnlyEmptyValues; // Process ALL items for type information
+                  value.forEach(function (item, idx) {
+                    var index = idx + 1;
 
-          // Add the actual value
-          _lines.push(String(fieldValue));
-          bodyParts.push(new Blob([_lines.join("\r\n")]));
-          console.log("[encode] Added non-binary field ".concat(_path, " to bodyParts"));
-          return _context4.abrupt("continue", 131);
-        case 94:
-          // Handle nested paths
-          _content = parts[_path];
-          if (_content) {
-            _context4.next = 98;
-            break;
-          }
-          console.log("[encode] No content found for path: ".concat(_path));
-          return _context4.abrupt("continue", 131);
-        case 98:
-          lines = [];
-          binaryParts = [];
-          isInlineKey = (_path === "data" || _path === "body") && !_path.includes("/");
-          sortedKeys = Object.keys(_content).sort(); // Collect ao-types for this part
-          partTypes = [];
-          _iterator3 = _createForOfIteratorHelper(sortedKeys);
-          try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              _key4 = _step3.value;
-              fullPath = _path ? "".concat(_path, "/").concat(_key4) : _key4;
-              _type4 = types[fullPath];
-              if (_type4) {
-                partTypes.push("".concat(_key4, "=\"").concat(_type4, "\""));
-              }
-            }
-          } catch (err) {
-            _iterator3.e(err);
-          } finally {
-            _iterator3.f();
-          }
-          if (partTypes.length > 0) {
-            lines.push("ao-types: ".concat(partTypes.sort().join(", ")));
-          }
-          if (isInlineKey) {
-            lines.push("content-disposition: inline");
-          } else {
-            lines.push("content-disposition: form-data;name=\"".concat(_path, "\""));
-          }
+                    // Skip type info for elements that have their own parts
+                    if (indicesWithOwnParts.has(index)) {
+                      return;
+                    }
 
-          // Add content fields
-          _iterator4 = _createForOfIteratorHelper(sortedKeys);
-          _context4.prev = 108;
-          _iterator4.s();
-        case 110:
-          if ((_step4 = _iterator4.n()).done) {
-            _context4.next = 122;
-            break;
-          }
-          _key5 = _step4.value;
-          _value3 = _content[_key5];
-          _fullPath = _path ? "".concat(_path, "/").concat(_key5) : _key5;
-          _type5 = types[_fullPath];
-          if (!(_type5 === "empty-message" || _type5 === "empty-list" || _type5 === "empty-binary")) {
-            _context4.next = 117;
-            break;
-          }
-          return _context4.abrupt("continue", 120);
-        case 117:
-          if (!((_value3 === "[]" || _value3 === "{}" || _value3 === "") && _type5 && _type5.startsWith("empty"))) {
-            _context4.next = 119;
-            break;
-          }
-          return _context4.abrupt("continue", 120);
-        case 119:
-          if (isBytes(_value3)) {
-            binaryParts.push({
-              key: _key5,
-              value: _value3
-            });
-          } else if (_type5 === "atom" && typeof _value3 === "boolean") {
-            lines.push("".concat(_key5, ": \"").concat(_value3, "\""));
-          } else if (_typeof(_value3) === "symbol") {
-            // Handle Symbol values
-            symbolValue = _value3.description || "symbol";
-            lines.push("".concat(_key5, ": ").concat(symbolValue));
-          } else {
-            lines.push("".concat(_key5, ": ").concat(_value3));
-          }
-        case 120:
-          _context4.next = 110;
-          break;
-        case 122:
-          _context4.next = 127;
-          break;
-        case 124:
-          _context4.prev = 124;
-          _context4.t4 = _context4["catch"](108);
-          _iterator4.e(_context4.t4);
-        case 127:
-          _context4.prev = 127;
-          _iterator4.f();
-          return _context4.finish(127);
-        case 130:
-          if (lines.length >= 1 || binaryParts.length > 0) {
-            if (binaryParts.length > 0) {
-              allParts = []; // Add text headers first
-              if (lines.length > 0) {
-                allParts.push(lines.join("\r\n"));
-                allParts.push("\r\n");
-              }
+                    // If we have nested object parts and this is an array with objects, skip processing it inline
+                    if (hasNestedObjectParts && Array.isArray(item) && item.some(function (subItem) {
+                      return isPojo(subItem);
+                    })) {
+                      // Type info already added above
+                      return;
+                    }
+
+                    // For all arrays (not just mixed ones), we need to process all items
+                    if (typeof item === "string" && item === "") {
+                      // Empty strings get type annotation but no field line
+                      partTypes.push("".concat(index, "=\"empty-binary\""));
+                    } else if (isPojo(item) && Object.keys(item).length === 0) {
+                      // Empty objects don't get field lines but do get type annotations
+                      partTypes.push("".concat(index, "=\"empty-message\""));
+                    } else if (isPojo(item)) {
+                      // Non-empty objects might have parts
+                    } else if (Array.isArray(item)) {
+                      if (item.length === 0) {
+                        // Empty arrays don't get field lines but do get type annotations
+                        partTypes.push("".concat(index, "=\"empty-list\""));
+                      } else {
+                        partTypes.push("".concat(index, "=\"list\""));
+                        // Encode array
+                        var encodedItems = item.map(function (subItem) {
+                          if (typeof subItem === "number") {
+                            if (Number.isInteger(subItem)) {
+                              return "\"(ao-type-integer) ".concat(subItem, "\"");
+                            } else {
+                              return "\"(ao-type-float) ".concat(formatFloat(subItem), "\"");
+                            }
+                          } else if (typeof subItem === "string") {
+                            return "\"".concat(subItem, "\"");
+                          } else if (subItem === null) {
+                            return "\"(ao-type-atom) \\\"null\\\"\"";
+                          } else if (subItem === undefined) {
+                            return "\"(ao-type-atom) \\\"undefined\\\"\"";
+                          } else if (_typeof(subItem) === "symbol") {
+                            var desc = subItem.description || "Symbol.for()";
+                            return "\"(ao-type-atom) \\\"".concat(desc, "\\\"\"");
+                          } else if (typeof subItem === "boolean") {
+                            return "\"(ao-type-atom) \\\"".concat(subItem, "\\\"\"");
+                          } else if (Array.isArray(subItem)) {
+                            // Use the full encodeArrayItem for nested arrays
+                            return encodeArrayItem(subItem);
+                          } else if (isBytes(subItem)) {
+                            var _buffer2 = toBuffer(subItem);
+                            if (_buffer2.length === 0 || _buffer2.byteLength === 0) {
+                              return "\"\"";
+                            }
+                            return "\"(ao-type-binary)\"";
+                          } else if (isPojo(subItem)) {
+                            var json = JSON.stringify(subItem);
+                            var escaped = json.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+                            return "\"(ao-type-map) ".concat(escaped, "\"");
+                          } else {
+                            return "\"".concat(String(subItem), "\"");
+                          }
+                        }).join(", ");
+                        fieldLines.push("".concat(index, ": ").concat(encodedItems));
+                      }
+                    } else if (typeof item === "number") {
+                      if (Number.isInteger(item)) {
+                        partTypes.push("".concat(index, "=\"integer\""));
+                        fieldLines.push("".concat(index, ": ").concat(item));
+                      } else {
+                        partTypes.push("".concat(index, "=\"float\""));
+                        fieldLines.push("".concat(index, ": ").concat(formatFloat(item)));
+                      }
+                    } else if (typeof item === "string") {
+                      // Non-empty strings just get field lines, no type annotation
+                      fieldLines.push("".concat(index, ": ").concat(item));
+                    } else if (item === null || item === undefined || _typeof(item) === "symbol" || typeof item === "boolean") {
+                      partTypes.push("".concat(index, "=\"atom\""));
+                      if (item === null) {
+                        fieldLines.push("".concat(index, ": null"));
+                      } else if (item === undefined) {
+                        fieldLines.push("".concat(index, ": undefined"));
+                      } else if (_typeof(item) === "symbol") {
+                        var desc = item.description || "Symbol.for()";
+                        fieldLines.push("".concat(index, ": ").concat(desc));
+                      } else {
+                        fieldLines.push("".concat(index, ": ").concat(item));
+                      }
+                    } else if (isBytes(item)) {
+                      var _buffer3 = toBuffer(item);
+                      if (_buffer3.length === 0) {
+                        partTypes.push("".concat(index, "=\"empty-binary\""));
+                      } else {
+                        partTypes.push("".concat(index, "=\"binary\""));
+                      }
+                    }
+                  });
+                  _isInline2 = bodyKey === "body" && headers["inline-body-key"] === "body";
+                  if (_isInline2) {
+                    _orderedLines2 = [];
+                    if (partTypes.length > 0) {
+                      _orderedLines2.push("ao-types: ".concat(partTypes.sort(function (a, b) {
+                        var aNum = parseInt(a.split("=")[0]);
+                        var bNum = parseInt(b.split("=")[0]);
+                        return aNum - bNum;
+                      }).join(", ")));
+                    }
+                    _orderedLines2.push("content-disposition: inline");
+                    if (fieldLines.length > 0) {
+                      _orderedLines2.push("");
+                      _iterator6 = _createForOfIteratorHelper(fieldLines);
+                      try {
+                        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                          line = _step6.value;
+                          _orderedLines2.push(line);
+                        }
+                      } catch (err) {
+                        _iterator6.e(err);
+                      } finally {
+                        _iterator6.f();
+                      }
+                    }
+                    bodyParts.push(new Blob([_orderedLines2.join("\r\n") + "\r\n"]));
+                  } else {
+                    // Put ao-types first, then content-disposition, then field lines
+                    _orderedLines3 = [];
+                    if (partTypes.length > 0) {
+                      _orderedLines3.push("ao-types: ".concat(partTypes.sort(function (a, b) {
+                        var aNum = parseInt(a.split("=")[0]);
+                        var bNum = parseInt(b.split("=")[0]);
+                        return aNum - bNum;
+                      }).join(", ")));
+                    }
+                    _orderedLines3.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+
+                    // Add field lines directly without blank line
+                    _iterator7 = _createForOfIteratorHelper(fieldLines);
+                    try {
+                      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                        _line = _step7.value;
+                        _orderedLines3.push(_line);
+                      }
 
-              // Add binary data
-              _iterator5 = _createForOfIteratorHelper(binaryParts);
-              try {
-                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                  binaryPart = _step5.value;
-                  allParts.push("".concat(binaryPart.key, ": "));
-                  allParts.push(binaryPart.value);
-                  if (binaryParts.indexOf(binaryPart) < binaryParts.length - 1) {
-                    allParts.push("\r\n");
+                      // Add trailing blank line if we have field lines
+                    } catch (err) {
+                      _iterator7.e(err);
+                    } finally {
+                      _iterator7.f();
+                    }
+                    if (fieldLines.length > 0) {
+                      bodyParts.push(new Blob([_orderedLines3.join("\r\n") + "\r\n"]));
+                    } else {
+                      bodyParts.push(new Blob([_orderedLines3.join("\r\n")]));
+                    }
                   }
-                }
-              } catch (err) {
-                _iterator5.e(err);
-              } finally {
-                _iterator5.f();
+                  return _context5.abrupt("return", 0);
+                case 52:
+                  // This should not be reached for binary values as they're handled above
+                  isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
+                  if (isInline) {
+                    lines.push("content-disposition: inline");
+                  } else {
+                    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+                  }
+                  if (typeof value === "string") {
+                    lines.push("");
+                    lines.push(value);
+                    bodyParts.push(new Blob([lines.join("\r\n")]));
+                  } else if (typeof value === "boolean" || typeof value === "number" || value === null || value === undefined || _typeof(value) === "symbol") {
+                    if (typeof value === "boolean") {
+                      content = "\"".concat(value, "\"");
+                    } else if (typeof value === "number") {
+                      content = String(value);
+                    } else if (value === null) {
+                      content = '"null"';
+                    } else if (value === undefined) {
+                      content = '"undefined"';
+                    } else if (_typeof(value) === "symbol") {
+                      content = "\"".concat(value.description || "Symbol.for()", "\"");
+                    }
+                    lines.push("");
+                    lines.push(content);
+                    bodyParts.push(new Blob([lines.join("\r\n")]));
+                  }
+                case 55:
+                case "end":
+                  return _context5.stop();
               }
-              bodyParts.push(new Blob(allParts));
-            } else {
-              bodyParts.push(new Blob([lines.join("\r\n")]));
-            }
+            }, _loop5);
+          });
+          _iterator5.s();
+        case 126:
+          if ((_step5 = _iterator5.n()).done) {
+            _context6.next = 133;
+            break;
+          }
+          return _context6.delegateYield(_loop5(), "t2", 128);
+        case 128:
+          _ret = _context6.t2;
+          if (!(_ret === 0)) {
+            _context6.next = 131;
+            break;
           }
+          return _context6.abrupt("continue", 131);
         case 131:
-          _context4.next = 68;
+          _context6.next = 126;
           break;
         case 133:
-          _context4.next = 138;
+          _context6.next = 138;
           break;
         case 135:
-          _context4.prev = 135;
-          _context4.t5 = _context4["catch"](66);
-          _iterator.e(_context4.t5);
+          _context6.prev = 135;
+          _context6.t3 = _context6["catch"](123);
+          _iterator5.e(_context6.t3);
         case 138:
-          _context4.prev = 138;
-          _iterator.f();
-          return _context4.finish(138);
+          _context6.prev = 138;
+          _iterator5.f();
+          return _context6.finish(138);
         case 141:
-          console.log("[encode] Total bodyParts: ".concat(bodyParts.length));
-
-          // Create boundary based on parts content
-          partsForBoundary = [];
-          _iterator2 = _createForOfIteratorHelper(bodyParts);
-          _context4.prev = 144;
-          _iterator2.s();
-        case 146:
-          if ((_step2 = _iterator2.n()).done) {
-            _context4.next = 154;
-            break;
+          // Add the special data/body part if needed
+          if (hasSpecialDataBody && obj.data && obj.data.body && isBytes(obj.data.body)) {
+            buffer = toBuffer(obj.data.body);
+            specialPart = ["content-disposition: form-data;name=\"data/body\"", "", ""].join("\r\n");
+            bodyParts.push(new Blob([specialPart, buffer]));
           }
-          part = _step2.value;
-          _context4.next = 150;
-          return part.text();
-        case 150:
-          partContent = _context4.sent;
-          partsForBoundary.push(partContent);
-        case 152:
-          _context4.next = 146;
-          break;
-        case 154:
-          _context4.next = 159;
-          break;
-        case 156:
-          _context4.prev = 156;
-          _context4.t6 = _context4["catch"](144);
-          _iterator2.e(_context4.t6);
-        case 159:
-          _context4.prev = 159;
-          _iterator2.f();
-          return _context4.finish(159);
-        case 162:
-          allPartsContent = partsForBoundary.join("");
-          console.log("[encode] All parts content length: ".concat(allPartsContent.length));
-          allPartsBuffer = Buffer.from(allPartsContent);
-          _context4.next = 167;
-          return sha256(allPartsBuffer.buffer.slice(allPartsBuffer.byteOffset, allPartsBuffer.byteOffset + allPartsBuffer.byteLength));
-        case 167:
-          hashResult = _context4.sent;
-          boundary = _base64url["default"].encode(Buffer.from(hashResult)); // Create final multipart body
+          _context6.next = 144;
+          return Promise.all(bodyParts.map(function (part) {
+            return part.text();
+          }));
+        case 144:
+          partsContent = _context6.sent;
+          allContent = partsContent.join("");
+          _context6.next = 148;
+          return sha256(new TextEncoder().encode(allContent));
+        case 148:
+          boundaryHash = _context6.sent;
+          boundary = _base64url["default"].encode(Buffer.from(boundaryHash));
           finalParts = [];
           for (i = 0; i < bodyParts.length; i++) {
-            finalParts.push("--".concat(boundary));
-            finalParts.push("\r\n");
-            finalParts.push(bodyParts[i]);
-            if (i < bodyParts.length - 1) {
-              finalParts.push("\r\n");
+            if (i === 0) {
+              finalParts.push(new Blob(["--".concat(boundary, "\r\n")]));
+            } else {
+              finalParts.push(new Blob(["\r\n--".concat(boundary, "\r\n")]));
             }
+            finalParts.push(bodyParts[i]);
           }
-          finalParts.push("\r\n--".concat(boundary, "--"));
+          finalParts.push(new Blob(["\r\n--".concat(boundary, "--")]));
           headers["content-type"] = "multipart/form-data; boundary=\"".concat(boundary, "\"");
           body = new Blob(finalParts);
-          _context4.next = 176;
+          _context6.next = 157;
           return body.arrayBuffer();
-        case 176:
-          finalContent = _context4.sent;
-          _context4.next = 179;
+        case 157:
+          finalContent = _context6.sent;
+          if (!(finalContent.byteLength > 0)) {
+            _context6.next = 164;
+            break;
+          }
+          _context6.next = 161;
           return sha256(finalContent);
-        case 179:
-          contentDigest = _context4.sent;
-          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
-          headers["content-digest"] = "sha-256=:".concat(base64, ":");
+        case 161:
+          _contentDigest5 = _context6.sent;
+          _base5 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest5));
+          headers["content-digest"] = "sha-256=:".concat(_base5, ":");
+        case 164:
           headers["content-length"] = String(finalContent.byteLength);
-          console.log("[encode] FINAL - headers:", headers, "body:", body);
-          return _context4.abrupt("return", {
+          console.log("=== ENCODE END ===\n");
+          return _context6.abrupt("return", {
             headers: headers,
             body: body
           });
-        case 185:
-          console.log("[encode] FINAL - headers:", headers, "body:", undefined);
-          return _context4.abrupt("return", {
-            headers: headers,
-            body: undefined
-          });
-        case 187:
+        case 167:
         case "end":
-          return _context4.stop();
+          return _context6.stop();
       }
-    }, _callee4, null, [[66, 135, 138, 141], [108, 124, 127, 130], [144, 156, 159, 162]]);
+    }, _callee3, null, [[123, 135, 138, 141]]);
   }));
-  return _encodeMultipart.apply(this, arguments);
+  return _encode.apply(this, arguments);
 }
-function enc(_x4) {
+function enc(_x3) {
   return _enc.apply(this, arguments);
 }
 function _enc() {
-  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(fields) {
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(fields) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          _context5.next = 2;
+          _context7.next = 2;
           return encode(fields);
         case 2:
-          return _context5.abrupt("return", _context5.sent);
+          return _context7.abrupt("return", _context7.sent);
         case 3:
         case "end":
-          return _context5.stop();
+          return _context7.stop();
       }
-    }, _callee5);
+    }, _callee4);
   }));
   return _enc.apply(this, arguments);
 }