abstract-document 16.0.35 → 16.0.36

package/lib/abstract-document-xml/handlebars-xml/parse-mustache-xml.js

@@ -0,0 +1,148 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseXsd = exports.parseXml = exports.renderHandlebars = exports.renderMustache = exports.parseMustacheXml = exports.TemplateMethod = void 0;
+exports.parseXmlCustom = parseXmlCustom;
+exports.findElement = findElement;
+exports.getChildren = getChildren;
+const fast_xml_parser_1 = require("fast-xml-parser");
+const handlebars_1 = __importDefault(require("handlebars"));
+const mustache_1 = __importDefault(require("mustache"));
+const helpers_1 = require("./helpers");
+var TemplateMethod;
+(function (TemplateMethod) {
+    TemplateMethod[TemplateMethod["Mustache"] = 0] = "Mustache";
+    TemplateMethod[TemplateMethod["Handlebars"] = 1] = "Handlebars";
+})(TemplateMethod || (exports.TemplateMethod = TemplateMethod = {}));
+const parseMustacheXml = (template, data, partials, method = TemplateMethod.Handlebars) => {
+    switch (method) {
+        case TemplateMethod.Handlebars: {
+            return (0, exports.parseXml)((0, exports.renderHandlebars)(template, data, partials));
+        }
+        case TemplateMethod.Mustache:
+        default: {
+            return (0, exports.parseXml)((0, exports.renderMustache)(template, data, partials));
+        }
+    }
+};
+exports.parseMustacheXml = parseMustacheXml;
+exports.renderMustache = mustache_1.default.render;
+const renderHandlebars = (template, data, partials) => {
+    (0, helpers_1.registerHelpers)();
+    Object.entries(partials).forEach(([name, partial]) => handlebars_1.default.registerPartial(name, partial));
+    return handlebars_1.default.compile(template, { compat: true, preventIndent: true })(data);
+};
+exports.renderHandlebars = renderHandlebars;
+function parseXmlCustom(text, options) {
+    const parser = new fast_xml_parser_1.XMLParser(options);
+    parser.addEntity("#x2F", "/");
+    parser.addEntity("#x3D", "=");
+    return transformFXP(parser.parse(text));
+}
+const parseXml = (text) => transformFXP(xmlParser.parse(text));
+exports.parseXml = parseXml;
+const parseXsd = (text) => transformFXP(xsdParser.parse(text.replace(/xs:/g, "")));
+exports.parseXsd = parseXsd;
+// Transforms fast-xml-parser format to a format that is much easier to work with
+function transformFXP(parsedXml) {
+    return parsedXml.flatMap((element) => {
+        const key = Object.keys(element).find((k) => k !== ":@" && k !== "#text");
+        if (key === "?xml") {
+            return [];
+        }
+        const children = (element[key] || []).filter((c) => {
+            const key = Object.keys(c)[0];
+            return key !== "#text" && key !== ":@";
+        });
+        const attributes = element[":@"] || {};
+        const textChilds = (element[key] || [])
+            .filter((c) => {
+            const key = Object.keys(c)[0];
+            return key === "#text";
+        })
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            .flatMap((t) => t["#text"]);
+        const textContents = textChilds.flatMap((text) => {
+            const cleaned = text.replace(/\n/g, "").replace(/\t/g, "").trim();
+            return cleaned ? [text] : [];
+        });
+        const textContent = textContents.join("\n");
+        return { tagName: key, attributes: attributes, children: transformFXP(children), textContent: textContent };
+    });
+}
+function findElement(elements, elementName) {
+    if (!elementName) {
+        return undefined;
+    }
+    for (const elem of elements) {
+        if (elem.tagName === "annotation" || elem.tagName === "attribute") {
+            continue;
+        }
+        if (shouldSkipLevel(elem)) {
+            const childElement = findElement(Array.from(elem.children), elementName);
+            if (childElement) {
+                return shouldSkipLevel(childElement)
+                    ? findElement(Array.from(childElement.children), elementName)
+                    : childElement;
+            }
+        }
+        if (elem.attributes.name === elementName) {
+            return elem;
+        }
+    }
+    return undefined;
+}
+function getChildren(elements) {
+    for (const elem of elements) {
+        if (elem.tagName === "annotation" || elem.tagName === "attribute") {
+            continue;
+        }
+        if (shouldSkipLevel(elem)) {
+            const child = getChildren(Array.from(elem.children));
+            if (child.length > 0) {
+                return child.flatMap((c) => (shouldSkipLevel(c) ? getChildren(Array.from(c.children)) : c));
+            }
+        }
+        return elements;
+    }
+    return [];
+}
+function shouldSkipLevel(tag) {
+    return (tag.tagName === "all" || tag.tagName === "sequence" || tag.tagName === "choice" || tag.attributes.name === undefined);
+}
+const xmlParser = new fast_xml_parser_1.XMLParser({
+    preserveOrder: true,
+    ignoreAttributes: false,
+    attributeNamePrefix: "",
+    allowBooleanAttributes: true,
+    trimValues: false,
+    ignoreDeclaration: true,
+    processEntities: true,
+    htmlEntities: true,
+    attributeValueProcessor: (_name, value) => {
+        if (!value?.trim()) {
+            return value;
+        }
+        const nValue = Number(value);
+        if (!Number.isNaN(nValue)) {
+            return nValue;
+        }
+        return value;
+    },
+});
+xmlParser.addEntity("#x2F", "/");
+xmlParser.addEntity("#x3D", "=");
+const xsdParser = new fast_xml_parser_1.XMLParser({
+    preserveOrder: true,
+    ignoreAttributes: false,
+    attributeNamePrefix: "",
+    allowBooleanAttributes: true,
+    trimValues: false,
+    ignoreDeclaration: true,
+    stopNodes: ["*.documentation"],
+});
+xsdParser.addEntity("#x2F", "/");
+xsdParser.addEntity("#x3D", "=");
+//# sourceMappingURL=parse-mustache-xml.js.map

