keep compat with markdown-it-anchor 5.0.2

nagaozen · Jun 19, 2018 · 4f839c1 · 4f839c1
1 parent 501e59a
commit 4f839c1
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 1,370 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.0.3] - 2018-06-19
+### Changed
+- update to keep compat with `markdown-it-anchor` `v5.0.2`
+
 ## [2.0.2] - 2018-06-15
 ### Changed
 - tests cover 100%

diff --git a/Makefile b/Makefile
@@ -20,6 +20,5 @@ build:
 upddemo:
 	rm -rf ./lib
 	mkdir lib
-	curl -o lib/markdown-it.js https://wzrd.in/standalone/markdown-it@latest
 	curl -o lib/markdown-it-anchor.js https://wzrd.in/standalone/markdown-it-anchor@latest
 	curl -o lib/uslug.js https://wzrd.in/standalone/uslug@latest
diff --git a/__test__/test.js b/__test__/test.js
@@ -112,6 +112,13 @@ test("headers innerText may happen more than once", () => {
 `);
 });
 
+test("and sometimes slugify with suffix may generate another existing header", () => {
+	expect( md.render("${toc}\n\n# header\n\n## header\n\n## header 2") ).toBe(`<nav class="table-of-contents"><ol><li><a href="#header"> header</a><ol><li><a href="#header-2"> header</a></li><li><a href="#header-2-2"> header 2</a></li></ol></li></ol></nav><h1 id="header"><a class="header-anchor" href="#header" aria-hidden="true">§</a> header</h1>
+<h2 id="header-2"><a class="header-anchor" href="#header-2" aria-hidden="true">§</a> header</h2>
+<h2 id="header-2-2"><a class="header-anchor" href="#header-2-2" aria-hidden="true">§</a> header 2</h2>
+`);
+});
+
 test("all options should work as expected", () => {
 	expect( umd.render("@[[TOC]]\n\n# 日本語") ).toBe('<nav class="user-content-toc"><ul><li><a href="#日本語"><span> 日本語</span></a></li></ul></nav><h1 id="日本語"><a class="header-anchor" href="#日本語" aria-hidden="true">§</a> 日本語</h1>\n');
 });
diff --git a/demo.html b/demo.html
@@ -19,7 +19,7 @@
 
 	</head>
 	<body>
-		<script src="lib/markdown-it.js"></script>
+		<script src="https://unpkg.com/markdown-it@8.4.1/dist/markdown-it.min.js"></script>
 		<script src="lib/markdown-it-anchor.js"></script>
 		<script src="lib/uslug.js"></script>
 		<script src="dist/markdown-it-toc-made-right.min.js"></script>

diff --git a/dist/markdown-it-toc-made-right.js b/dist/markdown-it-toc-made-right.js
@@ -1,4 +1,4 @@
-/*! markdown-it-toc-done-right 2.0.0 https://github.com//nagaozen/markdown-it-toc-done-right @license MIT */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.markdownitTocDoneRight = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+/*! markdown-it-toc-done-right 2.0.2 https://github.com//nagaozen/markdown-it-toc-done-right @license MIT */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.markdownitTocDoneRight = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 "use strict";
 
 function slugify(x) {
@@ -28,7 +28,7 @@ module.exports = function toc_plugin(md, options) {
 
 	var final_state = void 0;
 
-	function toc(state, startLine /*, endLine, silent*/) {
+	function toc(state, startLine, endLine, silent) {
 		var token = void 0;
 		var pos = state.bMarks[startLine] + state.tShift[startLine];
 		var max = state.eMarks[startLine];
@@ -41,21 +41,21 @@ module.exports = function toc_plugin(md, options) {
 			if (state.src.charCodeAt(pos + i) !== options.placeholder.charCodeAt(i) || pos >= max) return false;
 		}
 
-		/*if(silent) return true;*/
+		if (!silent) {
+			state.line = startLine + 1;
 
-		state.line = startLine + 1;
+			token = state.push("toc_open", "nav", 1);
+			token.markup = options.placeholder;
+			token.map = [startLine, state.line];
 
-		token = state.push("toc_open", "nav", 1);
-		token.markup = options.placeholder;
-		token.map = [startLine, state.line];
+			token = state.push("toc_body", "", 0);
+			token.markup = options.placeholder;
+			token.map = [startLine, state.line];
+			token.children = [];
 
-		token = state.push("toc_body", "", 0);
-		token.markup = options.placeholder;
-		token.map = [startLine, state.line];
-		token.children = [];
-
-		token = state.push("toc_close", "nav", -1);
-		token.markup = options.placeholder;
+			token = state.push("toc_close", "nav", -1);
+			token.markup = options.placeholder;
+		}
 
 		return true;
 	}
@@ -75,9 +75,12 @@ module.exports = function toc_plugin(md, options) {
 	function ast_html(tree, uniques) {
 		uniques = uniques || {};
 		function unique(s) {
-			if (uniques.hasOwnProperty(s)) return s + "-" + ++uniques[s];
-			uniques[s] = 1;
-			return s;
+			var u = s;
+			var i = 2;
+			while (uniques.hasOwnProperty(u)) {
+				u = s + "-" + i++;
+			}uniques[u] = true;
+			return u;
 		}
 
 		var keys = Object.keys(tree.c);

diff --git a/dist/markdown-it-toc-made-right.min.js b/dist/markdown-it-toc-made-right.min.js
diff --git a/index.js b/index.js
@@ -44,7 +44,7 @@ module.exports = function toc_plugin(md, options) {
 			if (state.src.charCodeAt(pos + i) !== options.placeholder.charCodeAt(i) || pos >= max) return false;
 		}
 
-		/*if(silent) return true;*/
+//		if(silent) return true;
 
 		state.line = startLine + 1;
 
@@ -78,9 +78,11 @@ module.exports = function toc_plugin(md, options) {
 	function ast_html(tree, uniques) {
 		uniques = uniques || {};
 		function unique(s) {
-			if( uniques.hasOwnProperty(s) ) return `${s}-${++uniques[s]}`;
-			uniques[s] = 1;
-			return s;
+			let u = s;
+			let i = 2;
+			while (uniques.hasOwnProperty(u)) u = `${s}-${i++}`;
+			uniques[u] = true;
+			return u;
 		}
 
 		const keys = Object.keys(tree.c);