Refactor code-style

Author: wooorm

.prettierignore

@@ -0,0 +1,3 @@
+coverage/
+hastscript.js
+hastscript.min.js

index.js

@@ -1,180 +1,180 @@
-'use strict';
+'use strict'
 
-var parseSelector = require('hast-util-parse-selector');
-var camelcase = require('camelcase');
-var propertyInformation = require('property-information');
-var spaces = require('space-separated-tokens').parse;
-var commas = require('comma-separated-tokens').parse;
+var parseSelector = require('hast-util-parse-selector')
+var camelcase = require('camelcase')
+var propertyInformation = require('property-information')
+var spaces = require('space-separated-tokens').parse
+var commas = require('comma-separated-tokens').parse
 
-module.exports = h;
+module.exports = h
 
 /* Hyperscript compatible DSL for creating virtual HAST
  * trees. */
 function h(selector, properties, children) {
-  var node = parseSelector(selector);
-  var property;
+  var node = parseSelector(selector)
+  var property
 
   if (
     properties &&
     !children &&
-    (
-      typeof properties === 'string' ||
+    (typeof properties === 'string' ||
       'length' in properties ||
-      isNode(node.tagName, properties)
-    )
+      isNode(node.tagName, properties))
   ) {
-    children = properties;
-    properties = null;
+    children = properties
+    properties = null
   }
 
   if (properties) {
     for (property in properties) {
-      addProperty(node.properties, property, properties[property]);
+      addProperty(node.properties, property, properties[property])
     }
   }
 
-  addChild(node.children, children);
+  addChild(node.children, children)
 
   if (node.tagName === 'template') {
-    node.content = {type: 'root', children: node.children};
-    node.children = [];
+    node.content = {type: 'root', children: node.children}
+    node.children = []
   }
 
-  return node;
+  return node
 }
 
 /* Check if `value` is a valid child node of `tagName`. */
 function isNode(tagName, value) {
-  var type = value.type;
+  var type = value.type
 
   if (typeof type === 'string') {
-    type = type.toLowerCase();
+    type = type.toLowerCase()
   }
 
   if (tagName === 'input' || !type || typeof type !== 'string') {
-    return false;
+    return false
   }
 
   if (typeof value.children === 'object' && 'length' in value.children) {
-    return true;
+    return true
   }
 
   if (tagName === 'button') {
-    return type !== 'menu' &&
+    return (
+      type !== 'menu' &&
       type !== 'submit' &&
       type !== 'reset' &&
-      type !== 'button';
+      type !== 'button'
+    )
   }
 
-  return 'value' in value;
+  return 'value' in value
 }
 
 /* Add `value` as a child to `nodes`. */
 function addChild(nodes, value) {
-  var index;
-  var length;
+  var index
+  var length
 
   if (value === null || value === undefined) {
-    return;
+    return
   }
 
   if (typeof value === 'string' || typeof value === 'number') {
-    value = {type: 'text', value: String(value)};
+    value = {type: 'text', value: String(value)}
   }
 
   if (typeof value === 'object' && 'length' in value) {
-    index = -1;
-    length = value.length;
+    index = -1
+    length = value.length
 
     while (++index < length) {
-      addChild(nodes, value[index]);
+      addChild(nodes, value[index])
     }
 
-    return;
+    return
   }
 
   if (typeof value !== 'object' || !('type' in value)) {
-    throw new Error('Expected node, nodes, or string, got `' + value + '`');
+    throw new Error('Expected node, nodes, or string, got `' + value + '`')
   }
 
-  nodes.push(value);
+  nodes.push(value)
 }
 
 /* Add `name` and its `value` to `properties`. `properties` can
  * be prefilled by `parseSelector`: it can have `id` and `className`
  * properties. */
 function addProperty(properties, name, value) {
-  var info = propertyInformation(name) || {};
-  var result = value;
-  var key;
+  var info = propertyInformation(name) || {}
+  var result = value
+  var key
 
   /* Ignore nully and NaN values. */
   if (value === null || value === undefined || value !== value) {
-    return;
+    return
   }
 
   /* Handle values. */
   if (name === 'style') {
     /* Accept `object`. */
     if (typeof value !== 'string') {
-      result = [];
+      result = []
 
       for (key in value) {
-        result.push([key, value[key]].join(': '));
+        result.push([key, value[key]].join(': '))
       }
 
-      result = result.join('; ');
+      result = result.join('; ')
     }
   } else if (info.spaceSeparated) {
     /* Accept both `string` and `Array`. */
-    result = typeof value === 'string' ? spaces(result) : result;
+    result = typeof value === 'string' ? spaces(result) : result
 
     /* Class-names (which can be added both on
      * the `selector` and here). */
     if (name === 'class' && properties.className) {
-      result = properties.className.concat(result);
+      result = properties.className.concat(result)
     }
   } else if (info.commaSeparated) {
     /* Accept both `string` and `Array`. */
-    result = typeof value === 'string' ? commas(result) : result;
+    result = typeof value === 'string' ? commas(result) : result
   }
 
-  result = parsePrimitive(info, name, result);
+  result = parsePrimitive(info, name, result)
 
-  properties[info.propertyName || camelcase(name)] = result;
+  properties[info.propertyName || camelcase(name)] = result
 }
 
 /* Parse a (list of) primitives. */
 function parsePrimitive(info, name, value) {
-  var result = value;
-  var index;
-  var length;
+  var result = value
+  var index
+  var length
 
   if (typeof value === 'object' && 'length' in value) {
-    length = value.length;
-    index = -1;
-    result = [];
+    length = value.length
+    index = -1
+    result = []
 
     while (++index < length) {
-      result[index] = parsePrimitive(info, name, value[index]);
+      result[index] = parsePrimitive(info, name, value[index])
     }
 
-    return result;
+    return result
   }
 
   if (info.numeric || info.positiveNumeric) {
     if (!isNaN(result) && result !== '') {
-      result = Number(result);
+      result = Number(result)
     }
   } else if (info.boolean || info.overloadedBoolean) {
     /* Accept `boolean` and `string`. */
     if (
       typeof result === 'string' &&
       (result === '' || value.toLowerCase() === name)
     ) {
-      result = true;
+      result = true
     }
   }
 
-  return result;
+  return result
 }

