@adobe/helix-docx2md 1.4.16 → 1.4.18

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.4.18](https://github.com/adobe/helix-docx2md/compare/v1.4.17...v1.4.18) (2023-09-29)
+
+
+### Bug Fixes
+
+* fix problems with duplicate bookmarks ([#312](https://github.com/adobe/helix-docx2md/issues/312)) ([37366a0](https://github.com/adobe/helix-docx2md/commit/37366a00643803f715d0721129b4e28ada2b4a45))
+
+## [1.4.17](https://github.com/adobe/helix-docx2md/compare/v1.4.16...v1.4.17) (2023-09-26)
+
+
+### Bug Fixes
+
+* imports ([#308](https://github.com/adobe/helix-docx2md/issues/308)) ([1087b0c](https://github.com/adobe/helix-docx2md/commit/1087b0cd1dc4896f2f9e6e0a52da41d551841ee7))
+
 ## [1.4.16](https://github.com/adobe/helix-docx2md/compare/v1.4.15...v1.4.16) (2023-09-26)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-docx2md",
-  "version": "1.4.16",
+  "version": "1.4.18",
   "description": "Helix library that converts word documents to markdown",
   "type": "module",
   "main": "./src/index.js",
@@ -54,8 +54,8 @@
     "@adobe/eslint-config-helix": "2.0.3",
     "@adobe/helix-admin-support": "2.2.12",
     "@adobe/helix-mediahandler": "2.2.16",
-    "@adobe/helix-onedrive-support": "10.8.0",
-    "@adobe/helix-shared-tokencache": "1.3.8",
+    "@adobe/helix-onedrive-support": "10.8.3",
+    "@adobe/helix-shared-tokencache": "1.3.9",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/src/dast2mdast/dast2mdast.js

@@ -111,9 +111,11 @@ export default async function dast2mdast(tree, opts = {}) {
       bm.id = '';
     } else if (bm.target.type === 'heading') {
       // if heading, create an ID from its text
-      const text = toString(bm.target).trim();
-      bm.id = slugger.slug(text || 'heading');
-      bm.target.id = bm.id;
+      if (!bm.target.id) {
+        const text = toString(bm.target).trim();
+        bm.target.id = slugger.slug(text || 'heading');
+      }
+      bm.id = bm.target.id;
     } else if (bm.links.length) {
       // create an anchor node for non-heading bookmarks
       bm.id = slugger.slug('bookmark');

package/src/dast2mdast/handlers/bookmark.js

@@ -18,7 +18,13 @@
  */
 export default function bookmark(h, node) {
   const bm = h.getBookmark(node.name);
+  if (bm.target) {
+    // eslint-disable-next-line no-console
+    console.warn(`bookmark ${node.name} is already defined`);
+    return null;
+  }
   bm.target = h('bookmark', node.name);
-  bm.target.bookmark = bm;
+  // do not enumerate, so that it doesn't trip inspect
+  Object.defineProperty(bm.target, 'bookmark', { enumerable: false, value: bm });
   return bm.target;
 }

package/src/dast2mdast/handlers/paragraph.js

@@ -270,12 +270,15 @@ export default function paragraph(h, node, parent, siblings) {
       return h('thematicBreak');
     }
     const heading = h('heading', { depth }, nodes);
-    // check if any of the children is a bookmark
-    const idx = nodes.findIndex((n) => n.type === 'bookmark');
-    if (idx >= 0) {
-      // replace the bookmark node  with this heading and remove the child
-      nodes[idx].bookmark.target = heading;
-      nodes.splice(idx, 1);
+    // check bookmark children (could have multiple)
+    for (let idx = 0; idx < nodes.length; idx += 1) {
+      const child = nodes[idx];
+      if (child.type === 'bookmark') {
+        // set the bookmark target to this heading and remove the child
+        child.bookmark.target = heading;
+        nodes.splice(idx, 1);
+        idx -= 1;
+      }
     }
     return heading;
   }

package/src/mdast2md/mdast2md.js

@@ -15,8 +15,7 @@ import stringify from 'remark-stringify';
 import { unified } from 'unified';
 import gfm from 'remark-gfm';
 
-// eslint-disable-next-line no-unused-vars,import/no-extraneous-dependencies
-import { inspect } from 'unist-util-inspect';
+// import { inspect } from 'unist-util-inspect';
 import {
   robustTables,
   suppressSpaceCode,