Refactor code-style

Author: wooorm

.prettierignore

@@ -0,0 +1,3 @@
+coverage/
+plain-text-data-to-json.js
+plain-text-data-to-json.min.js

index.js

@@ -1,71 +1,73 @@
-'use strict';
+'use strict'
 
-var trim = require('trim');
+var trim = require('trim')
 
-module.exports = toJSON;
+module.exports = toJSON
 
-var own = {}.hasOwnProperty;
+var own = {}.hasOwnProperty
 
 /* Transform a string into an array or object of values. */
 function toJSON(value, options) {
-  var propertyOrValues = {};
-  var lines;
-  var isPropertyValuePair;
-  var pairs;
-  var values;
+  var propertyOrValues = {}
+  var lines
+  var isPropertyValuePair
+  var pairs
+  var values
 
   if (!options) {
-    options = {};
+    options = {}
   }
 
   if (options.log === null || options.log === undefined) {
-    options.log = true;
+    options.log = true
   }
 
   if (options.comment === null || options.comment === undefined) {
-    options.comment = '%';
+    options.comment = '%'
   }
 
-  lines = value.split('\n');
+  lines = value.split('\n')
 
   if (options.comment) {
-    lines = lines.map(stripComments(options.comment));
+    lines = lines.map(stripComments(options.comment))
   }
 
-  lines = lines.map(trim).filter(Boolean);
+  lines = lines.map(trim).filter(Boolean)
 
-  pairs = lines.map(toPropertyValuePairs(options.delimiter || ':'));
+  pairs = lines.map(toPropertyValuePairs(options.delimiter || ':'))
 
-  pairs.forEach(function (line, index) {
-    var currentLineIsPropertyValuePair;
+  pairs.forEach(function(line, index) {
+    var currentLineIsPropertyValuePair
 
-    currentLineIsPropertyValuePair = line.length === 2;
+    currentLineIsPropertyValuePair = line.length === 2
 
     if (index === 0) {
-      isPropertyValuePair = currentLineIsPropertyValuePair;
+      isPropertyValuePair = currentLineIsPropertyValuePair
     } else if (currentLineIsPropertyValuePair !== isPropertyValuePair) {
       throw new Error(
-        'Error at `' + line + '`: ' +
-        'Both property-value pairs and array values found. ' +
-        'Make sure either exists.'
-      );
+        'Error at `' +
+          line +
+          '`: ' +
+          'Both property-value pairs and array values found. ' +
+          'Make sure either exists.'
+      )
     }
 
     if (own.call(propertyOrValues, line[0])) {
       if (
         !options.forgiving ||
-        (
-          options.forgiving === true &&
+        (options.forgiving === true &&
           currentLineIsPropertyValuePair &&
-          line[1] !== propertyOrValues[line[0]]
-        )
+          line[1] !== propertyOrValues[line[0]])
       ) {
         throw new Error(
-          'Error at `' + line + '`: ' +
-          'Duplicate data found. ' +
-          'Make sure, in objects, no duplicate properties exist;' +
-          'in arrays, no duplicate values.'
-        );
+          'Error at `' +
+            line +
+            '`: ' +
+            'Duplicate data found. ' +
+            'Make sure, in objects, no duplicate properties exist;' +
+            'in arrays, no duplicate values.'
+        )
       }
 
       if (options.log) {
@@ -74,75 +76,79 @@ function toJSON(value, options) {
           propertyOrValues[line[0]] !== line[1]
         ) {
           console.log(
-            'Overwriting `' + propertyOrValues[line[0]] + '` ' +
-            'to `' + line[1] + '` for `' + line[0] + '`'
-          );
+            'Overwriting `' +
+              propertyOrValues[line[0]] +
+              '` ' +
+              'to `' +
+              line[1] +
+              '` for `' +
+              line[0] +
+              '`'
+          )
         } else {
-          console.log(
-            'Ignoring duplicate key for `' + line[0] + '`'
-          );
+          console.log('Ignoring duplicate key for `' + line[0] + '`')
         }
       }
     }
 
-    propertyOrValues[line[0]] = line[1];
-  });
+    propertyOrValues[line[0]] = line[1]
+  })
 
   if (isPropertyValuePair) {
-    pairs.sort(sortOnFirstIndex);
-    values = propertyValuePairsToObject(pairs);
+    pairs.sort(sortOnFirstIndex)
+    values = propertyValuePairsToObject(pairs)
   } else {
-    lines.sort();
+    lines.sort()
   }
 
