@illusions-lab/mdi-to-docx 2.0.9 → 2.0.11

package/dist/index.cjs

@@ -51,17 +51,60 @@ async function mdiToDocx(tree, profile) {
         document: {
           run: {
             font: options.typesetting.fontFamily,
-            size: fontSizeHalfPoints
+            size: fontSizeHalfPoints,
+            color: "000000"
           },
-          paragraph: { spacing: { line: lineTwips } }
+          paragraph: { spacing: { line: lineTwips, after: 120 } }
         },
-        heading1: { run: headingRun(options) },
-        heading2: { run: headingRun(options) },
-        heading3: { run: headingRun(options) },
-        heading4: { run: headingRun(options) },
-        heading5: { run: headingRun(options) },
-        heading6: { run: headingRun(options) }
-      }
+        heading1: headingStyle(options, 1),
+        heading2: headingStyle(options, 2),
+        heading3: headingStyle(options, 3),
+        heading4: headingStyle(options, 4),
+        heading5: headingStyle(options, 5),
+        heading6: headingStyle(options, 6),
+        listParagraph: {
+          run: { font: options.typesetting.fontFamily, color: "000000" }
+        }
+      },
+      paragraphStyles: [
+        customHeadingStyle(options, 7),
+        customHeadingStyle(options, 8),
+        customHeadingStyle(options, 9),
+        {
+          id: "MdiQuote",
+          name: "MDI Quote",
+          basedOn: "Normal",
+          run: { font: options.typesetting.fontFamily, color: "000000", italics: true },
+          paragraph: {
+            indent: { left: 720, right: 360 },
+            spacing: { before: 120, after: 120, line: lineTwips }
+          }
+        },
+        {
+          id: "MdiList",
+          name: "MDI List",
+          basedOn: "ListParagraph",
+          run: { font: options.typesetting.fontFamily, color: "000000" },
+          paragraph: { spacing: { after: 60, line: lineTwips } }
+        },
+        {
+          id: "MdiCode",
+          name: "MDI Code Block",
+          basedOn: "Normal",
+          run: { font: "Courier New", color: "000000" },
+          paragraph: {
+            indent: { left: 360, right: 360 },
+            spacing: { before: 120, after: 120, line: lineTwips }
+          }
+        },
+        {
+          id: "MdiThematicBreak",
+          name: "MDI Thematic Break",
+          basedOn: "Normal",
+          run: { font: options.typesetting.fontFamily, color: "000000" },
+          paragraph: { spacing: { before: 120, after: 180 } }
+        }
+      ]
     },
     sections: [
       {
@@ -87,8 +130,34 @@ async function mdiToDocx(tree, profile) {
   });
   return import_docx.Packer.toBuffer(document);
 }
