@shelf/table-of-contents 1.1.0 → 1.2.0

package/lib/helpers/anchorize.js

@@ -12,6 +12,7 @@ export function anchorize(src, settingsOverride) {
     // Process HTML, "anchorizing" headers as-specified.
     const headers = [];
     const names = {};
+    // @ts-ignore
     const html = src.replace(settingsOverride.headers, function (all, level, attrs, header) {
         level = Number(level);
         // @ts-ignore

package/lib/helpers/getDataWithoutNestedAnchors.d.ts

@@ -1,3 +1,3 @@
-import type { TemplateExecutor } from 'lodash';
+import { type TemplateExecutor } from 'lodash';
 import type { Header } from '../types.js';
 export declare const getDataWithoutNestedAnchors: (data: Header, headerTemplate: TemplateExecutor) => string;

package/lib/helpers/getDataWithoutNestedAnchors.js

@@ -8,29 +8,16 @@ const hasAnchorTagsInHeader = (data) => {
 export const getDataWithoutNestedAnchors = (data, headerTemplate) => {
     const results = headerTemplate(data);
     if (!hasAnchorTagsInHeader(data)) {
-        return headerTemplate(data);
+        return results;
     }
-    const doc = parser.parseFromString(results, 'text/xml');
-    // get Toc pointer anchor node
-    const firstAnchorElement = doc.querySelector(`a[href="#${data.anchor}"]`);
-    const parentNode = firstAnchorElement?.parentElement;
-    // EDGECASE - other anchors in this header
-    const otherAnchorElements = doc?.querySelectorAll(`a:not([href="#${data.anchor}"]):empty`);
-    if (otherAnchorElements && otherAnchorElements?.length > 0) {
-        otherAnchorElements.forEach(node => {
-            node.remove();
-        });
-    }
-    // get all content nodes from Toc pointer anchor node
-    const contentArray = Array.from(firstAnchorElement?.childNodes ?? []);
-    // remove all content nodes from Toc pointer anchor node
-    contentArray.forEach(node => {
-        firstAnchorElement?.removeChild(node);
-    });
-    if (firstAnchorElement) {
-        firstAnchorElement.innerHTML = '<wbr/>';
-    }
-    const newContentArray = [firstAnchorElement, ...contentArray];
-    parentNode?.replaceChildren(...newContentArray);
-    return parentNode?.outerHTML || results;
+    // separately parse the results to get the anchor tag
+    const doc = parser.parseFromString(data.all, 'text/html');
+    const anchor = document.createElement('a');
+    anchor.setAttribute('href', `#${data.anchor}`);
+    anchor.setAttribute('name', `${data.anchor}`);
+    anchor.innerHTML = '<wbr>';
+    const headerNode = doc.querySelector(`h${data.level}`);
+    headerNode?.prepend(anchor);
+    const html = doc.body.innerHTML;
+    return html || results;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shelf/table-of-contents",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Fork of node-toc to reduce bundle size & rewritten in TypeScript",
   "license": "MIT",
   "author": {
@@ -24,6 +24,7 @@
     "lint:size": "size-limit",
     "prepack": "yarn build",
     "test": "TZ=UTC jest src",
+    "test:watch": "TZ=UTC jest src --watch",
     "type-check": "tsc --noEmit",
     "type-check:watch": "npm run type-check -- --watch"
   },
@@ -55,12 +56,12 @@
     "@types/lodash.template": "4.5.3",
     "@types/node": "20.8.9",
     "@types/slug": "5.0.7",
-    "eslint": "8.52.0",
+    "eslint": "8.53.0",
     "husky": "8.0.3",
     "jest": "29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "lint-staged": "15.0.2",
-    "prettier": "3.0.3",
+    "lint-staged": "15.1.0",
+    "prettier": "3.1.0",
     "size-limit": "11.0.0",
     "ts-jest-resolver": "2.0.1",
     "typescript": "5.2.2"