abstract-document 18.0.3 → 18.1.0

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

@@ -72,9 +72,10 @@ function createDocument(doc: AD.AbstractDoc.AbstractDoc): Document {
 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);
+  const pageContentMargins = AD.LayoutFoundation.orDefault(section.page.style.contentMargins);
 
   const contentAvailableWidth =
-    pageWidth - (section.page.style.contentMargins.left + section.page.style.contentMargins.right);
+    pageWidth - (pageContentMargins.left + pageContentMargins.right);
 
   const resources = AD.Resources.mergeResources([parentResources, section]);
 
@@ -117,12 +118,12 @@ function renderSection(section: AD.Section.Section, parentResources: AD.Resource
             section.page.style.orientation === "Landscape" ? PageOrientation.LANDSCAPE : PageOrientation.PORTRAIT,
         },
         margin: {
-          bottom: section.page.style.contentMargins.bottom * abstractDocPixelToDocxDXARatio,
-          top: section.page.style.contentMargins.top * abstractDocPixelToDocxDXARatio,
-          right: section.page.style.contentMargins.right * abstractDocPixelToDocxDXARatio,
-          left: section.page.style.contentMargins.left * abstractDocPixelToDocxDXARatio,
-          header: section.page.style.headerMargins.top * abstractDocPixelToDocxDXARatio,
-          footer: section.page.style.footerMargins.bottom * abstractDocPixelToDocxDXARatio,
+          bottom: pageContentMargins.bottom * abstractDocPixelToDocxDXARatio,
+          top: pageContentMargins.top * abstractDocPixelToDocxDXARatio,
+          right: pageContentMargins.right * abstractDocPixelToDocxDXARatio,
+          left: pageContentMargins.left * abstractDocPixelToDocxDXARatio,
+          header: pageContentMargins.top * abstractDocPixelToDocxDXARatio,
+          footer: pageContentMargins.bottom * abstractDocPixelToDocxDXARatio,
         },
       },
     },
@@ -214,6 +215,7 @@ function renderTable(
     table.styleName,
     resources
   ) as AD.TableStyle.TableStyle;
