abstract-document 6.0.2 → 6.0.3

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

@@ -1,45 +1,45 @@
-import * as TextStyle from "./text-style";
-import * as LayoutFoundation from "../primitives/layout-foundation";
-
-export type TextAlignment = "Start" | "Center" | "End" | "Justify";
-
-export interface ParagraphStyle {
-  readonly type: "ParagraphStyle";
-  readonly alignment?: TextAlignment;
-  readonly margins: LayoutFoundation.LayoutFoundation;
-  readonly textStyle: TextStyle.TextStyle;
-}
-
-export interface ParagraphStyleProps {
-  readonly alignment?: TextAlignment;
-  readonly margins?: LayoutFoundation.LayoutFoundation;
-  readonly textStyle?: TextStyle.TextStyle;
-}
-
-export function create(props?: ParagraphStyleProps): ParagraphStyle {
-  const {
-    alignment = undefined,
-    margins = LayoutFoundation.create(),
-    textStyle = TextStyle.create()
-  } =
-    props || {};
-  return {
-    type: "ParagraphStyle",
-    alignment,
-    margins,
-    textStyle
-  };
-}
-
-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,
-    margins: LayoutFoundation.overrideWith(a.margins, b.margins),
-    textStyle: TextStyle.overrideWith(a.textStyle, b.textStyle)
-  });
-}
+import * as TextStyle from "./text-style";
+import * as LayoutFoundation from "../primitives/layout-foundation";
+
+export type TextAlignment = "Start" | "Center" | "End" | "Justify";
+
+export interface ParagraphStyle {
+  readonly type: "ParagraphStyle";
+  readonly alignment?: TextAlignment;
+  readonly margins: LayoutFoundation.LayoutFoundation;
+  readonly textStyle: TextStyle.TextStyle;
+}
+
+export interface ParagraphStyleProps {
+  readonly alignment?: TextAlignment;
+  readonly margins?: LayoutFoundation.LayoutFoundation;
+  readonly textStyle?: TextStyle.TextStyle;
+}
+
+export function create(props?: ParagraphStyleProps): ParagraphStyle {
+  const {
+    alignment = undefined,
+    margins = LayoutFoundation.create(),
+    textStyle = TextStyle.create()
+  } =
+    props || {};
+  return {
+    type: "ParagraphStyle",
+    alignment,
+    margins,
+    textStyle
+  };
+}
+
+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,
+    margins: LayoutFoundation.overrideWith(a.margins, b.margins),
+    textStyle: TextStyle.overrideWith(a.textStyle, b.textStyle)
+  });
+}

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

@@ -1,5 +1,5 @@
-export type StyleKey = string;
-
-export function create(type: string, name: string): StyleKey {
-  return `${type}_${name}`;
-}
+export type StyleKey = string;
+
+export function create(type: string, name: string): StyleKey {
+  return `${type}_${name}`;
+}

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

