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

abstract-document 6.4.0 → 6.7.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 (296) hide show

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun baseline hanging.pdf ADDED Viewed

@@ -0,0 +1,113 @@
+%PDF-1.3
+%����
+7 0 obj
+<<
+/Type /Page
+/Parent 1 0 R
+/MediaBox [0 0 595 842]
+/Contents 5 0 R
+/Resources 6 0 R
+>>
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/F1 8 0 R
+>>
+>>
+endobj
+5 0 obj
+<<
+/Length 121
+>>
+stream
+1 0 0 -1 0 842 cm
+/DeviceRGB cs
+0 0 0 scn
+q
+1 0 0 -1 0 842 cm
+BT
+1 0 0 1 0 836.256 Tm
+/F1 10 Tf
+[<48656c6c6f> 0] TJ
+ET
+Q
+endstream
+endobj
+10 0 obj
+(PDFKit)
+endobj
+11 0 obj
+(PDFKit)
+endobj
+12 0 obj
+(D:20220215122943Z)
+endobj
+9 0 obj
+<<
+/Producer 10 0 R
+/Creator 11 0 R
+/CreationDate 12 0 R
+>>
+endobj
+8 0 obj
+<<
+/Type /Font
+/BaseFont /Helvetica
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+>>
+endobj
+4 0 obj
+<<
+>>
+endobj
+3 0 obj
+<<
+/Type /Catalog
+/Pages 1 0 R
+/Names 2 0 R
+>>
+endobj
+1 0 obj
+<<
+/Type /Pages
+/Count 1
+/Kids [7 0 R]
+>>
+endobj
+2 0 obj
+<<
+/Dests <<
+  /Names [
+]
+>>
+>>
+endobj
+xref
+0 13
+0000000000 65535 f
+0000000721 00000 n
+0000000778 00000 n
+0000000659 00000 n
+0000000638 00000 n
+0000000208 00000 n
+0000000119 00000 n
+0000000015 00000 n
+0000000541 00000 n
+0000000466 00000 n
+0000000380 00000 n
+0000000405 00000 n
+0000000430 00000 n
+trailer
+<<
+/Size 13
+/Root 3 0 R
+/Info 9 0 R
+/ID [<882575d1de7b05f6358c58969995a639> <882575d1de7b05f6358c58969995a639>]
+>>
+startxref
+825
+%%EOF

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun baseline middle.pdf ADDED Viewed

@@ -0,0 +1,113 @@
+%PDF-1.3
+%����
+7 0 obj
+<<
+/Type /Page
+/Parent 1 0 R
+/MediaBox [0 0 595 842]
+/Contents 5 0 R
+/Resources 6 0 R
+>>
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/F1 8 0 R
+>>
+>>
+endobj
+5 0 obj
+<<
+/Length 121
+>>
+stream
+1 0 0 -1 0 842 cm
+/DeviceRGB cs
+0 0 0 scn
+q
+1 0 0 -1 0 842 cm
+BT
+1 0 0 1 0 839.445 Tm
+/F1 10 Tf
+[<48656c6c6f> 0] TJ
+ET
+Q
+endstream
+endobj
+10 0 obj
+(PDFKit)
+endobj
+11 0 obj
+(PDFKit)
+endobj
+12 0 obj
+(D:20220215122943Z)
+endobj
+9 0 obj
+<<
+/Producer 10 0 R
+/Creator 11 0 R
+/CreationDate 12 0 R
+>>
+endobj
+8 0 obj
+<<
+/Type /Font
+/BaseFont /Helvetica
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+>>
+endobj
+4 0 obj
+<<
+>>
+endobj
+3 0 obj
+<<
+/Type /Catalog
+/Pages 1 0 R
+/Names 2 0 R
+>>
+endobj
+1 0 obj
+<<
+/Type /Pages
+/Count 1
+/Kids [7 0 R]
+>>
+endobj
+2 0 obj
+<<
+/Dests <<
+  /Names [
+]
+>>
+>>
+endobj
+xref
+0 13
+0000000000 65535 f
+0000000721 00000 n
+0000000778 00000 n
+0000000659 00000 n
+0000000638 00000 n
+0000000208 00000 n
+0000000119 00000 n
+0000000015 00000 n
+0000000541 00000 n
+0000000466 00000 n
+0000000380 00000 n
+0000000405 00000 n
+0000000430 00000 n
+trailer
+<<
+/Size 13
+/Root 3 0 R
+/Info 9 0 R
+/ID [<2826ab3091cb36de7a540836ed65a6d7> <2826ab3091cb36de7a540836ed65a6d7>]
+>>
+startxref
+825
+%%EOF

