refactor: update extension options

BREAKING CHANGE: merged 2 render chapter functions to 1

src/index.ts

@@ -12,7 +12,7 @@ import { numberingHeadingFactory } from './numberingHeadingFactory';
 export default function markedTableOfContentsExtension(
 	options?: MarkedTableOfContentsExtensionOptions,
 ) {
-	const { className, renderChapterNumberHeading, renderChapterNumberTOC } = options || {};
+	const { className, renderChapterNumber } = options || {};
 
   let headings: Array<{ text: string; depth: number }> | null = null;
   let fixHeadingDepth: ((heading: Heading) => void) | null = null;
@@ -34,10 +34,7 @@ export default function markedTableOfContentsExtension(
         fixHeadingDepth = fixHeadingDepthFactory();
       }
       if (!numberingHeading) {
-        numberingHeading = numberingHeadingFactory(
-          renderChapterNumberTOC,
-          renderChapterNumberHeading,
-        );
+        numberingHeading = numberingHeadingFactory(renderChapterNumber);
       }
       fixHeadingDepth(token);
       numberingHeading(token);

src/numberingHeadingFactory.test.ts

@@ -52,8 +52,7 @@ describe('numberingHeadingFactory', () => {
       const headings = createHeadings(receivedDepths);
 
       numberingHeading = numberingHeadingFactory(
-        (numbers: Array<number>) => numbers.join("-"),
-        (numbers: Array<number>) => numbers.join("|"),
+        (numbers: Array<number>, kind) => numbers.join(kind === 'toc' ? '-' : '|'),
       );
 
       headings.forEach((heading) => numberingHeading(heading));

src/numberingHeadingFactory.ts

@@ -6,10 +6,7 @@ import { Heading, HeadingWithChapterNumber, RenderChapterNumberFn } from './type
  * it makes no sense to numbering these headings.
  */
 
-export function numberingHeadingFactory(
-  renderChapterNumberTOC?: RenderChapterNumberFn,
-  renderChapterNumberHeading?: RenderChapterNumberFn,
-) {
+export function numberingHeadingFactory(renderChapterNumber?: RenderChapterNumberFn) {
   const chapterNumbers: Array<number> = [];
   let prevDepth = 0;
 
@@ -46,13 +43,13 @@ export function numberingHeadingFactory(
 
     // append chapter number to token
     (heading as unknown as HeadingWithChapterNumber).chapterNumberTOC =
-      renderChapterNumberTOC
-        ? renderChapterNumberTOC([...chapterNumbers])
+      renderChapterNumber
+        ? renderChapterNumber([...chapterNumbers], 'toc')
         : getChapterNumber();
 
     (heading as unknown as HeadingWithChapterNumber).chapterNumberHeading =
-      renderChapterNumberHeading
-        ? renderChapterNumberHeading([...chapterNumbers])
+      renderChapterNumber
+        ? renderChapterNumber([...chapterNumbers], 'heading')
         : getChapterNumber();
   };
 }

src/test/toc-with-options.test.ts

@@ -8,8 +8,7 @@ import markedToc from '..';
 
 marked.use(markedToc({
   className: 'toc',
-  renderChapterNumberTOC: (numbers) => numbers.join("--"),
-  renderChapterNumberHeading: (numbers) => numbers.join("++"),
+  renderChapterNumber: (numbers, kind) => numbers.join(kind === 'toc' ? '--' : '++'),
 }));
 
 function removeLeadingSpaces(html: string) {

src/types.ts

@@ -10,10 +10,9 @@ export type HeadingWithChapterNumber = Heading & {
 
 export type Headings = Array<Heading>;
 
-export type RenderChapterNumberFn = (numbers: Array<number>) => string;
+export type RenderChapterNumberFn = (numbers: Array<number>, kind: 'toc' | 'heading') => string;
 
 export type MarkedTableOfContentsExtensionOptions = {
   className?: string;
-	renderChapterNumberTOC?: RenderChapterNumberFn;
-  renderChapterNumberHeading?: RenderChapterNumberFn;
+	renderChapterNumber?: RenderChapterNumberFn;
 };