abstract-document 14.0.11 → 14.0.12

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

@@ -1,5 +1,34 @@
 import * as AD from "../../abstract-document/index.js";
-import * as DOCXJS from "docx";
+import {
+  Packer,
+  Document,
+  ISectionOptions,
+  Paragraph,
+  Table,
+  Bookmark,
+  PageOrientation,
+  Header,
+  Footer,
+  InternalHyperlink,
+  ExternalHyperlink,
+  TextRun,
+  UnderlineType,
+  AlignmentType,
+  WidthType,
+  BorderStyle,
+  TableRow,
+  TableCell,
+  VerticalAlign,
+  ImageRun,
+  SymbolRun,
+  PageBreak,
+  SequentialIdentifier,
+  FootnoteReferenceRun,
+  InsertedTextRun,
+  DeletedTextRun,
+  Math as MathDocX,
+  PageNumber,
+} from "docx";
 import { renderImage } from "./render-image.js";
 import { Readable } from "stream";
 
@@ -9,7 +38,7 @@ const abstractDocPixelToDocxDXARatio = 20;
 export function exportToHTML5Blob(doc: AD.AbstractDoc.AbstractDoc): Promise<Blob> {
   return new Promise((resolve) => {
     const docx = createDocument(doc);
-    DOCXJS.Packer.toBlob(docx).then((blob) => {
+    Packer.toBlob(docx).then((blob) => {
       resolve(blob);
     });
   });
@@ -18,7 +47,7 @@ export function exportToHTML5Blob(doc: AD.AbstractDoc.AbstractDoc): Promise<Blob
 export function exportToStream(blobStream: NodeJS.WritableStream, doc: AD.AbstractDoc.AbstractDoc): void {
   const docx = createDocument(doc);
 
-  DOCXJS.Packer.toBuffer(docx).then((buffer) => {
+  Packer.toBuffer(docx).then((buffer) => {
     const readableStream = new Readable();
     readableStream.push(buffer);
     readableStream.push(null);
@@ -33,14 +62,14 @@ export function exportToStream(blobStream: NodeJS.WritableStream, doc: AD.Abstra
  * @param doc
  */
 
-function createDocument(doc: AD.AbstractDoc.AbstractDoc): DOCXJS.Document {
-  const docx = new DOCXJS.Document({
+function createDocument(doc: AD.AbstractDoc.AbstractDoc): Document {
+  const docx = new Document({
     sections: doc.children.map((s) => renderSection(s, doc)),
   });
   return docx;
 }
 
-function renderSection(section: AD.Section.Section, parentResources: AD.Resources.Resources): DOCXJS.ISectionOptions {
+function renderSection(section: AD.Section.Section, parentResources: AD.Resources.Resources): ISectionOptions {
   const pageWidth = AD.PageStyle.getWidth(section.page.style);
   const pageHeight = AD.PageStyle.getHeight(section.page.style);
 
@@ -52,20 +81,20 @@ function renderSection(section: AD.Section.Section, parentResources: AD.Resource
   const headerChildren = section.page.header.reduce((sofar, c) => {
     sofar.push(...renderSectionElement(c, resources, contentAvailableWidth));
     return sofar;
-  }, [] as Array<DOCXJS.Paragraph | DOCXJS.Table>);
+  }, [] as Array<Paragraph | Table>);
 
   const footerChildren = [
     ...section.page.footer.reduce((sofar, c) => {
       sofar.push(...renderSectionElement(c, resources, contentAvailableWidth));
       return sofar;
-    }, [] as Array<DOCXJS.Paragraph | DOCXJS.Table>),
+    }, [] as Array<Paragraph | Table>),
   ];
 
   const contentChildren = [
-    new DOCXJS.Paragraph({
+    new Paragraph({
       spacing: { before: 0, after: 0, line: 1 },
       children: [
-        new DOCXJS.Bookmark({
+        new Bookmark({
           id: section.id,
           children: [],
         }),
@@ -74,7 +103,7 @@ function renderSection(section: AD.Section.Section, parentResources: AD.Resource
     ...section.children.reduce((sofar, c) => {
       sofar.push(...renderSectionElement(c, resources, contentAvailableWidth));
       return sofar;
-    }, [] as Array<DOCXJS.Paragraph | DOCXJS.Table>),
+    }, [] as Array<Paragraph | Table>),
   ];
 
   return {
@@ -85,9 +114,7 @@ function renderSection(section: AD.Section.Section, parentResources: AD.Resource
           width: AD.PageStyle.getPaperWidth(section.page.style.paperSize) * abstractDocPixelToDocxDXARatio,
           height: AD.PageStyle.getPaperHeight(section.page.style.paperSize) * abstractDocPixelToDocxDXARatio,
           orientation:
-            section.page.style.orientation === "Landscape"
-              ? DOCXJS.PageOrientation.LANDSCAPE
-              : DOCXJS.PageOrientation.PORTRAIT,
+            section.page.style.orientation === "Landscape" ? PageOrientation.LANDSCAPE : PageOrientation.PORTRAIT,
         },
         margin: {
           bottom: section.page.style.contentMargins.bottom * abstractDocPixelToDocxDXARatio,
@@ -100,12 +127,12 @@ function renderSection(section: AD.Section.Section, parentResources: AD.Resource
       },
     },
     headers: {
-      default: new DOCXJS.Header({
+      default: new Header({
         children: headerChildren,
       }),
     },
     footers: {
-      default: new DOCXJS.Footer({
+      default: new Footer({
         children: footerChildren,
       }),
     },
@@ -116,9 +143,9 @@ function renderSection(section: AD.Section.Section, parentResources: AD.Resource
 function renderHyperLink(
   hyperLink: AD.HyperLink.HyperLink,
   style: AD.TextStyle.TextStyle
-): DOCXJS.InternalHyperlink | DOCXJS.ExternalHyperlink {
+): InternalHyperlink | ExternalHyperlink {
   const fontSize = AD.TextStyle.calculateFontSize(style, 10) * 2;
-  const textRun = new DOCXJS.TextRun({
+  const textRun = new TextRun({
     text: hyperLink.text,
     font: style.fontFamily || "Arial",
     size: fontSize,
@@ -127,18 +154,18 @@ function renderHyperLink(
     underline: style.underline
       ? {
           color: style.color || "blue",
-          type: DOCXJS.UnderlineType.SINGLE,
+          type: UnderlineType.SINGLE,
         }
       : undefined,
   });
 
   if (hyperLink.target.startsWith("#") && !hyperLink.target.startsWith("#page=")) {
-    return new DOCXJS.InternalHyperlink({
+    return new InternalHyperlink({
       anchor: hyperLink.target,
       child: textRun,
     });
   } else {
-    return new DOCXJS.ExternalHyperlink({
+    return new ExternalHyperlink({
       link: hyperLink.target,
       child: textRun,
     });
@@ -150,7 +177,7 @@ function renderSectionElement(
   parentResources: AD.Resources.Resources,
   contentAvailableWidth: number,
   keepNext: boolean = false
-): ReadonlyArray<DOCXJS.Paragraph | DOCXJS.Table> /*| DOCXJS.TableOfContents | DOCXJS.HyperlinkRef */ {
+): ReadonlyArray<Paragraph | Table> /*| DOCXJS.TableOfContents | DOCXJS.HyperlinkRef */ {
   const resources = AD.Resources.mergeResources([parentResources, element]);
   switch (element.type) {
     case "Paragraph":
@@ -160,19 +187,16 @@ function renderSectionElement(
     case "Table":
       const table = renderTable(element, resources, contentAvailableWidth, keepNext);
       return table
-        ? [
-            table,
-            new DOCXJS.Paragraph({ keepNext: keepNext, children: [new DOCXJS.TextRun({ text: ".", size: 0.000001 })] }),
-          ]
+        ? [table, new Paragraph({ keepNext: keepNext, children: [new TextRun({ text: ".", size: 0.000001 })] })]
         : [];
     case "PageBreak":
       return [
-        new DOCXJS.Paragraph({
+        new Paragraph({
           pageBreakBefore: true,
         }),
       ];
     default:
-      return [new DOCXJS.Paragraph({})];
+      return [new Paragraph({})];
   }
 }
 
@@ -181,7 +205,7 @@ function renderTable(
   resources: AD.Resources.Resources,
   contentAvailableWidth: number,
   keepNext: boolean
-): DOCXJS.Table | undefined {
+): Table | undefined {
   const style = AD.Resources.getStyle(
     undefined,
     table.style,
@@ -204,13 +228,13 @@ function renderTable(
     Number.isFinite(w) ? w * abstractDocPixelToDocxDXARatio : infinityCellWidth * abstractDocPixelToDocxDXARatio
   );
 
-  return new DOCXJS.Table({
+  return new Table({
     alignment:
       style.alignment === "Left"
-        ? DOCXJS.AlignmentType.LEFT
+        ? AlignmentType.LEFT
         : style.alignment === "Right"
-        ? DOCXJS.AlignmentType.RIGHT
-        : DOCXJS.AlignmentType.CENTER,
+        ? AlignmentType.RIGHT
+        : AlignmentType.CENTER,
     margins: {
       top: style.margins.top * abstractDocPixelToDocxDXARatio,
       bottom: style.margins.bottom * abstractDocPixelToDocxDXARatio,
@@ -218,39 +242,39 @@ function renderTable(
       right: style.margins.right * abstractDocPixelToDocxDXARatio,
     },
     width: {
-      type: DOCXJS.WidthType.DXA,
+      type: WidthType.DXA,
       size: columnWidths.reduce((a, b) => a + b),
     },
     borders: {
       top: {
         color: style.cellStyle.borderColor ?? "",
         size: 0,
-        style: DOCXJS.BorderStyle.NONE,
+        style: BorderStyle.NONE,
       },
       right: {
         color: style.cellStyle.borderColor ?? "",
         size: 0,
-        style: DOCXJS.BorderStyle.NONE,
+        style: BorderStyle.NONE,
       },
       bottom: {
         color: style.cellStyle.borderColor ?? "",
         size: 0,
-        style: DOCXJS.BorderStyle.NONE,
+        style: BorderStyle.NONE,
       },
       left: {
         color: style.cellStyle.borderColor ?? "",
         size: 0,
-        style: DOCXJS.BorderStyle.NONE,
+        style: BorderStyle.NONE,
       },
       insideHorizontal: {
         color: style.cellStyle.borderColor ?? "",
         size: 0,
-        style: DOCXJS.BorderStyle.NONE,
+        style: BorderStyle.NONE,
       },
       insideVertical: {
         color: style.cellStyle.borderColor ?? "",
         size: 0,
-        style: DOCXJS.BorderStyle.NONE,
+        style: BorderStyle.NONE,
       },
     },
     rows: table.children.map((c) => renderRow(c, resources, style.cellStyle, columnWidths, keepNext)),
@@ -263,8 +287,8 @@ function renderRow(
   tableCellStyle: AD.TableCellStyle.TableCellStyle,
   columnWidths: ReadonlyArray<number>,
   keepNext: boolean
-): DOCXJS.TableRow {
-  return new DOCXJS.TableRow({
+): TableRow {
+  return new TableRow({
     cantSplit: true,
     children: row.children.map((c, ix) => renderCell(c, resources, tableCellStyle, columnWidths[ix], keepNext)),
   });
@@ -276,7 +300,7 @@ function renderCell(
   tableCellStyle: AD.TableCellStyle.TableCellStyle,
   width: number,
   keepNext: boolean
-): DOCXJS.TableCell {
+): TableCell {
   const style = AD.Resources.getStyle(
     tableCellStyle,
     cell.style,
@@ -285,20 +309,20 @@ function renderCell(
     resources
   ) as AD.TableCellStyle.TableCellStyle;
 
-  return new DOCXJS.TableCell({
+  return new TableCell({
     verticalAlign:
       (style.verticalAlignment && style.verticalAlignment === "Top"
-        ? DOCXJS.VerticalAlign.TOP
+        ? VerticalAlign.TOP
         : style.verticalAlignment === "Bottom"
-        ? DOCXJS.VerticalAlign.BOTTOM
-        : DOCXJS.VerticalAlign.CENTER) || undefined,
+        ? VerticalAlign.BOTTOM
+        : VerticalAlign.CENTER) || undefined,
     shading: {
       fill: style.background ? style.background : undefined,
     },
     columnSpan: cell.columnSpan,
     rowSpan: cell.rowSpan,
     width: {
-      type: DOCXJS.WidthType.DXA,
+      type: WidthType.DXA,
       size: width,
     },
     margins: {
@@ -311,29 +335,29 @@ function renderCell(
       top: {
         color: style.borderColor ?? "",
         size: style.borders.top,
-        style: style.borders.top ? DOCXJS.BorderStyle.SINGLE : DOCXJS.BorderStyle.NONE,
+        style: style.borders.top ? BorderStyle.SINGLE : BorderStyle.NONE,
       },
       right: {
         color: style.borderColor ?? "",
         size: style.borders.right,
-        style: style.borders.right ? DOCXJS.BorderStyle.SINGLE : DOCXJS.BorderStyle.NONE,
+        style: style.borders.right ? BorderStyle.SINGLE : BorderStyle.NONE,
       },
       bottom: {
         color: style.borderColor ?? "",
         size: style.borders.bottom,
-        style: style.borders.bottom ? DOCXJS.BorderStyle.SINGLE : DOCXJS.BorderStyle.NONE,
+        style: style.borders.bottom ? BorderStyle.SINGLE : BorderStyle.NONE,
       },
       left: {
         color: style.borderColor ?? "",
         size: style.borders.left,
-        style: style.borders.left ? DOCXJS.BorderStyle.SINGLE : DOCXJS.BorderStyle.NONE,
+        style: style.borders.left ? BorderStyle.SINGLE : BorderStyle.NONE,
       },
     },
 
     children: cell.children.reduce((sofar, c) => {
       sofar.push(...renderSectionElement(c, resources, width, keepNext));
       return sofar;
-    }, [] as Array<DOCXJS.Paragraph | DOCXJS.Table>),
+    }, [] as Array<Paragraph | Table>),
   });
 }
 
@@ -342,18 +366,18 @@ function renderAtom(
   textStyle: AD.TextStyle.TextStyle,
   atom: AD.Atom.Atom
 ):
-  | DOCXJS.TextRun
-  | DOCXJS.ImageRun
-  | DOCXJS.SymbolRun
-  | DOCXJS.Bookmark
-  | DOCXJS.PageBreak
-  | DOCXJS.SequentialIdentifier
-  | DOCXJS.FootnoteReferenceRun
-  | DOCXJS.InsertedTextRun
-  | DOCXJS.DeletedTextRun
-  | DOCXJS.InternalHyperlink
-  | DOCXJS.ExternalHyperlink
-  | DOCXJS.Math {
+  | TextRun
+  | ImageRun
+  | SymbolRun
+  | Bookmark
+  | PageBreak
+  | SequentialIdentifier
+  | FootnoteReferenceRun
+  | InsertedTextRun
+  | DeletedTextRun
+  | InternalHyperlink
+  | ExternalHyperlink
+  | MathDocX {
   switch (atom.type) {
     case "TextField":
       return renderTextField(resources, textStyle, atom);
@@ -364,9 +388,9 @@ function renderAtom(
     case "HyperLink":
       return renderHyperLink(atom, textStyle);
     case "TocSeparator":
-      return new DOCXJS.TextRun({ text: "..." });
+      return new TextRun({ text: "..." });
     default:
-      return new DOCXJS.TextRun({ text: "missed" }); // TODO
+      return new TextRun({ text: "missed" }); // TODO
   }
 }
 
@@ -374,7 +398,7 @@ function renderTextField(
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
   textField: AD.TextField.TextField
-): DOCXJS.TextRun {
+): TextRun {
   const style = AD.Resources.getStyle(
     textStyle,
     textField.style,
@@ -398,7 +422,7 @@ function renderTextRun(
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
   textRun: AD.TextRun.TextRun
-): DOCXJS.TextRun {
+): TextRun {
   const style = AD.Resources.getNestedStyle(
     textStyle,
     textRun.style,
@@ -411,9 +435,9 @@ function renderTextRun(
   return renderText(style, textRun.text);
 }
 
-function renderPageNumber(style: AD.TextStyle.TextStyle): DOCXJS.TextRun {
+function renderPageNumber(style: AD.TextStyle.TextStyle): TextRun {
   const fontSize = AD.TextStyle.calculateFontSize(style, 10) * abstractDocToDocxFontRatio;
-  return new DOCXJS.TextRun({
+  return new TextRun({
     font: style.fontFamily || "Arial",
     size: fontSize,
     color: style.color || "black",
@@ -421,16 +445,16 @@ function renderPageNumber(style: AD.TextStyle.TextStyle): DOCXJS.TextRun {
     underline: style.underline
       ? {
           color: style.color,
-          type: DOCXJS.UnderlineType.SINGLE,
+          type: UnderlineType.SINGLE,
         }
       : undefined,
-    children: [DOCXJS.PageNumber.CURRENT],
+    children: [PageNumber.CURRENT],
   });
 }
 
-function renderTotalPages(style: AD.TextStyle.TextStyle): DOCXJS.TextRun {
+function renderTotalPages(style: AD.TextStyle.TextStyle): TextRun {
   const fontSize = AD.TextStyle.calculateFontSize(style, 10) * abstractDocToDocxFontRatio;
-  return new DOCXJS.TextRun({
+  return new TextRun({
     font: style.fontFamily || "Arial",
     size: fontSize,
     color: style.color || "black",
@@ -438,17 +462,17 @@ function renderTotalPages(style: AD.TextStyle.TextStyle): DOCXJS.TextRun {
     underline: style.underline
       ? {
           color: style.color,
-          type: DOCXJS.UnderlineType.SINGLE,
+          type: UnderlineType.SINGLE,
         }
       : undefined,
-    children: [DOCXJS.PageNumber.TOTAL_PAGES],
+    children: [PageNumber.TOTAL_PAGES],
   });
 }
 
-function renderText(style: AD.TextStyle.TextStyle, text: string): DOCXJS.TextRun {
+function renderText(style: AD.TextStyle.TextStyle, text: string): TextRun {
   const fontSize = AD.TextStyle.calculateFontSize(style, 10) * abstractDocToDocxFontRatio;
 
-  return new DOCXJS.TextRun({
+  return new TextRun({
     text: text,
     font: style.fontFamily || "Arial",
     size: fontSize,
@@ -457,7 +481,7 @@ function renderText(style: AD.TextStyle.TextStyle, text: string): DOCXJS.TextRun
     underline: style.underline
       ? {
           color: style.color,
-          type: DOCXJS.UnderlineType.SINGLE,
+          type: UnderlineType.SINGLE,
         }
       : undefined,
   });
@@ -467,8 +491,8 @@ function renderGroup(
   group: AD.Group.Group,
   resources: AD.Resources.Resources,
   availabelWidth: number
-): Array<DOCXJS.Paragraph | DOCXJS.Table> {
-  let sofar = Array<DOCXJS.Paragraph | DOCXJS.Table>();
+): Array<Paragraph | Table> {
+  let sofar = Array<Paragraph | Table>();
   let keepNext = true;
   for (let index = 0; index < group.children.length; index++) {
     if (index == group.children.length - 1) {
@@ -483,7 +507,7 @@ function renderParagraph(
   paragraph: AD.Paragraph.Paragraph,
   resources: AD.Resources.Resources,
   keepNext: boolean
-): DOCXJS.Paragraph {
+): Paragraph {
   const style = AD.Resources.getStyle(
     undefined,
     paragraph.style,
@@ -492,15 +516,15 @@ function renderParagraph(
     resources
   ) as AD.ParagraphStyle.ParagraphStyle;
 
-  return new DOCXJS.Paragraph({
+  return new Paragraph({
     keepNext: keepNext,
     alignment:
       (style.alignment &&
         (style.alignment === "Center"
-          ? DOCXJS.AlignmentType.CENTER
+          ? AlignmentType.CENTER
           : style.alignment === "End"
-          ? DOCXJS.AlignmentType.END
-          : DOCXJS.AlignmentType.START)) ||
+          ? AlignmentType.END
+          : AlignmentType.START)) ||
       undefined,
 
     spacing: {

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

@@ -1,5 +1,2 @@
-import * as Pdf from "./pdf/render.js";
-import * as Docx from "./docx2/render.js";
-// import * as Docx from "./docx/docx-document-renderer";
-
-export { Pdf, Docx };
+export * as Pdf from "./pdf/render.js";
+export * as Docx from "./docx2/render.js";

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

@@ -1,5 +1,5 @@
 import * as AbstractImage from "abstract-image";
-import * as base64 from "base64-js";
+import { fromByteArray } from "base64-js";
 import svgToPdfKit from "svg-to-pdfkit";
 import * as AD from "../../abstract-document/index.js";
 import { getFontNameStyle, getFontName, isFontAvailable } from "./font.js";
@@ -41,12 +41,12 @@ function abstractComponentToPdf(
           fit: [imageWidth, imageHeight],
         });
       } else if (format === "png") {
-        const data = "data:image/png;base64," + base64.fromByteArray(component.data.bytes);
+        const data = "data:image/png;base64," + fromByteArray(component.data.bytes);
         pdf.image(data, component.topLeft.x, component.topLeft.y, {
           fit: [imageWidth, imageHeight],
         });
       } else if (format === "jpg") {
-        const data = "data:image/jpeg;base64," + base64.fromByteArray(component.data.bytes);
+        const data = "data:image/jpeg;base64," + fromByteArray(component.data.bytes);
         pdf.image(data, component.topLeft.x, component.topLeft.y, {
           fit: [imageWidth, imageHeight],
         });

package/src/abstract-document-exporters/shared/get_resources.ts

@@ -1,19 +1,27 @@
-import * as AD from "../../abstract-document/index.js";
 import { exhaustiveCheck } from "ts-exhaustive-check";
-
-export function getResources(doc: AD.AbstractDoc.AbstractDoc): AD.Resources.Resources {
+import { AbstractDoc } from "../../abstract-document/abstract-doc.js";
+import { Resources, mergeResources } from "../../abstract-document/resources.js";
+import { Group } from "../../abstract-document/section-elements/group.js";
+import { Table } from "../../abstract-document/section-elements/table.js";
+import { SectionElement } from "../../abstract-document/section-elements/section-element.js";
+import { Paragraph } from "../../abstract-document/section-elements/paragraph.js";
+import { Section } from "../../abstract-document/page/section.js";
+import { TableRow } from "../../abstract-document/table/table-row.js";
+import { TableCell } from "../../abstract-document/table/table-cell.js";
+
+export function getResources(doc: AbstractDoc): Resources {
   const resources = doc.children.map((s) => getResourcesSection(s));
-  return AD.Resources.mergeResources([...resources, doc]);
+  return mergeResources([...resources, doc]);
 }
 
-function getResourcesSection(s: AD.Section.Section): AD.Resources.Resources {
-  const header = AD.Resources.mergeResources(s.page.header.map((e) => getResourcesSectionElement(e)));
-  const footer = AD.Resources.mergeResources(s.page.footer.map((e) => getResourcesSectionElement(e)));
-  const children = AD.Resources.mergeResources(s.children.map((e) => getResourcesSectionElement(e)));
-  return AD.Resources.mergeResources([header, footer, children]);
+function getResourcesSection(s: Section): Resources {
+  const header = mergeResources(s.page.header.map((e) => getResourcesSectionElement(e)));
+  const footer = mergeResources(s.page.footer.map((e) => getResourcesSectionElement(e)));
+  const children = mergeResources(s.children.map((e) => getResourcesSectionElement(e)));
+  return mergeResources([header, footer, children]);
 }
 
-function getResourcesSectionElement(e: AD.SectionElement.SectionElement): AD.Resources.Resources {
+function getResourcesSectionElement(e: SectionElement): Resources {
   switch (e.type) {
     case "Paragraph":
       return getResourcesParagraph(e);
@@ -28,22 +36,22 @@ function getResourcesSectionElement(e: AD.SectionElement.SectionElement): AD.Res
   }
 }
 
-function getResourcesParagraph(paragraph: AD.Paragraph.Paragraph): AD.Resources.Resources {
+function getResourcesParagraph(paragraph: Paragraph): Resources {
   return paragraph;
 }
 
-function getResourcesTable(table: AD.Table.Table): AD.Resources.Resources {
-  return AD.Resources.mergeResources(table.children.map((r) => getResourcesTableRow(r)));
+function getResourcesTable(table: Table): Resources {
+  return mergeResources(table.children.map((r) => getResourcesTableRow(r)));
 }
 
-function getResourcesTableRow(r: AD.TableRow.TableRow): AD.Resources.Resources {
-  return AD.Resources.mergeResources(r.children.map((c) => getResourcesTableCell(c)));
+function getResourcesTableRow(r: TableRow): Resources {
+  return mergeResources(r.children.map((c) => getResourcesTableCell(c)));
 }
 
-function getResourcesTableCell(c: AD.TableCell.TableCell): AD.Resources.Resources {
-  return AD.Resources.mergeResources(c.children.map((e) => getResourcesSectionElement(e)));
+function getResourcesTableCell(c: TableCell): Resources {
+  return mergeResources(c.children.map((e) => getResourcesSectionElement(e)));
 }
 
-function getResourcesGroup(group: AD.Group.Group): AD.Resources.Resources {
-  return AD.Resources.mergeResources(group.children.map((e) => getResourcesSectionElement(e)));
+function getResourcesGroup(group: Group): Resources {
+  return mergeResources(group.children.map((e) => getResourcesSectionElement(e)));
 }

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

@@ -1,4 +1,4 @@
-import * as React from "react";
+import React from "react";
 import {
   AbstractDoc as AbstractDoc1,
   Section as Section1,

package/src/abstract-document-xml/mustache-xml/parse-mustache-xml.ts

@@ -1,4 +1,4 @@
-import * as FXmlP from "fast-xml-parser";
+import { X2jOptions, XMLParser } from "fast-xml-parser";
 import Mustache from "mustache";
 
 export type XmlElement = {
@@ -16,8 +16,8 @@ export const parseMustacheXml = (
 
 export const render = Mustache.render;
 
-export function parseXmlCustom(text: string, options: Partial<FXmlP.X2jOptions>): ReadonlyArray<XmlElement> {
-  const parser = new FXmlP.XMLParser(options);
+export function parseXmlCustom(text: string, options: Partial<X2jOptions>): ReadonlyArray<XmlElement> {
+  const parser = new XMLParser(options);
   parser.addEntity("#x2F", "/");
   parser.addEntity("#x3D", "=");
   return transformFXP(parser.parse(text));
@@ -104,7 +104,7 @@ function shouldSkipLevel(tag: XmlElement): boolean {
   );
 }
 
-const xmlParser = new FXmlP.XMLParser({
+const xmlParser = new XMLParser({
   preserveOrder: true,
   ignoreAttributes: false,
   attributeNamePrefix: "",
@@ -127,7 +127,7 @@ const xmlParser = new FXmlP.XMLParser({
 xmlParser.addEntity("#x2F", "/");
 xmlParser.addEntity("#x3D", "=");
 
-const xsdParser = new FXmlP.XMLParser({
+const xsdParser = new XMLParser({
   preserveOrder: true,
   ignoreAttributes: false,
   attributeNamePrefix: "",

package/src/abstract-document-xml/mustache-xml/validate-mustache-xml.ts

@@ -1,4 +1,4 @@
-import * as FXmlP from "fast-xml-parser";
+import { XMLValidator, ValidationError } from "fast-xml-parser";
 import { XmlElement, parseXml, findElement } from "./parse-mustache-xml.js";
 
 enum ErrorType {
@@ -56,7 +56,7 @@ export function validateXml(fullXml: string, xsdSchema: ReadonlyArray<XmlElement
 
   if (xml) {
     try {
-      const result = FXmlP.XMLValidator.validate(xml, {
+      const result = XMLValidator.validate(xml, {
         allowBooleanAttributes: true,
       });
 
@@ -191,7 +191,7 @@ function getDecorationsFromError(error: XmlError): ErrorObject {
   };
 }
 
-function getErrorFromException(result: FXmlP.ValidationError, xml: string): XmlError {
+function getErrorFromException(result: ValidationError, xml: string): XmlError {
   const { col, line, msg } = result.err;
   const startLine = line - 1;
   const lines = xml.split("\n");