Refactor code-style

Author: wooorm

.prettierignore

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

index.js

@@ -1,79 +1,78 @@
-'use strict';
+'use strict'
 
-/* Expose. */
-module.exports = zone;
+var commentMarker = require('mdast-comment-marker')
+var visit = require('unist-util-visit')
 
-/* Dependencies. */
-var commentMarker = require('mdast-comment-marker');
-var visit = require('unist-util-visit');
+module.exports = zone
 
-/* Methods. */
-var splice = [].splice;
+var splice = [].splice
 
-/* Run factory. */
 function zone(node, name, callback) {
-  var nodes = [];
-  var start = null;
-  var scope = null;
-  var level = 0;
-  var position;
+  var nodes = []
+  var start = null
+  var scope = null
+  var level = 0
+  var position
 
-  visit(node, gather);
+  visit(node, gather)
 
   /* Gather one dimensional zones. */
   function gather(node, index, parent) {
-    var type = test(node);
+    var type = test(node)
 
     if (scope && parent === scope) {
       if (type === 'start') {
-        level++;
+        level++
       }
 
       if (type === 'end') {
-        level--;
+        level--
       }
 
       if (type === 'end' && level === 0) {
         nodes = callback(start, nodes, node, {
           start: index - nodes.length - 1,
           end: index,
           parent: scope
-        });
+        })
 
         if (nodes) {
-          splice.apply(scope.children, [position, index - position + 1].concat(nodes));
+          splice.apply(
+            scope.children,
+            [position, index - position + 1].concat(nodes)
+          )
         }
 
-        start = null;
-        scope = null;
-        position = null;
-        nodes = [];
+        start = null
+        scope = null
+        position = null
+        nodes = []
       } else {
-        nodes.push(node);
+        nodes.push(node)
       }
     }
 
     if (!scope && type === 'start') {
-      level = 1;
-      position = index;
-      start = node;
-      scope = parent;
+      level = 1
+      position = index
+      start = node
+      scope = parent
     }
   }
 
   /* Test if `node` matches the bound settings. */
   function test(node) {
-    var marker = commentMarker(node);
-    var attributes;
-    var head;
+    var marker = commentMarker(node)
+    var attributes
+    var head
 
     if (!marker || marker.name !== name) {
-      return null;
+      return null
     }
 
-    attributes = marker.attributes;
-    head = attributes.match(/(start|end)\b/);
+    attributes = marker.attributes
+    head = attributes.match(/(start|end)\b/)
 
-    return head ? head[0] : null;
+    return head ? head[0] : null
   }
 }

package.json

@@ -30,6 +30,7 @@
     "is-hidden": "^1.0.1",
     "negate": "^1.0.0",
     "nyc": "^12.0.0",
