Refactor code-style

Author: wooorm

.prettierignore

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

index.js

@@ -1,41 +1,35 @@
-'use strict';
+'use strict'
 
-var repeat = require('repeat-string');
-var vfileLocation = require('vfile-location');
-var position = require('unist-util-position');
-var toString = require('nlcst-to-string');
+var repeat = require('repeat-string')
+var vfileLocation = require('vfile-location')
+var position = require('unist-util-position')
+var toString = require('nlcst-to-string')
 
-module.exports = toNLCST;
+module.exports = toNLCST
 
-var ignore = [
-  'table',
-  'tableRow',
-  'tableCell'
-];
+var ignore = ['table', 'tableRow', 'tableCell']
 
-var source = [
-  'inlineCode'
-];
+var source = ['inlineCode']
 
-var newline = '\n';
+var newline = '\n'
 
-/* Transform `tree` into `nlcst`. */
+// Transform `tree` into `nlcst`.
 function toNLCST(tree, file, Parser, options) {
-  var settings = options || {};
-  var parser;
+  var settings = options || {}
+  var parser
 
-  /* Warn for invalid parameters. */
+  // Warn for invalid parameters.
   if (!tree || !tree.type) {
-    throw new Error('mdast-util-to-nlcst expected node');
+    throw new Error('mdast-util-to-nlcst expected node')
   }
 
   if (!file || !file.messages) {
-    throw new Error('mdast-util-to-nlcst expected file');
+    throw new Error('mdast-util-to-nlcst expected file')
   }
 
-  /* Construct parser. */
+  // Construct parser.
   if (!Parser) {
-    throw new Error('mdast-util-to-nlcst expected parser');
+    throw new Error('mdast-util-to-nlcst expected parser')
   }
 
   if (
@@ -44,129 +38,135 @@ function toNLCST(tree, file, Parser, options) {
     !tree.position.start.column ||
     !tree.position.start.line
   ) {
-    throw new Error('mdast-util-to-nlcst expected position on nodes');
+    throw new Error('mdast-util-to-nlcst expected position on nodes')
   }
 
-  parser = 'parse' in Parser ? Parser : new Parser();
-
-  /* Transform mdast into NLCST tokens, and pass these
-   * into `parser.parse` to insert sentences, paragraphs
-   * where needed. */
-  return parser.parse(one({
-    doc: String(file),
-    location: vfileLocation(file),
-    parser: parser,
-    ignore: ignore.concat(settings.ignore || []),
-    source: source.concat(settings.source || [])
-  }, tree));
+  parser = 'parse' in Parser ? Parser : new Parser()
+
+  // Transform mdast into NLCST tokens, and pass these into `parser.parse` to
+  // insert sentences, paragraphs where needed.
+  return parser.parse(
+    one(
+      {
+        doc: String(file),
+        location: vfileLocation(file),
+        parser: parser,
+        ignore: ignore.concat(settings.ignore || []),
+        source: source.concat(settings.source || [])
+      },
+      tree
+    )
+  )
 }
 
-/* Convert `node` into NLCST. */
+// Convert `node` into NLCST.
 function one(config, node) {
-  var offset = config.location.toOffset;
-  var parser = config.parser;
-  var doc = config.doc;
-  var type = node.type;
-  var start = offset(position.start(node));
-  var end = offset(position.end(node));
+  var offset = config.location.toOffset
+  var parser = config.parser
+  var doc = config.doc
+  var type = node.type
+  var start = offset(position.start(node))
+  var end = offset(position.end(node))
 
   if (config.ignore.indexOf(type) === -1) {
     if (config.source.indexOf(type) !== -1) {
-      return patch(config, [parser.tokenizeSource(doc.slice(start, end))], start);
+      return patch(
+        config,
+        [parser.tokenizeSource(doc.slice(start, end))],
+        start
+      )
     }
 
     if (node.children) {
-      return all(config, node);
+      return all(config, node)
     }
 
     if (type === 'image' || type === 'imageReference') {
-      return patch(config, parser.tokenize(node.alt), start + 2);
+      return patch(config, parser.tokenize(node.alt), start + 2)
     }
 
     if (type === 'text' || type === 'escape') {
-      return patch(config, parser.tokenize(node.value), start);
+      return patch(config, parser.tokenize(node.value), start)
     }
 
     if (node.type === 'break') {
-      return patch(config, [parser.tokenizeWhiteSpace('\n')], start);
+      return patch(config, [parser.tokenizeWhiteSpace('\n')], start)
     }
   }
 
-  return null;
+  return null
 }
 
-/* Convert all nodes in `parent` (mdast) into NLCST. */
+// Convert all nodes in `parent` (mdast) into NLCST.
 function all(config, parent) {
-  var children = parent.children;
-  var length = children && children.length;
-  var index = -1;
-  var result = [];
-  var child;
-  var node;
-  var pos;
-  var prevEndLine;
-  var prevOffset;
-  var endLine;
+  var children = parent.children
+  var length = children && children.length
+  var index = -1
+  var result = []
+  var child
+  var node
+  var pos
+  var prevEndLine
+  var prevOffset
+  var endLine
 
   while (++index < length) {
-    node = children[index];
-    pos = node.position;
-    endLine = position.start(node).line;
+    node = children[index]
+    pos = node.position
+    endLine = position.start(node).line
 
     if (prevEndLine && endLine !== prevEndLine) {
-      child = config.parser.tokenizeWhiteSpace(repeat(newline, endLine - prevEndLine));
-      patch(config, [child], prevOffset);
+      child = config.parser.tokenizeWhiteSpace(
+        repeat(newline, endLine - prevEndLine)
+      )
+      patch(config, [child], prevOffset)
 
       if (child.value.length < 2) {
-        child.value = repeat(newline, 2);
+        child.value = repeat(newline, 2)
       }
 
-      result.push(child);
+      result.push(child)
     }
 
-    child = one(config, node);
+    child = one(config, node)
 
     if (child) {
-      result = result.concat(child);
+      result = result.concat(child)
     }
 
-    pos = position.end(node);
-    prevEndLine = pos.line;
-    prevOffset = pos.offset;
+    pos = position.end(node)
+    prevEndLine = pos.line
+    prevOffset = pos.offset
   }
 
-  return result;
+  return result
 }
 
-/* Patch a position on each node in `nodes`.
- * `offset` is the offset in `file` this run of content
- * starts at. */
+// Patch a position on each node in `nodes`.
+// `offset` is the offset in `file` this run of content starts at.
 function patch(config, nodes, offset) {
-  var position = config.location.toPosition;
-  var length = nodes.length;
-  var index = -1;
-  var start = offset;
-  var children;
-  var node;
-  var end;
+  var position = config.location.toPosition
+  var length = nodes.length
+  var index = -1
+  var start = offset
+  var children
+  var node
+  var end
 
   while (++index < length) {
-    node = nodes[index];
-    children = node.children;
+    node = nodes[index]
+    children = node.children
 
     if (children) {
-      patch(config, children, start);
+      patch(config, children, start)
     }
 
-    end = start + toString(node).length;
+    end = start + toString(node).length
 
-    node.position = {
-      start: position(start),
-      end: position(end)
-    };
+    node.position = {start: position(start), end: position(end)}
 
-    start = end;
+    start = end
   }
 
-  return nodes;
+  return nodes
 }

package.json

@@ -36,6 +36,7 @@
     "parse-dutch": "^4.0.0",
     "parse-english": "^4.0.0",
     "parse-latin": "^4.0.0",
+    "prettier": "^1.14.3",
     "remark": "^10.0.0",
     "remark-cli": "^6.0.0",
     "remark-frontmatter": "^1.0.0",
@@ -45,23 +46,30 @@
     "xo": "^0.23.0"
   },
   "scripts": {
-    "build-md": "remark *.md -qfo",
+    "format": "remark *.md -qfo && prettier --write '**/*.js' && xo --fix",
     "build-bundle": "browserify index.js --bare -s mdastUtilToNLCST > mdast-util-to-nlcst.js",
     "build-mangle": "esmangle mdast-util-to-nlcst.js > mdast-util-to-nlcst.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/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,
     "rules": {
       "max-params": "off"

readme.md

@@ -15,18 +15,18 @@ npm install mdast-util-to-nlcst
 ## Usage
 
 ```javascript
-var toNLCST = require('mdast-util-to-nlcst');
-var inspect = require('unist-util-inspect');
-var English = require('parse-english');
-var remark = require('remark');
-var vfile = require('vfile');
+var toNLCST = require('mdast-util-to-nlcst')
+var inspect = require('unist-util-inspect')
+var English = require('parse-english')
+var remark = require('remark')
+var vfile = require('vfile')
 
-var file = vfile('Some *foo*sball.');
-var tree = remark().parse(file);
+var file = vfile('Some *foo*sball.')
+var tree = remark().parse(file)
 
-var nlcst = toNLCST(tree, file, English);
+var nlcst = toNLCST(tree, file, English)
 
-console.log(inspect(nlcst));
+console.log(inspect(nlcst))
 ```
 
 Yields: