fixes jonschlinkert#66

Author: jonschlinkert

index.js

@@ -44,13 +44,13 @@ toc.insert = require('./lib/insert');
 
 function generate(options) {
   var opts = utils.merge({firsth1: true, maxdepth: 6}, options);
-  var seen = opts.seen = {};
   var stripFirst = opts.firsth1 === false;
   if (opts.linkify !== false) opts.linkify = true;
 
   return function(md) {
     md.renderer.render = function(tokens) {
       tokens = tokens.slice();
+      var seen = {};
       var len = tokens.length, i = 0, num = 0;
       var tocstart = -1;
       var arr = [];
@@ -92,7 +92,7 @@ function generate(options) {
             seen[val]++;
           }
 
-          tok.seen = seen[val];
+          tok.seen = opts.num = seen[val];
           tok.slug = utils.slugify(val, opts);
           res.json.push(utils.pick(tok, ['content', 'slug', 'lvl', 'i', 'seen']));
           if (opts.linkify) tok = linkify(tok, opts);
@@ -178,13 +178,12 @@ function highest(arr) {
  * Turn headings into anchors
  */
 
-function linkify(tok, opts) {
+function linkify(tok, options) {
+  var opts = utils.merge({}, options);
   if (tok && tok.content) {
+    opts.num = tok.seen;
     var text = titleize(tok.content, opts);
     var slug = utils.slugify(tok.content, opts);
-    if (tok.seen) {
-      slug += '-' + tok.seen;
-    }
     slug = querystring.escape(slug);
     if (opts && typeof opts.linkify === 'function') {
       return opts.linkify(tok, text, slug, opts);
@@ -212,7 +211,8 @@ function titleize(str, opts) {
   }
   str = utils.getTitle(str);
   str = str.split(/<\/?[^>]+>/).join('');
-  return str.replace(/[ \t]+/g, ' ').trim();
+  str = str.split(/[ \t]+/).join(' ');
+  return str.trim();
 }
 
 /**

lib/utils.js

@@ -13,15 +13,15 @@ require = utils;
  * Lazily required module dependencies
  */
 
-require('minimist');
-require('remarkable', 'Remarkable');
-require('repeat-string', 'repeat');
-require('markdown-link', 'mdlink');
 require('concat-stream', 'concat');
 require('gray-matter', 'matter');
-require('object.pick', 'pick');
-require('mixin-deep', 'merge');
 require('list-item', 'li');
+require('markdown-link', 'mdlink');
+require('minimist');
+require('mixin-deep', 'merge');
+require('object.pick', 'pick');
+require('remarkable', 'Remarkable');
+require('repeat-string', 'repeat');
 require('strip-color');
 require = fn;
 
@@ -58,12 +58,15 @@ utils.slugify = function(str, options) {
   str = utils.stripColor(str);
   str = str.toLowerCase();
   // `.split()` is often (but not always) faster than `.replace()`
-  str = str.split(/ /).join('-');
+  str = str.split(' ').join('-');
   str = str.split(/\t/).join('--');
   str = str.split(/<\/?[^>]+>/).join('');
   str = str.split(/[|$&`~=\\\/@+*!?({[\]})<>=.,;:'"^]/).join('');
   str = str.split(/[。？！，、；：“”【】（）〔〕［］﹃﹄“ ”‘’﹁﹂—…－～《》〈〉「」]/).join('');
   str = diacritics.removeDiacritics(str);
+  if (options.num) {
+    str += '-' + options.num;
+  }
   return str;
 };
 

test/test.js

@@ -153,6 +153,12 @@ describe('toc', function() {
     ].join('\n'));
   });
 
+  it('should increment duplicate headings:', function() {
+    assert.equal(toc('### AAA\n### AAA\n### AAA').json[0].slug, 'aaa');
+    assert.equal(toc('### AAA\n### AAA\n### AAA').json[1].slug, 'aaa-1');
+    assert.equal(toc('### AAA\n### AAA\n### AAA').json[2].slug, 'aaa-2');
+  });
+
   it('should allow and ignore empty headings:', function() {
     assert.equal(toc('#\n# \n# AAA\n# BBB\nfoo\nbar\nbaz#\n').content, [
       '- [AAA](#aaa)',