abstract-document 9.1.0 → 10.0.1

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

@@ -61,7 +61,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240320125109Z)
+(D:20240506102905Z)
 endobj
 10 0 obj
 <<
@@ -125,7 +125,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<0a979361777b86bd63ddcc9139add520> <0a979361777b86bd63ddcc9139add520>]
+/ID [<3f379857fb315c7be45627256ec827d2> <3f379857fb315c7be45627256ec827d2>]
 >>
 startxref
 1499

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

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240320125109Z)
+(D:20240506102905Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<e150432e30563fbfc05f97b2120fa483> <e150432e30563fbfc05f97b2120fa483>]
+/ID [<90a92935fb526cad64d46c41d7100763> <90a92935fb526cad64d46c41d7100763>]
 >>
 startxref
 929

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

@@ -75,7 +75,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240320125109Z)
+(D:20240506102905Z)
 endobj
 10 0 obj
 <<
@@ -139,7 +139,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<002fe6d9f711b2f3d693437d96f4b9b0> <002fe6d9f711b2f3d693437d96f4b9b0>]
+/ID [<f3fe555614e88b59386cd27ac59fe3da> <f3fe555614e88b59386cd27ac59fe3da>]
 >>
 startxref
 1173

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

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240320125109Z)
+(D:20240506102905Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<ae6c8e6c8959ce4bdcd525f744cc2493> <ae6c8e6c8959ce4bdcd525f744cc2493>]
+/ID [<554c4b3f9289829c744efdb8910b1e29> <554c4b3f9289829c744efdb8910b1e29>]
 >>
 startxref
 905

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

@@ -71,7 +71,7 @@ endobj
 (PDFKit)
 endobj
 14 0 obj
-(D:20240320125109Z)
+(D:20240506102905Z)
 endobj
 11 0 obj
 <<
@@ -136,7 +136,7 @@ trailer
 /Size 15
 /Root 3 0 R
 /Info 11 0 R
-/ID [<ec423255595052e240dba47b2b0b5f46> <ec423255595052e240dba47b2b0b5f46>]
+/ID [<b64ad567264a234856505fc2b283c771> <b64ad567264a234856505fc2b283c771>]
 >>
 startxref
 1232

package/src/abstract-document-exporters/__tests__/pdf/tmp/hello with roman font.pdf

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240320125108Z)
+(D:20240506102903Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<fe823ddc3637f7edfd45e6b5ae382658> <fe823ddc3637f7edfd45e6b5ae382658>]
+/ID [<8166408dd6c7d6012ea4d0562947d0d4> <8166408dd6c7d6012ea4d0562947d0d4>]
 >>
 startxref
 975

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

@@ -93,7 +93,7 @@ endobj
 (PDFKit)
 endobj
 16 0 obj
-(D:20240320125108Z)
+(D:20240506102904Z)
 endobj
 13 0 obj
 <<
@@ -160,7 +160,7 @@ trailer
 /Size 17
 /Root 3 0 R
 /Info 13 0 R
-/ID [<a573e385265f5127b3caa87b5284387f> <a573e385265f5127b3caa87b5284387f>]
+/ID [<574e653cc1990a6c41fe4d3df6684e71> <574e653cc1990a6c41fe4d3df6684e71>]
 >>
 startxref
 1330

package/src/abstract-document-exporters/__tests__/pdf/tmp/pagebreak.pdf

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240320125108Z)
+(D:20240506102903Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<60db0bdd474d794581bba8cdb1ae4fe9> <60db0bdd474d794581bba8cdb1ae4fe9>]
+/ID [<32fc04358b5a76bae66d46f385615ccc> <32fc04358b5a76bae66d46f385615ccc>]
 >>
 startxref
 905

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

@@ -53,7 +53,7 @@ endobj
 (PDFKit)
 endobj
 13 0 obj
-(D:20240320125109Z)
+(D:20240506102905Z)
 endobj
 10 0 obj
 <<
@@ -117,7 +117,7 @@ trailer
 /Size 14
 /Root 3 0 R
 /Info 10 0 R
-/ID [<cbe28391cdc70c80cdbb476cb2d8ff19> <cbe28391cdc70c80cdbb476cb2d8ff19>]
+/ID [<3c79896e6e110e1f873358a97c2dd614> <3c79896e6e110e1f873358a97c2dd614>]
 >>
 startxref
 918

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

@@ -1,4 +1,3 @@
-import * as R from "ramda";
 import * as AD from "../../abstract-document/index";
 import { exhaustiveCheck } from "ts-exhaustive-check";
 import { Page } from "./paginate";
