@emeryld/rrroutes-client 2.5.7 → 2.5.9

package/README.md

@@ -222,7 +222,9 @@ const updateUser = buildRoute('updateUser', {}, { name: 'profile' }) // debug na
 
 ### 8) File uploads (FormData)
 
-If a leaf has `bodyFiles` set in its contract, the client automatically converts the body to `FormData`:
+If a leaf has `bodyFiles` set in its contract, the client automatically converts the body to `FormData`.
+For each declared file field name, pass files using `file${name}` in the input body.
+The raw field name is also accepted for backward compatibility.
 
 ```ts
 const uploadAvatar = client.build(
@@ -231,7 +233,21 @@ const uploadAvatar = client.build(
 
 await uploadAvatar.fetch(
   { params: { userId: 'u_1' } },
-  { avatar: new File([blob], 'avatar.png', { type: 'image/png' }) },
+  {
+    // bodyFiles: [{ name: 'avatar', maxCount: 1 }]
+    fileavatar: new File([blob], 'avatar.png', { type: 'image/png' }),
+    // any non-file body fields still go here and are validated by bodySchema
+    note: 'profile image',
+  },
+)
+```
+
+For multi-file fields (`maxCount > 1`), pass `Blob[]` or `FileList`:
+
+```ts
+await uploadAvatar.fetch(
+  { params: { userId: 'u_1' } },
+  { filephotos: [fileA, fileB] }, // bodyFiles: [{ name: 'photos', maxCount: 5 }]
 )
 ```
 

package/dist/index.cjs

@@ -166,6 +166,7 @@ function isBlobLike(value) {
 function assertFileFieldValue(sourceKey, targetField, value) {
   if (value == null) return;
   if (isBlobLike(value)) return;
+  if (isReactNativeFile(value)) return;
   if (typeof FileList !== "undefined" && value instanceof FileList) {
     for (const item of Array.from(value)) {
       if (!isBlobLike(item)) {
@@ -178,7 +179,7 @@ function assertFileFieldValue(sourceKey, targetField, value) {
   }
   if (Array.isArray(value)) {
     for (const item of value) {
-      if (!isBlobLike(item)) {
+      if (!isBlobLike(item) && !isReactNativeFile(item)) {
         throw new Error(
           `Multipart field "${sourceKey}" must contain Blob/File values for "${targetField}".`
         );
@@ -187,7 +188,7 @@ function assertFileFieldValue(sourceKey, targetField, value) {
     return;
   }
   throw new Error(
-    `Multipart field "${sourceKey}" must be Blob/File, Blob[] or FileList.`
+    `Multipart field "${sourceKey}" must be Blob/File, ReactNativeFile, Blob[]/ReactNativeFile[] or FileList. ReactNativeFile = { uri: string, name: string, type: string }.`
   );
 }
 function splitMultipartBody(body, fields) {
@@ -199,7 +200,7 @@ function splitMultipartBody(body, fields) {
   }
   const fieldByInputKey = /* @__PURE__ */ new Map();
   for (const field of fields) {
-    fieldByInputKey.set(`file${field.name}`, field.name);
+    fieldByInputKey.set(`file_${field.name}`, field.name);
     fieldByInputKey.set(field.name, field.name);
   }
   const regularBody = {};
@@ -215,29 +216,44 @@ function splitMultipartBody(body, fields) {
   }
   return { regularBody, multipartFiles };
 }
-function toFormData(body, fields) {
-  const fileFieldNames = new Set((fields ?? []).map((field) => field.name));
+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();
-  for (const [k, v] of Object.entries(body ?? {})) {
-    if (v == null) continue;
-    if (fileFieldNames.has(k)) {
-      assertFileFieldValue(`file${k}`, k, v);
+  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 (Array.isArray(v)) {
-      for (const item of v) {
-        if (item == null) continue;
-        fd.append(k, item);
-      }
-      continue;
+    if (isFile(value)) {
+      fd.append(fieldName, value, value.name);
+      return;
     }
-    if (typeof FileList !== "undefined" && v instanceof FileList) {
-      for (const item of Array.from(v)) {
-        if (item == null) continue;
-        fd.append(k, item);
+    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;
 }