Update dependencies, dev-dependencies

wooorm · wooorm · commit d096a9e2ec69 · 2016-06-13T20:42:50.000+02:00
diff --git a/.jscs.json b/.jscs.json
@@ -7,16 +7,22 @@
     "mdast-zone.js",
     "mdast-zone.min.js"
   ],
-  "preset": "yandex",
-  "requireQuotedKeysInObjects": true,
-  "disallowQuotedKeysInObjects": false,
+  "preset": "crockford",
+  "requireMultipleVarDecl": false,
+  "requireVarDeclFirst": false,
+  "disallowDanglingUnderscores": false,
   "maximumLineLength": {
     "value": 79,
     "allExcept": [
       "regex",
-      "urlComments"
+      "urlComments",
+      "require"
     ]
   },
+  "requireQuotedKeysInObjects": true,
+  "disallowKeywords": [
+    "with"
+  ],
   "jsDoc": {
     "checkAnnotations": "jsdoc3",
     "checkParamExistence": true,
diff --git a/index.js b/index.js
@@ -14,6 +14,8 @@
  * Dependencies.
  */
 
+var trim = require('trim');
+var commentMarker = require('mdast-comment-marker');
 var visit = require('unist-util-visit');
 
 /*
@@ -22,111 +24,6 @@ var visit = require('unist-util-visit');
 
 var splice = [].splice;
 
-/*
- * Expression for parsing parameters.
- */
-
-var PARAMETERS = new RegExp(
-    '\\s*' +
-    '(' +
-        '[-a-z09_]+' +
-    ')' +
-    '(?:' +
-        '=' +
-        '(?:' +
-            '"' +
-            '(' +
-                '(?:' +
-                    '\\\\[\\s\\S]' +
-                    '|' +
-                    '[^"]' +
-                ')+' +
-            ')' +
-            '"' +
-            '|' +
-            '\'' +
-            '(' +
-                '(?:' +
-                    '\\\\[\\s\\S]' +
-                    '|' +
-                    '[^\']' +
-                ')+' +
-            ')' +
-            '\'' +
-            '|' +
-            '(' +
-                '(?:' +
-                    '\\\\[\\s\\S]' +
-                    '|' +
-                    '[^"\'\\s]' +
-                ')+' +
-            ')' +
-        ')' +
-    ')?' +
-    '\\s*',
-    'gi'
-);
-
-/**
- * Create an expression which matches a marker.
- *
- * @param {string} name - Plug-in name.
- * @return {RegExp} - Expression.
- */
-function marker(name) {
-    return new RegExp(
-        '(' +
-            '\\s*' +
-            '<!--' +
-            '\\s*' +
-            '(' +
-                name +
-            ')' +
-            '\\s*' +
-            '(' +
-                'start' +
-                '|' +
-                'end' +
-            ')?' +
-            '\\s*' +
-            '(' +
-                '[\\s\\S]*?' +
-            ')' +
-            '\\s*' +
-            '-->' +
-            '\\s*' +
-        ')'
-    );
-}
-
-/**
- * Parse `value` into an object.
- *
- * @param {string} value - HTML comment.
- * @return {Object} - Parsed parameters.
- */
-function parameters(value) {
-    var attributes = {};
-
-    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);
-        }
-
-        attributes[$1] = result;
-
-        return '';
-    });
-
-    return attributes;
-}
-
 /**
  * Factory to test if `node` matches `settings`.
  *
@@ -137,7 +34,6 @@ function parameters(value) {
  */
 function testFactory(settings, callback) {
     var name = settings.name;
-    var expression = marker(name);
 
     /**
      * Test if `node` matches the bound settings.
@@ -147,37 +43,30 @@ function testFactory(settings, callback) {
      * @return {Object?} - Whether `node` matches.
      */
     function test(node, context) {
-        var value;
-        var match;
-        var result;
+        var marker = commentMarker(node);
+        var attributes;
+        var head;
 
-        if (!node || node.type !== 'html') {
+        if (!marker || marker.name !== name) {
             return null;
         }
 
-        value = node.value;
-        match = value.match(expression);
+        attributes = marker.attributes;
+        head = attributes.match(/(start|end)\b/);
 
-        if (
-            !match ||
-            match[1].length !== value.length ||
-            match[2] !== settings.name
-        ) {
-            return null;
+        if (head) {
+            head = head[0];
+            marker.attributes = trim.left(attributes.slice(head.length));
+            marker.parameters[head] = undefined;
         }
 
-        result = {
-            'type': match[3] || 'marker',
-            'attributes': match[4] || '',
-            'parameters': parameters(match[4] || ''),
-            'node': node
-        };
+        marker.type = head || 'marker';
 
         if (callback) {
-            callback(result, context);
+            callback(marker, context);
         }
 
-        return result;
+        return marker;
     }
 
     return test;
@@ -331,11 +220,11 @@ function attacher(mdast, options) {
     var parser = mdast.Parser.prototype;
     var blockTokenizers = parser.blockTokenizers;
     var inlineTokenizers = parser.inlineTokenizers;
-    var stringifiers = mdast.Compiler.prototype;
+    var stringifiers = mdast.Compiler.prototype.visitors;
 
     if (options.onparse) {
         blockTokenizers.html = parse(blockTokenizers.html, options);
-        inlineTokenizers.tag = parse(inlineTokenizers.tag, options);
+        inlineTokenizers.html = parse(inlineTokenizers.html, options);
     }
 
     if (options.onstringify) {
diff --git a/package.json b/package.json
@@ -13,31 +13,37 @@
     "mdast"
   ],
   "dependencies": {
+    "mdast-comment-marker": "^1.0.1",
+    "trim": "0.0.1",
     "unist-util-visit": "^1.0.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/wooorm/mdast-zone.git"
   },
   "bugs": "https://github.com/wooorm/mdast-zone/issues",
-  "author": "Titus Wormer <tituswormer@gmail.com>",
+  "author": "Titus Wormer <tituswormer@gmail.com> (http://wooorm.com)",
+  "contributors": [
+    "Titus Wormer <tituswormer@gmail.com> (http://wooorm.com)"
+  ],
   "files": [
     "index.js"
   ],
   "devDependencies": {
     "browserify": "^13.0.0",
-    "eslint": "^1.0.0",
+    "eslint": "^2.0.0",
     "esmangle": "^1.0.0",
     "istanbul": "^0.4.0",
-    "jscs": "^2.0.0",
-    "jscs-jsdoc": "^1.0.0",
-    "remark": "^3.0.0",
-    "remark-github": "^3.0.0",
-    "remark-lint": "^2.0.0",
-    "remark-toc": "^2.0.0",
-    "remark-usage": "^2.0.0",
-    "remark-validate-links": "^2.0.0",
-    "remark-yaml-config": "^2.0.0",
+    "jscs": "^3.0.0",
+    "jscs-jsdoc": "^2.0.0",
+    "remark": "^5.0.0",
+    "remark-cli": "^1.0.0",
+    "remark-github": "^5.0.0",
+    "remark-lint": "^4.0.0",
+    "remark-toc": "^3.0.0",
+    "remark-usage": "^4.0.0",
+    "remark-validate-links": "^4.0.0",
+    "remark-yaml-config": "^3.0.0",
     "tape": "^4.4.0"
   },
   "scripts": {
diff --git a/test/fixture/attributes-boolean-false/index.js b/test/fixture/attributes-boolean-false/index.js
@@ -30,10 +30,10 @@ function assertion(zone, t) {
     /**
      * Plug-in.
      *
-     * @param {Remark} remark - Processor.
+     * @param {Unified} processor - Processor.
      */
-    function plugin(remark) {
-        remark.use(zone({
+    function plugin(processor) {
+        processor.use(zone({
             'name': 'foo',
             'onparse': onparse
         }));
diff --git a/test/fixture/attributes-boolean-true/index.js b/test/fixture/attributes-boolean-true/index.js
@@ -30,10 +30,10 @@ function assertion(zone, t) {
     /**
      * Plug-in.
      *
-     * @param {Remark} remark - Processor.
+     * @param {Unified} processor - Processor.
      */
-    function plugin(remark) {
-        remark.use(zone({
+    function plugin(processor) {
+        processor.use(zone({
             'name': 'foo',
             'onparse': onparse
         }));
diff --git a/test/fixture/attributes-empty/index.js b/test/fixture/attributes-empty/index.js
@@ -30,10 +30,10 @@ function assertion(zone, t) {
     /**
      * Plug-in.
      *
-     * @param {Remark} remark - Processor.
+     * @param {Unified} processor - Processor.
      */
-    function plugin(remark) {
-        remark.use(zone({
+    function plugin(processor) {
+        processor.use(zone({
             'name': 'foo',
             'onparse': onparse
         }));
diff --git a/test/fixture/attributes-number/index.js b/test/fixture/attributes-number/index.js
@@ -42,10 +42,10 @@ function assertion(zone, t) {
     /**
      * Plug-in.
      *
-     * @param {Remark} remark - Processor.
+     * @param {Unified} processor - Processor.
      */
-    function plugin(remark) {
-        remark.use(zone({
+    function plugin(processor) {
+        processor.use(zone({
             'name': 'foo',
             'onparse': onparse
         }));
diff --git a/test/fixture/attributes-quoted-double/index.js b/test/fixture/attributes-quoted-double/index.js
@@ -30,10 +30,10 @@ function assertion(zone, t) {
     /**
      * Plug-in.
      *
-     * @param {Remark} remark - Processor.
+     * @param {Unified} processor - Processor.
      */
-    function plugin(remark) {
-        remark.use(zone({
+    function plugin(processor) {
+        processor.use(zone({
             'name': 'foo',
             'onparse': onparse
         }));
diff --git a/test/index.js b/test/index.js
@@ -47,12 +47,12 @@ test('Fixtures', function (t) {
     fixtures.forEach(function (fixture) {
         var processor = remark().use(fixture.test(zone, t));
 
-        processor.process(fixture.input, function (err, file, doc) {
+        processor.process(fixture.input, function (err, file) {
             t.ifError(err, 'should not fail (' + fixture.name + ')');
 
             if (fixture.output) {
                 t.equal(
-                    doc,
+                    String(file),
                     fixture.output,
                     'should stringify ' + fixture.name
                 );
