@json-to-office/core-docx 1.5.0 → 1.7.0

package/dist/plugin/example/index.js

@@ -864,6 +864,143 @@ var init_devportal_docx_theme = __esm({
   }
 });
 
+// src/templates/themes/vermilion.docx.theme.json
+var vermilion_docx_theme_default;
+var init_vermilion_docx_theme = __esm({
+  "src/templates/themes/vermilion.docx.theme.json"() {
+    vermilion_docx_theme_default = {
+      name: "vermilion",
+      displayName: "Vermilion Editorial",
+      description: "Poster-red editorial system \u2014 vermilion display headings, ink text, warm creams and hairline rules",
+      version: "1.0.0",
+      colors: {
+        primary: "#282829",
+        secondary: "#58595B",
+        accent: "#EF4130",
+        text: "#282829",
+        background: "#FFFFFF",
+        border: "#E8E2DC",
+        textPrimary: "#282829",
+        textSecondary: "#58595B",
+        textMuted: "#939598",
+        borderPrimary: "#C7C8CA",
+        borderSecondary: "#EFEAE4",
+        backgroundPrimary: "#FFFFFF",
+        backgroundSecondary: "#FAF7F5"
+      },
+      fonts: {
+        heading: {
+          family: "Arial",
+          size: 24
+        },
+        body: {
+          family: "Calibri",
+          size: 10.5
+        },
+        mono: {
+          family: "Consolas",
+          size: 10
+        },
+        light: {
+          family: "Arial",
+          size: 24
+        }
+      },
+      page: {
+        size: "A4",
+        margins: {
+          top: 1360,
+          bottom: 1360,
+          left: 1180,
+          right: 1180,
+          header: 620,
+          footer: 620,
+          gutter: 0
+        }
+      },
+      styles: {
+        normal: {
+          font: "body",
+          color: "textPrimary",
+          lineSpacing: {
+            type: "multiple",
+            value: 1.3
+          },
+          alignment: "left",
+          spacing: {
+            after: 8
+          }
+        },
+        heading1: {
+          font: "heading",
+          size: 25,
+          bold: false,
+          color: "accent",
+          characterSpacing: {
+            type: "expanded",
+            value: 50
+          },
+          spacing: {
+            before: 22,
+            after: 12
+          },
+          keepNext: true,
+          alignment: "left"
+        },
+        heading2: {
+          font: "heading",
+          size: 12.5,
+          bold: true,
+          color: "accent",
+          characterSpacing: {
+            type: "expanded",
+            value: 30
+          },
+          spacing: {
+            before: 16,
+            after: 7
+          },
+          keepNext: true,
+          alignment: "left"
+        },
+        heading3: {
+          font: "body",
+          size: 11,
+          bold: true,
+          color: "textPrimary",
+          spacing: {
+            before: 12,
+            after: 5
+          },
+          keepNext: true,
+          alignment: "left"
+        },
+        title: {
+          font: "heading",
+          size: 38,
+          bold: true,
+          color: "primary",
+          alignment: "left",
+          spacing: {
+            before: 0,
+            after: 14
+          }
+        },
+        subtitle: {
+          font: "body",
+          size: 14,
+          color: "textSecondary",
+          alignment: "left",
+          spacing: {
+            before: 0,
+            after: 10
+          }
+        }
+      }
+    };
+  }
+});
+
 // src/templates/themes/index.ts
 import fs from "fs";
 import path from "path";
