wao 0.27.0 → 0.27.1

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,237 @@ 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) {
+  // Format float in scientific notation with proper padding
+  var exp = num.toExponential(20);
+  // Replace "1.23e+0" with "1.23e+00"
+  exp = exp.replace(/e\+(\d)$/, "e+0$1");
+  exp = exp.replace(/e-(\d)$/, "e-0$1");
+  return exp;
+}
+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)) {
+    // Nested array
+    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 (_typeof(nestedItem) === "symbol") {
+        var _desc = nestedItem.description || "Symbol.for()";
+        return "\\\"(ao-type-atom) \\\\\\\"".concat(_desc, "\\\\\\\"\\\"");
       } 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)) {
+    // For empty binaries in arrays, return empty string
+    var buffer = toBuffer(item);
+    if (buffer.length === 0 || buffer.byteLength === 0) {
+      return "\"\"";
+    }
+    // For non-empty binaries, we can't include them in headers
+    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 needsOwnBodyPart(value) {
+  if (Array.isArray(value)) return true;
+  if (isBytes(value)) return true;
+  if (isPojo(value)) {
+    // Check if object has complex fields
+    return Object.values(value).some(function (v) {
+      return Array.isArray(v) || isPojo(v) || isBytes(v) || v === null || v === undefined || _typeof(v) === "symbol";
+    });
+  }
+  return false;
+}
+function collectBodyKeys(obj) {
+  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+  var keys = [];
+  function traverse(current, path) {
+    // Track if current level has simple fields or empty objects
+    var hasSimpleFields = false;
+    // Track nested paths that need body parts
+    var nestedPaths = [];
+    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)) {
         var hasObjects = value.some(function (item) {
           return isPojo(item);
         });
+        var hasNonObjects = value.some(function (item) {
+          return !isPojo(item);
+        });
         if (hasObjects) {
-          // Arrays with objects: create separate parts for each indexed item
-          types[currentPath] = "list";
+          // Each object in array gets its own key
           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;
-
-                // 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";
-                }
-              }
-            } 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";
-              }
+              nestedPaths.push("".concat(fullPath, "/").concat(index + 1));
             }
           });
+
+          // If array ALSO has non-object items, it needs its own body part
+          if (hasNonObjects) {
+            hasSimpleFields = true;
+          }
+        } else {
+          // Simple array - parent needs body part
+          hasSimpleFields = true;
+        }
+      } else if (isPojo(value)) {
+        // Check if this is an empty object
+        if (Object.keys(value).length === 0) {
+          // Empty objects need a body part
+          hasSimpleFields = true;
         } 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";
+          // Non-empty objects are processed recursively
+          nestedPaths.push(fullPath);
         }
+      } else if (isBytes(value)) {
+        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] = "{}";
-      } 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;
-        });
-        if (hasOnlyEmptyChildren) {
-          if (!parts[currentPath]) parts[currentPath] = {};
+    };
+    for (var _i = 0, _Object$entries = Object.entries(current); _i < _Object$entries.length; _i++) {
+      _loop();
+    }
+
+    // Add current path if it has simple fields or empty objects
+    if (hasSimpleFields) {
+      keys.push(path);
+    }
+
+    // Process nested paths
+    for (var _i2 = 0, _nestedPaths = nestedPaths; _i2 < _nestedPaths.length; _i2++) {
+      var nestedPath = _nestedPaths[_i2];
+      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];
+          }
         }
-        collectParts(value, currentPath, parts, types);
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
-    } 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";
+      if (isPojo(nestedObj)) {
+        traverse(nestedObj, nestedPath);
       }
     }
-  };
-  for (var _i = 0, _Object$entries = Object.entries(obj); _i < _Object$entries.length; _i++) {
-    _loop();
   }
-  return {
-    parts: parts,
-    types: types
+
+  // Handle top-level fields
+  var _loop2 = function _loop2() {
+    var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2),
+      key = _Object$entries2$_i[0],
+      value = _Object$entries2$_i[1];
+    if (Array.isArray(value)) {
+      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);
+      });
+      if (hasObjects) {
+        value.forEach(function (item, index) {
+          if (isPojo(item)) {
+            keys.push("".concat(key, "/").concat(index + 1));
+            // Also need to traverse into nested objects within array items
+            for (var _i4 = 0, _Object$entries3 = Object.entries(item); _i4 < _Object$entries3.length; _i4++) {
+              var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i4], 2),
+                nestedKey = _Object$entries3$_i[0],
+                nestedValue = _Object$entries3$_i[1];
+              if (isPojo(nestedValue)) {
+                keys.push("".concat(key, "/").concat(index + 1, "/").concat(nestedKey));
+              }
+            }
+          }
+        });
+
+        // Mixed arrays also need their own body part
+        if (hasNonObjects) {
+          keys.push(key);
+        }
+      } else if (hasArrays) {
+        // Array containing arrays needs body part
+        keys.push(key);
+      } else {
+        // Simple array at top level - DO NOT add to body keys
+        // It will go in headers instead
+      }
+    } else if (isPojo(value)) {
+      // Top-level object that may have nested structures
+      traverse(value, key);
+    } else if (isBytes(value)) {
+      // All binary data needs body parts, even empty ones
+      keys.push(key);
+    } else if (typeof value === "string" && value.includes("\n")) {
+      // Multiline string
+      keys.push(key);
+    }
   };