-function headingRun(options) {
-  return { font: options.typesetting.fontFamily, color: "000000" };
+function headingStyle(options, level) {
+  const scale = [1.8, 1.55, 1.35, 1.2, 1.1, 1][level - 1] ?? 1;
+  const before = [360, 300, 240, 180, 150, 120][level - 1] ?? 120;
+  return {
+    run: {
+      font: options.typesetting.fontFamily,
+      color: "000000",
+      bold: true,
+      size: Math.round(22 * scale)
+    },
+    paragraph: {
+      spacing: { before, after: 120 },
+      keepNext: true,
+      keepLines: true,
+      outlineLevel: level - 1
+    }
+  };
+}
+function customHeadingStyle(options, level) {
+  const style = headingStyle(options, level);
+  return {
+    id: `Heading${level}`,
+    name: `Heading ${level}`,
+    basedOn: "Normal",
+    next: "Normal",
+    quickFormat: true,
+    ...style
+  };
 }
 function pageNumberSection(options, size) {
   const page = options.pagination.pageNumbers;
@@ -127,17 +196,73 @@ function block(node, options) {
     return node.children.flatMap(
       (item) => item.children.filter((n) => n.type === "paragraph").map(
         (n) => new import_docx.Paragraph({
+          style: "MdiList",
           children: inline(n.children),
           bullet: { level: 0 }
         })
       )
     );
+  if (node.type === "blockquote")
+    return node.children.flatMap(
+      (child) => child.type === "paragraph" ? [paragraph(child.children, options, "MdiQuote")] : block(child, options)
+    );
+  if (node.type === "code")
+    return [
+      new import_docx.Paragraph({
+        style: "MdiCode",
+        children: node.value.split("\n").map(
+          (line, index) => new import_docx.TextRun({
+            text: line,
+            break: index === 0 ? void 0 : 1,
+            font: "Courier New"
+          })
+        )
+      })
+    ];
+  if (node.type === "thematicBreak")
+    return [
+      new import_docx.Paragraph({
+        style: "MdiThematicBreak",
+        alignment: import_docx.AlignmentType.CENTER,
+        children: [new import_docx.TextRun("\u2014 \u2014 \u2014")]
+      })
+    ];
+  if (node.type === "table") return [tableBlock(node, options)];
   if (node.type === "mdiPagebreak")
     return [new import_docx.Paragraph({ children: [new import_docx.PageBreak()] })];
   if (node.type === "mdiBlank") return [new import_docx.Paragraph("")];
   return [];
 }
-function paragraph(nodes, options) {
+function tableBlock(node, options) {
+  const columns = Math.max(1, ...node.children.map((row) => row.children.length));
+  const dimensions = import_mdi_export_profile.PAGE_DIMENSIONS[options.pagination.pageSize];
+  const pageWidth = options.pagination.landscape ? dimensions.height : dimensions.width;
+  const usableWidth = mmToTwips(
+    pageWidth - options.pagination.margins.left - options.pagination.margins.right
+  );
+  const columnWidth = Math.floor(usableWidth / columns);
+  return new import_docx.Table({
+    width: { size: usableWidth, type: import_docx.WidthType.DXA },
+    columnWidths: Array.from({ length: columns }, () => columnWidth),
+    layout: import_docx.TableLayoutType.FIXED,
+    margins: { top: 80, bottom: 80, left: 100, right: 100 },
+    rows: node.children.map(
+      (row, rowIndex) => new import_docx.TableRow({
+        children: row.children.map(
+          (cell) => new import_docx.TableCell({
+            width: { size: columnWidth, type: import_docx.WidthType.DXA },
+            children: [
+              new import_docx.Paragraph({
+                children: rowIndex === 0 ? [new import_docx.TextRun({ bold: true, children: inline(cell.children) })] : inline(cell.children)
+              })
+            ]
+          })
+        )
+      })
+    )
+  });
+}
+function paragraph(nodes, options, style) {
   const fontSizeMm = (() => {
     const dimensions = import_mdi_export_profile.PAGE_DIMENSIONS[options.pagination.pageSize];
     const primary = options.typesetting.writingMode === "vertical" ? (options.pagination.landscape ? dimensions.width : dimensions.height) - options.pagination.margins.top - options.pagination.margins.bottom : (options.pagination.landscape ? dimensions.height : dimensions.width) - options.pagination.margins.left - options.pagination.margins.right;
@@ -145,10 +270,13 @@ function paragraph(nodes, options) {
   })();
   const prefix = options.typesetting.fullwidthSpaceIndent ? [new import_docx.TextRun("\u3000".repeat(Math.round(options.typesetting.textIndentEm)))] : [];
   return new import_docx.Paragraph({
+    style,
     indent: options.typesetting.fullwidthSpaceIndent ? void 0 : {
-      firstLine: Math.round(
-        options.typesetting.textIndentEm * fontSizeMm / 25.4 * 1440
-      )
+      ...style ? {} : {
+        firstLine: Math.round(
+          options.typesetting.textIndentEm * fontSizeMm / 25.4 * 1440
+        )
+      }
     },
     children: [...prefix, ...inline(nodes)]
   });
@@ -164,6 +292,12 @@ function inline(nodes) {
       return [new import_docx.TextRun({ bold: true, children: inline(node.children) })];
     if (node.type === "delete")
       return [new import_docx.TextRun({ strike: true, children: inline(node.children) })];
+    if (node.type === "inlineCode")
+      return [new import_docx.TextRun({ text: node.value, font: "Courier New" })];
+    if (node.type === "image")
+      return [new import_docx.TextRun({ text: node.alt ? `[Image: ${node.alt}]` : "[Image]" })];
+    if (node.type === "footnoteReference")
+      return [new import_docx.TextRun({ text: `[${node.label ?? node.identifier}]`, superScript: true })];
     if (node.type === "mdiRuby") return [rawRun(rubyXml(node.base, node.ruby))];
     if (node.type === "mdiTcy")
       return [
@@ -189,7 +323,12 @@ function rubyXml(base, reading) {
   )}</w:t></w:r></w:rubyBase></w:ruby>`;
 }
 function rawRun(xmlString) {
-  return import_docx.ImportedXmlComponent.fromXmlString(xmlString);
+  const namespaced = xmlString.replace(
+    /^<w:([\w-]+)/,
+    '<w:$1 xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"'
+  );
+  const imported = import_docx.ImportedXmlComponent.fromXmlString(namespaced);
+  return imported.root[0];
 }
 function xml(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;");

package/dist/index.js

@@ -11,7 +11,12 @@ import {
   PageNumber,
   PageTextDirectionType,
   Paragraph,
-  TextRun
+  Table as DocxTable,
+  TableCell,
+  TableLayoutType,
+  TableRow,
+  TextRun,
+  WidthType
 } from "docx";
 import {
   PAGE_DIMENSIONS,
@@ -42,17 +47,60 @@ async function mdiToDocx(tree, profile) {
         document: {
           run: {
             font: options.typesetting.fontFamily,
-            size: fontSizeHalfPoints
+            size: fontSizeHalfPoints,
+            color: "000000"
           },
-          paragraph: { spacing: { line: lineTwips } }
+          paragraph: { spacing: { line: lineTwips, after: 120 } }
         },
-        heading1: { run: headingRun(options) },
-        heading2: { run: headingRun(options) },
-        heading3: { run: headingRun(options) },
-        heading4: { run: headingRun(options) },
-        heading5: { run: headingRun(options) },
-        heading6: { run: headingRun(options) }
-      }
+        heading1: headingStyle(options, 1),
+        heading2: headingStyle(options, 2),
+        heading3: headingStyle(options, 3),
+        heading4: headingStyle(options, 4),
+        heading5: headingStyle(options, 5),
+        heading6: headingStyle(options, 6),
+        listParagraph: {
+          run: { font: options.typesetting.fontFamily, color: "000000" }
+        }
+      },
+      paragraphStyles: [
+        customHeadingStyle(options, 7),
+        customHeadingStyle(options, 8),
+        customHeadingStyle(options, 9),
+        {
+          id: "MdiQuote",
+          name: "MDI Quote",
+          basedOn: "Normal",
+          run: { font: options.typesetting.fontFamily, color: "000000", italics: true },
+          paragraph: {
+            indent: { left: 720, right: 360 },
+            spacing: { before: 120, after: 120, line: lineTwips }
+          }
+        },
+        {
+          id: "MdiList",
+          name: "MDI List",
+          basedOn: "ListParagraph",
+          run: { font: options.typesetting.fontFamily, color: "000000" },
+          paragraph: { spacing: { after: 60, line: lineTwips } }
+        },
+        {
+          id: "MdiCode",
+          name: "MDI Code Block",
+          basedOn: "Normal",
+          run: { font: "Courier New", color: "000000" },
+          paragraph: {
+            indent: { left: 360, right: 360 },
+            spacing: { before: 120, after: 120, line: lineTwips }
+          }
+        },
+        {
+          id: "MdiThematicBreak",
+          name: "MDI Thematic Break",
+          basedOn: "Normal",
+          run: { font: options.typesetting.fontFamily, color: "000000" },
+          paragraph: { spacing: { before: 120, after: 180 } }
+        }
+      ]
     },
     sections: [
       {
@@ -78,8 +126,34 @@ async function mdiToDocx(tree, profile) {
   });
   return Packer.toBuffer(document);
 }
-function headingRun(options) {
-  return { font: options.typesetting.fontFamily, color: "000000" };
+function headingStyle(options, level) {
+  const scale = [1.8, 1.55, 1.35, 1.2, 1.1, 1][level - 1] ?? 1;
+  const before = [360, 300, 240, 180, 150, 120][level - 1] ?? 120;
+  return {
+    run: {
+      font: options.typesetting.fontFamily,
+      color: "000000",
+      bold: true,
+      size: Math.round(22 * scale)
+    },
+    paragraph: {
+      spacing: { before, after: 120 },
+      keepNext: true,
+      keepLines: true,
+      outlineLevel: level - 1
+    }
+  };
+}
+function customHeadingStyle(options, level) {
+  const style = headingStyle(options, level);
+  return {
+    id: `Heading${level}`,
+    name: `Heading ${level}`,
+    basedOn: "Normal",
+    next: "Normal",
+    quickFormat: true,
+    ...style
+  };
 }
 function pageNumberSection(options, size) {
   const page = options.pagination.pageNumbers;
@@ -118,17 +192,73 @@ function block(node, options) {
     return node.children.flatMap(
       (item) => item.children.filter((n) => n.type === "paragraph").map(
         (n) => new Paragraph({
+          style: "MdiList",
           children: inline(n.children),
           bullet: { level: 0 }
         })
       )
     );
+  if (node.type === "blockquote")
+    return node.children.flatMap(
+      (child) => child.type === "paragraph" ? [paragraph(child.children, options, "MdiQuote")] : block(child, options)
+    );
+  if (node.type === "code")
+    return [
+      new Paragraph({
+        style: "MdiCode",
+        children: node.value.split("\n").map(
+          (line, index) => new TextRun({
+            text: line,
+            break: index === 0 ? void 0 : 1,
+            font: "Courier New"
+          })
+        )
+      })
+    ];
+  if (node.type === "thematicBreak")
+    return [
+      new Paragraph({
+        style: "MdiThematicBreak",
+        alignment: AlignmentType.CENTER,
+        children: [new TextRun("\u2014 \u2014 \u2014")]
+      })
+    ];
+  if (node.type === "table") return [tableBlock(node, options)];
   if (node.type === "mdiPagebreak")
     return [new Paragraph({ children: [new PageBreak()] })];
   if (node.type === "mdiBlank") return [new Paragraph("")];
   return [];
 }
-function paragraph(nodes, options) {
+function tableBlock(node, options) {
+  const columns = Math.max(1, ...node.children.map((row) => row.children.length));
+  const dimensions = PAGE_DIMENSIONS[options.pagination.pageSize];
+  const pageWidth = options.pagination.landscape ? dimensions.height : dimensions.width;
+  const usableWidth = mmToTwips(
+    pageWidth - options.pagination.margins.left - options.pagination.margins.right
+  );
+  const columnWidth = Math.floor(usableWidth / columns);
+  return new DocxTable({
+    width: { size: usableWidth, type: WidthType.DXA },
+    columnWidths: Array.from({ length: columns }, () => columnWidth),
+    layout: TableLayoutType.FIXED,
+    margins: { top: 80, bottom: 80, left: 100, right: 100 },
+    rows: node.children.map(
+      (row, rowIndex) => new TableRow({
+        children: row.children.map(
+          (cell) => new TableCell({
+            width: { size: columnWidth, type: WidthType.DXA },
+            children: [
+              new Paragraph({
+                children: rowIndex === 0 ? [new TextRun({ bold: true, children: inline(cell.children) })] : inline(cell.children)
+              })
+            ]
+          })
+        )
+      })
+    )
+  });
+}
+function paragraph(nodes, options, style) {
   const fontSizeMm = (() => {
     const dimensions = PAGE_DIMENSIONS[options.pagination.pageSize];
     const primary = options.typesetting.writingMode === "vertical" ? (options.pagination.landscape ? dimensions.width : dimensions.height) - options.pagination.margins.top - options.pagination.margins.bottom : (options.pagination.landscape ? dimensions.height : dimensions.width) - options.pagination.margins.left - options.pagination.margins.right;
@@ -136,10 +266,13 @@ function paragraph(nodes, options) {
   })();
   const prefix = options.typesetting.fullwidthSpaceIndent ? [new TextRun("\u3000".repeat(Math.round(options.typesetting.textIndentEm)))] : [];
   return new Paragraph({
+    style,
     indent: options.typesetting.fullwidthSpaceIndent ? void 0 : {
-      firstLine: Math.round(
-        options.typesetting.textIndentEm * fontSizeMm / 25.4 * 1440
-      )
+      ...style ? {} : {
+        firstLine: Math.round(
+          options.typesetting.textIndentEm * fontSizeMm / 25.4 * 1440
+        )
+      }
     },
     children: [...prefix, ...inline(nodes)]
   });
@@ -155,6 +288,12 @@ function inline(nodes) {
       return [new TextRun({ bold: true, children: inline(node.children) })];
     if (node.type === "delete")
       return [new TextRun({ strike: true, children: inline(node.children) })];
+    if (node.type === "inlineCode")
+      return [new TextRun({ text: node.value, font: "Courier New" })];
+    if (node.type === "image")
+      return [new TextRun({ text: node.alt ? `[Image: ${node.alt}]` : "[Image]" })];
+    if (node.type === "footnoteReference")
+      return [new TextRun({ text: `[${node.label ?? node.identifier}]`, superScript: true })];
     if (node.type === "mdiRuby") return [rawRun(rubyXml(node.base, node.ruby))];
     if (node.type === "mdiTcy")
       return [
@@ -180,7 +319,12 @@ function rubyXml(base, reading) {
   )}</w:t></w:r></w:rubyBase></w:ruby>`;
 }
 function rawRun(xmlString) {
-  return ImportedXmlComponent.fromXmlString(xmlString);
+  const namespaced = xmlString.replace(
+    /^<w:([\w-]+)/,
+    '<w:$1 xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"'
+  );
+  const imported = ImportedXmlComponent.fromXmlString(namespaced);
+  return imported.root[0];
 }
 function xml(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@illusions-lab/mdi-to-docx",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "Render MDI (.mdi) documents to DOCX",
   "license": "MIT",
   "repository": {
@@ -25,8 +25,8 @@
   "dependencies": {
     "docx": "^9.0.0",
     "@types/mdast": "^4.0.0",
-    "@illusions-lab/mdi-export-profile": "2.0.4",
-    "mdast-util-mdi": "2.0.8"
+    "@illusions-lab/mdi-export-profile": "2.0.6",
+    "mdast-util-mdi": "2.0.10"
   },
   "devDependencies": {
     "remark-parse": "^11.0.0",
@@ -36,7 +36,7 @@
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
     "@types/node": "^20.0.0",
-    "@illusions-lab/mdi-remark": "2.0.9"
+    "@illusions-lab/mdi-remark": "2.0.11"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",