Refactor code-style

Author: wooorm

.prettierignore

@@ -0,0 +1,3 @@
+coverage/
+mdast-util-compact.js
+mdast-util-compact.min.js

index.js

@@ -1,30 +1,27 @@
-'use strict';
+'use strict'
 
-/* Dependencies. */
-var visit = require('unist-util-visit');
-var modify = require('unist-util-modify-children');
+var visit = require('unist-util-visit')
+var modify = require('unist-util-modify-children')
 
-/* Expose. */
-module.exports = compact;
+module.exports = compact
 
-/* Make an MDAST tree compact by merging adjacent text
- * nodes. */
+/* Make an MDAST tree compact by merging adjacent text nodes. */
 function compact(tree, commonmark) {
-  var modifier = modify(iterator);
+  var modifier = modify(iterator)
 
-  visit(tree, visitor);
+  visit(tree, visitor)
 
-  return tree;
+  return tree
 
   function visitor(node) {
     if (node.children) {
-      modifier(node);
+      modifier(node)
     }
   }
 
   function iterator(child, index, parent) {
-    var siblings = parent.children;
-    var prev = index && siblings[index - 1];
+    var siblings = parent.children
+    var prev = index && siblings[index - 1]
 
     if (
       prev &&
@@ -33,40 +30,41 @@ function compact(tree, commonmark) {
       mergeable(child, commonmark)
     ) {
       if (child.value) {
-        prev.value += child.value;
+        prev.value += child.value
       }
 
       if (child.children) {
-        prev.children = prev.children.concat(child.children);
+        prev.children = prev.children.concat(child.children)
       }
 
-      siblings.splice(index, 1);
+      siblings.splice(index, 1)
 
       if (prev.position && child.position) {
-        prev.position.end = child.position.end;
+        prev.position.end = child.position.end
       }
 
-      return index;
+      return index
     }
   }
 }
 
 function mergeable(node, commonmark) {
-  var start;
-  var end;
+  var start
+  var end
 
   if (node.type === 'text') {
     if (!node.position) {
-      return true;
+      return true
     }
 
-    start = node.position.start;
-    end = node.position.end;
+    start = node.position.start
+    end = node.position.end
 
     /* Only merge nodes which occupy the same size as their `value`. */
-    return start.line !== end.line ||
-      end.column - start.column === node.value.length;
+    return (
+      start.line !== end.line || end.column - start.column === node.value.length
+    )
   }
 
-  return commonmark && node.type === 'blockquote';
+  return commonmark && node.type === 'blockquote'
 }

package.json

@@ -25,6 +25,7 @@
   "devDependencies": {
     "browserify": "^16.0.0",
     "nyc": "^12.0.0",
+    "prettier": "^1.14.2",
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",
     "tape": "^4.0.0",
@@ -33,17 +34,24 @@
     "xo": "^0.22.0"
   },
   "scripts": {
-    "build-md": "remark . --quiet --frail --output",
+    "format": "remark . -qfo && prettier --write '**/*.js' && xo --fix",
     "build-bundle": "browserify . -s mdastUtilCompact > mdast-util-compact.js",
     "build-mangle": "browserify . -s mdastUtilCompact -p tinyify > mdast-util-compact.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,
     "ignores": [
       "mdast-util-compact.js"

readme.md

@@ -14,18 +14,14 @@ npm install mdast-util-compact
 ## Usage
 
 ```javascript
-var u = require('unist-builder');
-var compact = require('mdast-util-compact');
+var u = require('unist-builder')
+var compact = require('mdast-util-compact')
 
-var tree = u('strong', [
-  u('text', 'alpha'),
-  u('text', ' '),
-  u('text', 'bravo')
-]);
+var tree = u('strong', [u('text', 'alpha'), u('text', ' '), u('text', 'bravo')])
 
-compact(tree);
+compact(tree)
 
-console.log(tree);
+console.log(tree)
 ```
 
 Yields:

test.js

@@ -1,87 +1,114 @@
-'use strict';
+'use strict'
 
-var test = require('tape');
-var u = require('unist-builder');
-var compact = require('.');
+var test = require('tape')
+var u = require('unist-builder')
+var compact = require('.')
 
-test('compact()', function (t) {
+test('compact()', function(t) {
   t.same(
-    compact(u('paragraph', [
-      u('text', 'alpha'),
-      u('text', ' '),
-      u('text', 'bravo')
-    ])),
+    compact(
+      u('paragraph', [u('text', 'alpha'), u('text', ' '), u('text', 'bravo')])
+    ),
     u('paragraph', [u('text', 'alpha bravo')]),
     'should compact texts'
-  );
+  )
 
   t.same(
-    compact(u('paragraph', [
-      u('text', {position: {
-        start: {line: 1, column: 1},
-        end: {line: 1, column: 6}
-      }}, 'alpha'),
-      u('text', {position: {
-        start: {line: 1, column: 6},
-        end: {line: 1, column: 7}
-      }}, ' '),
-      u('text', {position: {
-        start: {line: 1, column: 7},
-        end: {line: 1, column: 12}
-      }}, 'bravo')
-    ])),
-    u('paragraph', [u('text', {position: {
-      start: {line: 1, column: 1},
-      end: {line: 1, column: 12}
-    }}, 'alpha bravo')]),
+    compact(
+      u('paragraph', [
+        u(
+          'text',
+          {
+            position: {start: {line: 1, column: 1}, end: {line: 1, column: 6}}
+          },
+          'alpha'
+        ),
+        u(
+          'text',
+          {
+            position: {start: {line: 1, column: 6}, end: {line: 1, column: 7}}
+          },
+          ' '
+        ),
+        u(
+          'text',
+          {
+            position: {start: {line: 1, column: 7}, end: {line: 1, column: 12}}
+          },
+          'bravo'
+        )
+      ])
+    ),
+    u('paragraph', [
+      u(
+        'text',
+        {
+          position: {start: {line: 1, column: 1}, end: {line: 1, column: 12}}
+        },
+        'alpha bravo'
+      )
+    ]),
     'should merge positions'
-  );
+  )
 
   t.same(
-    compact(u('paragraph', [
-      u('text', 'at'),
-      u('text', {position: {
-        start: {line: 1, column: 3},
-        end: {line: 1, column: 8}
-      }}, '&'),
-      u('text', 't')
-    ])),
+    compact(
+      u('paragraph', [
+        u('text', 'at'),
+        u(
+          'text',
+          {
+            position: {start: {line: 1, column: 3}, end: {line: 1, column: 8}}
+          },
+          '&'
+        ),
+        u('text', 't')
+      ])
+    ),
     u('paragraph', [
       u('text', 'at'),
-      u('text', {position: {
-        start: {line: 1, column: 3},
-        end: {line: 1, column: 8}
-      }}, '&'),
+      u(
+        'text',
+        {
+          position: {start: {line: 1, column: 3}, end: {line: 1, column: 8}}
+        },
+        '&'
+      ),
       u('text', 't')
     ]),
     'should not compact texts with incompatible positions'
-  );
+  )
 
   t.same(
-    compact(u('root', [
-      u('blockquote', [u('paragraph', [u('text', 'Alpha.')])]),
-      u('blockquote', [u('paragraph', [u('text', 'Bravo.')])])
-    ])),
+    compact(
+      u('root', [
+        u('blockquote', [u('paragraph', [u('text', 'Alpha.')])]),
+        u('blockquote', [u('paragraph', [u('text', 'Bravo.')])])
+      ])
+    ),
     u('root', [
       u('blockquote', [u('paragraph', [u('text', 'Alpha.')])]),
       u('blockquote', [u('paragraph', [u('text', 'Bravo.')])])
     ]),
     'should not compact blockquotes'
-  );
+  )
 
   t.same(
-    compact(u('root', [
-      u('blockquote', [u('paragraph', [u('text', 'Alpha.')])]),
-      u('blockquote', [u('paragraph', [u('text', 'Bravo.')])])
-    ]), true),
+    compact(
+      u('root', [
+        u('blockquote', [u('paragraph', [u('text', 'Alpha.')])]),
+        u('blockquote', [u('paragraph', [u('text', 'Bravo.')])])
+      ]),
+      true
+    ),
     u('root', [
       u('blockquote', [
         u('paragraph', [u('text', 'Alpha.')]),
         u('paragraph', [u('text', 'Bravo.')])
       ])
     ]),
     'should compact blockquotes in commonmark mode'
-  );
+  )
 
-  t.end();
-});
+  t.end()
+})