delimiter: validation refinements

CHANGELOG.md

@@ -5,7 +5,8 @@
 
 Enhancements:
 
-* max_record_size: validation refinement
+* delimiter: validation refinements
+* max_record_size: validation refinements
 
 ## Version 4.2.0
 

lib/es5/index.js

@@ -50,14 +50,11 @@ var _require = require('stream'),
 var ResizeableBuffer = require('./ResizeableBuffer');
 
 var default_options = {
-  columns: null,
-  delimiter: Buffer.from(','),
   escape: Buffer.from('"'),
   from: 1,
   from_line: 1,
   objname: undefined,
   // TODO create a max_comment_size
-  // max_record_size: 0,
   relax: false,
   relax_column_count: false,
   skip_empty_lines: false,
@@ -154,8 +151,21 @@ function (_Transform) {
     } // Normalize option `delimiter`
 
 
-    if (typeof options.delimiter === 'string') {
+    if (options.delimiter === undefined || options.delimiter === null || options.delimiter === false) {
+      options.delimiter = Buffer.from(',');
+    } else if (Buffer.isBuffer(options.delimiter)) {
+      if (options.delimiter.length === 0) {
+        throw new Error("Invalid Option: delimiter must be a non empty buffer");
+      } // Great, nothing to do
+
+    } else if (typeof options.delimiter === 'string') {
+      if (options.delimiter.length === 0) {
+        throw new Error("Invalid Option: delimiter must be a non empty string");
+      }
+
       options.delimiter = Buffer.from(options.delimiter);
+    } else {
+      throw new Error("Invalid Option: delimiter must be a string or a buffer, got ".concat(options.delimiter));
     } // Normalize option `escape`
 
 

lib/index.js

@@ -10,14 +10,11 @@ const { Transform } = require('stream')
 const ResizeableBuffer = require('./ResizeableBuffer')
 
 const default_options = {
-  columns: null,
-  delimiter: Buffer.from(','),
   escape: Buffer.from('"'),
   from: 1,
   from_line: 1,
   objname: undefined,
   // TODO create a max_comment_size
-  // max_record_size: 0,
   relax: false,
   relax_column_count: false,
   skip_empty_lines: false,
@@ -94,8 +91,20 @@ class Parser extends Transform {
       }
     }
     // Normalize option `delimiter`
-    if(typeof options.delimiter === 'string'){
+    if(options.delimiter === undefined || options.delimiter === null || options.delimiter === false){
+      options.delimiter = Buffer.from(',')
+    }else if(Buffer.isBuffer(options.delimiter)){
+      if(options.delimiter.length === 0){
+        throw new Error(`Invalid Option: delimiter must be a non empty buffer`)
+      }
+      // Great, nothing to do
+    }else if(typeof options.delimiter === 'string'){
+      if(options.delimiter.length === 0){
+        throw new Error(`Invalid Option: delimiter must be a non empty string`)
+      }
       options.delimiter = Buffer.from(options.delimiter)
+    }else{
+      throw new Error(`Invalid Option: delimiter must be a string or a buffer, got ${options.delimiter}`)
     }
     // Normalize option `escape`
     if(typeof options.escape === 'string'){

test/option.delimiter.coffee

@@ -3,6 +3,19 @@ parse = require '../lib'
 
 describe 'Option `delimiter`', ->
 
+  it 'validation', ->
+    parse '', delimiter: ',', (->)
+    parse '', delimiter: Buffer.from(','), (->)
+    (->
+      parse '', delimiter: '', (->)
+    ).should.throw 'Invalid Option: delimiter must be a non empty string'
+    (->
+      parse '', delimiter: Buffer.from(''), (->)
+    ).should.throw 'Invalid Option: delimiter must be a non empty buffer'
+    (->
+      parse '', delimiter: true, (->)
+    ).should.throw 'Invalid Option: delimiter must be a string or a buffer, got true'
+
   it 'using default comma', (next) ->
     parse """
     abc,,123,