add stream support; change version syntax

Author: Keyang

bin/csvtojson.js

@@ -67,6 +67,7 @@ function csvtojson() {
       process.exit(1);
     })
     is.pipe(conv).pipe(process.stdout);
+    // is.pipe(conv);
   }
 
   function run(cmd, options) {

libs/core/Converter.js

@@ -9,8 +9,8 @@ var Worker = require("./Worker.js");
 var utils = require("./utils.js");
 var async = require("async");
 
-function Converter(params) {
-  Transform.call(this);
+function Converter(params,options) {
+  Transform.call(this,options);
   var _param = {
     constructResult: true, //set to false to not construct result in memory. suitable for big csv data
     delimiter: ',', // change the delimiter of csv columns. It is able to use an array to specify potencial delimiters. e.g. [",","|",";"]
@@ -37,7 +37,9 @@ function Converter(params) {
     console.warn("Parameter should be a JSON object like {'constructResult':false}");
     _param.constructResult = params;
   }
+  this._options=options || {};
   this.param = _param;
+  this.param._options=this._options;
   this.resultObject = new Result(this);
   this.pipe(this.resultObject); // it is important to have downstream for a transform otherwise it will stuck
   this.started = false;
@@ -184,7 +186,11 @@ Converter.prototype.flushBuffer = function() {
     if (this.param.toArrayString && this.recordNum > 0) {
       this.push("," + eol);
     }
-    this.push(resultJSONStr, "utf8");
+    if (this._options && this._options.objectMode){
+      this.push(resultRow);
+    }else{
+      this.push(resultJSONStr, "utf8");
+    }
     this.recordNum++;
   }
   this.checkAndFlush();

libs/core/Result.js

@@ -2,20 +2,40 @@ var Writable = require("stream").Writable;
 var util = require("util");
 var eol=require("os").EOL;
 function Result(csvParser) {
-  Writable.call(this);
+  Writable.call(this,csvParser._options);
+  this._option=csvParser._options || {};
   this.parser = csvParser;
   this.param = csvParser.param;
-  this.buffer = this.param.toArrayString?"":"["+eol;
+  this.buffer =this._option.objectMode?[]:"["+eol;
   this.started = false;
   var self = this;
   this.parser.on("end", function() {
-    if (!self.param.toArrayString){
+    if (typeof self.buffer === "string"){
       self.buffer += eol+ "]";
     }
   });
+  this._write=this._option.objectMode?_writeObject:_writeBuffer;
 }
 util.inherits(Result, Writable);
-Result.prototype._write = function(data, encoding, cb) {
+
+Result.prototype.getBuffer = function() {
+  return typeof this.buffer ==="string"?JSON.parse(this.buffer):this.buffer;
+};
+
+Result.prototype.disableConstruct = function() {
+  this._write = function(d, e, cb) {
+    // console.log(typeof d,d);
+    cb(); //do nothing just dropit
+  };
+};
+
+
+function _writeObject (data, encoding, cb) {
+  this.buffer.push(data);
+  cb();
+};
+
+function _writeBuffer(data, encoding, cb) {
   if (encoding === "buffer") {
     encoding = "utf8";
   }
@@ -32,15 +52,4 @@ Result.prototype._write = function(data, encoding, cb) {
   cb();
 };
 
-Result.prototype.getBuffer = function() {
-  // console.log(this.buffer);
-  return JSON.parse(this.buffer);
-};
-
-Result.prototype.disableConstruct = function() {
-  this._write = function(d, e, cb) {
-    cb(); //do nothing just dropit
-  };
-};
-
 module.exports = Result;

package.json

@@ -18,7 +18,7 @@
       "email": "t3dodson@gmail.com"
     }
   ],
-  "version": "0.5.14",
+  "version": "1.0.0",
   "keywords": [
     "csv",
     "csvtojson",

readme.md

@@ -39,6 +39,7 @@ All you need nodejs csv to json converter.
 * [Header Configuration](#header-configuration)
 * [Error Handling](#error-handling)
 * [Customised Parser](#parser)
+* [Stream Options](#stream-options)
 * [Change Log](#change-log)
 
 GitHub: https://github.com/Keyang/node-csvtojson
@@ -781,11 +782,26 @@ The parameter of Parse function is a JSON object. It contains following fields:
    ]
 }
 ```
+#Stream Options
+Since version 1.0.0, the Converter constructor takes stream options as second parameter.
 
+```js
+const conv=new Converter(params,{
+  objectMode:true, // stream down JSON object instead of JSON array
+  highWaterMark:65535 //Buffer level
+})
+
+```
+
+See more detailed information [here](https://nodejs.org/api/stream.html#stream_class_stream_transform).
 
 
 #Change Log
 
+## 1.0.0
+* Add [Stream Options](#stream-options)
+* Change version syntax to follow x.y.z
+
 ## 0.5.12
 * Added support for scientific notation number support (#100)
 * Added "off" option to quote parameter
@@ -886,3 +902,4 @@ csvConverter.fromString(csvString, callback);
 The callback function above is optional. see [Parse String](#parse-string).
 
 After version 0.3, csvtojson requires node 0.10 and above.
+

test/data/dataWithMultipleLineRow

@@ -0,0 +1,4 @@
+aa,bb
+ss,"12345
+6789,abcde""
+ddee"

test/testCSVConverter2.js

@@ -207,6 +207,22 @@ describe("CSV Converter", function() {
     });
     rs.pipe(conv);
   })
+  it ("should support object mode",function(done){
+    var testData = __dirname + "/data/complexJSONCSV";
+    var rs = fs.createReadStream(testData);
+    var conv=new Converter({},{
+      objectMode:true
+    });
+    conv.on("data",function(d){
+      assert(typeof d  === "object");
+    });
+    conv.on("end_parsed",function(res){
+      assert(res);
+      assert(res.length>0);
+      done();
+    })
+    rs.pipe(conv);
+  })
   // it ("should convert big csv",function(done){
   //   // var rs=fs.createReadStream(__dirname+"/data/large-csv-sample.csv");
   //   var rs=fs.createReadStream("/Users/kxiang/tmp/csvdata");