+  const styleMargins = AD.LayoutFoundation.orDefault(style.margins);
 
   if (table.children.length === 0) {
     return undefined;
@@ -237,10 +239,10 @@ function renderTable(
           ? AlignmentType.RIGHT
           : AlignmentType.CENTER,
     margins: {
-      top: style.margins.top * abstractDocPixelToDocxDXARatio,
-      bottom: style.margins.bottom * abstractDocPixelToDocxDXARatio,
-      left: style.margins.left * abstractDocPixelToDocxDXARatio,
-      right: style.margins.right * abstractDocPixelToDocxDXARatio,
+      top: styleMargins.top * abstractDocPixelToDocxDXARatio,
+      bottom: styleMargins.bottom * abstractDocPixelToDocxDXARatio,
+      left: styleMargins.left * abstractDocPixelToDocxDXARatio,
+      right: styleMargins.right * abstractDocPixelToDocxDXARatio,
     },
     width: {
       type: WidthType.DXA,
@@ -310,8 +312,8 @@ function renderCell(
     resources
   ) as AD.TableCellStyle.TableCellStyle;
 
-  const stylePadding = style.padding ?? AD.LayoutFoundation.create();
-  const styleBorders = style.borders ?? AD.LayoutFoundation.create();
+  const stylePadding = AD.LayoutFoundation.orDefault(style.padding);
+  const styleBorders = AD.LayoutFoundation.orDefault(style.borders);
 
   return new TableCell({
     verticalAlign:
@@ -522,6 +524,7 @@ function renderParagraph(
     paragraph.styleName,
     resources
   ) as AD.ParagraphStyle.ParagraphStyle;
+  const styleMargins = AD.LayoutFoundation.orDefault(style.margins);
 
   return new Paragraph({
     keepNext: keepNext,
@@ -535,12 +538,12 @@ function renderParagraph(
       undefined,
 
     spacing: {
-      before: Math.max(style.margins.top, 0) * abstractDocPixelToDocxDXARatio,
-      after: Math.max(style.margins.bottom, 0) * abstractDocPixelToDocxDXARatio,
+      before: Math.max(styleMargins.top, 0) * abstractDocPixelToDocxDXARatio,
+      after: Math.max(styleMargins.bottom, 0) * abstractDocPixelToDocxDXARatio,
     },
     indent: {
-      left: Math.max(style.margins.left, 0) * abstractDocPixelToDocxDXARatio,
-      right: Math.max(style.margins.right, 0) * abstractDocPixelToDocxDXARatio,
+      left: Math.max(styleMargins.left, 0) * abstractDocPixelToDocxDXARatio,
+      right: Math.max(styleMargins.right, 0) * abstractDocPixelToDocxDXARatio,
     },
     children: paragraph.children.map((atom) => renderAtom(resources, style.textStyle, atom)),
   });

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

@@ -49,8 +49,10 @@ function measureSection(
   const pageHeight = AD.PageStyle.getHeight(section.page.style);
   const resources = AD.Resources.mergeResources([section, parentResources]);
 
+  const pageContentMargins = AD.LayoutFoundation.orDefault(section.page.style.contentMargins);
+
   const totalContentAvailableWidth =
-    pageWidth - (section.page.style.contentMargins.left + section.page.style.contentMargins.right);
+    pageWidth - (pageContentMargins.left + pageContentMargins.right);
   const contentAvailableWidth =
     totalContentAvailableWidth / section.page.style.columnLayout.columnCount -
     section.page.style.columnLayout.columnGap * (section.page.style.columnLayout.columnCount - 1);
@@ -58,12 +60,12 @@ function measureSection(
   const sectionSizes = children.map((e) => measureSectionElement(pdfKit, resources, contentAvailableSize, e));
 
   const headerAvailableWidth =
-    pageWidth - (section.page.style.headerMargins.left + section.page.style.headerMargins.right);
+    pageWidth - (pageContentMargins.left + pageContentMargins.right);
   const headerAvailableSize = AD.Size.create(headerAvailableWidth, pageHeight);
   const headerSizes = header.map((e) => measureSectionElement(pdfKit, resources, headerAvailableSize, e));
 
   const footerAvailableWidth =
-    pageWidth - (section.page.style.footerMargins.left + section.page.style.footerMargins.right);
+    pageWidth - (pageContentMargins.left + pageContentMargins.right);
   const footerAvailableSize = AD.Size.create(footerAvailableWidth, pageHeight);
   const footerSizes = footer.map((e) => measureSectionElement(pdfKit, resources, footerAvailableSize, e));
 
@@ -76,7 +78,8 @@ function measureSection(
       [firstPageHeaderAndFooters.footer, firstPageHeaderAndFooters.footerMargins],
     ];
   const firstPageHeaderAndFooterSizes = firstPageHeaderAndFootersExtracted.reduce((prev, [sections, margins]) => {
-    const availabelWidth = pageWidth - (margins.left + margins.right);
+    const defMargins = AD.LayoutFoundation.orDefault(margins);
+    const availabelWidth = pageWidth - (defMargins.left + defMargins.right);
     const availableSizes = AD.Size.create(availabelWidth, pageHeight);
     return [...prev, ...sections.map((e) => measureSectionElement(pdfKit, resources, availableSizes, e))];
   }, []);
@@ -124,11 +127,12 @@ function measureParagraph(
     paragraph.styleName,
     resources
   ) as AD.ParagraphStyle.ParagraphStyle;
-  const contentAvailableWidth = availableSize.width - (style.margins.left + style.margins.right);
-  const contentAvailableHeight = availableSize.height - (style.margins.top + style.margins.bottom);
+  const styleMargins = AD.LayoutFoundation.orDefault(style.margins);
+  const contentAvailableWidth = availableSize.width - (styleMargins.left + styleMargins.right);
+  const contentAvailableHeight = availableSize.height - (styleMargins.top + styleMargins.bottom);
   const contentAvailableSize = AD.Size.create(contentAvailableWidth, contentAvailableHeight);
 
-  let paragraphHeight = style.margins.top + style.margins.bottom;
+  let paragraphHeight = styleMargins.top + styleMargins.bottom;
   let desiredSizes = new Map<any, AD.Size.Size>();
 
   const rows: Array<Array<AD.Atom.Atom>> = [];
@@ -243,7 +247,8 @@ export function measureTable(
     table.styleName,
     resources
   ) as AD.TableStyle.TableStyle;
-  const tableAvailableWidth = availableSize.width - (style.margins.left + style.margins.right);
+  const styleMargins = AD.LayoutFoundation.orDefault(style.margins);
+  const tableAvailableWidth = availableSize.width - (styleMargins.left + styleMargins.right);
   const numInfinityColumns = table.columnWidths.filter((w) => !isFinite(w)).length;
   const fixedColumnsWidth = table.columnWidths.filter((w) => isFinite(w)).reduce((a, b) => a + b, 0);
   const infinityWidth = (tableAvailableWidth - fixedColumnsWidth) / numInfinityColumns;
@@ -261,8 +266,15 @@ export function measureTable(
         resources
       ) as AD.TableCellStyle.TableCellStyle;
       const cellWidth = columnWidths.slice(column, column + cell.columnSpan).reduce((a, b) => a + b, 0);
-      const cellStylePadding = cellStyle.padding ?? AD.LayoutFoundation.create();
+      //const cellStylePadding2 = cellStyle.padding ?? AD.LayoutFoundation.create();
 
+      const cellStylePadding = {
+        top: cellStyle.padding?.top ?? 0,
+        bottom: cellStyle.padding?.bottom ?? 0,
+        left: cellStyle.padding?.left ?? 0,
+        right: cellStyle.padding?.right ?? 0,
+      };
+    
       const contentAvailableWidth = cellWidth - (cellStylePadding.left + cellStylePadding.right);
       let cellDesiredHeight = cellStylePadding.top + cellStylePadding.bottom;
 
@@ -311,8 +323,8 @@ export function measureTable(
 
   const desiredWidth = table.columnWidths.some((w) => !isFinite(w))
     ? availableSize.width
-    : table.columnWidths.reduce((a, b) => a + b, style.margins.left + style.margins.right);
-  let desiredHeight = style.margins.top + style.margins.bottom;
+    : table.columnWidths.reduce((a, b) => a + b, styleMargins.left + styleMargins.right);
+  let desiredHeight = styleMargins.top + styleMargins.bottom;
   for (let i = 0; i < rows.length; i++) {
     const row = rows[i];
     const rowHeight = minRowHeights[i];

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

@@ -266,8 +266,8 @@ export function getHeaderAndFooter(
 ): {
   readonly header: Array<AD.SectionElement.SectionElement>;
   readonly footer: Array<AD.SectionElement.SectionElement>;
-  readonly headerMargins: AD.LayoutFoundation.LayoutFoundation;
-  readonly footerMargins: AD.LayoutFoundation.LayoutFoundation;
+  readonly headerMargins: Required<AD.LayoutFoundation.LayoutFoundation>;
+  readonly footerMargins: Required<AD.LayoutFoundation.LayoutFoundation>;
 } {
   const FIRST_PAGE = 1;
   const EVEN_PAGE = 0;
@@ -280,12 +280,12 @@ export function getHeaderAndFooter(
       return {
         footer: normalFooter ? section.page.footer : section.page.frontFooter,
         header: normalHeader ? section.page.header : section.page.frontHeader,
-        headerMargins: normalHeader
+        headerMargins: AD.LayoutFoundation.orDefault(normalHeader
           ? section.page.style.headerMargins
-          : section.page.style.firstPageHeaderMargins ?? section.page.style.headerMargins,
-        footerMargins: normalFooter
+          : section.page.style.firstPageHeaderMargins ?? section.page.style.headerMargins),
+        footerMargins: AD.LayoutFoundation.orDefault(normalFooter
           ? section.page.style.footerMargins
-          : section.page.style.firstPageFooterMargins ?? section.page.style.footerMargins,
+          : section.page.style.firstPageFooterMargins ?? section.page.style.footerMargins),
       };
     }
     case pageNo === 0:
@@ -295,8 +295,8 @@ export function getHeaderAndFooter(
       return {
         header: section.page.header,
         footer: section.page.footer,
-        headerMargins: section.page.style.headerMargins,
-        footerMargins: section.page.style.footerMargins,
+        headerMargins: AD.LayoutFoundation.orDefault(section.page.style.headerMargins),
+        footerMargins: AD.LayoutFoundation.orDefault(section.page.style.footerMargins),
       };
     }
   }
@@ -308,6 +308,7 @@ function getPageContentRect(
   pageNo: number
 ): AD.Rect.Rect {
   const style = section.page.style;
+  const styleContentMargins = AD.LayoutFoundation.orDefault(style.contentMargins);
   const pageWidth = AD.PageStyle.getWidth(style);
   const pageHeight = AD.PageStyle.getHeight(style);
 
@@ -328,10 +329,10 @@ function getPageContentRect(
   }
   headerY += headerMargins.bottom;
 
-  const rectX = style.contentMargins.left;
-  const rectY = headerY + style.contentMargins.top;
-  const rectWidth = pageWidth - (style.contentMargins.left + style.contentMargins.right);
-  const rectHeight = pageHeight - headerHeight - footerHeight - style.contentMargins.top - style.contentMargins.bottom;
+  const rectX = styleContentMargins.left;
+  const rectY = headerY + styleContentMargins.top;
+  const rectWidth = pageWidth - (styleContentMargins.left + styleContentMargins.right);
+  const rectHeight = pageHeight - headerHeight - footerHeight - styleContentMargins.top - styleContentMargins.bottom;
   return AD.Rect.create(rectX, rectY, rectWidth, rectHeight);
 }
 
@@ -343,11 +344,11 @@ function getLeadingAndTrailingSpace(
   const { noTopBottomMargin } = section.page.style;
 
   const first = elements[0];
-  const firstMargins = first && getSectionElementMargin(resources, first);
+  const firstMargins = first && AD.LayoutFoundation.orDefault(getSectionElementMargin(resources, first));
   const leadingSpace = firstMargins && noTopBottomMargin ? firstMargins.top : 0;
 
   const last = elements.length > 0 ? elements[elements.length - 1] : undefined;
-  const lastMargins = last && getSectionElementMargin(resources, last);
+  const lastMargins = last && AD.LayoutFoundation.orDefault(getSectionElementMargin(resources, last));
   const trailingSpace = lastMargins && noTopBottomMargin ? lastMargins.bottom : 0;
 
   return [leadingSpace, trailingSpace];

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

@@ -190,8 +190,9 @@ function renderGroup(
   finalRect: AD.Rect.Rect,
   group: AD.Group.Group
 ): void {
-  const finalX = finalRect.x + group.style.margins.left;
-  const startY = finalRect.y + group.style.margins.top;
+  const styleMargins = AD.LayoutFoundation.orDefault(group.style.margins);
+  const finalX = finalRect.x + styleMargins.left;
+  const startY = finalRect.y + styleMargins.top;
   let y = startY;
   for (const element of group.children) {
     const elementSize = getDesiredSize(element, desiredSizes);
@@ -223,7 +224,8 @@ function renderParagraph(
     paragraph.styleName,
     resources
   ) as AD.ParagraphStyle.ParagraphStyle;
-  const availableWidth = finalRect.width - (style.margins.left + style.margins.right);
+  const styleMargins = AD.LayoutFoundation.orDefault(style.margins);
+  const availableWidth = finalRect.width - (styleMargins.left + styleMargins.right);
 
   let rows: Array<Array<AD.Atom.Atom>> = [];
   let currentRow: Array<AD.Atom.Atom> = [];
@@ -286,7 +288,7 @@ function renderParagraph(
     rows.push(currentRow);
   }
 
-  let y = finalRect.y + style.margins.top;
+  let y = finalRect.y + styleMargins.top;
   const alignment = parseAlignment(style.alignment);
   const newRows = rowsSplit(rows, availableWidth, desiredSizes, alignment);
   const { newDesiredSizes, combinedRows } = rowsCombineTextRuns(
@@ -310,12 +312,12 @@ function renderParagraph(
     let x = finalRect.x;
 
     if (style.alignment === "Start" || style.alignment === "Justify") {
-      x += style.margins.left;
+      x += styleMargins.left;
     } else if (style.alignment === "End") {
-      x -= style.margins.right;
+      x -= styleMargins.right;
     }
 
-    if (row.length > 1 || row[0].type === "Image" || row[0].type === "TextRun") {
+    if (row.length > 1 || row[0].type === "Image" || row[0].type === "TextRun" || row[0].type === "TextField") {
       // Using continued with alignment "center" or "right" is broken:
       // https://github.com/foliojs/pdfkit/issues/240
       // Therefore we have to position it ourself
@@ -737,12 +739,13 @@ function renderTable(
     table.styleName,
     resources
   ) as AD.TableStyle.TableStyle;
+  const styleMargins = AD.LayoutFoundation.orDefault(style.margins);
   const availableWidth = finalRect.width;
-  let y = finalRect.y + style.margins.top;
+  let y = finalRect.y + styleMargins.top;
   const rows = [...table.headerRows, ...table.children];
   for (let [index, row] of rows.entries()) {
     const rowSize = getDesiredSize(row, desiredSizes);
-    let x = finalRect.x + style.margins.left;
+    let x = finalRect.x + styleMargins.left;
     if (style.alignment === "Center") x += 0.5 * (availableWidth - rowSize.width);
     else if (style.alignment === "Right") x += availableWidth - rowSize.width;
     const rowRect = AD.Rect.create(x, y, rowSize.width, rowSize.height);
@@ -812,8 +815,8 @@ function renderCell(
     pdf.rect(finalRect.x, finalRect.y, finalRect.width, finalRect.height).fill(style.background);
   }
 
-  const borders = style.borders ?? { top: 0, bottom: 0, left: 0, right: 0 };
-  const padding = style.padding ?? { top: 0, bottom: 0, left: 0, right: 0 };
+  const borders = AD.LayoutFoundation.orDefault(style.borders);
+  const padding = AD.LayoutFoundation.orDefault(style.padding);
 
   let x = finalRect.x + padding.left;
   const availableHeight = finalRect.height;

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

@@ -1,5 +1,6 @@
 import { addResources, merge } from "../../abstract-document/abstract-doc.js";
 import { AbstractDoc } from "../../abstract-document/index.js";
+import * as StyleKey from "../../abstract-document/styles/style-key.js";
 import { Resources } from "../../abstract-document/resources.js";
 import { ADCreatorFn, creators, propsCreators } from "./creator.js";
 import { parseHandlebarsXml, parseMustacheXml, type XmlElement } from "handlebars-xml";
@@ -47,7 +48,8 @@ export function abstractDocXml(
   const xml =
     rendered === "Mustache" ? parseMustacheXml(template, data, partials) : parseHandlebarsXml(template, data, partials);
   const [imageUrls, fontFamilies, styleNames] = extractImageFontsStyleNames(xml);
-  return [abstractDocXmlRecursive(creators(styleNames), xml[0]!), imageUrls, fontFamilies];
+  const doc = abstractDocXmlRecursive(creators(styleNames), xml[0]!);
+  return [doc, imageUrls, fontFamilies];
 }
 
 function abstractDocXmlRecursive(
@@ -63,7 +65,7 @@ function abstractDocXmlRecursive(
       if (childName === "StyleNames") {
         props.styles = abstractDocXmlRecursive(creators, childElement);
       } else if (childName === "StyleName" && childElement.attributes && childElement.attributes.name) {
-        const styleName = childElement.attributes.name;
+        const styleName = StyleKey.create(childElement.attributes.type, childElement.attributes.name);
         const style = abstractDocXmlRecursive(creators, childElement);
         props[styleName] = style;
       } else if (childName.startsWith(childName.charAt(0).toUpperCase())) {
@@ -98,10 +100,11 @@ function abstractDocXmlRecursive(
   //
   const obj = creator(allProps, children) as { [k: string]: unknown };
 
-  for (const propName of Object.keys(allProps)) {
-    const propsCreator = allProps[propName] && propsCreators[propName] ? propsCreators[propName] : undefined;
+  for (const propName of Object.keys(allProps).sort((a, b) => a.length - b.length)) {
+    const propsCreator = allProps[propName] !== undefined && propsCreators[propName] ? propsCreators[propName] : undefined;
     if (propsCreator) {
-      obj[propsCreator.name] = propsCreator(allProps, children);
+      const attributeName = getSuffixedAttributeBaseName(propsCreator.name) ?? propsCreator.name;
+      obj[attributeName] = propsCreator(allProps, children);
     }
   }
 
@@ -148,6 +151,27 @@ function abstractDocXmlRecursive(
   return obj;
 }
 
+function getSuffixedAttributeBaseName(attributeName: string): string | undefined {
+  const suffixRemoved = (() => {
+    const suffixes = ["Top", "Bottom", "Left", "Right"];
+    for(const suffix of suffixes) {
+      if(attributeName.endsWith(suffix)) {
+        return attributeName.slice(0, -suffix.length);
+      }
+    }
+    return undefined;
+  })();
+
+  const actualLookup: Record<string, string> = {
+    border: "borders",
+    margin: "margins",
+    padding: "padding",
+    borderColor: "borderColors",
+  };
+
+  return actualLookup[suffixRemoved ?? ""];
+}
+
 function extractImageFontsStyleNames(
   xmlElement: ReadonlyArray<XmlElement>,
   styleNames: Record<string, string> = {},

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

@@ -70,7 +70,7 @@ export const propsCreators: Record<string, ADCreatorFn> = {
     const fixedStyles: Record<string, Record<string, string | number>> = {};
     if (props.styles) {
       Object.keys(props.styles).forEach((key: string) => {
-        fixedStyles[(props.styles[key]?.type ?? "") + "_" + key] = { ...props.styles[key] };
+        fixedStyles[key] = { ...props.styles[key] };
       });
     }
 
@@ -137,6 +137,30 @@ export const propsCreators: Record<string, ADCreatorFn> = {
     });
     return borders;
   },
+  borderTop: (props: { readonly borderTop: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const borders: { top?: number, bottom?: number, left?: number, right?: number } = allProps.borders ?? {};
+    borders.top = Number(props.borderTop);
+    return borders; 
+  },
+  borderBottom: (props: { readonly borderBottom: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const borders: { top?: number, bottom?: number, left?: number, right?: number } = allProps.borders ?? {};
+    borders.bottom = Number(props.borderBottom);
+    return borders; 
+  },
+  borderLeft: (props: { readonly borderLeft: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const borders: { top?: number, bottom?: number, left?: number, right?: number } = allProps.borders ?? {};
+    borders.left = Number(props.borderLeft);
+    return borders; 
+  },
+  borderRight: (props: { readonly borderRight: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const borders: { top?: number, bottom?: number, left?: number, right?: number } = allProps.borders ?? {};
+    borders.right = Number(props.borderRight);
+    return borders; 
+  },
   padding: (props: { readonly padding: string }): unknown => {
     const padding: { [k: string]: number } = { top: 0, right: 0, bottom: 0, left: 0 };
 
@@ -179,6 +203,30 @@ export const propsCreators: Record<string, ADCreatorFn> = {
     });
     return padding;
   },
+  paddingTop: (props: { readonly paddingTop: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const padding: { top?: number, bottom?: number, left?: number, right?: number } = allProps.padding ?? {};
+    padding.top = Number(props.paddingTop);
+    return padding; 
+  },
+  paddingBottom: (props: { readonly paddingBottom: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const padding: { top?: number, bottom?: number, left?: number, right?: number } = allProps.padding ?? {};
+    padding.bottom = Number(props.paddingBottom);
+    return padding; 
+  },
+  paddingLeft: (props: { readonly paddingLeft: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const padding: { top?: number, bottom?: number, left?: number, right?: number } = allProps.padding ?? {};
+    padding.left = Number(props.paddingLeft);
+    return padding; 
+  },
+  paddingRight: (props: { readonly paddingRight: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const padding: { top?: number, bottom?: number, left?: number, right?: number } = allProps.padding ?? {};
+    padding.right = Number(props.paddingRight);
+    return padding; 
+  },
   margins: (props: { readonly margins: string }): unknown => {
     const margins: { [k: string]: number } = { top: 0, right: 0, bottom: 0, left: 0 };
     const propMargins = props.margins.toString().split(" ");
@@ -219,6 +267,30 @@ export const propsCreators: Record<string, ADCreatorFn> = {
     });
     return margins;
   },
+  marginTop: (props: { readonly marginTop: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const margins: { top?: number, bottom?: number, left?: number, right?: number } = allProps.margins ?? {};
+    margins.top = Number(props.marginTop);
+    return margins; 
+  },
+  marginBottom: (props: { readonly marginBottom: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const margins: { top?: number, bottom?: number, left?: number, right?: number } = allProps.margins ?? {};
+    margins.bottom = Number(props.marginBottom);
+    return margins; 
+  },
+  marginLeft: (props: { readonly marginLeft: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const margins: { top?: number, bottom?: number, left?: number, right?: number } = allProps.margins ?? {};
+    margins.left = Number(props.marginLeft);
+    return margins; 
+  },
+  marginRight: (props: { readonly marginRight: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const margins: { top?: number, bottom?: number, left?: number, right?: number } = allProps.margins ?? {};
+    margins.right = Number(props.marginRight);
+    return margins; 
+  },
   borderColors: (props: { readonly borderColors: string }): unknown => {
     const borderColors: { [k: string]: string } = { top: "", right: "", bottom: "", left: "" };
     props.borderColors.split(" ").forEach((item: string, index) => {
@@ -241,6 +313,30 @@ export const propsCreators: Record<string, ADCreatorFn> = {
     });
     return borderColors;
   },
+  borderColorTop: (props: { readonly borderColorTop: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const margins: { top?: string, bottom?: string, left?: string, right?: string } = allProps.borderColors ?? {};
+    margins.top = props.borderColorTop;
+    return margins; 
+  },
+  borderColorBottom: (props: { readonly borderColorBottom: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const boderColors: { top?: string, bottom?: string, left?: string, right?: string } = allProps.borderColors ?? {};
+    boderColors.bottom = props.borderColorBottom;
+    return boderColors; 
+  },
+  borderColorLeft: (props: { readonly borderColorLeft: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const boderColors: { top?: string, bottom?: string, left?: string, right?: string } = allProps.borderColors ?? {};
+    boderColors.left = props.borderColorLeft;
+    return boderColors; 
+  },
+  borderColorRight: (props: { readonly borderColorRight: string }): unknown => {
+    const allProps = props as Record<string, unknown>;
+    const boderColors: { top?: string, bottom?: string, left?: string, right?: string } = allProps.borderColors ?? {};
+    boderColors.right = props.borderColorRight;
+    return boderColors; 
+  },
 };
 
 const zero = AI.createPoint(0, 0);

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

@@ -4,7 +4,39 @@ export const StyleNames = `<xs:complexType name="StyleNames">
 	</xs:sequence>
 </xs:complexType>`;
 
+export const paddingAttributes = `
+  <xs:attribute name="paddingTop" type="xs:decimal"/>
+  <xs:attribute name="paddingRight" type="xs:decimal"/>
+  <xs:attribute name="paddingBottom" type="xs:decimal"/>
+  <xs:attribute name="paddingLeft" type="xs:decimal"/>
+`;
+
+export const bordersAttributes = `
+  <xs:attribute name="borderTop" type="xs:decimal"/>
+  <xs:attribute name="borderRight" type="xs:decimal"/>
+  <xs:attribute name="borderBottom" type="xs:decimal"/>
+  <xs:attribute name="borderLeft" type="xs:decimal"/>
+`;
+
+export const marginsAttributes = `
+  <xs:attribute name="marginTop" type="xs:decimal"/>
+  <xs:attribute name="marginRight" type="xs:decimal"/>
+  <xs:attribute name="marginBottom" type="xs:decimal"/>
+  <xs:attribute name="marginLeft" type="xs:decimal"/>
+`;
+
+export const borderColorsAttributes = `
+  <xs:attribute name="borderColorTop" type="xs:string"/>
+  <xs:attribute name="borderColorRight" type="xs:string"/>
+  <xs:attribute name="borderColorBottom" type="xs:string"/>
+  <xs:attribute name="borderColorLeft" type="xs:string"/>
+`;
+
 export const StyleName = `<xs:complexType name="StyleName">
+	${borderColorsAttributes}
+	${marginsAttributes}
+	${bordersAttributes}
+	${paddingAttributes}
 	<xs:attribute name="name" type="xs:string" use="required" />
 	<xs:attribute name="type" use="required">
 		<xs:annotation>
@@ -76,6 +108,7 @@ export const StyleName = `<xs:complexType name="StyleName">
 </xs:complexType>`;
 
 export const groupStyle = `<xs:complexType name="GroupStyle">
+	${marginsAttributes}
 	<xs:annotation>
 		<xs:documentation>Group style</xs:documentation>
 	</xs:annotation>
@@ -92,6 +125,9 @@ export const groupStyle = `<xs:complexType name="GroupStyle">
 </xs:complexType>`;
 
 export const tableCellStyle = `<xs:complexType name="TableCellStyle">
+	${paddingAttributes}
+	${bordersAttributes}
+	${borderColorsAttributes}
 	<xs:annotation>
 		<xs:documentation>Table cell style</xs:documentation>
 	</xs:annotation>
@@ -136,6 +172,7 @@ export const tableCellStyle = `<xs:complexType name="TableCellStyle">
 </xs:complexType>`;
 
 export const tableStyle = `<xs:complexType name="TableStyle">
+	${marginsAttributes}
 	<xs:annotation>
 		<xs:documentation>Table style</xs:documentation>
 	</xs:annotation>
@@ -167,6 +204,7 @@ export const tableStyle = `<xs:complexType name="TableStyle">
 </xs:complexType>`;
 
 export const paragraphStyle = `<xs:complexType name="ParagraphStyle">
+	${paddingAttributes}
 	<xs:annotation>
 		<xs:documentation>Paragraph style</xs:documentation>
 	</xs:annotation>
@@ -281,4 +319,4 @@ export const layoutFoundation = `<xs:complexType name="LayoutFoundation">
 export const pageColumnLayout = `<xs:complexType name="PageColumnLayout">
 	<xs:attribute name="columnCount" type="xs:decimal" />
 	<xs:attribute name="columnGap" type="xs:decimal" />
-</xs:complexType>`;
+</xs:complexType>`;