abstract-document 6.11.0 → 6.12.1

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

@@ -71,7 +71,7 @@ endobj
 (PDFKit)
 endobj
 14 0 obj
-(D:20230608065812Z)
+(D:20231008070042Z)
 endobj
 11 0 obj
 <<
@@ -136,7 +136,7 @@ trailer
 /Size 15
 /Root 3 0 R
 /Info 11 0 R
-/ID [<3e87d7be7742d4546833e51d430b2636> <3e87d7be7742d4546833e51d430b2636>]
+/ID [<a986116c151e9e75a029ef15cf8e3023> <a986116c151e9e75a029ef15cf8e3023>]
 >>
 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:20230608065810Z)
+(D:20231008070041Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<934112d90e67c46dbc73bdd5306c4e9d> <934112d90e67c46dbc73bdd5306c4e9d>]
+/ID [<3c4978e92cbf06a3744d252fed770832> <3c4978e92cbf06a3744d252fed770832>]
 >>
 startxref
 894

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

@@ -79,7 +79,7 @@ endobj
 (PDFKit)
 endobj
 15 0 obj
-(D:20230608065811Z)
+(D:20231008070041Z)
 endobj
 12 0 obj
 <<
@@ -145,7 +145,7 @@ trailer
 /Size 16
 /Root 3 0 R
 /Info 12 0 R
-/ID [<f9cc22232a65c37d0c256468909cf644> <f9cc22232a65c37d0c256468909cf644>]
+/ID [<149dc659d928aec55d86cfeef376379e> <149dc659d928aec55d86cfeef376379e>]
 >>
 startxref
 1212

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230608065810Z)
+(D:20231008070041Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<04e05e7e8ee47a45ab26c110b7d0e49b> <04e05e7e8ee47a45ab26c110b7d0e49b>]
+/ID [<7768afa1bfb669e8f25caad1033a0361> <7768afa1bfb669e8f25caad1033a0361>]
 >>
 startxref
 824

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

@@ -43,7 +43,7 @@ endobj
 (PDFKit)
 endobj
 12 0 obj
-(D:20230608065812Z)
+(D:20231008070042Z)
 endobj
 9 0 obj
 <<
@@ -106,7 +106,7 @@ trailer
 /Size 13
 /Root 3 0 R
 /Info 9 0 R
-/ID [<2d39a98aa94d3e77acb70ef84bf204f7> <2d39a98aa94d3e77acb70ef84bf204f7>]
+/ID [<b540321f3bdf2098e2ba84c05061dbd3> <b540321f3bdf2098e2ba84c05061dbd3>]
 >>
 startxref
 837

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

@@ -29,6 +29,10 @@ import {
   TextParagraph,
   ImageCellProps,
   ImageCell,
+  ImageParagraphProps,
+  ImageRowProps,
+  ImageParagraph,
+  ImageRow,
 } from "./custom-elements";
 
 export type ADCreatorFn = (props?: Record<string, unknown>, children?: ReadonlyArray<unknown>) => unknown;
@@ -59,7 +63,9 @@ export const creators: (
     TextRow: (props: TextRowProps) => TextRow(props, styleNames),
     TextCell: (props: TextCellProps) => TextCell(props, styleNames),
     TextParagraph: (props: TextParagraphProps) => TextParagraph(props, styleNames),
+    ImageCRow: (props: ImageRowProps) => ImageRow(props, styleNames),
     ImageCell: (props: ImageCellProps) => ImageCell(props, styleNames),
+    ImageCParagraph: (props: ImageParagraphProps) => ImageParagraph(props, styleNames),
     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),

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

@@ -44,18 +44,10 @@ export function extractStyleNames(
   return styleNameProps;
 }
 
-export type TextParagraphProps = {
-  readonly text: string;
-  readonly textStyle?: TextStyle.TextStyle;
-  readonly paragraphStyle?: ParagraphStyle.ParagraphStyle;
-  readonly styleNames?: string;
-};
+export type TextRowProps = TextCellProps & {};
 
