wao 0.27.1 → 0.27.3

package/cjs/encode.js

@@ -114,13 +114,14 @@ function _sha() {
   return _sha.apply(this, arguments);
 }
 function formatFloat(num) {
-  // Format float in scientific notation with proper padding
   var exp = num.toExponential(20);
-  // Replace "1.23e+0" with "1.23e+00"
   exp = exp.replace(/e\+(\d)$/, "e+0$1");
   exp = exp.replace(/e-(\d)$/, "e-0$1");
   return exp;
 }
+function hasNonAscii(str) {
+  return /[^\x00-\x7F]/.test(str);
+}
 function encodeArrayItem(item) {
   if (typeof item === "number") {
     if (Number.isInteger(item)) {
@@ -140,7 +141,6 @@ function encodeArrayItem(item) {
   } else if (typeof item === "boolean") {
     return "\"(ao-type-atom) \\\"".concat(item, "\\\"\"");
   } else if (Array.isArray(item)) {
-    // Nested array
     var nestedItems = item.map(function (nestedItem) {
       if (typeof nestedItem === "number") {
         if (Number.isInteger(nestedItem)) {
@@ -152,21 +152,64 @@ function encodeArrayItem(item) {
         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)) {
-    // For empty binaries in arrays, return empty string
     var buffer = toBuffer(item);
     if (buffer.length === 0 || buffer.byteLength === 0) {
       return "\"\"";
     }
-    // For non-empty binaries, we can't include them in headers
     return "\"(ao-type-binary)\"";
   } else if (isPojo(item)) {
     var json = JSON.stringify(item);
@@ -176,63 +219,144 @@ function encodeArrayItem(item) {
     return "\"".concat(String(item), "\"");
   }
 }
-function needsOwnBodyPart(value) {
-  if (Array.isArray(value)) return true;
-  if (isBytes(value)) return true;
-  if (isPojo(value)) {
-    // Check if object has complex fields
-    return Object.values(value).some(function (v) {
-      return Array.isArray(v) || isPojo(v) || isBytes(v) || v === null || v === undefined || _typeof(v) === "symbol";
-    });
+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);
   }
-  return false;
 }
 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) {
-    // Track if current level has simple fields or empty objects
+    console.log("[traverse] Called with path: \"".concat(path, "\""));
     var hasSimpleFields = false;
-    // Track nested paths that need body parts
     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 (hasObjects) {
-          // Each object in array gets its own key
-          value.forEach(function (item, index) {
-            if (isPojo(item)) {
-              nestedPaths.push("".concat(fullPath, "/").concat(index + 1));
-            }
+        if (value.length === 0) {
+          console.log("[traverse] Empty array at ".concat(fullPath, " - marking parent as having simple fields"));
+          hasSimpleFields = true;
+        } else if (hasObjects) {
+          hasArraysWithObjects = true;
+          // Check if we need special handling for mixed arrays
+          var hasEmptyStrings = value.some(function (item) {
+            return typeof item === "string" && item === "";
+          });
+          var hasEmptyObjects = value.some(function (item) {
+            return isPojo(item) && Object.keys(item).length === 0;
+          });
+          var hasNonEmptyObjects = value.some(function (item) {
+            return isPojo(item) && Object.keys(item).length > 0;
           });
 
-          // If array ALSO has non-object items, it needs its own body part
-          if (hasNonObjects) {
-            hasSimpleFields = true;
+          // 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;
+            });
+          });
+
+          // Only use special handling if we have BOTH empty elements AND non-empty objects
+          if ((hasEmptyStrings || hasEmptyObjects) && hasNonEmptyObjects) {
+            // Special case: mixed array with empty strings/objects - only non-empty objects get parts
+            value.forEach(function (item, index) {
+              if (isPojo(item) && Object.keys(item).length > 0) {
+                var itemPath = "".concat(fullPath, "/").concat(index + 1);
+                keys.push(itemPath);
+                nestedPaths.push(itemPath);
+              }
+            });
+            if (hasNonObjects) {
+              hasSimpleFields = true;
+              keys.push(fullPath);
+            }
+          } else if (hasObjectsWithOnlyEmptyValues && !hasNonObjects) {
+            // Special case: objects that contain only empty values should get parts
+            value.forEach(function (item, index) {
+              if (isPojo(item)) {
+                var itemPath = "".concat(fullPath, "/").concat(index + 1);
+                keys.push(itemPath);
+                if (Object.keys(item).length > 0) {
+                  nestedPaths.push(itemPath);
+                }
+              }
+            });
+          } else {
+            // Normal case: all objects get parts
+            value.forEach(function (item, index) {
+              if (isPojo(item)) {
+                var itemPath = "".concat(fullPath, "/").concat(index + 1);
+                keys.push(itemPath);
+                if (Object.keys(item).length > 0) {
+                  nestedPaths.push(itemPath);
+                }
+              }
+            });
+            if (hasNonObjects) {
+              hasSimpleFields = true;
+              keys.push(fullPath);
+            }
           }
         } else {
-          // Simple array - parent needs body part
+          console.log("[traverse] Non-empty array without objects at ".concat(fullPath, " - marking as simple field"));
           hasSimpleFields = true;
         }
       } else if (isPojo(value)) {
-        // Check if this is an empty object
         if (Object.keys(value).length === 0) {
-          // Empty objects need a body part
+          console.log("[traverse] Empty object at ".concat(fullPath, " - marking parent as having simple fields"));
           hasSimpleFields = true;
         } else {
-          // Non-empty objects are processed recursively
-          nestedPaths.push(fullPath);
+          // Don't traverse into the object if it only contains empty values
+          var containsOnlyEmptyCollections = Object.entries(value).every(function (_ref) {
+            var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+            return Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0 || isBytes(v) && (v.length === 0 || v.byteLength === 0) || typeof v === "string" && v.length === 0;
+          });
+          if (containsOnlyEmptyCollections && Object.keys(value).length > 0) {
+            console.log("[traverse] Object at ".concat(fullPath, " contains only empty collections - adding as body key"));
+            keys.push(fullPath);
+          } else {
+            // Check if this object contains arrays with only empty elements
+            var hasArraysWithOnlyEmptyElements = Object.entries(value).some(function (_ref3) {
+              var _ref4 = _slicedToArray(_ref3, 2),
+                k = _ref4[0],
+                v = _ref4[1];
+              return Array.isArray(v) && v.length > 0 && v.every(function (item) {
+                return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+              });
+            });
+            if (hasArraysWithOnlyEmptyElements) {
+              // This object needs a body part to show its array types
+              console.log("[traverse] Object at ".concat(fullPath, " has arrays with empty elements - adding as body key"));
+              keys.push(fullPath);
+            }
+            console.log("[traverse] Non-empty object at ".concat(fullPath, " - will traverse into it"));
+            nestedPaths.push(fullPath);
+          }
         }
-      } else if (isBytes(value)) {
+      } else if (isBytes(value) && value.length > 0) {
         hasSimpleFields = true;
       } else if (typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null || value === undefined || _typeof(value) === "symbol") {
         hasSimpleFields = true;
@@ -241,15 +365,33 @@ function collectBodyKeys(obj) {
     for (var _i = 0, _Object$entries = Object.entries(current); _i < _Object$entries.length; _i++) {
       _loop();
     }
-
-    // Add current path if it has simple fields or empty objects
     if (hasSimpleFields) {
+      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);
     }
 
-    // Process nested paths
-    for (var _i2 = 0, _nestedPaths = nestedPaths; _i2 < _nestedPaths.length; _i2++) {
-      var nestedPath = _nestedPaths[_i2];
+    // Check for arrays with only empty elements that need their own body parts
+    for (var _i2 = 0, _Object$entries2 = Object.entries(current); _i2 < _Object$entries2.length; _i2++) {
+      var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+        key = _Object$entries2$_i[0],
+        value = _Object$entries2$_i[1];
+      var fullPath = path ? "".concat(path, "/").concat(key) : key;
+      if (Array.isArray(value) && value.length > 0) {
+        var hasOnlyEmptyElements = value.every(function (item) {
+          return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+        });
+        if (hasOnlyEmptyElements) {
+          console.log("[traverse] Array at ".concat(fullPath, " has only empty elements - adding as body key"));
+          keys.push(fullPath);
+        }
+      }
+    }
+    for (var _i3 = 0, _nestedPaths = nestedPaths; _i3 < _nestedPaths.length; _i3++) {
+      var nestedPath = _nestedPaths[_i3];
       var parts = nestedPath.split("/");
       var nestedObj = obj;
       var _iterator = _createForOfIteratorHelper(parts),
@@ -273,13 +415,29 @@ function collectBodyKeys(obj) {
       }
     }
   }
-
-  // Handle top-level fields
+  var objKeys = Object.keys(obj);
   var _loop2 = function _loop2() {
-    var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2),
-      key = _Object$entries2$_i[0],
-      value = _Object$entries2$_i[1];
-    if (Array.isArray(value)) {
+    var _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);
       });
@@ -289,61 +447,223 @@ function collectBodyKeys(obj) {
       var hasNonObjects = value.some(function (item) {
         return !isPojo(item);
       });
-      if (hasObjects) {
-        value.forEach(function (item, index) {
-          if (isPojo(item)) {
-            keys.push("".concat(key, "/").concat(index + 1));
-            // Also need to traverse into nested objects within array items
-            for (var _i4 = 0, _Object$entries3 = Object.entries(item); _i4 < _Object$entries3.length; _i4++) {
-              var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i4], 2),
-                nestedKey = _Object$entries3$_i[0],
-                nestedValue = _Object$entries3$_i[1];
-              if (isPojo(nestedValue)) {
-                keys.push("".concat(key, "/").concat(index + 1, "/").concat(nestedKey));
-              }
-            }
-          }
+
+      // 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
+
+        // 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;
         });
 
-        // Mixed arrays also need their own body part
-        if (hasNonObjects) {
+        // Check for objects that contain only empty values
+        var hasObjectsWithOnlyEmptyValues = value.some(function (item) {
+          if (!isPojo(item) || Object.keys(item).length === 0) return false;
+          return Object.values(item).every(function (v) {
+            return typeof v === "string" && v === "" || Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0;
+          });
+        });
+        if (hasArraysOfObjects) {
+          // Handle arrays of arrays containing objects
+          value.forEach(function (item, index) {
+            if (Array.isArray(item)) {
+              item.forEach(function (subItem, subIndex) {
+                if (isPojo(subItem)) {
+                  var path = "".concat(key, "/").concat(index + 1, "/").concat(subIndex + 1);
+                  console.log("[main loop] Adding nested object path: \"".concat(path, "\""));
+                  keys.push(path);
+                }
+              });
+            }
+            bodyPartCounter++;
+          });
+          // Always add the main array key
+          console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
+          keys.push(key);
+        } else if (hasObjects && (hasEmptyStrings || hasEmptyObjects) && !hasObjectsWithOnlyEmptyValues) {
+          // Special handling: only non-empty objects get parts
+          value.forEach(function (item, index) {
+            if (isPojo(item) && Object.keys(item).length > 0) {
+              var path = "".concat(key, "/").concat(bodyPartCounter);
+              console.log("[main loop] Adding non-empty object path: \"".concat(path, "\" (array index ").concat(index, ")"));
+              keys.push(path);
+              // Add paths for nested objects
+              for (var _i5 = 0, _Object$entries4 = Object.entries(item); _i5 < _Object$entries4.length; _i5++) {
+                var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
+                  nestedKey = _Object$entries4$_i[0],
+                  nestedValue = _Object$entries4$_i[1];
+                if (isPojo(nestedValue)) {
+                  var nestedPath = "".concat(key, "/").concat(bodyPartCounter, "/").concat(nestedKey);
+                  console.log("[main loop] Adding nested object path: \"".concat(nestedPath, "\""));
+                  keys.push(nestedPath);
+                }
+              }
+            }
+            bodyPartCounter++;
+          });
+          // Always add the main array key
+          console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
           keys.push(key);
+        } else if (hasObjects) {
+          // Normal handling: all objects get parts (except if parent array has only empty elements)
+          var skipEmptyObjects = false;
+
+          // Check if this array contains only empty elements
+          var arrayHasOnlyEmptyElements = value.every(function (item) {
+            return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+          });
+          if (arrayHasOnlyEmptyElements) {
+            skipEmptyObjects = true;
+          }
+          value.forEach(function (item, index) {
+            if (isPojo(item)) {
+              // Skip empty objects if array has only empty elements
+              if (skipEmptyObjects && Object.keys(item).length === 0) {
+                bodyPartCounter++;
+                return;
+              }
+              var path = "".concat(key, "/").concat(bodyPartCounter);
+              console.log("[main loop] Adding object path: \"".concat(path, "\" (array index ").concat(index, ", empty=").concat(Object.keys(item).length === 0, ")"));
+              keys.push(path);
+              // Add paths for nested objects (but not empty ones)
+              if (Object.keys(item).length > 0) {
+                for (var _i6 = 0, _Object$entries5 = Object.entries(item); _i6 < _Object$entries5.length; _i6++) {
+                  var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2),
+                    nestedKey = _Object$entries5$_i[0],
+                    nestedValue = _Object$entries5$_i[1];
+                  if (isPojo(nestedValue) && Object.keys(nestedValue).length > 0) {
+                    var nestedPath = "".concat(key, "/").concat(bodyPartCounter, "/").concat(nestedKey);
+                    console.log("[main loop] Adding nested object path: \"".concat(nestedPath, "\""));
+                    keys.push(nestedPath);
+                  }
+                }
+              }
+            } else if (typeof item === "string" && item === "") {
+              // Empty strings may get parts in some formats
+              var _path = "".concat(key, "/").concat(bodyPartCounter);
+              console.log("[main loop] Adding empty string path: \"".concat(_path, "\" (array index ").concat(index, ")"));
+              keys.push(_path);
+            }
+            bodyPartCounter++;
+          });
+          // Don't add main array key for arrays with only objects containing empty values
+          if (!hasObjectsWithOnlyEmptyValues || value.some(function (item) {
+            return !isPojo(item);
+          })) {
+            // Check if array has only empty elements
+            var hasOnlyEmptyElements = value.every(function (item) {
+              return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+            });
+            if (!hasOnlyEmptyElements) {
+              // Always add the main array key
+              console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
+              keys.push(key);
+            }
+          }
+        } else {
+          // Check if array has only empty elements
+          var hasOnlyEmptyArraysOrObjects = value.every(function (item) {
+            return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+          });
+          if (hasOnlyEmptyArraysOrObjects && value.length > 0) {
+            // Always add the main array key for arrays with only empty elements
+            console.log("[main loop] ADDING main array key for empty elements: \"".concat(key, "\""));
+            keys.push(key);
+          } else if (!hasOnlyEmptyArraysOrObjects) {
+            // Always add the main array key
+            console.log("[main loop] ADDING main array key: \"".concat(key, "\""));
+            keys.push(key);
+          }
         }
-      } else if (hasArrays) {
-        // Array containing arrays needs body part
-        keys.push(key);
-      } else {
-        // Simple array at top level - DO NOT add to body keys
-        // It will go in headers instead
       }
     } else if (isPojo(value)) {
-      // Top-level object that may have nested structures
+      console.log("[main loop] Traversing object at key: \"".concat(key, "\""));
+      // Check if this object contains arrays with only empty elements
+      var hasArraysWithOnlyEmptyElements = false;
+      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];
+        if (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 === "";
+        })) {
+          hasArraysWithOnlyEmptyElements = true;
+          keys.push("".concat(key, "/").concat(k));
+        }
+      }
       traverse(value, key);