+  for (var _i3 = 0, _Object$entries2 = Object.entries(obj); _i3 < _Object$entries2.length; _i3++) {
+    _loop2();
+  }
+  return _toConsumableArray(new Set(keys)).filter(function (k) {
+    return k !== "";
+  });
+}
+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 encode() {
   return _encode.apply(this, arguments);
@@ -331,717 +351,1172 @@ function encode() {
 function _encode() {
   _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var obj,
+      _processValue,
+      processedObj,
+      _i6,
+      _Object$entries5,
+      _Object$entries5$_i,
+      k,
+      v,
+      hasBodyBinary,
+      otherFields,
+      allOthersSimpleOrEmptyBinary,
+      _headers,
+      _headerTypes,
+      _i7,
+      _Object$entries6,
+      _Object$entries6$_i,
+      key,
+      value,
+      encodedItems,
+      bodyBuffer,
+      bodyArrayBuffer,
+      _contentDigest,
+      _base,
       objKeys,
       fieldName,
       binaryData,
+      _headers2,
+      _bodyBuffer,
+      _bodyArrayBuffer,
+      _contentDigest2,
+      _base2,
       headers,
-      bodyBuffer,
-      bodyArrayBuffer,
+      headerTypes,
+      bodyKeys,
+      _loop3,
+      _i8,
+      _Object$entries7,
+      _loop4,
+      _i9,
+      _Object$entries8,
+      allBodyKeysAreEmptyBinaries,
+      sortedBodyKeys,
+      hasSpecialDataBody,
+      inlineKey,
+      bodyParts,
+      _iterator3,
+      _step3,
+      _loop5,
+      _ret,
+      buffer,
+      specialPart,
+      partsContent,
+      allContent,
+      boundaryHash,
+      boundary,
+      finalParts,
+      i,
+      body,
+      finalContent,
       contentDigest,
       base64,
-      _headers,
-      types,
-      needsMultipart,
-      _i3,
-      _Object$entries3,
-      _Object$entries3$_i,
-      key,
-      value,
-      _hbEncodeValue5,
-      _hbEncodeValue6,
-      type,
-      encoded,
-      body,
-      _bodyBuffer,
-      _bodyArrayBuffer,
-      _contentDigest,
-      _base,
-      _args3 = arguments;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+      bodyText,
+      boundaryMatch,
+      debugBoundary,
+      parts,
+      lines,
+      _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] : {};
+          // Convert symbols to strings for logging
+          _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 _i5 = 0, _Object$entries4 = Object.entries(value); _i5 < _Object$entries4.length; _i5++) {
+                var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
+                  k = _Object$entries4$_i[0],
+                  v = _Object$entries4$_i[1];
+                result[k] = _processValue(v);
+              }
+              return result;
+            }
+            return value;
+          };
+          processedObj = {};
+          for (_i6 = 0, _Object$entries5 = Object.entries(obj); _i6 < _Object$entries5.length; _i6++) {
+            _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2), k = _Object$entries5$_i[0], v = _Object$entries5$_i[1];
+            processedObj[k] = _processValue(v);
+          }
+
+          // Remove debug logging for cleaner output
+          console.log("[encode] START with obj:", JSON.stringify(processedObj));
           if (!(Object.keys(obj).length === 0)) {
-            _context3.next = 4;
+            _context6.next = 7;
             break;
           }