@@ -880,7 +1017,8 @@ function loadThemesFromJson() {
     corporate: ensureThemeDefaults(corporate_docx_theme_default),
     modern: ensureThemeDefaults(modern_docx_theme_default),
     apex: ensureThemeDefaults(apex_docx_theme_default),
-    devportal: ensureThemeDefaults(devportal_docx_theme_default)
+    devportal: ensureThemeDefaults(devportal_docx_theme_default),
+    vermilion: ensureThemeDefaults(vermilion_docx_theme_default)
   };
   try {
     const __filename2 = fileURLToPath(import.meta.url);
@@ -928,6 +1066,7 @@ var init_themes = __esm({
     init_modern_docx_theme();
     init_apex_docx_theme();
     init_devportal_docx_theme();
+    init_vermilion_docx_theme();
     _themesCache = null;
     themes = loadThemesFromJson();
     getTheme = (themeName) => {
@@ -1718,6 +1857,14 @@ async function rasterizeSvgFallback(svg, transformation) {
   }
   try {
     const markup = svg.toString("utf-8");
+    if (/<(?:[A-Za-z][\w.-]*:)?text[\s>/]/.test(markup)) {
+      reportWarning(
+        "image",
+        "IMAGE_SVG_RASTER_SKIPPED",
+        "Inline SVG contains <text>, which would rasterize with machine-dependent fonts, so its fallback only renders in Word 2016+. Convert the text to paths for a portable fallback."
+      );
+      return void 0;
+    }
     const probeImage = new Resvg(markup);
     const wide = probeImage.width / probeImage.height > transformation.width / transformation.height;
     const mode = wide ? "height" : "width";
@@ -6979,6 +7126,17 @@ function mergeBorderSizePerSide(...borders3) {
     left: pick("left")
   };
 }
+function statedSides(colors, sizes) {
+  const namedColors = colors.filter((value) => typeof value === "object").map(normalizeBorderColor);
+  const namedSizes = sizes.filter((value) => typeof value === "object").map(normalizeBorderSize);
+  const stated = (side) => namedColors.some((c) => c !== void 0 && c[side] !== UNSET_COLOR) || namedSizes.some((s) => s !== void 0 && s[side] !== UNSET_SIZE);
+  return {
+    top: stated("top"),
+    right: stated("right"),
+    bottom: stated("bottom"),
+    left: stated("left")
+  };
+}
 function mergePaddingPerSide(...paddings) {
   const normalized = paddings.map(normalizePadding);
   if (!normalized.some((p) => p !== void 0)) return void 0;
@@ -7118,6 +7276,10 @@ function mergeCellDefaults(tableDef, columnDef, cellDef, position, tableOuterBor
       tableDef?.borderSize,
       tableOuterBorder.borderSize
     ),
+    borderExplicit: statedSides(
+      [cellDef?.borderColor, columnDef?.borderColor],
+      [cellDef?.borderSize, columnDef?.borderSize]
+    ),
     padding: mergePaddingPerSide(
       cellDef?.padding,
       columnDef?.padding,
@@ -7175,6 +7337,10 @@ function mergeHeaderCellDefaults(tableDef, headerTableDef, columnDef, headerDef,
       tableDef?.borderSize,
       tableOuterBorder.borderSize
     ),
+    borderExplicit: statedSides(
+      [headerDef?.borderColor, columnDef?.borderColor],
+      [headerDef?.borderSize, columnDef?.borderSize]
+    ),
     padding: mergePaddingPerSide(
       headerDef?.padding,
       headerTableDef?.padding,
@@ -7205,28 +7371,20 @@ function resolveTableModel(source, theme, themeName, options = {}) {
         return position.isLastCol ? hidden.right : hidden.insideVertical;
     }
   };
-  const borders3 = (merged, position) => ({
-    top: {
-      size: merged.borderSize.top,
-      color: merged.borderColor.top,
-      hidden: isHidden("top", position)
-    },
-    right: {
-      size: merged.borderSize.right,
-      color: merged.borderColor.right,
-      hidden: isHidden("right", position)
-    },
-    bottom: {
-      size: merged.borderSize.bottom,
-      color: merged.borderColor.bottom,
-      hidden: isHidden("bottom", position)
-    },
-    left: {
-      size: merged.borderSize.left,
-      color: merged.borderColor.left,
-      hidden: isHidden("left", position)
-    }
-  });
+  const borders3 = (merged, position) => {
+    const side = (name) => ({
+      size: merged.borderSize[name],
+      color: merged.borderColor[name],
+      hidden: isHidden(name, position) && !merged.borderExplicit[name],
+      explicit: merged.borderExplicit[name]
+    });
+    return {
+      top: side("top"),
+      right: side("right"),
+      bottom: side("bottom"),
+      left: side("left")
+    };
+  };
   const tallest = (heights) => heights.reduce(
     (max, height) => height === void 0 ? max : max === void 0 ? height : Math.max(max, height),
     void 0
@@ -7336,6 +7494,7 @@ function resolveTableModel(source, theme, themeName, options = {}) {
     };
     return row;
   });
+  adjudicateInteriorEdges([header, ...rows]);
   return {
     ...resolveWidths(source, columns, theme, themeName),
     header,
@@ -7343,6 +7502,54 @@ function resolveTableModel(source, theme, themeName, options = {}) {
     repeatHeader: source.repeatHeaderOnPageBreak ?? true
   };
 }
+function drawsNothing(border3) {
+  return border3.hidden || border3.size <= 0;
+}
+function channels(hex) {
+  const digits = hex.startsWith("#") ? hex.slice(1) : hex;
+  return [
+    parseInt(digits.slice(0, 2), 16) || 0,
+    parseInt(digits.slice(2, 4), 16) || 0,
+    parseInt(digits.slice(4, 6), 16) || 0
+  ];
+}
+function outweighs(a, b) {
+  if (drawsNothing(a)) return false;
+  if (drawsNothing(b)) return true;
+  if (a.size !== b.size) return a.size > b.size;
+  const [redA, greenA, blueA] = channels(a.color);
+  const [redB, greenB, blueB] = channels(b.color);
+  const brightness = [
+    [redA + blueA + 2 * greenA, redB + blueB + 2 * greenB],
+    [blueA + 2 * greenA, blueB + 2 * greenB],
+    [greenA, greenB]
+  ];
+  for (const [ours, theirs] of brightness) {
+    if (ours !== theirs) return ours < theirs;
+  }
+  return false;
+}
+function adjudicateInteriorEdges(rows) {
+  const settle = (earlier, later) => {
+    if (drawsNothing(earlier) && drawsNothing(later)) return;
+    if (earlier.hidden === later.hidden && earlier.size === later.size && earlier.color === later.color) {
+      return;
+    }
+    const winner = earlier.explicit !== later.explicit ? earlier.explicit ? earlier : later : outweighs(later, earlier) ? later : earlier;
+    const loser = winner === earlier ? later : earlier;
+    loser.size = winner.size;
+    loser.color = winner.color;
+    loser.hidden = winner.hidden;
+  };
+  rows.forEach((row, rowIndex) => {
+    row.cells.forEach((cell, colIndex) => {
+      const right = row.cells[colIndex + 1];
+      if (right) settle(cell.borders.right, right.borders.left);
+      const below = rows[rowIndex + 1]?.cells[colIndex];
+      if (below) settle(cell.borders.bottom, below.borders.top);
+    });
+  });
+}
 function resolveWidths(source, columns, theme, themeName) {
   const hasExplicitWidths = columns.some((col) => col.width !== void 0);
   if (!hasExplicitWidths) {
@@ -10359,6 +10566,7 @@ function compileTableRow(row, spacing, baseStyle, scope) {
   };
 }
 function compileTableCell(cell, spacing, baseStyle, keepNext, scope, rowRevision, markRevision) {
+  const cellLine = compileLineSpacing(cell.font?.lineSpacing);
   const paragraph2 = {
     kind: "paragraph",
     id: scope.id,
@@ -10372,7 +10580,10 @@ function compileTableCell(cell, spacing, baseStyle, keepNext, scope, rowRevision
       spacing: {
         beforeTwips: spacing.before,
         afterTwips: spacing.after,
-        ...spacing.line !== void 0 ? { lineTwips: spacing.line, lineRule: lineRule(spacing.lineRule) } : {}
+        ...cellLine ? {
+          ...cellLine.lineTwips !== void 0 ? { lineTwips: cellLine.lineTwips } : {},
+          lineRule: cellLine.lineRule
+        } : spacing.line !== void 0 ? { lineTwips: spacing.line, lineRule: lineRule(spacing.lineRule) } : {}
       },
       ...keepNext ? { keepNext: true } : {}
     },
@@ -11423,7 +11634,22 @@ function characterSpacingPt(spacing) {
   if (rule === void 0 || value === void 0) return 0;
   return rule.type === "condensed" ? -value / TWIPS_PER_POINT3 : value / TWIPS_PER_POINT3;
 }
-function frameTextFact(props, path3, page) {
+function frameSignature(floating) {
+  const horizontal = asRecord(floating.horizontalPosition);
+  const vertical = asRecord(floating.verticalPosition);
+  return JSON.stringify([
+    floating.width ?? null,
+    floating.height ?? null,
+    horizontal?.offset ?? null,
+    horizontal?.relative ?? null,
+    horizontal?.align ?? null,
+    vertical?.offset ?? null,
+    vertical?.relative ?? null,
+    vertical?.align ?? null,
+    asRecord(floating.wrap)?.type ?? null
+  ]);
+}
+function frameTextFact(props, path3, page, frameChainId, flowIndex) {
   const floating = asRecord(props.floating);
   const frameWidthTwips = finiteNumber(floating?.width);
   if (frameWidthTwips === void 0) return void 0;
@@ -11436,7 +11662,12 @@ function frameTextFact(props, path3, page) {
     (longest, word) => word.length > longest.length ? word : longest,
     ""
   );
-  const offsetY = finiteNumber(asRecord(floating?.verticalPosition)?.offset);
+  const horizontal = asRecord(floating?.horizontalPosition);
+  const vertical = asRecord(floating?.verticalPosition);
+  const offsetX = finiteNumber(horizontal?.offset);
+  const offsetY = finiteNumber(vertical?.offset);
+  const absolutelyPinned = horizontal?.offset !== void 0 || vertical?.offset !== void 0;
+  const resolvable = (horizontal?.offset === void 0 || offsetX !== void 0) && (vertical?.offset === void 0 || offsetY !== void 0);
   return {
     id: `docx:frame-text:${path3}`,
     kind: "docx/frame-text",
@@ -11451,7 +11682,14 @@ function frameTextFact(props, path3, page) {
     },
     ...offsetY !== void 0 && { offsetYTwips: offsetY },
     pageBottomTwips: page.pageBottomTwips,
-    longestWord
+    longestWord,
+    ...absolutelyPinned && resolvable && {
+      absoluteOffsetTwips: { x: offsetX ?? 0, y: offsetY ?? 0 }
+    },
+    anchorHorizontal: typeof horizontal?.relative === "string" ? horizontal.relative : "page",
+    anchorVertical: typeof vertical?.relative === "string" ? vertical.relative : "page",
+    frameChainId,
+    flowIndex
   };
 }
 var SVG_VIEWBOX = /viewBox\s*=\s*"\s*(-?[\d.]+)[\s,]+(-?[\d.]+)[\s,]+(-?[\d.]+)[\s,]+(-?[\d.]+)\s*"/;
@@ -11522,6 +11760,10 @@ function prepareDocxQualityDocument(document, options = {}) {
       ...fact.relatedPaths && { relatedPaths: fact.relatedPaths }
     };
   };
+  let previousVisitPath;
+  let lastFrame;
+  let flowIndex = 0;
+  const parentOf = (path3) => path3.slice(0, path3.lastIndexOf("/"));
   const visit = (node, path3, page) => {
     const props = asRecord(node.props) ?? {};
     if (node.name === "table") {
@@ -11529,8 +11771,14 @@ function prepareDocxQualityDocument(document, options = {}) {
       if (fact) addFact(fact);
     }
     if (node.name === "paragraph" || node.name === "text-box") {
-      const fact = frameTextFact(props, path3, page);
-      if (fact) addFact(fact);
+      const floating = asRecord(props.floating);
+      if (floating) {
+        const signature = frameSignature(floating);
+        const chainId = lastFrame !== void 0 && previousVisitPath === lastFrame.path && parentOf(lastFrame.path) === parentOf(path3) && lastFrame.signature === signature ? lastFrame.chainId : `docx:frame-chain:${path3}`;
+        lastFrame = { path: path3, signature, chainId };
+        const fact = frameTextFact(props, path3, page, chainId, flowIndex);
+        if (fact) addFact(fact);
+      }
     }
     if (node.name === "image" || node.name === "visual") {
       for (const fact of svgTextFacts(props, path3)) addFact(fact);
@@ -11548,9 +11796,11 @@ function prepareDocxQualityDocument(document, options = {}) {
       });
       previousHeadingLevel = level;
     }
+    previousVisitPath = path3;
   };
   resolved.children.forEach((component, index) => {
     const rec = component;
+    if (rec.name === "section") flowIndex += 1;
     const page = rec.name === "section" ? pageBox(resolved.theme, context.themeName, rec.props?.page) : basePage;
     walkActive(component, `/children/${index}`, page, visit);
   });