package/src/abstract-document-exporters/__tests__/pdf/tmp/Single textrun baseline top.pdf ADDED Viewed

@@ -0,0 +1,113 @@
+%PDF-1.3
+%����
+7 0 obj
+<<
+/Type /Page
+/Parent 1 0 R
+/MediaBox [0 0 595 842]
+/Contents 5 0 R
+/Resources 6 0 R
+>>
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/F1 8 0 R
+>>
+>>
+endobj
+5 0 obj
+<<
+/Length 120
+>>
+stream
+1 0 0 -1 0 842 cm
+/DeviceRGB cs
+0 0 0 scn
+q
+1 0 0 -1 0 842 cm
+BT
+1 0 0 1 0 834.82 Tm
+/F1 10 Tf
+[<48656c6c6f> 0] TJ
+ET
+Q
+endstream
+endobj
+10 0 obj
+(PDFKit)
+endobj
+11 0 obj
+(PDFKit)
+endobj
+12 0 obj
+(D:20220215122943Z)
+endobj
+9 0 obj
+<<
+/Producer 10 0 R
+/Creator 11 0 R
+/CreationDate 12 0 R
+>>
+endobj
+8 0 obj
+<<
+/Type /Font
+/BaseFont /Helvetica
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+>>
+endobj
+4 0 obj
+<<
+>>
+endobj
+3 0 obj
+<<
+/Type /Catalog
+/Pages 1 0 R
+/Names 2 0 R
+>>
+endobj
+1 0 obj
+<<
+/Type /Pages
+/Count 1
+/Kids [7 0 R]
+>>
+endobj
+2 0 obj
+<<
+/Dests <<
+  /Names [
+]
+>>
+>>
+endobj
+xref
+0 13
+0000000000 65535 f
+0000000720 00000 n
+0000000777 00000 n
+0000000658 00000 n
+0000000637 00000 n
+0000000208 00000 n
+0000000119 00000 n
+0000000015 00000 n
+0000000540 00000 n
+0000000465 00000 n
+0000000379 00000 n
+0000000404 00000 n
+0000000429 00000 n
+trailer
+<<
+/Size 13
+/Root 3 0 R
+/Info 9 0 R
+/ID [<37ad9551cfbb53c3cc6eb4091d522975> <37ad9551cfbb53c3cc6eb4091d522975>]
+>>
+startxref
+824
+%%EOF

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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<5794634c8a4f2772e355433c2914b54f> <5794634c8a4f2772e355433c2914b54f>]
+/ID [<850dd4d668179313b1e5773d8b14850d> <850dd4d668179313b1e5773d8b14850d>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<956e3e639128f050a183967cefd7e2fb> <956e3e639128f050a183967cefd7e2fb>]
+/ID [<7e3be9b2d88f0c0c75642c26051b3051> <7e3be9b2d88f0c0c75642c26051b3051>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<ecfd9302cc515b70fbcfd09366cb1efd> <ecfd9302cc515b70fbcfd09366cb1efd>]
+/ID [<5e08ab0f0eb660327eb959e5fad9cebd> <5e08ab0f0eb660327eb959e5fad9cebd>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<f93aae53ea6bc70272d0e20177f0ad1c> <f93aae53ea6bc70272d0e20177f0ad1c>]
+/ID [<69267e383428e163b950b8f6f80485fb> <69267e383428e163b950b8f6f80485fb>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<3683b78eac37afbc7bd98277b3aef4cf> <3683b78eac37afbc7bd98277b3aef4cf>]
+/ID [<61ecad3fe58db84137e7d2ab2041a119> <61ecad3fe58db84137e7d2ab2041a119>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<f9c7d6851ba22dd9411cbffa27098df3> <f9c7d6851ba22dd9411cbffa27098df3>]
+/ID [<736a7c7fc3d67886bd3e84197d5003c4> <736a7c7fc3d67886bd3e84197d5003c4>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<1515a889e1a7ab6c3b080842b51d9078> <1515a889e1a7ab6c3b080842b51d9078>]
+/ID [<26da2455df14075a8d7880b9c05e6288> <26da2455df14075a8d7880b9c05e6288>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -126,7 +126,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<d5d827414bc4b7346a369cfecec66c25> <d5d827414bc4b7346a369cfecec66c25>]
+/ID [<ffd1e59d8954a8073c061263a0ef0363> <ffd1e59d8954a8073c061263a0ef0363>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<ee0c991f78209c559ad2bf9290ab5cbd> <ee0c991f78209c559ad2bf9290ab5cbd>]
+/ID [<3b1060bf5da0c2e3f42298cf380b6984> <3b1060bf5da0c2e3f42298cf380b6984>]
 >>
 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:20220215122943Z)
 endobj
 12 0 obj
 <<
