@adobe/helix-md2docx 2.2.3 → 2.2.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.2.5](https://github.com/adobe/helix-md2docx/compare/v2.2.4...v2.2.5) (2025-03-16)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([#569](https://github.com/adobe/helix-md2docx/issues/569)) ([b463df6](https://github.com/adobe/helix-md2docx/commit/b463df634714e2a76daa8210ddcbc42602408050))
+
+## [2.2.4](https://github.com/adobe/helix-md2docx/compare/v2.2.3...v2.2.4) (2025-03-11)
+
+
+### Bug Fixes
+
+* add workaround for fragment issue ([#568](https://github.com/adobe/helix-md2docx/issues/568)) ([4e14e89](https://github.com/adobe/helix-md2docx/commit/4e14e89cfaff20aa0b1db04e7908500c0f0d6ca6)), closes [#567](https://github.com/adobe/helix-md2docx/issues/567)
+
 ## [2.2.3](https://github.com/adobe/helix-md2docx/compare/v2.2.2...v2.2.3) (2025-03-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-md2docx",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "Helix Service that converts markdown to word documents",
   "main": "src/index.js",
   "type": "module",
@@ -29,10 +29,10 @@
   "homepage": "https://github.com/adobe/helix-md2docx#readme",
   "dependencies": {
     "@adobe/fetch": "4.2.0",
-    "@adobe/helix-docx2md": "1.6.24",
+    "@adobe/helix-docx2md": "1.6.25",
     "@adobe/helix-markdown-support": "7.1.12",
     "@adobe/helix-shared-process-queue": "3.1.2",
-    "@adobe/remark-gridtables": "3.0.11",
+    "@adobe/remark-gridtables": "3.0.12",
     "docx": "9.2.0",
     "github-slugger": "2.0.0",
     "hast-util-is-element": "3.0.0",

package/src/mdast2docx/handlers/heading.js

@@ -9,9 +9,10 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { Bookmark, HeadingLevel, Paragraph } from 'docx';
+import { Bookmark, HeadingLevel } from 'docx';
 
 import all from '../all.js';
+import { MyParagraph } from './paragraph.js';
 
 const DEPTHS = [
   HeadingLevel.HEADING_1,
@@ -31,7 +32,7 @@ export default async function heading(ctx, node, parent) {
       children: [],
     }));
   }
-  return new Paragraph({
+  return new MyParagraph({
     heading: DEPTHS[node.depth - 1],
     children,
     alignment: parent.alignment,

package/src/mdast2docx/handlers/paragraph.js

@@ -9,8 +9,49 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-import { Paragraph } from 'docx';
+import {
+  ConcreteHyperlink, ExternalHyperlink, Paragraph, uniqueId,
+} from 'docx';
 import all from '../all.js';
+import { findXMLComponent } from '../utils.js';
+
+/**
+ * Custom paragraph that overwrites `prepForXml` and handles the special case for external links
+ * with fragments the same way as word does: it creates a relationship w/o the fragment and adds
+ * the fragment as `w:anchor` property to the hyperlink.
+ *
+ * @see https://github.com/dolanmiu/docx/issues/2986
+ */
+export class MyParagraph extends Paragraph {
+  prepForXml(context) {
+    for (const element of this.root) {
+      if (element instanceof ExternalHyperlink) {
+        let { link } = element.options;
+        let anchor;
+        const idx = link.indexOf('#');
+        if (idx > 0) {
+          anchor = link.substring(idx + 1);
+          link = link.substring(0, idx);
+        }
+        const index = this.root.indexOf(element);
+        // eslint-disable-next-line max-len
+        const concreteHyperlink = new ConcreteHyperlink(element.options.children, uniqueId());
+        context.viewWrapper.Relationships.createRelationship(
+          concreteHyperlink.linkId,
+          'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink',
+          link,
+          'External',
+        );
+        if (anchor) {
+          const attrs = findXMLComponent(concreteHyperlink, '_attr');
+          attrs.root.anchor = anchor;
+        }
+        this.root[index] = concreteHyperlink;
+      }
+    }
+    return super.prepForXml(context);
+  }
+}
 
 export default async function paragraph(ctx, node, parent) {
   // clear style
@@ -47,5 +88,5 @@ export default async function paragraph(ctx, node, parent) {
   } else if (ctx.paragraphStyle) {
     opts.style = ctx.paragraphStyle;
   }
-  return new Paragraph(opts);
+  return new MyParagraph(opts);
 }

package/src/mdast2docx/handlers/tableCell.js

@@ -14,6 +14,7 @@ import {
 } from 'docx';
 import all from '../all.js';
 import { removeUndefined } from '../utils.js';
+import { MyParagraph } from './paragraph.js';
 
 const ALIGN = {
   left: null,
@@ -41,7 +42,7 @@ export default async function tableCell(ctx, node, parent, siblings) {
     const child = children[i];
     if ((child instanceof Paragraph) || (child instanceof Table)) {
       if (leaves.length) {
-        content.push(new Paragraph({ alignment: node.alignment, children: leaves }));
+        content.push(new MyParagraph({ alignment: node.alignment, children: leaves }));
       }
       content.push(child);
       leaves = [];
@@ -50,7 +51,7 @@ export default async function tableCell(ctx, node, parent, siblings) {
     }
   }
   if (leaves.length) {
-    content.push(new Paragraph({ alignment: node.alignment, children: leaves }));
+    content.push(new MyParagraph({ alignment: node.alignment, children: leaves }));
   }
 
   const opts = removeUndefined({