+    "prettier": "^1.14.2",
     "remark": "^9.0.0",
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",
@@ -38,23 +39,30 @@
     "xo": "^0.22.0"
   },
   "scripts": {
-    "build-md": "remark . -qfo",
+    "format": "remark . -qfo && prettier --write '**/*.js' && xo --fix",
     "build-bundle": "browserify . -s mdastZone > mdast-zone.js",
     "build-mangle": "browserify . -s mdastZone -p tinyify > mdast-zone.min.js",
-    "build": "npm run build-md && npm run build-bundle && npm run build-mangle",
-    "lint": "xo",
-    "test-api": "node test/index.js",
+    "build": "npm run build-bundle && npm run build-mangle",
+    "test-api": "node test",
     "test-coverage": "nyc --reporter lcov tape test/index.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,
     "ignores": [
       "mdast-zone.js"

readme.md

@@ -26,28 +26,30 @@ Foo
 And our script, `example.js`, looks as follows:
 
 ```javascript
-var vfile = require('to-vfile');
-var remark = require('remark');
-var zone = require('mdast-zone');
+var vfile = require('to-vfile')
+var remark = require('remark')
+var zone = require('mdast-zone')
 
 remark()
   .use(plugin)
-  .process(vfile.readSync('example.md'), function (err, file) {
-    if (err) throw err;
-    console.log(String(file));
-  });
+  .process(vfile.readSync('example.md'), function(err, file) {
+    if (err) throw err
+    console.log(String(file))
+  })
 
 function plugin() {
-  return transformer;
-  function transformer(tree) {
-    zone(tree, 'foo', mutate);
+  return transform
+
+  function transform(tree) {
+    zone(tree, 'foo', mutate)
   }
+
   function mutate(start, nodes, end) {
     return [
       start,
       {type: 'paragraph', children: [{type: 'text', value: 'Bar'}]},
       end
-    ];
+    ]
   }
 }
 ```

test/fixtures.js

@@ -1,23 +1,30 @@
-'use strict';
+'use strict'
 
 /* eslint-disable import/no-dynamic-require */
 
-var fs = require('fs');
-var path = require('path');
-var negate = require('negate');
-var hidden = require('is-hidden');
+var fs = require('fs')
+var path = require('path')
+var negate = require('negate')
+var hidden = require('is-hidden')
 
-var root = path.join(__dirname, 'fixtures');
+var root = path.join(__dirname, 'fixtures')
 
-module.exports = fs.readdirSync(root)
+module.exports = fs
+  .readdirSync(root)
   .filter(negate(hidden))
-  .map(function (basename) {
-    var output = path.join(root, basename, 'output.md');
+  .map(map)
 
-    return {
-      name: basename,
-      input: fs.readFileSync(path.join(root, basename, 'input.md'), 'utf8'),
-      output: fs.existsSync(output) ? fs.readFileSync(output, 'utf8') : null,
-      test: require(path.join(root, basename, 'index.js'))
-    };
-  });
+function map(basename) {
+  var output = null
+
+  try {
+    output = fs.readFileSync(path.join(root, basename, 'output.md'))
+  } catch (err) {}
+
+  return {
+    name: basename,
+    input: fs.readFileSync(path.join(root, basename, 'input.md')),
+    output: output,
+    test: require(path.join(root, basename))
+  }
+}

test/fixtures/mismatched/index.js

@@ -1,11 +1,11 @@
-'use strict';
+'use strict'
 
-module.exports = assertion;
+module.exports = assertion
 
 function assertion(t, zone, tree) {
-  zone(tree, 'foo', handle);
+  zone(tree, 'foo', handle)
 
   function handle() {
-    throw new Error('Should not be invoked');
+    throw new Error('Should not be invoked')
   }
 }

test/fixtures/nodes/index.js

@@ -1,24 +1,22 @@
-'use strict';
+'use strict'
 
-module.exports = assertion;
+module.exports = assertion
 
 function assertion(t, zone, tree) {
-  var count = 0;
+  var count = 0
 
-  zone(tree, 'foo', handle);
+  t.test('nodes', function(st) {
+    st.plan(6)
 
-  function handle(start, nodes) {
-    t.test('range-children', function (st) {
-      st.equal(nodes.length, 1);
-      st.equal(nodes[0].type, 'paragraph');
-      st.equal(nodes[0].children.length, 1);
-      st.equal(nodes[0].children[0].type, 'text');
-      st.equal(nodes[0].children[0].value, 'Foo.');
+    zone(tree, 'foo', handle)
 
-      count++;
-      st.equal(count, 1);
-
-      st.end();
-    });
-  }
+    function handle(start, nodes) {
+      st.equal(nodes.length, 1)
+      st.equal(nodes[0].type, 'paragraph')
+      st.equal(nodes[0].children.length, 1)
+      st.equal(nodes[0].children[0].type, 'text')
+      st.equal(nodes[0].children[0].value, 'Foo.')
+      st.equal(++count, 1)
+    }
+  })
 }

test/fixtures/non-marker/index.js

@@ -1,11 +1,11 @@
-'use strict';
+'use strict'
 
-module.exports = assertion;
+module.exports = assertion
 
 function assertion(t, zone, tree) {
-  zone(tree, 'foo', handle);
+  zone(tree, 'foo', handle)
 
   function handle() {
-    throw new Error('Should not be invoked');
+    throw new Error('Should not be invoked')
   }
 }

test/fixtures/range-children/index.js

@@ -0,0 +1,19 @@
+'use strict'
+
+module.exports = assertion
+
+function assertion(t, zone, tree) {
+  var count = 0
+
+  t.test('range-children', function(st) {
+    st.plan(3)
+
+    zone(tree, 'foo', handle)
+
+    function handle(start, nodes) {
+      st.equal(nodes.length, 1)
+      st.equal(nodes[0].type, 'blockquote')
+      st.equal(++count, 1)
+    }
+  })
+}