abstract-document 20.0.3 → 20.0.4

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

@@ -8,17 +8,25 @@ type LongWordSplit = {
   readonly width: number;
 };
 
-export function rowsSplit(rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, availableWidth: number, desiredSizes: Map<{}, AD.Size.Size>, alignment: PdfKitAlignment, pdf: PDFKit.PDFDocument, resources: AD.Resources.Resources, defaultStyle: AD.TextStyle.TextStyle): ReadonlyArray<ReadonlyArray<AD.Atom.Atom>> {
+export function rowsSplit(
+  rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>,
+  availableWidth: number,
+  desiredSizes: Map<{}, AD.Size.Size>,
+  alignment: PdfKitAlignment,
+  pdf: PDFKit.PDFDocument,
+  resources: AD.Resources.Resources,
+  defaultStyle: AD.TextStyle.TextStyle
+): ReadonlyArray<ReadonlyArray<AD.Atom.Atom>> {
   const newRows: Array<ReadonlyArray<AD.Atom.Atom>> = [];
 
-  for(const row of rows) {
-    if(row.length < 1) {
+  for (const row of rows) {
+    if (row.length < 1) {
       newRows.push(row);
       continue;
     }
-    
+
     const width = row.reduce((a, b) => a + getDesiredSize(b, desiredSizes).width, 0);
-    if(width < availableWidth) {
+    if (width < availableWidth) {
       newRows.push(row);
       continue;
     }
@@ -28,45 +36,41 @@ export function rowsSplit(rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, avai
     let currentWidth = 0;
     let lastWasSpace = false;
 
-    for(let i = 0; i < row.length; i++) {
+    for (let i = 0; i < row.length; i++) {
       const atom = row[i];
       const size = getDesiredSize(atom, desiredSizes);
       const width = size.width;
       const height = size.height;
 
-      if(atom.type !== "TextRun") {
+      if (atom.type !== "TextRun") {
         currentRow.push(atom);
         currentWidth += width;
         continue;
       }
 
-      
-      const isSpace = atom.text.replaceAll(/[\p{Zs}]/ug, "").length === 0;
+      const isSpace = atom.text.replaceAll(/[\p{Zs}]/gu, "").length === 0;
       const lastSpace = lastWasSpace;
       lastWasSpace = isSpace;
 
       //if the next atom is a space, we need to split this row early if it doesnt fit
       const nextAtom = row[i + 1];
-      const nextWidthIfSpace = 
-        !isSpace
-        && nextAtom
-        && nextAtom.type === "TextRun"
-        && nextAtom.text.replaceAll(/[\p{Zs}]/ug, "").length === 0
+      const nextWidthIfSpace =
+        !isSpace && nextAtom && nextAtom.type === "TextRun" && nextAtom.text.replaceAll(/[\p{Zs}]/gu, "").length === 0
           ? getDesiredSize(nextAtom, desiredSizes).width
           : 0;
 
-      if(isSpace && currentWidth === 0 && i !== 0 && (alignment === "left" || alignment === "justify")) {
+      if (isSpace && currentWidth === 0 && i !== 0 && (alignment === "left" || alignment === "justify")) {
         continue;
       }
-      
-      if((currentWidth + width + nextWidthIfSpace) < availableWidth) {
+
+      if (currentWidth + width + nextWidthIfSpace < availableWidth) {
         currentRow.push(atom);
         currentWidth += width;
         continue;
       }
 
       //was it a space??
-      if(isSpace) {
+      if (isSpace) {
         newRows.push(currentRow);
         currentRow = [];
         currentWidth = 0;
@@ -76,10 +80,10 @@ export function rowsSplit(rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, avai
       //it is now longer than the remaning size
       const remSize = availableWidth - (currentWidth + nextWidthIfSpace);
       const splittedWord = splitWord(atom, remSize, availableWidth, pdf, resources, defaultStyle);
-      if(splittedWord.length > 0) {
+      if (splittedWord.length > 0) {
         const heightPerRow = height / splittedWord.length;
         const [first, ...rest] = splittedWord;
-        if(!first && !rest) {
+        if (!first && !rest) {
           continue;
         }
         //add the first to the current row
@@ -88,7 +92,7 @@ export function rowsSplit(rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, avai
         currentRow.push(newFirstRowAtom);
 
         //then add new rows
-        for(const part of rest ?? []) {
+        for (const part of rest ?? []) {
           newRows.push(currentRow);
           const newAtom = { ...atom, text: part.text };
           desiredSizes.set(newAtom, { width: part.width, height: heightPerRow });
@@ -98,11 +102,15 @@ export function rowsSplit(rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, avai
         continue;
       }
 
-      newRows.push((lastSpace && (alignment === "right" || alignment === "justify")) ? currentRow.slice(0, -1) : currentRow);
+      newRows.push(
+        lastSpace && (alignment === "right" || alignment === "justify") ? currentRow.slice(0, -1) : currentRow
+      );
       currentRow = [atom];
       currentWidth = width;
     }
-    newRows.push((lastWasSpace && (alignment === "right" || alignment === "justify")) ? currentRow.slice(0, -1) : currentRow);
+    newRows.push(
+      lastWasSpace && (alignment === "right" || alignment === "justify") ? currentRow.slice(0, -1) : currentRow
+    );
   }
   return newRows;
 }
@@ -110,27 +118,34 @@ export function rowsSplit(rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, avai
 /*
   the first entry fits inside the current row
 */
-function splitWord(word: AD.TextRun.TextRun, firstRowRemainingWidth: number, rowWidth: number, pdf: PDFKit.PDFDocument, resources: AD.Resources.Resources, defaultStyle: AD.TextStyle.TextStyle): ReadonlyArray<LongWordSplit> {
+function splitWord(
+  word: AD.TextRun.TextRun,
+  firstRowRemainingWidth: number,
+  rowWidth: number,
+  pdf: PDFKit.PDFDocument,
+  resources: AD.Resources.Resources,
+  defaultStyle: AD.TextStyle.TextStyle
+): ReadonlyArray<LongWordSplit> {
   const strings: Array<LongWordSplit> = [];
   const totalWidth = stringWidth(word, pdf, word.text, resources, defaultStyle);
-  if(totalWidth < rowWidth) {
+  if (totalWidth < rowWidth) {
     return [];
   }
 
   let currentString = "";
   let atFirstRow = true;
-  for(const char of word.text) {
+  for (const char of word.text) {
     const remWidth = atFirstRow ? firstRowRemainingWidth : rowWidth;
     const newString = currentString + char;
     const newWidth = stringWidth(word, pdf, newString, resources, defaultStyle);
-    if(newWidth < remWidth) {
+    if (newWidth < remWidth) {
       currentString = newString;
       continue;
     }
 
     strings.push({
       text: currentString,
-      width: newWidth
+      width: newWidth,
     });
 
     //reset
@@ -139,19 +154,26 @@ function splitWord(word: AD.TextRun.TextRun, firstRowRemainingWidth: number, row
   }
 
   //add any remainder
-  if(currentString !== "") {
+  if (currentString !== "") {
     const newWidth = stringWidth(word, pdf, currentString, resources, defaultStyle);
     strings.push({
       text: currentString,
-      width: newWidth
+      width: newWidth,
     });
   }
 
   return strings;
 }
 
-export function rowsCombineTextRuns(resources: AD.Resources.Resources, pdf: PDFKit.PDFDocument, rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, desiredSizes: Map<{}, AD.Size.Size>, alignment: PdfKitAlignment, defaultStyle: AD.TextStyle.TextStyle): { newDesiredSizes: Map<{}, AD.Size.Size>; combinedRows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>> } {
-  if(alignment === "justify") {
+export function rowsCombineTextRuns(
+  resources: AD.Resources.Resources,
+  pdf: PDFKit.PDFDocument,
+  rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>,
+  desiredSizes: Map<{}, AD.Size.Size>,
+  alignment: PdfKitAlignment,
+  defaultStyle: AD.TextStyle.TextStyle
+): { newDesiredSizes: Map<{}, AD.Size.Size>; combinedRows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>> } {
+  if (alignment === "justify") {
     return { combinedRows: rows, newDesiredSizes: desiredSizes };
   }
 
@@ -161,31 +183,34 @@ export function rowsCombineTextRuns(resources: AD.Resources.Resources, pdf: PDFK
   let currentStyle: string = "";
 
   const newRows: Array<ReadonlyArray<AD.Atom.Atom>> = [];
-  for(const row of rows) {
+  for (const row of rows) {
     const newRow: Array<AD.Atom.Atom> = [];
     let isFirst = true;
 
-    for(let i = 0; i < row.length; i++) {
+    for (let i = 0; i < row.length; i++) {
       const atom = row[i];
       const isLast = i === row.length - 1;
       const measurement = getDesiredSize(atom, desiredSizes);
 
-      if(atom.type !== "TextRun") {
-        if(current !== undefined) {
+      if (atom.type !== "TextRun") {
+        if (current !== undefined) {
           const newTextRun = {
             ...current,
-            text: currentString
+            text: currentString,
           };
-          if(isFirst && alignment === "left") {
-            while(currentString.startsWith(" ")) {
+          if (isFirst && alignment === "left") {
+            while (currentString.startsWith(" ")) {
               currentString = currentString.slice(1);
             }
             isFirst = false;
-          } else if(isFirst) {
+          } else if (isFirst) {
             isFirst = false;
           }
           newRow.push(newTextRun);
-          desiredSizes.set(newTextRun, { width: stringWidth(current, pdf, currentString, resources, defaultStyle), height: currentHeight });
+          desiredSizes.set(newTextRun, {
+            width: stringWidth(current, pdf, currentString, resources, defaultStyle),
+            height: currentHeight,
+          });
           currentString = "";
           currentStyle = "";
           currentHeight = 0;
@@ -195,35 +220,40 @@ export function rowsCombineTextRuns(resources: AD.Resources.Resources, pdf: PDFK
         continue;
       }
 
-      const style = JSON.stringify(AD.Resources.getNestedStyle(
-        defaultStyle,
-        atom.style,
-        "TextStyle",
-        atom.styleName,
-        resources,
-        atom.nestedStyleNames || []
-      ));
-
-      if(current === undefined) {
+      const style = JSON.stringify(
+        AD.Resources.getNestedStyle(
+          defaultStyle,
+          atom.style,
+          "TextStyle",
+          atom.styleName,
+          resources,
+          atom.nestedStyleNames || []
+        )
+      );
+
+      if (current === undefined) {
         currentString = atom.text;
         current = atom;
         currentHeight = Math.max(measurement.height, currentHeight);
         currentStyle = style;
-      } else if(style !== currentStyle) {
+      } else if (style !== currentStyle) {
         const newTextRun = {
           ...current,
-          text: currentString
+          text: currentString,
         };
-        if(isFirst && alignment === "left") {
-          while(currentString.startsWith(" ")) {
+        if (isFirst && alignment === "left") {
+          while (currentString.startsWith(" ")) {
             currentString = currentString.slice(1);
           }
           isFirst = false;
-        } else if(isFirst) {
+        } else if (isFirst) {
           isFirst = false;
         }
         newRow.push(newTextRun);
-        desiredSizes.set(newTextRun, { width: stringWidth(current, pdf, currentString, resources, defaultStyle), height: currentHeight });
+        desiredSizes.set(newTextRun, {
+          width: stringWidth(current, pdf, currentString, resources, defaultStyle),
+          height: currentHeight,
+        });
         currentString = atom.text;
         currentHeight = Math.max(measurement.height, currentHeight);
         current = atom;
@@ -233,16 +263,16 @@ export function rowsCombineTextRuns(resources: AD.Resources.Resources, pdf: PDFK
         currentHeight = Math.max(measurement.height, currentHeight);
       }
 
-      if(isLast) {
-        if(current) {
+      if (isLast) {
+        if (current) {
           //does the last contain spaces at the end?
-          if(alignment === "right") {
-            while(currentString.endsWith(" ")) {
+          if (alignment === "right") {
+            while (currentString.endsWith(" ")) {
               currentString = currentString.slice(0, -1);
             }
           }
-          if(isFirst && alignment === "left") {
-            while(currentString.startsWith(" ")) {
+          if (isFirst && alignment === "left") {
+            while (currentString.startsWith(" ")) {
               currentString = currentString.slice(1);
             }
             isFirst = false;
@@ -251,9 +281,12 @@ export function rowsCombineTextRuns(resources: AD.Resources.Resources, pdf: PDFK
           const newTextRun: AD.Atom.Atom = {
             ...current,
             text: currentString,
-          }
+          };
           newRow.push(newTextRun);
-          desiredSizes.set(newTextRun, { width: stringWidth(current, pdf, currentString, resources, defaultStyle), height: currentHeight });
+          desiredSizes.set(newTextRun, {
+            width: stringWidth(current, pdf, currentString, resources, defaultStyle),
+            height: currentHeight,
+          });
         }
       }
     }
@@ -273,14 +306,15 @@ function stringWidth(
   resources: AD.Resources.Resources,
   defaultStyle: AD.TextStyle.TextStyle
 ): number {
-  const style = AD.Resources.getNestedStyle(
-    defaultStyle,
-    textRun.style,
-    "TextStyle",
-    textRun.styleName,
-    resources,
-    textRun.nestedStyleNames || []
-  ) as AD.TextStyle.TextStyle ?? defaultStyle;
+  const style =
+    (AD.Resources.getNestedStyle(
+      defaultStyle,
+      textRun.style,
+      "TextStyle",
+      textRun.styleName,
+      resources,
+      textRun.nestedStyleNames || []
+    ) as AD.TextStyle.TextStyle) ?? defaultStyle;
 
   const font = getFontNameStyle(style);
   const fontSize = AD.TextStyle.calculateFontSize(style, 10);
@@ -305,4 +339,4 @@ function getDesiredSize(element: {}, desiredSizes: Map<{}, AD.Size.Size>): AD.Si
     return size;
   }
   throw new Error("Could not find size for element!");
-}
+}

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

@@ -55,7 +55,7 @@ export function render(element: any): any {
   }
   const props = element.props || {};
   const children = renderChildren(element);
-  return (element.type as any)({ ...props, children });
+  return element.type({ ...props, children });
 }
 
 function renderChildren(element: React.ReactElement<any>): any {

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

@@ -43,7 +43,7 @@ export async function abstractDocsXml(
     const combinedReport = addResources(merge(...abstractDocs), resources);
     return { type: "Ok", value: combinedReport };
   } catch (e) {
-    return { type: "Err", error: typeof e === "string" ? e : (e as any).message };
+    return { type: "Err", error: typeof e === "string" ? e : e.message };
   }
 }
 
@@ -54,11 +54,11 @@ export function abstractDocXml(
 ): readonly [
   AbstractDoc.AbstractDoc,
   imageUrls: Record<string, true>,
-  fontFamilies: Record<string, Partial<Record<keyof Font, boolean>>>
+  fontFamilies: Record<string, Partial<Record<keyof Font, boolean>>>,
 ] {
   const xml = parseHandlebarsXml(template, data, partials);
   const [imageUrls, fontFamilies, styleNames] = extractImageFontsStyleNames(xml);
-  const doc = abstractDocXmlRecursive(creators(styleNames), xml[0]!);
+  const doc = abstractDocXmlRecursive(creators(styleNames), xml[0]);
   return [doc, imageUrls, fontFamilies];
 }
 
@@ -189,16 +189,16 @@ function extractImageFontsStyleNames(
   styleNames: Record<string, string> = {},
   images: Record<string, true> = {},
   fonts: Record<string, Partial<Record<keyof Font, boolean>>> = {},
-  currentFontFamily: string | undefined = undefined
+  currentFontFamily?: string
 ): readonly [
   imageUrls: Record<string, true>,
   fontFamilies: Record<string, Partial<Record<keyof Font, boolean>>>,
-  styleNames: Record<string, string>
+  styleNames: Record<string, string>,
 ] {
   let crFntFam = currentFontFamily;
   xmlElement.forEach((item) => {
     if (item.tagName.startsWith("Image") && item.attributes?.["src"]) {
-      images[item.attributes["src"] as string] = true;
+      images[item.attributes["src"]] = true;
     } else if (item.tagName === "style") {
       const fontFamily = crFntFam ?? styleFamilies["Default"];
       if (fontFamily) {
@@ -217,15 +217,15 @@ function extractImageFontsStyleNames(
       }
     } else if (item.attributes?.["fontFamily"]) {
       const styleName = getFontStyleName(item.attributes);
-      (fonts[item.attributes["fontFamily"] as string] ??= {})[styleName] = true;
+      (fonts[item.attributes["fontFamily"]] ??= {})[styleName] = true;
       if (item.tagName === "StyleName" && item.attributes["name"] && item.attributes["type"]) {
-        styleNames[item.attributes["name"] as string] = item.attributes["type"];
+        styleNames[item.attributes["name"]] = item.attributes["type"];
       }
     } else if (item.tagName === "StyleName" && item.attributes["name"] && item.attributes["type"]) {
-      styleNames[item.attributes["name"] as string] = item.attributes["type"];
+      styleNames[item.attributes["name"]] = item.attributes["type"];
       if (item.attributes["type"] === "TextStyle" && item.attributes["fontFamily"]) {
         const styleName = getFontStyleName(item.attributes);
-        styleFamilies[item.attributes["name"] as string] = item.attributes["fontFamily"];
+        styleFamilies[item.attributes["name"]] = item.attributes["fontFamily"];
         (fonts[item.attributes["fontFamily"]] ??= {})[styleName] = true;
       }
     }

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

@@ -71,6 +71,7 @@ export const propsCreators: Record<string, ADCreatorFn> = {
   },
   columnWidths: (props: { readonly columnWidths: string; readonly columnMultiplier: string }): unknown => {
     const columnWidths = (props.columnWidths ?? "")
+      // oxlint-disable-next-line typescript/no-unnecessary-type-conversion -- allProps can carry non-strings
       .toString()
       .split(",")
       .map((item: string) => {
@@ -87,10 +88,13 @@ export const propsCreators: Record<string, ADCreatorFn> = {
       return props.paperSize;
     }
     const parts = props.paperSize.split("x");
-    return { width: Number(parts[0]) ?? 595, height: Number(parts[1]) ?? 842 };
+    const width = Number(parts[0] ?? 595);
+    const height = Number(parts[1] ?? 842);
+    return { width: Number.isNaN(width) ? 595 : width, height: Number.isNaN(height) ? 842 : height };
   },
   borders: (props: { readonly borders: string }): unknown => {
     const borders: { [k: string]: number } = { top: 0, right: 0, bottom: 0, left: 0 };
+    // oxlint-disable-next-line typescript/no-unnecessary-type-conversion -- allProps can carry non-strings
     const propBorders = props.borders.toString().split(" ");
     if (!propBorders) {
       return borders;
@@ -157,6 +161,7 @@ export const propsCreators: Record<string, ADCreatorFn> = {
   padding: (props: { readonly padding: string }): unknown => {
     const padding: { [k: string]: number } = { top: 0, right: 0, bottom: 0, left: 0 };
 
+    // oxlint-disable-next-line typescript/no-unnecessary-type-conversion -- allProps can carry non-strings
     const paddings = props.padding.toString().split(" ");
     if (!paddings) {
       return padding;
@@ -222,6 +227,7 @@ export const propsCreators: Record<string, ADCreatorFn> = {
   },
   margins: (props: { readonly margins: string }): unknown => {
     const margins: { [k: string]: number } = { top: 0, right: 0, bottom: 0, left: 0 };
+    // oxlint-disable-next-line typescript/no-unnecessary-type-conversion -- allProps can carry non-strings
     const propMargins = props.margins.toString().split(" ");
     if (!propMargins) {
       return margins;

package/src/abstract-document-xml/xsd-template/styles.ts

@@ -319,4 +319,4 @@ export const layoutFoundation = `<xs:complexType name="LayoutFoundation">
 export const pageColumnLayout = `<xs:complexType name="PageColumnLayout">
 	<xs:attribute name="columnCount" type="xs:decimal" />
 	<xs:attribute name="columnGap" type="xs:decimal" />
-</xs:complexType>`;
+</xs:complexType>`;

package/lib/abstract-document/table/text-row.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=text-row.d.ts.map

package/lib/abstract-document/table/text-row.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"text-row.d.ts","sourceRoot":"","sources":["../../../src/abstract-document/table/text-row.ts"],"names":[],"mappings":""}

package/lib/abstract-document/table/text-row.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=text-row.js.map

package/lib/abstract-document/table/text-row.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"text-row.js","sourceRoot":"","sources":["../../../src/abstract-document/table/text-row.ts"],"names":[],"mappings":""}

package/lib/abstract-document-exporters/docx/docx-document-renderer.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=docx-document-renderer.d.ts.map

package/lib/abstract-document-exporters/docx/docx-document-renderer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"docx-document-renderer.d.ts","sourceRoot":"","sources":["../../../src/abstract-document-exporters/docx/docx-document-renderer.ts"],"names":[],"mappings":""}