abstract-document 16.0.0 → 16.0.2

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

@@ -35,24 +35,17 @@ import { Readable } from "stream";
 const abstractDocToDocxFontRatio = 2;
 const abstractDocPixelToDocxDXARatio = 20;
 
-export function exportToHTML5Blob(
-  doc: AD.AbstractDoc.AbstractDoc,
-  imageDataByUrl: Record<string, Uint8Array | string> = {}
-): Promise<Blob> {
+export function exportToHTML5Blob(doc: AD.AbstractDoc.AbstractDoc): Promise<Blob> {
   return new Promise((resolve) => {
-    const docx = createDocument(doc, imageDataByUrl);
+    const docx = createDocument(doc);
     Packer.toBlob(docx).then((blob) => {
       resolve(blob);
     });
   });
 }
 
-export function exportToStream(
-  blobStream: NodeJS.WritableStream,
-  doc: AD.AbstractDoc.AbstractDoc,
-  imageDataByUrl: Record<string, Uint8Array | string> = {}
-): void {
-  const docx = createDocument(doc, imageDataByUrl);
+export function exportToStream(blobStream: NodeJS.WritableStream, doc: AD.AbstractDoc.AbstractDoc): void {
+  const docx = createDocument(doc);
 
   Packer.toBuffer(docx).then((buffer) => {
     const readableStream = new Readable();
@@ -69,21 +62,14 @@ export function exportToStream(
  * @param doc
  */
 
-function createDocument(
-  doc: AD.AbstractDoc.AbstractDoc,
-  imageDataByUrl: Record<string, Uint8Array | string>
-): Document {
+function createDocument(doc: AD.AbstractDoc.AbstractDoc): Document {
   const docx = new Document({
-    sections: doc.children.map((s) => renderSection(s, doc, imageDataByUrl)),
+    sections: doc.children.map((s) => renderSection(s, doc)),
   });
   return docx;
 }
 
-function renderSection(
-  section: AD.Section.Section,
-  parentResources: AD.Resources.Resources,
-  imageDataByUrl: Record<string, Uint8Array | string>
-): 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);
 
@@ -93,13 +79,13 @@ function renderSection(
   const resources = AD.Resources.mergeResources([parentResources, section]);
 
   const headerChildren = section.page.header.reduce((sofar, c) => {
-    sofar.push(...renderSectionElement(c, resources, contentAvailableWidth, false, imageDataByUrl));
+    sofar.push(...renderSectionElement(c, resources, contentAvailableWidth));
     return sofar;
   }, [] as Array<Paragraph | Table>);
 
   const footerChildren = [
     ...section.page.footer.reduce((sofar, c) => {
-      sofar.push(...renderSectionElement(c, resources, contentAvailableWidth, false, imageDataByUrl));
+      sofar.push(...renderSectionElement(c, resources, contentAvailableWidth));
       return sofar;
     }, [] as Array<Paragraph | Table>),
   ];
@@ -115,7 +101,7 @@ function renderSection(
       ],
     }),
     ...section.children.reduce((sofar, c) => {
-      sofar.push(...renderSectionElement(c, resources, contentAvailableWidth, false, imageDataByUrl));
+      sofar.push(...renderSectionElement(c, resources, contentAvailableWidth));
       return sofar;
     }, [] as Array<Paragraph | Table>),
   ];
@@ -191,17 +177,16 @@ function renderSectionElement(
   element: AD.SectionElement.SectionElement,
   parentResources: AD.Resources.Resources,
   contentAvailableWidth: number,
-  keepNext: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  keepNext: boolean = false
 ): ReadonlyArray<Paragraph | Table> /*| DOCXJS.TableOfContents | DOCXJS.HyperlinkRef */ {
   const resources = AD.Resources.mergeResources([parentResources, element]);
   switch (element.type) {
     case "Paragraph":
-      return [renderParagraph(element, resources, keepNext, imageDataByUrl)];
+      return [renderParagraph(element, resources, keepNext)];
     case "Group":
-      return [...renderGroup(element, parentResources, contentAvailableWidth, imageDataByUrl)];
+      return [...renderGroup(element, parentResources, contentAvailableWidth)];
     case "Table":
-      const table = renderTable(element, resources, contentAvailableWidth, keepNext, imageDataByUrl);
+      const table = renderTable(element, resources, contentAvailableWidth, keepNext);
       return table
         ? [table, new Paragraph({ keepNext: keepNext, children: [new TextRun({ text: ".", size: 0.000001 })] })]
         : [];
@@ -220,8 +205,7 @@ function renderTable(
   table: AD.Table.Table,
   resources: AD.Resources.Resources,
   contentAvailableWidth: number,
-  keepNext: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  keepNext: boolean
 ): Table | undefined {
   const style = AD.Resources.getStyle(
     undefined,
@@ -294,7 +278,7 @@ function renderTable(
         style: BorderStyle.NONE,
       },
     },
-    rows: table.children.map((c) => renderRow(c, resources, style.cellStyle, columnWidths, keepNext, imageDataByUrl)),
+    rows: table.children.map((c) => renderRow(c, resources, style.cellStyle, columnWidths, keepNext)),
   });
 }
 
@@ -303,14 +287,11 @@ function renderRow(
   resources: AD.Resources.Resources,
   tableCellStyle: AD.TableCellStyle.TableCellStyle,
   columnWidths: ReadonlyArray<number>,
-  keepNext: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  keepNext: boolean
 ): TableRow {
   return new TableRow({
     cantSplit: true,
-    children: row.children.map((c, ix) =>
-      renderCell(c, resources, tableCellStyle, columnWidths[ix], keepNext, imageDataByUrl)
-    ),
+    children: row.children.map((c, ix) => renderCell(c, resources, tableCellStyle, columnWidths[ix], keepNext)),
   });
 }
 
@@ -319,8 +300,7 @@ function renderCell(
   resources: AD.Resources.Resources,
   tableCellStyle: AD.TableCellStyle.TableCellStyle,
   width: number,
-  keepNext: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  keepNext: boolean
 ): TableCell {
   const style = AD.Resources.getStyle(
     tableCellStyle,
@@ -376,7 +356,7 @@ function renderCell(
     },
 
     children: cell.children.reduce((sofar, c) => {
-      sofar.push(...renderSectionElement(c, resources, width, keepNext, imageDataByUrl));
+      sofar.push(...renderSectionElement(c, resources, width, keepNext));
       return sofar;
     }, [] as Array<Paragraph | Table>),
   });
@@ -385,8 +365,7 @@ function renderCell(
 function renderAtom(
   resources: AD.Resources.Resources,
   textStyle: AD.TextStyle.TextStyle,
-  atom: AD.Atom.Atom,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  atom: AD.Atom.Atom
 ):
   | TextRun
   | ImageRun
@@ -406,7 +385,7 @@ function renderAtom(
     case "TextRun":
       return renderTextRun(resources, textStyle, atom);
     case "Image":
-      return renderImage(atom, textStyle, imageDataByUrl);
+      return renderImage(atom, textStyle, resources);
     case "HyperLink":
       return renderHyperLink(atom, textStyle);
     case "TocSeparator":
@@ -515,8 +494,7 @@ function renderText(style: AD.TextStyle.TextStyle, text: string): TextRun {
 function renderGroup(
   group: AD.Group.Group,
   resources: AD.Resources.Resources,
-  availabelWidth: number,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  availabelWidth: number
 ): Array<Paragraph | Table> {
   let sofar = Array<Paragraph | Table>();
   let keepNext = true;
@@ -524,7 +502,7 @@ function renderGroup(
     if (index == group.children.length - 1) {
       keepNext = false;
     }
-    sofar.push(...renderSectionElement(group.children[index], resources, availabelWidth, keepNext, imageDataByUrl));
+    sofar.push(...renderSectionElement(group.children[index], resources, availabelWidth, keepNext));
   }
   return sofar;
 }
@@ -532,8 +510,7 @@ function renderGroup(
 function renderParagraph(
   paragraph: AD.Paragraph.Paragraph,
   resources: AD.Resources.Resources,
-  keepNext: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  keepNext: boolean
 ): Paragraph {
   const style = AD.Resources.getStyle(
     undefined,
@@ -562,6 +539,6 @@ function renderParagraph(
       left: Math.max(style.margins.left, 0) * abstractDocPixelToDocxDXARatio,
       right: Math.max(style.margins.right, 0) * abstractDocPixelToDocxDXARatio,
     },
-    children: paragraph.children.map((atom) => renderAtom(resources, style.textStyle, atom, imageDataByUrl)),
+    children: paragraph.children.map((atom) => renderAtom(resources, style.textStyle, atom)),
   });
 }

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

@@ -38,10 +38,11 @@ export function preProcess(doc: AD.AbstractDoc.AbstractDoc): AD.AbstractDoc.Abst
   return AD.AbstractDoc.create(
     {
       fonts: doc.fonts,
-      imageResources: doc.imageResources,
       styles: doc.styles,
-      numberings: doc.numberings,
-      numberingDefinitions: doc.numberingDefinitions,
+      imageDataByUrl: doc.imageDataByUrl,
+      // imageResources: doc.imageResources,
+      // numberings: doc.numberings,
+      // numberingDefinitions: doc.numberingDefinitions,
     },
     children
   );

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

@@ -8,8 +8,7 @@ export function renderImage(
   pdf: PDFKit.PDFDocument,
   finalRect: AD.Rect.Rect,
   textStyle: AD.TextStyle.TextStyle,
-  image: AD.Image.Image,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  image: AD.Image.Image
 ): void {
   const aImage = image.imageResource.abstractImage;
   const position = AD.Point.create(finalRect.x, finalRect.y);
@@ -17,10 +16,9 @@ export function renderImage(
   const scaleY = finalRect.height / aImage.size.height;
   const scale = Math.min(scaleX, scaleY);
   pdf.save();
+
   pdf.translate(position.x, position.y).scale(scale);
-  aImage.components.forEach((c: AbstractImage.Component) =>
-    abstractComponentToPdf(resources, pdf, c, textStyle, imageDataByUrl)
-  );
+  aImage.components.forEach((c: AbstractImage.Component) => abstractComponentToPdf(resources, pdf, c, textStyle));
   pdf.restore();
 }
 
@@ -28,20 +26,19 @@ function abstractComponentToPdf(
   resources: AD.Resources.Resources,
   pdf: PDFKit.PDFDocument,
   component: AbstractImage.Component,
-  textStyle: AD.TextStyle.TextStyle,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  textStyle: AD.TextStyle.TextStyle
 ): void {
   switch (component.type) {
     case "group":
-      component.children.forEach((c) => abstractComponentToPdf(resources, pdf, c, textStyle, imageDataByUrl));
+      component.children.forEach((c) => abstractComponentToPdf(resources, pdf, c, textStyle));
       break;
     case "binaryimage":
       const format = component.format.toLowerCase();
       const imageWidth = component.bottomRight.x - component.topLeft.x;
       const imageHeight = component.bottomRight.y - component.topLeft.y;
       if (component.data.type === "url") {
-        const imageData = imageDataByUrl[component.data.url];
-        if (typeof imageData === "string" && /^\s*<svg[\s>]/i.test(imageData)) {
+        const imageData = resources.imageDataByUrl?.[component.data.url];
+        if (typeof imageData === "string" && imageData.includes("<svg")) {
           addWithSvgToPdfKit(imageData, component, pdf, resources, textStyle);
         } else {
           pdf.image(

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

@@ -13,11 +13,10 @@ export type PdfExportOptions = {
 export function exportToHTML5Blob(
   pdfKit: PDFKit.PDFDocument,
   doc: AD.AbstractDoc.AbstractDoc,
-  options: PdfExportOptions = { compress: false },
-  imageDataByUrl: Record<string, Uint8Array | string> = {}
+  options: PdfExportOptions = { compress: false }
 ): Promise<Blob> {
   return new Promise((resolve) => {
-    let pdf = createDocument(pdfKit, options, doc, imageDataByUrl);
+    let pdf = createDocument(pdfKit, options, doc);
     const buffers = Array<BlobPart>();
     pdf.on("data", buffers.push.bind(buffers));
     pdf.on("end", () => resolve(new Blob(buffers, { type: "application/pdf" })));
@@ -36,18 +35,16 @@ export function exportToStream(
   pdfKit: PDFKit.PDFDocument,
   blobStream: any,
   doc: AD.AbstractDoc.AbstractDoc,
-  options: PdfExportOptions = { compress: false },
-  imageDataByUrl: Record<string, Uint8Array | string> = {}
+  options: PdfExportOptions = { compress: false }
 ): void {
-  let pdf = createDocument(pdfKit, options, doc, imageDataByUrl);
+  let pdf = createDocument(pdfKit, options, doc);
   pdf.pipe(blobStream);
 }
 
 function createDocument(
   pdfKit: PDFKit.PDFDocument,
   options: PdfExportOptions,
-  ad: AD.AbstractDoc.AbstractDoc,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  ad: AD.AbstractDoc.AbstractDoc
 ): PDFKit.PDFDocument {
   const pdf = new pdfKit({ ...options, autoFirstPage: false, bufferPages: true });
 
@@ -59,7 +56,7 @@ function createDocument(
   const pageDesiredSizes = measurePages(pdfKit, document, updatedPages);
 
   for (let page of updatedPages) {
-    renderPage(document, pdf, pageDesiredSizes, page, imageDataByUrl);
+    renderPage(document, pdf, pageDesiredSizes, page);
   }
   pdf.end();
   return pdf;
@@ -69,8 +66,7 @@ function renderPage(
   parentResources: AD.Resources.Resources,
   pdfKit: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
-  page: Page,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  page: Page
 ): void {
   const section = page.section;
   const style = section.page.style;
@@ -95,8 +91,7 @@ function renderPage(
       pdfKit,
       desiredSizes,
       AD.Rect.create(headerX, isAbsolute ? headerStart : headerY, elementSize.width, elementSize.height),
-      element,
-      imageDataByUrl
+      element
     );
     if (!isAbsolute) {
       headerY += elementSize.height;
@@ -119,8 +114,7 @@ function renderPage(
       pdfKit,
       desiredSizes,
       AD.Rect.create(footerX, isAbsolute ? footerStart : footerY, elementSize.width, elementSize.height),
-      element,
-      imageDataByUrl
+      element
     );
     if (!isAbsolute) {
       footerY += elementSize.height;
@@ -137,8 +131,7 @@ function renderPage(
       pdfKit,
       desiredSizes,
       AD.Rect.create(contentRect.x, isAbsolute ? elementStart : y, elementSize.width, elementSize.height),
-      element,
-      imageDataByUrl
+      element
     );
     if (!isAbsolute) {
       y += elementSize.height;
@@ -167,19 +160,18 @@ function renderSectionElement(
   pdf: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
-  element: AD.SectionElement.SectionElement,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  element: AD.SectionElement.SectionElement
 ): void {
   const resources = AD.Resources.mergeResources([parentResources, element]);
   switch (element.type) {
     case "Paragraph":
-      renderParagraph(resources, pdf, desiredSizes, finalRect, element, imageDataByUrl);
+      renderParagraph(resources, pdf, desiredSizes, finalRect, element);
       return;
     case "Table":
-      renderTable(resources, pdf, desiredSizes, finalRect, element, imageDataByUrl);
+      renderTable(resources, pdf, desiredSizes, finalRect, element);
       return;
     case "Group":
-      renderGroup(resources, pdf, desiredSizes, finalRect, element, imageDataByUrl);
+      renderGroup(resources, pdf, desiredSizes, finalRect, element);
       return;
   }
 }
@@ -189,8 +181,7 @@ function renderGroup(
   pdfKit: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
-  group: AD.Group.Group,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  group: AD.Group.Group
 ): void {
   const finalX = finalRect.x + group.style.margins.left;
   const startY = finalRect.y + group.style.margins.top;
@@ -203,8 +194,7 @@ function renderGroup(
       pdfKit,
       desiredSizes,
       AD.Rect.create(finalX, isAbsolute ? startY : y, elementSize.width, elementSize.height),
-      element,
-      imageDataByUrl
+      element
     );
     if (!isAbsolute) {
       y += elementSize.height;
@@ -217,8 +207,7 @@ function renderParagraph(
   pdfKit: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
-  paragraph: AD.Paragraph.Paragraph,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  paragraph: AD.Paragraph.Paragraph
 ): void {
   const style = AD.Resources.getStyle(
     undefined,
@@ -332,8 +321,7 @@ function renderParagraph(
         parseAlignment(style.alignment),
         availableWidth,
         i === 0,
-        i === lastIndex,
-        imageDataByUrl
+        i === lastIndex
       );
 
       x += atomSize.width;
@@ -368,8 +356,7 @@ function renderAtom(
   alignment: AD.TextStyle.TextAlignment,
   availableWidth: number,
   isFirstAtom: boolean,
-  isLastAtom: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  isLastAtom: boolean
 ): void {
   switch (atom.type) {
     case "TextField":
@@ -389,7 +376,7 @@ function renderAtom(
       renderTextRun(resources, pdfKit, finalRect, textStyle, atom, alignment, isFirstAtom, isLastAtom, availableWidth);
       return;
     case "Image":
-      renderImage(resources, pdfKit, finalRect, textStyle, atom, imageDataByUrl);
+      renderImage(resources, pdfKit, finalRect, textStyle, atom);
       return;
     case "HyperLink":
       renderHyperLink(
@@ -682,8 +669,7 @@ function renderTable(
   pdf: PDFKit.PDFDocument,
   desiredSizes: Map<{}, AD.Size.Size>,
   finalRect: AD.Rect.Rect,
-  table: AD.Table.Table,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  table: AD.Table.Table
 ): void {
   const style = AD.Resources.getStyle(
     undefined,
@@ -703,19 +689,7 @@ function renderTable(
     const rowRect = AD.Rect.create(x, y, rowSize.width, rowSize.height);
     const isTop = index === 0;
     const isBottom = index === rows.length - 1;
-    renderRow(
-      resources,
-      pdf,
-      desiredSizes,
-      rowRect,
-      style.cellStyle,
-      table,
-      row,
-      index,
-      isTop,
-      isBottom,
-      imageDataByUrl
-    );
+    renderRow(resources, pdf, desiredSizes, rowRect, style.cellStyle, table, row, index, isTop, isBottom);
     y += rowSize.height;
   }
 }
@@ -730,8 +704,7 @@ function renderRow(
   row: AD.TableRow.TableRow,
   rowIndex: number,
   isTop: boolean,
-  isBottom: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  isBottom: boolean
 ): void {
   let x = finalRect.x;
   const rowSize = getDesiredSize(row, desiredSizes);
@@ -752,19 +725,7 @@ function renderRow(
     const cellRect = AD.Rect.create(x, finalRect.y, cellSize.width, height);
     const isFirst = cellIndex === 0;
     const isLast = cellIndex === row.children.length - 1;
-    renderCell(
-      resources,
-      pdf,
-      desiredSizes,
-      cellRect,
-      tableCellStyle,
-      cell,
-      isFirst,
-      isLast,
-      isTop,
-      isBottom,
-      imageDataByUrl
-    );
+    renderCell(resources, pdf, desiredSizes, cellRect, tableCellStyle, cell, isFirst, isLast, isTop, isBottom);
     x += cellSize.width;
   }
 }
@@ -779,8 +740,7 @@ function renderCell(
   isFirst: boolean,
   isLast: boolean,
   isTop: boolean,
-  isBottom: boolean,
-  imageDataByUrl: Record<string, Uint8Array | string>
+  isBottom: boolean
 ): void {
   const style = AD.Resources.getStyle(
     tableCellStyle,
@@ -809,7 +769,7 @@ function renderCell(
     const elementSize = getDesiredSize(element, desiredSizes);
     const isAbsolute = AD.Position.isPositionAbsolute(element);
     const elementRect = AD.Rect.create(x, isAbsolute ? startY : y, elementSize.width, elementSize.height);
-    renderSectionElement(resources, pdf, desiredSizes, elementRect, element, imageDataByUrl);
+    renderSectionElement(resources, pdf, desiredSizes, elementRect, element);
     if (!isAbsolute) {
       y += elementSize.height;
     }