formstream 1.3.0 → 1.4.0

package/README.md

@@ -1,13 +1,10 @@
 # formstream
 
 [![NPM version][npm-image]][npm-url]
-[![Test coverage][coveralls-image]][coveralls-url]
 [![npm download][download-image]][download-url]
 
 [npm-image]: https://img.shields.io/npm/v/formstream.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/formstream
-[coveralls-image]: https://img.shields.io/coveralls/node-modules/formstream.svg?style=flat-square
-[coveralls-url]: https://coveralls.io/r/node-modules/formstream?branch=master
 [download-image]: https://img.shields.io/npm/dm/formstream.svg?style=flat-square
 [download-url]: https://npmjs.org/package/formstream
 
@@ -178,7 +175,7 @@ See [Node.js Documentation](http://nodejs.org/api/stream.html#stream_event_end)
 
 (The MIT License)
 
-Copyright (c) 2012 - 2014 fengmk2 <fengmk2@gmail.com>
+Copyright (c) 2012 - 2014 fengmk2 <fengmk2@gmail.com>
 Copyright(c) node-modules and other contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -199,3 +196,14 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+<!-- GITCONTRIBUTOR_START -->
+
+## Contributors
+
+|[<img src="https://avatars.githubusercontent.com/u/156269?v=4" width="100px;"/><br/><sub><b>fengmk2</b></sub>](https://github.com/fengmk2)<br/>|[<img src="https://avatars.githubusercontent.com/u/288288?v=4" width="100px;"/><br/><sub><b>xingrz</b></sub>](https://github.com/xingrz)<br/>|[<img src="https://avatars.githubusercontent.com/u/32174276?v=4" width="100px;"/><br/><sub><b>semantic-release-bot</b></sub>](https://github.com/semantic-release-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/13151189?v=4" width="100px;"/><br/><sub><b>fjc0k</b></sub>](https://github.com/fjc0k)<br/>|[<img src="https://avatars.githubusercontent.com/u/18096247?v=4" width="100px;"/><br/><sub><b>mrspeiser</b></sub>](https://github.com/mrspeiser)<br/>|[<img src="https://avatars.githubusercontent.com/u/985607?v=4" width="100px;"/><br/><sub><b>dead-horse</b></sub>](https://github.com/dead-horse)<br/>|
+| :---: | :---: | :---: | :---: | :---: | :---: |
+[<img src="https://avatars.githubusercontent.com/u/7326406?v=4" width="100px;"/><br/><sub><b>shaozj</b></sub>](https://github.com/shaozj)<br/>
+
+This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Wed May 15 2024 00:34:12 GMT+0800`.
+
+<!-- GITCONTRIBUTOR_END -->

package/lib/formstream.js

@@ -1,5 +1,5 @@
 /**
- * Data format:
+ * Form Data format:
  *
 
 --FormStreamBoundary1349886663601\r\n
@@ -7,6 +7,11 @@ Content-Disposition: form-data; name="foo"\r\n
 \r\n
 <FIELD-CONTENT>\r\n
 --FormStreamBoundary1349886663601\r\n
+Content-Disposition: form-data; name="data"\r\n
+Content-Type: application/json\r\n
+\r\n
+<JSON-FORMAT-CONTENT>\r\n
+--FormStreamBoundary1349886663601\r\n
 Content-Disposition: form-data; name="file"; filename="formstream.test.js"\r\n
 Content-Type: application/javascript\r\n
 \r\n
@@ -49,6 +54,8 @@ function FormStream() {
   this._contentLength = 0;
   this._isAllStreamSizeKnown = true;
   this._knownStreamSize = 0;
+
+  this.isFormStream = true;
 }
 
 util.inherits(FormStream, Stream);
@@ -128,9 +135,10 @@ FormStream.prototype.file = function (name, filepath, filename, filesize) {
  * Add a form field
  * @param  {String} name field name
  * @param  {String|Buffer} value field value
+ * @param  {String} [mimeType] field mimeType
  * @return {this}
  */
-FormStream.prototype.field = function (name, value) {
+FormStream.prototype.field = function (name, value, mimeType) {
   if (!Buffer.isBuffer(value)) {
     // field(String, Number)
     // https://github.com/qiniu/nodejs-sdk/issues/123
@@ -139,7 +147,7 @@ FormStream.prototype.field = function (name, value) {
     }
     value = Buffer.from(value);
   }
-  return this.buffer(name, value);
+  return this.buffer(name, value, null, mimeType);
 };
 
 FormStream.prototype.stream = function (name, stream, filename, mimeType, size) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formstream",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A multipart/form-data encoded stream, helper for file upload.",
   "main": "lib/formstream.js",
   "types": "types/formstream.d.ts",
@@ -13,7 +13,8 @@
     "cov": "egg-bin cov",
     "ci": "npm run lint && npm run tsd && npm run cov",
     "lint": "jshint .",
-    "tsd": "tsd"
+    "tsd": "tsd",
+    "contributor": "git-contributor"
   },
   "repository": {
     "type": "git",
@@ -38,6 +39,7 @@
     "connect-multiparty": "1",
     "egg-bin": "^5.6.1",
     "express": "^4.16.4",
+    "git-contributor": "^2.1.5",
     "jshint": "^2.13.6",
     "pedding": "1",
     "should": "4",

package/types/formstream.d.ts

@@ -7,7 +7,7 @@ declare class FormStream extends Stream {
    * @param name Name of field
    * @param value Value of field
    */
-  field(name: string, value: string): this
+  field(name: string, value: string, contentType?: string): this
 
   /**
    * Add a local file to be uploaded to the form.
@@ -69,4 +69,6 @@ declare const formStream: {
   (): FormStream
 }
 
+interface formStream extends FormStream {}
+
 export = formStream