resolve conlifct

Author: Keyang

Gruntfile.js

@@ -24,7 +24,7 @@ module.exports = function(grunt) {
       client: {
         options: {
           mangle: true,
-          banner:"/*Automatically Generated. Do not modify.*/\n"
+          banner: "/*Automatically Generated. Do not modify.*/\n"
         },
         src: "./dist/csvtojson.js",
         dest: "./dist/csvtojson.min.js",

bin/benchmark.js

@@ -1,43 +1,43 @@
 #!/usr/bin/env node
-var path=process.argv[2];
-var fs=require('fs');
-if (!fs.existsSync(path)){
+var path = process.argv[2];
+var fs = require('fs');
+if (!fs.existsSync(path)) {
   console.log("Run: benchmark [csvpath]");
-  console.log("File not found: ",path);
+  console.log("File not found: ", path);
   process.exit(1);
 }
-function testCSVLine(coreNum,checkType,cb){
-  console.log("WorkerNum:",coreNum,"Check Type: ",checkType);
-  var Converter=require("../libs/core/Converter");
-  var rs=fs.createReadStream(path);
-  var converter=new Converter({
-    workerNum:coreNum,
-    checkType:checkType,
-    constructResult:false
+function testCSVLine(coreNum, checkType, cb){
+  console.log("WorkerNum:", coreNum, "Check Type: ", checkType);
+  var Converter = require("../libs/core/Converter");
+  var rs = fs.createReadStream(path);
+  var converter = new Converter({
+    workerNum: coreNum,
+    checkType: checkType,
+    constructResult: false
     // fork:true
   });
-  var totalLines=0;
-  var secLines=0;
-  converter.on("data",function(){
-      totalLines++;
-      secLines++;
+  var totalLines = 0;
+  var secLines = 0;
+  converter.on("data", function() {
+    totalLines++;
+    secLines++;
   });
-  converter.on("end",function(){
+  converter.on("end", function() {
     clearInterval(timer);
     console.log("");
-    var t=new Date()-start;
-    console.log("Time elapsed: ",t, " ms");
-    console.log("Total lines: "+totalLines);
-    console.log("Average Speed: "+Math.round(totalLines/t*1000)+" Lines / Sec");
+    var t = new Date() - start;
+    console.log("Time elapsed: ", t, " ms");
+    console.log("Total lines: " + totalLines);
+    console.log("Average Speed: " + Math.round(totalLines / t * 1000) + " Lines / Sec");
     cb();
-  })
-  var timer=setInterval(function(){
-    process.stdout.write("\r"+secLines+" CSV Lines/Sec");
-    secLines=0;
-  },1000);
-  var start=new Date();
+  });
+  var timer = setInterval(function() {
+    process.stdout.write("\r" + secLines + " CSV Lines/Sec");
+    secLines = 0;
+  }, 1000);
+  var start = new Date();
 
-  var stream=rs.pipe(converter);
+  var stream = rs.pipe(converter);
 }
 
 // testCSVLine(1,false,false,function(){

bin/csvtojson.js

@@ -68,7 +68,7 @@ function csvtojson() {
         }
       }
       process.exit(1);
-    })
+    });
     is.pipe(conv).pipe(process.stdout);
     // is.pipe(conv);
   }

bin/genCsv.js

@@ -1,33 +1,32 @@
 #!/usr/bin/env node
-var minimist=require("minimist");
-var argv=process.argv;
+var minimist = require("minimist");
+var argv = process.argv;
 argv.shift();
 argv.shift();
-var args=minimist(argv);
-var headers=["name","header1","file2","description","header2","field2","header3"];
+var args = minimist(argv);
+var headers = ["name", "header1", "file2", "description", "header2", "field2", "header3"];
 
-if (args.headers){
-  headers=JSON.parse(args.headers);
+if (args.headers) {
+  headers = JSON.parse(args.headers);
 }
-var rowNum=args.row?args.row:10000;
-var chars=args.chars?args.chars:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-var maxLength=parseInt(args.max?args.max:"15");
+var rowNum = args.row ? args.row : 10000;
+var chars = args.chars ? args.chars : "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+var maxLength = parseInt(args.max ? args.max : "15");
 console.log(headers.join(","));
-for (var i=0;i<rowNum;i++){
-  var row=[];
-  for (var j=0;j<headers.length;j++){
+for (var i = 0; i < rowNum; i++) {
+  var row = [];
+  for (var j = 0; j < headers.length; j++) {
     row.push(genWord());
   }
   console.log(row.join(","));
 }
 
-
-function genWord(){
-  var len=Math.round(Math.random()*maxLength);
-  var rtn="";
-  for (var i=0;i<len;i++){
-    var pos=Math.round(Math.random()*chars.length);
-    rtn+=chars[pos];
+function genWord() {
+  var len = Math.round(Math.random() * maxLength);
+  var rtn = "";
+  for (var i = 0; i < len; i++) {
+    var pos = Math.round(Math.random() * chars.length);
+    rtn += chars[pos];
   }
   return rtn;
 }

bin/options.json

@@ -17,7 +17,7 @@
             "type": "boolean"
         },
         "--checkType": {
-            "desc": "This parameter turns on and off whether check field type. default is true.",
+            "desc": "This parameter turns on and off whether check field type. default is false.",
             "type": "boolean"
 
         },

libs/core/CSVError.js

@@ -1,27 +1,27 @@
-var util=require("util");
-module.exports=CSVError;
-function CSVError(err,index,extra){
-  Error.call(this,"");
-  this.err=err;
-  this.line=index;
-  this.extra=extra;
-  this.message="Error: "+err+". JSON Line number: "+index+ (extra?" near: "+extra:"");
-  this.name="CSV Error";
+var util = require("util");
+module.exports = CSVError;
+function CSVError(err, index, extra) {
+  Error.call(this, "");
+  this.err = err;
+  this.line = index;
+  this.extra = extra;
+  this.message = "Error: " + err + ". JSON Line number: " + index + (extra ? " near: " + extra : "");
+  this.name = "CSV Error";
 }
-util.inherits(CSVError,Error);
+util.inherits(CSVError, Error);
 
-CSVError.prototype.toString=function(){
-  return JSON.stringify([this.err,this.line,this.extra]);
-}
+CSVError.prototype.toString = function() {
+  return JSON.stringify([this.err, this.line, this.extra]);
+};
 
-CSVError.column_mismatched=function(index,extra){
-  return new CSVError("column_mismatched",index,extra);
-}
+CSVError.column_mismatched = function(index, extra) {
+  return new CSVError("column_mismatched", index, extra);
+};
 
-CSVError.unclosed_quote=function(index,extra){
-  return new CSVError("unclosed_quote",index,extra);
-}
+CSVError.unclosed_quote = function(index, extra) {
+  return new CSVError("unclosed_quote", index, extra);
+};
 
-CSVError.fromArray=function(arr){
-  return new CSVError(arr[0],arr[1],arr[2]);
-}
+CSVError.fromArray = function(arr) {
+  return new CSVError(arr[0], arr[1], arr[2]);
+};