-  return values || lines;
+  return values || lines
 }
 
 /* Transform a list of property--value tuples to an object. */
 function propertyValuePairsToObject(pairs) {
-  var values = {};
+  var values = {}
 
-  pairs.forEach(function (pair) {
-    values[pair[0]] = pair[1];
-  });
+  pairs.forEach(function(pair) {
+    values[pair[0]] = pair[1]
+  })
 
-  return values;
+  return values
 }
 
 /* Sort on the first (`0`) index. */
 function sortOnFirstIndex(a, b) {
-  return a[0].charCodeAt(0) - b[0].charCodeAt(0);
+  return a[0].charCodeAt(0) - b[0].charCodeAt(0)
 }
 
 /* Factory to transform lines to property--value tuples. */
 function toPropertyValuePairs(token) {
-  return toPropValuePairs;
+  return toPropValuePairs
 
   /* Transform `value` to a property--value tuple. */
   function toPropValuePairs(value) {
-    var values = value.split(token);
-    var result = [trim(values.shift())];
+    var values = value.split(token)
+    var result = [trim(values.shift())]
 
     if (values.length !== 0) {
-      result.push(trim(values.join(token)));
+      result.push(trim(values.join(token)))
     }
 
-    return result;
+    return result
   }
 }
 
 /* Strip comments factory. */
 function stripComments(token) {
-  return strip;
+  return strip
 
   /* Strip comments. */
   function strip(value) {
-    var index = value.indexOf(token);
+    var index = value.indexOf(token)
 
     if (index !== -1) {
-      value = value.substr(0, index);
+      value = value.substr(0, index)
     }
 
-    return value;
+    return value
   }
 }

package.json

@@ -25,23 +25,31 @@
     "cept": "^1.0.1",
     "esmangle": "^1.0.1",
     "nyc": "^11.0.0",
+    "prettier": "^1.12.1",
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",
     "tape": "^4.0.0",
     "xo": "^0.20.0"
   },
   "scripts": {
-    "build-md": "remark . -qfo",
+    "format": "remark . -qfo && prettier --write '**/*.js' && xo --fix",
     "build-bundle": "browserify index.js --bare -s plain-text-data-to-json > plain-text-data-to-json.js",
     "build-mangle": "esmangle plain-text-data-to-json.js > plain-text-data-to-json.min.js",
-    "build": "npm run build-md && npm run build-bundle && npm run build-mangle",
-    "lint": "xo",
+    "build": "npm run build-bundle && npm run build-mangle",
     "test-api": "node test",
     "test-coverage": "nyc --reporter lcov tape test.js",
-    "test": "npm run build && npm run lint && npm run test-coverage"
+    "test": "npm run format && npm run build && npm run test-coverage"
+  },
+  "prettier": {
+    "tabWidth": 2,
+    "useTabs": false,
+    "singleQuote": true,
+    "bracketSpacing": false,
+    "semi": false,
+    "trailingComma": "none"
   },
   "xo": {
-    "space": true,
+    "prettier": true,
     "esnext": false,
     "rules": {
       "no-var": "off",

readme.md

@@ -14,14 +14,14 @@ npm install plain-text-data-to-json
 ## Usage
 
 ```js
-var fs = require('fs');
-var toJSON = require('plain-text-data-to-json');
+var fs = require('fs')
+var toJSON = require('plain-text-data-to-json')
 
-var doc = fs.readFileSync('input.txt', 'utf8');
+var doc = fs.readFileSync('input.txt', 'utf8')
 
-var data = toJSON(doc);
+var data = toJSON(doc)
 
-fs.writeFileSync('output.json', JSON.stringify(data, null, 2) + '\n');
+fs.writeFileSync('output.json', JSON.stringify(data, null, 2) + '\n')
 ```
 
 ## API