abstract-document 10.0.4 → 11.0.1

package/src/abstract-document-exporters/pdf/measure.ts

@@ -5,26 +5,30 @@ import { registerFonts, getFontNameStyle } from "./font";
 
 //tslint:disable:no-any variable-name
 
-export function measure(PDFDocument: any, document: AD.AbstractDoc.AbstractDoc): Map<any, AD.Size.Size> {
-  let pdf = new PDFDocument();
+export function measure(pdfKit: PDFKit.PDFDocument, document: AD.AbstractDoc.AbstractDoc): Map<any, AD.Size.Size> {
+  let pdf = new pdfKit();
   registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
   return mergeMaps(document.children.map((s) => measureSection(pdf, document, s)));
 }
 
 export function measurePages(
-  PDFDocument: any,
+  pdfKit: PDFKit.PDFDocument,
   document: AD.AbstractDoc.AbstractDoc,
   pages: ReadonlyArray<Page>
 ): Map<any, AD.Size.Size> {
-  let pdf = new PDFDocument();
-  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
+  let pdf = new pdfKit();
+  registerFonts(
+    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
+      pdf.registerFont(fontName, fontSource, fontFamily),
+    document
+  );
   return mergeMaps(
     pages.map((page) => measureSection(pdf, document, page.section, page.header, page.footer, page.elements))
   );
 }
 
 function measureSection(
-  pdf: any,
+  pdfKit: PDFKit.PDFDocument,
   parentResources: AD.Resources.Resources,
   section: AD.Section.Section,
   separateHeader?: ReadonlyArray<AD.SectionElement.SectionElement>,
@@ -42,23 +46,23 @@ function measureSection(
   const contentAvailableWidth =
     pageWidth - (section.page.style.contentMargins.left + section.page.style.contentMargins.right);
   const contentAvailableSize = AD.Size.create(contentAvailableWidth, pageHeight);
-  const sectionSizes = children.map((e) => measureSectionElement(pdf, resources, contentAvailableSize, e));
+  const sectionSizes = children.map((e) => measureSectionElement(pdfKit, resources, contentAvailableSize, e));
 
   const headerAvailableWidth =
     pageWidth - (section.page.style.headerMargins.left + section.page.style.headerMargins.right);
   const headerAvailableSize = AD.Size.create(headerAvailableWidth, pageHeight);
-  const headerSizes = header.map((e) => measureSectionElement(pdf, resources, headerAvailableSize, e));
+  const headerSizes = header.map((e) => measureSectionElement(pdfKit, resources, headerAvailableSize, e));
 
   const footerAvailableWidth =
     pageWidth - (section.page.style.footerMargins.left + section.page.style.footerMargins.right);
   const footerAvailableSize = AD.Size.create(footerAvailableWidth, pageHeight);
-  const footerSizes = footer.map((e) => measureSectionElement(pdf, resources, footerAvailableSize, e));
+  const footerSizes = footer.map((e) => measureSectionElement(pdfKit, resources, footerAvailableSize, e));
 
   return mergeMaps([...sectionSizes, ...headerSizes, ...footerSizes]);
 }
 
 function measureSectionElement(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   parentResources: AD.Resources.Resources,
   availableSize: AD.Size.Size,
   element: AD.SectionElement.SectionElement
@@ -85,7 +89,7 @@ function measurePageBreak(availableSize: AD.Size.Size, pageBreak: AD.PageBreak.P
 }
 
 function measureParagraph(
-  pdf: any,
+  pdfKit: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   availableSize: AD.Size.Size,
   paragraph: AD.Paragraph.Paragraph
@@ -129,7 +133,7 @@ function measureParagraph(
         hasAtomImage = true;
       }
       const atomSize = measureAtom(
-        pdf,
+        pdfKit,
         resources,
         style.textStyle,
         contentAvailableSize,
@@ -154,7 +158,7 @@ function measureParagraph(
     } else if (hasAtomImage) {
       paragraphHeight += desiredHeight + currentRowHeight;
     } else {
-      paragraphHeight += pdf.heightOfString(concatenatedText, {
+      paragraphHeight += pdfKit.heightOfString(concatenatedText, {
         width: textOptions && textOptions.lineBreak === false ? Infinity : availableSize.width,
         ...textOptions,
       });
@@ -192,7 +196,7 @@ function getBiggestStyle(
 }
 
 export function measureTable(
-  pdf: any,
+  pdfKit: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   availableSize: AD.Size.Size,
   table: AD.Table.Table
@@ -228,7 +232,7 @@ export function measureTable(
 
       for (let element of cell.children) {
         const elementAvailableSize = AD.Size.create(contentAvailableWidth, Infinity);
-        const elementSizes = measureSectionElement(pdf, resources, elementAvailableSize, element);
+        const elementSizes = measureSectionElement(pdfKit, resources, elementAvailableSize, element);
         elementSizes.forEach((v, k) => desiredSizes.set(k, v));
         const elementSize = getDesiredSize(element, desiredSizes);
         if (!AD.Position.isPositionAbsolute(element)) {
@@ -290,13 +294,13 @@ export function measureTable(
 }
 
 function measureGroup(
-  pdf: any,
+  pdfKit: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   availableSize: AD.Size.Size,
   keepTogether: AD.Group.Group
 ): Map<any, AD.Size.Size> {
   let desiredSizes = mergeMaps(
-    keepTogether.children.map((e) => measureSectionElement(pdf, resources, availableSize, e))
+    keepTogether.children.map((e) => measureSectionElement(pdfKit, resources, availableSize, e))
   );
   let desiredHeight = keepTogether.children.reduce(
     (sum, e) => sum + (AD.Position.isPositionAbsolute(e) ? 0 : getDesiredSize(e, desiredSizes).height),
@@ -307,7 +311,7 @@ function measureGroup(
 }
 
 function measureAtom(
-  pdf: any,
+  pdfKit: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
   availableSize: AD.Size.Size,
@@ -316,17 +320,17 @@ function measureAtom(
 ): AD.Size.Size {
   switch (atom.type) {
     case "TextRun":
-      return measureTextRun(pdf, resources, textStyle, atom, availableSize);
+      return measureTextRun(pdfKit, resources, textStyle, atom, availableSize);
     case "TextField":
-      return measureTextField(pdf, resources, textStyle, atom, availableSize);
+      return measureTextField(pdfKit, resources, textStyle, atom, availableSize);
     case "Image":
       return measureImage(availableSize, atom);
     case "HyperLink":
-      return measureHyperLink(pdf, resources, textStyle, atom, availableSize);
+      return measureHyperLink(pdfKit, resources, textStyle, atom, availableSize);
     case "TocSeparator":
-      return measureTocSeparator(pdf, textStyle, availableSize, availableRowSpace);
+      return measureTocSeparator(pdfKit, textStyle, availableSize, availableRowSpace);
     case "LineBreak":
-      return measureLineBreak(pdf, resources, textStyle, availableSize);
+      return measureLineBreak(pdfKit, resources, textStyle, availableSize);
     case "LinkTarget":
       return {
         width: availableSize.width,
@@ -338,12 +342,12 @@ function measureAtom(
 }
 
 function measureLineBreak(
-  pdf: any,
+  pdfKit: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
   availableSize: AD.Size.Size
 ): AD.Size.Size {
-  const textSize = measureText(pdf, "A", textStyle, availableSize);
+  const textSize = measureText(pdfKit, "A", textStyle, availableSize);
   return {
     height: textSize.height,
     width: 0,
@@ -351,7 +355,7 @@ function measureLineBreak(
 }
 
 function measureTextRun(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
   textRun: AD.TextRun.TextRun,
@@ -369,7 +373,7 @@ function measureTextRun(
 }
 
 function measureHyperLink(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
   hyperLink: AD.HyperLink.HyperLink,
@@ -386,7 +390,7 @@ function measureHyperLink(
 }
 
 function measureTextField(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
   textField: AD.TextField.TextField,
@@ -412,7 +416,7 @@ function measureTextField(
 }
 
 function measureTocSeparator(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   textStyle: AD.TextStyle.TextStyle,
   availableSize: AD.Size.Size,
   availableRowSpace: number
@@ -431,7 +435,7 @@ function measureImage(availableSize: AD.Size.Size, image: AD.Image.Image): AD.Si
 }
 
 function measureText(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   text: string,
   textStyle: AD.TextStyle.TextStyle,
   availableSize: AD.Size.Size

package/src/abstract-document-exporters/pdf/paginate.ts

@@ -3,8 +3,6 @@ import { getResources } from "../shared/get_resources";
 import { registerFonts } from "./font";
 import { measureTable } from "./measure";
 
-/* tslint:disable:no-any */
-
 export interface Page {
   readonly pageNo: number;
   readonly namedDestionations: ReadonlyArray<string>;
@@ -17,19 +15,18 @@ export interface Page {
 }
 
 export function paginate(
-  pdfKit: any,
+  pdfKit: PDFKit.PDFDocument,
   document: AD.AbstractDoc.AbstractDoc,
   desiredSizes: Map<any, AD.Size.Size>
 ): ReadonlyArray<Page> {
   const resources = getResources(document);
-  let pdf = new pdfKit({
-    compress: false,
-    autoFirstPage: false,
-    bufferPages: true,
-  }) as any;
-
-  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
+  let pdf = new pdfKit({ compress: false, autoFirstPage: false, bufferPages: true });
 
+  registerFonts(
+    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
+      pdf.registerFont(fontName, fontSource, fontFamily),
+    document
+  );
   let pages = new Array<Page>();
   for (let section of document.children) {
     const previousPage = pages.length > 0 ? pages[pages.length - 1] : undefined;
@@ -40,7 +37,7 @@ export function paginate(
 }
 
 function splitSection(
-  pdfKit: any,
+  pdfKit: PDFKit.PDFDocument,
   document: AD.AbstractDoc.AbstractDoc,
   parentResources: AD.Resources.Resources,
   desiredSizes: Map<{}, AD.Size.Size>,
@@ -138,7 +135,7 @@ function splitSection(
 }
 
 function splitTable(
-  pdfKit: any,
+  pdfKit: PDFKit.PDFDocument,
   document: AD.AbstractDoc.AbstractDoc,
   resources: AD.Resources.Resources,
   desiredSizes: Map<{}, AD.Size.Size>,
@@ -370,7 +367,7 @@ function getDesiredSize(element: {}, desiredSizes: Map<{}, AD.Size.Size>): AD.Si
 }
 
 function splitTableAt(
-  pdfKit: any,
+  pdfKit: PDFKit.PDFDocument,
   document: AD.AbstractDoc.AbstractDoc,
   resources: AD.Resources.Resources,
   desiredSizes: Map<{}, AD.Size.Size>,
@@ -420,7 +417,11 @@ function splitTableAt(
 
   const availableSize = getDesiredSize(table, desiredSizes);
   let pdf = new pdfKit();
-  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
+  registerFonts(
+    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
+      pdf.registerFont(fontName, fontSource, fontFamily),
+    document
+  );
   const headSizes = measureTable(pdf, resources, availableSize, tableHead);
   const tailSizes = measureTable(pdf, resources, availableSize, tableTail);
 

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

@@ -6,13 +6,11 @@ import { getFontNameStyle, getFontName, isFontAvailable } from "./font";
 
 export function renderImage(
   resources: AD.Resources.Resources,
-  // tslint:disable-next-line:no-any
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   image: AD.Image.Image
-  // tslint:disable-next-line:no-any
-): any {
+): void {
   const aImage = image.imageResource.abstractImage;
   const position = AD.Point.create(finalRect.x, finalRect.y);
   const scaleX = finalRect.width / aImage.size.width;
@@ -26,8 +24,7 @@ export function renderImage(
 
 function abstractComponentToPdf(
   resources: AD.Resources.Resources,
-  // tslint:disable-next-line:no-any
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   component: AbstractImage.Component,
   textStyle: AD.TextStyle.TextStyle
 ): void {
@@ -213,6 +210,6 @@ function colorToOpacity(color: AbstractImage.Color): number {
   return color.a / 255;
 }
 
-function colorToRgb(color: AbstractImage.Color): Array<number> {
+function colorToRgb(color: AbstractImage.Color): [number, number, number] {
   return [color.r, color.g, color.b];
 }

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

@@ -11,8 +11,7 @@ export type PdfExportOptions = {
 };
 
 export function exportToHTML5Blob(
-  // tslint:disable-next-line:no-any
-  pdfKit: any,
+  pdfKit: PDFKit.PDFDocument,
   doc: AD.AbstractDoc.AbstractDoc,
   options: PdfExportOptions = { compress: false }
 ): Promise<Blob> {
@@ -33,8 +32,8 @@ export function exportToHTML5Blob(
  * @param options
  */
 export function exportToStream(
-  pdfKit: any,
-  blobStream: {},
+  pdfKit: PDFKit.PDFDocument,
+  blobStream: any,
   doc: AD.AbstractDoc.AbstractDoc,
   options: PdfExportOptions = { compress: false }
 ): void {
@@ -42,12 +41,19 @@ export function exportToStream(
   pdf.pipe(blobStream);
 }
 
-function createDocument(pdfKit: any, options: PdfExportOptions, doc: AD.AbstractDoc.AbstractDoc): any {
-  let pdf = new pdfKit({ ...options, autoFirstPage: false, bufferPages: true }) as any;
-
-  const document = preProcess(doc);
-  registerFonts((fontName: string, fontSource: AD.Font.FontSource) => pdf.registerFont(fontName, fontSource), document);
-
+function createDocument(
+  pdfKit: PDFKit.PDFDocument,
+  options: PdfExportOptions,
+  ad: AD.AbstractDoc.AbstractDoc
+): PDFKit.PDFDocument {
+  let pdf = new pdfKit({ ...options, autoFirstPage: false, bufferPages: true });
+
+  const document = preProcess(ad);
+  registerFonts(
+    (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) =>
+      pdf.registerFont(fontName, fontSource, fontFamily),
+    document
+  );
   const desiredSizes = measure(pdfKit, document);
   const pages = paginate(pdfKit, document, desiredSizes);
   const updatedPages = updatePageRefs(pages);
@@ -62,7 +68,7 @@ function createDocument(pdfKit: any, options: PdfExportOptions, doc: AD.Abstract
 
 function renderPage(
   parentResources: AD.Resources.Resources,
-  pdf: any,
+  pdfKit: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   page: Page
 ): void {
@@ -70,11 +76,11 @@ function renderPage(
   const style = section.page.style;
   const resources = AD.Resources.mergeResources([parentResources, section]);
   const pageHeight = AD.PageStyle.getHeight(style);
-  const contentRect = addPage(pdf, page);
+  const contentRect = addPage(pdfKit, page);
 
   page.namedDestionations.forEach((dest) => {
-    if (pdf.addNamedDestination) {
-      pdf.addNamedDestination(dest);
+    if ((pdfKit as any).addNamedDestination) {
+      (pdfKit as any).addNamedDestination(dest);
     }
   });
 
@@ -86,7 +92,7 @@ function renderPage(
     const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
-      pdf,
+      pdfKit,
       desiredSizes,
       AD.Rect.create(headerX, isAbsolute ? headerStart : headerY, elementSize.width, elementSize.height),
       element
@@ -109,7 +115,7 @@ function renderPage(
     const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
-      pdf,
+      pdfKit,
       desiredSizes,
       AD.Rect.create(footerX, isAbsolute ? footerStart : footerY, elementSize.width, elementSize.height),
       element
@@ -126,7 +132,7 @@ function renderPage(
     const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
-      pdf,
+      pdfKit,
       desiredSizes,
       AD.Rect.create(contentRect.x, isAbsolute ? elementStart : y, elementSize.width, elementSize.height),
       element
@@ -137,22 +143,17 @@ function renderPage(
   }
 }
 
-function addPage(pdf: any, page: Page): AD.Rect.Rect {
+function addPage(pdf: PDFKit.PDFDocument, page: Page): AD.Rect.Rect {
   const section = page.section;
   const style = section.page.style;
   // This is rotated later depending on the orientation.
   const pageWidth = AD.PageStyle.getPaperWidth(style.paperSize);
   const pageHeight = AD.PageStyle.getPaperHeight(style.paperSize);
   const layout = style.orientation === "Landscape" ? "landscape" : "portrait";
-  const pageOptions = {
+  const pageOptions: PDFKit.PDFDocumentOptions = {
     size: [pageWidth, pageHeight],
     layout: layout,
-    margins: {
-      top: 0,
-      left: 0,
-      right: 0,
-      bottom: 0,
-    },
+    margins: { top: 0, left: 0, right: 0, bottom: 0 },
   };
   pdf.addPage(pageOptions);
   return page.contentRect;
@@ -160,7 +161,7 @@ function addPage(pdf: any, page: Page): AD.Rect.Rect {
 
 function renderSectionElement(
   parentResources: AD.Resources.Resources,
-  pdf: {},
+  pdf: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
   element: AD.SectionElement.SectionElement
@@ -181,7 +182,7 @@ function renderSectionElement(
 
 function renderGroup(
   resources: AD.Resources.Resources,
-  pdf: {},
+  pdfKit: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
   group: AD.Group.Group
@@ -194,7 +195,7 @@ function renderGroup(
     const isAbsolute = AD.Position.isPositionAbsolute(element);
     renderSectionElement(
       resources,
-      pdf,
+      pdfKit,
       desiredSizes,
       AD.Rect.create(finalX, isAbsolute ? startY : y, elementSize.width, elementSize.height),
       element
@@ -207,7 +208,7 @@ function renderGroup(
 
 function renderParagraph(
   resources: AD.Resources.Resources,
-  pdf: {},
+  pdfKit: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
   paragraph: AD.Paragraph.Paragraph
@@ -317,7 +318,7 @@ function renderParagraph(
       const atomSize = getDesiredSize(atom, desiredSizes);
       renderAtom(
         resources,
-        pdf,
+        pdfKit,
         AD.Rect.create(x, y, atomSize.width, atomSize.height),
         style.textStyle,
         atom,
@@ -352,7 +353,7 @@ function parseAlignment(paragraphAlignment: AD.ParagraphStyle.TextAlignment | un
 
 function renderAtom(
   resources: AD.Resources.Resources,
-  pdf: {},
+  pdfKit: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   atom: AD.Atom.Atom,
@@ -363,19 +364,39 @@ function renderAtom(
 ): void {
   switch (atom.type) {
     case "TextField":
-      renderTextField(resources, pdf, finalRect, textStyle, atom, alignment, isFirstAtom, isLastAtom, availableWidth);
+      renderTextField(
+        resources,
+        pdfKit,
+        finalRect,
+        textStyle,
+        atom,
+        alignment,
+        isFirstAtom,
+        isLastAtom,
+        availableWidth
+      );
       return;
     case "TextRun":
-      renderTextRun(resources, pdf, finalRect, textStyle, atom, alignment, isFirstAtom, isLastAtom, availableWidth);
+      renderTextRun(resources, pdfKit, finalRect, textStyle, atom, alignment, isFirstAtom, isLastAtom, availableWidth);
       return;
     case "Image":
-      renderImage(resources, pdf, finalRect, textStyle, atom);
+      renderImage(resources, pdfKit, finalRect, textStyle, atom);
       return;
     case "HyperLink":
-      renderHyperLink(resources, pdf, finalRect, textStyle, atom, alignment, isFirstAtom, isLastAtom, availableWidth);
+      renderHyperLink(
+        resources,
+        pdfKit,
+        finalRect,
+        textStyle,
+        atom,
+        alignment,
+        isFirstAtom,
+        isLastAtom,
+        availableWidth
+      );
       return;
     case "TocSeparator":
-      renderTocSeparator(pdf, finalRect, textStyle, atom);
+      renderTocSeparator(pdfKit, finalRect, textStyle, atom);
       return;
     case "LinkTarget":
       return;
@@ -386,7 +407,7 @@ function renderAtom(
 
 function renderTextField(
   resources: AD.Resources.Resources,
-  pdf: {},
+  pdfKit: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   textField: AD.TextField.TextField,
@@ -405,7 +426,7 @@ function renderTextField(
   switch (textField.fieldType) {
     case "Date":
       drawText(
-        pdf,
+        pdfKit,
         finalRect,
         style,
         new Date(Date.now()).toDateString(),
@@ -419,7 +440,7 @@ function renderTextField(
     case "TotalPages":
     case "PageNumberOf":
       if (textField.text) {
-        drawText(pdf, finalRect, style, textField.text, alignment, isFirstAtom, isLastAtom, availableWidth);
+        drawText(pdfKit, finalRect, style, textField.text, alignment, isFirstAtom, isLastAtom, availableWidth);
       }
       return;
   }
@@ -427,7 +448,7 @@ function renderTextField(
 
 function renderTextRun(
   resources: AD.Resources.Resources,
-  pdf: {},
+  pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   textRun: AD.TextRun.TextRun,
@@ -450,7 +471,7 @@ function renderTextRun(
 
 function renderHyperLink(
   resources: AD.Resources.Resources,
-  pdf: {},
+  pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   hyperLink: AD.HyperLink.HyperLink,
@@ -471,7 +492,7 @@ function renderHyperLink(
 }
 
 function renderTocSeparator(
-  pdf: {},
+  pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   tocSeparator: AD.TocSeparator.TocSeparator
@@ -480,7 +501,7 @@ function renderTocSeparator(
 }
 
 function drawHyperLink(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   hyperLink: AD.HyperLink.HyperLink,
@@ -522,10 +543,7 @@ function drawHyperLink(
       ...(textStyle.lineGap !== undefined ? { lineGap: textStyle.lineGap } : {}),
     });
     if (textStyle.underline === undefined ? true : textStyle.underline) {
-      pdf.underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, {
-        align: isSingleAtom ? alignment : "left",
-        color: "blue",
-      });
+      pdf.underline(xUnderline, finalRect.y + 2, finalRect.width, finalRect.height, { color: "blue" });
     }
   } else {
     pdf.text(hyperLink.text, {
@@ -550,7 +568,7 @@ function drawHyperLink(
 }
 
 function drawText(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   text: string,
@@ -599,7 +617,7 @@ function drawText(
 }
 
 function drawDottedLine(
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
   tocSeparator: AD.TocSeparator.TocSeparator
@@ -648,7 +666,7 @@ function drawDottedLine(
 
 function renderTable(
   resources: AD.Resources.Resources,
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
   table: AD.Table.Table
@@ -678,7 +696,7 @@ function renderTable(
 
 function renderRow(
   resources: AD.Resources.Resources,
-  pdf: {},
+  pdf: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
   tableCellStyle: AD.TableCellStyle.TableCellStyle,
@@ -714,7 +732,7 @@ function renderRow(
 
 function renderCell(
   resources: AD.Resources.Resources,
-  pdf: any,
+  pdf: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
   tableCellStyle: AD.TableCellStyle.TableCellStyle,
@@ -818,7 +836,7 @@ function getDesiredSize(element: {}, desiredSizes: Map<{}, AD.Size.Size>): AD.Si
   throw new Error("Could not find size for element!");
 }
 
-function applyTextOffset(pdf: any, textStyle: AD.TextStyle.TextStyle): void {
+function applyTextOffset(pdf: PDFKit.PDFDocument, textStyle: AD.TextStyle.TextStyle): void {
   const offset = calculateTextOffset(textStyle);
   if (offset < 0) {
     pdf.moveDown(Math.abs(offset));
@@ -827,7 +845,7 @@ function applyTextOffset(pdf: any, textStyle: AD.TextStyle.TextStyle): void {
   }
 }
 
-function resetTextOffset(pdf: any, textStyle: AD.TextStyle.TextStyle): void {
+function resetTextOffset(pdf: PDFKit.PDFDocument, textStyle: AD.TextStyle.TextStyle): void {
   const offset = calculateTextOffset(textStyle);
   if (offset < 0) {
     pdf.moveUp(Math.abs(offset));

package/src/abstract-document-xml/parse-xml/parse-xml.ts

@@ -1,4 +1,4 @@
-import { X2jOptions, X2jOptionsOptional, XMLParser } from "fast-xml-parser";
+import { X2jOptions, XMLParser } from "fast-xml-parser";
 import Mustache from "mustache";
 import { xsd } from "../xsd-template";
 import { errorToReadableText, validateXml } from "./validation";
@@ -60,7 +60,7 @@ export function parseMustacheXml(
   return { type: "Ok", xml: parseXml(mustacheResolvedXml, options) };
 }
 
-export function parseXml(text: string, options?: X2jOptionsOptional): ReadonlyArray<XmlElement> {
+export function parseXml(text: string, options?: Partial<X2jOptions>): ReadonlyArray<XmlElement> {
   const parser = new XMLParser(options);
   // Unescape HTML entity
   parser.addEntity("#x2F", "/");