Merge branch 'release/4.2.0'

CHANGELOG.yaml

@@ -1,3 +1,11 @@
+4.2.0:
+  date: 2023-08-03
+  new features:
+    - GH-1329 Added support for `fileName` property in formdata request body
+    - GH-1329 Retain string file content while parsing formdata and file bodies
+  chores:
+    - Updated dependencies
+
 4.1.7:
   date: 2023-01-24
   fixed bugs:

lib/collection/form-param.js

@@ -25,6 +25,7 @@ _.inherit((
         this.type = options.type;
         this.src = options.src;
         this.contentType = options.contentType;
+        this.fileName = options.fileName;
     }), Property);
 
 _.assign(FormParam.prototype, /** @lends FormParam.prototype */ {
@@ -54,8 +55,8 @@ _.assign(FormParam.prototype, /** @lends FormParam.prototype */ {
     toJSON () {
         var obj = PropertyBase.toJSON(this);
 
-        // remove value from file param because it is non-serializable ReadStream
-        if (obj.type === 'file') {
+        // remove value from file param if it's empty or non-string (can be non-serializable ReadStream)
+        if (obj.type === 'file' && (typeof obj.value !== 'string' || !obj.value)) {
             _.unset(obj, 'value');
         }
 

lib/collection/request-body.js

@@ -214,8 +214,10 @@ _.assign(RequestBody.prototype, /** @lends RequestBody.prototype */ {
     toJSON () {
         var obj = PropertyBase.toJSON(this);
 
-        // make sure that file content is removed because it is non-serializable ReadStream
-        _.unset(obj, 'file.content');
+        // remove value from file param if it's empty or non-string (can be non-serializable ReadStream)
+        if (obj.file && obj.file.content && typeof obj.file.content !== 'string') {
+            _.unset(obj, 'file.content');
+        }
 
         return obj;
     }