@@ -55,7 +54,7 @@ function measureSection(
   const footerAvailableSize = AD.Size.create(footerAvailableWidth, pageHeight);
   const footerSizes = footer.map((e) => measureSectionElement(pdf, resources, footerAvailableSize, e));
 
-  return mergeMaps(R.unnest([sectionSizes, headerSizes, footerSizes]));
+  return mergeMaps([...sectionSizes, ...headerSizes, ...footerSizes]);
 }
 
 function measureSectionElement(
@@ -299,12 +298,9 @@ function measureGroup(
   let desiredSizes = mergeMaps(
     keepTogether.children.map((e) => measureSectionElement(pdf, resources, availableSize, e))
   );
-  let desiredHeight = R.reduce(
-    (sum, e) => {
-      return sum + (AD.Position.isPositionAbsolute(e) ? 0 : getDesiredSize(e, desiredSizes).height);
-    },
-    0.0,
-    keepTogether.children
+  let desiredHeight = keepTogether.children.reduce(
+    (sum, e) => sum + (AD.Position.isPositionAbsolute(e) ? 0 : getDesiredSize(e, desiredSizes).height),
+    0.0
   );
   desiredSizes.set(keepTogether, AD.Size.create(availableSize.width, desiredHeight));
   return desiredSizes;

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

@@ -1,7 +1,4 @@
-import * as R from "ramda";
-import { split } from "ramda";
 import * as AD from "../../abstract-document/index";
-import { Table } from "../../abstract-document/section-elements/table";
 import { getResources } from "../shared/get_resources";
 import { registerFonts } from "./font";
 import { measureTable } from "./measure";
@@ -222,9 +219,9 @@ function createPage(
 
   const sectionName = isFirst && section.id !== "" ? [section.id] : [];
   // For now, only support link targets at base level. Tree search would be needed to find all targets.
-  const targetNames = R.unnest(
-    elements.map((e) => (e.type === "Paragraph" ? e.children.map((c) => (c.type === "LinkTarget" ? c.name : "")) : []))
-  ).filter((t) => t !== "");
+  const targetNames = elements
+    .flatMap((e) => (e.type === "Paragraph" ? e.children.map((c) => (c.type === "LinkTarget" ? c.name : "")) : []))
+    .filter((t) => t !== "");
   const namedDestionations = [...sectionName, ...targetNames];
 
   // Ignore leading space by expanding the content rect upwards

package/src/abstract-document-exporters/pdf/pre-process.ts

@@ -1,4 +1,3 @@
-import * as R from "ramda";
 import * as AD from "../../abstract-document/index";
 import { exhaustiveCheck } from "ts-exhaustive-check/lib-cjs";
 import * as TextStyle from "../../abstract-document/styles/text-style";
@@ -50,20 +49,10 @@ export function preProcess(doc: AD.AbstractDoc.AbstractDoc): AD.AbstractDoc.Abst
 
 function preProcessSection(s: AD.Section.Section, parentResources: AD.Resources.Resources): AD.Section.Section {
   const resources = AD.Resources.mergeResources([parentResources, s]);
-  const header = R.unnest<AD.SectionElement.SectionElement>(
-    s.page.header.map((e) => preProcessSectionElement(e, resources))
-  );
-  const footer = R.unnest<AD.SectionElement.SectionElement>(
-    s.page.footer.map((e) => preProcessSectionElement(e, resources))
-  );
-  const page = AD.MasterPage.create({
-    style: s.page.style,
-    header: header,
-    footer: footer,
-  });
-  const children = R.unnest<AD.SectionElement.SectionElement>(
-    s.children.map((e) => preProcessSectionElement(e, resources))
-  );
+  const header = s.page.header.flatMap((e) => preProcessSectionElement(e, resources));
+  const footer = s.page.footer.flatMap((e) => preProcessSectionElement(e, resources));
+  const page = AD.MasterPage.create({ style: s.page.style, header: header, footer: footer });
+  const children = s.children.flatMap((e) => preProcessSectionElement(e, resources));
   return AD.Section.create({ page: page, id: s.id }, children);
 }
 
@@ -264,24 +253,6 @@ function toChar(num: number): string {
   return builder;
 }
 
-// function preProcessTextRun(r: AD.TextRun.TextRun, paragraph: AD.Paragraph.Paragraph): AD.Paragraph.Paragraph {
-//   console.log("text", r.text);
-//   const text = (!r.text ? [""] : r.text.split(' ')).filter((f) => f!=="");
-//   const children: Array<AD.Atom.Atom> = R.addIndex(R.map)((s, i) => AD.TextRun.create({
-//     text: s + (i == text.length - 1 ? "" : " "),
-//     styleName: r.styleName,
-//     textProperties: r.textProperties
-//   }), text);
-//   console.log("children", children);
-//   return AD.Paragraph.create({
-//     styleName: paragraph.styleName,
-//     paragraphProperties: paragraph.paragraphProperties,
-//     textProperties: paragraph.textProperties,
-//     children,
-//     numbering: paragraph.numbering
-//   });
-// }
-
 function preProcessTable(table: AD.Table.Table, resources: AD.Resources.Resources): AD.SectionElement.SectionElement {
   const processedHeaders = [];
   const processedChildren = [];
@@ -352,16 +323,9 @@ function preProcessTableRow(
 }
 
 function preProcessTableCell(c: AD.TableCell.TableCell, resources: AD.Resources.Resources): AD.TableCell.TableCell {
-  const children = R.unnest<AD.SectionElement.SectionElement>(
-    c.children.map((e) => preProcessSectionElement(e, resources))
-  );
+  const children = c.children.flatMap((e) => preProcessSectionElement(e, resources));
   return AD.TableCell.create(
-    {
-      styleName: c.styleName,
-      columnSpan: c.columnSpan,
-      rowSpan: c.rowSpan,
-      style: c.style,
-    },
+    { styleName: c.styleName, columnSpan: c.columnSpan, rowSpan: c.rowSpan, style: c.style },
     children
   );
 }
@@ -370,9 +334,7 @@ function preProcessGroup(
   group: AD.Group.Group,
   parentResources: AD.Resources.Resources
 ): Array<AD.SectionElement.SectionElement> {
-  const children = R.unnest<AD.SectionElement.SectionElement>(
-    group.children.map((e) => preProcessSectionElement(e, parentResources))
-  );
+  const children = group.children.flatMap((e) => preProcessSectionElement(e, parentResources));
   if (group.keepTogether || AD.Resources.hasResources(group) || group.style.position === "absolute") {
     return [
       AD.Group.create(

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

@@ -62,6 +62,7 @@ function abstractComponentToPdf(
         let svgUpdated = svg;
         ["fill=", "stroke=", "color="].forEach((t) => {
           let index = 0;
+          // eslint-disable-next-line no-constant-condition
           while (true) {
             index = svgUpdated.indexOf(t, index);
             if (index === -1) break;
@@ -80,6 +81,7 @@ function abstractComponentToPdf(
 
         ["stroke-dasharray="].forEach((t) => {
           let index = 0;
+          // eslint-disable-next-line no-constant-condition
           while (true) {
             index = svgUpdated.indexOf(t, index);
             if (index === -1) break;

package/src/abstract-document-jsx/index.ts

@@ -1,4 +1,3 @@
-import * as R from "ramda";
 import * as React from "react";
 import {
   AbstractDoc as AbstractDoc1,
@@ -17,16 +16,8 @@ import {
   TextRun as TextRun1,
   PageBreak as PageBreak1,
   LineBreak as LineBreak1,
-  //Resources,
-  //MasterPage,
-  //ParagraphStyle,
-  //ParagraphNumbering,
-  //TableStyle,
 } from "../abstract-document/index";
 
-// tslint:disable:variable-name no-any no-console
-// console.log(Resources, MasterPage, ParagraphStyle, ParagraphNumbering, TableStyle);
-
 export interface ChildrenProp {
   readonly children?: Child;
 }
@@ -70,17 +61,15 @@ function renderChildren(element: React.ReactElement<any>): any {
   if (!element.props || !element.props.children) {
     return [];
   } else if (Array.isArray(element.props.children)) {
-    return R.unnest(
-      element.props.children.map((c: any) => {
-        if (!c) {
-          return [];
-        }
-        if (Array.isArray(c)) {
-          return c.map(render);
-        }
-        return render(c);
-      })
-    );
+    return element.props.children.flatMap((c: any) => {
+      if (!c) {
+        return [];
+      }
+      if (Array.isArray(c)) {
+        return c.map(render);
+      }
+      return render(c);
+    });
   } else {
     const elements = render(element.props.children); // Markdown returns an array of elements already
     return Array.isArray(elements) ? elements : [elements]; // so we need to test for that before we return.

package/src/abstract-document-xml/abstract-doc-of-xml/creator.ts

@@ -1,5 +1,3 @@
-import { propIs } from "ramda";
-import { ImageProps } from "../../abstract-document/atoms/image";
 import {
   AbstractDoc,
   Atom,