Version bump

https://github.com/dolanmiu/docx/wiki/Contributing-Guidelines

README.md

@@ -66,6 +66,10 @@ exporter.pack('My First Document');
 ## Examples
 Check [the Wiki](https://github.com/dolanmiu/docx/wiki/Examples) for examples.
 
+# Contributing
+
+Read the contribution guidelines [here](https://github.com/dolanmiu/docx/wiki/Contributing-Guidelines).
+
 -----
 
 Made with 💖

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docx",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Generate .docx documents with JavaScript (formerly Office-Clippy)",
   "main": "build/index.js",
   "scripts": {
@@ -22,6 +22,7 @@
     "url": "git+https://github.com/dolanmiu/docx.git"
   },
   "keywords": [
+    "docx",
     "office",
     "word",
     "generate",

ts/docx/document/body/body.ts

@@ -0,0 +1,12 @@
+import { XmlComponent } from "../../xml-components";
+
+export class Body extends XmlComponent {
+
+    constructor() {
+        super("w:body");
+    }
+
+    public push(component: XmlComponent): void {
+        this.root.push(component);
+    }
+}

ts/docx/document/body/index.ts

@@ -1,12 +1 @@
-import { XmlComponent } from "../../xml-components";
+export * from "./body";
-
-export class Body extends XmlComponent {
-
-    constructor() {
-        super("w:body");
-    }
-
-    public push(component: XmlComponent): void {
-        this.root.push(component);
-    }
-}

ts/docx/document/document.ts

@@ -0,0 +1,56 @@
+// http://officeopenxml.com/WPdocument.php
+import { Paragraph } from "../paragraph";
+import { Table } from "../table";
+import { XmlComponent } from "../xml-components";
+import { Body } from "./body";
+import { DocumentAttributes } from "./document-attributes";
+
+export class Document extends XmlComponent {
+    private body: Body;
+
+    constructor() {
+        super("w:document");
+        this.root.push(new DocumentAttributes({
+            wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
+            mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
+            o: "urn:schemas-microsoft-com:office:office",
+            r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+            m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
+            v: "urn:schemas-microsoft-com:vml",
+            wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing",
+            wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
+            w10: "urn:schemas-microsoft-com:office:word",
+            w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
+            w14: "http://schemas.microsoft.com/office/word/2010/wordml",
+            w15: "http://schemas.microsoft.com/office/word/2012/wordml",
+            wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
+            wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk",
+            wne: "http://schemas.microsoft.com/office/word/2006/wordml",
+            wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape",
+            Ignorable: "w14 w15 wp14",
+        }));
+        this.body = new Body();
+        this.root.push(this.body);
+    }
+
+    public addParagraph(paragraph: Paragraph): void {
+        this.body.push(paragraph);
+    }
+
+    public createParagraph(text?: string): Paragraph {
+        const para = new Paragraph(text);
+        this.addParagraph(para);
+        return para;
+    }
+
+    public addTable(table: Table): void {
+        this.body.push(table);
+    }
+
+    public createTable(rows: number, cols: number): Table {
+        const table = new Table(rows, cols);
+        this.addTable(table);
+        return table;
+    }
+
+}

ts/docx/document/index.ts

@@ -1,55 +1 @@
-import { Paragraph } from "../paragraph";
+export * from "./document";
-import { Table } from "../table";
-import { XmlComponent } from "../xml-components";
-import { Body } from "./body";
-import { DocumentAttributes } from "./document-attributes";
-
-export class Document extends XmlComponent {
-    private body: Body;
-
-    constructor() {
-        super("w:document");
-        this.root.push(new DocumentAttributes({
-            wpc: "http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas",
-            mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
-            o: "urn:schemas-microsoft-com:office:office",
-            r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-            m: "http://schemas.openxmlformats.org/officeDocument/2006/math",
-            v: "urn:schemas-microsoft-com:vml",
-            wp14: "http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing",
-            wp: "http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing",
-            w10: "urn:schemas-microsoft-com:office:word",
-            w: "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
-            w14: "http://schemas.microsoft.com/office/word/2010/wordml",
-            w15: "http://schemas.microsoft.com/office/word/2012/wordml",
-            wpg: "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
-            wpi: "http://schemas.microsoft.com/office/word/2010/wordprocessingInk",
-            wne: "http://schemas.microsoft.com/office/word/2006/wordml",
-            wps: "http://schemas.microsoft.com/office/word/2010/wordprocessingShape",
-            Ignorable: "w14 w15 wp14",
-        }));
-        this.body = new Body();
-        this.root.push(this.body);
-    }
-
-    public addParagraph(paragraph: Paragraph): void {
-        this.body.push(paragraph);
-    }
-
-    public createParagraph(text?: string): Paragraph {
-        const para = new Paragraph(text);
-        this.addParagraph(para);
-        return para;
-    }
-
-    public addTable(table: Table): void {
-        this.body.push(table);
-    }
-
-    public createTable(rows: number, cols: number): Table {
-        const table = new Table(rows, cols);
-        this.addTable(table);
-        return table;
-    }
-
-}

ts/docx/index.ts

@@ -1,7 +1,4 @@
-export { Document } from "./document";
+export * from "./document";
 export * from "./paragraph";
-export { Run } from "./run";
+export * from "./run";
-export { TextRun } from "./run/text-run";
-export { PictureRun } from "./run/picture-run";
 export { Table } from "./table";
-// Perhaps all run related stuff can be exported from run, instead of exporting Run, TextRun, PictureRun seperately.

ts/docx/paragraph/index.ts

@@ -1,156 +1,2 @@
-import { IData } from "../../media/data";
-import { Num } from "../../numbering/num";
-import { Run } from "../run";
-import { PictureRun } from "../run/picture-run";
-import { TextRun } from "../run/text-run";
-import { XmlComponent } from "../xml-components";
-
-import { Alignment } from "./alignment";
-import { ThematicBreak } from "./border";
-import { Indent } from "./indent";
-import { KeepLines, KeepNext } from "./keep";
-import { PageBreak } from "./page-break";
-import { ParagraphProperties } from "./properties";
-import { ISpacingProperties, Spacing } from "./spacing";
-import { Style } from "./style";
-import { LeftTabStop, MaxRightTabStop } from "./tab-stop";
-import { NumberProperties } from "./unordered-list";
-
 export * from "./formatting";
-
+export * from "./paragraph";
-export class Paragraph extends XmlComponent {
-    private properties: ParagraphProperties;
-
-    constructor(text?: string) {
-        super("w:p");
-        this.properties = new ParagraphProperties();
-        this.root.push(this.properties);
-        if (text !== undefined) {
-            this.root.push(new TextRun(text));
-        }
-    }
-
-    public addRun(run: Run): Paragraph {
-        this.root.push(run);
-        return this;
-    }
-
-    public createTextRun(text: string): TextRun {
-        const run = new TextRun(text);
-        this.addRun(run);
-        return run;
-    }
-
-    public createPictureRun(imageData: IData): PictureRun {
-        const run = new PictureRun(imageData);
-        this.addRun(run);
-        return run;
-    }
-
-    public heading1(): Paragraph {
-        this.properties.push(new Style("Heading1"));
-        return this;
-    }
-
-    public heading2(): Paragraph {
-        this.properties.push(new Style("Heading2"));
-        return this;
-    }
-
-    public heading3(): Paragraph {
-        this.properties.push(new Style("Heading3"));
-        return this;
-    }
-
-    public heading4(): Paragraph {
-        this.properties.push(new Style("Heading4"));
-        return this;
-    }
-
-    public heading5(): Paragraph {
-        this.properties.push(new Style("Heading5"));
-        return this;
-    }
-
-    public title(): Paragraph {
-        this.properties.push(new Style("Title"));
-        return this;
-    }
-
-    public center(): Paragraph {
-        this.properties.push(new Alignment("center"));
-        return this;
-    }
-
-    public left(): Paragraph {
-        this.properties.push(new Alignment("left"));
-        return this;
-    }
-
-    public right(): Paragraph {
-        this.properties.push(new Alignment("right"));
-        return this;
-    }
-
-    public justified(): Paragraph {
-        this.properties.push(new Alignment("both"));
-        return this;
-    }
-
-    public thematicBreak(): Paragraph {
-        this.properties.push(new ThematicBreak());
-        return this;
-    }
-
-    public pageBreak(): Paragraph {
-        this.root.push(new PageBreak());
-        return this;
-    }
-
-    public maxRightTabStop(): Paragraph {
-        this.properties.push(new MaxRightTabStop());
-        return this;
-    }
-
-    public leftTabStop(position: number): Paragraph {
-        this.properties.push(new LeftTabStop(position));
-        return this;
-    }
-
-    public bullet(): Paragraph {
-        this.properties.push(new Style("ListParagraph"));
-        this.properties.push(new NumberProperties(1, 0));
-        return this;
-    }
-
-    public setNumbering(numbering: Num, indentLevel: number): Paragraph {
-        this.properties.push(new Style("ListParagraph"));
-        this.properties.push(new NumberProperties(numbering.id, indentLevel));
-        return this;
-    }
-
-    public style(styleId: string): Paragraph {
-        this.properties.push(new Style(styleId));
-        return this;
-    }
-
-    public indent(attrs: object): Paragraph {
-        this.properties.push(new Indent(attrs));
-        return this;
-    }
-
-    public spacing(params: ISpacingProperties): Paragraph {
-        this.properties.push(new Spacing(params));
-        return this;
-    }
-
-    public keepNext(): Paragraph {
-        this.properties.push(new KeepNext());
-        return this;
-    }
-
-    public keepLines(): Paragraph {
-        this.properties.push(new KeepLines());
-        return this;
-    }
-}

ts/docx/paragraph/paragraph.ts

@@ -0,0 +1,165 @@
+// http://officeopenxml.com/WPparagraph.php
+import { IData } from "../../media/data";
+import { Num } from "../../numbering/num";
+import { Run } from "../run";
+import { PictureRun } from "../run/picture-run";
+import { TextRun } from "../run/text-run";
+import { XmlComponent } from "../xml-components";
+
+import { Alignment } from "./alignment";
+import { ThematicBreak } from "./border";
+import { Indent } from "./indent";
+import { KeepLines, KeepNext } from "./keep";
+import { PageBreak } from "./page-break";
+import { ParagraphProperties } from "./properties";
+import { ISpacingProperties, Spacing } from "./spacing";
+import { Style } from "./style";
+import { CenterTabStop, LeftTabStop, MaxRightTabStop, RightTabStop } from "./tab-stop";
+import { NumberProperties } from "./unordered-list";
+
+export class Paragraph extends XmlComponent {
+    private properties: ParagraphProperties;
+
+    constructor(text?: string) {
+        super("w:p");
+        this.properties = new ParagraphProperties();
+        this.root.push(this.properties);
+        if (text !== undefined) {
+            this.root.push(new TextRun(text));
+        }
+    }
+
+    public addRun(run: Run): Paragraph {
+        this.root.push(run);
+        return this;
+    }
+
+    public createTextRun(text: string): TextRun {
+        const run = new TextRun(text);
+        this.addRun(run);
+        return run;
+    }
+
+    public createPictureRun(imageData: IData): PictureRun {
+        const run = new PictureRun(imageData);
+        this.addRun(run);
+        return run;
+    }
+
+    public heading1(): Paragraph {
+        this.properties.push(new Style("Heading1"));
+        return this;
+    }
+
+    public heading2(): Paragraph {
+        this.properties.push(new Style("Heading2"));
+        return this;
+    }
+
+    public heading3(): Paragraph {
+        this.properties.push(new Style("Heading3"));
+        return this;
+    }
+
+    public heading4(): Paragraph {
+        this.properties.push(new Style("Heading4"));
+        return this;
+    }
+
+    public heading5(): Paragraph {
+        this.properties.push(new Style("Heading5"));
+        return this;
+    }
+
+    public title(): Paragraph {
+        this.properties.push(new Style("Title"));
+        return this;
+    }
+
+    public center(): Paragraph {
+        this.properties.push(new Alignment("center"));
+        return this;
+    }
+
+    public left(): Paragraph {
+        this.properties.push(new Alignment("left"));
+        return this;
+    }
+
+    public right(): Paragraph {
+        this.properties.push(new Alignment("right"));
+        return this;
+    }
+
+    public justified(): Paragraph {
+        this.properties.push(new Alignment("both"));
+        return this;
+    }
+
+    public thematicBreak(): Paragraph {
+        this.properties.push(new ThematicBreak());
+        return this;
+    }
+
+    public pageBreak(): Paragraph {
+        this.root.push(new PageBreak());
+        return this;
+    }
+
+    public maxRightTabStop(): Paragraph {
+        this.properties.push(new MaxRightTabStop());
+        return this;
+    }
+
+    public leftTabStop(position: number): Paragraph {
+        this.properties.push(new LeftTabStop(position));
+        return this;
+    }
+
+    public rightTabStop(position: number): Paragraph {
+        this.properties.push(new RightTabStop(position));
+        return this;
+    }
+
+    public centerTabStop(position: number): Paragraph {
+        this.properties.push(new CenterTabStop(position));
+        return this;
+    }
+
+    public bullet(): Paragraph {
+        this.properties.push(new Style("ListParagraph"));
+        this.properties.push(new NumberProperties(1, 0));
+        return this;
+    }
+
+    public setNumbering(numbering: Num, indentLevel: number): Paragraph {
+        this.properties.push(new Style("ListParagraph"));
+        this.properties.push(new NumberProperties(numbering.id, indentLevel));
+        return this;
+    }
+
+    public style(styleId: string): Paragraph {
+        this.properties.push(new Style(styleId));
+        return this;
+    }
+
+    public indent(attrs: object): Paragraph {
+        this.properties.push(new Indent(attrs));
+        return this;
+    }
+
+    public spacing(params: ISpacingProperties): Paragraph {
+        this.properties.push(new Spacing(params));
+        return this;
+    }
+
+    public keepNext(): Paragraph {
+        this.properties.push(new KeepNext());
+        return this;
+    }
+
+    public keepLines(): Paragraph {
+        this.properties.push(new KeepLines());
+        return this;
+    }
+}

ts/docx/paragraph/tab-stop.ts

@@ -1,3 +1,4 @@
+// http://officeopenxml.com/WPtab.php
 import { XmlAttributeComponent, XmlComponent } from "../xml-components";
 
 export class TabStop extends XmlComponent {
@@ -8,15 +9,15 @@ export class TabStop extends XmlComponent {
     }
 }
 
-export type TabOptions = "left" | "right";
+export type TabValue = "left" | "right" | "center" | "bar" | "clear" | "decimal" | "end" | "num" | "start";
 
-export class TabAttributes extends XmlAttributeComponent<{val: TabOptions, pos: string | number}> {
+export class TabAttributes extends XmlAttributeComponent<{val: TabValue, pos: string | number}> {
     protected xmlKeys = {val: "w:val", pos: "w:pos"};
 }
 
 export class Tab extends XmlComponent {
 
-    constructor(value: TabOptions, position: string | number) {
+    constructor(value: TabValue, position: string | number) {
         super("w:tab");
         this.root.push(new TabAttributes({
             val: value,
@@ -36,3 +37,15 @@ export class LeftTabStop extends TabStop {
         super(new Tab("left", position));
     }
 }
+
+export class RightTabStop extends TabStop {
+    constructor(position: number) {
+        super(new Tab("right", position));
+    }
+}
+
+export class CenterTabStop extends TabStop {
+    constructor(position: number) {
+        super(new Tab("center", position));
+    }
+}

ts/docx/row.ts

@@ -1,3 +0,0 @@
-export class Row {
-
-}

ts/docx/run/index.ts

@@ -1,96 +1,3 @@
-import { Break } from "./break";
+export * from "./run";
-import { Caps, SmallCaps } from "./caps";
+export * from "./text-run";
-import { Bold, Color, DoubleStrike, Italics, Size, Strike } from "./formatting";
+export * from "./picture-run";
-import { RunProperties } from "./properties";
-import { RunFonts } from "./run-fonts";
-import { SubScript, SuperScript } from "./script";
-import { Style } from "./style";
-import { Tab } from "./tab";
-import { Underline } from "./underline";
-
-import { XmlComponent } from "../xml-components";
-
-export class Run extends XmlComponent {
-    private properties: RunProperties;
-
-    constructor() {
-        super("w:r");
-        this.properties = new RunProperties();
-        this.root.push(this.properties);
-    }
-
-    public bold(): Run {
-        this.properties.push(new Bold());
-        return this;
-    }
-
-    public italic(): Run {
-        this.properties.push(new Italics());
-        return this;
-    }
-
-    public underline(underlineType?: string, color?: string): Run {
-        this.properties.push(new Underline(underlineType, color));
-        return this;
-    }
-
-    public color(color: string): Run {
-        this.properties.push(new Color(color));
-        return this;
-    }
-
-    public size(size: number): Run {
-        this.properties.push(new Size(size));
-        return this;
-    }
-
-    public break(): Run {
-        this.root.splice(1, 0, new Break());
-        return this;
-    }
-
-    public tab(): Run {
-        this.root.splice(1, 0, new Tab());
-        return this;
-    }
-
-    public smallCaps(): Run {
-        this.properties.push(new SmallCaps());
-        return this;
-    }
-
-    public allCaps(): Run {
-        this.properties.push(new Caps());
-        return this;
-    }
-
-    public strike(): Run {
-        this.properties.push(new Strike());
-        return this;
-    }
-
-    public doubleStrike(): Run {
-        this.properties.push(new DoubleStrike());
-        return this;
-    }
-
-    public subScript(): Run {
-        this.properties.push(new SubScript());
-        return this;
-    }
-
-    public superScript(): Run {
-        this.properties.push(new SuperScript());
-        return this;
-    }
-
-    public font(fontName: string): Run {
-        this.properties.push(new RunFonts(fontName));
-        return this;
-    }
-
-    public style(styleId: string): Run {
-        this.properties.push(new Style(styleId));
-        return this;
-    }
-}

ts/docx/run/run.ts

@@ -0,0 +1,97 @@
+// http://officeopenxml.com/WPtext.php
+import { Break } from "./break";
+import { Caps, SmallCaps } from "./caps";
+import { Bold, Color, DoubleStrike, Italics, Size, Strike } from "./formatting";
+import { RunProperties } from "./properties";
+import { RunFonts } from "./run-fonts";
+import { SubScript, SuperScript } from "./script";
+import { Style } from "./style";
+import { Tab } from "./tab";
+import { Underline } from "./underline";
+
+import { XmlComponent } from "../xml-components";
+
+export class Run extends XmlComponent {
+    private properties: RunProperties;
+
+    constructor() {
+        super("w:r");
+        this.properties = new RunProperties();
+        this.root.push(this.properties);
+    }
+
+    public bold(): Run {
+        this.properties.push(new Bold());
+        return this;
+    }
+
+    public italic(): Run {
+        this.properties.push(new Italics());
+        return this;
+    }
+
+    public underline(underlineType?: string, color?: string): Run {
+        this.properties.push(new Underline(underlineType, color));
+        return this;
+    }
+
+    public color(color: string): Run {
+        this.properties.push(new Color(color));
+        return this;
+    }
+
+    public size(size: number): Run {
+        this.properties.push(new Size(size));
+        return this;
+    }
+
+    public break(): Run {
+        this.root.splice(1, 0, new Break());
+        return this;
+    }
+
+    public tab(): Run {
+        this.root.splice(1, 0, new Tab());
+        return this;
+    }
+
+    public smallCaps(): Run {
+        this.properties.push(new SmallCaps());
+        return this;
+    }
+
+    public allCaps(): Run {
+        this.properties.push(new Caps());
+        return this;
+    }
+
+    public strike(): Run {
+        this.properties.push(new Strike());
+        return this;
+    }
+
+    public doubleStrike(): Run {
+        this.properties.push(new DoubleStrike());
+        return this;
+    }
+
+    public subScript(): Run {
+        this.properties.push(new SubScript());
+        return this;
+    }
+
+    public superScript(): Run {
+        this.properties.push(new SuperScript());
+        return this;
+    }
+
+    public font(fontName: string): Run {
+        this.properties.push(new RunFonts(fontName));
+        return this;
+    }
+
+    public style(styleId: string): Run {
+        this.properties.push(new Style(styleId));
+        return this;
+    }
+}

ts/docx/table/index.ts

@@ -1,123 +1 @@
-import { Paragraph } from "../paragraph";
+export * from "./table";
-import { XmlComponent } from "../xml-components";
-import { IXmlableObject } from "../xml-components/xmlable-object";
-import { TableGrid } from "./grid";
-import { TableProperties, WidthTypes } from "./properties";
-
-export class Table extends XmlComponent {
-    private properties: TableProperties;
-    private rows: TableRow[];
-    private grid: TableGrid;
-
-    constructor(rows: number, cols: number) {
-        super("w:tbl");
-        this.properties = new TableProperties();
-        this.root.push(this.properties);
-
-        const gridCols: number[] = [];
-        for (let i = 0; i < cols; i++) {
-            /*
-              0-width columns don't get rendered correctly, so we need
-              to give them some value. A reasonable default would be
-              ~6in / numCols, but if we do that it becomes very hard
-              to resize the table using setWidth, unless the layout
-              algorithm is set to 'fixed'. Instead, the approach here
-              means even in 'auto' layout, setting a width on the
-              table will make it look reasonable, as the layout
-              algorithm will expand columns to fit its content
-             */
-            gridCols.push(1);
-        }
-        this.grid = new TableGrid(gridCols);
-        this.root.push(this.grid);
-
-        this.rows = [];
-        for (let i = 0; i < rows; i++) {
-            const cells: TableCell[] = [];
-            for (let j = 0; j < cols; j++) {
-                cells.push(new TableCell());
-            }
-            const row = new TableRow(cells);
-            this.rows.push(row);
-            this.root.push(row);
-        }
-    }
-
-    public getRow(ix: number): TableRow {
-        return this.rows[ix];
-    }
-
-    public getCell(row: number, col: number): TableCell {
-        return this.getRow(row).getCell(col);
-    }
-
-    public setWidth(type: WidthTypes, width: number | string): Table {
-        this.properties.setWidth(type, width);
-        return this;
-    }
-
-    public fixedWidthLayout(): Table {
-        this.properties.fixedWidthLayout();
-        return this;
-    }
-}
-
-export class TableRow extends XmlComponent {
-    private properties: TableRowProperties;
-    private cells: TableCell[];
-
-    constructor(cells: TableCell[]) {
-        super("w:tr");
-        this.properties = new TableRowProperties();
-        this.root.push(this.properties);
-        this.cells = cells;
-        cells.forEach((c) => this.root.push(c));
-    }
-
-    public getCell(ix: number): TableCell {
-        return this.cells[ix];
-    }
-}
-
-export class TableRowProperties extends XmlComponent {
-    constructor() {
-        super("w:trPr");
-    }
-}
-
-export class TableCell extends XmlComponent {
-    private 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 {
-        // Cells must end with a paragraph
-        const retval = super.prepForXml();
-        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;
-    }
-}
-
-export class TableCellProperties extends XmlComponent {
-    constructor() {
-        super("w:tcPr");
-    }
-}

ts/docx/table/table.ts

@@ -0,0 +1,123 @@
+import { Paragraph } from "../paragraph";
+import { XmlComponent } from "../xml-components";
+import { IXmlableObject } from "../xml-components/xmlable-object";
+import { TableGrid } from "./grid";
+import { TableProperties, WidthTypes } from "./properties";
+
+export class Table extends XmlComponent {
+    private properties: TableProperties;
+    private rows: TableRow[];
+    private grid: TableGrid;
+
+    constructor(rows: number, cols: number) {
+        super("w:tbl");
+        this.properties = new TableProperties();
+        this.root.push(this.properties);
+
+        const gridCols: number[] = [];
+        for (let i = 0; i < cols; i++) {
+            /*
+              0-width columns don't get rendered correctly, so we need
+              to give them some value. A reasonable default would be
+              ~6in / numCols, but if we do that it becomes very hard
+              to resize the table using setWidth, unless the layout
+              algorithm is set to 'fixed'. Instead, the approach here
+              means even in 'auto' layout, setting a width on the
+              table will make it look reasonable, as the layout
+              algorithm will expand columns to fit its content
+             */
+            gridCols.push(1);
+        }
+        this.grid = new TableGrid(gridCols);
+        this.root.push(this.grid);
+
+        this.rows = [];
+        for (let i = 0; i < rows; i++) {
+            const cells: TableCell[] = [];
+            for (let j = 0; j < cols; j++) {
+                cells.push(new TableCell());
+            }
+            const row = new TableRow(cells);
+            this.rows.push(row);
+            this.root.push(row);
+        }
+    }
+
+    public getRow(ix: number): TableRow {
+        return this.rows[ix];
+    }
+
+    public getCell(row: number, col: number): TableCell {
+        return this.getRow(row).getCell(col);
+    }
+
+    public setWidth(type: WidthTypes, width: number | string): Table {
+        this.properties.setWidth(type, width);
+        return this;
+    }
+
+    public fixedWidthLayout(): Table {
+        this.properties.fixedWidthLayout();
+        return this;
+    }
+}
+
+export class TableRow extends XmlComponent {
+    private properties: TableRowProperties;
+    private cells: TableCell[];
+
+    constructor(cells: TableCell[]) {
+        super("w:tr");
+        this.properties = new TableRowProperties();
+        this.root.push(this.properties);
+        this.cells = cells;
+        cells.forEach((c) => this.root.push(c));
+    }
+
+    public getCell(ix: number): TableCell {
+        return this.cells[ix];
+    }
+}
+
+export class TableRowProperties extends XmlComponent {
+    constructor() {
+        super("w:trPr");
+    }
+}
+
+export class TableCell extends XmlComponent {
+    private 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 {
+        // Cells must end with a paragraph
+        const retval = super.prepForXml();
+        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;
+    }
+}
+
+export class TableCellProperties extends XmlComponent {
+    constructor() {
+        super("w:tcPr");
+    }
+}

ts/docx/xml-components/index.ts

@@ -1,27 +1,3 @@
-import { BaseXmlComponent } from "./base";
+export * from "./xml-component";
-import { IXmlableObject } from "./xmlable-object";
-export { BaseXmlComponent };
-
-export abstract class XmlComponent extends BaseXmlComponent {
-    protected root: Array<BaseXmlComponent | string>;
-
-    constructor(rootKey: string) {
-        super(rootKey);
-        this.root = new Array<BaseXmlComponent>();
-    }
-
-    public prepForXml(): IXmlableObject {
-        const children = this.root.map((comp) => {
-            if (comp instanceof BaseXmlComponent) {
-                return comp.prepForXml();
-            }
-            return comp;
-        }).filter((comp) => comp); // Exclude null, undefined, and empty strings
-        return {
-            [this.rootKey]: children,
-        };
-    }
-}
-
 export * from "./attributes";
 export * from "./default-attributes";

ts/docx/xml-components/xml-component.ts

@@ -0,0 +1,24 @@
+import { BaseXmlComponent } from "./base";
+import { IXmlableObject } from "./xmlable-object";
+export { BaseXmlComponent };
+
+export abstract class XmlComponent extends BaseXmlComponent {
+    protected root: Array<BaseXmlComponent | string>;
+
+    constructor(rootKey: string) {
+        super(rootKey);
+        this.root = new Array<BaseXmlComponent>();
+    }
+
+    public prepForXml(): IXmlableObject {
+        const children = this.root.map((comp) => {
+            if (comp instanceof BaseXmlComponent) {
+                return comp.prepForXml();
+            }
+            return comp;
+        }).filter((comp) => comp); // Exclude null, undefined, and empty strings
+        return {
+            [this.rootKey]: children,
+        };
+    }
+}

ts/export/index.ts

@@ -1,3 +1,3 @@
-export { LocalPacker } from "./packer/local";
+export * from "./packer/local";
-export { ExpressPacker } from "./packer/express";
+export * from "./packer/express";
-export { Packer } from "./packer/packer";
+export * from "./packer/packer";

ts/tests/_testTemplate.ts

@@ -1,18 +0,0 @@
-/* tslint:disable */
-import { assert } from "chai";
-
-import { Utility } from "./utility";
-/* tslint:enable */
-
-describe("", () => {
-
-    beforeEach(() => {
-        // TODO
-    });
-
-    describe("#methodName()", () => {
-        it("should ", () => {
-            // TODO
-        });
-    });
-});