Merge pull request #17 from technote-space/release/next-v2.2.0

release: v2.2.1

Author: technote-space

__tests__/transform-html-mode.test.ts

@@ -15,6 +15,8 @@ describe('transform', () => {
         '<a href="#installation">Installation</a>',
         '<span>|</span>',
         '<a href="#api">API</a>',
+        '<span>|</span>',
+        '<a href="#license">^License</a>',
         '</p>',
         ''],
     );
@@ -37,6 +39,8 @@ describe('transform', () => {
         '<li><a href="#installation" target="_blank">Installation</a></li>',
         '',
         '<li><a href="#api" target="_blank">API</a></li>',
+        '',
+        '<li><a href="#license" target="_blank">^License</a></li>',
         '</ul>',
         ''],
     );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/doctoc",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Generates TOC for markdown files of local git repo.",
   "keywords": [
     "github",

src/lib/get-html-headers.ts

@@ -27,7 +27,7 @@ const addLinenos = (lines: Array<string>, headers: Array<HeaderData>): Array<Omi
   });
 };
 
-const rankify = (headers: Array<Omit<Header, 'rank'> & HeaderData>, max): Array<Header> => headers.map(header => ({
+const rankify = (headers: Array<Omit<Header, 'rank'> & HeaderData>, max: number): Array<Header> => headers.map(header => ({
   ...header,
   // eslint-disable-next-line no-magic-numbers
   rank: parseInt(header.tag.slice(1), 10),

src/lib/transform.ts

@@ -126,9 +126,9 @@ const getHeaderItem = (header: HeaderWithAnchor, indentation: string, lowestRank
   return `${indentation.repeat(header.rank - lowestRank)}${entryPrefix} ${header.anchor}`;
 };
 
-const getHtmlHeaderContents = (headers: Array<HeaderWithAnchor>, htmlTemplate: string | undefined, itemTemplate: string | undefined, separator: string | undefined): string => replaceVariables(htmlTemplate ?? DEFAULT_HTML_TEMPLATE, [{
+const getHtmlHeaderContents = (headers: Array<HeaderWithAnchor>, lowestRank: number, htmlTemplate: string | undefined, itemTemplate: string | undefined, separator: string | undefined): string => replaceVariables(htmlTemplate ?? DEFAULT_HTML_TEMPLATE, [{
   key: 'ITEMS',
-  replace: `\n${headers.map(header => getHeaderItemHtml(header, itemTemplate)).join(`\n${separator ?? DEFAULT_SEPARATOR}\n`)}\n`,
+  replace: `\n${headers.filter(header => header.rank === lowestRank).map(header => getHeaderItemHtml(header, itemTemplate)).join(`\n${separator ?? DEFAULT_SEPARATOR}\n`)}\n`,
 }]);
 
 const getHeaderItemHtml = (header: HeaderWithAnchor, itemTemplate: string | undefined): string => {
@@ -165,7 +165,7 @@ export const transform = (
 
   // only limit *HTML* headings by default
   // eslint-disable-next-line no-magic-numbers
-  const maxHeaderLevelHtml = isHtml ? 1 : (maxHeaderLevel || 4);
+  const maxHeaderLevelHtml = maxHeaderLevel || 4;
   const lines              = content.split('\n');
   const info: SectionInfo  = updateSection.parse(lines, matchesStart(checkOpeningComments), matchesEnd(checkClosingComments));
 
@@ -197,7 +197,7 @@ export const transform = (
   const toc         =
           inferredTitle +
           titleSeparator +
-          (isHtml ? getHtmlHeaderContents(linkedHeaders, htmlTemplate, itemTemplate, separator) : getHeaderContents(linkedHeaders, indentation, lowestRank, _entryPrefix)) +
+          (isHtml ? getHtmlHeaderContents(linkedHeaders, lowestRank, htmlTemplate, itemTemplate, separator) : getHeaderContents(linkedHeaders, indentation, lowestRank, _entryPrefix)) +
           '\n';
   const wrappedToc  = (openingComment ?? OPENING_COMMENT) + '\n' + wrapToc(toc, inferredTitle, isFolding) + '\n' + (closingComment ?? CLOSING_COMMENT);
   if (currentToc === wrappedToc) {