@shelf/table-of-contents 1.3.1 → 1.3.2

package/lib/helpers/anchor.js

@@ -1,10 +1,10 @@
-import { decode } from 'entities';
+import { decodeHTML } from 'entities';
 import slug from 'slug';
 import { untag } from './untag.js';
 export function anchor(s) {
     s = untag(s);
     s = s.toLowerCase();
-    s = decode(s);
+    s = decodeHTML(s);
     s = s.replace(/['"!]|[\\.]+$/g, '');
     s = slug(s);
     s = s.replace(/[:\\(\\)]+/gi, '-');

package/lib/helpers/anchorize.js

@@ -1,12 +1,15 @@
-import { template } from 'lodash-es';
+import { escape as escapeHtml, template } from 'lodash-es';
+import { decodeHTML } from 'entities';
 import { getSettings } from '../default-settings.js';
 import { untag } from './untag.js';
 import { unique } from './unique.js';
 import { anchor } from './anchor.js';
-import { decode } from 'entities';
-function normalizeHeaderText(text) {
-    // Decode HTML entities, convert NBSP to regular spaces, collapse inner whitespace, and trim.
-    return decode(text).replace(/\u00a0/g, ' ').replace(/\s+/g, ' ').trim();
+function normalizeAnchorText(text) {
+    // Convert NBSP to regular spaces, collapse inner whitespace for anchor stability, and trim.
+    return text
+        .replace(/\u00a0/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim();
 }
 // Parse HTML, returning an array of header objects and anchorized HTML.
 export function anchorize(src, settingsOverride) {
@@ -24,9 +27,11 @@ export function anchorize(src, settingsOverride) {
         // @ts-ignore
         const anchorLevel = level >= settingsOverride.anchorMin && level <= settingsOverride.anchorMax;
         const untaggedHeader = untag(header);
-        const decodedHeader = decode(untaggedHeader).replace(/\u00a0/g, ' ');
-        const normalizedText = normalizeHeaderText(untaggedHeader);
-        const anchorSource = normalizedText || decodedHeader.trim() || untaggedHeader || 'section';
+        const decodedHeader = decodeHTML(untaggedHeader);
+        const normalizedHeader = decodedHeader.replace(/\u00a0/g, ' ');
+        const displayText = escapeHtml(normalizedHeader);
+        const normalizedText = normalizeAnchorText(normalizedHeader);
+        const anchorSource = normalizedText || normalizedHeader.trim();
         let data;
         if (tocLevel || anchorLevel) {
             // This data is passed into the specified "header" template function.
@@ -38,7 +43,7 @@ export function anchorize(src, settingsOverride) {
                 // Header HTML contents.
                 header: header,
                 // Un-tagged header HTML contents.
-                text: normalizedText,
+                text: displayText,
                 // Unique anchor name for this header.
                 anchor: unique(names, anchor(anchorSource)),
                 // All HTML (including tags) matched by the "headers" RegExp.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shelf/table-of-contents",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Fork of node-toc to reduce bundle size & rewritten in TypeScript",
   "license": "MIT",
   "author": {