@emeryld/rrroutes-client 2.5.6 → 2.5.8

package/dist/index.mjs

@@ -119,25 +119,101 @@ function buildUrl(leaf, baseUrl, params, query) {
   const url = `${baseUrl ?? ""}${path}${toSearchString(normalizedQuery)}`;
   return { url, normalizedQuery, normalizedParams };
 }
-function toFormData(body) {
-  const fd = new FormData();
-  for (const [k, v] of Object.entries(body ?? {})) {
-    if (v == null) continue;
-    if (Array.isArray(v)) {
-      for (const item of v) {
-        if (item == null) continue;
-        fd.append(k, item);
+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;
     }
-    if (typeof FileList !== "undefined" && v instanceof FileList) {
-      for (const item of Array.from(v)) {
-        if (item == null) continue;
-        fd.append(k, item);
+    assertFileFieldValue(key, resolvedFieldName, value);
+    multipartFiles[resolvedFieldName] = value;
+  }
+  return { regularBody, multipartFiles };
+}
+var isReactNativeFile = (v) => v && typeof v === "object" && typeof v.uri === "string" && typeof v.name === "string" && typeof v.type === "string";
+var isFile = (v) => typeof File !== "undefined" && v instanceof File;
+var isBlob = (v) => typeof Blob !== "undefined" && v instanceof Blob;
+function toFormData(body, bodyFiles = []) {
+  const fd = new FormData();
+  const fileKeys = new Set(
+    bodyFiles.flatMap((f) => [f.name, `file_${f.name}`])
+  );
+  const appendFile = (fieldName, value) => {
+    if (value == null) return;
+    if (isReactNativeFile(value)) {
+      fd.append(fieldName, value);
+      return;
+    }
+    if (isFile(value)) {
+      fd.append(fieldName, value, value.name);
+      return;
+    }
+    if (isBlob(value)) {
+      fd.append(fieldName, value, "upload");
+      return;
+    }
+    throw new Error(`Invalid upload value for ${fieldName}`);
+  };
+  for (const [key, value] of Object.entries(body)) {
+    if (fileKeys.has(key)) {
+      if (Array.isArray(value)) {
+        for (const v of value) appendFile(key, v);
+      } else {
+        appendFile(key, value);
       }
       continue;
     }
-    fd.append(k, v);
+    if (typeof value === "string") fd.append(key, value);
+    else if (typeof value === "number" || typeof value === "boolean")
+      fd.append(key, String(value));
+    else if (value == null) {
+    } else {
+      fd.append(key, JSON.stringify(value));
+    }
   }
   return fd;
 }
@@ -267,9 +343,19 @@ function buildGetLeaf(leaf, rqOpts, env) {
     const acceptsBody = Boolean(leafCfg.bodySchema || isMultipart);
     const requiresBody = options?.requireBody ?? (!acceptsBody ? false : true);
     if (typeof options?.body !== "undefined") {
-      const normalizedBody = leafCfg.bodySchema ? lowProfileParse2(leafCfg.bodySchema, options.body) : options.body;
+      const { regularBody, multipartFiles } = splitMultipartBody(
+        options.body,
+        leafCfg.bodyFiles
+      );
+      const normalizedBody = leafCfg.bodySchema ? lowProfileParse2(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
-        payload = toFormData(normalizedBody);
+        payload = toFormData(
+          {
+            ...normalizedBody,
+            ...multipartFiles
+          },
+          leafCfg.bodyFiles
+        );
       } else {
         payload = normalizedBody;
       }
@@ -533,9 +619,19 @@ function buildInfiniteGetLeaf(leaf, rqOpts, env) {
     const acceptsBody = Boolean(leafCfg.bodySchema || isMultipart);
     const requiresBody = options?.requireBody ?? (!acceptsBody ? false : true);
     if (typeof options?.body !== "undefined") {
-      const normalizedBody = leafCfg.bodySchema ? lowProfileParse3(leafCfg.bodySchema, options.body) : options.body;
+      const { regularBody, multipartFiles } = splitMultipartBody(
+        options.body,
+        leafCfg.bodyFiles
+      );
+      const normalizedBody = leafCfg.bodySchema ? lowProfileParse3(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
-        payload = toFormData(normalizedBody);
+        payload = toFormData(
+          {
+            ...normalizedBody,
+            ...multipartFiles
+          },
+          leafCfg.bodyFiles
+        );
       } else {
         payload = normalizedBody;
       }
@@ -833,9 +929,19 @@ function buildMutationLeaf(leaf, rqOpts, env) {
     const acceptsBody = Boolean(leafCfg.bodySchema || isMultipart);
     const requiresBody = options?.requireBody ?? (!acceptsBody ? false : true);
     if (typeof options?.body !== "undefined") {
-      const normalizedBody = leafCfg.bodySchema ? lowProfileParse4(leafCfg.bodySchema, options.body) : options.body;
+      const { regularBody, multipartFiles } = splitMultipartBody(
+        options.body,
+        leafCfg.bodyFiles
+      );
+      const normalizedBody = leafCfg.bodySchema ? lowProfileParse4(leafCfg.bodySchema, regularBody) : regularBody;
       if (isMultipart && normalizedBody && typeof normalizedBody === "object") {
-        payload = toFormData(normalizedBody);
+        payload = toFormData(
+          {
+            ...normalizedBody,
+            ...multipartFiles
+          },
+          leafCfg.bodyFiles
+        );
       } else {
         payload = normalizedBody;
       }