-    } else if (isBytes(value)) {
-      // All binary data needs body parts, even empty ones
+    } else if (isBytes(value) && value.length > 0) {
+      console.log("[main loop] Adding key for non-empty bytes: \"".concat(key, "\""));
       keys.push(key);
     } else if (typeof value === "string" && value.includes("\n")) {
-      // Multiline string
+      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 _i3 = 0, _Object$entries2 = Object.entries(obj); _i3 < _Object$entries2.length; _i3++) {
-    _loop2();
+  for (var _i4 = 0, _Object$entries3 = Object.entries(obj); _i4 < _Object$entries3.length; _i4++) {
+    if (_loop2()) continue;
   }
-  return _toConsumableArray(new Set(keys)).filter(function (k) {
-    return k !== "";
+  var result = _toConsumableArray(new Set(keys)).filter(function (k) {
+    if (k === "") return false;
+
+    // Check if this is a path to an empty object inside an array with only empty elements
+    var parts = k.split("/");
+    if (parts.length >= 2 && /^\d+$/.test(parts[parts.length - 1])) {
+      // This is an array element path like "maps/1"
+      var arrayPath = parts.slice(0, -1).join("/");
+      var arrayValue = obj;
+
+      // Navigate to the array
+      var _iterator2 = _createForOfIteratorHelper(parts.slice(0, -1)),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var part = _step2.value;
+          if (/^\d+$/.test(part)) {
+            arrayValue = arrayValue[parseInt(part) - 1];
+          } else {
+            arrayValue = arrayValue[part];
+          }
+        }
+
+        // Check if this array contains only empty elements
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      if (Array.isArray(arrayValue)) {
+        var hasOnlyEmptyElements = arrayValue.every(function (item) {
+          return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+        });
+        if (hasOnlyEmptyElements) {
+          // Filter out paths to individual empty elements
+          console.log("[filter] Removing path to empty element: \"".concat(k, "\""));
+          return false;
+        }
+      }
+    }
+    return true;
   });
-}
-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);
-  }
+  console.log("\n=== collectBodyKeys RESULT ===");
+  console.log("Final bodyKeys:", JSON.stringify(result));
+  console.log("=== collectBodyKeys END ===\n");
+  return result;
 }
 function encode() {
   return _encode.apply(this, arguments);
@@ -353,50 +673,66 @@ function _encode() {
     var obj,
       _processValue,
       processedObj,
-      _i6,
-      _Object$entries5,
-      _Object$entries5$_i,
+      _i9,
+      _Object$entries8,
+      _Object$entries8$_i,
       k,
       v,
+      objKeys,
+      fieldName,
+      fieldValue,
+      _headers,
       hasBodyBinary,
       otherFields,
-      allOthersSimpleOrEmptyBinary,
-      _headers,
-      _headerTypes,
-      _i7,
-      _Object$entries6,
-      _Object$entries6$_i,
-      key,
-      value,
-      encodedItems,
+      _headers2,
       bodyBuffer,
       bodyArrayBuffer,
-      _contentDigest,
-      _base,
-      objKeys,
-      fieldName,
-      binaryData,
-      _headers2,
+      contentDigest,
+      base64,
+      _fieldName,
+      _fieldValue,
+      _headers3,
       _bodyBuffer,
       _bodyArrayBuffer,
+      _contentDigest,
+      _base,
+      _headers4,
+      bodyContent,
+      encoder,
+      encoded,
       _contentDigest2,
       _base2,
+      _headers5,
+      _encoder,
+      _encoded,
+      _contentDigest3,
+      _base3,
       headers,
       headerTypes,
       bodyKeys,
       _loop3,
-      _i8,
-      _Object$entries7,
+      _i10,
+      _Object$entries9,
       _loop4,
-      _i9,
-      _Object$entries8,
+      _i11,
+      _Object$entries10,
       allBodyKeysAreEmptyBinaries,
+      singleKey,
+      pathParts,
+      value,
+      _iterator4,
+      _step4,
+      part,
+      otherFieldsAreEmpty,
+      _bodyBuffer2,
+      _bodyArrayBuffer2,
+      _contentDigest4,
+      _base4,
       sortedBodyKeys,
       hasSpecialDataBody,
-      inlineKey,
       bodyParts,
-      _iterator3,
-      _step3,
+      _iterator5,
+      _step5,
       _loop5,
       _ret,
       buffer,
@@ -409,19 +745,15 @@ function _encode() {
       i,
       body,
       finalContent,
-      contentDigest,
-      base64,
-      bodyText,
-      boundaryMatch,
-      debugBoundary,
-      parts,
-      lines,
+      _contentDigest5,
+      _base5,
       _args6 = arguments;
     return _regeneratorRuntime().wrap(function _callee3$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           obj = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
-          // Convert symbols to strings for logging
+          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()";
@@ -429,10 +761,10 @@ function _encode() {
               return value.map(_processValue);
             } else if (isPojo(value)) {
               var result = {};
-              for (var _i5 = 0, _Object$entries4 = Object.entries(value); _i5 < _Object$entries4.length; _i5++) {
-                var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
-                  k = _Object$entries4$_i[0],
-                  v = _Object$entries4$_i[1];
+              for (var _i8 = 0, _Object$entries7 = Object.entries(value); _i8 < _Object$entries7.length; _i8++) {
+                var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2),
+                  k = _Object$entries7$_i[0],
+                  v = _Object$entries7$_i[1];
                 result[k] = _processValue(v);
               }
               return result;
@@ -440,243 +772,306 @@ function _encode() {
             return value;
           };
           processedObj = {};
-          for (_i6 = 0, _Object$entries5 = Object.entries(obj); _i6 < _Object$entries5.length; _i6++) {
-            _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2), k = _Object$entries5$_i[0], v = _Object$entries5$_i[1];
+          for (_i9 = 0, _Object$entries8 = Object.entries(obj); _i9 < _Object$entries8.length; _i9++) {
+            _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2), k = _Object$entries8$_i[0], v = _Object$entries8$_i[1];
             processedObj[k] = _processValue(v);
           }
-
-          // Remove debug logging for cleaner output
-          console.log("[encode] START with obj:", JSON.stringify(processedObj));
           if (!(Object.keys(obj).length === 0)) {
-            _context6.next = 7;
+            _context6.next = 8;
             break;
           }
           return _context6.abrupt("return", {
             headers: {},
             body: undefined
           });
-        case 7:
-          // Check for special case: body field with binary + other simple fields or empty binaries
-          hasBodyBinary = obj.body && isBytes(obj.body);
-          otherFields = Object.keys(obj).filter(function (k) {
-            return k !== "body";
-          });
-          allOthersSimpleOrEmptyBinary = otherFields.every(function (k) {
-            var v = obj[k];
-            // Allow empty binaries as "simple"
-            if (isBytes(v) && (v.length === 0 || v.byteLength === 0)) return true;
-            return !isBytes(v) && !isPojo(v) && !(Array.isArray(v) && v.some(function (item) {
-              return isPojo(item) || isBytes(item);
-            }));
-          });
-          if (!(hasBodyBinary && allOthersSimpleOrEmptyBinary)) {
-            _context6.next = 34;
+        case 8:
+          objKeys = Object.keys(obj);
+          if (!(objKeys.length === 1)) {
+            _context6.next = 16;
             break;
           }
-          console.log("[encode] Special case: body with binary + simple fields");
-          // Special case: body with binary + other simple fields
-          _headers = {};
-          _headerTypes = []; // Process other fields into headers
-          _i7 = 0, _Object$entries6 = Object.entries(obj);
-        case 15:
-          if (!(_i7 < _Object$entries6.length)) {
-            _context6.next = 24;
+          fieldName = objKeys[0];
+          fieldValue = obj[fieldName];
+          if (!(isBytes(fieldValue) && (fieldValue.length === 0 || fieldValue.byteLength === 0))) {
+            _context6.next = 16;
             break;
           }
-          _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2), key = _Object$entries6$_i[0], value = _Object$entries6$_i[1];
-          if (!(key === "body")) {
-            _context6.next = 19;
+          _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;
             break;
           }
-          return _context6.abrupt("continue", 21);
-        case 19:
-          console.log("[encode] Processing special case field: ".concat(key, " = ").concat(JSON.stringify(value)));
-          if (value === null) {
-            _headers[key] = '"null"';
-            _headerTypes.push("".concat(key, "=\"atom\""));
-          } else if (value === undefined) {
-            _headers[key] = '"undefined"';
-            _headerTypes.push("".concat(key, "=\"atom\""));
-          } else if (typeof value === "boolean") {
-            _headers[key] = "\"".concat(value, "\"");
-            _headerTypes.push("".concat(key, "=\"atom\""));
-          } else if (_typeof(value) === "symbol") {
-            _headers[key] = "\"".concat(value.description || "Symbol.for()", "\"");
-            _headerTypes.push("".concat(key, "=\"atom\""));
-          } else if (typeof value === "number") {
-            _headers[key] = String(value);
-            _headerTypes.push("".concat(key, "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
-          } else if (typeof value === "string") {
-            if (value.length === 0) {
-              // Empty strings only go in ao-types, not as headers
-              console.log("[encode] Adding empty string type for key: ".concat(key));
-              _headerTypes.push("".concat(key, "=\"empty-binary\""));
-            } else {
-              _headers[key] = value;
-            }
-          } else if (Array.isArray(value) && value.length === 0) {
-            // Empty array only goes in ao-types, not as a header
-            _headerTypes.push("".concat(key, "=\"empty-list\""));
-          } else if (Array.isArray(value) && !value.some(function (item) {
-            return isPojo(item);
-          })) {
-            encodedItems = value.map(function (item) {
-              return encodeArrayItem(item);
-            }).join(", ");
-            _headers[key] = encodedItems;
-            _headerTypes.push("".concat(key, "=\"list\""));
-          } else if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
-            // Empty binary goes in ao-types only
-            _headerTypes.push("".concat(key, "=\"empty-binary\""));
-          }
-        case 21:
-          _i7++;
-          _context6.next = 15;
-          break;
-        case 24:
-          // Add ao-types if needed
-          if (_headerTypes.length > 0) {
-            _headers["ao-types"] = _headerTypes.sort().join(", ");
-          }
-
-          // Set body to binary
+          _headers2 = {};
           bodyBuffer = toBuffer(obj.body);
           bodyArrayBuffer = bodyBuffer.buffer.slice(bodyBuffer.byteOffset, bodyBuffer.byteOffset + bodyBuffer.byteLength);
-          _context6.next = 29;
+          _context6.next = 25;
           return sha256(bodyArrayBuffer);
-        case 29:
-          _contentDigest = _context6.sent;
-          _base = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest));
-          _headers["content-digest"] = "sha-256=:".concat(_base, ":");
-          console.log("[encode] FINAL (body with binary) - headers:", _headers, "body:", obj.body);
+        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: _headers,
+            headers: _headers2,
             body: obj.body
           });
-        case 34:
-          // Check if single binary field
-          objKeys = Object.keys(obj);
-          if (!(objKeys.length === 1 && isBytes(obj[objKeys[0]]))) {
-            _context6.next = 49;
+        case 29:
+          if (!(objKeys.length === 1)) {
+            _context6.next = 71;
             break;
           }
-          fieldName = objKeys[0];
-          binaryData = obj[fieldName];
-          _headers2 = {};
-          _bodyBuffer = toBuffer(binaryData);
+          _fieldName = objKeys[0];
+          _fieldValue = obj[_fieldName];
+          if (!(isBytes(_fieldValue) && _fieldValue.length > 0)) {
+            _context6.next = 45;
+            break;
+          }
+          _headers3 = {};
+          _bodyBuffer = toBuffer(_fieldValue);
           _bodyArrayBuffer = _bodyBuffer.buffer.slice(_bodyBuffer.byteOffset, _bodyBuffer.byteOffset + _bodyBuffer.byteLength);
-          _context6.next = 43;
+          _context6.next = 38;
           return sha256(_bodyArrayBuffer);
-        case 43:
+        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));
-          _headers2["content-digest"] = "sha-256=:".concat(_base2, ":");
-
-          // Add inline-body-key header to preserve the field name
-          if (fieldName !== "body") {
-            _headers2["inline-body-key"] = fieldName;
+          _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;
           }
-          console.log("[encode] FINAL (simple binary field) - headers:", _headers2, "body:", binaryData);
           return _context6.abrupt("return", {
-            headers: _headers2,
-            body: binaryData
+            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 49:
-          // Continue with normal multipart processing
+        case 71:
           headers = {};
-          headerTypes = []; // Collect all body keys
-          bodyKeys = collectBodyKeys(obj); // Process simple header fields AND collect types for body fields
+          headerTypes = [];
+          bodyKeys = collectBodyKeys(obj);
           _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
-            var _Object$entries7$_i, key, value, needsBody, _encodedItems;
+            var _Object$entries9$_i, key, value, needsBody, hasNonAsciiItems, encodedItems;
             return _regeneratorRuntime().wrap(function _loop3$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
-                  _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2), key = _Object$entries7$_i[0], value = _Object$entries7$_i[1];
-                  console.log("[encode] Processing field: ".concat(key, " = ").concat(JSON.stringify(value), ", type: ").concat(_typeof(value)));
+                  _Object$entries9$_i = _slicedToArray(_Object$entries9[_i10], 2), key = _Object$entries9$_i[0], value = _Object$entries9$_i[1];
                   needsBody = bodyKeys.includes(key) || bodyKeys.some(function (k) {
                     return k.startsWith("".concat(key, "/"));
                   });
-                  if (!needsBody) {
-                    console.log("[encode] Field ".concat(key, " doesn't need body, adding to headers"));
-                    // Simple value goes in header
-                    if (value === null) {
-                      headers[key] = '"null"';
-                      headerTypes.push("".concat(key, "=\"atom\""));
-                    } else if (value === undefined) {
-                      headers[key] = '"undefined"';
-                      headerTypes.push("".concat(key, "=\"atom\""));
-                    } else if (typeof value === "boolean") {
-                      headers[key] = "\"".concat(value, "\"");
-                      headerTypes.push("".concat(key, "=\"atom\""));
-                    } else if (_typeof(value) === "symbol") {
-                      headers[key] = "\"".concat(value.description || "Symbol.for()", "\"");
-                      headerTypes.push("".concat(key, "=\"atom\""));
-                    } else if (typeof value === "number") {
-                      headers[key] = String(value);
-                      headerTypes.push("".concat(key, "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
-                    } else if (typeof value === "string") {
-                      if (value.length === 0) {
-                        headerTypes.push("".concat(key, "=\"empty-binary\""));
-                        // Don't add empty strings as headers
-                      } else {
-                        headers[key] = value;
-                      }
-                    } else if (Array.isArray(value) && !value.some(function (item) {
-                      return isPojo(item);
-                    })) {
-                      // Simple array (no objects) goes in header
-                      _encodedItems = value.map(function (item) {
+                  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, "=\"list\""));
-                    }
-                  } else {
-                    // Field needs body - still need to add type info to ao-types
-                    if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
-                      headerTypes.push("".concat(key, "=\"empty-binary\""));
-                    } else if (typeof value === "string" && value.length === 0) {
-                      headerTypes.push("".concat(key, "=\"empty-binary\""));
-                    } else if (Array.isArray(value) && value.length === 0) {
-                      headerTypes.push("".concat(key, "=\"empty-list\""));
-                    } else if (isPojo(value) && Object.keys(value).length === 0) {
-                      headerTypes.push("".concat(key, "=\"empty-message\""));
+                      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 4:
+                case 44:
                 case "end":
                   return _context3.stop();
               }
             }, _loop3);
           });
-          _i8 = 0, _Object$entries7 = Object.entries(obj);
-        case 54:
-          if (!(_i8 < _Object$entries7.length)) {
-            _context6.next = 59;
+          _i10 = 0, _Object$entries9 = Object.entries(obj);
+        case 76:
+          if (!(_i10 < _Object$entries9.length)) {
+            _context6.next = 83;
             break;
           }
-          return _context6.delegateYield(_loop3(), "t0", 56);
-        case 56:
-          _i8++;
-          _context6.next = 54;
+          return _context6.delegateYield(_loop3(), "t0", 78);
+        case 78:
+          if (!_context6.t0) {
+            _context6.next = 80;
+            break;
+          }
+          return _context6.abrupt("continue", 80);
+        case 80:
+          _i10++;
+          _context6.next = 76;
           break;
-        case 59:
+        case 83:
           _loop4 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop4() {
-            var _Object$entries8$_i, key, value;
+            var _Object$entries10$_i, key, value;
             return _regeneratorRuntime().wrap(function _loop4$(_context4) {
               while (1) switch (_context4.prev = _context4.next) {
                 case 0:
-                  _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2), key = _Object$entries8$_i[0], value = _Object$entries8$_i[1];
+                  _Object$entries10$_i = _slicedToArray(_Object$entries10[_i11], 2), key = _Object$entries10$_i[0], value = _Object$entries10$_i[1];
                   if (Array.isArray(value)) {
-                    // Check if this array goes in the body
                     if (bodyKeys.includes(key) || bodyKeys.some(function (k) {
                       return k.startsWith("".concat(key, "/"));
                     })) {
-                      // Don't add list type if it's already been added
                       if (!headerTypes.some(function (t) {
-                        return t.startsWith("".concat(key, "="));
+                        return t.startsWith("".concat(key.toLowerCase(), "="));
                       })) {
-                        headerTypes.push("".concat(key, "=\"list\""));
+                        headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
                       }
                     }
                   }
@@ -686,752 +1081,950 @@ function _encode() {
               }
             }, _loop4);
           });
-          _i9 = 0, _Object$entries8 = Object.entries(obj);
-        case 61:
-          if (!(_i9 < _Object$entries8.length)) {
-            _context6.next = 66;
+          _i11 = 0, _Object$entries10 = Object.entries(obj);
+        case 85:
+          if (!(_i11 < _Object$entries10.length)) {
+            _context6.next = 90;
             break;
           }
-          return _context6.delegateYield(_loop4(), "t1", 63);
-        case 63:
-          _i9++;
-          _context6.next = 61;
+          return _context6.delegateYield(_loop4(), "t1", 87);
+        case 87:
+          _i11++;
+          _context6.next = 85;
           break;
-        case 66:
+        case 90:
           if (!(bodyKeys.length === 0)) {
-            _context6.next = 70;
+            _context6.next = 94;
             break;
           }
+          console.log("No bodyKeys, returning headers only");
           if (headerTypes.length > 0) {
             headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          console.log("[encode] FINAL - headers:", headers, "body:", undefined);
           return _context6.abrupt("return", {
             headers: headers,
             body: undefined
           });
-        case 70:
-          // Check if all body keys are for empty binaries - if so, treat as no body needed
+        case 94:
           allBodyKeysAreEmptyBinaries = bodyKeys.every(function (key) {
             var pathParts = key.split("/");
             var value = obj;
-            var _iterator2 = _createForOfIteratorHelper(pathParts),
-              _step2;
+            var _iterator3 = _createForOfIteratorHelper(pathParts),
+              _step3;
             try {
-              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                var part = _step2.value;
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var part = _step3.value;
                 if (/^\d+$/.test(part)) {
-                  value = value[parseInt(part) - 1];
+                  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) {
-              _iterator2.e(err);
+              _iterator3.e(err);
             } finally {
-              _iterator2.f();
+              _iterator3.f();
             }
             return isBytes(value) && (value.length === 0 || value.byteLength === 0);
           });
           if (!allBodyKeysAreEmptyBinaries) {
-            _context6.next = 75;
+            _context6.next = 98;
             break;
           }
-          // Treat as header-only encoding
           if (headerTypes.length > 0) {
             headers["ao-types"] = headerTypes.sort().join(", ");
           }
-          console.log("[encode] FINAL (all empty binaries) - headers:", headers, "body:", undefined);
           return _context6.abrupt("return", {
             headers: headers,
             body: undefined
           });
-        case 75:
-          // Sort body keys and add to headers
+        case 98:
+          if (!(bodyKeys.length === 1)) {
+            _context6.next = 116;
+            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;
+            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) {
-            // Special sorting to ensure parent paths come before child paths
-            if (a.startsWith(b + "/")) return 1;
-            if (b.startsWith(a + "/")) return -1;
+            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);
-          }); // Special case: if we have both 'data' and 'body' keys where data.body is binary
-          // then we need special handling per Erlang behavior
+          }); // Check if we have the special case where data contains body with bytes and body contains data with bytes
           hasSpecialDataBody = sortedBodyKeys.includes("data") && sortedBodyKeys.includes("body") && obj.data && obj.data.body && isBytes(obj.data.body) && obj.body && obj.body.data && isBytes(obj.body.data);
           headers["body-keys"] = sortedBodyKeys.map(function (k) {
             return "\"".concat(k, "\"");
           }).join(", ");