@@ -150,7 +150,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<e240d9002d21a37a30ebcd421fb986a3> <e240d9002d21a37a30ebcd421fb986a3>]
+/ID [<8a750fe54e8b7b7c776626edd30c9512> <8a750fe54e8b7b7c776626edd30c9512>]
 >>
 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:20220215122942Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<21816c3e20efc2272ef0b485514d10ea> <21816c3e20efc2272ef0b485514d10ea>]
+/ID [<0277c1a2bcf8027307a6a0802c9f6fb0> <0277c1a2bcf8027307a6a0802c9f6fb0>]
 >>
 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:20220215122943Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<b4e36add613f2271ddea1e998d10d746> <b4e36add613f2271ddea1e998d10d746>]
+/ID [<a38fd26bcbe3213b9bf7ac14dce2a0a6> <a38fd26bcbe3213b9bf7ac14dce2a0a6>]
 >>
 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
@@ -98,7 +98,7 @@ function measureParagraph(
     paragraph.styleName,
     resources
   ) as AD.ParagraphStyle.ParagraphStyle;
-  const contentAvailableWidth = availableSize.width - (style.margins.left + style.margins.left);
+  const contentAvailableWidth = availableSize.width - (style.margins.left + style.margins.right);
   const contentAvailableHeight = availableSize.height - (style.margins.top + style.margins.bottom);
   const contentAvailableSize = AD.Size.create(contentAvailableWidth, contentAvailableHeight);
@@ -216,7 +216,9 @@ export function measureTable(
         const elementSizes = measureSectionElement(pdf, resources, elementAvailableSize, element);
         elementSizes.forEach((v, k) => desiredSizes.set(k, v));
         const elementSize = getDesiredSize(element, desiredSizes);
-        cellDesiredHeight += elementSize.height;
+        if (!AD.Position.isPositionAbsolute(element)) {
+          cellDesiredHeight += elementSize.height;
+        }
       }
       desiredSizes.set(cell, AD.Size.create(cellWidth, cellDesiredHeight));
@@ -253,7 +255,13 @@ function measureGroup(
   let desiredSizes = mergeMaps(
     keepTogether.children.map((e) => measureSectionElement(pdf, resources, availableSize, e))
   );
-  let desiredHeight = R.reduce((sum, e) => sum + getDesiredSize(e, desiredSizes).height, 0.0, keepTogether.children);
+  let desiredHeight = R.reduce(
+    (sum, e) => {
+      return sum + (AD.Position.isPositionAbsolute(e) ? 0 : getDesiredSize(e, desiredSizes).height);
+    },
+    0.0,
+    keepTogether.children
+  );
   desiredSizes.set(keepTogether, AD.Size.create(availableSize.width, desiredHeight));
   return desiredSizes;
 }
@@ -373,7 +381,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/paginate.ts CHANGED Viewed

@@ -75,9 +75,10 @@ function splitSection(
       i--;
       continue;
     }
+    const isPositionAbsolute = AD.Position.isPositionAbsolute(element);
     elements.push(element);
-    elementsHeight += elementSize.height;
+    elementsHeight += isPositionAbsolute ? 0 : elementSize.height;
     const [leadingSpace, trailingSpace] = getLeadingAndTrailingSpace(resources, section, elements);
     const availableHeight = contentRect.height + leadingSpace + trailingSpace;
@@ -85,7 +86,7 @@ function splitSection(
       if (element.type === "Table" && element.children.length > 1) {
         //Remove last element
         elements.pop();
-        elementsHeight -= elementSize.height;
+        elementsHeight -= elementSize.height; //TODO: handle absolute positioned elements
         //Try to split table
         const [tableHead, tableTail] = splitTable(