npm - abstract-document - Versions diffs - 6.4.0 → 6.5.0 - Mend

abstract-document 6.4.0 → 6.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (107) hide show

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single hyperlink right aligned.pdf CHANGED Viewed

@@ -73,7 +73,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 12 0 obj
 <<
@@ -139,7 +139,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<65a369929149695b2357d5862c037fd5> <65a369929149695b2357d5862c037fd5>]
+/ID [<54306be23ba6f4aa54355d257d6a5378> <54306be23ba6f4aa54355d257d6a5378>]
 >>
 startxref
 1228

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single hyperlink.pdf CHANGED Viewed

@@ -73,7 +73,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 12 0 obj
 <<
@@ -139,7 +139,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<43148cb5a48db0565e09b0796b630eb2> <43148cb5a48db0565e09b0796b630eb2>]
+/ID [<41fbc356571cadfd23dbd14a1014a68e> <41fbc356571cadfd23dbd14a1014a68e>]
 >>
 startxref
 1209

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single image svg color hex.pdf CHANGED Viewed

@@ -108,7 +108,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 10 0 obj
 <<
@@ -172,7 +172,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<9adce57fa755143849dd48a753927b54> <9adce57fa755143849dd48a753927b54>]
+/ID [<3918561e81d57f0741260551bc03dfce> <3918561e81d57f0741260551bc03dfce>]
 >>
 startxref
 1530

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single image svg color name.pdf CHANGED Viewed

@@ -108,7 +108,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 10 0 obj
 <<
@@ -172,7 +172,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<df93e1469e8ee4eb0da13b89d0d12aa7> <df93e1469e8ee4eb0da13b89d0d12aa7>]
+/ID [<452272fc3aea4f81f5df288d5cd98ed0> <452272fc3aea4f81f5df288d5cd98ed0>]
 >>
 startxref
 1530

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single image svg color url.pdf CHANGED Viewed

@@ -154,7 +154,7 @@ endobj
 (PDFKit)
 endobj
 18 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 15 0 obj
 <<
@@ -215,7 +215,7 @@ trailer
 /Size 19
 /Root 3 0 R
 /Info 15 0 R
-/ID [<8f8d03bb31f4c92f80db759f15f1a72e> <8f8d03bb31f4c92f80db759f15f1a72e>]
+/ID [<493cb2d8821ea725684c294723d200fe> <493cb2d8821ea725684c294723d200fe>]
 >>
 startxref
 1798

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single image.pdf CHANGED Viewed

Binary file

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Center alignment that linebreaks.pdf CHANGED Viewed

@@ -51,7 +51,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<5794634c8a4f2772e355433c2914b54f> <5794634c8a4f2772e355433c2914b54f>]
+/ID [<9d29515e5ec6a20d41b421eb1ca81a28> <9d29515e5ec6a20d41b421eb1ca81a28>]
 >>
 startxref
 1427

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Center alignment.pdf CHANGED Viewed

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<956e3e639128f050a183967cefd7e2fb> <956e3e639128f050a183967cefd7e2fb>]
+/ID [<ba0f63116a63843548ad4cb7c54404f0> <ba0f63116a63843548ad4cb7c54404f0>]
 >>
 startxref
 854

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with End alignment that linebreaks.pdf CHANGED Viewed

@@ -51,7 +51,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<ecfd9302cc515b70fbcfd09366cb1efd> <ecfd9302cc515b70fbcfd09366cb1efd>]
+/ID [<d7a3b23e2ec3180457866d6303d28653> <d7a3b23e2ec3180457866d6303d28653>]
 >>
 startxref
 1427

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with End alignment.pdf CHANGED Viewed

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<f93aae53ea6bc70272d0e20177f0ad1c> <f93aae53ea6bc70272d0e20177f0ad1c>]
+/ID [<f4846f0552ac0e6db2d58f73a2309d08> <f4846f0552ac0e6db2d58f73a2309d08>]
 >>
 startxref
 853

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Justify alignment.pdf CHANGED Viewed

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<3683b78eac37afbc7bd98277b3aef4cf> <3683b78eac37afbc7bd98277b3aef4cf>]
+/ID [<5cac7591b21e4a30b599de6c544be180> <5cac7591b21e4a30b599de6c544be180>]
 >>
 startxref
 848

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Start alignment that linebreaks.pdf CHANGED Viewed

