wao 0.27.2 → 0.27.4

package/cjs/encode.js

@@ -5,14 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.enc = enc;
 var _base64url = _interopRequireDefault(require("base64url"));
-var _fastSha = require("fast-sha256");
+var _encodeUtils = require("./encode-utils.js");
+var _encodeArrayItem = _interopRequireDefault(require("./encode-array-item.js"));
+var _collectBodyKeys = _interopRequireDefault(require("./collect-body-keys.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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 _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 _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 _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; } }
@@ -21,1201 +20,1271 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 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) || value && _typeof(value) === "object" && value.type === "Buffer" && Array.isArray(value.data);
+var MAX_HEADER_LENGTH = 4096;
+
+// Step 1: Process and normalize input values (handle symbols, nested objects/arrays)
+function processInputValues(obj) {
+  // Currently this is a no-op, but will be used for input validation/normalization
+  return obj;
 }
-function isPojo(value) {
-  return !isBytes(value) && !Array.isArray(value) && !(value instanceof Blob) && _typeof(value) === "object" && value !== null;
+
+// Step 2: Handle empty object case
+function handleEmptyObject(obj) {
+  if (Object.keys(obj).length === 0) {
+    return {
+      headers: {},
+      body: undefined
+    };
+  }
+  return null;
 }
-var MAX_HEADER_LENGTH = 4096;
-function hasNewline(_x) {
-  return _hasNewline.apply(this, arguments);
+
+// Step 3: Handle single field with empty binary
+function handleSingleEmptyBinaryField(obj) {
+  var objKeys = Object.keys(obj);
+  if (objKeys.length === 1) {
+    var fieldName = objKeys[0];
+    var fieldValue = obj[fieldName];
+    if ((0, _encodeUtils.isBytes)(fieldValue) && (fieldValue.length === 0 || fieldValue.byteLength === 0)) {
+      var headers = {};
+      headers["ao-types"] = "".concat(fieldName.toLowerCase(), "=\"empty-binary\"");
+      return {
+        headers: headers,
+        body: undefined
+      };
+    }
+  }
+  return null;
 }
-function _hasNewline() {
-  _hasNewline = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
+
+// Step 4: Handle single field with binary data
+function handleSingleBinaryField(_x) {
+  return _handleSingleBinaryField.apply(this, arguments);
+} // Step 5: Handle single field with primitive value (string/number/boolean/null/undefined/symbol)
+function _handleSingleBinaryField() {
+  _handleSingleBinaryField = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(obj) {
+    var hasBodyBinary, otherFields, headers, bodyBuffer, bodyArrayBuffer, contentDigest, base64;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(typeof value === "string")) {
-            _context.next = 2;
-            break;
-          }
-          return _context.abrupt("return", value.includes("\n"));
-        case 2:
-          if (!(value instanceof Blob)) {
-            _context.next = 7;
-            break;
-          }
-          _context.next = 5;
-          return value.text();
-        case 5:
-          value = _context.sent;
-          return _context.abrupt("return", value.includes("\n"));
-        case 7:
-          if (!isBytes(value)) {
-            _context.next = 9;
+          hasBodyBinary = obj.body && (0, _encodeUtils.isBytes)(obj.body);
+          otherFields = Object.keys(obj).filter(function (k) {
+            return k !== "body";
+          });
+          if (!(hasBodyBinary && otherFields.length === 0)) {
+            _context.next = 12;
             break;
           }
-          return _context.abrupt("return", Buffer.from(value).includes("\n"));
-        case 9:
-          return _context.abrupt("return", false);
-        case 10:
+          headers = {};
+          bodyBuffer = (0, _encodeUtils.toBuffer)(obj.body);
+          bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
+          _context.next = 8;
+          return (0, _encodeUtils.sha256)(bodyArrayBuffer);
+        case 8:
+          contentDigest = _context.sent;
+          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
+          headers["content-digest"] = "sha-256=:".concat(base64, ":");
+          return _context.abrupt("return", {
+            headers: headers,
+            body: obj.body
+          });
+        case 12:
+          return _context.abrupt("return", null);
+        case 13:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return _hasNewline.apply(this, arguments);
+  return _handleSingleBinaryField.apply(this, arguments);
 }
-function sha256(_x2) {
-  return _sha.apply(this, arguments);
-}
-function _sha() {
-  _sha = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data) {
-    var uint8Array, hashResult;
+function handleSinglePrimitiveField(_x2) {
+  return _handleSinglePrimitiveField.apply(this, arguments);
+} // Step 6a: Handle single field with non-empty binary (not body field)
+function _handleSinglePrimitiveField() {
+  _handleSinglePrimitiveField = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(obj) {
+    var objKeys, fieldName, fieldValue, headers, bodyContent, encoder, encoded, contentDigest, base64, aoType;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          if (!(data instanceof ArrayBuffer)) {
-            _context2.next = 4;
+          objKeys = Object.keys(obj);
+          if (!(objKeys.length === 1)) {
+            _context2.next = 18;
             break;
           }
-          uint8Array = new Uint8Array(data);
-          _context2.next = 13;
-          break;
-        case 4:
-          if (!(data instanceof Uint8Array)) {
-            _context2.next = 8;
+          fieldName = objKeys[0];
+          fieldValue = obj[fieldName];
+          if (!((fieldName === "data" || fieldName === "body") && (typeof fieldValue === "string" || typeof fieldValue === "boolean" || typeof fieldValue === "number" || fieldValue === null || fieldValue === undefined || _typeof(fieldValue) === "symbol"))) {
+            _context2.next = 18;
             break;
           }
-          uint8Array = data;
-          _context2.next = 13;
-          break;
-        case 8:
-          if (!ArrayBuffer.isView(data)) {
-            _context2.next = 12;
-            break;
+          headers = {};
+          bodyContent = (0, _encodeUtils.encodePrimitiveContent)(fieldValue);
+          encoder = new TextEncoder();
+          encoded = encoder.encode(bodyContent);
+          _context2.next = 11;
+          return (0, _encodeUtils.sha256)(encoded.buffer);
+        case 11:
+          contentDigest = _context2.sent;
+          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
+          headers["content-digest"] = "sha-256=:".concat(base64, ":");
+          aoType = (0, _encodeUtils.getAoType)(fieldValue);
+          if (aoType === "atom" || aoType === "integer" || aoType === "float") {
+            headers["ao-types"] = "".concat(fieldName.toLowerCase(), "=\"").concat(aoType, "\"");
           }
-          uint8Array = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
-          _context2.next = 13;
-          break;
-        case 12:
-          throw new Error("sha256 expects ArrayBuffer or ArrayBufferView");
-        case 13:
-          hashResult = (0, _fastSha.hash)(uint8Array);
-          return _context2.abrupt("return", hashResult.buffer.slice(hashResult.byteOffset, hashResult.byteOffset + hashResult.byteLength));
-        case 15:
+          if (fieldName !== "body") {
+            headers["inline-body-key"] = fieldName;
+          }
+          return _context2.abrupt("return", {
+            headers: headers,
+            body: bodyContent
+          });
+        case 18:
+          return _context2.abrupt("return", null);
+        case 19:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   }));
-  return _sha.apply(this, arguments);
+  return _handleSinglePrimitiveField.apply(this, arguments);
+}
+function handleSingleNonEmptyBinaryField(_x3) {
+  return _handleSingleNonEmptyBinaryField.apply(this, arguments);
+} // Step 6: Handle single field with non-ASCII string
+function _handleSingleNonEmptyBinaryField() {
+  _handleSingleNonEmptyBinaryField = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(obj) {
+    var objKeys, fieldName, fieldValue, headers, bodyBuffer, bodyArrayBuffer, contentDigest, base64;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          objKeys = Object.keys(obj);
+          if (!(objKeys.length === 1)) {
+            _context3.next = 15;
+            break;
+          }
+          fieldName = objKeys[0];
+          fieldValue = obj[fieldName];
+          if (!((0, _encodeUtils.isBytes)(fieldValue) && fieldValue.length > 0)) {
+            _context3.next = 15;
+            break;
+          }
+          headers = {};
+          bodyBuffer = (0, _encodeUtils.toBuffer)(fieldValue);
+          bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
+          _context3.next = 10;
+          return (0, _encodeUtils.sha256)(bodyArrayBuffer);
+        case 10:
+          contentDigest = _context3.sent;
+          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
+          headers["content-digest"] = "sha-256=:".concat(base64, ":");
+          if (fieldName !== "body") {
+            headers["inline-body-key"] = fieldName;
+          }
+          return _context3.abrupt("return", {
+            headers: headers,
+            body: fieldValue
+          });
+        case 15:
+          return _context3.abrupt("return", null);
+        case 16:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _handleSingleNonEmptyBinaryField.apply(this, arguments);
 }
-function formatFloat(num) {
-  var exp = num.toExponential(20);
-  exp = exp.replace(/e\+(\d)$/, "e+0$1");
-  exp = exp.replace(/e-(\d)$/, "e-0$1");
-  return exp;
+function handleSingleNonAsciiStringField(_x4) {
+  return _handleSingleNonAsciiStringField.apply(this, arguments);
+} // Step 7: Collect all keys that need to go in body
+function _handleSingleNonAsciiStringField() {
+  _handleSingleNonAsciiStringField = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(obj) {
+    var objKeys, fieldName, fieldValue, headers, encoder, encoded, contentDigest, base64;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          objKeys = Object.keys(obj);
+          if (!(objKeys.length === 1)) {
+            _context4.next = 15;
+            break;
+          }
+          fieldName = objKeys[0];
+          fieldValue = obj[fieldName];
+          if (!(typeof fieldValue === "string" && (0, _encodeUtils.hasNonAscii)(fieldValue))) {
+            _context4.next = 15;
+            break;
+          }
+          headers = {};
+          encoder = new TextEncoder();
+          encoded = encoder.encode(fieldValue);
+          _context4.next = 10;
+          return (0, _encodeUtils.sha256)(encoded.buffer);
+        case 10:
+          contentDigest = _context4.sent;
+          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
+          headers["content-digest"] = "sha-256=:".concat(base64, ":");
+          if (fieldName !== "body") {
+            headers["inline-body-key"] = fieldName;
+          }
+          return _context4.abrupt("return", {
+            headers: headers,
+            body: fieldValue
+          });
+        case 15:
+          return _context4.abrupt("return", null);
+        case 16:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _handleSingleNonAsciiStringField.apply(this, arguments);
 }
-function hasNonAscii(str) {
-  return /[^\x00-\x7F]/.test(str);
+function collectBodyKeysStep(obj) {
+  return (0, _collectBodyKeys["default"])(obj);
 }
-function encodeArrayItem(item) {
-  if (typeof item === "number") {
-    if (Number.isInteger(item)) {
-      return "\"(ao-type-integer) ".concat(item, "\"");
+
+// Step 8: Process fields that can go in headers
+function processHeaderFields(obj, bodyKeys, headers, headerTypes) {
+  var _loop = function _loop() {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+      key = _Object$entries$_i[0],
+      value = _Object$entries$_i[1];
+    var needsBody = bodyKeys.includes(key) || bodyKeys.some(function (k) {
+      return k.startsWith("".concat(key, "/"));
+    });
+    if (!needsBody) {
+      if (value === null) {
+        headers[key] = '"null"';
+        headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+      } else if (value === undefined) {
+        headers[key] = '"undefined"';
+        headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+      } else if (typeof value === "boolean") {
+        headers[key] = "\"".concat(value, "\"");
+        headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+      } else if (_typeof(value) === "symbol") {
+        headers[key] = "\"".concat(value.description || "Symbol.for()", "\"");
+        headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
+      } else if (typeof value === "number") {
+        headers[key] = String(value);
+        headerTypes.push("".concat(key.toLowerCase(), "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
+      } else if (typeof value === "string") {
+        if (value.length === 0) {
+          headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+        } else if ((0, _encodeUtils.hasNonAscii)(value)) {
+          return 1; // continue
+        } else {
+          headers[key] = value;
+        }
+      } else if (Array.isArray(value) && value.length === 0) {
+        headerTypes.push("".concat(key.toLowerCase(), "=\"empty-list\""));
+      } else if (Array.isArray(value) && !value.some(function (item) {
+        return (0, _encodeUtils.isPojo)(item);
+      })) {
+        var hasNonAsciiItems = value.some(function (item) {
+          return typeof item === "string" && (0, _encodeUtils.hasNonAscii)(item);
+        });
+        if (!hasNonAsciiItems) {
+          var encodedItems = value.map(function (item) {
+            return (0, _encodeArrayItem["default"])(item);
+          }).join(", ");
+          headers[key] = encodedItems;
+          headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
+        }
+      } else if ((0, _encodeUtils.isBytes)(value) && (value.length === 0 || value.byteLength === 0)) {
+        headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+      } else if ((0, _encodeUtils.isPojo)(value) && Object.keys(value).length === 0) {
+        headerTypes.push("".concat(key.toLowerCase(), "=\"empty-message\""));
+      }
     } else {
-      return "\"(ao-type-float) ".concat(formatFloat(item), "\"");
+      // Fields that need body still get type annotations
+      var aoType = (0, _encodeUtils.getAoType)(value);
+      if (aoType) {
+        headerTypes.push("".concat(key.toLowerCase(), "=\"").concat(aoType, "\""));
+      }
     }
-  } else if (typeof item === "string") {
-    return "\"".concat(item, "\"");
-  } else if (item === null) {
-    return "\"(ao-type-atom) \\\"null\\\"\"";
-  } else if (item === undefined) {
-    return "\"(ao-type-atom) \\\"undefined\\\"\"";
-  } else if (_typeof(item) === "symbol") {
-    var desc = item.description || "Symbol.for()";
-    return "\"(ao-type-atom) \\\"".concat(desc, "\\\"\"");
-  } else if (typeof item === "boolean") {
-    return "\"(ao-type-atom) \\\"".concat(item, "\\\"\"");
-  } else if (Array.isArray(item)) {
-    var nestedItems = item.map(function (nestedItem) {
-      if (typeof nestedItem === "number") {
-        if (Number.isInteger(nestedItem)) {
-          return "\\\"(ao-type-integer) ".concat(nestedItem, "\\\"");
-        } else {
-          return "\\\"(ao-type-float) ".concat(formatFloat(nestedItem), "\\\"");
+  };
+  for (var _i = 0, _Object$entries = Object.entries(obj); _i < _Object$entries.length; _i++) {
+    if (_loop()) continue;
+  }
+
+  // Second pass for array type annotations
+  var _loop2 = function _loop2() {
+    var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+      key = _Object$entries2$_i[0],
+      value = _Object$entries2$_i[1];
+    if (Array.isArray(value)) {
+      if (bodyKeys.includes(key) || bodyKeys.some(function (k) {
+        return k.startsWith("".concat(key, "/"));
+      })) {
+        if (!headerTypes.some(function (t) {
+          return t.startsWith("".concat(key.toLowerCase(), "="));
+        })) {
+          headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
         }
-      } else if (typeof nestedItem === "string") {
-        return "\\\"".concat(nestedItem, "\\\"");
-      } else if (nestedItem === null) {
-        return "\\\"(ao-type-atom) \\\\\\\"null\\\\\\\"\\\"";
-      } else if (nestedItem === undefined) {
-        return "\\\"(ao-type-atom) \\\\\\\"undefined\\\\\\\"\\\"";
-      } else if (_typeof(nestedItem) === "symbol") {
-        var _desc = nestedItem.description || "Symbol.for()";
-        return "\\\"(ao-type-atom) \\\\\\\"".concat(_desc, "\\\\\\\"\\\"");
-      } else if (typeof nestedItem === "boolean") {
-        return "\\\"(ao-type-atom) \\\\\\\"".concat(nestedItem, "\\\\\\\"\\\"");
-      } else if (Array.isArray(nestedItem)) {
-        // Handle nested arrays recursively
-        var deeperItems = nestedItem.map(function (deepItem) {
-          if (typeof deepItem === "number") {
-            if (Number.isInteger(deepItem)) {
-              return "\\\\\\\"(ao-type-integer) ".concat(deepItem, "\\\\\\\"");
-            } else {
-              return "\\\\\\\"(ao-type-float) ".concat(formatFloat(deepItem), "\\\\\\\"");
-            }
-          } else if (typeof deepItem === "string") {
-            return "\\\\\\\"".concat(deepItem, "\\\\\\\"");
-          } else if (Array.isArray(deepItem)) {
-            // Even deeper nesting - need to escape more
-            var deepestItems = deepItem.map(function (deepestItem) {
-              if (typeof deepestItem === "number") {
-                if (Number.isInteger(deepestItem)) {
-                  return "\\\\\\\\\\\\\\\"(ao-type-integer) ".concat(deepestItem, "\\\\\\\\\\\\\\\"");
-                } else {
-                  return "\\\\\\\\\\\\\\\"(ao-type-float) ".concat(formatFloat(deepestItem), "\\\\\\\\\\\\\\\"");
-                }
-              } else if (typeof deepestItem === "string") {
-                return "\\\\\\\\\\\\\\\"".concat(deepestItem, "\\\\\\\\\\\\\\\"");
-              } else {
-                return "\\\\\\\\\\\\\\\"".concat(String(deepestItem), "\\\\\\\\\\\\\\\"");
-              }
-            }).join(", ");
-            return "\\\\\\\"(ao-type-list) ".concat(deepestItems, "\\\\\\\"");
-          } else if (deepItem === null) {
-            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"null\\\\\\\\\\\\\\\"\\\\\\\"";
-          } else if (deepItem === undefined) {
-            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"undefined\\\\\\\\\\\\\\\"\\\\\\\"";
-          } else if (_typeof(deepItem) === "symbol") {
-            var _desc2 = deepItem.description || "Symbol.for()";
-            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"".concat(_desc2, "\\\\\\\\\\\\\\\"\\\\\\\"");
-          } else if (typeof deepItem === "boolean") {
-            return "\\\\\\\"(ao-type-atom) \\\\\\\\\\\\\\\"".concat(deepItem, "\\\\\\\\\\\\\\\"\\\\\\\"");
-          } else {
-            return "\\\\\\\"".concat(String(deepItem), "\\\\\\\"");
-          }
-        }).join(", ");
-        return "\\\"(ao-type-list) ".concat(deeperItems, "\\\"");
-      } else {
-        return "\\\"".concat(String(nestedItem), "\\\"");
       }
-    }).join(", ");
-    return "\"(ao-type-list) ".concat(nestedItems, "\"");
-  } else if (isBytes(item)) {
-    var buffer = toBuffer(item);
-    if (buffer.length === 0 || buffer.byteLength === 0) {
-      return "\"\"";
     }
-    return "\"(ao-type-binary)\"";
-  } else if (isPojo(item)) {
-    var json = JSON.stringify(item);
-    var escaped = json.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    return "\"(ao-type-map) ".concat(escaped, "\"");
-  } else {
-    return "\"".concat(String(item), "\"");
+  };
+  for (var _i2 = 0, _Object$entries2 = Object.entries(obj); _i2 < _Object$entries2.length; _i2++) {
+    _loop2();
   }
 }
-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);
+
+// Step 9: Handle case where all body keys are empty binaries
+function handleAllEmptyBinaryBodyKeys(obj, bodyKeys, headers, headerTypes) {
+  if (bodyKeys.length === 0) {
+    if (headerTypes.length > 0) {
+      headers["ao-types"] = headerTypes.sort().join(", ");
+    }
+    return {
+      headers: headers,
+      body: undefined
+    };
+  }
+  var allBodyKeysAreEmptyBinaries = bodyKeys.every(function (key) {
+    var value = (0, _encodeUtils.getValueByPath)(obj, key);
+    return (0, _encodeUtils.isBytes)(value) && (value.length === 0 || value.byteLength === 0);
+  });
+  if (allBodyKeysAreEmptyBinaries) {
+    if (headerTypes.length > 0) {
+      headers["ao-types"] = headerTypes.sort().join(", ");
+    }
+    return {
+      headers: headers,
+      body: undefined
+    };
   }
+  return null;
 }
-function collectBodyKeys(obj) {
-  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
-  console.log("=== collectBodyKeys START ===");
-  console.log("Input object:", JSON.stringify(obj));
-  var keys = [];
-  function traverse(current, path) {
-    console.log("[traverse] Called with path: \"".concat(path, "\""));
-    var hasSimpleFields = false;
-    var nestedPaths = [];
-    var hasArraysWithObjects = false;
-    var _loop = function _loop() {
-      var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-        key = _Object$entries$_i[0],
-        value = _Object$entries$_i[1];
-      var fullPath = path ? "".concat(path, "/").concat(key) : key;
-      if (Array.isArray(value)) {
-        console.log("[traverse] Found array at ".concat(fullPath, ", length: ").concat(value.length));
-        var hasObjects = value.some(function (item) {
-          return isPojo(item);
-        });
-        var hasNonObjects = value.some(function (item) {
-          return !isPojo(item);
-        });
-        if (value.length === 0) {
-          console.log("[traverse] Empty array at ".concat(fullPath, " - marking parent as having simple fields"));
-          hasSimpleFields = true;
-        } else if (hasObjects) {
-          hasArraysWithObjects = true;
-          // Check if we need special handling for mixed arrays
-          var hasEmptyStrings = value.some(function (item) {
-            return typeof item === "string" && item === "";
-          });
-          var hasEmptyObjects = value.some(function (item) {
-            return isPojo(item) && Object.keys(item).length === 0;
+
+// Step 10: Handle single body key optimization
+function handleSingleBodyKeyOptimization(_x5, _x6, _x7, _x8) {
+  return _handleSingleBodyKeyOptimization.apply(this, arguments);
+} // Step 11: Sort body keys
+function _handleSingleBodyKeyOptimization() {
+  _handleSingleBodyKeyOptimization = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(obj, bodyKeys, headers, headerTypes) {
+    var singleKey, value, otherFieldsAreEmpty, bodyBuffer, bodyArrayBuffer, contentDigest, base64;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          if (!(bodyKeys.length === 1)) {
+            _context5.next = 15;
+            break;
+          }
+          singleKey = bodyKeys[0];
+          value = (0, _encodeUtils.getValueByPath)(obj, singleKey);
+          otherFieldsAreEmpty = Object.entries(obj).every(function (_ref11) {
+            var _ref12 = _slicedToArray(_ref11, 2),
+              key = _ref12[0],
+              val = _ref12[1];
+            if (key === singleKey) return true;
+            return (0, _encodeUtils.isEmpty)(val);
           });
-          var hasNonEmptyObjects = value.some(function (item) {
-            return isPojo(item) && Object.keys(item).length > 0;
+          if (!(otherFieldsAreEmpty && (0, _encodeUtils.isBytes)(value) && value.length > 0)) {
+            _context5.next = 15;
+            break;
+          }
+          bodyBuffer = (0, _encodeUtils.toBuffer)(value);
+          bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
+          _context5.next = 9;
+          return (0, _encodeUtils.sha256)(bodyArrayBuffer);
+        case 9:
+          contentDigest = _context5.sent;
+          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
+          headers["content-digest"] = "sha-256=:".concat(base64, ":");
+          if (singleKey !== "body") {
+            headers["inline-body-key"] = singleKey;
+          }
+          if (headerTypes.length > 0) {
+            headers["ao-types"] = headerTypes.sort().join(", ");
+          }
+          return _context5.abrupt("return", {
+            headers: headers,
+            body: value
           });
+        case 15:
+          return _context5.abrupt("return", null);
+        case 16:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return _handleSingleBodyKeyOptimization.apply(this, arguments);
+}
+function sortBodyKeys(bodyKeys) {
+  return bodyKeys.sort(function (a, b) {
+    var aIsArrayElement = /\/\d+$/.test(a);
+    var bIsArrayElement = /\/\d+$/.test(b);
+    var aBase = a.split("/")[0];
+    var bBase = b.split("/")[0];
+    if (aBase === bBase) {
+      if (!aIsArrayElement && bIsArrayElement) {
+        return -1;
+      }
+      if (aIsArrayElement && !bIsArrayElement) {
+        return 1;
+      }
+      if (aIsArrayElement && bIsArrayElement) {
+        var aIndex = parseInt(a.split("/")[1]);
+        var bIndex = parseInt(b.split("/")[1]);
+        return aIndex - bIndex;
+      }
+      return a.localeCompare(b);
+    }
+    return a.localeCompare(b);
+  });
+}
 
-          // Check if objects contain only empty values (not empty objects)
-          var hasObjectsWithOnlyEmptyValues = value.some(function (item) {
-            if (!isPojo(item) || Object.keys(item).length === 0) return false;
-            return Object.values(item).every(function (v) {
-              return typeof v === "string" && v === "" || Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
-            });
-          });
+// Step 12: Check for special data/body case
+function checkSpecialDataBodyCase(obj, sortedBodyKeys) {
+  return sortedBodyKeys.includes("data") && sortedBodyKeys.includes("body") && obj.data && obj.data.body && (0, _encodeUtils.isBytes)(obj.data.body) && obj.body && obj.body.data && (0, _encodeUtils.isBytes)(obj.body.data);
+}
+
+// Step 13.2.2: Handle empty string in nested path
+function handleEmptyStringInNestedPath(bodyKey, value, pathParts) {
+  if (typeof value === "string" && value === "" && pathParts.length > 1) {
+    var lines = [];
+    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+    lines.push("");
+    lines.push("");
+    return new Blob([lines.join("\r\n")]);
+  }
+  return null;
+}
 
-          // Only use special handling if we have BOTH empty elements AND non-empty objects
-          if ((hasEmptyStrings || hasEmptyObjects) && hasNonEmptyObjects) {
-            // Special case: mixed array with empty strings/objects - only non-empty objects get parts
-            value.forEach(function (item, index) {
-              if (isPojo(item) && Object.keys(item).length > 0) {
-                var itemPath = "".concat(fullPath, "/").concat(index + 1);
-                keys.push(itemPath);
-                nestedPaths.push(itemPath);
-              }
-            });
-            if (hasNonObjects) {
-              hasSimpleFields = true;
-              keys.push(fullPath);
+// Step 13.2.3.2: Handle arrays with only empty elements
+function handleArrayWithOnlyEmptyElements(bodyKey, value, headers, sortedBodyKeys) {
+  var fieldLines = [];
+  var partTypes = [];
+  value.forEach(function (item, idx) {
+    var index = idx + 1;
+    var itemType = (0, _encodeUtils.getAoType)(item);
+    if (itemType) {
+      partTypes.push("".concat(index, "=\"").concat(itemType, "\""));
+    }
+  });
+  var isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
+  if (isInline) {
+    var orderedLines = [];
+    if (partTypes.length > 0) {
+      orderedLines.push("ao-types: ".concat((0, _encodeUtils.sortTypeAnnotations)(partTypes).join(", ")));
+    }
+    orderedLines.push("content-disposition: inline");
+    orderedLines.push("");
+    return new Blob([orderedLines.join("\r\n")]);
+  } else {
+    var _orderedLines = [];
+    if (partTypes.length > 0) {
+      _orderedLines.push("ao-types: ".concat((0, _encodeUtils.sortTypeAnnotations)(partTypes).join(", ")));
+    }
+    _orderedLines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+    var isLastBodyPart = sortedBodyKeys.indexOf(bodyKey) === sortedBodyKeys.length - 1;
+    var hasOnlyTypes = partTypes.length > 0 && fieldLines.length === 0;
+    if (isLastBodyPart && hasOnlyTypes) {
+      return new Blob([_orderedLines.join("\r\n")]);
+    } else {
+      _orderedLines.push("");
+      return new Blob([_orderedLines.join("\r\n")]);
+    }
+  }
+}
+
+// Step 13.2.3.3: Build indices with own parts
+function buildIndicesWithOwnParts(bodyKey, sortedBodyKeys) {
+  var indicesWithOwnParts = new Set();
+  sortedBodyKeys.forEach(function (key) {
+    if (key.startsWith(bodyKey + "/")) {
+      var subPath = key.substring(bodyKey.length + 1);
+      var match = subPath.match(/^(\d+)/);
+      if (match) {
+        indicesWithOwnParts.add(parseInt(match[1]));
+      }
+    }
+  });
+  return indicesWithOwnParts;
+}
+
+// Step 13.2.3.4: Process array items
+function processArrayItems(value, indicesWithOwnParts, hasNestedObjectParts, pathParts) {
+  var fieldLines = [];
+  var partTypes = [];
+  if (hasNestedObjectParts) {
+    value.forEach(function (item, idx) {
+      var index = idx + 1;
+      if (Array.isArray(item)) {
+        partTypes.push("".concat(index, "=\"list\""));
+      }
+    });
+  }
+  value.forEach(function (item, idx) {
+    var index = idx + 1;
+    if (indicesWithOwnParts.has(index)) {
+      return;
+    }
+    if (hasNestedObjectParts && Array.isArray(item) && item.some(function (subItem) {
+      return (0, _encodeUtils.isPojo)(subItem);
+    })) {
+      return;
+    }
+    if (typeof item === "string" && item === "") {
+      partTypes.push("".concat(index, "=\"empty-binary\""));
+    } else if ((0, _encodeUtils.isPojo)(item) && Object.keys(item).length === 0) {
+      partTypes.push("".concat(index, "=\"empty-message\""));
+    } else if ((0, _encodeUtils.isPojo)(item)) {
+      // Non-empty objects are handled elsewhere
+    } else if (Array.isArray(item)) {
+      if (item.length === 0) {
+        partTypes.push("".concat(index, "=\"empty-list\""));
+      } else {
+        partTypes.push("".concat(index, "=\"list\""));
+        var encodedItems = item.map(function (subItem) {
+          if (typeof subItem === "number") {
+            if (Number.isInteger(subItem)) {
+              return "\"(ao-type-integer) ".concat(subItem, "\"");
+            } else {
+              return "\"(ao-type-float) ".concat((0, _encodeUtils.formatFloat)(subItem), "\"");
             }
-          } else if (hasObjectsWithOnlyEmptyValues && !hasNonObjects) {
-            // Special case: objects that contain only empty values should get parts
-            value.forEach(function (item, index) {
-              if (isPojo(item)) {
-                var itemPath = "".concat(fullPath, "/").concat(index + 1);
-                keys.push(itemPath);
-                if (Object.keys(item).length > 0) {
-                  nestedPaths.push(itemPath);
-                }
-              }
-            });
-          } else {
-            // Normal case: all objects get parts
-            value.forEach(function (item, index) {
-              if (isPojo(item)) {
-                var itemPath = "".concat(fullPath, "/").concat(index + 1);
-                keys.push(itemPath);
-                if (Object.keys(item).length > 0) {
-                  nestedPaths.push(itemPath);
-                }
-              }
-            });
-            if (hasNonObjects) {
-              hasSimpleFields = true;
-              keys.push(fullPath);
+          } else if (typeof subItem === "string") {
+            return "\"".concat(subItem, "\"");
+          } else if (subItem === null) {
+            return "\"(ao-type-atom) \\\"null\\\"\"";
+          } else if (subItem === undefined) {
+            return "\"(ao-type-atom) \\\"undefined\\\"\"";
+          } else if (_typeof(subItem) === "symbol") {
+            var desc = subItem.description || "Symbol.for()";
+            return "\"(ao-type-atom) \\\"".concat(desc, "\\\"\"");
+          } else if (typeof subItem === "boolean") {
+            return "\"(ao-type-atom) \\\"".concat(subItem, "\\\"\"");
+          } else if (Array.isArray(subItem)) {
+            return (0, _encodeArrayItem["default"])(subItem);
+          } else if ((0, _encodeUtils.isBytes)(subItem)) {
+            var buffer = (0, _encodeUtils.toBuffer)(subItem);
+            if (buffer.length === 0 || buffer.byteLength === 0) {
+              return "\"\"";
             }
-          }
-        } else {
-          console.log("[traverse] Non-empty array without objects at ".concat(fullPath, " - marking as simple field"));
-          hasSimpleFields = true;
-        }
-      } else if (isPojo(value)) {
-        if (Object.keys(value).length === 0) {
-          console.log("[traverse] Empty object at ".concat(fullPath, " - marking parent as having simple fields"));
-          hasSimpleFields = true;
-        } else {
-          // Don't traverse into the object if it only contains empty values
-          var containsOnlyEmptyCollections = Object.entries(value).every(function (_ref) {
-            var _ref2 = _slicedToArray(_ref, 2),
-              k = _ref2[0],
-              v = _ref2[1];
-            return Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0 || isBytes(v) && (v.length === 0 || v.byteLength === 0) || typeof v === "string" && v.length === 0;
-          });
-          if (containsOnlyEmptyCollections && Object.keys(value).length > 0) {
-            console.log("[traverse] Object at ".concat(fullPath, " contains only empty collections - adding as body key"));
-            keys.push(fullPath);
+            return "\"(ao-type-binary)\"";
+          } else if ((0, _encodeUtils.isPojo)(subItem)) {
+            var json = JSON.stringify(subItem);
+            var escaped = json.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+            return "\"(ao-type-map) ".concat(escaped, "\"");
           } else {
-            // Check if this object contains arrays with only empty elements
-            var hasArraysWithOnlyEmptyElements = Object.entries(value).some(function (_ref3) {
-              var _ref4 = _slicedToArray(_ref3, 2),
-                k = _ref4[0],
-                v = _ref4[1];
-              return Array.isArray(v) && v.length > 0 && v.every(function (item) {
-                return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
-              });
-            });
-            if (hasArraysWithOnlyEmptyElements) {
-              // This object needs a body part to show its array types
-              console.log("[traverse] Object at ".concat(fullPath, " has arrays with empty elements - adding as body key"));
-              keys.push(fullPath);
-            }
-            console.log("[traverse] Non-empty object at ".concat(fullPath, " - will traverse into it"));
-            nestedPaths.push(fullPath);
+            return "\"".concat(String(subItem), "\"");
           }
-        }
-      } else if (isBytes(value)) {
-        var buffer = toBuffer(value);
-        if (buffer.length > 0) {
-          hasSimpleFields = true;
-        }
-      } else if (typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null || value === undefined || _typeof(value) === "symbol") {
-        hasSimpleFields = true;
+        }).join(", ");
+        fieldLines.push("".concat(index, ": ").concat(encodedItems));
+      }
+    } else if (typeof item === "number") {
+      if (Number.isInteger(item)) {
+        partTypes.push("".concat(index, "=\"integer\""));
+        fieldLines.push("".concat(index, ": ").concat(item));
+      } else {
+        partTypes.push("".concat(index, "=\"float\""));
+        fieldLines.push("".concat(index, ": ").concat((0, _encodeUtils.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") {
+        var desc = item.description || "Symbol.for()";
+        fieldLines.push("".concat(index, ": ").concat(desc));
+      } else {
+        fieldLines.push("".concat(index, ": ").concat(item));
+      }
+    } else if ((0, _encodeUtils.isBytes)(item)) {
+      var buffer = (0, _encodeUtils.toBuffer)(item);
+      if (buffer.length === 0) {
+        partTypes.push("".concat(index, "=\"empty-binary\""));
+      } else {
+        partTypes.push("".concat(index, "=\"binary\""));
       }
-    };
-    for (var _i = 0, _Object$entries = Object.entries(current); _i < _Object$entries.length; _i++) {
-      _loop();
-    }
-    if (hasSimpleFields) {
-      console.log("[traverse] Adding \"".concat(path, "\" to keys (has simple fields)"));
-      keys.push(path);
-    } else if (hasArraysWithObjects && path) {
-      // If the object only contains arrays with objects, we still need to add it as a body key
-      console.log("[traverse] Adding \"".concat(path, "\" to keys (contains arrays with objects)"));
-      keys.push(path);
     }
+  });
+  return {
+    fieldLines: fieldLines,
+    partTypes: partTypes
+  };
+}
 
-    // Check for arrays with only empty elements that need their own body parts
-    for (var _i2 = 0, _Object$entries2 = Object.entries(current); _i2 < _Object$entries2.length; _i2++) {
-      var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
-        key = _Object$entries2$_i[0],
-        value = _Object$entries2$_i[1];
-      var fullPath = path ? "".concat(path, "/").concat(key) : key;
-      if (Array.isArray(value) && value.length > 0) {
-        var hasOnlyEmptyElements = value.every(function (item) {
-          return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
-        });
-        if (hasOnlyEmptyElements) {
-          console.log("[traverse] Array at ".concat(fullPath, " has only empty elements - adding as body key"));
-          keys.push(fullPath);
-        }
-      }
+// Step 13.2.3.5: Create array body part
+function createArrayBodyPart(bodyKey, fieldLines, partTypes, headers) {
+  var isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
+  if (isInline) {
+    var orderedLines = [];
+    if (partTypes.length > 0) {
+      orderedLines.push("ao-types: ".concat((0, _encodeUtils.sortTypeAnnotations)(partTypes).join(", ")));
     }
-    for (var _i3 = 0, _nestedPaths = nestedPaths; _i3 < _nestedPaths.length; _i3++) {
-      var nestedPath = _nestedPaths[_i3];
-      var parts = nestedPath.split("/");
-      var nestedObj = obj;
-      var _iterator = _createForOfIteratorHelper(parts),
+    orderedLines.push("content-disposition: inline");
+    if (fieldLines.length > 0) {
+      orderedLines.push("");
+      var _iterator = _createForOfIteratorHelper(fieldLines),
         _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];
-          }
+          var line = _step.value;
+          orderedLines.push(line);
         }
       } catch (err) {
         _iterator.e(err);
       } finally {
         _iterator.f();
       }
-      if (isPojo(nestedObj)) {
-        traverse(nestedObj, nestedPath);
+    }
+    return new Blob([orderedLines.join("\r\n") + "\r\n"]);
+  } else {
+    var _orderedLines2 = [];
+    if (partTypes.length > 0) {
+      _orderedLines2.push("ao-types: ".concat((0, _encodeUtils.sortTypeAnnotations)(partTypes).join(", ")));
+    }
+    _orderedLines2.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+    var _iterator2 = _createForOfIteratorHelper(fieldLines),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _line = _step2.value;
+        _orderedLines2.push(_line);
       }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    if (fieldLines.length > 0) {
+      return new Blob([_orderedLines2.join("\r\n") + "\r\n"]);
+    } else {
+      return new Blob([_orderedLines2.join("\r\n")]);
     }
   }
-  var objKeys = Object.keys(obj);
-  var _loop2 = function _loop2() {
-    var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i4], 2),
-      key = _Object$entries3$_i[0],
-      value = _Object$entries3$_i[1];
-    console.log("\n[main loop] Processing key: \"".concat(key, "\""));
-    console.log("[main loop] Value type: ".concat(Array.isArray(value) ? "array" : _typeof(value)));
-    console.log("[main loop] Array length: ".concat(Array.isArray(value) ? value.length : "N/A"));
-    if ((key === "data" || key === "body") && (typeof value === "string" || typeof value === "boolean" || typeof value === "number" || value === null || value === undefined || _typeof(value) === "symbol") && objKeys.length > 1) {
-      // Special handling: only add to body keys if there's no other data/body field with an object
-      if (key === "data" && obj.body && isPojo(obj.body) && Object.keys(obj.body).length > 0) {
-        console.log("[main loop] Skipping special data field");
-      } else if (key === "body" && obj.data && isPojo(obj.data) && Object.keys(obj.data).length > 0) {
-        console.log("[main loop] Skipping special body field");
-      } else {
-        console.log("[main loop] Adding special data/body key: \"".concat(key, "\""));
-        keys.push(key);
-      }
-    } else if (Array.isArray(value)) {
-      if (value.length === 0) {
-        console.log("[main loop] SKIPPING empty array for key: \"".concat(key, "\""));
-        return 1; // continue
-      }
-      var hasObjects = value.some(function (item) {
-        return isPojo(item);
-      });
-      var hasArrays = value.some(function (item) {
-        return Array.isArray(item);
-      });
-      var hasNonObjects = value.some(function (item) {
-        return !isPojo(item);
-      });
+}
 
-      // Check if this is an array of arrays containing objects
-      var hasArraysOfObjects = value.some(function (item) {
-        return Array.isArray(item) && item.some(function (subItem) {
-          return isPojo(subItem);
-        });
-      });
-      console.log("[main loop] Array analysis: hasObjects=".concat(hasObjects, ", hasArrays=").concat(hasArrays, ", hasNonObjects=").concat(hasNonObjects, ", hasArraysOfObjects=").concat(hasArraysOfObjects));
-      if (value.length > 0) {
-        var bodyPartCounter = 1; // Start counting from 1
+// Step 13.2.3: Handle array values
+function handleArrayValue(bodyKey, value, headers, sortedBodyKeys, pathParts) {
+  var arrayInfo = (0, _encodeUtils.analyzeArray)(value);
+  if (arrayInfo.hasOnlyNonEmptyObjects) {
+    return null;
+  }
+  if (arrayInfo.hasOnlyEmptyElements) {
+    return handleArrayWithOnlyEmptyElements(bodyKey, value, headers, sortedBodyKeys);
+  }
+  var indicesWithOwnParts = buildIndicesWithOwnParts(bodyKey, sortedBodyKeys);
+  var hasNestedObjectParts = sortedBodyKeys.some(function (key) {
+    return key.startsWith(bodyKey + "/") && key.split("/").length > pathParts.length + 1;
+  });
+  var _processArrayItems = processArrayItems(value, indicesWithOwnParts, hasNestedObjectParts, pathParts),
+    fieldLines = _processArrayItems.fieldLines,
+    partTypes = _processArrayItems.partTypes;
+  return createArrayBodyPart(bodyKey, fieldLines, partTypes, headers);
+}
 
-        // Check for special mixed array case
-        var hasEmptyStrings = value.some(function (item) {
-          return typeof item === "string" && item === "";
-        });
-        var hasEmptyObjects = value.some(function (item) {
-          return isPojo(item) && Object.keys(item).length === 0;
-        });
+// Step 13.2.4.3: Process object fields
+function processObjectFields(value, bodyKey, sortedBodyKeys) {
+  var objectTypes = [];
+  var fieldLines = [];
+  var binaryFields = [];
+  var arrayTypes = [];
 
-        // Check for objects that contain only empty values
-        var hasObjectsWithOnlyEmptyValues = value.some(function (item) {
-          if (!isPojo(item) || Object.keys(item).length === 0) return false;
-          return Object.values(item).every(function (v) {
-            return typeof v === "string" && v === "" || Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
-          });
-        });
-        if (hasArraysOfObjects) {
-          // Handle arrays of arrays containing objects
-          value.forEach(function (item, index) {
-            if (Array.isArray(item)) {
-              item.forEach(function (subItem, subIndex) {
-                if (isPojo(subItem)) {
-                  var path = "".concat(key, "/").concat(index + 1, "/").concat(subIndex + 1);
-                  console.log("[main loop] Adding nested object path: \"".concat(path, "\""));
-                  keys.push(path);
-                }
-              });
-            }
-            bodyPartCounter++;
-          });
-          // Always add the main array key
-          console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
-          keys.push(key);
-        } else if (hasObjects && (hasEmptyStrings || hasEmptyObjects) && !hasObjectsWithOnlyEmptyValues) {
-          // Special handling: only non-empty objects get parts
-          value.forEach(function (item, index) {
-            if (isPojo(item) && Object.keys(item).length > 0) {
-              var path = "".concat(key, "/").concat(bodyPartCounter);
-              console.log("[main loop] Adding non-empty object path: \"".concat(path, "\" (array index ").concat(index, ")"));
-              keys.push(path);
-              // Add paths for nested objects
-              for (var _i5 = 0, _Object$entries4 = Object.entries(item); _i5 < _Object$entries4.length; _i5++) {
-                var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
-                  nestedKey = _Object$entries4$_i[0],
-                  nestedValue = _Object$entries4$_i[1];
-                if (isPojo(nestedValue)) {
-                  var nestedPath = "".concat(key, "/").concat(bodyPartCounter, "/").concat(nestedKey);
-                  console.log("[main loop] Adding nested object path: \"".concat(nestedPath, "\""));
-                  keys.push(nestedPath);
-                }
-              }
-            }
-            bodyPartCounter++;
-          });
-          // Always add the main array key
-          console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
-          keys.push(key);
-        } else if (hasObjects) {
-          // Normal handling: all objects get parts (except if parent array has only empty elements)
-          var skipEmptyObjects = false;
+  // First collect array types
+  for (var _i3 = 0, _Object$entries3 = Object.entries(value); _i3 < _Object$entries3.length; _i3++) {
+    var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2),
+      k = _Object$entries3$_i[0],
+      v = _Object$entries3$_i[1];
+    if (Array.isArray(v)) {
+      arrayTypes.push("".concat(k.toLowerCase(), "=\"").concat(v.length === 0 ? "empty-list" : "list", "\""));
+    }
+  }
 
-          // Check if this array contains only empty elements
-          var arrayHasOnlyEmptyElements = value.every(function (item) {
-            return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
-          });
-          if (arrayHasOnlyEmptyElements) {
-            skipEmptyObjects = true;
-          }
-          value.forEach(function (item, index) {
-            if (isPojo(item)) {
-              // Skip empty objects if array has only empty elements
-              if (skipEmptyObjects && Object.keys(item).length === 0) {
-                bodyPartCounter++;
-                return;
-              }
-              var path = "".concat(key, "/").concat(bodyPartCounter);
-              console.log("[main loop] Adding object path: \"".concat(path, "\" (array index ").concat(index, ", empty=").concat(Object.keys(item).length === 0, ")"));
-              keys.push(path);
-              // Add paths for nested objects (but not empty ones)
-              if (Object.keys(item).length > 0) {
-                for (var _i6 = 0, _Object$entries5 = Object.entries(item); _i6 < _Object$entries5.length; _i6++) {
-                  var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2),
-                    nestedKey = _Object$entries5$_i[0],
-                    nestedValue = _Object$entries5$_i[1];
-                  if (isPojo(nestedValue) && Object.keys(nestedValue).length > 0) {
-                    var nestedPath = "".concat(key, "/").concat(bodyPartCounter, "/").concat(nestedKey);
-                    console.log("[main loop] Adding nested object path: \"".concat(nestedPath, "\""));
-                    keys.push(nestedPath);
-                  }
-                }
-              }
-            } else if (typeof item === "string" && item === "") {
-              // Empty strings may get parts in some formats
-              var _path = "".concat(key, "/").concat(bodyPartCounter);
-              console.log("[main loop] Adding empty string path: \"".concat(_path, "\" (array index ").concat(index, ")"));
-              keys.push(_path);
-            }
-            bodyPartCounter++;
-          });
-          // Don't add main array key for arrays with only objects containing empty values
-          if (!hasObjectsWithOnlyEmptyValues || value.some(function (item) {
-            return !isPojo(item);
-          })) {
-            // Check if array has only empty elements
-            var hasOnlyEmptyElements = value.every(function (item) {
-              return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
-            });
-            if (!hasOnlyEmptyElements) {
-              // Always add the main array key
-              console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
-              keys.push(key);
-            }
-          }
-        } else {
-          // Check if array has only empty elements
-          var hasOnlyEmptyArraysOrObjects = value.every(function (item) {
-            return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
-          });
-          if (hasOnlyEmptyArraysOrObjects && value.length > 0) {
-            // Always add the main array key for arrays with only empty elements
-            console.log("[main loop] ADDING main array key for empty elements: \"".concat(key, "\""));
-            keys.push(key);
-          } else if (!hasOnlyEmptyArraysOrObjects) {
-            // Always add the main array key
-            console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
-            keys.push(key);
-          }
-        }
+  // Then process other fields
+  for (var _i4 = 0, _Object$entries4 = Object.entries(value); _i4 < _Object$entries4.length; _i4++) {
+    var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2),
+      _k = _Object$entries4$_i[0],
+      _v = _Object$entries4$_i[1];
+    var childPath = "".concat(bodyKey, "/").concat(_k);
+    if (sortedBodyKeys.includes(childPath)) {
+      continue;
+    }
+    if (Array.isArray(_v) && _v.some(function (item) {
+      return (0, _encodeUtils.isPojo)(item);
+    })) {
+      var hasOnlyEmpty = _v.every(function (item) {
+        return (0, _encodeUtils.isEmpty)(item);
+      });
+      if (hasOnlyEmpty) {
+        continue;
+      }
+    }
+    if (Array.isArray(_v)) {
+      // Type already added in arrayTypes
+    } else if (_v === null || _v === undefined || _typeof(_v) === "symbol" || typeof _v === "boolean") {
+      objectTypes.push("".concat(_k.toLowerCase(), "=\"atom\""));
+    } else if (typeof _v === "number") {
+      objectTypes.push("".concat(_k.toLowerCase(), "=\"").concat(Number.isInteger(_v) ? "integer" : "float", "\""));
+    } else if (typeof _v === "string" && _v.length === 0) {
+      objectTypes.push("".concat(_k.toLowerCase(), "=\"empty-binary\""));
+    } else if ((0, _encodeUtils.isBytes)(_v) && (_v.length === 0 || _v.byteLength === 0)) {
+      objectTypes.push("".concat(_k.toLowerCase(), "=\"empty-binary\""));
+    } else if ((0, _encodeUtils.isPojo)(_v) && Object.keys(_v).length === 0) {
+      objectTypes.push("".concat(_k.toLowerCase(), "=\"empty-message\""));
+    }
+    if (typeof _v === "string") {
+      if (_v.length === 0) {
+        fieldLines.push("".concat(_k, ": "));
+      } else {
+        fieldLines.push("".concat(_k, ": ").concat(_v));
       }
-    } else if (isPojo(value)) {
-      console.log("[main loop] Processing object at key: \"".concat(key, "\""));
-      // Objects should be traversed, not have their fields individually added
-      traverse(value, key);
-    } else if (isBytes(value)) {
-      var buffer = toBuffer(value);
-      if (buffer.length > 0) {
-        console.log("[main loop] Adding key for non-empty bytes: \"".concat(key, "\""));
-        keys.push(key);
+    } else if (typeof _v === "number") {
+      fieldLines.push("".concat(_k, ": ").concat(_v));
+    } else if (typeof _v === "boolean") {
+      fieldLines.push("".concat(_k, ": \"").concat(_v, "\""));
+    } else if (_v === null) {
+      fieldLines.push("".concat(_k, ": \"null\""));
+    } else if (_v === undefined) {
+      fieldLines.push("".concat(_k, ": \"undefined\""));
+    } else if (_typeof(_v) === "symbol") {
+      var desc = _v.description || "Symbol.for()";
+      fieldLines.push("".concat(_k, ": \"").concat(desc, "\""));
+    } else if ((0, _encodeUtils.isBytes)(_v)) {
+      var buffer = (0, _encodeUtils.toBuffer)(_v);
+      binaryFields.push({
+        key: _k,
+        buffer: buffer
+      });
+    } else if (Array.isArray(_v) && _v.length > 0) {
+      var _childPath = "".concat(bodyKey, "/").concat(_k);
+      if (!sortedBodyKeys.includes(_childPath)) {
+        var hasObjects = _v.some(function (item) {
+          return (0, _encodeUtils.isPojo)(item);
+        });
+        if (!hasObjects) {
+          var encodedItems = _v.map(function (item) {
+            return (0, _encodeArrayItem["default"])(item);
+          }).join(", ");
+          fieldLines.push("".concat(_k, ": ").concat(encodedItems));
+        }
       }
-    } else if (typeof value === "string" && value.includes("\n")) {
-      console.log("[main loop] Adding key for string with newline: \"".concat(key, "\""));
-      keys.push(key);
-    } else if (typeof value === "string" && hasNonAscii(value)) {
-      console.log("[main loop] Adding key for non-ASCII string: \"".concat(key, "\""));
-      keys.push(key);
-    } else {
-      console.log("[main loop] Skipping key: \"".concat(key, "\" (no match)"));
     }
-  };
-  for (var _i4 = 0, _Object$entries3 = Object.entries(obj); _i4 < _Object$entries3.length; _i4++) {
-    if (_loop2()) continue;
   }
-  var result = _toConsumableArray(new Set(keys)).filter(function (k) {
-    if (k === "") return false;
-
-    // Check if this is a path to an empty object inside an array with only empty elements
-    var parts = k.split("/");
-    if (parts.length >= 2 && /^\d+$/.test(parts[parts.length - 1])) {
-      // This is an array element path like "maps/1"
-      var arrayPath = parts.slice(0, -1).join("/");
-      var arrayValue = obj;
+  var allTypes = [].concat(arrayTypes, objectTypes);
+  return {
+    allTypes: allTypes,
+    fieldLines: fieldLines,
+    binaryFields: binaryFields
+  };
+}
 
-      // Navigate to the array
-      var _iterator2 = _createForOfIteratorHelper(parts.slice(0, -1)),
-        _step2;
+// Step 13.2.4.5: Create object body part
+function createObjectBodyPart(bodyKey, value, allTypes, fieldLines, binaryFields, headers, sortedBodyKeys) {
+  var isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
+  var lines = [];
+  if (isInline) {
+    lines.push("content-disposition: inline");
+  } else {
+    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+  }
+  if (isInline) {
+    var orderedLines = [];
+    var _iterator3 = _createForOfIteratorHelper(fieldLines),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var line = _step3.value;
+        orderedLines.push(line);
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+    if (allTypes.length > 0) {
+      orderedLines.push("ao-types: ".concat(allTypes.sort().join(", ")));
+    }
+    orderedLines.push("content-disposition: inline");
+    var binaryFieldsForInline = Object.entries(value).filter(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+        k = _ref2[0],
+        v = _ref2[1];
+      return (0, _encodeUtils.isBytes)(v) && !sortedBodyKeys.includes("".concat(bodyKey, "/").concat(k));
+    }).map(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+        k = _ref4[0],
+        v = _ref4[1];
+      return {
+        key: k,
+        buffer: (0, _encodeUtils.toBuffer)(v)
+      };
+    });
+    if (binaryFieldsForInline.length > 0) {
+      var parts = [];
+      parts.push(Buffer.from(orderedLines.join("\r\n")));
+      var _iterator4 = _createForOfIteratorHelper(binaryFieldsForInline),
+        _step4;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var part = _step2.value;
-          if (/^\d+$/.test(part)) {
-            arrayValue = arrayValue[parseInt(part) - 1];
-          } else {
-            arrayValue = arrayValue[part];
-          }
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var _step4$value = _step4.value,
+            key = _step4$value.key,
+            buffer = _step4$value.buffer;
+          parts.push(Buffer.from("\r\n".concat(key, ": ")));
+          parts.push(buffer);
         }
-
-        // Check if this array contains only empty elements
       } catch (err) {
-        _iterator2.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator2.f();
+        _iterator4.f();
       }
-      if (Array.isArray(arrayValue)) {
-        var hasOnlyEmptyElements = arrayValue.every(function (item) {
-          return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
-        });
-        if (hasOnlyEmptyElements) {
-          // Filter out paths to individual empty elements
-          console.log("[filter] Removing path to empty element: \"".concat(k, "\""));
-          return false;
+      parts.push(Buffer.from("\r\n"));
+      var fullBody = Buffer.concat(parts);
+      return new Blob([fullBody]);
+    } else {
+      var isLastBodyPart = sortedBodyKeys.indexOf(bodyKey) === sortedBodyKeys.length - 1;
+      var hasOnlyTypes = allTypes.length > 0 && fieldLines.length === 0;
+      if (isLastBodyPart && hasOnlyTypes) {
+        return new Blob([orderedLines.join("\r\n")]);
+      } else if (fieldLines.length === 0) {
+        return new Blob([orderedLines.join("\r\n")]);
+      } else {
+        return new Blob([orderedLines.join("\r\n") + "\r\n"]);
+      }
+    }
+  } else {
+    var _orderedLines3 = [];
+    if (allTypes.length > 0) {
+      _orderedLines3.push("ao-types: ".concat(allTypes.sort().join(", ")));
+    }
+    _orderedLines3.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+    var hasBinaryFields = binaryFields && binaryFields.length > 0;
+    if (hasBinaryFields || fieldLines.length === 0) {
+      _orderedLines3.push("");
+    }
+    var _iterator5 = _createForOfIteratorHelper(fieldLines),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var _line2 = _step5.value;
+        _orderedLines3.push(_line2);
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+    if (binaryFields && binaryFields.length > 0) {
+      var _parts = [];
+      var headerText = _orderedLines3.join("\r\n");
+      _parts.push(Buffer.from(headerText));
+      for (var i = 0; i < binaryFields.length; i++) {
+        var _binaryFields$i = binaryFields[i],
+          _key = _binaryFields$i.key,
+          _buffer = _binaryFields$i.buffer;
+        if (i > 0) {
+          _parts.push(Buffer.from("\r\n"));
         }
+        _parts.push(Buffer.from("".concat(_key, ": ")));
+        _parts.push(_buffer);
+      }
+      _parts.push(Buffer.from("\r\n"));
+      var _fullBody = Buffer.concat(_parts);
+      return new Blob([_fullBody]);
+    } else {
+      if (fieldLines.length > 0) {
+        return new Blob([_orderedLines3.join("\r\n") + "\r\n"]);
+      } else {
+        return new Blob([_orderedLines3.join("\r\n")]);
+      }
+    }
+  }
+}
+
+// Step 13.2.4: Handle object values
+function handleObjectValue(obj, bodyKey, value, headers, sortedBodyKeys, pathParts, hasSpecialDataBody) {
+  if (Object.keys(value).length === 0) {
+    // Skip empty objects in certain contexts
+    var parentPath = pathParts.slice(0, -1).join("/");
+    var parentValue = parentPath ? (0, _encodeUtils.getValueByPath)(obj, parentPath) : obj;
+    if (Array.isArray(parentValue)) {
+      var parentArrayInfo = (0, _encodeUtils.analyzeArray)(parentValue);
+      if (parentArrayInfo.hasObjects && (parentArrayInfo.hasEmptyStrings || parentArrayInfo.hasEmptyObjects)) {
+        return null;
       }
     }
-    return true;
+    return null;
+  }
+
+  // Skip special data/body case
+  if (hasSpecialDataBody && bodyKey === "data" && Object.keys(value).length === 1 && value.body && (0, _encodeUtils.isBytes)(value.body)) {
+    return null;
+  }
+  var _processObjectFields = processObjectFields(value, bodyKey, sortedBodyKeys),
+    allTypes = _processObjectFields.allTypes,
+    fieldLines = _processObjectFields.fieldLines,
+    binaryFields = _processObjectFields.binaryFields;
+
+  // Check if object should be skipped
+  var hasOnlyEmptyCollections = Object.entries(value).every(function (_ref5) {
+    var _ref6 = _slicedToArray(_ref5, 2),
+      k = _ref6[0],
+      v = _ref6[1];
+    return (0, _encodeUtils.isEmpty)(v);
   });
-  console.log("\n=== collectBodyKeys RESULT ===");
-  console.log("Final bodyKeys:", JSON.stringify(result));
-  console.log("=== collectBodyKeys END ===\n");
-  return result;
+  var hasArraysWithOnlyEmptyElements = Object.entries(value).some(function (_ref7) {
+    var _ref8 = _slicedToArray(_ref7, 2),
+      k = _ref8[0],
+      v = _ref8[1];
+    return Array.isArray(v) && v.length > 0 && v.every(function (item) {
+      return (0, _encodeUtils.isEmpty)(item);
+    });
+  });
+  var shouldSkipObject = Object.entries(value).every(function (_ref9) {
+    var _ref10 = _slicedToArray(_ref9, 2),
+      k = _ref10[0],
+      v = _ref10[1];
+    var childPath = "".concat(bodyKey, "/").concat(k);
+    if (sortedBodyKeys.includes(childPath)) return true;
+    if (Array.isArray(v) && v.some(function (item) {
+      return (0, _encodeUtils.isPojo)(item);
+    })) {
+      var hasOnlyEmpty = v.every(function (item) {
+        return (0, _encodeUtils.isEmpty)(item);
+      });
+      return hasOnlyEmpty || sortedBodyKeys.includes(childPath);
+    }
+    return false;
+  });
+  if (shouldSkipObject && !hasOnlyEmptyCollections && !hasArraysWithOnlyEmptyElements) {
+    return null;
+  }
+  return createObjectBodyPart(bodyKey, value, allTypes, fieldLines, binaryFields, headers, sortedBodyKeys);
+}
+
+// Step 13.2.5: Handle primitive values
+function handlePrimitiveValue(bodyKey, value, headers) {
+  var isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
+  var lines = [];
+  if (isInline) {
+    lines.push("content-disposition: inline");
+  } else {
+    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+  }
+  if (typeof value === "string") {
+    lines.push("");
+    lines.push(value);
+    return new Blob([lines.join("\r\n")]);
+  } else {
+    var content = (0, _encodeUtils.encodePrimitiveContent)(value);
+    lines.push("");
+    lines.push(content);
+    return new Blob([lines.join("\r\n")]);
+  }
+}
+
+// Step 13.2.6: Handle binary values
+function handleBinaryValue(bodyKey, value, headers) {
+  var isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
+  var lines = [];
+  if (isInline) {
+    lines.push("content-disposition: inline");
+  } else {
+    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+  }
+  var buffer = (0, _encodeUtils.toBuffer)(value);
+  var headerText = lines.join("\r\n") + "\r\n\r\n";
+  return new Blob([headerText, buffer]);
+}
+
+// Step 13.3: Handle special data/body case
+function handleSpecialDataBodyCase(obj, hasSpecialDataBody) {
+  if (hasSpecialDataBody && obj.data && obj.data.body && (0, _encodeUtils.isBytes)(obj.data.body)) {
+    var buffer = (0, _encodeUtils.toBuffer)(obj.data.body);
+    var specialPart = ["content-disposition: form-data;name=\"data/body\"", "", ""].join("\r\n");
+    return new Blob([specialPart, buffer]);
+  }
+  return null;
+}
+
+// Step 13: Build body parts for each body key
+function buildBodyParts(obj, sortedBodyKeys, headers, hasSpecialDataBody) {
+  // Step 13.1: Initialize body parts collection
+  var bodyParts = [];
+
+  // Step 13.2: Process each body key
+  var _iterator6 = _createForOfIteratorHelper(sortedBodyKeys),
+    _step6;
+  try {
+    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+      var bodyKey = _step6.value;
+      // Step 13.2.1: Get value for current body key
+      var value = (0, _encodeUtils.getValueByPath)(obj, bodyKey);
+      var pathParts = bodyKey.split("/");
+
+      // Step 13.2.2: Handle empty string in nested path
+      var emptyStringPart = handleEmptyStringInNestedPath(bodyKey, value, pathParts);
+      if (emptyStringPart) {
+        bodyParts.push(emptyStringPart);
+        continue;
+      }
+
+      // Step 13.2.3: Handle array values
+      if (Array.isArray(value)) {
+        var arrayPart = handleArrayValue(bodyKey, value, headers, sortedBodyKeys, pathParts);
+        if (arrayPart) {
+          bodyParts.push(arrayPart);
+        }
+        continue;
+      }
+
+      // Step 13.2.4: Handle object values
+      if ((0, _encodeUtils.isPojo)(value)) {
+        var objectPart = handleObjectValue(obj, bodyKey, value, headers, sortedBodyKeys, pathParts, hasSpecialDataBody);
+        if (objectPart) {
+          bodyParts.push(objectPart);
+        }
+        continue;
+      }
+
+      // Step 13.2.5: Handle primitive values
+      if (typeof value === "string" || typeof value === "boolean" || typeof value === "number" || value === null || value === undefined || _typeof(value) === "symbol") {
+        var primitivePart = handlePrimitiveValue(bodyKey, value, headers);
+        bodyParts.push(primitivePart);
+        continue;
+      }
+
+      // Step 13.2.6: Handle binary values
+      if ((0, _encodeUtils.isBytes)(value)) {
+        var binaryPart = handleBinaryValue(bodyKey, value, headers);
+        bodyParts.push(binaryPart);
+        continue;
+      }
+    }
+
+    // Step 13.3: Handle special data/body case
+  } catch (err) {
+    _iterator6.e(err);
+  } finally {
+    _iterator6.f();
+  }
+  var specialPart = handleSpecialDataBodyCase(obj, hasSpecialDataBody);
+  if (specialPart) {
+    bodyParts.push(specialPart);
+  }
+
+  // Step 13.4: Return body parts
+  return bodyParts;
+}
+
+// Step 14: Generate multipart boundary
+function generateBoundary(_x9) {
+  return _generateBoundary.apply(this, arguments);
+} // Step 15: Assemble final multipart body
+function _generateBoundary() {
+  _generateBoundary = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(bodyParts) {
+    var partsContent, allContent, boundaryHash, boundary;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.next = 2;
+          return Promise.all(bodyParts.map(function (part) {
+            return part.text();
+          }));
+        case 2:
+          partsContent = _context6.sent;
+          allContent = partsContent.join("");
+          _context6.next = 6;
+          return (0, _encodeUtils.sha256)(new TextEncoder().encode(allContent));
+        case 6:
+          boundaryHash = _context6.sent;
+          boundary = _base64url["default"].encode(Buffer.from(boundaryHash));
+          return _context6.abrupt("return", boundary);
+        case 9:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return _generateBoundary.apply(this, arguments);
+}
+function assembleMultipartBody(bodyParts, boundary) {
+  var finalParts = [];
+  for (var i = 0; i < bodyParts.length; i++) {
+    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(new Blob(["\r\n--".concat(boundary, "--")]));
+  return new Blob(finalParts);
+}
+
+// Step 16: Calculate content digest
+function calculateContentDigest(_x10) {
+  return _calculateContentDigest.apply(this, arguments);
+} // Step 17: Set final headers (content-type, content-length)
+function _calculateContentDigest() {
+  _calculateContentDigest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(body) {
+    var finalContent, contentDigest, base64;
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          _context7.next = 2;
+          return body.arrayBuffer();
+        case 2:
+          finalContent = _context7.sent;
+          if (!(finalContent.byteLength > 0)) {
+            _context7.next = 9;
+            break;
+          }
+          _context7.next = 6;
+          return (0, _encodeUtils.sha256)(finalContent);
+        case 6:
+          contentDigest = _context7.sent;
+          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
+          return _context7.abrupt("return", {
+            digest: base64,
+            byteLength: finalContent.byteLength
+          });
+        case 9:
+          return _context7.abrupt("return", {
+            digest: null,
+            byteLength: finalContent.byteLength
+          });
+        case 10:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
+  return _calculateContentDigest.apply(this, arguments);
+}
+function setFinalHeaders(headers, boundary, contentDigest, byteLength) {
+  headers["content-type"] = "multipart/form-data; boundary=\"".concat(boundary, "\"");
+  if (contentDigest) {
+    headers["content-digest"] = "sha-256=:".concat(contentDigest, ":");
+  }
+  headers["content-length"] = String(byteLength);
 }
 function encode() {
   return _encode.apply(this, arguments);
 }
 function _encode() {
-  _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+  _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
     var obj,
-      _processValue,
       processedObj,
-      _i8,
-      _Object$entries7,
-      _Object$entries7$_i,
-      k,
-      v,
-      objKeys,
-      fieldName,
-      fieldValue,
-      _headers,
-      hasBodyBinary,
-      otherFields,
-      _headers2,
-      bodyBuffer,
-      bodyArrayBuffer,
-      contentDigest,
-      base64,
-      _fieldName,
-      _fieldValue,
-      _headers3,
-      _bodyBuffer,
-      _bodyArrayBuffer,
-      _contentDigest,
-      _base,
-      _headers4,
-      bodyContent,
-      encoder,
-      encoded,
-      _contentDigest2,
-      _base2,
-      _headers5,
-      _encoder,
-      _encoded,
-      _contentDigest3,
-      _base3,
+      emptyResult,
+      emptyBinaryResult,
+      singleBinaryResult,
+      primitiveResult,
+      nonEmptyBinaryResult,
+      nonAsciiResult,
       bodyKeys,
+      objKeys,
       headers,
       headerTypes,
-      _loop3,
-      _i9,
-      _Object$entries8,
-      _loop4,
-      _i10,
-      _Object$entries9,
-      allBodyKeysAreEmptyBinaries,
-      singleKey,
-      pathParts,
-      value,
-      _iterator4,
-      _step4,
-      part,
-      otherFieldsAreEmpty,
-      _bodyBuffer2,
-      _bodyArrayBuffer2,
-      _contentDigest4,
-      _base4,
+      emptyBinaryBodyResult,
+      singleBodyKeyResult,
       sortedBodyKeys,
       hasSpecialDataBody,
       bodyParts,
-      _iterator5,
-      _step5,
-      _loop5,
-      _ret,
-      buffer,
-      specialPart,
-      partsContent,
-      allContent,
-      boundaryHash,
       boundary,
-      finalParts,
-      i,
       body,
-      finalContent,
-      _contentDigest5,
-      _base5,
-      _args6 = arguments;
-    return _regeneratorRuntime().wrap(function _callee3$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+      _yield$calculateConte,
+      contentDigest,
+      byteLength,
+      _args8 = arguments;
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          obj = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
-          console.log("\n=== ENCODE START ===");
-          console.log("Encoding object:", JSON.stringify(obj));
-          _processValue = function processValue(value) {
-            if (_typeof(value) === "symbol") {
-              return value.description || "Symbol.for()";
-            } else if (Array.isArray(value)) {
-              return value.map(_processValue);
-            } else if (isPojo(value)) {
-              var result = {};
-              for (var _i7 = 0, _Object$entries6 = Object.entries(value); _i7 < _Object$entries6.length; _i7++) {
-                var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2),
-                  k = _Object$entries6$_i[0],
-                  v = _Object$entries6$_i[1];
-                result[k] = _processValue(v);
-              }
-              return result;
-            }
-            return value;
-          };
-          processedObj = {};
-          for (_i8 = 0, _Object$entries7 = Object.entries(obj); _i8 < _Object$entries7.length; _i8++) {
-            _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2), k = _Object$entries7$_i[0], v = _Object$entries7$_i[1];
-            processedObj[k] = _processValue(v);
+          obj = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
+          // Step 1: Process and normalize input values
+          processedObj = processInputValues(obj); // Step 2: Handle empty object case
+          emptyResult = handleEmptyObject(processedObj);
+          if (!emptyResult) {
+            _context8.next = 5;
+            break;
           }
-          if (!(Object.keys(obj).length === 0)) {
-            _context6.next = 8;
+          return _context8.abrupt("return", emptyResult);
+        case 5:
+          // Step 3: Handle single field with empty binary
+          emptyBinaryResult = handleSingleEmptyBinaryField(processedObj);
+          if (!emptyBinaryResult) {
+            _context8.next = 8;
             break;
           }
-          return _context6.abrupt("return", {
-            headers: {},
-            body: undefined
-          });
+          return _context8.abrupt("return", emptyBinaryResult);
         case 8:
-          objKeys = Object.keys(obj);
-          if (!(objKeys.length === 1)) {
-            _context6.next = 16;
+          _context8.next = 10;
+          return handleSingleBinaryField(processedObj);
+        case 10:
+          singleBinaryResult = _context8.sent;
+          if (!singleBinaryResult) {
+            _context8.next = 13;
             break;
           }
-          fieldName = objKeys[0];
-          fieldValue = obj[fieldName];
-          if (!(isBytes(fieldValue) && (fieldValue.length === 0 || fieldValue.byteLength === 0))) {
-            _context6.next = 16;
+          return _context8.abrupt("return", singleBinaryResult);
+        case 13:
+          _context8.next = 15;
+          return handleSinglePrimitiveField(processedObj);
+        case 15:
+          primitiveResult = _context8.sent;
+          if (!primitiveResult) {
+            _context8.next = 18;
             break;
           }
-          _headers = {};
-          _headers["ao-types"] = "".concat(fieldName.toLowerCase(), "=\"empty-binary\"");
-          return _context6.abrupt("return", {
-            headers: _headers,
-            body: undefined
-          });
-        case 16:
-          if (obj.body && isBytes(obj.body) && (obj.body.length === 0 || obj.body.byteLength === 0) && objKeys.length > 1) {}
-          hasBodyBinary = obj.body && isBytes(obj.body);
-          otherFields = Object.keys(obj).filter(function (k) {
-            return k !== "body";
-          });
-          if (!(hasBodyBinary && otherFields.length === 0)) {
-            _context6.next = 29;
+          return _context8.abrupt("return", primitiveResult);
+        case 18:
+          _context8.next = 20;
+          return handleSingleNonEmptyBinaryField(processedObj);
+        case 20:
+          nonEmptyBinaryResult = _context8.sent;
+          if (!nonEmptyBinaryResult) {
+            _context8.next = 23;
             break;
           }
-          _headers2 = {};
-          bodyBuffer = toBuffer(obj.body);
-          bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
-          _context6.next = 25;
-          return sha256(bodyArrayBuffer);
+          return _context8.abrupt("return", nonEmptyBinaryResult);
+        case 23:
+          _context8.next = 25;
+          return handleSingleNonAsciiStringField(processedObj);
         case 25:
-          contentDigest = _context6.sent;
-          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
-          _headers2["content-digest"] = "sha-256=:".concat(base64, ":");
-          return _context6.abrupt("return", {
-            headers: _headers2,
-            body: obj.body
-          });
-        case 29:
-          if (!(objKeys.length === 1)) {
-            _context6.next = 71;
-            break;
-          }
-          _fieldName = objKeys[0];
-          _fieldValue = obj[_fieldName];
-          if (!(isBytes(_fieldValue) && _fieldValue.length > 0)) {
-            _context6.next = 45;
+          nonAsciiResult = _context8.sent;
+          if (!nonAsciiResult) {
+            _context8.next = 28;
             break;
           }
-          _headers3 = {};
-          _bodyBuffer = toBuffer(_fieldValue);
-          _bodyArrayBuffer = _bodyBuffer.buffer.slice(_bodyBuffer.byteOffset, _bodyBuffer.byteOffset + _bodyBuffer.byteLength);
-          _context6.next = 38;
-          return sha256(_bodyArrayBuffer);
-        case 38:
-          _contentDigest = _context6.sent;
-          _base = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest));
-          _headers3["content-digest"] = "sha-256=:".concat(_base, ":");
-          if (_fieldName !== "body") {
-            _headers3["inline-body-key"] = _fieldName;
-          }
-          return _context6.abrupt("return", {
-            headers: _headers3,
-            body: _fieldValue
-          });
-        case 45:
-          if (!((_fieldName === "data" || _fieldName === "body") && (typeof _fieldValue === "string" || typeof _fieldValue === "boolean" || typeof _fieldValue === "number" || _fieldValue === null || _fieldValue === undefined || _typeof(_fieldValue) === "symbol"))) {
-            _context6.next = 60;
-            break;
-          }
-          _headers4 = {};
-          if (typeof _fieldValue === "string") {
-            bodyContent = _fieldValue;
-          } else if (typeof _fieldValue === "boolean") {
-            bodyContent = "\"".concat(_fieldValue, "\"");
-          } else if (typeof _fieldValue === "number") {
-            bodyContent = String(_fieldValue);
-          } else if (_fieldValue === null) {
-            bodyContent = '"null"';
-          } else if (_fieldValue === undefined) {
-            bodyContent = '"undefined"';
-          } else if (_typeof(_fieldValue) === "symbol") {
-            bodyContent = "\"".concat(_fieldValue.description || "Symbol.for()", "\"");
-          }
-          encoder = new TextEncoder();
-          encoded = encoder.encode(bodyContent);
-          _context6.next = 52;
-          return sha256(encoded.buffer);
-        case 52:
-          _contentDigest2 = _context6.sent;
-          _base2 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest2));
-          _headers4["content-digest"] = "sha-256=:".concat(_base2, ":");
-          if (typeof _fieldValue === "boolean" || _fieldValue === null || _fieldValue === undefined || _typeof(_fieldValue) === "symbol") {
-            _headers4["ao-types"] = "".concat(_fieldName.toLowerCase(), "=\"atom\"");
-          } else if (typeof _fieldValue === "number") {
-            _headers4["ao-types"] = "".concat(_fieldName.toLowerCase(), "=\"").concat(Number.isInteger(_fieldValue) ? "integer" : "float", "\"");
-          }
-          if (_fieldName !== "body") {
-            _headers4["inline-body-key"] = _fieldName;
-          }
-          return _context6.abrupt("return", {
-            headers: _headers4,
-            body: bodyContent
-          });
-        case 60:
-          if (!(typeof _fieldValue === "string" && hasNonAscii(_fieldValue))) {
-            _context6.next = 71;
-            break;
-          }
-          _headers5 = {};
-          _encoder = new TextEncoder();
-          _encoded = _encoder.encode(_fieldValue);
-          _context6.next = 66;
-          return sha256(_encoded.buffer);
-        case 66:
-          _contentDigest3 = _context6.sent;
-          _base3 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest3));
-          _headers5["content-digest"] = "sha-256=:".concat(_base3, ":");
-          if (_fieldName !== "body") {
-            _headers5["inline-body-key"] = _fieldName;
-          }
-          return _context6.abrupt("return", {
-            headers: _headers5,
-            body: _fieldValue
-          });
-        case 71:
-          bodyKeys = collectBodyKeys(obj);
+          return _context8.abrupt("return", nonAsciiResult);
+        case 28:
+          // Step 7: Collect all keys that need to go in body
+          bodyKeys = collectBodyKeysStep(processedObj);
+          objKeys = Object.keys(obj);
           headers = {};
-          headerTypes = [];
-          _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
-            var _Object$entries8$_i, key, value, needsBody, hasNonAsciiItems, encodedItems;
-            return _regeneratorRuntime().wrap(function _loop3$(_context3) {
-              while (1) switch (_context3.prev = _context3.next) {
-                case 0:
-                  _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2), key = _Object$entries8$_i[0], value = _Object$entries8$_i[1];
-                  needsBody = bodyKeys.includes(key) || bodyKeys.some(function (k) {
-                    return k.startsWith("".concat(key, "/"));
-                  });
-                  if (needsBody) {
-                    _context3.next = 43;
-                    break;
-                  }
-                  if (!(value === null)) {
-                    _context3.next = 8;
-                    break;
-                  }
-                  headers[key] = '"null"';
-                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
-                  _context3.next = 41;
-                  break;
-                case 8:
-                  if (!(value === undefined)) {
-                    _context3.next = 13;
-                    break;
-                  }
-                  headers[key] = '"undefined"';
-                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
-                  _context3.next = 41;
-                  break;
-                case 13:
-                  if (!(typeof value === "boolean")) {
-                    _context3.next = 18;
-                    break;
-                  }
-                  headers[key] = "\"".concat(value, "\"");
-                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
-                  _context3.next = 41;
-                  break;
-                case 18:
-                  if (!(_typeof(value) === "symbol")) {
-                    _context3.next = 23;
-                    break;
-                  }
-                  headers[key] = "\"".concat(value.description || "Symbol.for()", "\"");
-                  headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
-                  _context3.next = 41;
-                  break;
-                case 23:
-                  if (!(typeof value === "number")) {
-                    _context3.next = 28;
-                    break;
-                  }
-                  headers[key] = String(value);
-                  headerTypes.push("".concat(key.toLowerCase(), "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
-                  _context3.next = 41;
-                  break;
-                case 28:
-                  if (!(typeof value === "string")) {
-                    _context3.next = 40;
-                    break;
-                  }
-                  if (!(value.length === 0)) {
-                    _context3.next = 33;
-                    break;
-                  }
-                  headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
-                  _context3.next = 38;
-                  break;
-                case 33:
-                  if (!hasNonAscii(value)) {
-                    _context3.next = 37;
-                    break;
-                  }
-                  return _context3.abrupt("return", 1);
-                case 37:
-                  headers[key] = value;
-                case 38:
-                  _context3.next = 41;
-                  break;
-                case 40:
-                  if (Array.isArray(value) && value.length === 0) {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-list\""));
-                  } else if (Array.isArray(value) && !value.some(function (item) {
-                    return isPojo(item);
-                  })) {
-                    hasNonAsciiItems = value.some(function (item) {
-                      return typeof item === "string" && hasNonAscii(item);
-                    });
-                    if (!hasNonAsciiItems) {
-                      encodedItems = value.map(function (item) {
-                        return encodeArrayItem(item);
-                      }).join(", ");
-                      headers[key] = encodedItems;
-                      headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
-                    }
-                  } else if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
-                  } else if (isPojo(value) && Object.keys(value).length === 0) {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-message\""));
-                  }
-                case 41:
-                  _context3.next = 44;
-                  break;
-                case 43:
-                  if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
-                  } else if (typeof value === "string" && value.length === 0) {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
-                  } else if (Array.isArray(value) && value.length === 0) {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-list\""));
-                  } else if (isPojo(value) && Object.keys(value).length === 0) {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"empty-message\""));
-                  } else if (typeof value === "boolean" || value === null || value === undefined || _typeof(value) === "symbol") {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"atom\""));
-                  } else if (typeof value === "number") {
-                    headerTypes.push("".concat(key.toLowerCase(), "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
-                  }
-                case 44:
-                case "end":
-                  return _context3.stop();
-              }
-            }, _loop3);
-          });
-          _i9 = 0, _Object$entries8 = Object.entries(obj);
-        case 76:
-          if (!(_i9 < _Object$entries8.length)) {
-            _context6.next = 83;
-            break;
-          }
-          return _context6.delegateYield(_loop3(), "t0", 78);
-        case 78:
-          if (!_context6.t0) {
-            _context6.next = 80;
-            break;
-          }
-          return _context6.abrupt("continue", 80);
-        case 80:
-          _i9++;
-          _context6.next = 76;
-          break;
-        case 83:
-          _loop4 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop4() {
-            var _Object$entries9$_i, key, value;
-            return _regeneratorRuntime().wrap(function _loop4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
-                case 0:
-                  _Object$entries9$_i = _slicedToArray(_Object$entries9[_i10], 2), key = _Object$entries9$_i[0], value = _Object$entries9$_i[1];
-                  if (Array.isArray(value)) {
-                    if (bodyKeys.includes(key) || bodyKeys.some(function (k) {
-                      return k.startsWith("".concat(key, "/"));
-                    })) {
-                      if (!headerTypes.some(function (t) {
-                        return t.startsWith("".concat(key.toLowerCase(), "="));
-                      })) {
-                        headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
-                      }
-                    }
-                  }
-                case 2:
-                case "end":
-                  return _context4.stop();
-              }
-            }, _loop4);
-          });
-          _i10 = 0, _Object$entries9 = Object.entries(obj);
-        case 85:
-          if (!(_i10 < _Object$entries9.length)) {
-            _context6.next = 90;
-            break;
-          }
-          return _context6.delegateYield(_loop4(), "t1", 87);
-        case 87:
-          _i10++;
-          _context6.next = 85;
-          break;
-        case 90:
-          if (!(bodyKeys.length === 0)) {
-            _context6.next = 94;
-            break;
-          }
-          console.log("No bodyKeys, returning headers only");
-          if (headerTypes.length > 0) {
-            headers["ao-types"] = headerTypes.sort().join(", ");
-          }
-          return _context6.abrupt("return", {
-            headers: headers,
-            body: undefined
-          });
-        case 94:
-          allBodyKeysAreEmptyBinaries = bodyKeys.every(function (key) {
-            var pathParts = key.split("/");
-            var value = obj;
-            var _iterator3 = _createForOfIteratorHelper(pathParts),
-              _step3;
-            try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                var part = _step3.value;
-                if (/^\d+$/.test(part)) {
-                  var index = parseInt(part) - 1;
-                  console.log("[Body part] Getting array element at index ".concat(index, " from part ").concat(part));
-                  value = value[index];
-                } else {
-                  value = value[part];
-                }
-              }
-            } catch (err) {
-              _iterator3.e(err);
-            } finally {
-              _iterator3.f();
-            }
-            return isBytes(value) && (value.length === 0 || value.byteLength === 0);
-          });
-          if (!allBodyKeysAreEmptyBinaries) {
-            _context6.next = 98;
-            break;
-          }
-          if (headerTypes.length > 0) {
-            headers["ao-types"] = headerTypes.sort().join(", ");
-          }
-          return _context6.abrupt("return", {
-            headers: headers,
-            body: undefined
-          });
-        case 98:
-          if (!(bodyKeys.length === 1)) {
-            _context6.next = 116;
+          headerTypes = []; // Step 8: Process fields that can go in headers
+          processHeaderFields(obj, bodyKeys, headers, headerTypes);
+
+          // Step 9: Handle case where all body keys are empty binaries
+          emptyBinaryBodyResult = handleAllEmptyBinaryBodyKeys(obj, bodyKeys, headers, headerTypes);
+          if (!emptyBinaryBodyResult) {
+            _context8.next = 36;
             break;
           }
-          singleKey = bodyKeys[0];
-          pathParts = singleKey.split("/");
-          value = obj;
-          _iterator4 = _createForOfIteratorHelper(pathParts);
-          try {
-            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-              part = _step4.value;
-              if (/^\d+$/.test(part)) {
-                value = value[parseInt(part) - 1];
-              } else {
-                value = value[part];
-              }
-            }
-          } catch (err) {
-            _iterator4.e(err);
-          } finally {
-            _iterator4.f();
-          }
-          otherFieldsAreEmpty = Object.entries(obj).every(function (_ref5) {
-            var _ref6 = _slicedToArray(_ref5, 2),
-              key = _ref6[0],
-              val = _ref6[1];
-            if (key === singleKey) return true;
-            return Array.isArray(val) && val.length === 0 || isPojo(val) && Object.keys(val).length === 0 || isBytes(val) && (val.length === 0 || val.byteLength === 0) || typeof val === "string" && val.length === 0;
-          });
-          if (!(otherFieldsAreEmpty && isBytes(value) && value.length > 0)) {
-            _context6.next = 116;
+          return _context8.abrupt("return", emptyBinaryBodyResult);
+        case 36:
+          _context8.next = 38;
+          return handleSingleBodyKeyOptimization(obj, bodyKeys, headers, headerTypes);
+        case 38:
+          singleBodyKeyResult = _context8.sent;
+          if (!singleBodyKeyResult) {
+            _context8.next = 41;
             break;
           }
-          _bodyBuffer2 = toBuffer(value);
-          _bodyArrayBuffer2 = _bodyBuffer2.buffer.slice(_bodyBuffer2.byteOffset, _bodyBuffer2.byteOffset + _bodyBuffer2.byteLength);
-          _context6.next = 110;
-          return sha256(_bodyArrayBuffer2);
-        case 110:
-          _contentDigest4 = _context6.sent;
-          _base4 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest4));
-          headers["content-digest"] = "sha-256=:".concat(_base4, ":");
-          if (singleKey !== "body") {
-            headers["inline-body-key"] = singleKey;
-          }
-          if (headerTypes.length > 0) {
-            headers["ao-types"] = headerTypes.sort().join(", ");
-          }
-          return _context6.abrupt("return", {
-            headers: headers,
-            body: value
-          });
-        case 116:
-          // Sort body keys: main array comes first, then element parts by index
-          sortedBodyKeys = bodyKeys.sort(function (a, b) {
-            var aIsArrayElement = /\/\d+$/.test(a);
-            var bIsArrayElement = /\/\d+$/.test(b);
-            var aBase = a.split("/")[0];
-            var bBase = b.split("/")[0];
-
-            // If both are for the same array
-            if (aBase === bBase) {
-              // Main array comes before element parts
-              if (!aIsArrayElement && bIsArrayElement) {
-                return -1; // main array comes first
-              }
-              if (aIsArrayElement && !bIsArrayElement) {
-                return 1; // element parts come after
-              }
-              // Both are elements - sort by index
-              if (aIsArrayElement && bIsArrayElement) {
-                var aIndex = parseInt(a.split("/")[1]);
-                var bIndex = parseInt(b.split("/")[1]);
-                return aIndex - bIndex;
-              }
-              return a.localeCompare(b);
-            }
-
-            // Different arrays, sort by base name
-            return a.localeCompare(b);
-          }); // Check if we have the special case where data contains body with bytes and body contains data with bytes
-          hasSpecialDataBody = sortedBodyKeys.includes("data") && sortedBodyKeys.includes("body") && obj.data && obj.data.body && isBytes(obj.data.body) && obj.body && obj.body.data && isBytes(obj.body.data);
+          return _context8.abrupt("return", singleBodyKeyResult);
+        case 41:
+          // Step 11: Sort body keys
+          sortedBodyKeys = sortBodyKeys(bodyKeys); // Step 12: Check for special data/body case
+          hasSpecialDataBody = checkSpecialDataBodyCase(obj, sortedBodyKeys);
           headers["body-keys"] = sortedBodyKeys.map(function (k) {
             return "\"".concat(k, "\"");
           }).join(", ");
@@ -1227,481 +1296,54 @@ function _encode() {
           if (headerTypes.length > 0) {
             headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          bodyParts = [];
-          _iterator5 = _createForOfIteratorHelper(sortedBodyKeys);
-          _context6.prev = 123;
-          _loop5 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop5() {
-            var bodyKey, lines, pathParts, value, parent, _i11, _part, _buffer, headerText, hasOnlyEmptyElements, hasOnlyNonEmptyObjects, hasOnlyEmptyObjects, hasObjects, hasArrays, nonObjectItems, _fieldLines, _partTypes, _isInline, orderedLines, _orderedLines, isLastBodyPart, hasOnlyTypes, indicesWithOwnParts, hasNestedObjectParts, fieldLines, partTypes, hasEmptyStrings, hasEmptyObjects, hasObjectsWithOnlyEmptyValues, isMixedArray, _isInline2, _orderedLines2, _iterator6, _step6, line, _orderedLines3, _iterator7, _step7, _line, isInline, content;
-            return _regeneratorRuntime().wrap(function _loop5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
-                case 0:
-                  bodyKey = _step5.value;
-                  console.log("\n[Body part] Processing bodyKey: ".concat(bodyKey));
-                  lines = [];
-                  pathParts = bodyKey.split("/");
-                  value = obj;
-                  parent = null;
-                  for (_i11 = 0; _i11 < pathParts.length; _i11++) {
-                    parent = value;
-                    _part = pathParts[_i11];
-                    if (/^\d+$/.test(_part)) {
-                      value = value[parseInt(_part) - 1];
-                    } else {
-                      value = value[_part];
-                    }
-                  }
-                  console.log("[Body part] Value at ".concat(bodyKey, ":"), JSON.stringify(value));
-
-                  // Special handling for empty strings in arrays
-                  if (!(typeof value === "string" && value === "" && pathParts.length > 1)) {
-                    _context5.next = 15;
-                    break;
-                  }
-                  console.log("[Body part] Creating part for empty string at ".concat(bodyKey));
-                  lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
-                  lines.push("");
-                  lines.push("");
-                  bodyParts.push(new Blob([lines.join("\r\n")]));
-                  return _context5.abrupt("return", 0);
-                case 15:
-                  if (!isBytes(value)) {
-                    _context5.next = 22;
-                    break;
-                  }
-                  console.log("[Body part] Creating part for binary at ".concat(bodyKey));
-                  lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
-                  _buffer = toBuffer(value);
-                  headerText = lines.join("\r\n") + "\r\n\r\n";
-                  bodyParts.push(new Blob([headerText, _buffer]));
-                  return _context5.abrupt("return", 0);
-                case 22:
-                  if (!Array.isArray(value)) {
-                    _context5.next = 52;
-                    break;
-                  }
-                  hasOnlyEmptyElements = value.length > 0 && value.every(function (item) {
-                    return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
-                  });
-                  hasOnlyNonEmptyObjects = value.length > 0 && value.every(function (item) {
-                    return isPojo(item) && Object.keys(item).length > 0;
-                  });
-                  hasOnlyEmptyObjects = value.length > 0 && value.every(function (item) {
-                    return isPojo(item) && Object.keys(item).length === 0;
-                  });
-                  hasObjects = value.some(function (item) {
-                    return isPojo(item);
-                  });
-                  hasArrays = value.some(function (item) {
-                    return Array.isArray(item);
-                  });
-                  nonObjectItems = value.map(function (item, index) {
-                    return {
-                      item: item,
-                      index: index + 1
-                    };
-                  }).filter(function (_ref7) {
-                    var item = _ref7.item;
-                    return !isPojo(item);
-                  });
-                  if (!hasOnlyNonEmptyObjects) {
-                    _context5.next = 31;
-                    break;
-                  }
-                  return _context5.abrupt("return", 0);
-                case 31:
-                  if (!hasOnlyEmptyElements) {
-                    _context5.next = 38;
-                    break;
-                  }
-                  _fieldLines = [];
-                  _partTypes = []; // Process items for type information
-                  value.forEach(function (item, idx) {
-                    var index = idx + 1;
-                    if (Array.isArray(item) && item.length === 0) {
-                      _partTypes.push("".concat(index, "=\"empty-list\""));
-                    } else if (isPojo(item) && Object.keys(item).length === 0) {
-                      _partTypes.push("".concat(index, "=\"empty-message\""));
-                    } else if (typeof item === "string" && item === "") {
-                      _partTypes.push("".concat(index, "=\"empty-binary\""));
-                    }
-                  });
-                  _isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
-                  if (_isInline) {
-                    orderedLines = [];
-                    if (_partTypes.length > 0) {
-                      orderedLines.push("ao-types: ".concat(_partTypes.sort(function (a, b) {
-                        var aNum = parseInt(a.split("=")[0]);
-                        var bNum = parseInt(b.split("=")[0]);
-                        return aNum - bNum;
-                      }).join(", ")));
-                    }
-                    orderedLines.push("content-disposition: inline");
-                    orderedLines.push("");
-                    bodyParts.push(new Blob([orderedLines.join("\r\n")]));
-                  } else {
-                    _orderedLines = [];
-                    if (_partTypes.length > 0) {
-                      _orderedLines.push("ao-types: ".concat(_partTypes.sort(function (a, b) {
-                        var aNum = parseInt(a.split("=")[0]);
-                        var bNum = parseInt(b.split("=")[0]);
-                        return aNum - bNum;
-                      }).join(", ")));
-                    }
-                    _orderedLines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
 
-                    // Check if this is the last body part
-                    isLastBodyPart = sortedBodyKeys.indexOf(bodyKey) === sortedBodyKeys.length - 1;
-                    hasOnlyTypes = _partTypes.length > 0 && _fieldLines.length === 0;
-                    if (isLastBodyPart && hasOnlyTypes) {
-                      // Don't add empty line for last part with only types
-                      bodyParts.push(new Blob([_orderedLines.join("\r\n")]));
-                    } else {
-                      _orderedLines.push("");
-                      bodyParts.push(new Blob([_orderedLines.join("\r\n")]));
-                    }
-                  }
-                  return _context5.abrupt("return", 0);
-                case 38:
-                  // Build list of which indices have their own parts
-                  indicesWithOwnParts = new Set();
-                  sortedBodyKeys.forEach(function (key) {
-                    if (key.startsWith(bodyKey + "/")) {
-                      var subPath = key.substring(bodyKey.length + 1);
-                      var match = subPath.match(/^(\d+)/);
-                      if (match) {
-                        indicesWithOwnParts.add(parseInt(match[1]));
-                      }
-                    }
-                  });
+          // Step 13: Build body parts for each body key
+          bodyParts = buildBodyParts(obj, sortedBodyKeys, headers, hasSpecialDataBody); // Step 14: Generate multipart boundary
+          _context8.next = 49;
+          return generateBoundary(bodyParts);
+        case 49:
+          boundary = _context8.sent;
+          // Step 15: Assemble final multipart body
+          body = assembleMultipartBody(bodyParts, boundary); // Step 16: Calculate content digest
+          _context8.next = 53;
+          return calculateContentDigest(body);
+        case 53:
+          _yield$calculateConte = _context8.sent;
+          contentDigest = _yield$calculateConte.digest;
+          byteLength = _yield$calculateConte.byteLength;
+          // Step 17: Set final headers (content-type, content-length)
+          setFinalHeaders(headers, boundary, contentDigest, byteLength);
 
-                  // Check if this array contains sub-arrays with objects that have their own parts
-                  hasNestedObjectParts = sortedBodyKeys.some(function (key) {
-                    return key.startsWith(bodyKey + "/") && key.split("/").length > pathParts.length + 1;
-                  });
-                  fieldLines = [];
-                  partTypes = []; // For arrays that contain sub-arrays with objects, we need to add type info for the sub-arrays
-                  if (hasNestedObjectParts) {
-                    value.forEach(function (item, idx) {
-                      var index = idx + 1;
-                      if (Array.isArray(item)) {
-                        partTypes.push("".concat(index, "=\"list\""));
-                      }
-                    });
-                  }
-
-                  // Check if this array has mixed content with empty strings/objects
-                  hasEmptyStrings = value.some(function (item) {
-                    return typeof item === "string" && item === "";
-                  });
-                  hasEmptyObjects = value.some(function (item) {
-                    return isPojo(item) && Object.keys(item).length === 0;
-                  }); // Check if we have objects with only empty values (like {empty: ""})
-                  hasObjectsWithOnlyEmptyValues = value.some(function (item) {
-                    if (!isPojo(item) || Object.keys(item).length === 0) return false;
-                    return Object.values(item).every(function (v) {
-                      return typeof v === "string" && v === "" || Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
-                    });
-                  });
-                  isMixedArray = hasObjects && (hasEmptyStrings || hasEmptyObjects) && !hasObjectsWithOnlyEmptyValues; // Process ALL items for type information
-                  value.forEach(function (item, idx) {
-                    var index = idx + 1;
-
-                    // Skip type info for elements that have their own parts
-                    if (indicesWithOwnParts.has(index)) {
-                      return;
-                    }
-
-                    // If we have nested object parts and this is an array with objects, skip processing it inline
-                    if (hasNestedObjectParts && Array.isArray(item) && item.some(function (subItem) {
-                      return isPojo(subItem);
-                    })) {
-                      // Type info already added above
-                      return;
-                    }
-
-                    // For all arrays (not just mixed ones), we need to process all items
-                    if (typeof item === "string" && item === "") {
-                      // Empty strings get type annotation but no field line
-                      partTypes.push("".concat(index, "=\"empty-binary\""));
-                    } else if (isPojo(item) && Object.keys(item).length === 0) {
-                      // Empty objects don't get field lines but do get type annotations
-                      partTypes.push("".concat(index, "=\"empty-message\""));
-                    } else if (isPojo(item)) {
-                      // Non-empty objects might have parts
-                    } else if (Array.isArray(item)) {
-                      if (item.length === 0) {
-                        // Empty arrays don't get field lines but do get type annotations
-                        partTypes.push("".concat(index, "=\"empty-list\""));
-                      } else {
-                        partTypes.push("".concat(index, "=\"list\""));
-                        // Encode array
-                        var encodedItems = item.map(function (subItem) {
-                          if (typeof subItem === "number") {
-                            if (Number.isInteger(subItem)) {
-                              return "\"(ao-type-integer) ".concat(subItem, "\"");
-                            } else {
-                              return "\"(ao-type-float) ".concat(formatFloat(subItem), "\"");
-                            }
-                          } else if (typeof subItem === "string") {
-                            return "\"".concat(subItem, "\"");
-                          } else if (subItem === null) {
-                            return "\"(ao-type-atom) \\\"null\\\"\"";
-                          } else if (subItem === undefined) {
-                            return "\"(ao-type-atom) \\\"undefined\\\"\"";
-                          } else if (_typeof(subItem) === "symbol") {
-                            var desc = subItem.description || "Symbol.for()";
-                            return "\"(ao-type-atom) \\\"".concat(desc, "\\\"\"");
-                          } else if (typeof subItem === "boolean") {
-                            return "\"(ao-type-atom) \\\"".concat(subItem, "\\\"\"");
-                          } else if (Array.isArray(subItem)) {
-                            // Use the full encodeArrayItem for nested arrays
-                            return encodeArrayItem(subItem);
-                          } else if (isBytes(subItem)) {
-                            var _buffer2 = toBuffer(subItem);
-                            if (_buffer2.length === 0 || _buffer2.byteLength === 0) {
-                              return "\"\"";
-                            }
-                            return "\"(ao-type-binary)\"";
-                          } else if (isPojo(subItem)) {
-                            var json = JSON.stringify(subItem);
-                            var escaped = json.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-                            return "\"(ao-type-map) ".concat(escaped, "\"");
-                          } else {
-                            return "\"".concat(String(subItem), "\"");
-                          }
-                        }).join(", ");
-                        fieldLines.push("".concat(index, ": ").concat(encodedItems));
-                      }
-                    } else if (typeof item === "number") {
-                      if (Number.isInteger(item)) {
-                        partTypes.push("".concat(index, "=\"integer\""));
-                        fieldLines.push("".concat(index, ": ").concat(item));
-                      } else {
-                        partTypes.push("".concat(index, "=\"float\""));
-                        fieldLines.push("".concat(index, ": ").concat(formatFloat(item)));
-                      }
-                    } else if (typeof item === "string") {
-                      // Non-empty strings just get field lines, no type annotation
-                      fieldLines.push("".concat(index, ": ").concat(item));
-                    } else if (item === null || item === undefined || _typeof(item) === "symbol" || typeof item === "boolean") {
-                      partTypes.push("".concat(index, "=\"atom\""));
-                      if (item === null) {
-                        fieldLines.push("".concat(index, ": null"));
-                      } else if (item === undefined) {
-                        fieldLines.push("".concat(index, ": undefined"));
-                      } else if (_typeof(item) === "symbol") {
-                        var desc = item.description || "Symbol.for()";
-                        fieldLines.push("".concat(index, ": ").concat(desc));
-                      } else {
-                        fieldLines.push("".concat(index, ": ").concat(item));
-                      }
-                    } else if (isBytes(item)) {
-                      var _buffer3 = toBuffer(item);
-                      if (_buffer3.length === 0) {
-                        partTypes.push("".concat(index, "=\"empty-binary\""));
-                      } else {
-                        partTypes.push("".concat(index, "=\"binary\""));
-                      }
-                    }
-                  });
-                  _isInline2 = bodyKey === "body" && headers["inline-body-key"] === "body";
-                  if (_isInline2) {
-                    _orderedLines2 = [];
-                    if (partTypes.length > 0) {
-                      _orderedLines2.push("ao-types: ".concat(partTypes.sort(function (a, b) {
-                        var aNum = parseInt(a.split("=")[0]);
-                        var bNum = parseInt(b.split("=")[0]);
-                        return aNum - bNum;
-                      }).join(", ")));
-                    }
-                    _orderedLines2.push("content-disposition: inline");
-                    if (fieldLines.length > 0) {
-                      _orderedLines2.push("");
-                      _iterator6 = _createForOfIteratorHelper(fieldLines);
-                      try {
-                        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                          line = _step6.value;
-                          _orderedLines2.push(line);
-                        }
-                      } catch (err) {
-                        _iterator6.e(err);
-                      } finally {
-                        _iterator6.f();
-                      }
-                    }
-                    bodyParts.push(new Blob([_orderedLines2.join("\r\n") + "\r\n"]));
-                  } else {
-                    // Put ao-types first, then content-disposition, then field lines
-                    _orderedLines3 = [];
-                    if (partTypes.length > 0) {
-                      _orderedLines3.push("ao-types: ".concat(partTypes.sort(function (a, b) {
-                        var aNum = parseInt(a.split("=")[0]);
-                        var bNum = parseInt(b.split("=")[0]);
-                        return aNum - bNum;
-                      }).join(", ")));
-                    }
-                    _orderedLines3.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
-
-                    // Add field lines directly without blank line
-                    _iterator7 = _createForOfIteratorHelper(fieldLines);
-                    try {
-                      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                        _line = _step7.value;
-                        _orderedLines3.push(_line);
-                      }
-
-                      // Add trailing blank line if we have field lines
-                    } catch (err) {
-                      _iterator7.e(err);
-                    } finally {
-                      _iterator7.f();
-                    }
-                    if (fieldLines.length > 0) {
-                      bodyParts.push(new Blob([_orderedLines3.join("\r\n") + "\r\n"]));
-                    } else {
-                      bodyParts.push(new Blob([_orderedLines3.join("\r\n")]));
-                    }
-                  }
-                  return _context5.abrupt("return", 0);
-                case 52:
-                  // This should not be reached for binary values as they're handled above
-                  isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
-                  if (isInline) {
-                    lines.push("content-disposition: inline");
-                  } else {
-                    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
-                  }
-                  if (typeof value === "string") {
-                    lines.push("");
-                    lines.push(value);
-                    bodyParts.push(new Blob([lines.join("\r\n")]));
-                  } else if (typeof value === "boolean" || typeof value === "number" || value === null || value === undefined || _typeof(value) === "symbol") {
-                    if (typeof value === "boolean") {
-                      content = "\"".concat(value, "\"");
-                    } else if (typeof value === "number") {
-                      content = String(value);
-                    } else if (value === null) {
-                      content = '"null"';
-                    } else if (value === undefined) {
-                      content = '"undefined"';
-                    } else if (_typeof(value) === "symbol") {
-                      content = "\"".concat(value.description || "Symbol.for()", "\"");
-                    }
-                    lines.push("");
-                    lines.push(content);
-                    bodyParts.push(new Blob([lines.join("\r\n")]));
-                  }
-                case 55:
-                case "end":
-                  return _context5.stop();
-              }
-            }, _loop5);
-          });
-          _iterator5.s();
-        case 126:
-          if ((_step5 = _iterator5.n()).done) {
-            _context6.next = 133;
-            break;
-          }
-          return _context6.delegateYield(_loop5(), "t2", 128);
-        case 128:
-          _ret = _context6.t2;
-          if (!(_ret === 0)) {
-            _context6.next = 131;
-            break;
-          }
-          return _context6.abrupt("continue", 131);
-        case 131:
-          _context6.next = 126;
-          break;
-        case 133:
-          _context6.next = 138;
-          break;
-        case 135:
-          _context6.prev = 135;
-          _context6.t3 = _context6["catch"](123);
-          _iterator5.e(_context6.t3);
-        case 138:
-          _context6.prev = 138;
-          _iterator5.f();
-          return _context6.finish(138);
-        case 141:
-          // Add the special data/body part if needed
-          if (hasSpecialDataBody && obj.data && obj.data.body && isBytes(obj.data.body)) {
-            buffer = toBuffer(obj.data.body);
-            specialPart = ["content-disposition: form-data;name=\"data/body\"", "", ""].join("\r\n");
-            bodyParts.push(new Blob([specialPart, buffer]));
-          }
-          _context6.next = 144;
-          return Promise.all(bodyParts.map(function (part) {
-            return part.text();
-          }));
-        case 144:
-          partsContent = _context6.sent;
-          allContent = partsContent.join("");
-          _context6.next = 148;
-          return sha256(new TextEncoder().encode(allContent));
-        case 148:
-          boundaryHash = _context6.sent;
-          boundary = _base64url["default"].encode(Buffer.from(boundaryHash));
-          finalParts = [];
-          for (i = 0; i < bodyParts.length; i++) {
-            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(new Blob(["\r\n--".concat(boundary, "--")]));
-          headers["content-type"] = "multipart/form-data; boundary=\"".concat(boundary, "\"");
-          body = new Blob(finalParts);
-          _context6.next = 157;
-          return body.arrayBuffer();
-        case 157:
-          finalContent = _context6.sent;
-          if (!(finalContent.byteLength > 0)) {
-            _context6.next = 164;
-            break;
-          }
-          _context6.next = 161;
-          return sha256(finalContent);
-        case 161:
-          _contentDigest5 = _context6.sent;
-          _base5 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest5));
-          headers["content-digest"] = "sha-256=:".concat(_base5, ":");
-        case 164:
-          headers["content-length"] = String(finalContent.byteLength);
-          console.log("=== ENCODE END ===\n");
-          return _context6.abrupt("return", {
+          // Step 18: Return result
+          return _context8.abrupt("return", {
             headers: headers,
             body: body
           });
-        case 167:
+        case 58:
         case "end":
-          return _context6.stop();
+          return _context8.stop();
       }
-    }, _callee3, null, [[123, 135, 138, 141]]);
+    }, _callee8);
   }));
   return _encode.apply(this, arguments);
 }
-function enc(_x3) {
+function enc(_x11) {
   return _enc.apply(this, arguments);
 }
 function _enc() {
-  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(fields) {
-    return _regeneratorRuntime().wrap(function _callee4$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(fields) {
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          _context7.next = 2;
+          _context9.next = 2;
           return encode(fields);
         case 2:
-          return _context7.abrupt("return", _context7.sent);
+          return _context9.abrupt("return", _context9.sent);
         case 3:
         case "end":
-          return _context7.stop();
+          return _context9.stop();
       }
-    }, _callee4);
+    }, _callee9);
   }));
   return _enc.apply(this, arguments);
 }