Refactor code-style

Author: wooorm

.prettierignore

@@ -0,0 +1,3 @@
+coverage/
+hast-util-from-parse5.js
+hast-util-from-parse5.min.js

index.js

@@ -1,14 +1,14 @@
-'use strict';
+'use strict'
 
-var information = require('property-information');
-var camelcase = require('camelcase');
-var h = require('hastscript');
-var xtend = require('xtend');
-var count = require('ccount');
+var information = require('property-information')
+var camelcase = require('camelcase')
+var h = require('hastscript')
+var xtend = require('xtend')
+var count = require('ccount')
 
-module.exports = wrapper;
+module.exports = wrapper
 
-var own = {}.hasOwnProperty;
+var own = {}.hasOwnProperty
 
 /* Handlers. */
 var map = {
@@ -17,83 +17,87 @@ var map = {
   '#text': text,
   '#comment': comment,
   '#documentType': doctype
-};
+}
 
 /* Wrapper to normalise options. */
 function wrapper(ast, options) {
-  var settings = options || {};
-  var file;
+  var settings = options || {}
+  var file
 
   if (settings.messages) {
-    file = settings;
-    settings = {};
+    file = settings
+    settings = {}
   } else {
-    file = settings.file;
+    file = settings.file
   }
 
   return transform(ast, {
     file: file,
     verbose: settings.verbose,
     location: false
-  });
+  })
 }
 
 /* Transform a node. */
 function transform(ast, config) {
-  var fn = own.call(map, ast.nodeName) ? map[ast.nodeName] : element;
-  var children;
-  var node;
-  var pos;
+  var fn = own.call(map, ast.nodeName) ? map[ast.nodeName] : element
+  var children
+  var node
+  var pos
 
   if (ast.childNodes) {
-    children = nodes(ast.childNodes, config);
+    children = nodes(ast.childNodes, config)
   }
 
-  node = fn(ast, children, config);
+  node = fn(ast, children, config)
 
   if (ast.sourceCodeLocation && config.file) {
-    pos = location(node, ast.sourceCodeLocation, config.verbose);
+    pos = location(node, ast.sourceCodeLocation, config.verbose)
 
     if (pos) {
-      config.location = true;
-      node.position = pos;
+      config.location = true
+      node.position = pos
     }
   }
 
-  return node;
+  return node
 }
 
 /* Transform children. */
 function nodes(children, config) {
-  var length = children.length;
-  var index = -1;
-  var result = [];
+  var length = children.length
+  var index = -1
+  var result = []
 
   while (++index < length) {
-    result[index] = transform(children[index], config);
+    result[index] = transform(children[index], config)
   }
 
-  return result;
+  return result
 }
 
 /* Transform a document.
  * Stores `ast.quirksMode` in `node.data.quirksMode`. */
 function root(ast, children, config) {
-  var node = {type: 'root', children: children, data: {}};
-  var doc;
+  var node = {type: 'root', children: children, data: {}}
+  var doc
 
-  node.data.quirksMode = ast.mode === 'quirks' || ast.mode === 'limited-quirks';
+  node.data.quirksMode = ast.mode === 'quirks' || ast.mode === 'limited-quirks'
 
   if (config.file && config.location) {
-    doc = String(config.file);
+    doc = String(config.file)
 
     node.position = {
       start: {line: 1, column: 1, offset: 0},
-      end: {line: count(doc, '\n') + 1, column: doc.length - doc.lastIndexOf('\n'), offset: doc.length}
-    };
+      end: {
+        line: count(doc, '\n') + 1,
+        column: doc.length - doc.lastIndexOf('\n'),
+        offset: doc.length
+      }
+    }
   }
 
-  return node;
+  return node
 }
 
 /* Transform a doctype. */