@@ -1,44 +1,44 @@
-import * as ParagraphStyle from "./paragraph-style";
-import * as TableCellStyle from "./table-cell-style";
-import * as TableStyle from "./table-style";
-import * as TextStyle from "./text-style";
-
-export type Style =
-  | ParagraphStyle.ParagraphStyle
-  | TableCellStyle.TableCellStyle
-  | TableStyle.TableStyle
-  | TextStyle.TextStyle;
-
-export function overrideWith(
-  overrider: Style | undefined,
-  toOverride: Style | undefined
-): Style | undefined {
-  if (!overrider) {
-    return toOverride;
-  }
-  if (!toOverride) {
-    return overrider;
-  }
-  if (
-    overrider.type === "ParagraphStyle" &&
-    toOverride.type === "ParagraphStyle"
-  ) {
-    return ParagraphStyle.overrideWith(overrider, toOverride);
-  } else if (
-    overrider.type === "TableCellStyle" &&
-    toOverride.type === "TableCellStyle"
-  ) {
-    return TableCellStyle.overrideWith(overrider, toOverride);
-  } else if (
-    overrider.type === "TableStyle" &&
-    toOverride.type === "TableStyle"
-  ) {
-    return TableStyle.overrideWith(overrider, toOverride);
-  } else if (
-    overrider.type === "TextStyle" &&
-    toOverride.type === "TextStyle"
-  ) {
-    return TextStyle.overrideWith(overrider, toOverride);
-  }
-  return toOverride;
-}
+import * as ParagraphStyle from "./paragraph-style";
+import * as TableCellStyle from "./table-cell-style";
+import * as TableStyle from "./table-style";
+import * as TextStyle from "./text-style";
+
+export type Style =
+  | ParagraphStyle.ParagraphStyle
+  | TableCellStyle.TableCellStyle
+  | TableStyle.TableStyle
+  | TextStyle.TextStyle;
+
+export function overrideWith(
+  overrider: Style | undefined,
+  toOverride: Style | undefined
+): Style | undefined {
+  if (!overrider) {
+    return toOverride;
+  }
+  if (!toOverride) {
+    return overrider;
+  }
+  if (
+    overrider.type === "ParagraphStyle" &&
+    toOverride.type === "ParagraphStyle"
+  ) {
+    return ParagraphStyle.overrideWith(overrider, toOverride);
+  } else if (
+    overrider.type === "TableCellStyle" &&
+    toOverride.type === "TableCellStyle"
+  ) {
+    return TableCellStyle.overrideWith(overrider, toOverride);
+  } else if (
+    overrider.type === "TableStyle" &&
+    toOverride.type === "TableStyle"
+  ) {
+    return TableStyle.overrideWith(overrider, toOverride);
+  } else if (
+    overrider.type === "TextStyle" &&
+    toOverride.type === "TextStyle"
+  ) {
+    return TextStyle.overrideWith(overrider, toOverride);
+  }
+  return toOverride;
+}

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

@@ -1,54 +1,54 @@
-import * as LayoutFoundation from "../primitives/layout-foundation";
-
-export type RowAlignment = "Top" | "Middle" | "Bottom";
-
-export interface TableCellStyle {
-  readonly type: "TableCellStyle";
-  readonly background?: string;
-  readonly borders: LayoutFoundation.LayoutFoundation;
-  readonly borderColor?: string;
-  readonly padding: LayoutFoundation.LayoutFoundation;
-  readonly verticalAlignment?: RowAlignment;
-}
-
-export interface TableCellStyleProps {
-  readonly background?: string;
-  readonly borders?: LayoutFoundation.LayoutFoundation;
-  readonly borderColor?: string;
-  readonly padding?: LayoutFoundation.LayoutFoundation;
-  readonly verticalAlignment?: RowAlignment;
-}
-
-export function create(props?: TableCellStyleProps): TableCellStyle {
-  const {
-    background = undefined,
-    borders = LayoutFoundation.create(),
-    borderColor = undefined,
-    padding = LayoutFoundation.create(),
-    verticalAlignment = undefined
-  } =
-    props || {};
-  return {
-    type: "TableCellStyle",
-    background,
-    borders,
-    borderColor,
-    padding,
-    verticalAlignment
-  };
-}
-
-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,
-    borders: LayoutFoundation.overrideWith(a.borders, b.borders),
-    borderColor: a.borderColor || b.borderColor,
-    padding: LayoutFoundation.overrideWith(a.padding, b.padding),
-    verticalAlignment: a.verticalAlignment || b.verticalAlignment
-  });
-}
+import * as LayoutFoundation from "../primitives/layout-foundation";
+
+export type RowAlignment = "Top" | "Middle" | "Bottom";
+
+export interface TableCellStyle {
+  readonly type: "TableCellStyle";
+  readonly background?: string;
+  readonly borders: LayoutFoundation.LayoutFoundation;
+  readonly borderColor?: string;
+  readonly padding: LayoutFoundation.LayoutFoundation;
+  readonly verticalAlignment?: RowAlignment;
+}
+
+export interface TableCellStyleProps {
+  readonly background?: string;
+  readonly borders?: LayoutFoundation.LayoutFoundation;
+  readonly borderColor?: string;
+  readonly padding?: LayoutFoundation.LayoutFoundation;
+  readonly verticalAlignment?: RowAlignment;
+}
+
+export function create(props?: TableCellStyleProps): TableCellStyle {
+  const {
+    background = undefined,
+    borders = LayoutFoundation.create(),
+    borderColor = undefined,
+    padding = LayoutFoundation.create(),
+    verticalAlignment = undefined
+  } =
+    props || {};
+  return {
+    type: "TableCellStyle",
+    background,
+    borders,
+    borderColor,
+    padding,
+    verticalAlignment
+  };
+}
+
+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,
+    borders: LayoutFoundation.overrideWith(a.borders, b.borders),
+    borderColor: a.borderColor || b.borderColor,
+    padding: LayoutFoundation.overrideWith(a.padding, b.padding),
+    verticalAlignment: a.verticalAlignment || b.verticalAlignment
+  });
+}

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

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

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

@@ -1,73 +1,73 @@
-export type TextAlignment = "left" | "center" | "right" | "justify";
-
-export interface TextStyle {
-  readonly type: "TextStyle";
-  readonly fontFamily?: string;
-  readonly bold?: boolean;
-  readonly mediumBold?: boolean;
-  readonly color?: string;
-  readonly fontSize?: number;
-  readonly fontScale?: number;
-  readonly italic?: boolean;
-  readonly subScript?: boolean;
-  readonly superScript?: boolean;
-  readonly underline?: boolean;
-  readonly verticalPosition?: number;
-  readonly indent?: number;
-  readonly lineGap?: number;
-  readonly lineBreak?: boolean;
-  readonly alignment?: TextAlignment;
-}
-
-export interface TextStyleProps {
-  readonly fontFamily?: string;
-  readonly bold?: boolean;
-  readonly mediumBold?: boolean;
-  readonly color?: string;
-  readonly fontSize?: number;
-  readonly fontScale?: number;
-  readonly italic?: boolean;
-  readonly subScript?: boolean;
-  readonly superScript?: boolean;
-  readonly underline?: boolean;
-  readonly verticalPosition?: number;
-  readonly indent?: number;
-  readonly lineGap?: number;
-  readonly lineBreak?: boolean;
-  readonly alignment?: TextAlignment;
-}
-
-export function create(props?: TextStyleProps): TextStyle {
-  return {
-    type: "TextStyle",
-    ...(props || {}),
-  };
-}
-
-export function overrideWith(overrider: TextStyle | undefined, toOverride: TextStyle | undefined): TextStyle {
-  const a: TextStyleProps = overrider || {};
-  const b: TextStyleProps = toOverride || {};
-  return create({
-    fontFamily: a.fontFamily || b.fontFamily,
-    bold: a.bold || b.bold,
-    mediumBold: a.mediumBold || b.mediumBold,
-    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,
-    alignment: a.alignment ?? b.alignment,
-  });
-}
-
-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;
-  return fontSize * fontScale;
-}
+export type TextAlignment = "left" | "center" | "right" | "justify";
+
+export interface TextStyle {
+  readonly type: "TextStyle";
+  readonly fontFamily?: string;
+  readonly bold?: boolean;
+  readonly mediumBold?: boolean;
+  readonly color?: string;
+  readonly fontSize?: number;
+  readonly fontScale?: number;
+  readonly italic?: boolean;
+  readonly subScript?: boolean;
+  readonly superScript?: boolean;
+  readonly underline?: boolean;
+  readonly verticalPosition?: number;
+  readonly indent?: number;
+  readonly lineGap?: number;
+  readonly lineBreak?: boolean;
+  readonly alignment?: TextAlignment;
+}
+
+export interface TextStyleProps {
+  readonly fontFamily?: string;
+  readonly bold?: boolean;
+  readonly mediumBold?: boolean;
+  readonly color?: string;
+  readonly fontSize?: number;
+  readonly fontScale?: number;
+  readonly italic?: boolean;
+  readonly subScript?: boolean;
+  readonly superScript?: boolean;
+  readonly underline?: boolean;
+  readonly verticalPosition?: number;
+  readonly indent?: number;
+  readonly lineGap?: number;
+  readonly lineBreak?: boolean;
+  readonly alignment?: TextAlignment;
+}
+
+export function create(props?: TextStyleProps): TextStyle {
+  return {
+    type: "TextStyle",
+    ...(props || {}),
+  };
+}
+
+export function overrideWith(overrider: TextStyle | undefined, toOverride: TextStyle | undefined): TextStyle {
+  const a: TextStyleProps = overrider || {};
+  const b: TextStyleProps = toOverride || {};
+  return create({
+    fontFamily: a.fontFamily || b.fontFamily,
+    bold: a.bold || b.bold,
+    mediumBold: a.mediumBold || b.mediumBold,
+    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,
+    alignment: a.alignment ?? b.alignment,
+  });
+}
+
+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;
+  return fontSize * fontScale;
+}

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

@@ -1,29 +1,29 @@
-import * as SectionElement from "../section-elements/section-element";
-import * as TableCellStyle from "../styles/table-cell-style";
-
-export interface TableCell {
-  readonly styleName: string;
-  readonly columnSpan: number;
-  readonly style?: TableCellStyle.TableCellStyle;
-  readonly children: ReadonlyArray<SectionElement.SectionElement>;
-}
-
-export interface TableCellProps {
-  readonly styleName?: string;
-  readonly columnSpan?: number;
-  readonly style?: TableCellStyle.TableCellStyle;
-}
-
-export function create(
-  props?: TableCellProps,
-  children?: ReadonlyArray<SectionElement.SectionElement>
-): TableCell {
-  const { styleName = "", columnSpan = 1, style = TableCellStyle.create() } =
-    props || {};
-  return {
-    styleName,
-    columnSpan,
-    style,
-    children: children || []
-  };
-}
+import * as SectionElement from "../section-elements/section-element";
+import * as TableCellStyle from "../styles/table-cell-style";
+
+export interface TableCell {
+  readonly styleName: string;
+  readonly columnSpan: number;
+  readonly style?: TableCellStyle.TableCellStyle;
+  readonly children: ReadonlyArray<SectionElement.SectionElement>;
+}
+
+export interface TableCellProps {
+  readonly styleName?: string;
+  readonly columnSpan?: number;
+  readonly style?: TableCellStyle.TableCellStyle;
+}
+
+export function create(
+  props?: TableCellProps,
+  children?: ReadonlyArray<SectionElement.SectionElement>
+): TableCell {
+  const { styleName = "", columnSpan = 1, style = TableCellStyle.create() } =
+    props || {};
+  return {
+    styleName,
+    columnSpan,
+    style,
+    children: children || []
+  };
+}

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

@@ -1,17 +1,17 @@
-import { TableCell } from "./table-cell";
-
-export interface TableRow {
-  readonly children: ReadonlyArray<TableCell>;
-}
-
-export interface TableRowProps {}
-
-export function create(
-  props?: TableRowProps,
-  children?: ReadonlyArray<TableCell>
-): TableRow {
-  const {} = props || {};
-  return {
-    children: children || []
-  };
-}
+import { TableCell } from "./table-cell";
+
+export interface TableRow {
+  readonly children: ReadonlyArray<TableCell>;
+}
+
+export interface TableRowProps {}
+
+export function create(
+  props?: TableRowProps,
+  children?: ReadonlyArray<TableCell>
+): TableRow {
+  const {} = props || {};
+  return {
+    children: children || []
+  };
+}

package/src/abstract-document/types.ts

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

package/src/abstract-document-exporters/__tests__/docx2/export-test-def.ts

@@ -1,10 +1,10 @@
-/**
- * Defines a data-type that represents a single test for the Docx render function
- */
-export type ExportTestDef = {
-  readonly name: string;
-  readonly only?: boolean;
-  readonly skip?: boolean;
-  readonly abstractDocJsx: JSX.Element;
-  readonly expectedDocxZipContexts: { readonly [filename: string]: string };
-};
+/**
+ * Defines a data-type that represents a single test for the Docx render function
+ */
+export type ExportTestDef = {
+  readonly name: string;
+  readonly only?: boolean;
+  readonly skip?: boolean;
+  readonly abstractDocJsx: JSX.Element;
+  readonly expectedDocxZipContexts: { readonly [filename: string]: string };
+};