@@ -51,7 +51,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<f9c7d6851ba22dd9411cbffa27098df3> <f9c7d6851ba22dd9411cbffa27098df3>]
+/ID [<cf0bc121be9f78bc94997565360fce90> <cf0bc121be9f78bc94997565360fce90>]
 >>
 startxref
 1418

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with Start alignment.pdf CHANGED Viewed

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<1515a889e1a7ab6c3b080842b51d9078> <1515a889e1a7ab6c3b080842b51d9078>]
+/ID [<41e6127e78ee3efe2c987b26324c3347> <41e6127e78ee3efe2c987b26324c3347>]
 >>
 startxref
 848

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun with super and subscripts.pdf CHANGED Viewed

@@ -63,7 +63,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -126,7 +126,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<d5d827414bc4b7346a369cfecec66c25> <d5d827414bc4b7346a369cfecec66c25>]
+/ID [<1bf6530e544b32c0fdb03695babaa7c1> <1bf6530e544b32c0fdb03695babaa7c1>]
 >>
 startxref
 1076

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun.pdf CHANGED Viewed

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<ee0c991f78209c559ad2bf9290ab5cbd> <ee0c991f78209c559ad2bf9290ab5cbd>]
+/ID [<bb4e849828d6652e881b71e25a89302a> <bb4e849828d6652e881b71e25a89302a>]
 >>
 startxref
 824

package/src/abstract-document-exporters/__tests__/pdf/tmp/Table of content separator.pdf CHANGED Viewed

@@ -84,7 +84,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 12 0 obj
 <<
@@ -150,7 +150,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<e240d9002d21a37a30ebcd421fb986a3> <e240d9002d21a37a30ebcd421fb986a3>]
+/ID [<aff467c850a90b8753d7857e8c793026> <aff467c850a90b8753d7857e8c793026>]
 >>
 startxref
 1439

package/src/abstract-document-exporters/__tests__/pdf/tmp/hello.pdf CHANGED Viewed

@@ -79,7 +79,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20211124154320Z)
+(D:20220105111758Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<21816c3e20efc2272ef0b485514d10ea> <21816c3e20efc2272ef0b485514d10ea>]
+/ID [<0ff0e795ffbd1e504a7e1c674a4e4be6> <0ff0e795ffbd1e504a7e1c674a4e4be6>]
 >>
 startxref
 1212

package/src/abstract-document-exporters/__tests__/pdf/tmp/world.pdf CHANGED Viewed

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20211124154320Z)
+(D:20220105111759Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<b4e36add613f2271ddea1e998d10d746> <b4e36add613f2271ddea1e998d10d746>]
+/ID [<34aa326327ae950341773bad4e6b0ff8> <34aa326327ae950341773bad4e6b0ff8>]
 >>
 startxref
 837

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

@@ -50,11 +50,11 @@ function abstractComponentToDocX(
     //     preserveAspectRatio: "xMinYMin",
     //     //fontCallback: component.overrideSvgFont
     //     //  ? (_family: string, _bold: boolean, _italic: boolean) => {
-    //     //      return getFontName(textStyle);
+    //     //      return getFontNameStyle(textStyle);
     //     //    }
     //     //  : undefined,
     //     // fontCallback: (_family: string, _bold: boolean, _italic: boolean) => {
-    //     //   return getFontName(textStyle);
+    //     //   return getFontNameStyle(textStyle);
     //     // }
     //   });
     // }

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

@@ -22,18 +22,27 @@ export function registerFonts(
   }
 }