@@ -103,77 +107,82 @@ function doctype(ast) {
     name: ast.name || '',
     public: ast.publicId || null,
     system: ast.systemId || null
-  };
+  }
 }
 
 /* Transform a text. */
 function text(ast) {
-  return {type: 'text', value: ast.value};
+  return {type: 'text', value: ast.value}
 }
 
 /* Transform a comment. */
 function comment(ast) {
-  return {type: 'comment', value: ast.data};
+  return {type: 'comment', value: ast.data}
 }
 
 /* Transform an element. */
 function element(ast, children, config) {
-  var props = {};
-  var values = ast.attrs;
-  var length = values.length;
-  var index = -1;
-  var attr;
-  var node;
-  var pos;
-  var start;
-  var end;
+  var props = {}
+  var values = ast.attrs
+  var length = values.length
+  var index = -1
+  var attr
+  var node
+  var pos
+  var start
+  var end
 
   while (++index < length) {
-    attr = values[index];
-    props[(attr.prefix ? attr.prefix + ':' : '') + attr.name] = attr.value;
+    attr = values[index]
+    props[(attr.prefix ? attr.prefix + ':' : '') + attr.name] = attr.value
   }
 
-  node = h(ast.tagName, props, children);
+  node = h(ast.tagName, props, children)
 
   if (ast.nodeName === 'template' && 'content' in ast) {
-    pos = ast.sourceCodeLocation;
-    start = pos && pos.startTag && position(pos.startTag).end;
-    end = pos && pos.endTag && position(pos.endTag).start;
+    pos = ast.sourceCodeLocation
+    start = pos && pos.startTag && position(pos.startTag).end
+    end = pos && pos.endTag && position(pos.endTag).start
 
-    node.content = transform(ast.content, config);
+    node.content = transform(ast.content, config)
 
     if ((start || end) && config.file) {
-      node.content.position = {start: start, end: end};
+      node.content.position = {start: start, end: end}
     }
   }
 
-  return node;
+  return node
 }
 
 /* Create clean positional information. */
 function location(node, location, verbose) {
-  var pos = position(location);
-  var reference;
-  var values;
-  var props;
-  var prop;
-  var name;
+  var pos = position(location)
+  var reference
+  var values
+  var props
+  var prop
+  var name
 
   if (node.type === 'element') {
-    reference = node.children[node.children.length - 1];
+    reference = node.children[node.children.length - 1]
 
     /* Unclosed with children (upstream: https://github.com/inikulin/parse5/issues/109) */
-    if (!location.endTag && reference && reference.position && reference.position.end) {
-      pos.end = xtend(reference.position.end);
+    if (
+      !location.endTag &&
+      reference &&
+      reference.position &&
+      reference.position.end
+    ) {
+      pos.end = xtend(reference.position.end)
     }
 
     if (verbose) {
-      values = location.attrs;
-      props = {};
+      values = location.attrs
+      props = {}
 
       for (prop in values) {
-        name = (information(prop) || {}).propertyName || camelcase(prop);
-        props[name] = position(values[prop]);
+        name = (information(prop) || {}).propertyName || camelcase(prop)
+        props[name] = position(values[prop])
       }
 
       node.data = {
@@ -182,19 +191,27 @@ function location(node, location, verbose) {
           closing: location.endTag ? position(location.endTag) : null,
           properties: props
         }
-      };
+      }
     }
   }
 
-  return pos;
+  return pos
 }
 
 function position(loc) {
-  var start = point({line: loc.startLine, column: loc.startCol, offset: loc.startOffset});
-  var end = point({line: loc.endLine, column: loc.endCol, offset: loc.endOffset});
-  return start || end ? {start: start, end: end} : null;
+  var start = point({
+    line: loc.startLine,
+    column: loc.startCol,
+    offset: loc.startOffset
+  })
+  var end = point({
+    line: loc.endLine,
+    column: loc.endCol,
+    offset: loc.endOffset
+  })
+  return start || end ? {start: start, end: end} : null
 }
 
 function point(point) {
-  return point.line && point.column ? point : null;
+  return point.line && point.column ? point : null
 }

package.json

@@ -35,6 +35,7 @@
     "not": "^0.1.0",
     "nyc": "^12.0.0",
     "parse5": "^5.0.0",
+    "prettier": "^1.13.5",
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",
     "tape": "^4.0.0",
@@ -43,17 +44,24 @@
     "xo": "^0.21.0"
   },
   "scripts": {
-    "build-md": "remark . -qfo",
+    "format": "remark . -qfo && prettier --write '**/*.js' && xo --fix",
     "build-bundle": "browserify index.js --bare -s hastUtilFromParse5 -g [ babelify --presets [ \"babel-preset-env\" ] ] > hast-util-from-parse5.js",
     "build-mangle": "esmangle hast-util-from-parse5.js > hast-util-from-parse5.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",
-    "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": {
       "guard-for-in": "off"

readme.md

@@ -21,16 +21,16 @@ Say we have the following file, `example.html`:
 And our script, `example.js`, looks as follows:
 
 ```javascript
-var vfile = require('to-vfile');
-var parse5 = require('parse5');
-var inspect = require('unist-util-inspect');
-var fromParse5 = require('hast-util-from-parse5');
+var vfile = require('to-vfile')
+var parse5 = require('parse5')
+var inspect = require('unist-util-inspect')
+var fromParse5 = require('hast-util-from-parse5')
 
-var doc = vfile.readSync('example.html');
-var ast = parse5.parse(String(doc), {sourceCodeLocationInfo: true});
-var hast = fromParse5(ast, doc);
+var doc = vfile.readSync('example.html')
+var ast = parse5.parse(String(doc), {sourceCodeLocationInfo: true})
+var hast = fromParse5(ast, doc)
 
-console.log(inspect(hast));
+console.log(inspect(hast))
 ```
 
 Now, running `node example` yields: