abstract-document 20.0.3 → 20.1.0

package/src/abstract-document/primitives/layout-foundation-color.ts

@@ -23,16 +23,13 @@ export function orDefault(colorLayout: LayoutFoundationColor | undefined): Layou
   };
 }
 
-export function overrideWith(
-  overrider: LayoutFoundationColor | undefined,
-  toOverride: LayoutFoundationColor | undefined
-): LayoutFoundationColor {
+export function overrideWith(overrider: LayoutFoundationColor | undefined, toOverride: LayoutFoundationColor | undefined): LayoutFoundationColor {
   const a = overrider;
   const b = toOverride;
   return create({
-    top: (a?.top ?? b?.top),
-    bottom: (a?.bottom ?? b?.bottom),
-    left: (a?.left ?? b?.left),
-    right: (a?.right ?? b?.right),
+    top: a?.top ?? b?.top,
+    bottom: a?.bottom ?? b?.bottom,
+    left: a?.left ?? b?.left,
+    right: a?.right ?? b?.right,
   });
 }

package/src/abstract-document/primitives/layout-foundation.ts

@@ -10,7 +10,7 @@ export function create(props?: LayoutFoundation): LayoutFoundation {
     top: props?.top,
     bottom: props?.bottom,
     left: props?.left,
-    right: props?.right
+    right: props?.right,
   };
 }
 
@@ -23,10 +23,7 @@ export function orDefault(layout: LayoutFoundation | undefined): Required<Layout
   };
 }
 
-export function overrideWith(
-  overrider: LayoutFoundation | undefined,
-  toOverride: LayoutFoundation | undefined
-): LayoutFoundation {
+export function overrideWith(overrider: LayoutFoundation | undefined, toOverride: LayoutFoundation | undefined): LayoutFoundation {
   const a = overrider;
   const b = toOverride;
   return {

package/src/abstract-document/primitives/point.ts

@@ -6,6 +6,6 @@ export interface Point {
 export function create(x: number, y: number): Point {
   return {
     x: x,
-    y: y
+    y: y,
   };
 }

package/src/abstract-document/resources.ts

@@ -1,19 +1,20 @@
+import { defaultAndStandardStyles } from "./default-styles.js";
 // import { ImageResource } from "./primitives/image-resource.js";
 // import { Numbering } from "./numberings/numbering.js";
 import type { NumberingDefinition } from "./numberings/numbering-definition.js";
+import type { Font } from "./primitives/font.js";
+import type { ImageResource } from "./primitives/image-resource.js";
 import { create } from "./styles/style-key.js";
 import type { Style } from "./styles/style.js";
 import { overrideWith } from "./styles/style.js";
-import type { Font } from "./primitives/font.js";
 import type { Indexer } from "./types.js";
-import { defaultAndStandardStyles } from "./default-styles.js";
-import type { ImageResource } from "./primitives/image-resource.js";
 
 export interface Resources {
   readonly fonts?: Indexer<Font>;
   readonly styles?: Indexer<Style>;
   /**
-   * Embedded image data uri are expected to have to shape: data:image/png;base64,${string}, data:image/jpeg;base64,${string} or data:image/svg+xml,${string}
+   * Embedded image data uri are expected to have to shape: data:image/png;base64,${string}, data:image/jpeg;base64,${string} or
+   * data:image/svg+xml,${string}
    */
   readonly imageResources?: Record<string, ImageResource>;
   readonly numberingDefinitions?: Indexer<NumberingDefinition>;
@@ -66,16 +67,10 @@ export function getNestedStyle(
   nestedStyleNames: ReadonlyArray<string>
 ): Style | undefined {
   const factoryDefault = defaultAndStandardStyles[create(type, "Default")];
-  const documentDefault = resources.styles && resources.styles[create(type, "Default")];
-  const namedStyle = resources.styles && resources.styles[create(type, name)];
+  const documentDefault = resources.styles?.[create(type, "Default")];
+  const namedStyle = resources.styles?.[create(type, name)];
   const nestedStyle = nestedStyleNames
-    ? nestedStyleNames.reduce(
-        (sofar, name) => overrideWith(sofar, resources.styles && resources.styles[create(type, name)]),
-        namedStyle
-      )
+    ? nestedStyleNames.reduce((sofar, name) => overrideWith(sofar, resources.styles?.[create(type, name)]), namedStyle)
     : namedStyle;
-  return overrideWith(
-    elementStyle,
-    overrideWith(nestedStyle, overrideWith(parentStyle, overrideWith(documentDefault, factoryDefault)))
-  );
+  return overrideWith(elementStyle, overrideWith(nestedStyle, overrideWith(parentStyle, overrideWith(documentDefault, factoryDefault))));
 }

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

@@ -1,6 +1,6 @@
 import type { Resources } from "../resources.js";
-import type { SectionElement } from "./section-element.js";
 import * as GroupStyle from "../styles/group-style.js";
+import type { SectionElement } from "./section-element.js";
 
 export const sectionType = "Group";
 
@@ -17,12 +17,12 @@ export type GroupProps = Resources & {
 };
 
 export function create(props?: GroupProps, children?: ReadonlyArray<SectionElement>): Group {
-  const { keepTogether = false, style = GroupStyle.create(), ...rest } = props || {};
+  const { keepTogether = false, style = GroupStyle.create(), ...rest } = props ?? {};
   return {
     type: sectionType,
     keepTogether: keepTogether,
     style,
-    children: children || [],
+    children: children ?? [],
     ...rest,
   };
 }

package/src/abstract-document/section-elements/page-break.ts

@@ -4,10 +4,9 @@ export type PageBreak = Resources & {
   readonly type: "PageBreak";
 };
 
-export type PageBreakProps = {};
+export type PageBreakProps = object;
 
-export function create(props?: PageBreakProps): PageBreak {
-  const {} = props || {};
+export function create(_props?: PageBreakProps): PageBreak {
   return {
     type: "PageBreak",
   };

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

@@ -1,7 +1,7 @@
-import type { Resources } from "../resources.js";
 import type { Atom } from "../atoms/atom.js";
-import type { ParagraphNumbering } from "./paragraph-numbering.js";
+import type { Resources } from "../resources.js";
 import * as ParagraphStyle from "../styles/paragraph-style.js";
+import type { ParagraphNumbering } from "./paragraph-numbering.js";
 
 export const sectionType = "Paragraph";
 
@@ -20,13 +20,13 @@ export type ParagraphProps = Resources & {
 };
 
 export function create(props?: ParagraphProps, children?: ReadonlyArray<Atom>): Paragraph {
-  const { styleName = "", style = ParagraphStyle.create(), numbering = undefined, ...rest } = props || {};
+  const { styleName = "", style = ParagraphStyle.create(), numbering, ...rest } = props ?? {};
   return {
     type: sectionType,
     styleName,
     style,
     numbering,
-    children: children || [],
+    children: children ?? [],
     ...rest,
   };
 }

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

@@ -1,7 +1,7 @@
 import * as Group from "./group.js";
+import type * as PageBreak from "./page-break.js";
 import * as Paragraph from "./paragraph.js";
 import * as Table from "./table.js";
-import type * as PageBreak from "./page-break.js";
 
 export type SectionElement = Group.Group | Paragraph.Paragraph | Table.Table | PageBreak.PageBreak;
 export type SectionElementNoPageBreak = Exclude<SectionElement, PageBreak.PageBreak>;

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

@@ -1,6 +1,6 @@
 import type { Resources } from "../resources.js";
-import type * as TableRow from "../table/table-row.js";
 import * as TableStyle from "../styles/table-style.js";
+import type * as TableRow from "../table/table-row.js";
 
 export const sectionType = "Table";
 
@@ -27,8 +27,8 @@ export function create(props: TableProps, children?: ReadonlyArray<TableRow.Tabl
     columnWidths,
     styleName,
     style,
-    headerRows: headerRows || [],
-    children: children || [],
+    headerRows: headerRows ?? [],
+    children: children ?? [],
     ...rest,
   };
 }

package/src/abstract-document/styles/group-style.ts

@@ -13,13 +13,13 @@ export interface GroupStyleProps {
 }
 
 export function create(props?: GroupStyleProps): GroupStyle {
-  const { margins = LayoutFoundation.create(), position = "relative" } = props || {};
+  const { margins = LayoutFoundation.create(), position = "relative" } = props ?? {};
   return { type: "GroupStyle", margins, position };
 }
 
 export function overrideWith(overrider: GroupStyle | undefined, toOverride: GroupStyle | undefined): GroupStyle {
-  const a: GroupStyleProps = overrider || {};
-  const b: GroupStyleProps = toOverride || {};
+  const a: GroupStyleProps = overrider ?? {};
+  const b: GroupStyleProps = toOverride ?? {};
   return create({
     margins: LayoutFoundation.overrideWith(a.margins, b.margins),
   });

package/src/abstract-document/styles/page-style.ts

@@ -50,7 +50,7 @@ export function create(props?: PageStyleProps): PageStyle {
       columnCount: 1,
       columnGap: 0,
     },
-  } = props || {};
+  } = props ?? {};
   return {
     headerMargins,
     footerMargins,
@@ -65,15 +65,11 @@ export function create(props?: PageStyleProps): PageStyle {
 }
 
 export function getWidth(pageStyle: PageStyle): number {
-  return pageStyle.orientation === "Landscape"
-    ? getPaperHeight(pageStyle.paperSize)
-    : getPaperWidth(pageStyle.paperSize);
+  return pageStyle.orientation === "Landscape" ? getPaperHeight(pageStyle.paperSize) : getPaperWidth(pageStyle.paperSize);
 }
 
 export function getHeight(pageStyle: PageStyle): number {
-  return pageStyle.orientation === "Landscape"
-    ? getPaperWidth(pageStyle.paperSize)
-    : getPaperHeight(pageStyle.paperSize);
+  return pageStyle.orientation === "Landscape" ? getPaperWidth(pageStyle.paperSize) : getPaperHeight(pageStyle.paperSize);
 }
 
 export function getPaperWidth(ps: PaperSize): number {

package/src/abstract-document/styles/paragraph-style.ts

@@ -1,6 +1,6 @@
-import * as TextStyle from "./text-style.js";
 import * as LayoutFoundation from "../primitives/layout-foundation.js";
 import type * as Position from "./position.js";
+import * as TextStyle from "./text-style.js";
 
 export type TextAlignment = "Start" | "Center" | "End" | "Justify";
 
@@ -20,12 +20,7 @@ export interface ParagraphStyleProps {
 }
 
 export function create(props?: ParagraphStyleProps): ParagraphStyle {
-  const {
-    alignment = undefined,
-    margins = LayoutFoundation.create(),
-    position = "relative",
-    textStyle = TextStyle.create(),
-  } = props || {};
+  const { alignment, margins = LayoutFoundation.create(), position = "relative", textStyle = TextStyle.create() } = props ?? {};
   return {
     type: "ParagraphStyle",
     alignment,
@@ -35,14 +30,11 @@ export function create(props?: ParagraphStyleProps): ParagraphStyle {
   };
 }
 
-export function overrideWith(
-  overrider: ParagraphStyle | undefined,
-  toOverride: ParagraphStyle | undefined
-): ParagraphStyle {
-  const a: ParagraphStyleProps = overrider || {};
-  const b: ParagraphStyleProps = toOverride || {};
+export function overrideWith(overrider: ParagraphStyle | undefined, toOverride: ParagraphStyle | undefined): ParagraphStyle {
+  const a: ParagraphStyleProps = overrider ?? {};
+  const b: ParagraphStyleProps = toOverride ?? {};
   return create({
-    alignment: a.alignment || b.alignment,
+    alignment: a.alignment ?? b.alignment,
     margins: LayoutFoundation.overrideWith(a.margins, b.margins),
     textStyle: TextStyle.overrideWith(a.textStyle, b.textStyle),
   });

package/src/abstract-document/styles/style.ts

@@ -3,11 +3,7 @@ import * as TableCellStyle from "./table-cell-style.js";
 import * as TableStyle from "./table-style.js";
 import * as TextStyle from "./text-style.js";
 
-export type Style =
-  | ParagraphStyle.ParagraphStyle
-  | TableCellStyle.TableCellStyle
-  | TableStyle.TableStyle
-  | TextStyle.TextStyle;
+export type Style = ParagraphStyle.ParagraphStyle | TableCellStyle.TableCellStyle | TableStyle.TableStyle | TextStyle.TextStyle;
 
 export function overrideWith(overrider: Style | undefined, toOverride: Style | undefined): Style | undefined {
   if (!overrider) {

package/src/abstract-document/styles/table-cell-style.ts

@@ -1,5 +1,5 @@
-import * as LayoutFoundation from "../primitives/layout-foundation.js";
 import * as LayoutFoundationColor from "../primitives/layout-foundation-color.js";
+import * as LayoutFoundation from "../primitives/layout-foundation.js";
 
 export type RowAlignment = "Top" | "Middle" | "Bottom";
 
@@ -23,14 +23,7 @@ export interface TableCellStyleProps {
 }
 
 export function create(props?: TableCellStyleProps): TableCellStyle {
-  const {
-    background = undefined,
-    borders = undefined,
-    borderColor = undefined,
-    borderColors = undefined,
-    padding = undefined,
-    verticalAlignment = undefined,
-  } = props || {};
+  const { background, borders, borderColor, borderColors, padding, verticalAlignment } = props ?? {};
   return {
     type: "TableCellStyle",
     background,
@@ -42,18 +35,15 @@ export function create(props?: TableCellStyleProps): TableCellStyle {
   };
 }
 
-export function overrideWith(
-  overrider: TableCellStyle | undefined,
-  toOverride: TableCellStyle | undefined
-): TableCellStyle {
-  const a: TableCellStyleProps = overrider || {};
-  const b: TableCellStyleProps = toOverride || {};
+export function overrideWith(overrider: TableCellStyle | undefined, toOverride: TableCellStyle | undefined): TableCellStyle {
+  const a: TableCellStyleProps = overrider ?? {};
+  const b: TableCellStyleProps = toOverride ?? {};
   return create({
-    background: a.background || b.background,
+    background: a.background ?? b.background,
     borders: LayoutFoundation.overrideWith(a.borders, b.borders),
-    borderColor: a.borderColor || b.borderColor,
+    borderColor: a.borderColor ?? b.borderColor,
     borderColors: LayoutFoundationColor.overrideWith(a.borderColors, b.borderColors),
     padding: LayoutFoundation.overrideWith(a.padding, b.padding),
-    verticalAlignment: a.verticalAlignment || b.verticalAlignment,
+    verticalAlignment: a.verticalAlignment ?? b.verticalAlignment,
   });
 }

package/src/abstract-document/styles/table-style.ts

@@ -1,6 +1,6 @@
 import * as LayoutFoundation from "../primitives/layout-foundation.js";
-import * as TableCellStyle from "./table-cell-style.js";
 import type * as Position from "./position.js";
+import * as TableCellStyle from "./table-cell-style.js";
 
 export type TableAlignment = "Left" | "Center" | "Right";
 
@@ -20,12 +20,7 @@ export interface TableStyleProps {
 }
 
 export function create(props?: TableStyleProps): TableStyle {
-  const {
-    margins = LayoutFoundation.create(),
-    alignment = undefined,
-    position = "relative",
-    cellStyle = TableCellStyle.create(),
-  } = props || {};
+  const { margins = LayoutFoundation.create(), alignment, position = "relative", cellStyle = TableCellStyle.create() } = props ?? {};
   return {
     type: "TableStyle",
     position,
@@ -40,7 +35,7 @@ export function overrideWith(overrider: TableStyle, toOverride: TableStyle): Tab
   const b: TableStyleProps = toOverride || {};
   return create({
     margins: LayoutFoundation.overrideWith(a.margins, b.margins),
-    alignment: a.alignment || b.alignment,
+    alignment: a.alignment ?? b.alignment,
     cellStyle: TableCellStyle.overrideWith(a.cellStyle, b.cellStyle),
   });
 }

package/src/abstract-document/styles/text-style.ts

@@ -55,48 +55,43 @@ export interface TextStyleProps {
 export function create(props?: TextStyleProps): TextStyle {
   return {
     type: "TextStyle",
-    ...(props || {}),
+    ...props,
   };
 }
 
 export function overrideWith(overrider: TextStyle | undefined, toOverride: TextStyle | undefined): TextStyle {
   const overriddenFontWeight: Partial<TextStyle> =
-    overrider?.light ||
-      overrider?.normal ||
-      overrider?.mediumBold ||
-      overrider?.bold ||
-      overrider?.extraBold ||
-      overrider?.fontWeight
+    overrider?.light || overrider?.normal || overrider?.mediumBold || overrider?.bold || overrider?.extraBold || overrider?.fontWeight
       ? {
-        light: overrider?.light,
-        normal: overrider?.normal,
-        mediumBold: overrider?.mediumBold,
-        bold: overrider?.bold,
-        extraBold: overrider?.extraBold,
-        fontWeight: overrider?.fontWeight,
-      }
+          light: overrider?.light,
+          normal: overrider?.normal,
+          mediumBold: overrider?.mediumBold,
+          bold: overrider?.bold,
+          extraBold: overrider?.extraBold,
+          fontWeight: overrider?.fontWeight,
+        }
       : {
-        light: toOverride?.light,
-        normal: toOverride?.normal,
-        mediumBold: toOverride?.mediumBold,
-        bold: toOverride?.bold,
-        extraBold: toOverride?.extraBold,
-        fontWeight: toOverride?.fontWeight,
-      };
-  const a: TextStyleProps = overrider || {};
-  const b: TextStyleProps = toOverride || {};
+          light: toOverride?.light,
+          normal: toOverride?.normal,
+          mediumBold: toOverride?.mediumBold,
+          bold: toOverride?.bold,
+          extraBold: toOverride?.extraBold,
+          fontWeight: toOverride?.fontWeight,
+        };
+  const a: TextStyleProps = overrider ?? {};
+  const b: TextStyleProps = toOverride ?? {};
   return create({
-    fontFamily: a.fontFamily || b.fontFamily,
-    color: a.color || b.color,
-    fontSize: a.fontSize || b.fontSize,
-    fontScale: a.fontScale || b.fontScale,
-    italic: a.italic || b.italic,
-    subScript: a.subScript || b.subScript,
-    superScript: a.superScript || b.superScript,
-    underline: a.underline || b.underline,
-    verticalPosition: a.verticalPosition || b.verticalPosition,
-    indent: a.indent || b.indent,
-    lineGap: a.lineGap || b.lineGap,
+    fontFamily: a.fontFamily ?? b.fontFamily,
+    color: a.color ?? b.color,
+    fontSize: a.fontSize ?? b.fontSize,
+    fontScale: a.fontScale ?? b.fontScale,
+    italic: a.italic ?? b.italic,
+    subScript: a.subScript ?? b.subScript,
+    superScript: a.superScript ?? b.superScript,
+    underline: a.underline ?? b.underline,
+    verticalPosition: a.verticalPosition ?? b.verticalPosition,
+    indent: a.indent ?? b.indent,
+    lineGap: a.lineGap ?? b.lineGap,
     lineBreak: a.lineBreak ?? b.lineBreak,
     baseline: a.baseline ?? b.baseline,
     strike: a.strike ?? b.strike,
@@ -107,7 +102,7 @@ export function overrideWith(overrider: TextStyle | undefined, toOverride: TextS
 }
 
 export function calculateFontSize(textStyle: TextStyle | undefined, defaultFontSize: number): number {
-  const fontSize = textStyle && textStyle.fontSize ? textStyle.fontSize : defaultFontSize;
-  const fontScale = textStyle && textStyle.fontScale ? textStyle.fontScale : 1.0;
+  const fontSize = textStyle?.fontSize ?? defaultFontSize;
+  const fontScale = textStyle?.fontScale ?? 1.0;
   return fontSize * fontScale;
 }

package/src/abstract-document/table/table-cell.ts

@@ -19,13 +19,13 @@ export interface TableCellProps {
 }
 
 export function create(props?: TableCellProps, children?: ReadonlyArray<SectionElement.SectionElement>): TableCell {
-  const { styleName = "", columnSpan = 1, rowSpan = 1, style = TableCellStyle.create(), dummy = false } = props || {};
+  const { styleName = "", columnSpan = 1, rowSpan = 1, style = TableCellStyle.create(), dummy = false } = props ?? {};
   return {
     styleName,
     columnSpan,
     rowSpan,
     style,
     dummy,
-    children: children || [],
+    children: children ?? [],
   };
 }

package/src/abstract-document/table/table-row.ts

@@ -4,11 +4,10 @@ export interface TableRow {
   readonly children: ReadonlyArray<TableCell>;
 }
 
-export interface TableRowProps {}
+export type TableRowProps = object;
 
-export function create(props?: TableRowProps, children?: ReadonlyArray<TableCell>): TableRow {
-  const {} = props || {};
+export function create(_props?: TableRowProps, children?: ReadonlyArray<TableCell>): TableRow {
   return {
-    children: children || [],
+    children: children ?? [],
   };
 }

package/src/abstract-document/types.ts

@@ -1,3 +1,2 @@
-// tslint:disable-next-line:readonly-keyword
 export type Indexer<T> = { [key: string]: T };
 export type Guid = string;

package/src/abstract-document-exporters/docx/document-container.ts

@@ -1,18 +1,29 @@
-import { RefContainer } from "./ref-container.js";
-import { XmlWriter } from "./xml-writer.js";
+import type { RefContainer } from "./ref-container.js";
+import { createRefContainer } from "./ref-container.js";
+import type { XmlWriter } from "./xml-writer.js";
+import { createXmlWriter } from "./xml-writer.js";
 
-//tslint:disable:no-class no-this
+export interface DocumentContainer {
+  readonly filePath: string;
+  readonly fileName: string;
+  readonly refId: string;
+  readonly contentType: string;
+  readonly references: RefContainer;
+  readonly XMLWriter: XmlWriter;
+}
 
-export class DocumentContainer {
-  readonly filePath!: string;
-  readonly fileName!: string;
-  readonly refId!: string;
-  readonly contentType!: string;
-  readonly references: RefContainer = new RefContainer();
+export function createDocumentContainer(filePath: string, fileName: string, refId: string, contentType: string): DocumentContainer {
+  const xmlWriter = createXmlWriter();
 
-  private readonly _xmlWriter: XmlWriter = new XmlWriter();
+  return {
+    filePath,
+    fileName,
+    refId,
+    contentType,
+    references: createRefContainer(),
 
-  get XMLWriter(): XmlWriter {
-    return this._xmlWriter;
-  }
+    get XMLWriter(): XmlWriter {
+      return xmlWriter;
+    },
+  };
 }

package/src/abstract-document-exporters/docx/docx-constants.ts

@@ -1,21 +1,17 @@
-// tslint:disable:variable-name
-
-export const WordNamespace = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
+export const WordNamespace = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
 export const WordPrefix = "w";
 export const VmlNamespace = "urn:schemas-microsoft-com:vml";
 export const VmlPrefix = "v";
 export const OfficeNamespace = "urn:schemas-microsoft-com:office:office";
 export const OfficePrefix = "o";
 export const HeadRelXml =
-  // tslint:disable-next-line:max-line-length
   "<?xml version='1.0' encoding='utf-8'?><Relationships xmlns='http://schemas.openxmlformats.org/package/2006/relationships'><Relationship Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument' Target='/word/document.xml' Id='Rac2f7d58837f4830'/></Relationships>";
 
 export const RelNamespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships";
 export const RelPrefix = "r";
 export const PointOoXmlFactor = 20;
 
-export const ImageStyle =
-  "width:{0}pt;height:{1}pt;mso-position-horizontal-relative:char;mso-position-vertical-relative:line;v-text-anchor:middle";
+export const ImageStyle = "width:{0}pt;height:{1}pt;mso-position-horizontal-relative:char;mso-position-vertical-relative:line;v-text-anchor:middle";
 
 export const ContentTypeNamespace = "http://schemas.openxmlformats.org/package/2006/content-types.js";
 export const HeaderNamespace = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";