package/lib/abstract-document-xml/handlebars-xml/parse-mustache-xml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-mustache-xml.js","sourceRoot":"","sources":["../../../src/abstract-document-xml/handlebars-xml/parse-mustache-xml.ts"],"names":[],"mappings":"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"}

package/lib/abstract-document-xml/handlebars-xml/validate-mustache-xml.d.ts

@@ -0,0 +1,21 @@
+import { XmlElement } from "./parse-mustache-xml.js";
+type Range = {
+    readonly startLineNumber: number;
+    readonly startColumn: number;
+    readonly endLineNumber: number;
+    readonly endColumn: number;
+};
+type ErrorObject = {
+    readonly range: Range;
+    readonly options: ErrorOptions;
+};
+type ErrorOptions = {
+    readonly className: string;
+    readonly hoverMessage: Array<{
+        readonly value: string;
+    }>;
+};
+export declare function validateXml(fullXml: string, xsdSchema: ReadonlyArray<XmlElement>): Array<ErrorObject>;
+export declare function errorToReadableText(errors: ReadonlyArray<ErrorObject>, templateName?: string): string;
+export {};
+//# sourceMappingURL=validate-mustache-xml.d.ts.map

package/lib/abstract-document-xml/handlebars-xml/validate-mustache-xml.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-mustache-xml.d.ts","sourceRoot":"","sources":["../../../src/abstract-document-xml/handlebars-xml/validate-mustache-xml.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAyB,MAAM,yBAAyB,CAAC;AAO5E,KAAK,KAAK,GAAG;IACX,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAMF,KAAK,WAAW,GAAG;IACjB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;CAChC,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC;QAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;KACxB,CAAC,CAAC;CACJ,CAAC;AASF,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,CAgErG;AAoJD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,EAAE,YAAY,GAAE,MAAW,GAAG,MAAM,CAYzG"}

package/lib/abstract-document-xml/handlebars-xml/validate-mustache-xml.js

