delimiter: accept multiple values

Author: wdavidw

CHANGELOG.md

@@ -10,6 +10,11 @@
 * promise: new API module
 * errors: finish normalisation of all errors
 
+## Trunk
+
+New Feature:
+* delimiter: accept multiple values
+
 ## Version 4.8.9
 
 Fix:

lib/es5/index.js

@@ -147,14 +147,28 @@ var Parser = /*#__PURE__*/function (_Transform) {
     } // Normalize option `delimiter`
 
 
-    if (options.delimiter === undefined || options.delimiter === null || options.delimiter === false) {
-      options.delimiter = Buffer.from(',');
-    } else if (typeof options.delimiter === 'string' && options.delimiter.length !== 0) {
-      options.delimiter = Buffer.from(options.delimiter);
-    } else if (Buffer.isBuffer(options.delimiter) && options.delimiter.length === 0 || typeof options.delimiter === 'string' && options.delimiter.length === 0 || !Buffer.isBuffer(options.delimiter) && typeof options.delimiter !== 'string') {
-      throw new CsvError('CSV_INVALID_OPTION_DELIMITER', ['Invalid option delimiter:', 'delimiter must be a non empty string or buffer,', "got ".concat(JSON.stringify(options.delimiter))]);
-    } // Normalize option `escape`
+    var delimiter_json = JSON.stringify(options.delimiter);
+    if (!Array.isArray(options.delimiter)) options.delimiter = [options.delimiter];
 
+    if (options.delimiter.length === 0) {
+      throw new CsvError('CSV_INVALID_OPTION_DELIMITER', ['Invalid option delimiter:', 'delimiter must be a non empty string or buffer or array of string|buffer,', "got ".concat(delimiter_json)]);
+    }
+
+    options.delimiter = options.delimiter.map(function (delimiter) {
+      if (delimiter === undefined || delimiter === null || delimiter === false) {
+        return Buffer.from(',');
+      }
+
+      if (typeof delimiter === 'string') {
+        delimiter = Buffer.from(delimiter);
+      }
+
+      if (!Buffer.isBuffer(delimiter) || delimiter.length === 0) {
+        throw new CsvError('CSV_INVALID_OPTION_DELIMITER', ['Invalid option delimiter:', 'delimiter must be a non empty string or buffer or array of string|buffer,', "got ".concat(delimiter_json)]);
+      }
+
+      return delimiter;
+    }); // Normalize option `escape`
 
     if (options.escape === undefined || options.escape === null) {
       options.escape = Buffer.from('"');
@@ -1118,14 +1132,20 @@ var Parser = /*#__PURE__*/function (_Transform) {
     key: "__isDelimiter",
     value: function __isDelimiter(chr, buf, pos) {
       var delimiter = this.options.delimiter;
-      var delLength = delimiter.length;
-      if (delimiter[0] !== chr) return 0;
 
-      for (var i = 1; i < delLength; i++) {
-        if (delimiter[i] !== buf[pos + i]) return 0;
+      loop1: for (var i = 0; i < delimiter.length; i++) {
+        var del = delimiter[i];
+
+        if (del[0] === chr) {
+          for (var j = 1; j < del.length; j++) {
+            if (del[j] !== buf[pos + j]) continue loop1;
+          }
+
+          return del.length;
+        }
       }
 
-      return delimiter.length;
+      return 0;
     }
   }, {
     key: "__isRecordDelimiter",

lib/index.js

@@ -104,17 +104,21 @@ class Parser extends Transform {
         `got ${delimiter_json}`
       ])
     }
-    options.delimiter = options.delimiter.map(function(del){
-      if(del === undefined || del === null || del === false){
+    options.delimiter = options.delimiter.map(function(delimiter){
+      if(delimiter === undefined || delimiter === null || delimiter === false){
         return Buffer.from(',')
-      }else if((typeof del === 'string' || Buffer.isBuffer(del)) && del.length !== 0){
-        return Buffer.from(del)
       }
-      throw new CsvError('CSV_INVALID_OPTION_DELIMITER', [
-        'Invalid option delimiter:',
-        'delimiter must be a non empty string or buffer or array of string|buffer,',
-        `got ${delimiter_json}`
-      ])
+      if(typeof delimiter === 'string'){
+        delimiter = Buffer.from(delimiter)
+      }
+      if( !Buffer.isBuffer(delimiter) || delimiter.length === 0){
+        throw new CsvError('CSV_INVALID_OPTION_DELIMITER', [
+          'Invalid option delimiter:',
+          'delimiter must be a non empty string or buffer or array of string|buffer,',
+          `got ${delimiter_json}`
+        ])
+      }
+      return delimiter
     })
     // Normalize option `escape`
     if(options.escape === undefined || options.escape === null){