abstract-document 6.12.3 → 6.12.5

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104106Z)
+(D:20231008111706Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<8b248fe8af63254eea801f383767a3d2> <8b248fe8af63254eea801f383767a3d2>]
+/ID [<adddf49427462b9d78a91e7378446ddb> <adddf49427462b9d78a91e7378446ddb>]
 >>
 startxref
 848

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

@@ -51,7 +51,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104106Z)
+(D:20231008111706Z)
 endobj
 9 0 obj
 <<
@@ -114,7 +114,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<dee0581af75b99e733757d3adf9fe391> <dee0581af75b99e733757d3adf9fe391>]
+/ID [<131cf0bfeb213acbc63312599fd144c4> <131cf0bfeb213acbc63312599fd144c4>]
 >>
 startxref
 1418

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104106Z)
+(D:20231008111706Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<2c0a8d746b62d6c32c4ef5f622322a22> <2c0a8d746b62d6c32c4ef5f622322a22>]
+/ID [<74197d04c36e53e421b24d3bd0ae981a> <74197d04c36e53e421b24d3bd0ae981a>]
 >>
 startxref
 848

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

@@ -63,7 +63,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104106Z)
+(D:20231008111706Z)
 endobj
 9 0 obj
 <<
@@ -126,7 +126,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<cd4687ae5cfa0f7682366f90b54f10bd> <cd4687ae5cfa0f7682366f90b54f10bd>]
+/ID [<d8ccc3ba679c369def5573e414b54495> <d8ccc3ba679c369def5573e414b54495>]
 >>
 startxref
 1076

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104106Z)
+(D:20231008111706Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<4363441bb44cc95654e3cd45a6d07187> <4363441bb44cc95654e3cd45a6d07187>]
+/ID [<58fa9ef21fcc8ba1af9233db572ad5f7> <58fa9ef21fcc8ba1af9233db572ad5f7>]
 >>
 startxref
 824

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

@@ -71,7 +71,7 @@ endobj
 (PDFKit)
 endobj
 14 0 obj
-(D:20231008104106Z)
+(D:20231008111706Z)
 endobj
 11 0 obj
 <<
@@ -136,7 +136,7 @@ trailer
 /Size 15
 /Root 3 0 R
 /Info 11 0 R
-/ID [<4ab0b450428eda07881e1d4b8359d4c7> <4ab0b450428eda07881e1d4b8359d4c7>]
+/ID [<1f473306b4349e9e4ac3dd1096c474d8> <1f473306b4349e9e4ac3dd1096c474d8>]
 >>
 startxref
 1232

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104104Z)
+(D:20231008111705Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<f8bd5fd9acda39a00ef0b0f9369ddc91> <f8bd5fd9acda39a00ef0b0f9369ddc91>]
+/ID [<ad91f4338aa0e39a884fd3ff2a74118a> <ad91f4338aa0e39a884fd3ff2a74118a>]
 >>
 startxref
 894

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

@@ -79,7 +79,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20231008104105Z)
+(D:20231008111706Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<f33bda50cb9782daba9675eb961633f1> <f33bda50cb9782daba9675eb961633f1>]
+/ID [<f224cffd450c8b5d5c3aa242705d8418> <f224cffd450c8b5d5c3aa242705d8418>]
 >>
 startxref
 1212

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104104Z)
+(D:20231008111705Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<2c69765051a20ff0210e6649aa888e58> <2c69765051a20ff0210e6649aa888e58>]
+/ID [<b1f8ca099b15875f513890f84f9b7bf2> <b1f8ca099b15875f513890f84f9b7bf2>]
 >>
 startxref
 824

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20231008104106Z)
+(D:20231008111706Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<fb483e2cfc4d5bebbb6db02d3c74c292> <fb483e2cfc4d5bebbb6db02d3c74c292>]
+/ID [<ea0823b6867fbb8321fa15201d2ec5e3> <ea0823b6867fbb8321fa15201d2ec5e3>]
 >>
 startxref
 837

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

@@ -1,3 +1,5 @@
+import { propIs } from "ramda";
+import { ImageProps } from "../../abstract-document/atoms/image";
 import {
   AbstractDoc,
   Atom,
@@ -57,40 +59,30 @@ export const creators: (
       }
       return AbstractDoc.create(props, children);
     },
-    Paragraph: (props, children: ReadonlyArray<Atom.Atom>) => Paragraph.create(props, children),
     Section: (props, children: ReadonlyArray<SectionElement.SectionElement>) => Section.create(props, children),
-    TextRun: (props) => TextRun.create(props as unknown as TextRun.TextRunProps),
+    Paragraph: (props, children: ReadonlyArray<Atom.Atom>) => Paragraph.create(props, children),
     TextRow: (props: TextRowProps) => TextRow(props, styleNames),
     TextCell: (props: TextCellProps) => TextCell(props, styleNames),
     TextParagraph: (props: TextParagraphProps) => TextParagraph(props, styleNames),