-          return _context3.abrupt("return", {
+          return _context6.abrupt("return", {
             headers: {},
             body: undefined
           });
-        case 4:
-          // Check if we have a simple binary field
-          objKeys = Object.keys(obj);
-          if (!(objKeys.length === 1 && isBytes(obj[objKeys[0]]))) {
-            _context3.next = 18;
-            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 7:
+          // Check for special case: body field with binary + other simple fields or empty binaries
+          hasBodyBinary = obj.body && isBytes(obj.body);
+          otherFields = Object.keys(obj).filter(function (k) {
+            return k !== "body";
+          });
+          allOthersSimpleOrEmptyBinary = otherFields.every(function (k) {
+            var v = obj[k];
+            // Allow empty binaries as "simple"
+            if (isBytes(v) && (v.length === 0 || v.byteLength === 0)) return true;
+            return !isBytes(v) && !isPojo(v) && !(Array.isArray(v) && v.some(function (item) {
+              return isPojo(item) || isBytes(item);
+            }));
           });
-        case 18:
-          if (!("body" in obj && isBytes(obj.body))) {
-            _context3.next = 108;
+          if (!(hasBodyBinary && allOthersSimpleOrEmptyBinary)) {
+            _context6.next = 34;
             break;
           }
+          console.log("[encode] Special case: body with binary + simple fields");
+          // Special case: body with binary + other simple fields
           _headers = {};
-          types = [];
-          needsMultipart = false;
-          _i3 = 0, _Object$entries3 = Object.entries(obj);
-        case 23:
-          if (!(_i3 < _Object$entries3.length)) {
-            _context3.next = 95;
+          _headerTypes = []; // Process other fields into headers
+          _i7 = 0, _Object$entries6 = Object.entries(obj);
+        case 15:
+          if (!(_i7 < _Object$entries6.length)) {
+            _context6.next = 24;
             break;
           }
-          _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2), key = _Object$entries3$_i[0], value = _Object$entries3$_i[1];
+          _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2), key = _Object$entries6$_i[0], value = _Object$entries6$_i[1];
           if (!(key === "body")) {
-            _context3.next = 27;
-            break;
-          }
-          return _context3.abrupt("continue", 92);
-        case 27:
-          if (!(value === null)) {
-            _context3.next = 32;
-            break;
-          }
-          _headers[key] = "null";
-          types.push("".concat(key, "=\"atom\""));
-          _context3.next = 92;
-          break;
-        case 32:
-          if (!(value === undefined)) {
-            _context3.next = 37;
-            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;
-            break;
-          }
-          types.push("".concat(key, "=\"empty-binary\""));
-          _context3.next = 92;
-          break;
-        case 41:
-          if (!Array.isArray(value)) {
-            _context3.next = 57;
-            break;
-          }
-          if (!(value.length === 0)) {
-            _context3.next = 46;
+            _context6.next = 19;
             break;
           }
-          types.push("".concat(key, "=\"empty-list\""));
-          _context3.next = 55;
-          break;
-        case 46:
-          if (!value.some(function (item) {
+          return _context6.abrupt("continue", 21);
+        case 19:
+          console.log("[encode] Processing special case field: ".concat(key, " = ").concat(JSON.stringify(value)));
+          if (value === null) {
+            _headers[key] = '"null"';
+            _headerTypes.push("".concat(key, "=\"atom\""));
+          } else if (value === undefined) {
+            _headers[key] = '"undefined"';
+            _headerTypes.push("".concat(key, "=\"atom\""));
+          } else if (typeof value === "boolean") {
+            _headers[key] = "\"".concat(value, "\"");
+            _headerTypes.push("".concat(key, "=\"atom\""));
+          } else if (_typeof(value) === "symbol") {
+            _headers[key] = "\"".concat(value.description || "Symbol.for()", "\"");
+            _headerTypes.push("".concat(key, "=\"atom\""));
+          } else if (typeof value === "number") {
+            _headers[key] = String(value);
+            _headerTypes.push("".concat(key, "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
+          } else if (typeof value === "string") {
+            if (value.length === 0) {
+              // Empty strings only go in ao-types, not as headers
+              console.log("[encode] Adding empty string type for key: ".concat(key));
+              _headerTypes.push("".concat(key, "=\"empty-binary\""));
+            } else {
+              _headers[key] = value;
+            }
+          } else if (Array.isArray(value) && value.length === 0) {
+            // Empty array only goes in ao-types, not as a header
+            _headerTypes.push("".concat(key, "=\"empty-list\""));
+          } else if (Array.isArray(value) && !value.some(function (item) {
             return isPojo(item);
           })) {
-            _context3.next = 52;
-            break;
-          }
-          // Arrays with objects need multipart
-          types.push("".concat(key, "=\"list\""));
-          needsMultipart = true;
-          return _context3.abrupt("break", 95);
-        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;
-          }
-          if (!(value.length === 0 || value.byteLength === 0)) {
-            _context3.next = 62;
-            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;
-        case 66:
-          if (!(typeof value === "boolean")) {
-            _context3.next = 71;
-            break;
-          }
-          _headers[key] = "\"".concat(value, "\"");
-          types.push("".concat(key, "=\"atom\""));
-          _context3.next = 92;
-          break;
-        case 71:
-          if (!(_typeof(value) === "symbol")) {
-            _context3.next = 76;
-            break;
-          }
-          _headers[key] = value.description || "symbol";
-          types.push("".concat(key, "=\"atom\""));
-          _context3.next = 92;
-          break;
-        case 76:
-          if (!(typeof value === "number")) {
-            _context3.next = 81;
-            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;
-            break;
+            encodedItems = value.map(function (item) {
+              return encodeArrayItem(item);
+            }).join(", ");
+            _headers[key] = encodedItems;
+            _headerTypes.push("".concat(key, "=\"list\""));
+          } else if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
+            // Empty binary goes in ao-types only
+            _headerTypes.push("".concat(key, "=\"empty-binary\""));
           }
-          _headers[key] = value;
-          _context3.next = 92;
-          break;
-        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;
-            break;
-          }
-          needsMultipart = true;
-          return _context3.abrupt("break", 95);
-        case 92:
-          _i3++;
-          _context3.next = 23;
+        case 21:
+          _i7++;
+          _context6.next = 15;
           break;
-        case 95:
-          if (!needsMultipart) {
-            _context3.next = 97;
-            break;
-          }
-          return _context3.abrupt("return", encodeMultipart(obj));
-        case 97:
-          if (types.length > 0) {
-            _headers["ao-types"] = types.sort().join(", ");
+        case 24:
+          // Add ao-types if needed
+          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;
+
+          // Set body to binary
+          bodyBuffer = toBuffer(obj.body);
+          bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
+          _context6.next = 29;
+          return sha256(bodyArrayBuffer);
+        case 29:
+          _contentDigest = _context6.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", {
+          console.log("[encode] FINAL (body with binary) - headers:", _headers, "body:", obj.body);
+          return _context6.abrupt("return", {
             headers: _headers,
-            body: body
+            body: obj.body
           });
-        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\""));
-            }
-          }
-          _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;
+        case 34:
+          // Check if single binary field
+          objKeys = Object.keys(obj);
+          if (!(objKeys.length === 1 && isBytes(obj[objKeys[0]]))) {
+            _context6.next = 49;
             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;
+          fieldName = objKeys[0];
+          binaryData = obj[fieldName];
+          _headers2 = {};
+          _bodyBuffer = toBuffer(binaryData);
+          _bodyArrayBuffer = _bodyBuffer.buffer.slice(_bodyBuffer.byteOffset, _bodyBuffer.byteOffset + _bodyBuffer.byteLength);
+          _context6.next = 43;
+          return sha256(_bodyArrayBuffer);
+        case 43:
+          _contentDigest2 = _context6.sent;
+          _base2 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest2));
+          _headers2["content-digest"] = "sha-256=:".concat(_base2, ":");
+
+          // Add inline-body-key header to preserve the field name
+          if (fieldName !== "body") {
+            _headers2["inline-body-key"] = fieldName;
           }
-          length = _value.byteLength || _value.length || 0;
-          if (!(length === 0)) {
-            _context4.next = 21;
+          console.log("[encode] FINAL (simple binary field) - headers:", _headers2, "body:", binaryData);
+          return _context6.abrupt("return", {
+            headers: _headers2,
+            body: binaryData
+          });
+        case 49:
+          // Continue with normal multipart processing
+          headers = {};
+          headerTypes = []; // Collect all body keys
+          bodyKeys = collectBodyKeys(obj); // Process simple header fields AND collect types for body fields
+          _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
+            var _Object$entries7$_i, key, value, needsBody, _encodedItems;
+            return _regeneratorRuntime().wrap(function _loop3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2), key = _Object$entries7$_i[0], value = _Object$entries7$_i[1];
+                  console.log("[encode] Processing field: ".concat(key, " = ").concat(JSON.stringify(value), ", type: ").concat(_typeof(value)));
+                  needsBody = bodyKeys.includes(key) || bodyKeys.some(function (k) {
+                    return k.startsWith("".concat(key, "/"));
+                  });
+                  if (!needsBody) {
+                    console.log("[encode] Field ".concat(key, " doesn't need body, adding to headers"));
+                    // Simple value goes in header
+                    if (value === null) {
+                      headers[key] = '"null"';
+                      headerTypes.push("".concat(key, "=\"atom\""));
+                    } else if (value === undefined) {
+                      headers[key] = '"undefined"';
+                      headerTypes.push("".concat(key, "=\"atom\""));
+                    } else if (typeof value === "boolean") {
+                      headers[key] = "\"".concat(value, "\"");
+                      headerTypes.push("".concat(key, "=\"atom\""));
+                    } else if (_typeof(value) === "symbol") {
+                      headers[key] = "\"".concat(value.description || "Symbol.for()", "\"");
+                      headerTypes.push("".concat(key, "=\"atom\""));
+                    } else if (typeof value === "number") {
+                      headers[key] = String(value);
+                      headerTypes.push("".concat(key, "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
+                    } else if (typeof value === "string") {
+                      if (value.length === 0) {
+                        headerTypes.push("".concat(key, "=\"empty-binary\""));
+                        // Don't add empty strings as headers
+                      } else {
+                        headers[key] = value;
+                      }
+                    } else if (Array.isArray(value) && !value.some(function (item) {
+                      return isPojo(item);
+                    })) {
+                      // Simple array (no objects) goes in header
+                      _encodedItems = value.map(function (item) {
+                        return encodeArrayItem(item);
+                      }).join(", ");
+                      headers[key] = _encodedItems;
+                      headerTypes.push("".concat(key, "=\"list\""));
+                    }
+                  } else {
+                    // Field needs body - still need to add type info to ao-types
+                    if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
+                      headerTypes.push("".concat(key, "=\"empty-binary\""));
+                    } else if (typeof value === "string" && value.length === 0) {
+                      headerTypes.push("".concat(key, "=\"empty-binary\""));
+                    } else if (Array.isArray(value) && value.length === 0) {
+                      headerTypes.push("".concat(key, "=\"empty-list\""));
+                    } else if (isPojo(value) && Object.keys(value).length === 0) {
+                      headerTypes.push("".concat(key, "=\"empty-message\""));
+                    }
+                  }
+                case 4:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _loop3);
+          });
+          _i8 = 0, _Object$entries7 = Object.entries(obj);
+        case 54:
+          if (!(_i8 < _Object$entries7.length)) {
+            _context6.next = 59;
             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;
+          return _context6.delegateYield(_loop3(), "t0", 56);
+        case 56:
+          _i8++;
+          _context6.next = 54;
           break;
-        case 25:
-          valueStr = String(_value);
-          type = types[_key];
-          if (!(type === "empty-binary" && valueStr === "")) {
-            _context4.next = 29;
-            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;
-          }
-          _context4.t3 = !_key.includes("/");
-        case 34:
-          _context4.t2 = _context4.t3;
-          if (!_context4.t2) {
-            _context4.next = 37;
+        case 59:
+          _loop4 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop4() {
+            var _Object$entries8$_i, key, value;
+            return _regeneratorRuntime().wrap(function _loop4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
+                case 0:
+                  _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2), key = _Object$entries8$_i[0], value = _Object$entries8$_i[1];
+                  if (Array.isArray(value)) {
+                    // Check if this array goes in the body
+                    if (bodyKeys.includes(key) || bodyKeys.some(function (k) {
+                      return k.startsWith("".concat(key, "/"));
+                    })) {
+                      // Don't add list type if it's already been added
+                      if (!headerTypes.some(function (t) {
+                        return t.startsWith("".concat(key, "="));
+                      })) {
+                        headerTypes.push("".concat(key, "=\"list\""));
+                      }
+                    }
+                  }
+                case 2:
+                case "end":
+                  return _context4.stop();
+              }
+            }, _loop4);
+          });
+          _i9 = 0, _Object$entries8 = Object.entries(obj);
+        case 61:
+          if (!(_i9 < _Object$entries8.length)) {
+            _context6.next = 66;
             break;
           }