-
-          // Check for inline keys - but not in the special data/body case
           if (!hasSpecialDataBody) {
-            inlineKey = headers["inline-body-key"];
-            if (!inlineKey) {
-              // Only set inline-body-key if we have ONLY body (not data)
-              if (sortedBodyKeys.includes("body") && !sortedBodyKeys.includes("data")) {
-                headers["inline-body-key"] = "body";
-              }
+            if (sortedBodyKeys.includes("body") && sortedBodyKeys.length === 1) {
+              headers["inline-body-key"] = "body";
             }
           }
-
-          // Add ao-types header if needed
           if (headerTypes.length > 0) {
             headers["ao-types"] = headerTypes.sort().join(", ");
           }
-
-          // Create multipart body parts
           bodyParts = [];
-          _iterator3 = _createForOfIteratorHelper(sortedBodyKeys);
-          _context6.prev = 82;
+          _iterator5 = _createForOfIteratorHelper(sortedBodyKeys);
+          _context6.prev = 123;
           _loop5 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop5() {
-            var bodyKey, lines, pathParts, value, parent, _i10, part, isInline, _buffer, textPart, _textPart, objectTypes, fieldLines, binaryFields, _i11, _Object$entries9, _Object$entries9$_i, _k, _v, childPath, _buffer2, _encodedItems2, onlyEmptyCollections, orderedLines, _iterator4, _step4, line, _binaryFields, _parts, _iterator5, _step5, _step5$value, _key, _buffer3, fullBody, _iterator6, _step6, _line, _parts2, headerText, _iterator7, _step7, _step7$value, _key2, _buffer4, _fullBody, hasObjects, hasArrays, nonObjectItems, _fieldLines, partTypes, _iterator8, _step8, _step8$value, item, index, _buffer5, _encodedItems3, _orderedLines, _iterator9, _step9, _line2, _iterator10, _step10, _line3, _fieldLines2, _partTypes, _orderedLines2, _iterator11, _step11, _line4, _iterator12, _step12, _line5, _fieldName, _partTypes2;
+            var bodyKey, lines, pathParts, value, parent, _i12, _part, 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, parentPath, parentValue, _iterator8, _step8, _part2, _hasEmptyStrings, _hasEmptyObjects, _hasObjects, _isInline3, objectTypes, _fieldLines2, binaryFields, hasOnlyEmptyCollections, hasArraysWithOnlyEmptyElements, arrayTypes, _i13, _Object$entries11, _Object$entries11$_i, _k, _v, _i14, _Object$entries12, _Object$entries12$_i, _k2, _v2, childPath, hasOnlyEmpty, desc, _buffer3, _childPath, _hasObjects2, encodedItems, allTypes, shouldSkipObject, onlyEmptyCollections, _orderedLines4, _iterator9, _step9, _line2, binaryFieldsForInline, parts, _iterator10, _step10, _step10$value, key, _buffer4, fullBody, _isLastBodyPart, _hasOnlyTypes, _orderedLines5, hasBinaryFields, _iterator11, _step11, _line3, _parts, headerText, _i15, _binaryFields$_i, _key, _buffer5, _fullBody, isInline, _buffer6, _headerText, content;
             return _regeneratorRuntime().wrap(function _loop5$(_context5) {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
-                  bodyKey = _step3.value;
-                  lines = []; // Parse the path to get to the value
+                  bodyKey = _step5.value;
+                  console.log("\n[Body part] Processing bodyKey: ".concat(bodyKey));
+                  lines = [];
                   pathParts = bodyKey.split("/");
                   value = obj;
-                  parent = null; // Get the actual value at this path
-                  for (_i10 = 0; _i10 < pathParts.length; _i10++) {
+                  parent = null;
+                  for (_i12 = 0; _i12 < pathParts.length; _i12++) {
                     parent = value;
-                    part = pathParts[_i10];
-                    if (/^\d+$/.test(part)) {
-                      value = value[parseInt(part) - 1];
+                    _part = pathParts[_i12];
+                    if (/^\d+$/.test(_part)) {
+                      value = value[parseInt(_part) - 1];
                     } else {
-                      value = value[part];
+                      value = value[_part];
                     }
                   }
-                  console.log("[encode] Processing body key:", bodyKey, "value type:", Array.isArray(value) ? "array" : _typeof(value));
+                  console.log("[Body part] Value at ".concat(bodyKey, ":"), JSON.stringify(value));
 
-                  // Skip if value is an array with only objects (no content for this body part)
-                  if (!(Array.isArray(value) && value.every(function (item) {
-                    return isPojo(item);
-                  }))) {
-                    _context5.next = 9;
+                  // 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 9:
-                  if (!(isPojo(value) && Object.keys(value).length === 0)) {
-                    _context5.next = 11;
+                case 15:
+                  if (!Array.isArray(value)) {
+                    _context5.next = 45;
                     break;
                   }
-                  return _context5.abrupt("return", 0);
-                case 11:
-                  if (!(hasSpecialDataBody && bodyKey === "data" && isPojo(value) && Object.keys(value).length === 1 && value.body && isBytes(value.body))) {
-                    _context5.next = 13;
+                  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 = 24;
                     break;
                   }
                   return _context5.abrupt("return", 0);
-                case 13:
-                  console.log("[encode] Creating body part for key:", bodyKey, "value type:", _typeof(value), "isBytes:", isBytes(value));
-
-                  // Determine content-disposition
-                  isInline = bodyKey === "body" && headers["inline-body-key"] === "body";
-                  if (isInline) {
-                    lines.push("content-disposition: inline");
+                case 24:
+                  if (!hasOnlyEmptyElements) {
+                    _context5.next = 31;
+                    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 {
-                    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+                    _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")]));
+                    }
                   }
-                  console.log("[encode] Value type checks:", {
-                    isBytes: isBytes(value),
-                    isPojo: isPojo(value),
-                    isArray: Array.isArray(value),
-                    valueType: _typeof(value)
+                  return _context5.abrupt("return", 0);
+                case 31:
+                  // 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]));
+                      }
+                    }
                   });
-                  if (!isBytes(value)) {
-                    _context5.next = 23;
-                    break;
+
+                  // 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\""));
+                      }
+                    });
                   }
-                  console.log("[encode] Processing binary value for key:", bodyKey);
-                  // Binary data
-                  _buffer = toBuffer(value); // Check if this is a nested path like "data/body"
-                  if (bodyKey.includes("/")) {
-                    // For nested binary, we need to replace the disposition
-                    lines[lines.length - 1] = "content-disposition: form-data;name=\"".concat(bodyKey, "\"");
-                    lines.push(""); // Empty line
-                    lines.push(""); // Another empty line before binary
-                    textPart = lines.join("\r\n");
-                    bodyParts.push(new Blob([textPart, _buffer]));
+
+                  // 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 _buffer = toBuffer(subItem);
+                            if (_buffer.length === 0 || _buffer.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 _buffer2 = toBuffer(item);
+                      if (_buffer2.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 {
-                    lines.push(""); // Empty line after headers
-                    lines.push(""); // Another empty line before binary data
-                    _textPart = lines.join("\r\n");
-                    bodyParts.push(new Blob([_textPart, _buffer]));
+                    // 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")]));
+                    }
                   }
-                  _context5.next = 80;
-                  break;
-                case 23:
+                  return _context5.abrupt("return", 0);
+                case 45:
                   if (!isPojo(value)) {
-                    _context5.next = 79;
+                    _context5.next = 126;
+                    break;
+                  }
+                  if (!(Object.keys(value).length === 0)) {
+                    _context5.next = 60;
+                    break;
+                  }
+                  // Check if this is a parent array context where empty objects should get parts
+                  parentPath = pathParts.slice(0, -1).join("/");
+                  parentValue = obj;
+                  _iterator8 = _createForOfIteratorHelper(pathParts.slice(0, -1));
+                  try {
+                    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+                      _part2 = _step8.value;
+                      if (/^\d+$/.test(_part2)) {
+                        parentValue = parentValue[parseInt(_part2) - 1];
+                      } else {
+                        parentValue = parentValue[_part2];
+                      }
+                    }
+                  } catch (err) {
+                    _iterator8.e(err);
+                  } finally {
+                    _iterator8.f();
+                  }
+                  if (!Array.isArray(parentValue)) {
+                    _context5.next = 58;
                     break;
                   }
-                  console.log("[encode] Processing object value");
-                  // Object - only include fields that aren't handled by nested body parts
+                  // Check if parent array has mixed content
+                  _hasEmptyStrings = parentValue.some(function (item) {
+                    return typeof item === "string" && item === "";
+                  });
+                  _hasEmptyObjects = parentValue.some(function (item) {
+                    return isPojo(item) && Object.keys(item).length === 0;
+                  });
+                  _hasObjects = parentValue.some(function (item) {
+                    return isPojo(item);
+                  });
+                  if (!(_hasObjects && (_hasEmptyStrings || _hasEmptyObjects))) {
+                    _context5.next = 58;
+                    break;
+                  }
+                  // Special mixed array case - empty objects don't get parts
+                  console.log("[Body part] Skipping empty object in mixed array at ".concat(bodyKey));
+                  return _context5.abrupt("return", 0);
+                case 58:
+                  // Normal case - empty objects might get parts
+                  console.log("[Body part] Empty object at ".concat(bodyKey));
+                  // For now, skip empty objects
+                  return _context5.abrupt("return", 0);
+                case 60:
+                  if (!(hasSpecialDataBody && bodyKey === "data" && Object.keys(value).length === 1 && value.body && isBytes(value.body))) {
+                    _context5.next = 62;
+                    break;
+                  }
+                  return _context5.abrupt("return", 0);
+                case 62:
+                  // Handle non-empty objects
+                  _isInline3 = bodyKey === "body" && headers["inline-body-key"] === "body";
+                  if (_isInline3) {
+                    lines.push("content-disposition: inline");
+                  } else {
+                    lines.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
+                  }
+
+                  // Continue with object processing...
                   objectTypes = [];
-                  fieldLines = [];
-                  binaryFields = [];
-                  _i11 = 0, _Object$entries9 = Object.entries(value);
-                case 29:
-                  if (!(_i11 < _Object$entries9.length)) {
-                    _context5.next = 75;
+                  _fieldLines2 = [];
+                  binaryFields = []; // First check if this object only contains empty collections
+                  hasOnlyEmptyCollections = Object.entries(value).every(function (_ref8) {
+                    var _ref9 = _slicedToArray(_ref8, 2),
+                      k = _ref9[0],
+                      v = _ref9[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;
+                  }); // Also check if it contains arrays with only empty elements
+                  hasArraysWithOnlyEmptyElements = Object.entries(value).some(function (_ref10) {
+                    var _ref11 = _slicedToArray(_ref10, 2),
+                      k = _ref11[0],
+                      v = _ref11[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 === "";
+                    });
+                  }); // Collect type information for arrays in the object BEFORE processing fields
+                  arrayTypes = [];
+                  for (_i13 = 0, _Object$entries11 = Object.entries(value); _i13 < _Object$entries11.length; _i13++) {
+                    _Object$entries11$_i = _slicedToArray(_Object$entries11[_i13], 2), _k = _Object$entries11$_i[0], _v = _Object$entries11$_i[1];
+                    if (Array.isArray(_v)) {
+                      arrayTypes.push("".concat(_k.toLowerCase(), "=\"").concat(_v.length === 0 ? "empty-list" : "list", "\""));
+                    }
+                  }
+                  _i14 = 0, _Object$entries12 = Object.entries(value);
+                case 72:
+                  if (!(_i14 < _Object$entries12.length)) {
+                    _context5.next = 119;
                     break;
                   }
-                  _Object$entries9$_i = _slicedToArray(_Object$entries9[_i11], 2), _k = _Object$entries9$_i[0], _v = _Object$entries9$_i[1];
-                  childPath = "".concat(bodyKey, "/").concat(_k); // Skip if this field has its own body part
+                  _Object$entries12$_i = _slicedToArray(_Object$entries12[_i14], 2), _k2 = _Object$entries12$_i[0], _v2 = _Object$entries12$_i[1];
+                  childPath = "".concat(bodyKey, "/").concat(_k2);
                   if (!sortedBodyKeys.includes(childPath)) {
-                    _context5.next = 34;
+                    _context5.next = 77;
                     break;
                   }
-                  return _context5.abrupt("continue", 72);
-                case 34:
-                  if (!(Array.isArray(_v) && _v.some(function (item) {
+                  return _context5.abrupt("continue", 116);
+                case 77:
+                  if (!(Array.isArray(_v2) && _v2.some(function (item) {
                     return isPojo(item);
                   }))) {
-                    _context5.next = 36;
+                    _context5.next = 83;
                     break;
                   }
-                  return _context5.abrupt("continue", 72);
-                case 36:
-                  // Add type info
-                  if (Array.isArray(_v)) {
-                    objectTypes.push("".concat(_k, "=\"").concat(_v.length === 0 ? "empty-list" : "list", "\""));
-                  } else if (_v === null || _v === undefined || _typeof(_v) === "symbol" || typeof _v === "boolean") {
-                    objectTypes.push("".concat(_k, "=\"atom\""));
-                  } else if (typeof _v === "number") {
-                    objectTypes.push("".concat(_k, "=\"").concat(Number.isInteger(_v) ? "integer" : "float", "\""));
-                  } else if (typeof _v === "string" && _v.length === 0) {
-                    objectTypes.push("".concat(_k, "=\"empty-binary\""));
-                  } else if (isBytes(_v) && (_v.length === 0 || _v.byteLength === 0)) {
-                    objectTypes.push("".concat(_k, "=\"empty-binary\""));
-                  } else if (isPojo(_v) && Object.keys(_v).length === 0) {
-                    objectTypes.push("".concat(_k, "=\"empty-message\""));
+                  if (!sortedBodyKeys.includes(childPath)) {
+                    _context5.next = 80;
+                    break;
                   }
-
-                  // Add field value
-                  if (!(typeof _v === "string")) {
-                    _context5.next = 41;
+                  return _context5.abrupt("continue", 116);
+                case 80:
+                  // Check if array has only empty elements
+                  hasOnlyEmpty = _v2.every(function (item) {
+                    return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+                  });
+                  if (!hasOnlyEmpty) {
+                    _context5.next = 83;
                     break;
                   }
-                  fieldLines.push("".concat(_k, ": ").concat(_v));
-                  _context5.next = 72;
-                  break;
-                case 41:
-                  if (!(typeof _v === "number")) {
-                    _context5.next = 45;
+                  return _context5.abrupt("continue", 116);
+                case 83:
+                  if (Array.isArray(_v2)) {
+                    // Type info already added above in arrayTypes
+                  } else if (_v2 === null || _v2 === undefined || _typeof(_v2) === "symbol" || typeof _v2 === "boolean") {
+                    objectTypes.push("".concat(_k2.toLowerCase(), "=\"atom\""));
+                  } else if (typeof _v2 === "number") {
+                    objectTypes.push("".concat(_k2.toLowerCase(), "=\"").concat(Number.isInteger(_v2) ? "integer" : "float", "\""));
+                  } else if (typeof _v2 === "string" && _v2.length === 0) {
+                    objectTypes.push("".concat(_k2.toLowerCase(), "=\"empty-binary\""));
+                  } else if (isBytes(_v2) && (_v2.length === 0 || _v2.byteLength === 0)) {
+                    objectTypes.push("".concat(_k2.toLowerCase(), "=\"empty-binary\""));
+                  } else if (isPojo(_v2) && Object.keys(_v2).length === 0) {
+                    objectTypes.push("".concat(_k2.toLowerCase(), "=\"empty-message\""));
+                  }
+                  if (!(typeof _v2 === "string")) {
+                    _context5.next = 88;
                     break;
                   }
-                  fieldLines.push("".concat(_k, ": ").concat(_v));
-                  _context5.next = 72;
+                  if (_v2.length === 0) {
+                    // Empty strings are shown as "empty: " (with trailing space)
+                    _fieldLines2.push("".concat(_k2, ": "));
+                  } else {
+                    _fieldLines2.push("".concat(_k2, ": ").concat(_v2));
+                  }
+                  _context5.next = 116;
                   break;
-                case 45:
-                  if (!(typeof _v === "boolean")) {
-                    _context5.next = 49;
+                case 88:
+                  if (!(typeof _v2 === "number")) {
+                    _context5.next = 92;
                     break;
                   }
-                  fieldLines.push("".concat(_k, ": \"").concat(_v, "\""));
-                  _context5.next = 72;
+                  _fieldLines2.push("".concat(_k2, ": ").concat(_v2));
+                  _context5.next = 116;
                   break;
-                case 49:
-                  if (!(_v === null)) {
-                    _context5.next = 53;
+                case 92:
+                  if (!(typeof _v2 === "boolean")) {
+                    _context5.next = 96;
                     break;
                   }
-                  fieldLines.push("".concat(_k, ": \"null\""));
-                  _context5.next = 72;
+                  _fieldLines2.push("".concat(_k2, ": \"").concat(_v2, "\""));
+                  _context5.next = 116;
                   break;
-                case 53:
-                  if (!(_v === undefined)) {
-                    _context5.next = 57;
+                case 96:
+                  if (!(_v2 === null)) {
+                    _context5.next = 100;
                     break;
                   }
-                  fieldLines.push("".concat(_k, ": \"undefined\""));
-                  _context5.next = 72;
+                  _fieldLines2.push("".concat(_k2, ": \"null\""));
+                  _context5.next = 116;
                   break;
-                case 57:
-                  if (!(_typeof(_v) === "symbol")) {
-                    _context5.next = 61;
+                case 100:
+                  if (!(_v2 === undefined)) {
+                    _context5.next = 104;
                     break;
                   }
-                  fieldLines.push("".concat(_k, ": \"").concat(_v.description || "Symbol.for()", "\""));
-                  _context5.next = 72;
+                  _fieldLines2.push("".concat(_k2, ": \"undefined\""));
+                  _context5.next = 116;
                   break;
-                case 61:
-                  if (!isBytes(_v)) {
-                    _context5.next = 71;
+                case 104:
+                  if (!(_typeof(_v2) === "symbol")) {
+                    _context5.next = 109;
                     break;
                   }
-                  _buffer2 = toBuffer(_v); // For inline data/body parts, binary fields get raw bytes
-                  if (!isInline) {
-                    _context5.next = 67;
+                  desc = _v2.description || "Symbol.for()";
+                  _fieldLines2.push("".concat(_k2, ": \"").concat(desc, "\""));
+                  _context5.next = 116;
+                  break;
+                case 109:
+                  if (!isBytes(_v2)) {
+                    _context5.next = 115;
                     break;
                   }
-                  return _context5.abrupt("continue", 72);
-                case 67:
-                  // For non-inline parts, we need to add raw bytes, not base64
-                  // Store the binary field for later processing
+                  _buffer3 = toBuffer(_v2);
                   binaryFields.push({
-                    key: _k,
-                    buffer: _buffer2
+                    key: _k2,
+                    buffer: _buffer3
                   });
-                  return _context5.abrupt("continue", 72);
-                case 69:
-                  _context5.next = 72;
-                  break;
-                case 71:
-                  if (Array.isArray(_v)) {
-                    if (_v.length === 0) {
-                      fieldLines.push("".concat(_k, ": "));
+                  return _context5.abrupt("continue", 116);
+                case 115:
+                  if (Array.isArray(_v2)) {
+                    if (_v2.length === 0) {
+                      // Don't add field line for empty array
                     } else {
-                      _encodedItems2 = _v.map(function (item) {
-                        return encodeArrayItem(item);
-                      }).join(", ");
-                      fieldLines.push("".concat(_k, ": ").concat(_encodedItems2));
+                      // Check if this array will have its own body part
+                      _childPath = "".concat(bodyKey, "/").concat(_k2);
+                      if (!sortedBodyKeys.includes(_childPath)) {
+                        // Check if this array contains objects - if so, don't add field line
+                        _hasObjects2 = _v2.some(function (item) {
+                          return isPojo(item);
+                        });
+                        if (!_hasObjects2) {
+                          encodedItems = _v2.map(function (item) {
+                            return encodeArrayItem(item);
+                          }).join(", ");
+                          _fieldLines2.push("".concat(_k2, ": ").concat(encodedItems));
+                        }
+                      }
                     }
-                  } else if (isPojo(_v) && Object.keys(_v).length === 0) {
-                    // Empty object - no content line needed, just ao-type
+                  } else if (isPojo(_v2) && Object.keys(_v2).length === 0) {
+                    // Empty object - don't add field line
                   }
-                case 72:
-                  _i11++;
-                  _context5.next = 29;
+                case 116:
+                  _i14++;
+                  _context5.next = 72;
                   break;
-                case 75:
-                  // Check if this object only has empty collections
-                  onlyEmptyCollections = Object.entries(value).every(function (_ref) {
-                    var _ref2 = _slicedToArray(_ref, 2),
-                      k = _ref2[0],
-                      v = _ref2[1];
+                case 119:
+                  // Combine arrayTypes with objectTypes
+                  allTypes = [].concat(arrayTypes, objectTypes); // Check if this object should be skipped entirely
+                  shouldSkipObject = Object.entries(value).every(function (_ref12) {
+                    var _ref13 = _slicedToArray(_ref12, 2),
+                      k = _ref13[0],
+                      v = _ref13[1];
+                    var childPath = "".concat(bodyKey, "/").concat(k);
+                    if (sortedBodyKeys.includes(childPath)) return true;
+                    if (Array.isArray(v) && v.some(function (item) {
+                      return isPojo(item);
+                    })) {
+                      // Check if array has only empty elements
+                      var _hasOnlyEmpty = v.every(function (item) {
+                        return Array.isArray(item) && item.length === 0 || isPojo(item) && Object.keys(item).length === 0 || typeof item === "string" && item === "";
+                      });
+                      return _hasOnlyEmpty || sortedBodyKeys.includes(childPath);
+                    }
+                    return false;
+                  });
+                  if (!(shouldSkipObject && !hasOnlyEmptyCollections && !hasArraysWithOnlyEmptyElements)) {
+                    _context5.next = 123;
+                    break;
+                  }
+                  return _context5.abrupt("return", 0);
+                case 123:
+                  onlyEmptyCollections = Object.entries(value).every(function (_ref14) {
+                    var _ref15 = _slicedToArray(_ref14, 2),
+                      k = _ref15[0],
+                      v = _ref15[1];
                     var childPath = "".concat(bodyKey, "/").concat(k);
                     if (sortedBodyKeys.includes(childPath)) return true;
                     if (Array.isArray(v) && v.some(function (item) {
                       return isPojo(item);
                     })) return true;
                     return Array.isArray(v) && v.length === 0 || isPojo(v) && Object.keys(v).length === 0 || isBytes(v) && (v.length === 0 || v.byteLength === 0);
-                  }); // Special handling for inline body
-                  if (isInline) {
-                    // For inline: fields first, then ao-types, then content-disposition
-                    orderedLines = []; // First: field lines
-                    if (!onlyEmptyCollections) {
-                      _iterator4 = _createForOfIteratorHelper(fieldLines);
-                      try {
-                        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                          line = _step4.value;
-                          orderedLines.push(line);
-                        }
-                      } catch (err) {
-                        _iterator4.e(err);
-                      } finally {
-                        _iterator4.f();
+                  });
+                  if (_isInline3) {
+                    _orderedLines4 = []; // FIXED: For inline body, put field lines FIRST
+                    _iterator9 = _createForOfIteratorHelper(_fieldLines2);
+                    try {
+                      for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                        _line2 = _step9.value;
+                        _orderedLines4.push(_line2);
                       }
+                    } catch (err) {
+                      _iterator9.e(err);
+                    } finally {
+                      _iterator9.f();
                     }
-
-                    // Then: ao-types
-                    if (objectTypes.length > 0) {
-                      orderedLines.push("ao-types: ".concat(objectTypes.sort().join(", ")));
+                    if (allTypes.length > 0) {
+                      _orderedLines4.push("ao-types: ".concat(allTypes.sort().join(", ")));
                     }
-
-                    // Finally: content-disposition
-                    orderedLines.push("content-disposition: inline");
-
-                    // Check if this has binary fields
-                    _binaryFields = Object.entries(value).filter(function (_ref3) {
-                      var _ref4 = _slicedToArray(_ref3, 2),
-                        k = _ref4[0],
-                        v = _ref4[1];
+                    _orderedLines4.push("content-disposition: inline");
+                    binaryFieldsForInline = Object.entries(value).filter(function (_ref16) {
+                      var _ref17 = _slicedToArray(_ref16, 2),
+                        k = _ref17[0],
+                        v = _ref17[1];
                       return isBytes(v) && !sortedBodyKeys.includes("".concat(bodyKey, "/").concat(k));
-                    }).map(function (_ref5) {
-                      var _ref6 = _slicedToArray(_ref5, 2),
-                        k = _ref6[0],
-                        v = _ref6[1];
+                    }).map(function (_ref18) {
+                      var _ref19 = _slicedToArray(_ref18, 2),
+                        k = _ref19[0],
+                        v = _ref19[1];
                       return {
                         key: k,
                         buffer: toBuffer(v)
                       };
                     });
-                    if (_binaryFields.length > 0) {
-                      // Build the parts
-                      _parts = []; // Add the text part
-                      _parts.push(Buffer.from(orderedLines.join("\r\n")));
-
-                      // Add binary fields with raw bytes
-                      _iterator5 = _createForOfIteratorHelper(_binaryFields);
+                    if (binaryFieldsForInline.length > 0) {
+                      parts = [];
+                      parts.push(Buffer.from(_orderedLines4.join("\r\n")));
+                      _iterator10 = _createForOfIteratorHelper(binaryFieldsForInline);
                       try {
-                        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                          _step5$value = _step5.value, _key = _step5$value.key, _buffer3 = _step5$value.buffer;
-                          _parts.push(Buffer.from("\r\n".concat(_key, ": ")));
-                          _parts.push(_buffer3);
+                        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+                          _step10$value = _step10.value, key = _step10$value.key, _buffer4 = _step10$value.buffer;
+                          parts.push(Buffer.from("\r\n".concat(key, ": ")));
+                          parts.push(_buffer4);
                         }
-
-                        // Add trailing \r\n for inline parts with binary
                       } catch (err) {
-                        _iterator5.e(err);
+                        _iterator10.e(err);
                       } finally {
-                        _iterator5.f();
+                        _iterator10.f();
                       }
-                      _parts.push(Buffer.from("\r\n"));
-                      fullBody = Buffer.concat(_parts);
+                      parts.push(Buffer.from("\r\n"));
+                      fullBody = Buffer.concat(parts);
                       bodyParts.push(new Blob([fullBody]));
                     } else {
-                      orderedLines.push(""); // Add empty line for trailing \r\n
-                      bodyParts.push(new Blob([orderedLines.join("\r\n")]));
+                      // Check if this is the last body part for special handling
+                      _isLastBodyPart = sortedBodyKeys.indexOf(bodyKey) === sortedBodyKeys.length - 1;
+                      _hasOnlyTypes = allTypes.length > 0 && _fieldLines2.length === 0;
+                      if (_isLastBodyPart && _hasOnlyTypes) {
+                        // Don't add empty line for last part with only types
+                        bodyParts.push(new Blob([_orderedLines4.join("\r\n")]));
+                      } else if (_fieldLines2.length === 0) {
+                        bodyParts.push(new Blob([_orderedLines4.join("\r\n")]));
+                      } else {
+                        bodyParts.push(new Blob([_orderedLines4.join("\r\n") + "\r\n"]));
+                      }
                     }
                   } else {
-                    // Normal handling (non-inline)
-                    // ao-types first if needed
-                    if (objectTypes.length > 0) {
-                      lines.unshift("ao-types: ".concat(objectTypes.sort().join(", ")));
+                    // Put ao-types first, then content-disposition, then field lines
+                    _orderedLines5 = [];
+                    if (allTypes.length > 0) {
+                      _orderedLines5.push("ao-types: ".concat(allTypes.sort().join(", ")));
                     }
+                    _orderedLines5.push("content-disposition: form-data;name=\"".concat(bodyKey, "\""));
 
-                    // Only add field lines if not all collections are empty
-                    if (!onlyEmptyCollections) {
-                      _iterator6 = _createForOfIteratorHelper(fieldLines);
-                      try {
-                        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                          _line = _step6.value;
-                          lines.push(_line);
-                        }
-                      } catch (err) {
-                        _iterator6.e(err);
-                      } finally {
-                        _iterator6.f();
-                      }
+                    // Check if we have any binary fields
+                    hasBinaryFields = binaryFields && binaryFields.length > 0; // Add blank line before field lines if we have binary fields or no field lines
+                    if (hasBinaryFields || _fieldLines2.length === 0) {
+                      _orderedLines5.push("");
                     }
 
-                    // Then handle binary fields with raw bytes if any
+                    // Add field lines
+                    _iterator11 = _createForOfIteratorHelper(_fieldLines2);
+                    try {
+                      for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                        _line3 = _step11.value;
+                        _orderedLines5.push(_line3);
+                      }
+                    } catch (err) {
+                      _iterator11.e(err);
+                    } finally {
+                      _iterator11.f();
+                    }
                     if (binaryFields && binaryFields.length > 0) {
-                      // Create parts array for proper ordering
-                      _parts2 = []; // Add headers and text fields
-                      headerText = lines.join("\r\n") + "\r\n";
-                      _parts2.push(Buffer.from(headerText));
-
-                      // Add binary fields with raw bytes
-                      _iterator7 = _createForOfIteratorHelper(binaryFields);
-                      try {
-                        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                          _step7$value = _step7.value, _key2 = _step7$value.key, _buffer4 = _step7$value.buffer;
-                          _parts2.push(Buffer.from("".concat(_key2, ": ")));
-                          _parts2.push(_buffer4);
-                          _parts2.push(Buffer.from("\r\n"));
+                      _parts = [];
+                      headerText = _orderedLines5.join("\r\n");
+                      _parts.push(Buffer.from(headerText));
+                      for (_i15 = 0; _i15 < binaryFields.length; _i15++) {
+                        _binaryFields$_i = binaryFields[_i15], _key = _binaryFields$_i.key, _buffer5 = _binaryFields$_i.buffer;
+                        if (_i15 > 0) {
+                          _parts.push(Buffer.from("\r\n"));
                         }
-                      } catch (err) {
-                        _iterator7.e(err);
-                      } finally {
-                        _iterator7.f();
+                        _parts.push(Buffer.from("".concat(_key, ": ")));
+                        _parts.push(_buffer5);
                       }
-                      _fullBody = Buffer.concat(_parts2);
+                      _parts.push(Buffer.from("\r\n"));
+                      _fullBody = Buffer.concat(_parts);
                       bodyParts.push(new Blob([_fullBody]));
                     } else {
-                      lines.push("");
-                      bodyParts.push(new Blob([lines.join("\r\n")]));
-                    }
-                  }
-                  _context5.next = 80;
-                  break;
-                case 79:
-                  if (Array.isArray(value)) {
-                    // Array field - check if it's a mixed array or array of arrays
-                    hasObjects = value.some(function (item) {
-                      return isPojo(item);
-                    });
-                    hasArrays = value.some(function (item) {
-                      return Array.isArray(item);
-                    });
-                    nonObjectItems = value.map(function (item, index) {
-                      return {
-                        item: item,
-                        index: index + 1
-                      };
-                    }).filter(function (_ref7) {
-                      var item = _ref7.item;
-                      return !isPojo(item);
-                    });
-                    if (hasObjects && nonObjectItems.length > 0) {
-                      // Mixed array - only include non-object items
-                      _fieldLines = [];
-                      partTypes = [];
-                      _iterator8 = _createForOfIteratorHelper(nonObjectItems);
-                      try {
-                        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                          _step8$value = _step8.value, item = _step8$value.item, index = _step8$value.index;
-                          if (typeof item === "number") {
-                            if (Number.isInteger(item)) {
-                              partTypes.push("".concat(index, "=\"integer\""));
-                              _fieldLines.push("".concat(index, ": ").concat(item));
-                            } else {
-                              partTypes.push("".concat(index, "=\"float\""));
-                              _fieldLines.push("".concat(index, ": ").concat(formatFloat(item)));
-                            }
-                          } else if (typeof item === "string") {
-                            _fieldLines.push("".concat(index, ": ").concat(item));
-                          } else if (item === null || item === undefined || _typeof(item) === "symbol" || typeof item === "boolean") {
-                            partTypes.push("".concat(index, "=\"atom\""));
-                            if (item === null) {
-                              _fieldLines.push("".concat(index, ": \"null\""));
-                            } else if (item === undefined) {
-                              _fieldLines.push("".concat(index, ": \"undefined\""));
-                            } else if (_typeof(item) === "symbol") {
-                              _fieldLines.push("".concat(index, ": \"").concat(item.description || "Symbol.for()", "\""));
-                            } else {
-                              _fieldLines.push("".concat(index, ": \"").concat(item, "\""));
-                            }
-                          } else if (isBytes(item)) {
-                            // Binary items in arrays need special handling
-                            _buffer5 = toBuffer(item);
-                            if (_buffer5.length === 0) {
-                              partTypes.push("".concat(index, "=\"empty-binary\""));
-                            }
-                            // For now, skip binary items in mixed arrays
-                            // They should be handled differently
-                            partTypes.push("".concat(index, "=\"binary\""));
-                          } else if (Array.isArray(item)) {
-                            partTypes.push("".concat(index, "=\"list\""));
-                            _encodedItems3 = item.map(function (subItem) {
-                              return encodeArrayItem(subItem);
-                            }).join(", ");
-                            _fieldLines.push("".concat(index, ": ").concat(_encodedItems3));
-                          }
-                        }
-
-                        // For inline arrays, use different order
-                      } catch (err) {
-                        _iterator8.e(err);
-                      } finally {
-                        _iterator8.f();
-                      }
-                      if (isInline) {
-                        console.log("[encode] Reordering for inline array:", {
-                          bodyKey: bodyKey,
-                          fieldLines: _fieldLines,
-                          partTypes: partTypes
-                        });
-
-                        // Rebuild in correct order: field lines, ao-types, content-disposition
-                        _orderedLines = []; // First: field lines
-                        _iterator9 = _createForOfIteratorHelper(_fieldLines);
-                        try {
-                          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                            _line2 = _step9.value;
-                            _orderedLines.push(_line2);
-                          }
-
-                          // Then: ao-types
-                        } catch (err) {
-                          _iterator9.e(err);
-                        } finally {
-                          _iterator9.f();
-                        }
-                        if (partTypes.length > 0) {
-                          _orderedLines.push("ao-types: ".concat(partTypes.sort(function (a, b) {
-                            var aNum = parseInt(a.split("=")[0]);
-                            var bNum = parseInt(b.split("=")[0]);
-                            return aNum - bNum;
-                          }).join(", ")));
-                        }
-
-                        // Finally: content-disposition (from lines[0])
-                        _orderedLines.push(lines[0]);
-                        _orderedLines.push("");
-                        console.log("[encode] Ordered lines:", _orderedLines);
-                        bodyParts.push(new Blob([_orderedLines.join("\r\n")]));
-                      } else {
-                        // Normal order for non-inline parts
-                        if (partTypes.length > 0) {
-                          lines.unshift("ao-types: ".concat(partTypes.sort(function (a, b) {
-                            var aNum = parseInt(a.split("=")[0]);
-                            var bNum = parseInt(b.split("=")[0]);
-                            return aNum - bNum;
-                          }).join(", ")));
-                        }
-                        _iterator10 = _createForOfIteratorHelper(_fieldLines);
-                        try {
-                          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-                            _line3 = _step10.value;
-                            lines.push(_line3);
-                          }
-                        } catch (err) {
-                          _iterator10.e(err);
-                        } finally {
-                          _iterator10.f();
-                        }
-                        lines.push("");
-                        bodyParts.push(new Blob([lines.join("\r\n")]));
-                      }
-                    } else if (hasArrays || !hasObjects && value.length > 0) {
-                      // Array of arrays or simple array - use indexed format
-                      _fieldLines2 = [];
-                      _partTypes = [];
-                      value.forEach(function (item, idx) {
-                        var index = idx + 1;
-                        if (Array.isArray(item)) {
-                          if (item.length === 0) {
-                            _partTypes.push("".concat(index, "=\"empty-list\""));
-                          } else {
-                            _partTypes.push("".concat(index, "=\"list\""));
-                            var _encodedItems4 = item.map(function (subItem) {
-                              return encodeArrayItem(subItem);
-                            }).join(", ");
-                            _fieldLines2.push("".concat(index, ": ").concat(_encodedItems4));
-                          }
-                        } else if (typeof item === "number") {
-                          if (Number.isInteger(item)) {
-                            _partTypes.push("".concat(index, "=\"integer\""));
-                            _fieldLines2.push("".concat(index, ": ").concat(item));
-                          } else {
-                            _partTypes.push("".concat(index, "=\"float\""));
-                            _fieldLines2.push("".concat(index, ": ").concat(formatFloat(item)));
-                          }
-                        } else if (typeof item === "string") {
-                          if (item.length === 0) {
-                            _partTypes.push("".concat(index, "=\"empty-binary\""));
-                          }
-                          _fieldLines2.push("".concat(index, ": ").concat(item));
-                        } else if (item === null || item === undefined || _typeof(item) === "symbol" || typeof item === "boolean") {
-                          _partTypes.push("".concat(index, "=\"atom\""));
-                          if (item === null) {
-                            _fieldLines2.push("".concat(index, ": \"null\""));
-                          } else if (item === undefined) {
-                            _fieldLines2.push("".concat(index, ": \"undefined\""));
-                          } else if (_typeof(item) === "symbol") {
-                            _fieldLines2.push("".concat(index, ": \"").concat(item.description || "Symbol.for()", "\""));
-                          } else {
-                            _fieldLines2.push("".concat(index, ": \"").concat(item, "\""));
-                          }
-                        } else if (isBytes(item)) {
-                          var _buffer6 = toBuffer(item);
-                          if (_buffer6.length === 0) {
-                            _partTypes.push("".concat(index, "=\"empty-binary\""));
-                          } else {
-                            _partTypes.push("".concat(index, "=\"binary\""));
-                          }
-                          // For indexed format, we also can't include raw bytes inline
-                          // This is a limitation of the format
-                        }
-                      });
-
-                      // For inline arrays, use different order
-                      if (isInline) {
-                        console.log("[encode] Reordering for inline array - indexed format");
-                        _orderedLines2 = []; // First: field lines
-                        _iterator11 = _createForOfIteratorHelper(_fieldLines2);
-                        try {
-                          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-                            _line4 = _step11.value;
-                            _orderedLines2.push(_line4);
-                          }
-
-                          // Then: ao-types
-                        } catch (err) {
-                          _iterator11.e(err);
-                        } finally {
-                          _iterator11.f();
-                        }
-                        if (_partTypes.length > 0) {
-                          _orderedLines2.push("ao-types: ".concat(_partTypes.sort(function (a, b) {
-                            var aNum = parseInt(a.split("=")[0]);
-                            var bNum = parseInt(b.split("=")[0]);
-                            return aNum - bNum;
-                          }).join(", ")));
-                        }
-
-                        // Finally: content-disposition
-                        _orderedLines2.push(lines[0]);
-                        _orderedLines2.push("");
-                        console.log("[encode] Final ordered lines:", _orderedLines2);
-                        bodyParts.push(new Blob([_orderedLines2.join("\r\n")]));
+                      // Add trailing blank line if we have field lines
+                      if (_fieldLines2.length > 0) {
+                        bodyParts.push(new Blob([_orderedLines5.join("\r\n") + "\r\n"]));
                       } else {
-                        // Normal order for non-inline parts
-                        if (_partTypes.length > 0) {
-                          console.log("[encode] Adding ao-types to beginning of lines array");
-                          lines.unshift("ao-types: ".concat(_partTypes.sort(function (a, b) {
-                            var aNum = parseInt(a.split("=")[0]);
-                            var bNum = parseInt(b.split("=")[0]);
-                            return aNum - bNum;
-                          }).join(", ")));
-                        }
-                        console.log("[encode] Adding field lines:", _fieldLines2);
-                        _iterator12 = _createForOfIteratorHelper(_fieldLines2);
-                        try {
-                          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-                            _line5 = _step12.value;
-                            lines.push(_line5);
-                          }
-                        } catch (err) {
-                          _iterator12.e(err);
-                        } finally {
-                          _iterator12.f();
-                        }
-                        console.log("[encode] Final lines before blob:", lines);
-                        lines.push("");
-                        bodyParts.push(new Blob([lines.join("\r\n")]));
+                        bodyParts.push(new Blob([_orderedLines5.join("\r\n")]));
                       }
-                    } else if (!hasObjects && value.length === 0) {
-                      // Empty array
-                      _fieldName = pathParts[pathParts.length - 1];
-                      _partTypes2 = ["".concat(_fieldName, "=\"empty-list\"")];
-                      lines.unshift("ao-types: ".concat(_partTypes2.join(", ")));
-                      lines.push("");
-                      bodyParts.push(new Blob([lines.join("\r\n")]));
                     }
+                  }
+                  return _context5.abrupt("return", 0);
+                case 126:
+                  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 (isBytes(value)) {
+                    _buffer6 = toBuffer(value);
+                    _headerText = lines.join("\r\n") + "\r\n\r\n";
+                    bodyParts.push(new Blob([_headerText, _buffer6]));
                   } else if (typeof value === "string") {
-                    // String with newlines or too long
                     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 80:
+                case 129:
                 case "end":
                   return _context5.stop();
               }
             }, _loop5);
           });
-          _iterator3.s();
-        case 85:
-          if ((_step3 = _iterator3.n()).done) {
-            _context6.next = 92;
+          _iterator5.s();
+        case 126:
+          if ((_step5 = _iterator5.n()).done) {
+            _context6.next = 133;
             break;
           }
-          return _context6.delegateYield(_loop5(), "t2", 87);
-        case 87:
+          return _context6.delegateYield(_loop5(), "t2", 128);
+        case 128:
           _ret = _context6.t2;
           if (!(_ret === 0)) {
-            _context6.next = 90;
+            _context6.next = 131;
             break;
           }
-          return _context6.abrupt("continue", 90);
-        case 90:
-          _context6.next = 85;
+          return _context6.abrupt("continue", 131);
+        case 131:
+          _context6.next = 126;
           break;
-        case 92:
-          _context6.next = 97;
+        case 133:
+          _context6.next = 138;
           break;
-        case 94:
-          _context6.prev = 94;
-          _context6.t3 = _context6["catch"](82);
-          _iterator3.e(_context6.t3);
-        case 97:
-          _context6.prev = 97;
-          _iterator3.f();
-          return _context6.finish(97);
-        case 100:
-          // Special case: add data/body as a separate form-data part if needed
+        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]));
           }
-
-          // Calculate boundary from content
-          _context6.next = 103;
+          _context6.next = 144;
           return Promise.all(bodyParts.map(function (part) {
             return part.text();
           }));
-        case 103:
+        case 144:
           partsContent = _context6.sent;
           allContent = partsContent.join("");
-          _context6.next = 107;
+          _context6.next = 148;
           return sha256(new TextEncoder().encode(allContent));
-        case 107:
+        case 148:
           boundaryHash = _context6.sent;
-          boundary = _base64url["default"].encode(Buffer.from(boundaryHash)); // Assemble final multipart body - NO newlines after each part except the last
+          boundary = _base64url["default"].encode(Buffer.from(boundaryHash));
           finalParts = [];
           for (i = 0; i < bodyParts.length; i++) {
             if (i === 0) {
@@ -1443,60 +2036,33 @@ function _encode() {
           }
           finalParts.push(new Blob(["\r\n--".concat(boundary, "--")]));
           headers["content-type"] = "multipart/form-data; boundary=\"".concat(boundary, "\"");
-          body = new Blob(finalParts); // Calculate content digest
-          _context6.next = 116;
+          body = new Blob(finalParts);
+          _context6.next = 157;
           return body.arrayBuffer();
-        case 116:
+        case 157:
           finalContent = _context6.sent;
-          _context6.next = 119;
+          if (!(finalContent.byteLength > 0)) {
+            _context6.next = 164;
+            break;
+          }
+          _context6.next = 161;
           return sha256(finalContent);
-        case 119:
-          contentDigest = _context6.sent;
-          base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
-          headers["content-digest"] = "sha-256=:".concat(base64, ":");
+        case 161:
+          _contentDigest5 = _context6.sent;
+          _base5 = _base64url["default"].toBase64(_base64url["default"].encode(_contentDigest5));
+          headers["content-digest"] = "sha-256=:".concat(_base5, ":");
+        case 164:
           headers["content-length"] = String(finalContent.byteLength);
-          console.log("[encode] FINAL - headers:", headers, "body:", body);
-
-          // Debug: decode the multipart body to verify structure
-          _context6.next = 126;
-          return body.text();
-        case 126:
-          bodyText = _context6.sent;
-          console.log("\n[encode] DEBUG - Full body text:");
-          console.log(bodyText);
-
-          // Parse multipart body
-          boundaryMatch = headers["content-type"].match(/boundary="([^"]+)"/);
-          if (boundaryMatch) {
-            debugBoundary = boundaryMatch[1];
-            parts = bodyText.split("--".concat(debugBoundary));
-            console.log("\n[encode] DEBUG - Multipart parts:");
-            parts.forEach(function (part, idx) {
-              console.log("Part ".concat(idx, ":"), JSON.stringify(part));
-            });
-
-            // Show the actual content part
-            if (parts[1]) {
-              console.log("\n[encode] DEBUG - Content part structure:");
-              lines = parts[1].trim().split("\r\n");
-              lines.forEach(function (line, idx) {
-                if (line.includes("\0")) {
-                  console.log("Line ".concat(idx, ": \"").concat(line.substring(0, line.indexOf("\0")), "\" + [").concat(line.length - line.indexOf("\0"), " bytes]"));
-                } else {
-                  console.log("Line ".concat(idx, ": \"").concat(line, "\""));
-                }
-              });
-            }
-          }
+          console.log("=== ENCODE END ===\n");
           return _context6.abrupt("return", {
             headers: headers,
             body: body
           });
-        case 132:
+        case 167:
         case "end":
           return _context6.stop();
       }
-    }, _callee3, null, [[82, 94, 97, 100]]);
+    }, _callee3, null, [[123, 135, 138, 141]]);
   }));
   return _encode.apply(this, arguments);
 }