abstract-document 20.1.6 → 20.2.1

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

@@ -166,7 +166,7 @@ function measureParagraph(
         currentRowHeight = 0;
       }
     }
-    if (row.length === 1 && row[0].type === "LineBreak") {
+    if (row.length === 1 && row[0]!.type === "LineBreak") {
       paragraphHeight += currentRowHeight;
     } else if (hasAtomImage) {
       paragraphHeight += desiredHeight + currentRowHeight;
@@ -276,7 +276,7 @@ export function measureTable(
   // Try to find the minimal height required for each row
   const cells = [];
   for (let i = 0; i < rows.length; i++) {
-    cells.push(...rows[i].children.map((child) => ({ child, rowIndex: i })));
+    cells.push(...rows[i]!.children.map((child) => ({ child, rowIndex: i })));
   }
   cells.sort((a, b) => {
     if (a.child.rowSpan === b.child.rowSpan) {
@@ -287,16 +287,16 @@ export function measureTable(
   });
   const minRowHeights = Array.from({ length: rows.length }, () => 0);
   for (const { child, rowIndex } of cells) {
-    const rowSpan = child.rowSpan || 1;
+    const rowSpan = Math.min(child.rowSpan || 1, rows.length - rowIndex);
     let currentHeight = 0;
     for (let i = rowIndex; i < rowIndex + rowSpan; i++) {
-      currentHeight += minRowHeights[i];
+      currentHeight += minRowHeights[i]!;
     }
     const adjustment = getDesiredSize(child, desiredSizes).height - currentHeight;
     if (adjustment > 0) {
       const adjustmentPerRow = adjustment / rowSpan;
       for (let i = rowIndex; i < rowIndex + rowSpan; i++) {
-        minRowHeights[i] += adjustmentPerRow;
+        minRowHeights[i]! += adjustmentPerRow;
       }
     }
   }
@@ -306,8 +306,8 @@ export function measureTable(
     : table.columnWidths.reduce((a, b) => a + b, styleMargins.left + styleMargins.right);
   let desiredHeight = styleMargins.top + styleMargins.bottom;
   for (let i = 0; i < rows.length; i++) {
-    const row = rows[i];
-    const rowHeight = minRowHeights[i];
+    const row = rows[i]!;
+    const rowHeight = minRowHeights[i]!;
     desiredHeight += rowHeight;
     desiredSizes.set(row, AD.Size.create(desiredWidth, rowHeight));
     for (const cell of row.children) {
@@ -460,7 +460,7 @@ function measureImage(resources: AD.Resources.Resources, availableSize: AD.Size.
     desiredWidth = availableSize.width;
   } else if (image.width) {
     desiredWidth = image.width;
-  } else if (resource?.abstractImage.size.width) {
+  } else if (resource.abstractImage.size.width) {
     desiredWidth = resource.abstractImage.size.width * (image.height / resource.abstractImage.size.height);
   }
 
@@ -469,7 +469,7 @@ function measureImage(resources: AD.Resources.Resources, availableSize: AD.Size.
     desiredHeight = availableSize.height;
   } else if (image.height) {
     desiredHeight = image.height;
-  } else if (resource?.abstractImage.size.height) {
+  } else if (resource.abstractImage.size.height) {
     desiredHeight = resource.abstractImage.size.height * (image.width / resource.abstractImage.size.width);
   }
   if (!resource.scaleMaxHeight || !resource.scaleMaxWidth) {

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

@@ -41,7 +41,7 @@ function paginateSection(
   let currentPage = previousPage;
   for (let i = 0; i < children.length; ++i) {
     const contentRect = getPageContentRect(desiredSizes, section, pages.length + 1);
-    const element = children[i];
+    const element = children[i]!;
     if (element.type === "PageBreak") {
       columns.push({ elements });
       currentPage = createPage(resources, desiredSizes, currentPage, section, columns, pages.length === 0);
@@ -371,7 +371,8 @@ function splitTableAt(
   //This causes them to be rendered like an empty cell
   //while keeping the remaining rowspan which was calculated
   //in the pre-process step
-  const splitRow = table.children[splitIndex];
+  // splitTable selects an existing row, and only splits tables with at least two rows.
+  const splitRow = table.children[splitIndex]!;
   const firstTailRow: Array<AD.TableCell.TableCell> = [];
   for (const cell of splitRow.children) {
     firstTailRow.push({ ...cell, dummy: false });

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

@@ -80,7 +80,7 @@ function preProcessParagraph(paragraph: AD.Paragraph.Paragraph, resources: AD.Re
     if (numberOverride !== undefined) {
       _numberingLevelItems.set(key, numberOverride);
     } else if (!_numberingLevelItems.has(key)) {
-      _numberingLevelItems.set(key, levelDefinitions[level].start);
+      _numberingLevelItems.set(key, levelDefinitions[level]?.start ?? 1);
     } else if (append !== true) {
       _numberingLevelItems.set(key, (_numberingLevelItems.get(key) ?? 0) + 1);
     }
@@ -158,7 +158,7 @@ function adjustParagraph(paragraph: AD.Paragraph.Paragraph): Array<AD.SectionEle
       const lines = text.split("\n");
 
       for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
+        const line = lines[i]!;
         const tokens = line.split(spaceRegex).filter((t) => t.length !== 0);
         for (const token of tokens) {
           newChildren.push({
@@ -282,11 +282,9 @@ function preProcessTable(table: AD.Table.Table, resources: AD.Resources.Resource
   const processedHeaders = [];
   const processedChildren = [];
   const rowSpans: Map<number, AD.TableCell.TableCell> = new Map();
-  if (table.headerRows) {
-    for (const row of table.headerRows) {
-      const header = preProcessTableRow(row, rowSpans, resources);
-      processedHeaders.push(header);
-    }
+  for (const row of table.headerRows) {
+    const header = preProcessTableRow(row, rowSpans, resources);
+    processedHeaders.push(header);
   }
   for (const row of table.children) {
     const children = preProcessTableRow(row, rowSpans, resources);

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

@@ -120,7 +120,7 @@ function abstractComponentToPdf(
       break;
     case "polyline":
       for (let i = 0; i < component.points.length; ++i) {
-        const p = component.points[i];
+        const p = component.points[i]!;
         if (i === 0) {
           pdf.moveTo(p.x, p.y);
         } else {
@@ -209,7 +209,7 @@ function addWithSvgToPdfKit(
   let svgUpdated = svg;
   ["fill=", "stroke=", "color="].forEach((t) => {
     let index = 0;
-    while (true) {
+    for (;;) {
       index = svgUpdated.indexOf(t, index);
       if (index === -1) {
         break;
@@ -227,7 +227,7 @@ function addWithSvgToPdfKit(
 
   ["stroke-dasharray="].forEach((t) => {
     let index = 0;
-    while (true) {
+    for (;;) {
       index = svgUpdated.indexOf(t, index);
       if (index === -1) {
         break;
@@ -312,7 +312,7 @@ function applyStrokeDashStyle(pdf: PDFKit.PDFDocument, dashStyle: AbstractImage.
       break;
     }
     const actualIndex = index + 1;
-    const replacementValue = dashes[actualIndex - 1] + dashes[actualIndex + 1];
+    const replacementValue = dashes[actualIndex - 1]! + dashes[actualIndex + 1]!;
     dashes = dashes
       .slice(0, actualIndex - 1)
       .concat([replacementValue])
@@ -322,7 +322,7 @@ function applyStrokeDashStyle(pdf: PDFKit.PDFDocument, dashStyle: AbstractImage.
   // The stroke array only having two elements (a dash value and space
   // value) is a special case.
   if (dashes.length === 1) {
-    dashes = [dashes[0], dashes[0]];
+    dashes = [dashes[0]!, dashes[0]!];
     if (dashes[0] === 0) {
       pdf.strokeOpacity(0);
     }
@@ -371,8 +371,8 @@ function applyStrokeDashStyle(pdf: PDFKit.PDFDocument, dashStyle: AbstractImage.
       //
       // ---␣␣-----␣␣␣␣
       //           ⎸
-      phase -= dashes[1];
-      dashes[dashes.length - 1] += dashes[1];
+      phase -= dashes[1]!;
+      dashes[dashes.length - 1]! += dashes[1]!;
       dashes = dashes.slice(2);
     }
     if (dashes[dashes.length - 1] === 0) {
@@ -392,8 +392,8 @@ function applyStrokeDashStyle(pdf: PDFKit.PDFDocument, dashStyle: AbstractImage.
       // ------␣␣␣␣---␣␣
       //      ⎸
       //
-      phase += dashes[dashes.length - 2];
-      dashes[0] += dashes[dashes.length - 2];
+      phase += dashes[dashes.length - 2]!;
+      dashes[0]! += dashes[dashes.length - 2]!;
       dashes = dashes.slice(0, -2);
     }
   }

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

@@ -67,9 +67,7 @@ function renderPage(parentResources: AD.Resources.Resources, pdfKit: PDFKit.PDFD
   const contentRect = addPage(pdfKit, page);
 
   page.namedDestionations.forEach((dest) => {
-    if (pdfKit.addNamedDestination) {
-      pdfKit.addNamedDestination(dest);
-    }
+    pdfKit.addNamedDestination(dest);
   });
 
   const { headerMargins, footerMargins } = getHeaderAndFooter(section, page.pageNo);
@@ -119,7 +117,7 @@ function renderPage(parentResources: AD.Resources.Resources, pdfKit: PDFKit.PDFD
   for (let columnIndex = 0; columnIndex < page.columns.length; columnIndex++) {
     const x = contentRect.x + columnStep * columnIndex;
     let y = elementStart;
-    for (const element of page.columns[columnIndex].elements) {
+    for (const element of page.columns[columnIndex]!.elements) {
       const elementSize = getDesiredSize(element, desiredSizes);
       const isAbsolute = AD.Position.isPositionAbsolute(element);
       renderSectionElement(
@@ -254,26 +252,24 @@ function renderParagraph(
       continue;
     }
 
-    if (atom.type === "Image") {
-      // Atom is Image
-      if (previousAtomType !== "Image") {
-        // Previous was not image
-        rows.push(currentRow);
-        currentRow = [];
-        currentWidth = 0;
-        previousAtomType = atom.type;
-      }
-      const atomSize = getDesiredSize(atom, desiredSizes);
-      if (currentWidth + atomSize.width < availableWidth || currentRow.length === 0) {
-        // Image fits in current row/current row is empty
-        currentRow.push(atom);
-        currentWidth += atomSize.width;
-      } else {
-        // Image does not fit in current row
-        rows.push(currentRow);
-        currentRow = [atom];
-        currentWidth = atomSize.width;
-      }
+    // Atom is Image
+    if (previousAtomType !== "Image") {
+      // Previous was not image
+      rows.push(currentRow);
+      currentRow = [];
+      currentWidth = 0;
+      previousAtomType = atom.type;
+    }
+    const atomSize = getDesiredSize(atom, desiredSizes);
+    if (currentWidth + atomSize.width < availableWidth || currentRow.length === 0) {
+      // Image fits in current row/current row is empty
+      currentRow.push(atom);
+      currentWidth += atomSize.width;
+    } else {
+      // Image does not fit in current row
+      rows.push(currentRow);
+      currentRow = [atom];
+      currentWidth = atomSize.width;
     }
   }
   if (currentRow.length > 0) {
@@ -287,7 +283,7 @@ function renderParagraph(
   const newRows = rowsSplit(rows, availableWidth, desiredSizes, alignment, pdfKit, resources, style.textStyle);
   const { newDesiredSizes, combinedRows } = rowsCombineTextRuns(resources, pdfKit, newRows, desiredSizes, alignment, style.textStyle);
   for (let r = 0; r < combinedRows.length; r++) {
-    const row = combinedRows[r];
+    const row = combinedRows[r]!;
     const isLast = r === combinedRows.length - 1;
     if (row.length === 0) {
       continue;
@@ -304,7 +300,7 @@ function renderParagraph(
       x -= styleMargins.right;
     }
 
-    if (row.length > 1 || row[0].type === "Image" || row[0].type === "TextRun" || row[0].type === "TextField") {
+    if (row.length > 1 || row[0]!.type === "Image" || row[0]!.type === "TextRun" || row[0]!.type === "TextField") {
       // Using continued with alignment "center" or "right" is broken:
       // https://github.com/foliojs/pdfkit/issues/240
       // Therefore we have to position it ourself
@@ -744,8 +740,9 @@ function renderRow(
 
     let height = rowSize.height;
     if (cell.rowSpan > 1) {
-      for (let index = rowIndex + 1; index < rowIndex + cell.rowSpan; index++) {
-        height += getDesiredSize([...table.headerRows, ...table.children][index], desiredSizes).height;
+      const rows = [...table.headerRows, ...table.children];
+      for (let index = rowIndex + 1; index < Math.min(rowIndex + cell.rowSpan, rows.length); index++) {
+        height += getDesiredSize(rows[index]!, desiredSizes).height;
       }
     }
     const cellSize = getDesiredSize(cell, desiredSizes);

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

@@ -37,7 +37,7 @@ export function rowsSplit(
     let lastWasSpace = false;
 
     for (let i = 0; i < row.length; i++) {
-      const atom = row[i];
+      const atom = row[i]!;
       const size = getDesiredSize(atom, desiredSizes);
       const width = size.width;
       const height = size.height;
@@ -83,7 +83,7 @@ export function rowsSplit(
       if (splittedWord.length > 0) {
         const heightPerRow = height / splittedWord.length;
         const [first, ...rest] = splittedWord;
-        if (!first && !rest) {
+        if (!first) {
           continue;
         }
         //add the first to the current row
@@ -92,7 +92,7 @@ export function rowsSplit(
         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 });
@@ -175,7 +175,7 @@ export function rowsCombineTextRuns(
 
   let currentString = "";
   let currentHeight = 0;
-  let current: AD.Atom.Atom | undefined = undefined;
+  let current: AD.TextRun.TextRun | undefined = undefined;
   let currentStyle: string = "";
 
   const newRows: Array<ReadonlyArray<AD.Atom.Atom>> = [];
@@ -184,7 +184,7 @@ export function rowsCombineTextRuns(
     let isFirst = true;
 
     for (let i = 0; i < row.length; i++) {
-      const atom = row[i];
+      const atom = row[i]!;
       const isLast = i === row.length - 1;
       const measurement = getDesiredSize(atom, desiredSizes);
 
@@ -253,30 +253,28 @@ export function rowsCombineTextRuns(
       }
 
       if (isLast) {
-        if (current) {
-          //does the last contain spaces at the end?
-          if (alignment === "right") {
-            while (currentString.endsWith(" ")) {
-              currentString = currentString.slice(0, -1);
-            }
+        //does the last contain spaces at the end?
+        if (alignment === "right") {
+          while (currentString.endsWith(" ")) {
+            currentString = currentString.slice(0, -1);
           }
-          if (isFirst && alignment === "left") {
-            while (currentString.startsWith(" ")) {
-              currentString = currentString.slice(1);
-            }
-            isFirst = false;
+        }
+        if (isFirst && alignment === "left") {
+          while (currentString.startsWith(" ")) {
+            currentString = currentString.slice(1);
           }
-
-          const newTextRun: AD.Atom.Atom = {
-            ...current,
-            text: currentString,
-          };
-          newRow.push(newTextRun);
-          desiredSizes.set(newTextRun, {
-            width: stringWidth(current, pdf, currentString, resources, defaultStyle),
-            height: currentHeight,
-          });
+          isFirst = false;
         }
+
+        const newTextRun: AD.Atom.Atom = {
+          ...current,
+          text: currentString,
+        };
+        newRow.push(newTextRun);
+        desiredSizes.set(newTextRun, {
+          width: stringWidth(current, pdf, currentString, resources, defaultStyle),
+          height: currentHeight,
+        });
       }
     }
     current = undefined;
@@ -295,15 +293,14 @@ 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 ?? []
+  ) ?? defaultStyle) as AD.TextStyle.TextStyle;
 
   const font = getFontNameStyle(style);
   const fontSize = AD.TextStyle.calculateFontSize(style, 10);

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

@@ -32,15 +32,15 @@ export const AbstractDoc = (props?: AbstractDoc1.AbstractDocProps & ChildrenProp
 export const Section = (props?: Section1.SectionProps & ChildrenProp): React.JSX.Element =>
   Section1.create(props, props && (props.children as unknown as ReadonlyArray<SectionElement1.SectionElement>)) as unknown as React.JSX.Element;
 export const Group = (props: Group1.GroupProps & ChildrenProp): React.JSX.Element =>
-  Group1.create(props, props && (props.children as unknown as ReadonlyArray<SectionElement1.SectionElement>)) as unknown as React.JSX.Element;
+  Group1.create(props, props.children as unknown as ReadonlyArray<SectionElement1.SectionElement>) as unknown as React.JSX.Element;
 export const Paragraph = (props: Paragraph1.ParagraphProps & ChildrenProp): React.JSX.Element =>
-  Paragraph1.create(props, props && (props.children as unknown as ReadonlyArray<Atom1.Atom>)) as unknown as React.JSX.Element;
+  Paragraph1.create(props, props.children as unknown as ReadonlyArray<Atom1.Atom>) as unknown as React.JSX.Element;
 export const Table = (props: Table1.TableProps & ChildrenProp): React.JSX.Element =>
-  Table1.create(props, props && (props.children as unknown as ReadonlyArray<TableRow1.TableRow>)) as unknown as React.JSX.Element;
+  Table1.create(props, props.children as unknown as ReadonlyArray<TableRow1.TableRow>) as unknown as React.JSX.Element;
 export const TableRow = (props: TableRow1.TableRowProps & ChildrenProp): React.JSX.Element =>
-  TableRow1.create(props, props && (props.children as unknown as ReadonlyArray<TableCell1.TableCell>)) as unknown as React.JSX.Element;
+  TableRow1.create(props, props.children as unknown as ReadonlyArray<TableCell1.TableCell>) as unknown as React.JSX.Element;
 export const TableCell = (props: TableCell1.TableCellProps & ChildrenProp): React.JSX.Element =>
-  TableCell1.create(props, props && (props.children as unknown as ReadonlyArray<SectionElement1.SectionElement>)) as unknown as React.JSX.Element;
+  TableCell1.create(props, props.children as unknown as ReadonlyArray<SectionElement1.SectionElement>) as unknown as React.JSX.Element;
 export const HyperLink = (props: HyperLink1.HyperLinkProps): React.JSX.Element => HyperLink1.create(props) as unknown as React.JSX.Element;
 export const LinkTarget = (props: LinkTarget1.LinkTargetProps): React.JSX.Element => LinkTarget1.create(props) as unknown as React.JSX.Element;
 export const Image = (props: Image1.ImageProps): React.JSX.Element => Image1.create(props) as unknown as React.JSX.Element;
@@ -79,9 +79,9 @@ function renderChildren(element: FakeElement): Array<unknown> {
         return [];
       }
       if (Array.isArray(c)) {
-        return c.map(render);
+        return c.map(render) as Array<unknown>;
       }
-      return render(c);
+      return render(c) as unknown;
     });
   } else {
     const elements = render(element.props.children); // Markdown returns an array of elements already

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

@@ -1,6 +1,6 @@
 import { parseHandlebarsXml, type XmlElement } from "handlebars-xml";
 import { getFontStyleName } from "../../abstract-document-exporters/pdf/font.js";
-import { addResources, merge } from "../../abstract-document/abstract-doc.js";
+import { addResources, create, merge } from "../../abstract-document/abstract-doc.js";
 import type { AbstractDoc } from "../../abstract-document/index.js";
 import type { Font } from "../../abstract-document/primitives/font.js";
 import type { Resources } from "../../abstract-document/resources.js";
@@ -49,7 +49,8 @@ export function abstractDocXml(
 ): readonly [AbstractDoc.AbstractDoc, imageUrls: Record<string, true>, 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 root = xml[0];
+  const doc = root === undefined ? create() : abstractDocXmlRecursive(creators(styleNames), root);
   return [doc, imageUrls, fontFamilies];
 }
 
@@ -57,31 +58,33 @@ export function abstractDocXml(
 function abstractDocXmlRecursive(creators: Record<string, ADCreatorFn>, xmlElement: XmlElement, onlyChildren: boolean = false): any {
   const children = [];
   const props: Record<string, unknown> = {};
-  for (const childElement of xmlElement.children ?? []) {
+  for (const childElement of xmlElement.children) {
     const childName = childElement.tagName;
-    if (childName !== undefined) {
-      if (childName === "StyleNames") {
-        props["styles"] = abstractDocXmlRecursive(creators, childElement);
-      } else if (childName === "StyleName" && childElement.attributes?.["name"]) {
-        const styleName = StyleKey.create(childElement.attributes["type"], childElement.attributes["name"]);
-        const style = abstractDocXmlRecursive(creators, childElement);
-        props[styleName] = style;
-      } else if (childName.startsWith(childName.charAt(0).toUpperCase())) {
-        // For uppercase elements we add them to the children key
-        children.push(abstractDocXmlRecursive(creators, childElement));
+    if (childName === "StyleNames") {
+      props["styles"] = abstractDocXmlRecursive(creators, childElement);
+    } else if (childName === "StyleName" && childElement.attributes["name"]) {
+      const type = childElement.attributes["type"];
+      if (type === undefined) {
+        continue;
+      }
+      const styleName = StyleKey.create(type, childElement.attributes["name"]);
+      const style = abstractDocXmlRecursive(creators, childElement);
+      props[styleName] = style;
+    } else if (childName.startsWith(childName.charAt(0).toUpperCase())) {
+      // For uppercase elements we add them to the children key
+      children.push(abstractDocXmlRecursive(creators, childElement));
+    } else {
+      // For lowercase elements we add them as keys using their name
+      // Some special keys should directly have an array of children as value instead of an object with children key
+      const arrayedElements = ["header", "footer", "headerRows"];
+      const childrenOnly = arrayedElements.findIndex((e) => e === childName) !== -1;
+      const differentFirstPage = childElement.attributes["differentFirstPage"];
+      if (differentFirstPage === "true" && childName === "header") {
+        props["frontHeader"] = abstractDocXmlRecursive(creators, childElement, childrenOnly);
+      } else if (differentFirstPage === "true" && childName === "footer") {
+        props["frontFooter"] = abstractDocXmlRecursive(creators, childElement, childrenOnly);
       } else {
-        // For lowercase elements we add them as keys using their name
-        // Some special keys should directly have an array of children as value instead of an object with children key
-        const arrayedElements = ["header", "footer", "headerRows"];
-        const childrenOnly = arrayedElements.findIndex((e) => e === childName) !== -1;
-        const differentFirstPage = childElement.attributes["differentFirstPage"];
-        if (differentFirstPage === "true" && childName === "header") {
-          props["frontHeader"] = abstractDocXmlRecursive(creators, childElement, childrenOnly);
-        } else if (differentFirstPage === "true" && childName === "footer") {
-          props["frontFooter"] = abstractDocXmlRecursive(creators, childElement, childrenOnly);
-        } else {
-          props[childName] = abstractDocXmlRecursive(creators, childElement, childrenOnly);
-        }
+        props[childName] = abstractDocXmlRecursive(creators, childElement, childrenOnly);
       }
     }
   }
@@ -185,7 +188,7 @@ function extractImageFontsStyleNames(
 ] {
   let crFntFam = currentFontFamily;
   xmlElement.forEach((item) => {
-    if (item.tagName.startsWith("Image") && item.attributes?.["src"]) {
+    if (item.tagName.startsWith("Image") && item.attributes["src"]) {
       images[item.attributes["src"]] = true;
     } else if (item.tagName === "style") {
       const fontFamily = crFntFam ?? styleFamilies["Default"];
@@ -203,7 +206,7 @@ function extractImageFontsStyleNames(
           crFntFam = fontFamily;
         }
       }
-    } else if (item.attributes?.["fontFamily"]) {
+    } else if (item.attributes["fontFamily"]) {
       const styleName = getFontStyleName(item.attributes);
       (fonts[item.attributes["fontFamily"]] ??= {})[styleName] = true;
       if (item.tagName === "StyleName" && item.attributes["name"] && item.attributes["type"]) {