-          _context4.t2 = Buffer.from(valueStr).byteLength <= MAX_HEADER_LENGTH;
-        case 37:
-          _context4.t1 = _context4.t2;
-          if (!_context4.t1) {
-            _context4.next = 40;
+          return _context6.delegateYield(_loop4(), "t1", 63);
+        case 63:
+          _i9++;
+          _context6.next = 61;
+          break;
+        case 66:
+          if (!(bodyKeys.length === 0)) {
+            _context6.next = 70;
             break;
           }
-          _context4.t1 = !isPojo(_value);
-        case 40:
-          _context4.t0 = _context4.t1;
-          if (!_context4.t0) {
-            _context4.next = 43;
-            break;
+          if (headerTypes.length > 0) {
+            headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          _context4.t0 = !(_key === "data" || _key === "body");
-        case 43:
-          if (!_context4.t0) {
-            _context4.next = 47;
+          console.log("[encode] FINAL - headers:", headers, "body:", undefined);
+          return _context6.abrupt("return", {
+            headers: headers,
+            body: undefined
+          });
+        case 70:
+          // Check if all body keys are for empty binaries - if so, treat as no body needed
+          allBodyKeysAreEmptyBinaries = bodyKeys.every(function (key) {
+            var pathParts = key.split("/");
+            var value = obj;
+            var _iterator2 = _createForOfIteratorHelper(pathParts),
+              _step2;
+            try {
+              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                var part = _step2.value;
+                if (/^\d+$/.test(part)) {
+                  value = value[parseInt(part) - 1];
+                } else {
+                  value = value[part];
+                }
+              }
+            } catch (err) {
+              _iterator2.e(err);
+            } finally {
+              _iterator2.f();
+            }
+            return isBytes(value) && (value.length === 0 || value.byteLength === 0);
+          });
+          if (!allBodyKeysAreEmptyBinaries) {
+            _context6.next = 75;
             break;
           }
-          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;
+          // Treat as header-only encoding
+          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();
+          console.log("[encode] FINAL (all empty binaries) - headers:", headers, "body:", undefined);
+          return _context6.abrupt("return", {
+            headers: headers,
+            body: undefined
+          });
+        case 75:
+          // Sort body keys and add to headers
+          sortedBodyKeys = bodyKeys.sort(function (a, b) {
+            // Special sorting to ensure parent paths come before child paths
+            if (a.startsWith(b + "/")) return 1;
+            if (b.startsWith(a + "/")) return -1;
+            return a.localeCompare(b);
+          }); // Special case: if we have both 'data' and 'body' keys where data.body is binary
+          // then we need special handling per Erlang behavior
+          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(", ");
 
-          // 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, "\""));
+          // Check for inline keys - but not in the special data/body case
+          if (!hasSpecialDataBody) {
+            inlineKey = headers["inline-body-key"];
+            if (!inlineKey) {
+              // Only set inline-body-key if we have ONLY body (not data)
+              if (sortedBodyKeys.includes("body") && !sortedBodyKeys.includes("data")) {
+                headers["inline-body-key"] = "body";
+              }
             }
           }
 
-          // 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-"), "\""));
-            }
-          }
+          // Add ao-types header if needed
           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;
-          }
 
           // 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));
