abstract-document 11.0.0 → 11.0.1

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

@@ -3,29 +3,28 @@ import { TextFontWeight } from "../../abstract-document/styles/text-style";
 import { getResources } from "../shared/get_resources";
 
 export function registerFonts(
-  registerFont: (fontName: string, fontSource: AD.Font.FontSource) => void,
+  registerFont: (fontName: string, fontSource: AD.Font.FontSource, fontFamily: string) => void,
   document: AD.AbstractDoc.AbstractDoc
 ): void {
   const resources = getResources(document);
-  if (resources.fonts) {
-    for (const fontName of Object.keys(resources.fonts)) {
-      const font = resources.fonts[fontName];
-      registerFont(fontName + "-Light", font.light || font.normal);
-      registerFont(fontName, font.normal);
-      registerFont(fontName + "-Medium", font.medium || font.normal);
-      registerFont(fontName + "-Bold", font.bold);
-      registerFont(fontName + "-ExtraBold", font.extraBold || font.bold);
-      registerFont(fontName + "-LightOblique", font.lightItalic || font.normal);
-      registerFont(fontName + "-LightItalic", font.lightItalic || font.normal);
-      registerFont(fontName + "-Oblique", font.italic);
-      registerFont(fontName + "-Italic", font.italic);
-      registerFont(fontName + "-BoldOblique", font.boldItalic);
-      registerFont(fontName + "-BoldItalic", font.boldItalic);
-      registerFont(fontName + "-MediumOblique", font.mediumItalic || font.italic);
-      registerFont(fontName + "-MediumItalic", font.mediumItalic || font.italic);
-      registerFont(fontName + "-ExtraBoldItalic", font.extraBoldItalic || font.boldItalic);
-      registerFont(fontName + "-ExtraBoldOblique", font.extraBoldItalic || font.boldItalic);
-    }
+  for (const [fontName, font] of Object.entries(resources.fonts ?? {})) {
+    // Required
+    registerFont(fontName, font.normal, fontName);
+    registerFont(fontName + "-Bold", font.bold, fontName);
+    registerFont(fontName + "-Light", font.light || font.normal, fontName);
+    registerFont(fontName + "-Oblique", font.italic, fontName);
+    registerFont(fontName + "-Italic", font.italic, fontName);
+    registerFont(fontName + "-BoldOblique", font.boldItalic, fontName);
+    registerFont(fontName + "-BoldItalic", font.boldItalic, fontName);
+    // Optional
+    registerFont(fontName + "-Medium", font.medium || font.normal, fontName);
+    registerFont(fontName + "-ExtraBold", font.extraBold || font.bold, fontName);
+    registerFont(fontName + "-LightOblique", font.lightItalic || font.normal, fontName);
+    registerFont(fontName + "-LightItalic", font.lightItalic || font.normal, fontName);
+    registerFont(fontName + "-MediumOblique", font.mediumItalic || font.italic, fontName);
+    registerFont(fontName + "-MediumItalic", font.mediumItalic || font.italic, fontName);
+    registerFont(fontName + "-ExtraBoldItalic", font.extraBoldItalic || font.boldItalic, fontName);
+    registerFont(fontName + "-ExtraBoldOblique", font.extraBoldItalic || font.boldItalic, fontName);
   }
 }
 

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];
 }