abstract-document 20.0.4 → 20.1.1

package/src/abstract-document-exporters/pdf/pre-process.ts

@@ -2,34 +2,7 @@ import { exhaustiveCheck } from "ts-exhaustive-check";
 import * as AD from "../../abstract-document/index.js";
 import * as TextStyle from "../../abstract-document/styles/text-style.js";
 
-const alphabet = [
-  "a",
-  "b",
-  "c",
-  "d",
-  "e",
-  "f",
-  "g",
-  "h",
-  "i",
-  "j",
-  "k",
-  "l",
-  "m",
-  "n",
-  "o",
-  "p",
-  "q",
-  "r",
-  "s",
-  "t",
-  "u",
-  "v",
-  "w",
-  "x",
-  "y",
-  "z",
-];
+const alphabet = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
 
 const _numberingLevelItems = new Map<string, number>();
 
@@ -84,10 +57,7 @@ function preProcessSectionElement(
   }
 }
 
-function preProcessParagraph(
-  paragraph: AD.Paragraph.Paragraph,
-  resources: AD.Resources.Resources
-): Array<AD.SectionElement.SectionElement> {
+function preProcessParagraph(paragraph: AD.Paragraph.Paragraph, resources: AD.Resources.Resources): Array<AD.SectionElement.SectionElement> {
   const adjustedParagraphs = adjustParagraph(paragraph);
   if (paragraph.numbering === undefined || !resources.numberingDefinitions) {
     return adjustedParagraphs;
@@ -101,7 +71,7 @@ function preProcessParagraph(
   if (numbering === "Unordered") {
     numberText = "-";
   } else {
-    for (let levelDefinition of levelDefinitions.filter((l) => l.level > level)) {
+    for (const levelDefinition of levelDefinitions.filter((l) => l.level > level)) {
       _numberingLevelItems.delete(numbering + "_" + levelDefinition.level.toString());
     }
 
@@ -112,20 +82,20 @@ function preProcessParagraph(
     } else if (!_numberingLevelItems.has(key)) {
       _numberingLevelItems.set(key, levelDefinitions[level].start);
     } else if (append !== true) {
-      _numberingLevelItems.set(key, (_numberingLevelItems.get(key) || 0) + 1);
+      _numberingLevelItems.set(key, (_numberingLevelItems.get(key) ?? 0) + 1);
     }
 
-    for (let levelDefinition of levelDefinitions.filter((l) => l.level <= level)) {
+    for (const levelDefinition of levelDefinitions.filter((l) => l.level <= level)) {
       const numberingLevel = numbering + "_" + levelDefinition.level.toString();
-      const currentNumber = _numberingLevelItems.get(numberingLevel) || 0;
+      const currentNumber = _numberingLevelItems.get(numberingLevel) ?? 0;
       const levelText = generateLevelText(levelDefinition.format, currentNumber);
       const levelKey = "%" + (levelDefinition.level + 1).toString();
       numberText = numberText.replace(levelKey, levelText);
     }
   }
 
-  let rows: Array<AD.TableRow.TableRow> = [];
-  let children: Array<AD.TableCell.TableCell> = [];
+  const rows: Array<AD.TableRow.TableRow> = [];
+  const children: Array<AD.TableCell.TableCell> = [];
 
   children.push(AD.TableCell.create());
 
@@ -311,7 +281,7 @@ function toChar(num: number): string {
 function preProcessTable(table: AD.Table.Table, resources: AD.Resources.Resources): AD.SectionElement.SectionElement {
   const processedHeaders = [];
   const processedChildren = [];
-  let rowSpans: Map<number, AD.TableCell.TableCell> = new Map();
+  const rowSpans: Map<number, AD.TableCell.TableCell> = new Map();
   if (table.headerRows) {
     for (const row of table.headerRows) {
       const header = preProcessTableRow(row, rowSpans, resources);
@@ -379,16 +349,10 @@ function preProcessTableRow(
 
 function preProcessTableCell(c: AD.TableCell.TableCell, resources: AD.Resources.Resources): AD.TableCell.TableCell {
   const children = c.children.flatMap((e) => preProcessSectionElement(e, resources));
-  return AD.TableCell.create(
-    { styleName: c.styleName, columnSpan: c.columnSpan, rowSpan: c.rowSpan, style: c.style },
-    children
-  );
+  return AD.TableCell.create({ styleName: c.styleName, columnSpan: c.columnSpan, rowSpan: c.rowSpan, style: c.style }, children);
 }
 
-function preProcessGroup(
-  group: AD.Group.Group,
-  parentResources: AD.Resources.Resources
-): Array<AD.SectionElement.SectionElement> {
+function preProcessGroup(group: AD.Group.Group, parentResources: AD.Resources.Resources): Array<AD.SectionElement.SectionElement> {
   const children = group.children.flatMap((e) => preProcessSectionElement(e, parentResources));
   if (group.keepTogether || AD.Resources.hasResources(group) || group.style.position === "absolute") {
     return [

package/src/abstract-document-exporters/pdf/render-image.ts

@@ -1,8 +1,8 @@
 import type * as AbstractImage from "abstract-image";
 import svgToPdfKit from "svg-to-pdfkit";
 import * as AD from "../../abstract-document/index.js";
-import { getFontNameStyle, getFontName, isFontAvailable } from "./font.js";
 import { rawSvgPrefix, toBase64 } from "../shared/base-64.js";
+import { getFontNameStyle, getFontName, isFontAvailable } from "./font.js";
 
 export function renderImage(
   resources: AD.Resources.Resources,
@@ -34,18 +34,9 @@ export function renderImage(
   const drawnH = imgH * scale;
 
   const offsetX =
-    image.horizontalAlignment === "Center"
-      ? (rect.width - drawnW) / 2
-      : image.horizontalAlignment === "Right"
-        ? rect.width - drawnW
-        : 0;
+    image.horizontalAlignment === "Center" ? (rect.width - drawnW) / 2 : image.horizontalAlignment === "Right" ? rect.width - drawnW : 0;
 
-  const offsetY =
-    image.verticalAlignment === "Center"
-      ? (rect.height - drawnH) / 2
-      : image.verticalAlignment === "Bottom"
-        ? rect.height - drawnH
-        : 0;
+  const offsetY = image.verticalAlignment === "Center" ? (rect.height - drawnH) / 2 : image.verticalAlignment === "Bottom" ? rect.height - drawnH : 0;
 
   pdf.save();
   pdf.translate(position.x + offsetX, position.y + offsetY).scale(scale);
@@ -68,7 +59,7 @@ function abstractComponentToPdf(
     case "group":
       component.children.forEach((c) => abstractComponentToPdf(resources, pdf, c, textStyle, circuitBreaker, accScale));
       break;
-    case "binaryimage":
+    case "binaryimage": {
       const format = component.format.toLowerCase();
       const w = component.bottomRight.x - component.topLeft.x;
       const h = component.bottomRight.y - component.topLeft.y;
@@ -86,13 +77,7 @@ function abstractComponentToPdf(
           );
           pdf.restore();
         } else if (component.data.url.startsWith(rawSvgPrefix)) {
-          addWithSvgToPdfKit(
-            decodeURIComponent(component.data.url.slice(rawSvgPrefix.length)),
-            component,
-            pdf,
-            resources,
-            textStyle
-          );
+          addWithSvgToPdfKit(decodeURIComponent(component.data.url.slice(rawSvgPrefix.length)), component, pdf, resources, textStyle);
         } else {
           const match = /^data:.+?;base64,(.*)$/.exec(component.data.url);
           if (match) {
@@ -112,6 +97,7 @@ function abstractComponentToPdf(
         addWithSvgToPdfKit(new TextDecoder().decode(component.data.bytes), component, pdf, resources, textStyle);
       }
       break;
+    }
     case "subimage": {
       const scaleX = component.size.width / (component.image.size.width || 1);
       const scaleY = component.size.height / (component.image.size.height || 1);
@@ -119,9 +105,7 @@ function abstractComponentToPdf(
 
       pdf.save();
       pdf.translate(component.topLeft.x, component.topLeft.y).scale(scale);
-      component.image.components.forEach((c) =>
-        abstractComponentToPdf(resources, pdf, c, textStyle, circuitBreaker, accScale * scale)
-      );
+      component.image.components.forEach((c) => abstractComponentToPdf(resources, pdf, c, textStyle, circuitBreaker, accScale * scale));
       pdf.restore();
       break;
     }
@@ -147,7 +131,7 @@ function abstractComponentToPdf(
       applyStrokeDashStyle(pdf, component.strokeDashStyle);
       pdf.stroke(colorToRgb(component.strokeColor));
       break;
-    case "text":
+    case "text": {
       const font = getFontName(component.fontFamily, component.fontWeight, component.italic);
       if (component.clockwiseRotationDegrees !== 0) {
         pdf.save();
@@ -159,17 +143,9 @@ function abstractComponentToPdf(
       const stringWidth = pdf.widthOfString(component.text);
       const stringHeight = pdf.currentLineHeight();
       const dx =
-        component.horizontalGrowthDirection === "left"
-          ? -stringWidth
-          : component.horizontalGrowthDirection === "uniform"
-            ? -stringWidth * 0.5
-            : 0;
+        component.horizontalGrowthDirection === "left" ? -stringWidth : component.horizontalGrowthDirection === "uniform" ? -stringWidth * 0.5 : 0;
       const dy =
-        component.verticalGrowthDirection === "up"
-          ? -stringHeight
-          : component.verticalGrowthDirection === "uniform"
-            ? -stringHeight * 0.5
-            : 0;
+        component.verticalGrowthDirection === "up" ? -stringHeight : component.verticalGrowthDirection === "uniform" ? -stringHeight * 0.5 : 0;
       pdf
         .font(font)
         .fontSize(component.fontSize)
@@ -179,7 +155,8 @@ function abstractComponentToPdf(
         pdf.restore();
       }
       break;
-    case "ellipse":
+    }
+    case "ellipse": {
       const width = component.bottomRight.x - component.topLeft.x;
       const height = component.bottomRight.y - component.topLeft.y;
       const centerX = component.topLeft.x + width * 0.5;
@@ -192,6 +169,7 @@ function abstractComponentToPdf(
       applyStrokeDashStyle(pdf, component.strokeDashStyle);
       pdf.fillAndStroke(colorToRgb(component.fillColor), colorToRgb(component.strokeColor));
       break;
+    }
     case "polygon":
       pdf
         .lineWidth(component.strokeThickness)
@@ -201,7 +179,7 @@ function abstractComponentToPdf(
       applyStrokeDashStyle(pdf, component.strokeDashStyle);
       pdf.fillAndStroke(colorToRgb(component.fillColor), colorToRgb(component.strokeColor));
       break;
-    case "rectangle":
+    case "rectangle": {
       const rWidth = component.bottomRight.x - component.topLeft.x;
       const rHeight = component.bottomRight.y - component.topLeft.y;
       pdf
@@ -212,6 +190,7 @@ function abstractComponentToPdf(
       applyStrokeDashStyle(pdf, component.strokeDashStyle);
       pdf.fillAndStroke(colorToRgb(component.fillColor), colorToRgb(component.strokeColor));
       break;
+    }
     default:
       break;
   }
@@ -232,15 +211,17 @@ function addWithSvgToPdfKit(
     let index = 0;
     while (true) {
       index = svgUpdated.indexOf(t, index);
-      if (index === -1) break;
-      let indexStart = svgUpdated.indexOf('"', index);
-      let indexEnd = svgUpdated.indexOf('"', indexStart + 1);
+      if (index === -1) {
+        break;
+      }
+      const indexStart = svgUpdated.indexOf('"', index);
+      const indexEnd = svgUpdated.indexOf('"', indexStart + 1);
       index = indexEnd;
 
       const color = svgUpdated.substring(indexStart, indexEnd);
-      if (color !== color.toLowerCase() && color.toLowerCase().indexOf("url(") === -1)
-        svgUpdated =
-          svgUpdated.substring(0, indexStart) + color.toLowerCase() + svgUpdated.substring(indexEnd, svgUpdated.length);
+      if (color !== color.toLowerCase() && color.toLowerCase().indexOf("url(") === -1) {
+        svgUpdated = svgUpdated.substring(0, indexStart) + color.toLowerCase() + svgUpdated.substring(indexEnd, svgUpdated.length);
+      }
     }
   });
 
@@ -248,9 +229,11 @@ function addWithSvgToPdfKit(
     let index = 0;
     while (true) {
       index = svgUpdated.indexOf(t, index);
-      if (index === -1) break;
-      let indexStart = svgUpdated.indexOf('"', index) + 1;
-      let indexEnd = svgUpdated.indexOf('"', indexStart);
+      if (index === -1) {
+        break;
+      }
+      const indexStart = svgUpdated.indexOf('"', index) + 1;
+      const indexEnd = svgUpdated.indexOf('"', indexStart);
       index = indexEnd;
 
       let dasharray = svgUpdated.substring(indexStart, indexEnd);
@@ -428,5 +411,5 @@ function applyStrokeDashStyle(pdf: PDFKit.PDFDocument, dashStyle: AbstractImage.
     }
   }
 
-  (pdf as { dash: (length: number | ReadonlyArray<number>, option: any) => any }).dash(dashes, { phase: phase });
+  (pdf as { dash: (length: number | ReadonlyArray<number>, option: { phase: number }) => PDFKit.PDFDocument }).dash(dashes, { phase: phase });
 }