abstract-document 19.3.0 → 20.0.3

package/src/abstract-document/markdown/markdown.ts

@@ -1,12 +1,12 @@
 import unified from "unified";
 import remarkParse from "remark-parse";
 import remarkSubSuper from "remark-sub-super";
-import { SectionElement } from "../section-elements/section-element.js";
+import type { SectionElement } from "../section-elements/section-element.js";
 import * as Paragraph from "../section-elements/paragraph.js";
-import * as Atom from "../atoms/atom.js";
-import * as TextRun from "../atoms/text-run.js";
+import type * as Atom from "../atoms/atom.js";
+import type * as TextRun from "../atoms/text-run.js";
 import * as Group from "../section-elements/group.js";
-import { AstElements, MarkDownProcessData, AstRoot } from "./types.js";
+import type { AstElements, MarkDownProcessData, AstRoot } from "./types.js";
 
 export interface MarkdownProps {
   readonly text: string;
@@ -33,7 +33,7 @@ function preProcessMarkdownAst(
   } // Need to convice TS that we never go below this line with a Str element.
 
   if (ast.children) {
-    ast.children.forEach((child, i) => {
+    ast.children.forEach((child) => {
       let style = styles.slice(); // create a new copy of styles
       switch (ast.type) {
         case "heading":
@@ -115,7 +115,10 @@ function preProcessMarkdownAst(
 
 export function create({ text, keepTogetherSections }: MarkdownProps): SectionElement {
   //markdown require newlines to have two spaces before them (this fixex alignment issues when using linebreaks for rows with single text runs)
-  const newlineReplacedText = text.replaceAll(/ \n/g, "\n").replaceAll(/ {2}\n/g, "\n").replaceAll(/\n/g, "  \n\r");
+  const newlineReplacedText = text
+    .replaceAll(/ \n/g, "\n")
+    .replaceAll(/ {2}\n/g, "\n")
+    .replaceAll(/\n/g, "  \n\r");
 
   const ast = unified().use(remarkParse, { commonmark: true }).use(remarkSubSuper).parse(newlineReplacedText);
   const { paragraphs } = preProcessMarkdownAst(ast as AstRoot, [], [], [], 0);

package/src/abstract-document/markdown/types.ts

@@ -1,4 +1,4 @@
-import * as AD from "../../abstract-document/index.js";
+import type * as AD from "../../abstract-document/index.js";
 
 export type AstChildElements =
   | AstHeading

package/src/abstract-document/numberings/numbering-definition.ts

@@ -1,4 +1,4 @@
-import { NumberingLevelDefinition } from "./numbering-level-definition.js";
+import type { NumberingLevelDefinition } from "./numbering-level-definition.js";
 
 export interface NumberingDefinition {
   readonly levels: NumberingLevelDefinition[];

package/src/abstract-document/numberings/numbering-level-definition.ts

@@ -1,5 +1,5 @@
 import * as TextStyle from "../styles/text-style.js";
-import { NumberingFormat } from "./numbering-format.js";
+import type { NumberingFormat } from "./numbering-format.js";
 
 export interface NumberingLevelDefinition {
   readonly level: number;

package/src/abstract-document/page/master-page.ts

@@ -1,5 +1,5 @@
 import * as PageStyle from "../styles/page-style.js";
-import * as SectionElement from "../section-elements/section-element.js";
+import type * as SectionElement from "../section-elements/section-element.js";
 
 export interface MasterPage {
   readonly style: PageStyle.PageStyle;

package/src/abstract-document/page/section.ts

@@ -1,6 +1,6 @@
-import { Resources } from "../resources.js";
+import type { Resources } from "../resources.js";
 import * as MasterPage from "./master-page.js";
-import { SectionElement } from "../section-elements/section-element.js";
+import type { SectionElement } from "../section-elements/section-element.js";
 
 export type Section = Resources & {
   readonly page: MasterPage.MasterPage;

package/src/abstract-document/primitives/image-resource.ts

@@ -1,4 +1,4 @@
-import { AbstractImage } from "abstract-image";
+import type { AbstractImage } from "abstract-image";
 
 export type Guid = string;
 

package/src/abstract-document/resources.ts

@@ -1,12 +1,13 @@
 // import { ImageResource } from "./primitives/image-resource.js";
 // import { Numbering } from "./numberings/numbering.js";
-import { NumberingDefinition } from "./numberings/numbering-definition.js";
+import type { NumberingDefinition } from "./numberings/numbering-definition.js";
 import { create } from "./styles/style-key.js";
-import { Style, overrideWith } from "./styles/style.js";
-import { Font } from "./primitives/font.js";
-import { Indexer } from "./types.js";
+import type { Style } from "./styles/style.js";
+import { overrideWith } from "./styles/style.js";
+import type { Font } from "./primitives/font.js";
+import type { Indexer } from "./types.js";
 import { defaultAndStandardStyles } from "./default-styles.js";
-import { ImageResource } from "./primitives/image-resource.js";
+import type { ImageResource } from "./primitives/image-resource.js";
 
 export interface Resources {
   readonly fonts?: Indexer<Font>;
@@ -69,9 +70,9 @@ export function getNestedStyle(
   const namedStyle = resources.styles && resources.styles[create(type, name)];
   const nestedStyle = nestedStyleNames
     ? nestedStyleNames.reduce(
-      (sofar, name) => overrideWith(sofar, resources.styles && resources.styles[create(type, name)]),
-      namedStyle
-    )
+        (sofar, name) => overrideWith(sofar, resources.styles && resources.styles[create(type, name)]),
+        namedStyle
+      )
     : namedStyle;
   return overrideWith(
     elementStyle,

package/src/abstract-document/section-elements/group.ts

@@ -1,5 +1,5 @@
-import { Resources } from "../resources.js";
-import { SectionElement } from "./section-element.js";
+import type { Resources } from "../resources.js";
+import type { SectionElement } from "./section-element.js";
 import * as GroupStyle from "../styles/group-style.js";
 
 export const sectionType = "Group";

package/src/abstract-document/section-elements/page-break.ts

@@ -1,4 +1,4 @@
-import { Resources } from "../resources.js";
+import type { Resources } from "../resources.js";
 
 export type PageBreak = Resources & {
   readonly type: "PageBreak";

package/src/abstract-document/section-elements/paragraph.ts

@@ -1,6 +1,6 @@
-import { Resources } from "../resources.js";
-import { Atom } from "../atoms/atom.js";
-import { ParagraphNumbering } from "./paragraph-numbering.js";
+import type { Resources } from "../resources.js";
+import type { Atom } from "../atoms/atom.js";
+import type { ParagraphNumbering } from "./paragraph-numbering.js";
 import * as ParagraphStyle from "../styles/paragraph-style.js";
 
 export const sectionType = "Paragraph";

package/src/abstract-document/section-elements/section-element.ts

@@ -1,7 +1,7 @@
 import * as Group from "./group.js";
 import * as Paragraph from "./paragraph.js";
 import * as Table from "./table.js";
-import * as PageBreak from "./page-break.js";
+import type * as PageBreak from "./page-break.js";
 
 export type SectionElement = Group.Group | Paragraph.Paragraph | Table.Table | PageBreak.PageBreak;
 export type SectionElementNoPageBreak = Exclude<SectionElement, PageBreak.PageBreak>;

package/src/abstract-document/section-elements/table.ts

@@ -1,5 +1,5 @@
-import { Resources } from "../resources.js";
-import * as TableRow from "../table/table-row.js";
+import type { Resources } from "../resources.js";
+import type * as TableRow from "../table/table-row.js";
 import * as TableStyle from "../styles/table-style.js";
 
 export const sectionType = "Table";

package/src/abstract-document/styles/group-style.ts

@@ -1,5 +1,5 @@
 import * as LayoutFoundation from "../primitives/layout-foundation.js";
-import * as Position from "./position.js";
+import type * as Position from "./position.js";
 
 export interface GroupStyle {
   readonly type: "GroupStyle";

package/src/abstract-document/styles/paragraph-style.ts

@@ -1,6 +1,6 @@
 import * as TextStyle from "./text-style.js";
 import * as LayoutFoundation from "../primitives/layout-foundation.js";
-import * as Position from "./position.js";
+import type * as Position from "./position.js";
 
 export type TextAlignment = "Start" | "Center" | "End" | "Justify";
 

package/src/abstract-document/styles/table-style.ts

@@ -1,6 +1,6 @@
 import * as LayoutFoundation from "../primitives/layout-foundation.js";
 import * as TableCellStyle from "./table-cell-style.js";
-import * as Position from "./position.js";
+import type * as Position from "./position.js";
 
 export type TableAlignment = "Left" | "Center" | "Right";
 

package/src/abstract-document/table/table-cell.ts

@@ -1,4 +1,4 @@
-import * as SectionElement from "../section-elements/section-element.js";
+import type * as SectionElement from "../section-elements/section-element.js";
 import * as TableCellStyle from "../styles/table-cell-style.js";
 
 export interface TableCell {

package/src/abstract-document/table/table-row.ts

@@ -1,4 +1,4 @@
-import { TableCell } from "./table-cell.js";
+import type { TableCell } from "./table-cell.js";
 
 export interface TableRow {
   readonly children: ReadonlyArray<TableCell>;

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

@@ -1,35 +1,26 @@
-import * as AbstractImage from "abstract-image";
-import { ImageRun, IMediaTransformation } from "docx";
-import { TextStyle } from "../../abstract-document/styles/text-style.js";
-import { Image } from "../../abstract-document/atoms/image.js";
-import { Resources } from "../../abstract-document/index.js";
+import type * as AbstractImage from "abstract-image";
+import type { IMediaTransformation } from "docx";
+import { ImageRun } from "docx";
+import type { TextStyle } from "../../abstract-document/styles/text-style.js";
+import type { Image } from "../../abstract-document/atoms/image.js";
 import { fromBase64, rawSvgPrefix } from "../shared/base-64.js";
-import * as AD from "../../abstract-document/index.js";
+import type * as AD from "../../abstract-document/index.js";
 
 const abstractDocPointsToDocxPxRatio = 1; // Set to 1 for now to minimize impact. Can be adjusted to better match PDF image dimensions
 
-const emptyPNG =
-  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO6pH7sAAAAASUVORK5CYII=";
+const emptyPNG = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO6pH7sAAAAASUVORK5CYII=";
 
-  const fallbackImage = {
-    type: "png" as const,
-    data: fromBase64(emptyPNG),
-  };
-
-export function renderImage(
-  image: Image,
-  textStyle: TextStyle,
-  resources: Resources.Resources
-): ImageRun {
+const fallbackImage = {
+  type: "png" as const,
+  data: fromBase64(emptyPNG),
+};
 
+export function renderImage(image: Image, textStyle: TextStyle, resources: AD.Resources.Resources): ImageRun {
   const aImage = image.imageResource.abstractImage;
 
   const firstComp = aImage.components[0];
   const resource =
-    !aImage.size.width &&
-    !aImage.size.height &&
-    firstComp?.type === "binaryimage" &&
-    firstComp.data.type === "url"
+    !aImage.size.width && !aImage.size.height && firstComp?.type === "binaryimage" && firstComp.data.type === "url"
       ? resources.imageResources?.[firstComp.data.url] ?? image.imageResource
       : image.imageResource;
 
@@ -48,7 +39,10 @@ export function renderImage(
   const drawnW = imgW * scale;
   const drawnH = imgH * scale;
 
-  const transformation: IMediaTransformation = { width: drawnW * abstractDocPointsToDocxPxRatio, height: drawnH * abstractDocPointsToDocxPxRatio};
+  const transformation: IMediaTransformation = {
+    width: drawnW * abstractDocPointsToDocxPxRatio,
+    height: drawnH * abstractDocPointsToDocxPxRatio,
+  };
 
   const directImage = tryCreateDirectImageRun(resource, transformation, resources);
   if (directImage) {
@@ -68,7 +62,7 @@ export function renderImage(
 function tryCreateDirectImageRun(
   resource: AD.ImageResource.ImageResource,
   transformation: IMediaTransformation,
-  resources: Resources.Resources
+  resources: AD.Resources.Resources
 ): ImageRun | undefined {
   if (resource.abstractImage.components.length !== 1) {
     return undefined;
@@ -85,7 +79,7 @@ function tryCreateDirectImageRun(
 function binaryImageToImageRun(
   component: AbstractImage.BinaryImage,
   transformation: IMediaTransformation,
-  resources: Resources.Resources
+  resources: AD.Resources.Resources
 ): ImageRun | undefined {
   const format = component.format.toLowerCase();
 
@@ -145,7 +139,7 @@ function binaryImageToImageRun(
       }
 
       if (mimeType.includes("svg")) {
-        return new ImageRun({ type: "svg", data, transformation, fallback: fallbackImage});
+        return new ImageRun({ type: "svg", data, transformation, fallback: fallbackImage });
       }
     }
   }
@@ -155,7 +149,7 @@ function binaryImageToImageRun(
 
 function abstractImageToSvg(
   image: AbstractImage.AbstractImage,
-  resources: Resources.Resources,
+  resources: AD.Resources.Resources,
   textStyle: TextStyle
 ): string {
   const width = image.size.width || 1;
@@ -171,7 +165,7 @@ function abstractImageToSvg(
 
 function componentToSvg(
   component: AbstractImage.Component,
-  resources: Resources.Resources,
+  resources: AD.Resources.Resources,
   textStyle: TextStyle,
   circuitBreaker: number
 ): string {
@@ -181,9 +175,7 @@ function componentToSvg(
 
   switch (component.type) {
     case "group":
-      return component.children
-        .map((child) => componentToSvg(child, resources, textStyle, circuitBreaker))
-        .join("");
+      return component.children.map((child) => componentToSvg(child, resources, textStyle, circuitBreaker)).join("");
 
     case "subimage": {
       const scaleX = component.size.width / (component.image.size.width || 1);
@@ -201,19 +193,33 @@ function componentToSvg(
       return binaryImageToSvg(component, resources, textStyle, circuitBreaker);
 
     case "line":
-      return `<line x1="${component.start.x}" y1="${component.start.y}" x2="${component.end.x}" y2="${component.end.y}" ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
+      return `<line x1="${component.start.x}" y1="${component.start.y}" x2="${component.end.x}" y2="${
+        component.end.y
+      }" ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
 
     case "polyline":
-      return `<polyline points="${component.points.map((p) => `${p.x},${p.y}`).join(" ")}" fill="none" ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
+      return `<polyline points="${component.points.map((p) => `${p.x},${p.y}`).join(" ")}" fill="none" ${strokeAttrs(
+        component.strokeColor,
+        component.strokeThickness,
+        component.strokeDashStyle
+      )} />`;
 
     case "polygon":
-      return `<polygon points="${component.points.map((p) => `${p.x},${p.y}`).join(" ")}" ${fillAttrs(component.fillColor)} ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
+      return `<polygon points="${component.points.map((p) => `${p.x},${p.y}`).join(" ")}" ${fillAttrs(
+        component.fillColor
+      )} ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
 
     case "rectangle": {
       const width = component.bottomRight.x - component.topLeft.x;
       const height = component.bottomRight.y - component.topLeft.y;
 
-      return `<rect x="${component.topLeft.x}" y="${component.topLeft.y}" width="${width}" height="${height}" ${fillAttrs(component.fillColor)} ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
+      return `<rect x="${component.topLeft.x}" y="${
+        component.topLeft.y
+      }" width="${width}" height="${height}" ${fillAttrs(component.fillColor)} ${strokeAttrs(
+        component.strokeColor,
+        component.strokeThickness,
+        component.strokeDashStyle
+      )} />`;
     }
 
     case "ellipse": {
@@ -222,7 +228,9 @@ function componentToSvg(
       const cx = component.topLeft.x + width * 0.5;
       const cy = component.topLeft.y + height * 0.5;
 
-      return `<ellipse cx="${cx}" cy="${cy}" rx="${width * 0.5}" ry="${height * 0.5}" ${fillAttrs(component.fillColor)} ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
+      return `<ellipse cx="${cx}" cy="${cy}" rx="${width * 0.5}" ry="${height * 0.5}" ${fillAttrs(
+        component.fillColor
+      )} ${strokeAttrs(component.strokeColor, component.strokeThickness, component.strokeDashStyle)} />`;
     }
 
     case "text":
@@ -235,7 +243,7 @@ function componentToSvg(
 
 function binaryImageToSvg(
   component: AbstractImage.BinaryImage,
-  resources: Resources.Resources,
+  resources: AD.Resources.Resources,
   textStyle: TextStyle,
   circuitBreaker: number
 ): string {
@@ -263,7 +271,9 @@ function binaryImageToSvg(
       return `<g transform="translate(${component.topLeft.x} ${component.topLeft.y})">${svg}</g>`;
     }
 
-    return `<image x="${component.topLeft.x}" y="${component.topLeft.y}" width="${width}" height="${height}" href="${escapeXml(component.data.url)}" />`;
+    return `<image x="${component.topLeft.x}" y="${
+      component.topLeft.y
+    }" width="${width}" height="${height}" href="${escapeXml(component.data.url)}" />`;
   }
 
   if (component.data.type === "bytes") {
@@ -307,24 +317,30 @@ function textComponentToSvg(component: AbstractImage.Text): string {
       ? "middle"
       : "text-before-edge";
 
-  return `<text x="${component.position.x}" y="${component.position.y}" font-family="${escapeXml(component.fontFamily)}" font-size="${component.fontSize}" font-weight="${component.fontWeight}" font-style="${component.italic ? "italic" : "normal"}" fill="${colorToCss(component.textColor)}" text-anchor="${anchor}" dominant-baseline="${dominantBaseline}"${rotation}>${escapeXml(component.text)}</text>`;
+  return `<text x="${component.position.x}" y="${component.position.y}" font-family="${escapeXml(
+    component.fontFamily
+  )}" font-size="${component.fontSize}" font-weight="${component.fontWeight}" font-style="${
+    component.italic ? "italic" : "normal"
+  }" fill="${colorToCss(
+    component.textColor
+  )}" text-anchor="${anchor}" dominant-baseline="${dominantBaseline}"${rotation}>${escapeXml(component.text)}</text>`;
 }
 
 function fillAttrs(color: AbstractImage.Color): string {
   return `fill="${colorToCss(color)}" fill-opacity="${colorToOpacity(color)}"`;
 }
 
-function strokeAttrs(
-  color: AbstractImage.Color,
-  thickness: number,
-  dashStyle: AbstractImage.DashStyle
-): string {
+function strokeAttrs(color: AbstractImage.Color, thickness: number, dashStyle: AbstractImage.DashStyle): string {
   const dashArray =
     dashStyle.dashes.length > 0
-      ? ` stroke-dasharray="${dashStyle.dashes.filter((dash) => dash !== 0).join(" ")}" stroke-dashoffset="${dashStyle.offset}"`
+      ? ` stroke-dasharray="${dashStyle.dashes.filter((dash) => dash !== 0).join(" ")}" stroke-dashoffset="${
+          dashStyle.offset
+        }"`
       : "";
 
-  return `stroke="${colorToCss(color)}" stroke-opacity="${colorToOpacity(color)}" stroke-width="${thickness}"${dashArray}`;
+  return `stroke="${colorToCss(color)}" stroke-opacity="${colorToOpacity(
+    color
+  )}" stroke-width="${thickness}"${dashArray}`;
 }
 
 function colorToOpacity(color: AbstractImage.Color): number {
@@ -336,11 +352,7 @@ function colorToCss(color: AbstractImage.Color): string {
 }
 
 function escapeXml(value: string): string {
-  return value
-    .replace(/&/g, "&amp;")
-    .replace(/"/g, "&quot;")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;");
+  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
 function resourceRect(resource: AD.ImageResource.ImageResource, rect: AbstractImage.Size): AbstractImage.Size {