Refactor code-style

Author: wooorm

.editorconfig

@@ -2,14 +2,8 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-[*.{json,remarkrc,eslintrc,sh}]
-indent_size = 2
-
-[*.md]
-trim_trailing_whitespace = false

index.js

@@ -1,143 +1,116 @@
-/**
- * @author Titus Wormer
- * @copyright 2016 Titus Wormer
- * @license MIT
- * @module mdast:comment-marker
- * @fileoverview Parse a comment marker.
- */
-
 'use strict';
 
-/* eslint-env commonjs */
+/* Expose. */
+module.exports = marker;
 
+/* HTML type. */
 var T_HTML = 'html';
 
-/*
- * Expression for parsing parameters.
- */
-
+/* Expression for parsing parameters. */
 var PARAMETERS = new RegExp(
-    '\\s+' +
-    '(' +
-        '[-a-z0-9_]+' +
-    ')' +
+  '\\s+' +
+  '(' +
+    '[-a-z0-9_]+' +
+  ')' +
+  '(?:' +
+    '=' +
     '(?:' +
-        '=' +
+      '"' +
+      '(' +
+        '(?:' +
+          '\\\\[\\s\\S]' +
+          '|' +
+          '[^"]' +
+        ')+' +
+      ')' +
+      '"' +
+      '|' +
+      '\'' +
+      '(' +
         '(?:' +
-            '"' +
-            '(' +
-                '(?:' +
-                    '\\\\[\\s\\S]' +
-                    '|' +
-                    '[^"]' +
-                ')+' +
-            ')' +
-            '"' +
-            '|' +
-            '\'' +
-            '(' +
-                '(?:' +
-                    '\\\\[\\s\\S]' +
-                    '|' +
-                    '[^\']' +
-                ')+' +
-            ')' +
-            '\'' +
-            '|' +
-            '(' +
-                '(?:' +
-                    '\\\\[\\s\\S]' +
-                    '|' +
-                    '[^"\'\\s]' +
-                ')+' +
-            ')' +
-        ')' +
-    ')?',
-    'gi'
+          '\\\\[\\s\\S]' +
+          '|' +
+          '[^\']' +
+        ')+' +
+      ')' +
+      '\'' +
+      '|' +
+      '(' +
+        '(?:' +
+          '\\\\[\\s\\S]' +
+          '|' +
+          '[^"\'\\s]' +
+        ')+' +
+      ')' +
+    ')' +
+  ')?',
+  'gi'
 );
 
 var MARKER = new RegExp(
-    '(' +
-        '\\s*' +
-        '<!--' +
-        '\\s*' +
-        '([a-zA-Z0-9-]+)' +
-        '(\\s+([\\s\\S]*?))?' +
-        '\\s*' +
-        '-->' +
-        '\\s*' +
-    ')'
+  '(' +
+    '\\s*' +
+    '<!--' +
+    '\\s*' +
+    '([a-zA-Z0-9-]+)' +
+    '(\\s+([\\s\\S]*?))?' +
+    '\\s*' +
+    '-->' +
+    '\\s*' +
+  ')'
 );
 