-export function TextParagraph(props: TextParagraphProps, styleNameTypes: Record<string, string>): Paragraph.Paragraph {
-  const { text, textStyle, paragraphStyle } = props;
-  const styleNames = extractStyleNames(props.styleNames, styleNameTypes);
-  const textRun = TextRun.create({ text, style: textStyle, styleName: styleNames.TextStyle });
-  return Paragraph.create({ style: paragraphStyle, styleName: styleNames.ParagraphStyle }, [textRun]);
+export function TextRow(props: TextRowProps, styleNameTypes: Record<string, string>): TableRow.TableRow {
+  return TableRow.create({}, [TextCell(props, styleNameTypes)]);
 }
 
 export type TextCellProps = TextParagraphProps & {
@@ -73,29 +65,31 @@ export function TextCell(props: TextCellProps, styleNameTypes: Record<string, st
   return TableCell.create({ columnSpan, rowSpan, style: cellStyle, styleName: styleNames.TableCellStyle }, [paragraph]);
 }
 
-export type TextRowProps = TextCellProps & {};
+export type TextParagraphProps = {
+  readonly text: string;
+  readonly textStyle?: TextStyle.TextStyle;
+  readonly paragraphStyle?: ParagraphStyle.ParagraphStyle;
+  readonly styleNames?: string;
+};
 
-export function TextRow(props: TextRowProps, styleNameTypes: Record<string, string>): TableRow.TableRow {
-  const { text, textStyle, paragraphStyle, cellStyle, columnSpan, rowSpan } = props;
+export function TextParagraph(props: TextParagraphProps, styleNameTypes: Record<string, string>): Paragraph.Paragraph {
+  const { text, textStyle, paragraphStyle } = props;
   const styleNames = extractStyleNames(props.styleNames, styleNameTypes);
   const textRun = TextRun.create({ text, style: textStyle, styleName: styleNames.TextStyle });
-  const paragraph = Paragraph.create({ style: paragraphStyle, styleName: styleNames.ParagraphStyle }, [textRun]);
-  const tableCell = TableCell.create({ columnSpan, rowSpan, style: cellStyle, styleName: styleNames.TableCellStyle }, [
-    paragraph,
-  ]);
-  return TableRow.create({}, [tableCell]);
+  return Paragraph.create({ style: paragraphStyle, styleName: styleNames.ParagraphStyle }, [textRun]);
+}
+
+export type ImageRowProps = ImageCellProps & {};
+
+export function ImageRow(props: ImageCellProps, styleNameTypes: Record<string, string>): TableRow.TableRow {
+  return TableRow.create({}, [ImageCell(props, styleNameTypes)]);
 }
 
 export type ImageCellProps = {
-  readonly image: ImageResource.ImageResource | undefined;
-  readonly width: number;
-  readonly height: number;
-  readonly paragraphStyle?: ParagraphStyle.ParagraphStyle;
   readonly cellStyle?: TableCellStyle.TableCellStyle;
   readonly columnSpan?: number;
   readonly rowSpan?: number;
-  readonly styleNames?: string;
-};
+} & ImageParagraphProps;
 
 export function ImageCell(props: ImageCellProps, styleNameTypes: Record<string, string>): TableCell.TableCell {
   const { image, width, height, paragraphStyle, cellStyle, columnSpan, rowSpan } = props;
@@ -108,3 +102,23 @@ export function ImageCell(props: ImageCellProps, styleNameTypes: Record<string,
     paragraph && [paragraph]
   );
 }
+
+export type ImageParagraphProps = {
+  readonly image: ImageResource.ImageResource | undefined;
+  readonly width: number;
+  readonly height: number;
+  readonly paragraphStyle?: ParagraphStyle.ParagraphStyle;
+  readonly styleNames?: string;
+};
+
+export function ImageParagraph(
+  props: ImageParagraphProps,
+  styleNameTypes: Record<string, string>
+): Paragraph.Paragraph | undefined {
+  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;
+}

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

@@ -1,20 +1,22 @@
 /* eslint-disable no-useless-escape */
-export const textParagraph = `<xs:complexType name="TextParagraph">
+export const textRow = `<xs:complexType name="TextRow">
 	<xs:annotation>
-		<xs:documentation>Shortcut to create \\<Paragraph> \\<TextRun text="..." /> \\</Paragraph></xs:documentation>
+		<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="style" type="TextStyle" />
 	</xs:choice>
 	<xs:attribute name="styleNames" type="xs:string" >
 		<xs:annotation>
-			<xs:documentation>Refrence to a TextStyle that is defined in \\<AbstractDoc> \\<StyleNames> \\<StyleName name="..." /> \\</StyleNames> \\</AbstractDoc></xs:documentation>
+		<xs:documentation>Refrence to a TextStyle that is defined in \\<AbstractDoc> \\<StyleNames> \\<StyleName name="..." /> \\</StyleNames> \\</AbstractDoc></xs:documentation>
 		</xs:annotation>
 	</xs:attribute>
 	<xs:attribute name="target" type="xs:string" />
+	<xs:attribute name="columnSpan" type="xs:string" />
+	<xs:attribute name="rowSpan" type="xs:string" />
 	<xs:attribute name="text" type="xs:string" use="required" />
 </xs:complexType>`;
-export const textParagraphElement = `<xs:element name="TextParagraph" type="TextParagraph" maxOccurs="unbounded" />`;
+export const textRowElement = `<xs:element name="TextRow" type="TextRow" maxOccurs="unbounded" />`;
 
 export const textCell = `<xs:complexType name="TextCell">
 	<xs:annotation>
@@ -35,22 +37,54 @@ export const textCell = `<xs:complexType name="TextCell">
 </xs:complexType>`;
 export const textCellElement = `<xs:element name="TextCell" type="TextCell" minOccurs="0" maxOccurs="unbounded" />`;
 
-export const textRow = `<xs:complexType name="TextRow">
+export const textParagraph = `<xs:complexType name="TextParagraph">
 	<xs:annotation>
-		<xs:documentation>Shortcut to create a \\<TableRow> \\<TableCell> \\<Paragraph> \\<TextRun text="..." /> \\</Paragraph> \\</TableCell> \\</TableRow></xs:documentation>
+		<xs:documentation>Shortcut to create \\<Paragraph> \\<TextRun text="..." /> \\</Paragraph></xs:documentation>
 	</xs:annotation>
 	<xs:choice minOccurs="0" maxOccurs="1">
 		<xs:element name="style" type="TextStyle" />
 	</xs:choice>
 	<xs:attribute name="styleNames" type="xs:string" >
 		<xs:annotation>
-		<xs:documentation>Refrence to a TextStyle that is defined in \\<AbstractDoc> \\<StyleNames> \\<StyleName name="..." /> \\</StyleNames> \\</AbstractDoc></xs:documentation>
+			<xs:documentation>Refrence to a TextStyle that is defined in \\<AbstractDoc> \\<StyleNames> \\<StyleName name="..." /> \\</StyleNames> \\</AbstractDoc></xs:documentation>
 		</xs:annotation>
 	</xs:attribute>
 	<xs:attribute name="target" type="xs:string" />
+	<xs:attribute name="text" type="xs:string" use="required" />
+</xs:complexType>`;
+export const textParagraphElement = `<xs:element name="TextParagraph" type="TextParagraph" maxOccurs="unbounded" />`;
+
+export const imageRow = `<xs:complexType name="ImageRow">
+	<xs:annotation>
+		<xs:documentation>Shortcut to create a \\<TableRow> \\<TableCell> \\<Paragraph> \\<Image src text="..." /> \\</Paragraph> \\</TableCell> \\</TableRow></xs:documentation>
+	</xs:annotation>
+	<xs:attribute name="styleNames" type="xs:string" />
+	<xs:attribute name="target" type="xs:string" />
 	<xs:attribute name="columnSpan" type="xs:string" />
 	<xs:attribute name="rowSpan" type="xs:string" />
 	<xs:attribute name="text" type="xs:string" use="required" />
 </xs:complexType>`;
+export const imageRowElement = `<xs:element name="ImageRow" type="ImageRow" maxOccurs="unbounded" />`;
 
-export const textRowElement = `<xs:element name="TextRow" type="TextRow" maxOccurs="unbounded" />`;
+export const imageCell = `<xs:complexType name="ImageCell">
+	<xs:annotation>
+		<xs:documentation>Shortcut to create a \\<ImageCell> \\<Paragraph> \\<Image src="..." /> \\</Paragraph> \\</TableCell></xs:documentation>
+	</xs:annotation>
+	<xs:attribute name="styleNames" type="xs:string" />
+	<xs:attribute name="target" type="xs:string" />
+	<xs:attribute name="columnSpan" type="xs:string" />
+	<xs:attribute name="rowSpan" type="xs:string" />
+	<xs:attribute name="text" type="xs:string" use="required" />
+</xs:complexType>`;
+export const imageCellElement = `<xs:element name="ImageCell" type="ImageCell" minOccurs="0" maxOccurs="unbounded" />`;
+
+export const imageParagraph = `<xs:complexType name="ImageParagraph">
+	<xs:annotation>
+		<xs:documentation>Shortcut to create \\<Paragraph> \\<Image src="..." /> \\</Paragraph></xs:documentation>
+	</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:complexType>`;
+export const imageParagraphElement = `<xs:element name="ImageParagraph" type="ImageParagraph" maxOccurs="unbounded" />`;

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

@@ -1,4 +1,4 @@
-import { textCellElement, textParagraphElement, textRowElement } from "./custom-elements";
+import * as Custom from "./custom-elements";
 
 export const abstractDoc = `<xs:element name="AbstractDoc">
     <xs:complexType>
@@ -15,7 +15,8 @@ export const section = `<xs:complexType name="Section">
 		<xs:element name="Group" type="Group" minOccurs="0" />
 		<xs:element name="PageBreak" type="PageBreak" minOccurs="0" />
 		<xs:element name="Paragraph" type="Paragraph" minOccurs="0" />
-		${textParagraphElement}
+		${Custom.textParagraphElement}
+		${Custom.imageParagraphElement}
 		<xs:element name="Markdown" type="Markdown" minOccurs="0" />
 		<xs:element name="page" type="page" minOccurs="0" maxOccurs="1"></xs:element>
 	</xs:choice>
@@ -38,7 +39,8 @@ export const sectionElement = `<xs:complexType name="SectionElement">
 		<xs:element name="Group" type="Group" minOccurs="0" />
 		<xs:element name="PageBreak" type="PageBreak" minOccurs="0" />
 		<xs:element name="Paragraph" type="Paragraph" minOccurs="0" />
-		${textParagraphElement}
+		${Custom.textParagraphElement}
+		${Custom.imageParagraphElement}
 		<xs:element name="Markdown" type="Markdown" minOccurs="0" />
 	</xs:choice>
 </xs:complexType>`;
@@ -49,7 +51,8 @@ export const group = `<xs:complexType name="Group">
 		<xs:element name="Group" type="Group" minOccurs="0" />
 		<xs:element name="PageBreak" type="PageBreak" minOccurs="0" />
 		<xs:element name="Paragraph" type="Paragraph" minOccurs="0" />
-		${textParagraphElement}
+		${Custom.textParagraphElement}
+		${Custom.imageParagraphElement}
 		<xs:element name="style" type="GroupStyle" minOccurs="0" />
 	</xs:choice>
 	<xs:attribute name="keepTogether" type="xs:boolean" />
@@ -62,7 +65,8 @@ export const table = `<xs:complexType name="Table">
 		<xs:sequence>
 			<xs:choice minOccurs="1">
 				<xs:element name="TableRow" type="TableRow"  maxOccurs="unbounded" />
-				${textRowElement}
+				${Custom.textRowElement}
+				${Custom.imageRowElement}
 			</xs:choice>
 		</xs:sequence>
 	</xs:choice>
@@ -82,7 +86,8 @@ export const headerRows = `<xs:complexType name="headerRows">
 	<xs:sequence>
 		<xs:choice minOccurs="1" maxOccurs="unbounded">
 			<xs:element name="TableRow" type="TableRow"/>
-			${textRowElement}
+			${Custom.textRowElement}
+			${Custom.imageRowElement}
 		</xs:choice>
 	</xs:sequence>
 </xs:complexType>`;
@@ -90,7 +95,8 @@ export const headerRows = `<xs:complexType name="headerRows">
 export const tableRow = `<xs:complexType name="TableRow">
 	<xs:choice maxOccurs="unbounded">
 		<xs:element name="TableCell" type="TableCell" minOccurs="0" maxOccurs="unbounded" />
-		${textCellElement}
+		${Custom.textCellElement}
+		${Custom.imageCellElement}
 	</xs:choice>
 </xs:complexType>`;
 
@@ -101,7 +107,8 @@ export const tableCell = `<xs:complexType name="TableCell">
 		<xs:element name="Group" type="Group" minOccurs="0" maxOccurs="unbounded" />
 		<xs:element name="PageBreak" type="PageBreak" minOccurs="0" maxOccurs="unbounded" />
 		<xs:element name="Paragraph" type="Paragraph" minOccurs="0" maxOccurs="unbounded" />
-		${textParagraphElement}
+		${Custom.textParagraphElement}
+		${Custom.imageParagraphElement}
 		<xs:element name="Markdown" type="Markdown" minOccurs="0" maxOccurs="unbounded" />
 	</xs:choice>
 	<xs:attribute name="rowSpan" type="xs:integer" />

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

@@ -27,9 +27,12 @@ ${Elements.tableRow}
 ${Elements.headerRows}
 ${Elements.table}
 ${Elements.tableCell}
-${CustomElements.textParagraph}
+${CustomElements.textRow}
 ${CustomElements.textCell}
-${CustomElements.textRow}`;
+${CustomElements.textParagraph}
+${CustomElements.imageRow}
+${CustomElements.imageCell}
+${CustomElements.imageParagraph}`;
 
 export const xsd = `<?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">