Use data as the first argument

Author: Philipp Alferov

index.js

@@ -45,25 +45,24 @@ var groupByParents = function(array, options) {
  *
  * @name arrayToTree
  * @function
+ *
+ * @param {Array} data An array of data
  * @param {Object} options An object containing the following fields:
  *
  *  - `parentProperty` (String): A name of a property where a link to
  *     a parent node could be found. Default: 'parent_id'
- *  - `data` (Array): An array of data
  *  - `customID` (String): An unique node identifier. Default: 'id'
  *
  * @return {Array} Result of transformation
  */
 
-module.exports = function arrayToTree(options) {
+module.exports = function arrayToTree(data, options) {
+  data = data || [];
   options = extend({
     parentProperty: 'parent_id',
-    data: [],
     customID: 'id',
     rootID: '0'
-  }, options);
-
-  var data = options.data;
+  }, options || {});
 
   if (!isArray(data)) {
     throw new Error('Expected an object but got an invalid argument');

test/test.js

@@ -12,7 +12,7 @@ describe('array-to-tree', function() {
   describe('with valid arguments', function() {
 
     beforeEach(function() {
-      current = toTree({ data: initial });
+      current = toTree(initial);
     });
 
     it('should not modify passed object', function() {
@@ -45,14 +45,14 @@ describe('array-to-tree', function() {
 
   describe('with invalid arguments', function() {
     it('should return an empty array if the empty array passed', function() {
-      expect(toTree({ data: [] })).to.be.deep.equal([]);
+      expect(toTree([])).to.be.deep.equal([]);
     });
 
     it('should throw an error if wrong arguments passed', function() {
-      expect(toTree.bind(null, { data: 'string' }))
+      expect(toTree.bind(null, 'string'))
         .to.throw(/invalid argument/);
 
-      expect(toTree.bind(null, { data: {} }))
+      expect(toTree.bind(null, {}))
         .to.throw(/invalid argument/);
     });
 
@@ -63,19 +63,17 @@ describe('array-to-tree', function() {
         return item;
       });
 
-      expect(toTree({ data: modified }))
+      expect(toTree(modified))
         .to.be.deep.equal(modified);
     });
   })
 
   describe('with different options', function() {
     it('should work with custom parents links', function() {
 
-      current = toTree({
-        data: customInitial,
-        parentProperty: 'parent',
-        customID: '_id'
-      });
+      current = toTree(
+        customInitial,
+        { parentProperty: 'parent', customID: '_id' });
 
       expect(current)
         .to.be.deep.equal(customExpected);