@@ -0,0 +1,195 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateXml = validateXml;
+exports.errorToReadableText = errorToReadableText;
+const fast_xml_parser_1 = require("fast-xml-parser");
+const parse_mustache_xml_js_1 = require("./parse-mustache-xml.js");
+var ErrorType;
+(function (ErrorType) {
+    ErrorType[ErrorType["warning"] = 0] = "warning";
+    ErrorType[ErrorType["error"] = 1] = "error";
+})(ErrorType || (ErrorType = {}));
+// eslint-disable-next-line functional/prefer-readonly-type
+function validateXml(fullXml, xsdSchema) {
+    const errors = [];
+    // ignore all mustache brackets
+    const matchMustacheBrackets = /{{.*}}(?!([\S]))/g;
+    // Ignore xml comments
+    const xmlComments = /<!--[^>]*-->/g;
+    // Replace matches with spaces of same length
+    let cleanedXml = fullXml.replace(matchMustacheBrackets, (m) => " ".repeat(m.length));
+    cleanedXml = cleanedXml.replace(xmlComments, (m) => {
+        const x = (m.match(/^.*$/gm) || []).map((m2) => " ".repeat(m2.length));
+        return x.join("\n");
+    });
+    const xml = `<xml>\n${cleanedXml}\n</xml>`;
+    if (xml) {
+        try {
+            const result = fast_xml_parser_1.XMLValidator.validate(xml, {
+                allowBooleanAttributes: true,
+            });
+            if (result !== true) {
+                errors.push(getErrorFromException(result, xml));
+            }
+            const entryPointXml = (0, parse_mustache_xml_js_1.parseXml)(xml)[0];
+            const entryPointSchema = xsdSchema[0];
+            let pos = 0;
+            const lines = cleanedXml.split("\n");
+            const getRangeOfElement = (text, incrementPosition = true) => {
+                if (text === undefined) {
+                    const monacoPosition = getPositionFromIndex(lines, pos);
+                    return toRange(monacoPosition.lineNumber, monacoPosition.column, monacoPosition.lineNumber, monacoPosition.column + 5);
+                }
+                const position = cleanedXml.indexOf(text, pos);
+                if (incrementPosition) {
+                    pos = position >= pos ? position + text.length : pos;
+                }
+                const monacoPosition = getPositionFromIndex(lines, position);
+                return toRange(monacoPosition.lineNumber, monacoPosition.column, monacoPosition.lineNumber, monacoPosition.column + text.length);
+            };
+            const validationErrors = entryPointXml.children.flatMap((child) => validateElements(child, undefined, entryPointSchema, getRangeOfElement));
+            errors.push(...validationErrors);
+        }
+        catch (e) {
+            errors.push(createError(e.message, ErrorType.error, toRange(1, 1, 1, 100)));
+        }
+    }
+    return errors.map((e) => getDecorationsFromError(e));
+}
+function validateElements(element, schemaElement, completeSchema, getRangeOfElement) {
+    const errors = [];
+    // Validate element name
+    const tagName = element.tagName;
+    const range = getRangeOfElement(tagName);
+    const slashPosition = getRangeOfElement("/", false);
+    const closingTagPosition = getRangeOfElement(">", false);
+    const isClosed = rangeLessThan(slashPosition, closingTagPosition);
+    const validElements = Object.values(completeSchema.children);
+    const schemaName = schemaElement?.attributes.type || tagName;
+    const foundSchemaElement = (0, parse_mustache_xml_js_1.findElement)(validElements, schemaName);
+    if (!foundSchemaElement) {
+        return [createError(`"${tagName}" is not a valid element`, ErrorType.error, range)];
+    }
+    const possibleAttributes = Array.from(foundSchemaElement.children).flatMap((c) => c.tagName === "attribute" ? c : []);
+    // Validate required attributes
+    for (const possibleAttribute of possibleAttributes) {
+        const attributeName = possibleAttribute.attributes.name;
+        const isRequired = possibleAttribute.attributes.use;
+        if (attributeName && isRequired && isRequired === "required") {
+            if (element.attributes[attributeName] === undefined) {
+                errors.push(createError(`"${attributeName}" is a required attribute on "${tagName}"`, ErrorType.error, range));
+            }
+        }
+    }
+    // Validate existing attributes
+    for (const [attrKey, attrVal] of Object.entries(element.attributes)) {
+        const possibleAttrNames = possibleAttributes.flatMap((p) => p.attributes.name || []);
+        const attrText = typeof attrVal === "string" ? `${attrKey}="${attrVal}"` : attrKey;
+        const attrRange = getRangeOfElement(attrText, false);
+        if (!possibleAttrNames.includes(attrKey)) {
+            errors.push(createError(`"${attrKey}" is a not a valid attribute on "${tagName}"`, ErrorType.error, attrRange));
+        }
+    }
+    // Validate that the children are allowed as a child of current element
+    // and then validate the children themselves
+    const schemaChildren = Object.values(foundSchemaElement.children);
+    for (const child of element.children) {
+        const childName = child.tagName;
+        if (!childName) {
+            continue;
+        }
+        const foundChild = (0, parse_mustache_xml_js_1.findElement)(schemaChildren, childName);
+        if (!foundChild) {
+            const childRange = getRangeOfElement(childName, false);
+            if (childRange) {
+                errors.push(createError(`"${childName}" is not a valid child of "${tagName}"`, ErrorType.error, childRange));
+            }
+        }
+        const elementErrors = validateElements(child, foundChild, completeSchema, getRangeOfElement);
+        errors.push(...elementErrors);
+    }
+    if (!isClosed) {
+        // Increment position to after closing tag
+        getRangeOfElement(`</${tagName}`, true);
+    }
+    return errors;
+}
+function getDecorationsFromError(error) {
+    return {
+        range: error.range,
+        options: {
+            className: getErrorClassNames(error),
+            hoverMessage: [{ value: getErrorType(error) }, { value: getErrorMessage(error) }],
+        },
+    };
+}
+function getErrorFromException(result, xml) {
+    const { col, line, msg } = result.err;
+    const startLine = line - 1;
+    const lines = xml.split("\n");
+    const rowText = lines[startLine] || "";
+    const length = rowText.indexOf(">") - rowText.indexOf("<") || 4;
+    const range = toRange(startLine, col, startLine, col + length);
+    return createError(msg, ErrorType.error, range);
+}
+function getErrorClassNames(error) {
+    switch (error.type) {
+        case ErrorType.warning:
+            return "xml-lint xml-lint--warning";
+        case ErrorType.error:
+            return "xml-lint xml-lint--error";
+        default:
+            return "";
+    }
+}
+function getErrorType(error) {
+    switch (error.type) {
+        case ErrorType.warning:
+            return "**Warning**";
+        case ErrorType.error:
+            return "**Error**";
+        default:
+            return "";
+    }
+}
+const getErrorMessage = (error) => error.message.split(/[\t\n]/g)[1] ?? error.message;
+const createError = (message, type, range) => ({ message, type, range });
+function getPositionFromIndex(lines, index) {
+    let totalLength = 0;
+    for (const [lineNumber, line] of lines.entries()) {
+        totalLength += line.length;
+        if (totalLength >= index - lineNumber) {
+            return {
+                lineNumber: lineNumber + 1,
+                column: 1 + index - (totalLength - line.length) - lineNumber || 1, // "- lineNumber" because of \n characters
+            };
+        }
+    }
+    return { lineNumber: lines.length, column: 1 };
+}
+const toRange = (startLineNumber, startColumn, endLineNumber, endColumn) => ({
+    startLineNumber,
+    startColumn,
+    endLineNumber,
+    endColumn,
+});
+function errorToReadableText(errors, templateName = "") {
+    const errorLines = [];
+    if (templateName) {
+        errorLines.push(`Error in template ${templateName} \n`);
+    }
+    for (const error of errors) {
+        const hoverErrors = error.options.hoverMessage.map((e) => e.value.replace(/\*/g, ""));
+        errorLines.push(`${hoverErrors.join("\n")}`);
+        errorLines.push(`On line ${error.range.startLineNumber}, column ${error.range.startColumn}\n`);
+    }
+    return errorLines.join("\n");
+}
+function rangeLessThan(range1, range2) {
+    return range1.startLineNumber < range2.startLineNumber
+        ? true
+        : range1.startLineNumber > range2.startLineNumber
+            ? false
+            : range1.startColumn < range2.startColumn;
+}
+//# sourceMappingURL=validate-mustache-xml.js.map