+          bodyParts = [];
+          _iterator3 = _createForOfIteratorHelper(sortedBodyKeys);
+          _context6.prev = 82;
+          _loop5 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop5() {
+            var bodyKey, lines, pathParts, value, parent, _i10, part, isInline, _buffer, textPart, _textPart, objectTypes, fieldLines, binaryFields, _i11, _Object$entries9, _Object$entries9$_i, _k, _v, childPath, _buffer2, _encodedItems2, onlyEmptyCollections, orderedLines, _iterator4, _step4, line, _binaryFields, _parts, _iterator5, _step5, _step5$value, _key, _buffer3, fullBody, _iterator6, _step6, _line, _parts2, headerText, _iterator7, _step7, _step7$value, _key2, _buffer4, _fullBody, hasObjects, hasArrays, nonObjectItems, _fieldLines, partTypes, _iterator8, _step8, _step8$value, item, index, _buffer5, _encodedItems3, _orderedLines, _iterator9, _step9, _line2, _iterator10, _step10, _line3, _fieldLines2, _partTypes, _orderedLines2, _iterator11, _step11, _line4, _iterator12, _step12, _line5, _fieldName, _partTypes2;
+            return _regeneratorRuntime().wrap(function _loop5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
+                case 0:
+                  bodyKey = _step3.value;
+                  lines = []; // Parse the path to get to the value
+                  pathParts = bodyKey.split("/");
+                  value = obj;
+                  parent = null; // Get the actual value at this path
+                  for (_i10 = 0; _i10 < pathParts.length; _i10++) {
+                    parent = value;
+                    part = pathParts[_i10];
+                    if (/^\d+$/.test(part)) {
+                      value = value[parseInt(part) - 1];
+                    } else {
+                      value = value[part];
+                    }
+                  }
+                  console.log("[encode] Processing body key:", bodyKey, "value type:", Array.isArray(value) ? "array" : _typeof(value));
 
-          // 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, "\""));
-          }
+                  // Skip if value is an array with only objects (no content for this body part)
+                  if (!(Array.isArray(value) && value.every(function (item) {
+                    return isPojo(item);
+                  }))) {
+                    _context5.next = 9;
+                    break;
+                  }
+                  return _context5.abrupt("return", 0);
+                case 9:
+                  if (!(isPojo(value) && Object.keys(value).length === 0)) {
+                    _context5.next = 11;
+                    break;
+                  }
+                  return _context5.abrupt("return", 0);
+                case 11:
+                  if (!(hasSpecialDataBody && bodyKey === "data" && isPojo(value) && Object.keys(value).length === 1 && value.body && isBytes(value.body))) {
+                    _context5.next = 13;
+                    break;
+                  }
+                  return _context5.abrupt("return", 0);
+                case 13:
+                  console.log("[encode] Creating body part for key:", bodyKey, "value type:", _typeof(value), "isBytes:", isBytes(value));
 
-          // Add the field type if available
-          _type3 = types[_path];
-          if (_type3) {
-            _lines.push("ao-types: ".concat(_path, "=\"").concat(_type3, "\""));
-          }
+                  // Determine content-disposition
+                  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, "\""));
+                  }
+                  console.log("[encode] Value type checks:", {
+                    isBytes: isBytes(value),
+                    isPojo: isPojo(value),
+                    isArray: Array.isArray(value),
+                    valueType: _typeof(value)
+                  });
+                  if (!isBytes(value)) {
+                    _context5.next = 23;
+                    break;
+                  }
+                  console.log("[encode] Processing binary value for key:", bodyKey);
+                  // Binary data
+                  _buffer = toBuffer(value); // Check if this is a nested path like "data/body"
+                  if (bodyKey.includes("/")) {
+                    // For nested binary, we need to replace the disposition
+                    lines[lines.length - 1] = "content-disposition: form-data;name=\"".concat(bodyKey, "\"");
+                    lines.push(""); // Empty line
+                    lines.push(""); // Another empty line before binary
+                    textPart = lines.join("\r\n");
+                    bodyParts.push(new Blob([textPart, _buffer]));
+                  } else {
+                    lines.push(""); // Empty line after headers
+                    lines.push(""); // Another empty line before binary data
+                    _textPart = lines.join("\r\n");
+                    bodyParts.push(new Blob([_textPart, _buffer]));
+                  }
+                  _context5.next = 80;
+                  break;
+                case 23:
+                  if (!isPojo(value)) {
+                    _context5.next = 79;
+                    break;
+                  }
+                  console.log("[encode] Processing object value");
+                  // Object - only include fields that aren't handled by nested body parts
+                  objectTypes = [];
+                  fieldLines = [];
+                  binaryFields = [];
+                  _i11 = 0, _Object$entries9 = Object.entries(value);
+                case 29:
+                  if (!(_i11 < _Object$entries9.length)) {
+                    _context5.next = 75;
+                    break;
+                  }
+                  _Object$entries9$_i = _slicedToArray(_Object$entries9[_i11], 2), _k = _Object$entries9$_i[0], _v = _Object$entries9$_i[1];
+                  childPath = "".concat(bodyKey, "/").concat(_k); // Skip if this field has its own body part
+                  if (!sortedBodyKeys.includes(childPath)) {
+                    _context5.next = 34;
+                    break;
+                  }
+                  return _context5.abrupt("continue", 72);
+                case 34:
+                  if (!(Array.isArray(_v) && _v.some(function (item) {
+                    return isPojo(item);
+                  }))) {
+                    _context5.next = 36;
+                    break;
+                  }
+                  return _context5.abrupt("continue", 72);
+                case 36:
+                  // Add type info
+                  if (Array.isArray(_v)) {
+                    objectTypes.push("".concat(_k, "=\"").concat(_v.length === 0 ? "empty-list" : "list", "\""));
+                  } else if (_v === null || _v === undefined || _typeof(_v) === "symbol" || typeof _v === "boolean") {
+                    objectTypes.push("".concat(_k, "=\"atom\""));
+                  } else if (typeof _v === "number") {
+                    objectTypes.push("".concat(_k, "=\"").concat(Number.isInteger(_v) ? "integer" : "float", "\""));
+                  } else if (typeof _v === "string" && _v.length === 0) {
+                    objectTypes.push("".concat(_k, "=\"empty-binary\""));
+                  } else if (isBytes(_v) && (_v.length === 0 || _v.byteLength === 0)) {
+                    objectTypes.push("".concat(_k, "=\"empty-binary\""));
+                  } else if (isPojo(_v) && Object.keys(_v).length === 0) {
+                    objectTypes.push("".concat(_k, "=\"empty-message\""));
+                  }
 