-    ImageRow: (props: ImageRowProps) => ImageRow(props, styleNames),
-    ImageCell: (props: ImageCellProps) => ImageCell(props, styleNames),
-    ImageParagraph: (props: ImageParagraphProps) => ImageParagraph(props, styleNames),
+    TextRun: (props) => TextRun.create(props as unknown as TextRun.TextRunProps),
+    ImageRow: (props: ImageRowProps) => {
+      mutateImageProps(images, props);
+      return ImageRow(props, styleNames);
+    },
+    ImageCell: (props: ImageCellProps) => {
+      return ImageCell(props, styleNames);
+    },
+    ImageParagraph: (props: ImageParagraphProps) => {
+      return ImageParagraph(props, styleNames);
+    },
+    Image: (props: Record<string, unknown>) => {
+      return Image.create(props as unknown as Image.ImageProps);
+    },
     Table: (props, children: ReadonlyArray<TableRow.TableRow>) =>
       Table.create(props as unknown as Table.TableProps, children),
     TableRow: (props, children: ReadonlyArray<TableCell.TableCell>) => TableRow.create(props, children),
     TableCell: (props, children: ReadonlyArray<SectionElement.SectionElement>) => TableCell.create(props, children),
     TextField: (props) => TextField.create(props as unknown as TextField.TextFieldProps),
-    Image: (props: Record<string, unknown>) => {
-      const image = images[(props.src as string) ?? ""];
-      if (image) {
-        if (image.width && image.height) {
-          props.width = image.width;
-          props.height = image.height;
-        } else {
-          const scaleX = (props.width as number) / image.abstractImage.size.width;
-          const scaleY = (props.height as number) / image.abstractImage.size.height;
-          if (scaleX < scaleY) {
-            props.height = (props.height as number) * (scaleX / scaleY);
-          } else {
-            props.width = (props.width as number) * (scaleY / scaleX);
-          }
-        }
-
-        props.imageResource = images[props.src as string];
-      }
-      return Image.create(props as unknown as Image.ImageProps);
-    },
     Group: (props, children) => Group.create(props, children as ReadonlyArray<Group.Group>),
     PageBreak: () => PageBreak.create(),
     Markdown: (props) => Markdown.create(props as unknown as Markdown.MarkdownProps),
@@ -271,3 +263,23 @@ export const propsCreators: Record<string, ADCreatorFn> = {
     return borderColors;
   },
 };
+
+function mutateImageProps(images: Record<string, ImageResource>, props: Record<string, unknown>): void {
+  const image = images[(props.src as string) ?? ""];
+  if (image) {
+    if (image.width && image.height) {
+      props.width = image.width;
+      props.height = image.height;
+    } else {
+      const scaleX = (props.width as number) / image.abstractImage.size.width;
+      const scaleY = (props.height as number) / image.abstractImage.size.height;
+      if (scaleX < scaleY) {
+        props.height = (props.height as number) * (scaleX / scaleY);
+      } else {
+        props.width = (props.width as number) * (scaleY / scaleX);
+      }
+    }
+
+    props.imageResource = images[props.src as string];
+  }
+}

package/src/abstract-document-xml/abstract-doc-of-xml/custom-elements.tsx