-/**
- * Parse `value` into an object.
- *
- * @param {string} value - HTML comment.
- * @return {Object} - Parsed parameters.
- */
-function parameters(value) {
-    var attributes = {};
-    var rest = value.replace(PARAMETERS, function ($0, $1, $2, $3, $4) {
-        var result = $2 || $3 || $4 || '';
+/* Parse a comment marker */
+function marker(node) {
+  var value;
+  var match;
+  var params;
 
-        if (result === 'true' || result === '') {
-            result = true;
-        } else if (result === 'false') {
-            result = false;
-        } else if (!isNaN(result)) {
-            result = Number(result);
-        }
+  if (!node || node.type !== T_HTML) {
+    return null;
+  }
 
-        attributes[$1] = result;
+  value = node.value;
+  match = value.match(MARKER);
 
-        return '';
-    });
+  if (!match || match[1].length !== value.length) {
+    return null;
+  }
 
-    return rest ? null : attributes;
-}
+  params = parameters(match[3] || '');
 
-/*
- * Constants.
- */
+  if (!params) {
+    return null;
+  }
 
-/**
- * Parse a comment marker
- *
- * @param {Node} node - Node to parse.
- * @return {Object?} - Marker information.
- */
-function marker(node) {
-    var value;
-    var match;
-    var params;
-
-    if (!node || node.type !== T_HTML) {
-        return null;
-    }
+  return {
+    name: match[2],
+    attributes: match[4] || '',
+    parameters: params,
+    node: node
+  };
+}
 
-    value = node.value;
-    match = value.match(MARKER);
+/* eslint-disable max-params */
 
-    if (!match || match[1].length !== value.length) {
-        return null;
+/* Parse `value` into an object. */
+function parameters(value) {
+  var attributes = {};
+  var rest = value.replace(PARAMETERS, function ($0, $1, $2, $3, $4) {
+    var result = $2 || $3 || $4 || '';
+
+    if (result === 'true' || result === '') {
+      result = true;
+    } else if (result === 'false') {
+      result = false;
+    } else if (!isNaN(result)) {
+      result = Number(result);
     }
 
-    params = parameters(match[3] || '');
+    attributes[$1] = result;
 
-    if (!params) {
-        return null;
-    }
+    return '';
+  });
 
-    return {
-        'name': match[2],
-        'attributes': match[4] || '',
-        'parameters': params,
-        'node': node
-    };
+  return rest ? null : attributes;
 }
-
-/*
- * Expose.
- */
-
-module.exports = marker;

package.json

@@ -37,18 +37,23 @@
     "remark-usage": "^4.0.0",
     "remark-validate-links": "^4.0.0",
     "remark-yaml-config": "^3.0.0",
-    "tape": "^4.0.0"
+    "tape": "^4.0.0",
+    "xo": "^0.17.0"
   },
   "scripts": {
     "build-md": "remark . --quiet --frail",
     "build-bundle": "browserify index.js --bare -s mdastCommentMarker > mdast-comment-marker.js",
     "build-mangle": "esmangle mdast-comment-marker.js > mdast-comment-marker.min.js",
     "build": "npm run build-md && npm run build-bundle && npm run build-mangle",
-    "lint-api": "eslint .",
-    "lint-style": "jscs --reporter inline .",
-    "lint": "npm run lint-api && npm run lint-style",
+    "lint": "xo",
     "test-api": "node test.js",
     "test-coverage": "istanbul cover test.js",
     "test": "npm run build && npm run lint && npm run test-coverage"
+  },
+  "xo": {
+    "space": true,
+    "ignore": [
+      "mdast-comment-marker.js"
+    ]
   }
 }

readme.md

@@ -1,7 +1,5 @@
 # mdast-comment-marker [![Build Status][build-badge]][build-status] [![Coverage Status][coverage-badge]][coverage-status] [![Chat][chat-badge]][chat]
 
-<!--lint disable list-item-spacing heading-increment list-item-indent-->
-
 Parse an [MDAST][] comment marker.
 
 ## Installation
@@ -19,14 +17,10 @@ globals module, [uncompressed and compressed][releases].
 
 ```javascript
 var marker = require('mdast-comment-marker');
-```
 
-A simple marker:
-
-```javascript
 var result = marker({
-    'type': 'html',
-    'value': '<!--foo-->'
+  type: 'html',
+  value: '<!--foo-->'
 });
 ```
 
@@ -48,8 +42,8 @@ Parameters:
 
 ```javascript
 result = marker({
-    'type': 'html',
-    'value': '<!--foo bar baz=12.4 qux="test test" quux=\'false\'-->'
+  type: 'html',
+  value: '<!--foo bar baz=12.4 qux="test test" quux=\'false\'-->'
 });
 ```
 
@@ -76,8 +70,8 @@ Non-markers:
 
 ```javascript
 result = marker({
-    'type': 'html',
-    'value': '<!doctype html>'
+  type: 'html',
+  value: '<!doctype html>'
 });
 ```