@emeryld/rrroutes-client 2.5.5 → 2.5.7

package/dist/index.cjs

@@ -160,13 +160,84 @@ function buildUrl(leaf, baseUrl, params, query) {
   const url = `${baseUrl ?? ""}${path}${toSearchString(normalizedQuery)}`;
   return { url, normalizedQuery, normalizedParams };
 }
-function toFormData(body) {
+function isBlobLike(value) {
+  return typeof Blob !== "undefined" && value instanceof Blob;
+}
+function assertFileFieldValue(sourceKey, targetField, value) {
+  if (value == null) return;
+  if (isBlobLike(value)) return;
+  if (typeof FileList !== "undefined" && value instanceof FileList) {
+    for (const item of Array.from(value)) {
+      if (!isBlobLike(item)) {
+        throw new Error(
+          `Multipart field "${sourceKey}" must contain Blob/File values for "${targetField}".`
+        );
+      }
+    }
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      if (!isBlobLike(item)) {
+        throw new Error(
+          `Multipart field "${sourceKey}" must contain Blob/File values for "${targetField}".`
+        );
+      }
+    }
+    return;
+  }
+  throw new Error(
+    `Multipart field "${sourceKey}" must be Blob/File, Blob[] or FileList.`
+  );
+}
+function splitMultipartBody(body, fields) {
+  if (!body || typeof body !== "object" || Array.isArray(body) || !fields) {
+    return {
+      regularBody: body,
+      multipartFiles: {}
+    };
+  }
+  const fieldByInputKey = /* @__PURE__ */ new Map();
+  for (const field of fields) {
+    fieldByInputKey.set(`file${field.name}`, field.name);
+    fieldByInputKey.set(field.name, field.name);
+  }
+  const regularBody = {};
+  const multipartFiles = {};
+  for (const [key, value] of Object.entries(body)) {
+    const resolvedFieldName = fieldByInputKey.get(key);
+    if (!resolvedFieldName) {
+      regularBody[key] = value;
+      continue;
+    }
+    assertFileFieldValue(key, resolvedFieldName, value);
+    multipartFiles[resolvedFieldName] = value;
+  }
+  return { regularBody, multipartFiles };
+}
+function toFormData(body, fields) {
+  const fileFieldNames = new Set((fields ?? []).map((field) => field.name));
   const fd = new FormData();
   for (const [k, v] of Object.entries(body ?? {})) {
     if (v == null) continue;
-    if (Array.isArray(v))
-      v.forEach((item, i) => fd.append(`${k}[${i}]`, item));
-    else fd.append(k, v);
+    if (fileFieldNames.has(k)) {
+      assertFileFieldValue(`file${k}`, k, v);
+    }
+    if (Array.isArray(v)) {
+      for (const item of v) {
+        if (item == null) continue;
+        fd.append(k, item);
+      }
+      continue;
+    }
+    if (typeof FileList !== "undefined" && v instanceof FileList) {
+      for (const item of Array.from(v)) {
+        if (item == null) continue;
+        fd.append(k, item);
+      }
+      continue;
+    }
+    fd.append(k, v);
   }
   return fd;
 }
@@ -292,13 +363,23 @@ function buildGetLeaf(leaf, rqOpts, env) {
       query
     );
     let payload;
-    const acceptsBody = Boolean(leafCfg.bodySchema);
+    const isMultipart = Array.isArray(leafCfg.bodyFiles) && leafCfg.bodyFiles.length > 0;
+    const acceptsBody = Boolean(leafCfg.bodySchema || isMultipart);
     const requiresBody = options?.requireBody ?? (!acceptsBody ? false : true);
     if (typeof options?.body !== "undefined") {
-      const normalizedBody = leafCfg.bodySchema ? (0, import_rrroutes_contract2.lowProfileParse)(leafCfg.bodySchema, options.body) : void 0;
-      const isMultipart = Array.isArray(leafCfg.bodyFiles) && leafCfg.bodyFiles.length > 0;
+      const { regularBody, multipartFiles } = splitMultipartBody(
+        options.body,
+        leafCfg.bodyFiles
+      );
+      const normalizedBody = leafCfg.bodySchema ? (0, import_rrroutes_contract2.lowProfileParse)(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
-        payload = toFormData(normalizedBody);
+        payload = toFormData(
+          {
+            ...normalizedBody,
+            ...multipartFiles
+          },
+          leafCfg.bodyFiles
+        );
       } else {
         payload = normalizedBody;
       }
@@ -555,13 +636,23 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
       query
     );
     let payload;
-    const acceptsBody = Boolean(leafCfg.bodySchema);
+    const isMultipart = Array.isArray(leafCfg.bodyFiles) && leafCfg.bodyFiles.length > 0;
+    const acceptsBody = Boolean(leafCfg.bodySchema || isMultipart);
     const requiresBody = options?.requireBody ?? (!acceptsBody ? false : true);
     if (typeof options?.body !== "undefined") {
-      const normalizedBody = leafCfg.bodySchema ? (0, import_rrroutes_contract3.lowProfileParse)(leafCfg.bodySchema, options.body) : void 0;
-      const isMultipart = Array.isArray(leafCfg.bodyFiles) && leafCfg.bodyFiles.length > 0;
+      const { regularBody, multipartFiles } = splitMultipartBody(
+        options.body,
+        leafCfg.bodyFiles
+      );
+      const normalizedBody = leafCfg.bodySchema ? (0, import_rrroutes_contract3.lowProfileParse)(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
-        payload = toFormData(normalizedBody);
+        payload = toFormData(
+          {
+            ...normalizedBody,
+            ...multipartFiles
+          },
+          leafCfg.bodyFiles
+        );
       } else {
         payload = normalizedBody;
       }
@@ -853,13 +944,23 @@ function buildMutationLeaf(leaf, rqOpts, env) {
       query
     );
     let payload;
-    const acceptsBody = Boolean(leafCfg.bodySchema);
+    const isMultipart = Array.isArray(leafCfg.bodyFiles) && leafCfg.bodyFiles.length > 0;
+    const acceptsBody = Boolean(leafCfg.bodySchema || isMultipart);
     const requiresBody = options?.requireBody ?? (!acceptsBody ? false : true);
     if (typeof options?.body !== "undefined") {
-      const normalizedBody = leafCfg.bodySchema ? (0, import_rrroutes_contract4.lowProfileParse)(leafCfg.bodySchema, options.body) : void 0;
-      const isMultipart = Array.isArray(leafCfg.bodyFiles) && leafCfg.bodyFiles.length > 0;
+      const { regularBody, multipartFiles } = splitMultipartBody(
+        options.body,
+        leafCfg.bodyFiles
+      );
+      const normalizedBody = leafCfg.bodySchema ? (0, import_rrroutes_contract4.lowProfileParse)(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
-        payload = toFormData(normalizedBody);
+        payload = toFormData(
+          {
+            ...normalizedBody,
+            ...multipartFiles
+          },
+          leafCfg.bodyFiles
+        );
       } else {
         payload = normalizedBody;
       }