@@ -95,12 +95,11 @@ export function ImageCell(props: ImageCellProps, styleNameTypes: Record<string,
   const { image, width, height, paragraphStyle, cellStyle, columnSpan, rowSpan } = props;
   const styleNames = extractStyleNames(props.styleNames, styleNameTypes);
   const imageElement = image && Image.create({ imageResource: image, width, height });
-  const paragraph =
-    imageElement && Paragraph.create({ style: paragraphStyle, styleName: styleNames.ParagraphStyle }, [imageElement]);
-  return TableCell.create(
-    { columnSpan, rowSpan, style: cellStyle, styleName: styleNames.TableCellStyle },
-    paragraph && [paragraph]
-  );
+  const pararaphProps = { style: paragraphStyle, styleName: styleNames.ParagraphStyle };
+  const paragraph = imageElement
+    ? Paragraph.create(pararaphProps, [imageElement])
+    : Paragraph.create(pararaphProps, [ImageMissing]);
+  return TableCell.create({ columnSpan, rowSpan, style: cellStyle, styleName: styleNames.TableCellStyle }, [paragraph]);
 }
 
 export type ImageParagraphProps = {
@@ -118,7 +117,10 @@ export function ImageParagraph(
   const { image, width, height, paragraphStyle } = props;
   const styleNames = extractStyleNames(props.styleNames, styleNameTypes);
   const imageElement = image && Image.create({ imageResource: image, width, height });
-  const paragraph =
-    imageElement && Paragraph.create({ style: paragraphStyle, styleName: styleNames.ParagraphStyle }, [imageElement]);
-  return paragraph;
+  const pararaphProps = { style: paragraphStyle, styleName: styleNames.ParagraphStyle };
+  return imageElement
+    ? Paragraph.create(pararaphProps, [imageElement])
+    : Paragraph.create(pararaphProps, [ImageMissing]);
 }
+
+const ImageMissing = TextRun.create({ text: "Image missing" });

package/src/abstract-document-xml/xsd-template/custom-elements.ts

@@ -3,6 +3,12 @@ export const textRow = `<xs:complexType name="TextRow">
 	<xs:annotation>
 		<xs:documentation>Shortcut to create a \\<TableRow> \\<TableCell> \\<Paragraph> \\<TextRun text="..." /> \\</Paragraph> \\</TableCell> \\</TableRow></xs:documentation>
 	</xs:annotation>
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="cellStyle" type="TableCellStyle" />
+	</xs:choice>
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="paragraphStyle" type="ParagraphStyle" />
+	</xs:choice>
 	<xs:choice minOccurs="0" maxOccurs="1">
 		<xs:element name="style" type="TextStyle" />
 	</xs:choice>
@@ -22,6 +28,12 @@ export const textCell = `<xs:complexType name="TextCell">
 	<xs:annotation>
 		<xs:documentation>Shortcut to create a \\<TableCell> \\<Paragraph> \\<TextRun text="..." /> \\</Paragraph> \\</TableCell></xs:documentation>
 	</xs:annotation>
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="cellStyle" type="TableCellStyle" />
+	</xs:choice>
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="paragraphStyle" type="ParagraphStyle" />
+	</xs:choice>
 	<xs:choice minOccurs="0" maxOccurs="1">
 		<xs:element name="style" type="TextStyle" />
 	</xs:choice>
@@ -41,6 +53,9 @@ export const textParagraph = `<xs:complexType name="TextParagraph">
 	<xs:annotation>
 		<xs:documentation>Shortcut to create \\<Paragraph> \\<TextRun text="..." /> \\</Paragraph></xs:documentation>
 	</xs:annotation>
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="paragraphStyle" type="ParagraphStyle" />
+	</xs:choice>
 	<xs:choice minOccurs="0" maxOccurs="1">
 		<xs:element name="style" type="TextStyle" />
 	</xs:choice>
@@ -62,8 +77,14 @@ export const imageRow = `<xs:complexType name="ImageRow">
 	<xs:attribute name="columnSpan" type="xs:string" />
 	<xs:attribute name="rowSpan" type="xs:string" />
 	<xs:attribute name="src" type="xs:string" use="required" />
-	<xs:attribute name="width" type="xs:decimal" use="required" />
-	<xs:attribute name="height" type="xs:decimal" use="required" />
+	<xs:attribute name="width" type="xs:decimal" />
+	<xs:attribute name="height" type="xs:decimal" />
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="cellStyle" type="TableCellStyle" />
+	</xs:choice>
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="paragraphStyle" type="ParagraphStyle" />
+	</xs:choice>
 </xs:complexType>`;
 export const imageRowElement = `<xs:element name="ImageRow" type="ImageRow" maxOccurs="unbounded" />`;
 
@@ -75,8 +96,14 @@ export const imageCell = `<xs:complexType name="ImageCell">
 	<xs:attribute name="columnSpan" type="xs:string" />
 	<xs:attribute name="rowSpan" type="xs:string" />
 	<xs:attribute name="src" type="xs:string" use="required" />
-	<xs:attribute name="width" type="xs:decimal" use="required" />
-	<xs:attribute name="height" type="xs:decimal" use="required" />
+	<xs:attribute name="width" type="xs:decimal" />
+	<xs:attribute name="height" type="xs:decimal" />
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="cellStyle" type="TableCellStyle" />
+	</xs:choice>
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="paragraphStyle" type="ParagraphStyle" />
+	</xs:choice>
 </xs:complexType>`;
 export const imageCellElement = `<xs:element name="ImageCell" type="ImageCell" minOccurs="0" maxOccurs="unbounded" />`;
 
@@ -86,7 +113,10 @@ export const imageParagraph = `<xs:complexType name="ImageParagraph">
 	</xs:annotation>
 	<xs:attribute name="styleNames" type="xs:string" />
 	<xs:attribute name="src" type="xs:string" use="required" />
-	<xs:attribute name="width" type="xs:decimal" use="required" />
-	<xs:attribute name="height" type="xs:decimal" use="required" />
+	<xs:attribute name="width" type="xs:decimal" />
+	<xs:attribute name="height" type="xs:decimal" />
+	<xs:choice minOccurs="0" maxOccurs="1">
+		<xs:element name="paragraphStyle" type="ParagraphStyle" />
+	</xs:choice>
 </xs:complexType>`;
 export const imageParagraphElement = `<xs:element name="ImageParagraph" type="ImageParagraph" maxOccurs="unbounded" />`;

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

@@ -201,8 +201,8 @@ export const textField = `<xs:complexType name="TextField">
 
 export const image = `<xs:complexType name="Image">
         <xs:attribute name="src" type="xs:string" use="required" />
-        <xs:attribute name="width" type="xs:decimal" use="required" />
-        <xs:attribute name="height" type="xs:decimal" use="required" />
+        <xs:attribute name="width" type="xs:decimal" />
+        <xs:attribute name="height" type="xs:decimal" />
 </xs:complexType>`;
 
 export const pageBreak = `<xs:complexType name="PageBreak" />`;