-export function getFontName(textStyle: AD.TextStyle.TextStyle): string {
-  const name = textStyle.fontFamily || "Helvetica";
-  if (textStyle.bold && textStyle.italic) {
+export function getFontNameStyle(textStyle: AD.TextStyle.TextStyle): string {
+  return getFontName(textStyle.fontFamily, textStyle.bold, textStyle.italic, textStyle.mediumBold);
+}
+export function getFontName(
+  fontFamily: string | undefined,
+  bold: boolean | undefined,
+  italic: boolean | undefined,
+  mediumBold: boolean | undefined
+): string {
+  const name = fontFamily || "Helvetica";
+  if (bold && italic) {
     return name + "-BoldOblique";
-  } else if (textStyle.bold) {
-    return name + "-Bold";
-  } else if (textStyle.italic) {
-    return name + "-Oblique";
-  } else if (textStyle.mediumBold && textStyle.italic) {
+  } else if (mediumBold && italic) {
     return name + "-MediumOblique";
-  } else if (textStyle.mediumBold) {
+  } else if (bold) {
+    return name + "-Bold";
+  } else if (mediumBold) {
     return name + "-Medium";
+  } else if (italic) {
+    return name + "-Oblique";
   } else {
     return name;
   }

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

@@ -2,7 +2,7 @@ import * as R from "ramda";
 import * as AD from "../../abstract-document/index";
 import { exhaustiveCheck } from "ts-exhaustive-check";
 import { Page } from "./paginate";
-import { registerFonts, getFontName } from "./font";
+import { registerFonts, getFontNameStyle } from "./font";
 //tslint:disable:no-any variable-name
@@ -373,7 +373,7 @@ function measureText(
   textStyle: AD.TextStyle.TextStyle,
   availableSize: AD.Size.Size
 ): AD.Size.Size {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
   pdf
     .font(font)

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

@@ -2,7 +2,7 @@ import * as AbstractImage from "abstract-image";
 import * as base64 from "base64-js";
 import svgToPdfKit from "svg-to-pdfkit";
 import * as AD from "../../abstract-document";
-import { getFontName, isFontAvailable } from "./font";
+import { getFontNameStyle, getFontName, isFontAvailable } from "./font";
 export function renderImage(
   resources: AD.Resources.Resources,
@@ -84,7 +84,7 @@ function abstractComponentToPdf(
             if (isFontAvailable(family, resources)) {
               return family;
             } else {
-              return getFontName(textStyle);
+              return getFontNameStyle(textStyle);
             }
           },
         });

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

@@ -5,7 +5,7 @@ import { paginate, Page } from "./paginate";
 import { updatePageRefs } from "./update-refs";
 import BlobStream from "blob-stream";
 import { renderImage } from "./render-image";
-import { registerFonts, getFontName } from "./font";
+import { registerFonts, getFontNameStyle } from "./font";
 type RowSpans = Map<number, { rowSpanLeft: number; colSpan: number }>;
@@ -467,7 +467,7 @@ function drawHyperLink(
   isLastAtom: boolean,
   availableWidth: number
 ): void {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const isInternalLink = hyperLink.target.startsWith("#") && !hyperLink.target.startsWith("#page=");
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
   const isSingleAtom = isFirstAtom && isLastAtom;
@@ -536,7 +536,7 @@ function drawText(
   isLastAtom: boolean,
   availableWidth: number
 ): void {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
   const isSingleAtom = isFirstAtom && isLastAtom;
   pdf
@@ -573,7 +573,7 @@ function drawText(
 }
 function drawDottedLine(pdf: any, finalRect: AD.Rect.Rect, textStyle: AD.TextStyle.TextStyle): void {
-  const font = getFontName(textStyle);
+  const font = getFontNameStyle(textStyle);
   const fontSize = AD.TextStyle.calculateFontSize(textStyle, 10);
   const oneDotW = pdf.widthOfString(".", {