package/lib/abstract-document-xml/handlebars-xml/validate-mustache-xml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-mustache-xml.js","sourceRoot":"","sources":["../../../src/abstract-document-xml/handlebars-xml/validate-mustache-xml.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abstract-document",
-  "version": "16.0.35",
+  "version": "16.0.36",
   "description": "Dynamically create documents using code or JSX and render to any format",
   "repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-document",
   "main": "lib/index.js",
@@ -48,5 +48,5 @@
     "vite": "^6.0.1",
     "vitest": "^2.1.6"
   },
-  "gitHead": "238a184dbb6658068579166db384d2c28b653ec7"
+  "gitHead": "be91668b1cef7bf6944910322f284e49cc4148c3"
 }

package/src/abstract-document/markdown/markdown.ts

@@ -86,6 +86,7 @@ function preProcessMarkdownAst(
             {
               styleName: paragraphStyle,
               numbering: paragraphNumbering,
+              isMarkdown: true,
             },
             atoms
           )
@@ -94,8 +95,17 @@ function preProcessMarkdownAst(
       } else if (child.type === "break") {
         atoms.push({ type: "LineBreak" });
       } else if (child.type === "text") {
+
+        // Due to formatting with bold and italic etc,
+        // markdown will split the whole text into separate
+        // textruns. Doing this only for the special text
+        // will make the renderer unhappy when aligning the
+        // textruns. Thereofre we should split all of the
+        // words here, and let the renderer align them word
+        // for word
+        const spaceRegex = /([\p{Zs}])/u;
         atoms = atoms.concat(
-          child.value.split("\n").map(
+          child.value.split(spaceRegex).filter((v) => v.length !== 0).map(
             (v: string) =>
               ({
                 type: "TextRun",

package/src/abstract-document/section-elements/paragraph.ts

@@ -11,21 +11,24 @@ export type Paragraph = Resources & {
   readonly style: ParagraphStyle.ParagraphStyle;
   readonly numbering: ParagraphNumbering | undefined;
   readonly children: ReadonlyArray<Atom>;
+  readonly isMarkdown?: boolean;
 };
 
 export type ParagraphProps = Resources & {
   readonly styleName?: string;
   readonly style?: ParagraphStyle.ParagraphStyle;
   readonly numbering?: ParagraphNumbering;
+  readonly isMarkdown?: boolean;
 };
 
 export function create(props?: ParagraphProps, children?: ReadonlyArray<Atom>): Paragraph {
-  const { styleName = "", style = ParagraphStyle.create(), numbering = undefined, ...rest } = props || {};
+  const { styleName = "", style = ParagraphStyle.create(), numbering = undefined, isMarkdown, ...rest } = props || {};
   return {
     type: sectionType,
     styleName,
     style,
     numbering,
+    isMarkdown,
     children: children || [],
     ...rest,
   };

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

@@ -280,14 +280,21 @@ function renderParagraph(
     rows.push(currentRow);
   }
 
-  let y = finalRect.y + style.margins.top;
+  //if the paragraph is markdown, we need to render it separately
+  //since alignment is different for that
+  if(paragraph.isMarkdown !== undefined && paragraph.isMarkdown) {
+    renderMarkdownRows(rows, resources, pdfKit, desiredSizes, finalRect, style, availableWidth);
+    return;
+  }
 
+  let y = finalRect.y + style.margins.top;
   for (let row of rows) {
     if (row.length === 0) {
       continue;
     }
-
+    
     const rowWidth = row.reduce((a, b) => a + getDesiredSize(b, desiredSizes).width, 0);
+    const remainingWidth = availableWidth - rowWidth;
     let x = finalRect.x;
 
     if (style.alignment === "Start" || style.alignment === "Justify") {
@@ -302,14 +309,13 @@ function renderParagraph(
       // Therefore we have to position it ourself
       // NOTE: Texts with multiple atoms with width over the available width are not supported.
       if (style.alignment === "Center") {
-        x += 0.5 * (availableWidth - rowWidth);
+        x += 0.5 * remainingWidth;
       } else if (style.alignment === "End") {
-        x += availableWidth - rowWidth;
+        x += remainingWidth;
       }
     }
 
     let rowHeight = 0;
-
     const lastIndex = row[row.length - 1]?.type === "LineBreak" ? row.length - 2 : row.length - 1;
     for (const [i, atom] of row.entries()) {
       const atomSize = getDesiredSize(atom, desiredSizes);
@@ -324,7 +330,6 @@ function renderParagraph(
         i === 0,
         i === lastIndex
       );
-
       x += atomSize.width;
       rowHeight = Math.max(rowHeight, atomSize.height);
     }
@@ -333,6 +338,146 @@ function renderParagraph(
   }
 }
 
+function renderMarkdownRows(
+  rawRows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>,
+  resources: AD.Resources.Resources,
+  pdfKit: PDFKit.PDFDocument,
+  desiredSizes: Map<{}, AD.Size.Size>,
+  finalRect: AD.Rect.Rect,
+  paragraphStyle: AD.ParagraphStyle.ParagraphStyle,
+  availableWidth: number,
+): void {
+  const rows = splitRows(rawRows, availableWidth, desiredSizes);
+  let y = finalRect.y + paragraphStyle.margins.top;
+  let markdownTextStyle: AD.TextStyle.TextStyle | undefined = undefined;
+  for(const row of rows) {
+    for(const atom of row) {
+      if(atom.type === "TextRun") {
+        markdownTextStyle = AD.Resources.getNestedStyle(
+          paragraphStyle.textStyle,
+          atom.style,
+          "TextStyle",
+          atom.styleName,
+          resources,
+          atom.nestedStyleNames || []
+        ) as AD.TextStyle.TextStyle;
+        break;
+      }
+    }
+  }
+
+  const defaultStyle = parseAlignment(paragraphStyle.alignment);
+  const alignment = markdownTextStyle?.alignment ?? defaultStyle;
+  for (let row of rows) {
+    if (row.length === 0) {
+      continue;
+    }
+    
+    const rowWidth = row.reduce((a, b) => a + getDesiredSize(b, desiredSizes).width, 0);
+    const remainingWidth = availableWidth - rowWidth;
+    const justificationWidth = row.length > 1 ? remainingWidth / (row.length - 1) : 0;
+    let x = finalRect.x;
+
+    if (alignment === "left" || alignment === "justify") {
+      x += paragraphStyle.margins.left;
+    } else if (alignment === "right") {
+      x -= paragraphStyle.margins.right;
+    }
+
+    if (row.length > 1 || row[0].type === "Image") {
+      if (alignment === "center") {
+        x += 0.5 * remainingWidth;
+      } else if (alignment === "right") {
+        x += remainingWidth;
+      }
+    }
+
+    let rowHeight = 0;
+    const lastIndex = row[row.length - 1]?.type === "LineBreak" ? row.length - 2 : row.length - 1;
+    for (const [i, atom] of row.entries()) {
+      const atomSize = getDesiredSize(atom, desiredSizes);
+      renderAtom(
+        resources,
+        pdfKit,
+        AD.Rect.create(x, y, atomSize.width, atomSize.height),
+        paragraphStyle.textStyle,
+        atom,
+        alignment,
+        availableWidth,
+        i === 0,
+        i === lastIndex
+      );
+      x += atomSize.width + (alignment === "justify" ? justificationWidth : 0);
+      rowHeight = Math.max(rowHeight, atomSize.height);
+    }
+    y += rowHeight;
+  }
+}
+
+function splitRows(rows: ReadonlyArray<ReadonlyArray<AD.Atom.Atom>>, availableWidth: number, desiredSizes: Map<{}, AD.Size.Size>): ReadonlyArray<ReadonlyArray<AD.Atom.Atom>> {
+  const newRows: Array<ReadonlyArray<AD.Atom.Atom>> = [];
+
+  for(const row of rows) {
+    if(row.length <= 1) {
+      newRows.push(row);
+      continue;
+    }
+    
+    const width = row.reduce((a, b) => a + getDesiredSize(b, desiredSizes).width, 0);
+    if(width <= availableWidth) {
+      newRows.push(row);
+      continue;
+    }
+
+    //we need to split it, because it doesn't fit
+    let currentRow: Array<AD.Atom.Atom> = [];
+    let currentWidth = 0;
+    let lastWasSpace = false;
+
+    for(let i = 0; i < row.length; i++) {
+      const atom = row[i];
+      if(atom.type !== "TextRun") {
+        continue;
+      }
+
+      const width = getDesiredSize(atom, desiredSizes).width;
+      if(atom.type !== "TextRun") {
+        currentRow.push(atom);
+        currentWidth += width;
+        continue;
+      }
+
+      const isSpace = atom.text.replaceAll(/[\p{Zs}]/ug, "").length === 0;
+      const lastSpace = lastWasSpace;
+      lastWasSpace = isSpace;
+
+      if(isSpace && currentWidth === 0 && i !== 0) {
+        continue;
+      }
+
+      if(currentWidth + width <= availableWidth) {
+        currentRow.push(atom);
+        currentWidth += width;
+        continue;
+      }
+
+      //was it a space??
+      if(isSpace) {
+        newRows.push(currentRow);
+        currentRow = [];
+        currentWidth = 0;
+        continue;
+      }
+
+      newRows.push(lastSpace ? currentRow.slice(0, -1) : currentRow);
+      currentRow = [atom];
+      currentWidth = width;
+    }
+    newRows.push(lastWasSpace ? currentRow.slice(0, -1) : currentRow);
+  }
+  return newRows;
+}
+
 function parseAlignment(paragraphAlignment: AD.ParagraphStyle.TextAlignment | undefined): AD.TextStyle.TextAlignment {
   switch (paragraphAlignment) {
     case "Start":

package/lib/abstract-document-exporters/shared/to-base-64.d.ts

@@ -1,3 +0,0 @@
-export declare function toBase64String(u8: Uint8Array): string;
-export declare const rawSvgPrefix = "data:image/svg+xml,";
-//# sourceMappingURL=to-base-64.d.ts.map

package/lib/abstract-document-exporters/shared/to-base-64.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"to-base-64.d.ts","sourceRoot":"","sources":["../../../src/abstract-document-exporters/shared/to-base-64.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,EAAE,EAAE,UAAU,GAAG,MAAM,CAarD;AAED,eAAO,MAAM,YAAY,wBAAwB,CAAC"}