package.json

@@ -33,29 +33,37 @@
     "browserify": "^16.0.0",
     "esmangle": "^1.0.0",
     "nyc": "^12.0.0",
+    "prettier": "^1.13.5",
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",
     "tape": "^4.0.0",
     "xo": "^0.21.0"
   },
   "scripts": {
-    "build-md": "remark . -qfo",
+    "format": "remark . -qfo && prettier --write '**/*.js' && xo --fix",
     "build-bundle": "browserify index.js --bare -s hastscript > hastscript.js",
     "build-mangle": "esmangle hastscript.js > hastscript.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"
   },
   "nyc": {
     "check-coverage": true,
     "lines": 100,
     "functions": 100,
     "branches": 100
   },
+  "prettier": {
+    "tabWidth": 2,
+    "useTabs": false,
+    "singleQuote": true,
+    "bracketSpacing": false,
+    "semi": false,
+    "trailingComma": "none"
+  },
   "xo": {
-    "space": true,
+    "prettier": true,
     "esnext": false,
     "rules": {
       "no-self-compare": "off",

readme.md

@@ -14,16 +14,22 @@ npm install hastscript
 ## Usage
 
 ```javascript
-var h = require('hastscript');
+var h = require('hastscript')
 
 var tree = h('.foo#some-id', [
   h('span', 'some text'),
   h('input', {type: 'text', value: 'foo'}),
-  h('a.alpha', {
-    class: 'bravo charlie',
-    download: 'download'
-  }, ['delta', 'echo'])
-]);
+  h(
+    'a.alpha',
+    {
+      class: 'bravo charlie',
+      download: 'download'
+    },
+    ['delta', 'echo']
+  )
+])
+
+console.log(tree)
 ```
 
 Yields: