Tidied up table components

src/file/table/index.ts

@@ -1,3 +1,3 @@
 export * from "./table";
 export * from "./table-cell";
-export * from "./table-float-properties";
+export * from "./table-properties";

src/file/table/properties.ts

@@ -1,103 +0,0 @@
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
-import { WidthType } from "./table-cell";
-import { TableCellMargin } from "./table-cell-margin";
-import { TableFloatProperties } from "./table-float-properties";
-
-export class TableProperties extends XmlComponent {
-    private readonly cellMargin: TableCellMargin;
-
-    constructor() {
-        super("w:tblPr");
-
-        this.cellMargin = new TableCellMargin();
-        this.root.push(this.cellMargin);
-    }
-
-    public setWidth(type: WidthType, w: number | string): TableProperties {
-        this.root.push(new PreferredTableWidth(type, w));
-        return this;
-    }
-
-    public setFixedWidthLayout(): TableProperties {
-        this.root.push(new TableLayout("fixed"));
-        return this;
-    }
-
-    public setBorder(): TableProperties {
-        this.root.push(new TableBorders());
-        return this;
-    }
-
-    public get CellMargin(): TableCellMargin {
-        return this.cellMargin;
-    }
-
-    public setTableFloatProperties(tableFloatProperties: TableFloatProperties): TableProperties {
-        this.root.push(tableFloatProperties);
-        return this;
-    }
-}
-
-interface ITableWidth {
-    type: WidthType;
-    w: number | string;
-}
-
-class TableWidthAttributes extends XmlAttributeComponent<ITableWidth> {
-    protected xmlKeys = { type: "w:type", w: "w:w" };
-}
-
-class PreferredTableWidth extends XmlComponent {
-    constructor(type: WidthType, w: number | string) {
-        super("w:tblW");
-        this.root.push(new TableWidthAttributes({ type, w }));
-    }
-}
-
-type TableLayoutOptions = "autofit" | "fixed";
-
-class TableLayoutAttributes extends XmlAttributeComponent<{ type: TableLayoutOptions }> {
-    protected xmlKeys = { type: "w:type" };
-}
-
-class TableLayout extends XmlComponent {
-    constructor(type: TableLayoutOptions) {
-        super("w:tblLayout");
-        this.root.push(new TableLayoutAttributes({ type }));
-    }
-}
-
-class TableBorders extends XmlComponent {
-    constructor() {
-        super("w:tblBorders");
-        this.root.push(new TableBordersElement("w:top", "single", 4, 0, "auto"));
-        this.root.push(new TableBordersElement("w:left", "single", 4, 0, "auto"));
-        this.root.push(new TableBordersElement("w:bottom", "single", 4, 0, "auto"));
-        this.root.push(new TableBordersElement("w:right", "single", 4, 0, "auto"));
-        this.root.push(new TableBordersElement("w:insideH", "single", 4, 0, "auto"));
-        this.root.push(new TableBordersElement("w:insideV", "single", 4, 0, "auto"));
-    }
-}
-
-class TableBordersElement extends XmlComponent {
-    constructor(elementName: string, value: string, size: number, space: number, color: string) {
-        super(elementName);
-        this.root.push(
-            new TableBordersAttributes({
-                value,
-                size,
-                space,
-                color,
-            }),
-        );
-    }
-}
-
-class TableBordersAttributes extends XmlAttributeComponent<{ value: string; size: number; space: number; color: string }> {
-    protected xmlKeys = {
-        value: "w:val",
-        size: "w:sz",
-        space: "w:space",
-        color: "w:color",
-    };
-}

src/file/table/table-cell/index.ts

@@ -0,0 +1,2 @@
+export * from "./table-cell";
+export * from "./table-cell-components";

src/file/table/table-cell/table-cell-components.ts

@@ -1,5 +1,5 @@
+import { BorderStyle } from "file/styles";
 import { IXmlableObject, XmlAttributeComponent, XmlComponent } from "file/xml-components";
-import { BorderStyle } from "../styles";
 
 interface ICellBorder {
     style: BorderStyle;

src/file/table/table-cell/table-cell-properties.ts

@@ -0,0 +1,57 @@
+import { XmlComponent } from "file/xml-components";
+
+import {
+    GridSpan,
+    TableCellBorders,
+    TableCellShading,
+    TableCellWidth,
+    VAlign,
+    VerticalAlign,
+    VMerge,
+    VMergeType,
+    WidthType,
+} from "./table-cell-components";
+
+export class TableCellProperties extends XmlComponent {
+    private readonly cellBorder: TableCellBorders;
+
+    constructor() {
+        super("w:tcPr");
+        this.cellBorder = new TableCellBorders();
+        this.root.push(this.cellBorder);
+    }
+
+    public get Borders(): TableCellBorders {
+        return this.cellBorder;
+    }
+
+    public addGridSpan(cellSpan: number): TableCellProperties {
+        this.root.push(new GridSpan(cellSpan));
+
+        return this;
+    }
+
+    public addVerticalMerge(type: VMergeType): TableCellProperties {
+        this.root.push(new VMerge(type));
+
+        return this;
+    }
+
+    public setVerticalAlign(type: VerticalAlign): TableCellProperties {
+        this.root.push(new VAlign(type));
+
+        return this;
+    }
+
+    public setWidth(width: string | number, type: WidthType): TableCellProperties {
+        this.root.push(new TableCellWidth(width, type));
+
+        return this;
+    }
+
+    public setShading(attrs: object): TableCellProperties {
+        this.root.push(new TableCellShading(attrs));
+
+        return this;
+    }
+}

src/file/table/table-cell/table-cell.spec.ts

@@ -1,8 +1,8 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
-import { BorderStyle } from "../styles";
-import { TableCellBorders, TableCellWidth, WidthType } from "./table-cell";
+import { Formatter } from "../../../export/formatter";
+import { BorderStyle } from "../../styles";
+import { TableCellBorders, TableCellWidth, WidthType } from "./table-cell-components";
 
 describe("TableCellBorders", () => {
     describe("#prepForXml", () => {

src/file/table/table-cell/table-cell.ts

@@ -0,0 +1,45 @@
+// http://officeopenxml.com/WPtableGrid.php
+import { Paragraph } from "file/paragraph";
+import { IXmlableObject, XmlComponent } from "file/xml-components";
+
+import { Table } from "../table";
+import { TableCellProperties } from "./table-cell-properties";
+
+export class TableCell extends XmlComponent {
+    private readonly properties: TableCellProperties;
+
+    constructor() {
+        super("w:tc");
+        this.properties = new TableCellProperties();
+        this.root.push(this.properties);
+    }
+
+    public addContent(content: Paragraph | Table): TableCell {
+        this.root.push(content);
+        return this;
+    }
+
+    public prepForXml(): IXmlableObject | undefined {
+        // Cells must end with a paragraph
+        const retval = super.prepForXml();
+        if (!retval) {
+            return undefined;
+        }
+
+        const content = retval["w:tc"];
+        if (!content[content.length - 1]["w:p"]) {
+            content.push(new Paragraph().prepForXml());
+        }
+        return retval;
+    }
+
+    public createParagraph(text?: string): Paragraph {
+        const para = new Paragraph(text);
+        this.addContent(para);
+        return para;
+    }
+
+    public get CellProperties(): TableCellProperties {
+        return this.properties;
+    }
+}

src/file/table/table-properties/index.ts

@@ -0,0 +1,2 @@
+export * from "./table-properties";
+export * from "./table-float-properties";

src/file/table/table-properties/table-borders.ts

@@ -0,0 +1,36 @@
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+
+export class TableBorders extends XmlComponent {
+    constructor() {
+        super("w:tblBorders");
+        this.root.push(new TableBordersElement("w:top", "single", 4, 0, "auto"));
+        this.root.push(new TableBordersElement("w:left", "single", 4, 0, "auto"));
+        this.root.push(new TableBordersElement("w:bottom", "single", 4, 0, "auto"));
+        this.root.push(new TableBordersElement("w:right", "single", 4, 0, "auto"));
+        this.root.push(new TableBordersElement("w:insideH", "single", 4, 0, "auto"));
+        this.root.push(new TableBordersElement("w:insideV", "single", 4, 0, "auto"));
+    }
+}
+
+class TableBordersElement extends XmlComponent {
+    constructor(elementName: string, value: string, size: number, space: number, color: string) {
+        super(elementName);
+        this.root.push(
+            new TableBordersAttributes({
+                value,
+                size,
+                space,
+                color,
+            }),
+        );
+    }
+}
+
+class TableBordersAttributes extends XmlAttributeComponent<{ value: string; size: number; space: number; color: string }> {
+    protected xmlKeys = {
+        value: "w:val",
+        size: "w:sz",
+        space: "w:space",
+        color: "w:color",
+    };
+}

src/file/table/table-properties/table-cell-margin.ts

@@ -1,5 +1,6 @@
 import { IXmlableObject, XmlAttributeComponent, XmlComponent } from "file/xml-components";
-import { WidthType } from "./table-cell";
+
+import { WidthType } from "../table-cell";
 
 class TableCellMarginAttributes extends XmlAttributeComponent<{ type: WidthType; value: number }> {
     protected xmlKeys = { value: "w:w", type: "w:sz" };

src/file/table/table-properties/table-float-properties.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
+import { Formatter } from "../../../export/formatter";
 import { RelativeHorizontalPosition, RelativeVerticalPosition, TableAnchorType, TableFloatProperties } from "./table-float-properties";
 
 describe("Table Float Properties", () => {

src/file/table/table-properties/table-layout.ts

@@ -0,0 +1,17 @@
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+
+export enum TableLayoutType {
+    AUTOFIT = "autofit",
+    FIXED = "fixed",
+}
+
+class TableLayoutAttributes extends XmlAttributeComponent<{ type: TableLayoutType }> {
+    protected xmlKeys = { type: "w:type" };
+}
+
+export class TableLayout extends XmlComponent {
+    constructor(type: TableLayoutType) {
+        super("w:tblLayout");
+        this.root.push(new TableLayoutAttributes({ type }));
+    }
+}

src/file/table/table-properties/table-properties.spec.ts

@@ -1,8 +1,8 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
-import { TableProperties } from "./properties";
-import { WidthType } from "./table-cell";
+import { Formatter } from "../../../export/formatter";
+import { WidthType } from "../table-cell";
+import { TableProperties } from "./table-properties";
 
 describe("TableProperties", () => {
     describe("#constructor", () => {

src/file/table/table-properties/table-properties.ts

@@ -0,0 +1,43 @@
+import { XmlComponent } from "file/xml-components";
+
+import { WidthType } from "../table-cell";
+import { TableBorders } from "./table-borders";
+import { TableCellMargin } from "./table-cell-margin";
+import { ITableFloatOptions, TableFloatProperties } from "./table-float-properties";
+import { TableLayout, TableLayoutType } from "./table-layout";
+import { PreferredTableWidth } from "./table-width";
+
+export class TableProperties extends XmlComponent {
+    private readonly cellMargin: TableCellMargin;
+
+    constructor() {
+        super("w:tblPr");
+
+        this.cellMargin = new TableCellMargin();
+        this.root.push(this.cellMargin);
+    }
+
+    public setWidth(type: WidthType, w: number | string): TableProperties {
+        this.root.push(new PreferredTableWidth(type, w));
+        return this;
+    }
+
+    public setFixedWidthLayout(): TableProperties {
+        this.root.push(new TableLayout(TableLayoutType.FIXED));
+        return this;
+    }
+
+    public setBorder(): TableProperties {
+        this.root.push(new TableBorders());
+        return this;
+    }
+
+    public get CellMargin(): TableCellMargin {
+        return this.cellMargin;
+    }
+
+    public setTableFloatProperties(tableFloatOptions: ITableFloatOptions): TableProperties {
+        this.root.push(new TableFloatProperties(tableFloatOptions));
+        return this;
+    }
+}

src/file/table/table-properties/table-width.ts

@@ -0,0 +1,19 @@
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+
+import { WidthType } from "../table-cell";
+
+interface ITableWidth {
+    type: WidthType;
+    w: number | string;
+}
+
+class TableWidthAttributes extends XmlAttributeComponent<ITableWidth> {
+    protected xmlKeys = { type: "w:type", w: "w:w" };
+}
+
+export class PreferredTableWidth extends XmlComponent {
+    constructor(type: WidthType, w: number | string) {
+        super("w:tblW");
+        this.root.push(new TableWidthAttributes({ type, w }));
+    }
+}

src/file/table/table-row/index.ts

@@ -0,0 +1,2 @@
+export * from "./table-row";
+export * from "./table-row-properties";

src/file/table/table-row/table-row-properties.ts

@@ -0,0 +1,7 @@
+import { XmlComponent } from "file/xml-components";
+
+export class TableRowProperties extends XmlComponent {
+    constructor() {
+        super("w:trPr");
+    }
+}

src/file/table/table-row/table-row.ts

@@ -0,0 +1,40 @@
+import { XmlComponent } from "file/xml-components";
+
+import { TableCell } from "../table-cell";
+import { TableRowProperties } from "./table-row-properties";
+
+export class TableRow extends XmlComponent {
+    private readonly properties: TableRowProperties;
+
+    constructor(private readonly cells: TableCell[]) {
+        super("w:tr");
+        this.properties = new TableRowProperties();
+        this.root.push(this.properties);
+        cells.forEach((c) => this.root.push(c));
+    }
+
+    public getCell(ix: number): TableCell {
+        const cell = this.cells[ix];
+
+        if (!cell) {
+            throw Error("Index out of bounds when trying to get cell on row");
+        }
+
+        return cell;
+    }
+
+    public addGridSpan(index: number, cellSpan: number): TableCell {
+        const remainCell = this.cells[index];
+        remainCell.CellProperties.addGridSpan(cellSpan);
+        this.cells.splice(index + 1, cellSpan - 1);
+        this.root.splice(index + 2, cellSpan - 1);
+
+        return remainCell;
+    }
+
+    public mergeCells(startIndex: number, endIndex: number): TableCell {
+        const cellSpan = endIndex - startIndex + 1;
+
+        return this.addGridSpan(startIndex, cellSpan);
+    }
+}

src/file/table/table.spec.ts

@@ -5,7 +5,7 @@ import { Formatter } from "../../export/formatter";
 import { Paragraph } from "../paragraph";
 import { Table } from "./";
 import { WidthType } from "./table-cell";
-import { RelativeHorizontalPosition, RelativeVerticalPosition, TableAnchorType } from "./table-float-properties";
+import { RelativeHorizontalPosition, RelativeVerticalPosition, TableAnchorType } from "./table-properties";
 
 const DEFAULT_TABLE_PROPERTIES = {
     "w:tblBorders": [

src/file/table/table.ts

@@ -1,20 +1,10 @@
 // http://officeopenxml.com/WPtableGrid.php
-import {
-    GridSpan,
-    TableCellBorders,
-    TableCellShading,
-    TableCellWidth,
-    VAlign,
-    VerticalAlign,
-    VMerge,
-    VMergeType,
-    WidthType,
-} from "file/table/table-cell";
-import { IXmlableObject, XmlComponent } from "file/xml-components";
-import { Paragraph } from "../paragraph";
+import { XmlComponent } from "file/xml-components";
+
 import { TableGrid } from "./grid";
-import { TableProperties } from "./properties";
-import { ITableFloatOptions, TableFloatProperties } from "./table-float-properties";
+import { TableCell, WidthType } from "./table-cell";
+import { ITableFloatOptions, TableProperties } from "./table-properties";
+import { TableRow } from "./table-row";
 
 export class Table extends XmlComponent {
     private readonly properties: TableProperties;
@@ -85,8 +75,8 @@ export class Table extends XmlComponent {
         return this;
     }
 
-    public float(tableFloatProperties: ITableFloatOptions): Table {
-        this.properties.setTableFloatProperties(new TableFloatProperties(tableFloatProperties));
+    public float(tableFloatOptions: ITableFloatOptions): Table {
+        this.properties.setTableFloatProperties(tableFloatOptions);
         return this;
     }
 
@@ -94,128 +84,3 @@ export class Table extends XmlComponent {
         return this.properties;
     }
 }
-
-export class TableRow extends XmlComponent {
-    private readonly properties: TableRowProperties;
-
-    constructor(private readonly cells: TableCell[]) {
-        super("w:tr");
-        this.properties = new TableRowProperties();
-        this.root.push(this.properties);
-        cells.forEach((c) => this.root.push(c));
-    }
-
-    public getCell(ix: number): TableCell {
-        const cell = this.cells[ix];
-
-        if (!cell) {
-            throw Error("Index out of bounds when trying to get cell on row");
-        }
-
-        return cell;
-    }
-
-    public addGridSpan(index: number, cellSpan: number): TableCell {
-        const remainCell = this.cells[index];
-        remainCell.CellProperties.addGridSpan(cellSpan);
-        this.cells.splice(index + 1, cellSpan - 1);
-        this.root.splice(index + 2, cellSpan - 1);
-
-        return remainCell;
-    }
-
-    public mergeCells(startIndex: number, endIndex: number): TableCell {
-        const cellSpan = endIndex - startIndex + 1;
-
-        return this.addGridSpan(startIndex, cellSpan);
-    }
-}
-
-export class TableRowProperties extends XmlComponent {
-    constructor() {
-        super("w:trPr");
-    }
-}
-
-export class TableCell extends XmlComponent {
-    private readonly properties: TableCellProperties;
-
-    constructor() {
-        super("w:tc");
-        this.properties = new TableCellProperties();
-        this.root.push(this.properties);
-    }
-
-    public addContent(content: Paragraph | Table): TableCell {
-        this.root.push(content);
-        return this;
-    }
-
-    public prepForXml(): IXmlableObject | undefined {
-        // Cells must end with a paragraph
-        const retval = super.prepForXml();
-        if (!retval) {
-            return undefined;
-        }
-
-        const content = retval["w:tc"];
-        if (!content[content.length - 1]["w:p"]) {
-            content.push(new Paragraph().prepForXml());
-        }
-        return retval;
-    }
-
-    public createParagraph(text?: string): Paragraph {
-        const para = new Paragraph(text);
-        this.addContent(para);
-        return para;
-    }
-
-    public get CellProperties(): TableCellProperties {
-        return this.properties;
-    }
-}
-
-export class TableCellProperties extends XmlComponent {
-    private readonly cellBorder: TableCellBorders;
-
-    constructor() {
-        super("w:tcPr");
-        this.cellBorder = new TableCellBorders();
-        this.root.push(this.cellBorder);
-    }
-
-    public get Borders(): TableCellBorders {
-        return this.cellBorder;
-    }
-
-    public addGridSpan(cellSpan: number): TableCellProperties {
-        this.root.push(new GridSpan(cellSpan));
-
-        return this;
-    }
-
-    public addVerticalMerge(type: VMergeType): TableCellProperties {
-        this.root.push(new VMerge(type));
-
-        return this;
-    }
-
-    public setVerticalAlign(type: VerticalAlign): TableCellProperties {
-        this.root.push(new VAlign(type));
-
-        return this;
-    }
-
-    public setWidth(width: string | number, type: WidthType): TableCellProperties {
-        this.root.push(new TableCellWidth(width, type));
-
-        return this;
-    }
-
-    public setShading(attrs: object): TableCellProperties {
-        this.root.push(new TableCellShading(attrs));
-
-        return this;
-    }
-}