-          // Add empty line before content
-          _lines.push("");
+                  // Add field value
+                  if (!(typeof _v === "string")) {
+                    _context5.next = 41;
+                    break;
+                  }
+                  fieldLines.push("".concat(_k, ": ").concat(_v));
+                  _context5.next = 72;
+                  break;
+                case 41:
+                  if (!(typeof _v === "number")) {
+                    _context5.next = 45;
+                    break;
+                  }
+                  fieldLines.push("".concat(_k, ": ").concat(_v));
+                  _context5.next = 72;
+                  break;
+                case 45:
+                  if (!(typeof _v === "boolean")) {
+                    _context5.next = 49;
+                    break;
+                  }
+                  fieldLines.push("".concat(_k, ": \"").concat(_v, "\""));
+                  _context5.next = 72;
+                  break;
+                case 49:
+                  if (!(_v === null)) {
+                    _context5.next = 53;
+                    break;
+                  }
+                  fieldLines.push("".concat(_k, ": \"null\""));
+                  _context5.next = 72;
+                  break;
+                case 53:
+                  if (!(_v === undefined)) {
+                    _context5.next = 57;
+                    break;
+                  }
+                  fieldLines.push("".concat(_k, ": \"undefined\""));
+                  _context5.next = 72;
+                  break;
+                case 57:
+                  if (!(_typeof(_v) === "symbol")) {
+                    _context5.next = 61;
+                    break;
+                  }
+                  fieldLines.push("".concat(_k, ": \"").concat(_v.description || "Symbol.for()", "\""));
+                  _context5.next = 72;
+                  break;
+                case 61:
+                  if (!isBytes(_v)) {
+                    _context5.next = 71;
+                    break;
+                  }
+                  _buffer2 = toBuffer(_v); // For inline data/body parts, binary fields get raw bytes
+                  if (!isInline) {
+                    _context5.next = 67;
+                    break;
+                  }
+                  return _context5.abrupt("continue", 72);
+                case 67:
+                  // For non-inline parts, we need to add raw bytes, not base64
+                  // Store the binary field for later processing
+                  binaryFields.push({
+                    key: _k,
+                    buffer: _buffer2
+                  });
+                  return _context5.abrupt("continue", 72);
+                case 69:
+                  _context5.next = 72;
+                  break;
+                case 71:
+                  if (Array.isArray(_v)) {
+                    if (_v.length === 0) {
+                      fieldLines.push("".concat(_k, ": "));
+                    } else {
+                      _encodedItems2 = _v.map(function (item) {
+                        return encodeArrayItem(item);
+                      }).join(", ");
+                      fieldLines.push("".concat(_k, ": ").concat(_encodedItems2));
+                    }
+                  } else if (isPojo(_v) && Object.keys(_v).length === 0) {
+                    // Empty object - no content line needed, just ao-type
+                  }
+                case 72:
+                  _i11++;
+                  _context5.next = 29;
+                  break;
+                case 75:
+                  // Check if this object only has empty collections
+                  onlyEmptyCollections = Object.entries(value).every(function (_ref) {
+                    var _ref2 = _slicedToArray(_ref, 2),
+                      k = _ref2[0],
+                      v = _ref2[1];
+                    var childPath = "".concat(bodyKey, "/").concat(k);
+                    if (sortedBodyKeys.includes(childPath)) return true;
+                    if (Array.isArray(v) && v.some(function (item) {
+                      return isPojo(item);
+                    })) return true;
+                    return Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0 || isBytes(v) && (v.length === 0 || v.byteLength === 0);
+                  }); // Special handling for inline body
+                  if (isInline) {
+                    // For inline: fields first, then ao-types, then content-disposition
+                    orderedLines = []; // First: field lines
+                    if (!onlyEmptyCollections) {
+                      _iterator4 = _createForOfIteratorHelper(fieldLines);
+                      try {
+                        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                          line = _step4.value;
+                          orderedLines.push(line);
+                        }
+                      } catch (err) {
+                        _iterator4.e(err);
+                      } finally {
+                        _iterator4.f();
+                      }
+                    }
 
-          // 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, "\""));
-          }
+                    // Then: ao-types
+                    if (objectTypes.length > 0) {
+                      orderedLines.push("ao-types: ".concat(objectTypes.sort().join(", ")));
+                    }
 
-          // 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");
-              }
+                    // Finally: content-disposition
+                    orderedLines.push("content-disposition: inline");
 
-              // 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");
+                    // Check if this has binary fields
+                    _binaryFields = Object.entries(value).filter(function (_ref3) {
+                      var _ref4 = _slicedToArray(_ref3, 2),
+                        k = _ref4[0],
+                        v = _ref4[1];
+                      return isBytes(v) && !sortedBodyKeys.includes("".concat(bodyKey, "/").concat(k));
+                    }).map(function (_ref5) {
+                      var _ref6 = _slicedToArray(_ref5, 2),
+                        k = _ref6[0],
+                        v = _ref6[1];
+                      return {
+                        key: k,
+                        buffer: toBuffer(v)
+                      };
+                    });
+                    if (_binaryFields.length > 0) {
+                      // Build the parts
+                      _parts = []; // Add the text part
+                      _parts.push(Buffer.from(orderedLines.join("\r\n")));
+
+                      // Add binary fields with raw bytes
+                      _iterator5 = _createForOfIteratorHelper(_binaryFields);
+                      try {
+                        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                          _step5$value = _step5.value, _key = _step5$value.key, _buffer3 = _step5$value.buffer;
+                          _parts.push(Buffer.from("\r\n".concat(_key, ": ")));
+                          _parts.push(_buffer3);
+                        }
+
+                        // Add trailing \r\n for inline parts with binary
+                      } catch (err) {
+                        _iterator5.e(err);
+                      } finally {
+                        _iterator5.f();
+                      }
+                      _parts.push(Buffer.from("\r\n"));
+                      fullBody = Buffer.concat(_parts);
+                      bodyParts.push(new Blob([fullBody]));
+                    } else {
+                      orderedLines.push(""); // Add empty line for trailing \r\n
+                      bodyParts.push(new Blob([orderedLines.join("\r\n")]));
+                    }
+                  } else {
+                    // Normal handling (non-inline)
+                    // ao-types first if needed
+                    if (objectTypes.length > 0) {
+                      lines.unshift("ao-types: ".concat(objectTypes.sort().join(", ")));
+                    }
+
+                    // Only add field lines if not all collections are empty
+                    if (!onlyEmptyCollections) {
+                      _iterator6 = _createForOfIteratorHelper(fieldLines);
+                      try {
+                        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                          _line = _step6.value;
+                          lines.push(_line);
+                        }
+                      } catch (err) {
+                        _iterator6.e(err);
+                      } finally {
+                        _iterator6.f();
+                      }
+                    }
+
+                    // Then handle binary fields with raw bytes if any
+                    if (binaryFields && binaryFields.length > 0) {
+                      // Create parts array for proper ordering
+                      _parts2 = []; // Add headers and text fields
+                      headerText = lines.join("\r\n") + "\r\n";
+                      _parts2.push(Buffer.from(headerText));
+
+                      // Add binary fields with raw bytes
+                      _iterator7 = _createForOfIteratorHelper(binaryFields);
+                      try {
+                        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+                          _step7$value = _step7.value, _key2 = _step7$value.key, _buffer4 = _step7$value.buffer;
+                          _parts2.push(Buffer.from("".concat(_key2, ": ")));
+                          _parts2.push(_buffer4);
+                          _parts2.push(Buffer.from("\r\n"));
+                        }
+                      } catch (err) {
+                        _iterator7.e(err);
+                      } finally {
+                        _iterator7.f();
+                      }
+                      _fullBody = Buffer.concat(_parts2);
+                      bodyParts.push(new Blob([_fullBody]));
+                    } else {
+                      lines.push("");
+                      bodyParts.push(new Blob([lines.join("\r\n")]));
+                    }
                   }
