from: validation refinements

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 Enhancements:
 
+* from: validation refinements
 * escape: validation refinements
 * skip_empty_lines: validation refinements
 * skip_lines_with_empty_values: validation refinements

lib/es5/index.js

@@ -50,7 +50,6 @@ var _require = require('stream'),
 var ResizeableBuffer = require('./ResizeableBuffer');
 
 var default_options = {
-  from: 1,
   from_line: 1,
   objname: undefined,
   // TODO create a max_comment_size
@@ -175,6 +174,16 @@ function (_Transform) {
       throw new Error("Invalid Option Length: escape must be one character, got ".concat(options.escape.length));
     } else {
       options.escape = options.escape[0];
+    } // Normalize option `from`
+
+
+    if (options.from === undefined || options.raw === null || options.raw === false) {
+      options.from = 1;
+    } else if (Number.isInteger(options.from) && options.from >= 0) {// Great, nothing to do
+    } else if (typeof options.from === 'string' && /\d+/.test(options.from)) {
+      options.from = parseInt(options.from);
+    } else {
+      throw new Error("Invalid Option: from must be a positive integer, got ".concat(JSON.stringify(options.from)));
     } // Normalize option `info`
 
 

lib/index.js

@@ -10,7 +10,6 @@ const { Transform } = require('stream')
 const ResizeableBuffer = require('./ResizeableBuffer')
 
 const default_options = {
-  from: 1,
   from_line: 1,
   objname: undefined,
   // TODO create a max_comment_size
@@ -113,6 +112,16 @@ class Parser extends Transform {
     }else{
       options.escape = options.escape[0]
     }
+    // Normalize option `from`
+    if(options.from === undefined || options.raw === null || options.raw === false){
+      options.from = 1
+    }else if(Number.isInteger(options.from) && options.from >= 0){
+      // Great, nothing to do
+    }else if(typeof options.from === 'string' && /\d+/.test(options.from)){
+      options.from = parseInt(options.from)
+    }else{
+      throw new Error(`Invalid Option: from must be a positive integer, got ${JSON.stringify(options.from)}`)
+    }
     // Normalize option `info`
     if(options.info === undefined || options.info === null || options.info === false){
       options.info = false

test/option.from.coffee

@@ -2,6 +2,19 @@
 parse = require '../lib'
 
 describe 'Option `from`', ->
+
+  it 'validation', ->
+    parse '', from: 10, (->)
+    parse '', from: "10", (->)
+    (->
+      parse '', from: -1, (->)
+    ).should.throw 'Invalid Option: from must be a positive integer, got -1'
+    (->
+      parse '', from: true, (->)
+    ).should.throw 'Invalid Option: from must be a positive integer, got true'
+    (->
+      parse '', from: 'oh no', (->)
+    ).should.throw 'Invalid Option: from must be a positive integer, got "oh no"'
 
   it 'start at defined position', (next) ->
     parse """