-                }
-              } catch (err) {
-                _iterator5.e(err);
-              } finally {
-                _iterator5.f();
+                  _context5.next = 80;
+                  break;
+                case 79:
+                  if (Array.isArray(value)) {
+                    // Array field - check if it's a mixed array or array of arrays
+                    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 (hasObjects && nonObjectItems.length > 0) {
+                      // Mixed array - only include non-object items
+                      _fieldLines = [];
+                      partTypes = [];
+                      _iterator8 = _createForOfIteratorHelper(nonObjectItems);
+                      try {
+                        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+                          _step8$value = _step8.value, item = _step8$value.item, index = _step8$value.index;
+                          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") {
+                            _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") {
+                              _fieldLines.push("".concat(index, ": \"").concat(item.description || "Symbol.for()", "\""));
+                            } else {
+                              _fieldLines.push("".concat(index, ": \"").concat(item, "\""));
+                            }
+                          } else if (isBytes(item)) {
+                            // Binary items in arrays need special handling
+                            _buffer5 = toBuffer(item);
+                            if (_buffer5.length === 0) {
+                              partTypes.push("".concat(index, "=\"empty-binary\""));
+                            }
+                            // For now, skip binary items in mixed arrays
+                            // They should be handled differently
+                            partTypes.push("".concat(index, "=\"binary\""));
+                          } else if (Array.isArray(item)) {
+                            partTypes.push("".concat(index, "=\"list\""));
+                            _encodedItems3 = item.map(function (subItem) {
+                              return encodeArrayItem(subItem);
+                            }).join(", ");
+                            _fieldLines.push("".concat(index, ": ").concat(_encodedItems3));
+                          }
+                        }
+
+                        // For inline arrays, use different order
+                      } catch (err) {
+                        _iterator8.e(err);
+                      } finally {
+                        _iterator8.f();
+                      }
+                      if (isInline) {
+                        console.log("[encode] Reordering for inline array:", {
+                          bodyKey: bodyKey,
+                          fieldLines: _fieldLines,
+                          partTypes: partTypes
+                        });
+
+                        // Rebuild in correct order: field lines, ao-types, content-disposition
+                        _orderedLines = []; // First: field lines
+                        _iterator9 = _createForOfIteratorHelper(_fieldLines);
+                        try {
+                          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                            _line2 = _step9.value;
+                            _orderedLines.push(_line2);
+                          }
+
+                          // Then: ao-types
+                        } catch (err) {
+                          _iterator9.e(err);
+                        } finally {
+                          _iterator9.f();
+                        }
+                        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(", ")));
+                        }
+
+                        // Finally: content-disposition (from lines[0])
+                        _orderedLines.push(lines[0]);
+                        _orderedLines.push("");
+                        console.log("[encode] Ordered lines:", _orderedLines);
+                        bodyParts.push(new Blob([_orderedLines.join("\r\n")]));
+                      } else {
+                        // Normal order for non-inline parts
+                        if (partTypes.length > 0) {
+                          lines.unshift("ao-types: ".concat(partTypes.sort(function (a, b) {
+                            var aNum = parseInt(a.split("=")[0]);
+                            var bNum = parseInt(b.split("=")[0]);
+                            return aNum - bNum;
+                          }).join(", ")));
+                        }
+                        _iterator10 = _createForOfIteratorHelper(_fieldLines);
+                        try {
+                          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+                            _line3 = _step10.value;
+                            lines.push(_line3);
+                          }
+                        } catch (err) {
+                          _iterator10.e(err);
+                        } finally {
+                          _iterator10.f();
+                        }
+                        lines.push("");
+                        bodyParts.push(new Blob([lines.join("\r\n")]));
+                      }
+                    } else if (hasArrays || !hasObjects && value.length > 0) {
+                      // Array of arrays or simple array - use indexed format
+                      _fieldLines2 = [];
+                      _partTypes = [];
+                      value.forEach(function (item, idx) {
+                        var index = idx + 1;
+                        if (Array.isArray(item)) {
+                          if (item.length === 0) {
+                            _partTypes.push("".concat(index, "=\"empty-list\""));
+                          } else {
+                            _partTypes.push("".concat(index, "=\"list\""));
+                            var _encodedItems4 = item.map(function (subItem) {
+                              return encodeArrayItem(subItem);
+                            }).join(", ");
+                            _fieldLines2.push("".concat(index, ": ").concat(_encodedItems4));
+                          }
+                        } else if (typeof item === "number") {
+                          if (Number.isInteger(item)) {
+                            _partTypes.push("".concat(index, "=\"integer\""));
+                            _fieldLines2.push("".concat(index, ": ").concat(item));
+                          } else {
+                            _partTypes.push("".concat(index, "=\"float\""));
+                            _fieldLines2.push("".concat(index, ": ").concat(formatFloat(item)));
+                          }
+                        } else if (typeof item === "string") {
+                          if (item.length === 0) {
+                            _partTypes.push("".concat(index, "=\"empty-binary\""));
+                          }
+                          _fieldLines2.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) {
+                            _fieldLines2.push("".concat(index, ": \"null\""));
+                          } else if (item === undefined) {
+                            _fieldLines2.push("".concat(index, ": \"undefined\""));
+                          } else if (_typeof(item) === "symbol") {
+                            _fieldLines2.push("".concat(index, ": \"").concat(item.description || "Symbol.for()", "\""));
+                          } else {
+                            _fieldLines2.push("".concat(index, ": \"").concat(item, "\""));
+                          }
+                        } else if (isBytes(item)) {
+                          var _buffer6 = toBuffer(item);
+                          if (_buffer6.length === 0) {
+                            _partTypes.push("".concat(index, "=\"empty-binary\""));
+                          } else {
+                            _partTypes.push("".concat(index, "=\"binary\""));
+                          }
+                          // For indexed format, we also can't include raw bytes inline
+                          // This is a limitation of the format
+                        }
+                      });
+
+                      // For inline arrays, use different order
+                      if (isInline) {
+                        console.log("[encode] Reordering for inline array - indexed format");
+                        _orderedLines2 = []; // First: field lines
+                        _iterator11 = _createForOfIteratorHelper(_fieldLines2);
+                        try {
+                          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                            _line4 = _step11.value;
+                            _orderedLines2.push(_line4);
+                          }
+
+                          // Then: ao-types
+                        } catch (err) {
+                          _iterator11.e(err);
+                        } finally {
+                          _iterator11.f();
+                        }
+                        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(", ")));
+                        }
+
+                        // Finally: content-disposition
+                        _orderedLines2.push(lines[0]);
+                        _orderedLines2.push("");
+                        console.log("[encode] Final ordered lines:", _orderedLines2);
+                        bodyParts.push(new Blob([_orderedLines2.join("\r\n")]));
+                      } else {
+                        // Normal order for non-inline parts
+                        if (_partTypes.length > 0) {
+                          console.log("[encode] Adding ao-types to beginning of lines array");
+                          lines.unshift("ao-types: ".concat(_partTypes.sort(function (a, b) {
+                            var aNum = parseInt(a.split("=")[0]);
+                            var bNum = parseInt(b.split("=")[0]);
+                            return aNum - bNum;
+                          }).join(", ")));
+                        }
+                        console.log("[encode] Adding field lines:", _fieldLines2);
+                        _iterator12 = _createForOfIteratorHelper(_fieldLines2);
+                        try {
+                          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+                            _line5 = _step12.value;
+                            lines.push(_line5);
+                          }
+                        } catch (err) {
+                          _iterator12.e(err);
+                        } finally {
+                          _iterator12.f();
+                        }
+                        console.log("[encode] Final lines before blob:", lines);
+                        lines.push("");
+                        bodyParts.push(new Blob([lines.join("\r\n")]));
+                      }
+                    } else if (!hasObjects && value.length === 0) {
+                      // Empty array
+                      _fieldName = pathParts[pathParts.length - 1];
+                      _partTypes2 = ["".concat(_fieldName, "=\"empty-list\"")];
+                      lines.unshift("ao-types: ".concat(_partTypes2.join(", ")));
+                      lines.push("");
+                      bodyParts.push(new Blob([lines.join("\r\n")]));
+                    }
+                  } else if (typeof value === "string") {
+                    // String with newlines or too long
+                    lines.push("");
+                    lines.push(value);
+                    lines.push("");
+                    bodyParts.push(new Blob([lines.join("\r\n")]));
+                  }
+                case 80:
+                case "end":
+                  return _context5.stop();
               }
-              bodyParts.push(new Blob(allParts));
-            } else {
-              bodyParts.push(new Blob([lines.join("\r\n")]));
-            }
+            }, _loop5);
+          });
+          _iterator3.s();
+        case 85:
+          if ((_step3 = _iterator3.n()).done) {
+            _context6.next = 92;
+            break;
           }
-        case 131:
-          _context4.next = 68;
-          break;
-        case 133:
-          _context4.next = 138;
-          break;
-        case 135:
-          _context4.prev = 135;
-          _context4.t5 = _context4["catch"](66);
-          _iterator.e(_context4.t5);
-        case 138:
-          _context4.prev = 138;
-          _iterator.f();
-          return _context4.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;
+          return _context6.delegateYield(_loop5(), "t2", 87);
+        case 87:
+          _ret = _context6.t2;
+          if (!(_ret === 0)) {
+            _context6.next = 90;
             break;
           }
-          part = _step2.value;
-          _context4.next = 150;
-          return part.text();
-        case 150:
-          partContent = _context4.sent;
-          partsForBoundary.push(partContent);
-        case 152:
-          _context4.next = 146;
+          return _context6.abrupt("continue", 90);
+        case 90:
+          _context6.next = 85;
           break;
-        case 154:
-          _context4.next = 159;
+        case 92:
+          _context6.next = 97;
           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
+        case 94:
+          _context6.prev = 94;
+          _context6.t3 = _context6["catch"](82);
+          _iterator3.e(_context6.t3);
+        case 97:
+          _context6.prev = 97;
+          _iterator3.f();
+          return _context6.finish(97);
+        case 100:
+          // Special case: add data/body as a separate form-data 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]));
+          }
+
+          // Calculate boundary from content
+          _context6.next = 103;
+          return Promise.all(bodyParts.map(function (part) {
+            return part.text();
+          }));
+        case 103:
+          partsContent = _context6.sent;
+          allContent = partsContent.join("");
+          _context6.next = 107;
+          return sha256(new TextEncoder().encode(allContent));
+        case 107:
+          boundaryHash = _context6.sent;
+          boundary = _base64url["default"].encode(Buffer.from(boundaryHash)); // Assemble final multipart body - NO newlines after each part except the last
           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;
+          body = new Blob(finalParts); // Calculate content digest
+          _context6.next = 116;
           return body.arrayBuffer();
-        case 176:
-          finalContent = _context4.sent;
-          _context4.next = 179;
+        case 116:
+          finalContent = _context6.sent;
+          _context6.next = 119;
           return sha256(finalContent);
-        case 179:
-          contentDigest = _context4.sent;
+        case 119:
+          contentDigest = _context6.sent;
           base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
           headers["content-digest"] = "sha-256=:".concat(base64, ":");
           headers["content-length"] = String(finalContent.byteLength);
           console.log("[encode] FINAL - headers:", headers, "body:", body);
-          return _context4.abrupt("return", {
+
+          // Debug: decode the multipart body to verify structure
+          _context6.next = 126;
+          return body.text();
+        case 126:
+          bodyText = _context6.sent;
+          console.log("\n[encode] DEBUG - Full body text:");
+          console.log(bodyText);
+
+          // Parse multipart body
+          boundaryMatch = headers["content-type"].match(/boundary="([^"]+)"/);
+          if (boundaryMatch) {
+            debugBoundary = boundaryMatch[1];
+            parts = bodyText.split("--".concat(debugBoundary));
+            console.log("\n[encode] DEBUG - Multipart parts:");
+            parts.forEach(function (part, idx) {
+              console.log("Part ".concat(idx, ":"), JSON.stringify(part));
+            });
+
+            // Show the actual content part
+            if (parts[1]) {
+              console.log("\n[encode] DEBUG - Content part structure:");
+              lines = parts[1].trim().split("\r\n");
+              lines.forEach(function (line, idx) {
+                if (line.includes("\0")) {
+                  console.log("Line ".concat(idx, ": \"").concat(line.substring(0, line.indexOf("\0")), "\" + [").concat(line.length - line.indexOf("\0"), " bytes]"));
+                } else {
+                  console.log("Line ".concat(idx, ": \"").concat(line, "\""));
+                }
+              });
+            }
+          }
+          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 132:
         case "end":
-          return _context4.stop();
+          return _context6.stop();
       }
-    }, _callee4, null, [[66, 135, 138, 141], [108, 124, 127, 130], [144, 156, 159, 162]]);
+    }, _callee3, null, [[82, 94, 97, 100]]);
   }));
-  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);
 }