Version bump

Removed unnecessary header2 references

README.md

@@ -9,13 +9,13 @@
 ---
 
 [![NPM version][npm-image]][npm-url]
+[![Downloads per month][downloads-image]][downloads-url]
 [![Build Status][travis-image]][travis-url]
-[![Dependency Status][gemnasium-image]][gemnasium-url]
+[![Dependency Status][daviddm-image]][daviddm-url]
 [![Known Vulnerabilities][snky-image]][snky-url]
 [![Chat on Gitter][gitter-image]][gitter-url]
 [![code style: prettier][prettier-image]][prettier-url]
-
-[![NPM](https://nodei.co/npm/docx.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/docx/)
+[![PRs Welcome][pr-image]][pr-url]
 
 # docx
 
@@ -102,6 +102,8 @@ Huge thanks to [@felipeochoa](https://github.com/felipeochoa) for awesome contri
 
 [npm-image]: https://badge.fury.io/js/docx.svg
 [npm-url]: https://npmjs.org/package/docx
+[downloads-image]: https://img.shields.io/npm/dm/docx.svg
+[downloads-url]: https://npmjs.org/package/docx
 [travis-image]: https://travis-ci.org/dolanmiu/docx.svg?branch=master
 [travis-url]: https://travis-ci.org/dolanmiu/docx
 [daviddm-image]: https://david-dm.org/dolanmiu/docx.svg?theme=shields.io
@@ -110,7 +112,7 @@ Huge thanks to [@felipeochoa](https://github.com/felipeochoa) for awesome contri
 [snky-url]: https://snyk.io/test/github/dolanmiu/docx
 [gitter-image]: https://badges.gitter.im/dolanmiu/docx.svg
 [gitter-url]: https://gitter.im/docx-lib/Lobby
-[gemnasium-image]: https://gemnasium.com/badges/github.com/dolanmiu/docx.svg
-[gemnasium-url]: https://gemnasium.com/github.com/dolanmiu/docx
 [prettier-image]: https://img.shields.io/badge/code_style-prettier-ff69b4.svg
 [prettier-url]: https://github.com/prettier/prettier
+[pr-image]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
+[pr-url]: http://makeapullrequest.com

demo/demo13.js

@@ -0,0 +1,26 @@
+// This example shows 3 styles
+const fs = require('fs');
+const docx = require('../build');
+
+const styles = fs.readFileSync('./demo/assets/custom-styles.xml', 'utf-8');
+const doc = new docx.Document({
+  title: 'Title',
+  externalStyles: styles
+});
+
+doc.createParagraph('Cool Heading Text').heading1();
+
+let paragraph = new docx.Paragraph('This is a custom named style from the template "MyFancyStyle"');
+paragraph.style('MyFancyStyle');
+doc.addParagraph(paragraph);
+
+doc.createParagraph('Some normal text')
+
+doc.createParagraph('MyFancyStyle again').style('MyFancyStyle');
+paragraph.style('MyFancyStyle');
+doc.addParagraph(paragraph);
+
+var exporter = new docx.LocalPacker(doc);
+exporter.pack('My Document');
+
+console.log('Document created successfully at project root!');

demo/demo14.js

@@ -0,0 +1,23 @@
+const docx = require('../build');
+
+var doc = new docx.Document(undefined,{differentFirstPageHeader:true});
+
+doc.createParagraph("First Page").pageBreak()
+doc.createParagraph("Second Page");
+
+var pageNumber = new docx.TextRun().pageNumber()
+
+var pageoneheader = new docx.Paragraph("First Page Header ").right();
+
+pageoneheader.addRun(pageNumber);
+doc.firstPageHeader.addParagraph(pageoneheader);
+
+var pagetwoheader = new docx.Paragraph("My Title ").right();
+
+pagetwoheader.addRun(pageNumber)
+doc.Header.addParagraph(pagetwoheader)
+
+var exporter = new docx.LocalPacker(doc);
+exporter.pack('My Document');
+
+console.log('Document created successfully at project root!');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docx",
-  "version": "3.4.0",
+  "version": "3.6.0",
   "description": "Generate .docx documents with JavaScript (formerly Office-Clippy)",
   "main": "build/index.js",
   "scripts": {
@@ -15,6 +15,7 @@
     "demo": "npm run build && node ./demo",
     "typedoc": "typedoc --out docs/ src/ --module commonjs --target ES6 --disableOutputCheck --excludePrivate --externalPattern \"**/*.spec.ts\"",
     "style": "prettier -l \"src/**/*.ts\"",
+    "style.fix": "prettier \"src/**/*.ts\" --write",
     "fix-types": "node types-absolute-fixer.js"
   },
   "files": [
@@ -45,6 +46,7 @@
     "@types/image-size": "0.0.29",
     "@types/request-promise": "^4.1.41",
     "archiver": "^2.1.1",
+    "fast-xml-parser": "^3.3.6",
     "image-size": "^0.6.2",
     "request": "^2.83.0",
     "request-promise": "^4.2.2",
@@ -59,16 +61,18 @@
   "devDependencies": {
     "@types/chai": "^3.4.35",
     "@types/mocha": "^2.2.39",
+    "@types/sinon": "^4.3.1",
     "awesome-typescript-loader": "^3.4.1",
     "chai": "^3.5.0",
     "glob": "^7.1.2",
     "mocha": "^3.2.0",
     "mocha-webpack": "^1.0.1",
-    "prettier": "^1.10.2",
+    "prettier": "^1.12.1",
     "prompt": "^1.0.0",
     "replace-in-file": "^3.1.0",
     "rimraf": "^2.5.2",
     "shelljs": "^0.7.7",
+    "sinon": "^5.0.7",
     "tslint": "^5.1.0",
     "typedoc": "^0.9.0",
     "typescript": "2.6.2",

src/export/packer/compiler.ts

@@ -34,6 +34,7 @@ export class Compiler {
         const xmlRelationships = xml(this.formatter.format(this.file.DocumentRelationships));
         const xmlFileRelationships = xml(this.formatter.format(this.file.FileRelationships));
         const xmlHeader = xml(this.formatter.format(this.file.Header.Header));
+        const xmlHeader2 = xml(this.formatter.format(this.file.firstPageHeader.Header));
         const xmlFooter = xml(this.formatter.format(this.file.Footer.Footer));
         const xmlHeaderRelationships = xml(this.formatter.format(this.file.Header.Relationships));
         const xmlFooterRelationships = xml(this.formatter.format(this.file.Footer.Relationships));
@@ -64,6 +65,10 @@ export class Compiler {
             name: "word/header1.xml",
         });
 
+        this.archive.append(xmlHeader2, {
+            name: "word/header2.xml",
+        });
+
         this.archive.append(xmlFooter, {
             name: "word/footer1.xml",
         });

src/export/packer/express.spec.ts

@@ -0,0 +1,43 @@
+// tslint:disable:typedef space-before-function-paren
+// tslint:disable:no-empty
+// tslint:disable:no-any
+import { assert } from "chai";
+import { stub } from "sinon";
+
+import { ExpressPacker } from "../../export/packer/express";
+import { File, Paragraph } from "../../file";
+
+describe("LocalPacker", () => {
+    let packer: ExpressPacker;
+
+    beforeEach(() => {
+        const file = new File({
+            creator: "Dolan Miu",
+            revision: "1",
+            lastModifiedBy: "Dolan Miu",
+        });
+        const paragraph = new Paragraph("test text");
+        const heading = new Paragraph("Hello world").heading1();
+        file.addParagraph(new Paragraph("title").title());
+        file.addParagraph(heading);
+        file.addParagraph(new Paragraph("heading 2").heading2());
+        file.addParagraph(paragraph);
+
+        const expressResMock = {
+            on: () => {},
+            attachment: () => {},
+        };
+
+        packer = new ExpressPacker(file, expressResMock as any);
+    });
+
+    describe("#pack()", () => {
+        it("should handle exception if it throws any", () => {
+            const compiler = stub((packer as any).packer, "compile");
+            compiler.throwsException();
+            return packer.pack("build/tests/test").catch((error) => {
+                assert.isDefined(error);
+            });
+        });
+    });
+});

src/export/packer/local.spec.ts

@@ -1,5 +1,7 @@
 /* tslint:disable:typedef space-before-function-paren */
+import { assert } from "chai";
 import * as fs from "fs";
+import { stub } from "sinon";
 
 import { LocalPacker } from "../../export/packer/local";
 import { File, Paragraph } from "../../file";
@@ -29,14 +31,36 @@ describe("LocalPacker", () => {
             await packer.pack("build/tests/test");
             fs.statSync("build/tests/test.docx");
         });
+
+        it("should handle exception if it throws any", () => {
+            // tslint:disable-next-line:no-any
+            const compiler = stub((packer as any).packer, "compile");
+            compiler.throwsException();
+            return packer.pack("build/tests/test").catch((error) => {
+                assert.isDefined(error);
+            });
+        });
     });
 
     describe("#packPdf", () => {
         it("should create a standard PDF file", async function() {
             this.timeout(99999999);
 
+            // tslint:disable-next-line:no-any
+            const pdfConverterConvert = stub((packer as any).pdfConverter, "convert");
+            pdfConverterConvert.returns("Test PDF Contents");
+
             await packer.packPdf("build/tests/pdf-test");
             fs.statSync("build/tests/pdf-test.pdf");
         });
+
+        it("should handle exception if it throws any", () => {
+            // tslint:disable-next-line:no-any
+            const compiler = stub((packer as any).packer, "compile");
+            compiler.throwsException();
+            return packer.packPdf("build/tests/pdf-test").catch((error) => {
+                assert.isDefined(error);
+            });
+        });
     });
 });

src/file/content-types/content-types.ts

@@ -24,7 +24,9 @@ export class ContentTypes extends XmlComponent {
         this.root.push(
             new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml", "/word/document.xml"),
         );
+
         this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml", "/word/header1.xml"));
+        this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml", "/word/header2.xml"));
         this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml", "/word/footer1.xml"));
         this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml", "/word/styles.xml"));
         this.root.push(new Override("application/vnd.openxmlformats-package.core-properties+xml", "/docProps/core.xml"));

src/file/core-properties/properties.ts

@@ -10,6 +10,7 @@ export interface IPropertiesOptions {
     description?: string;
     lastModifiedBy?: string;
     revision?: string;
+    externalStyles?: string;
 }
 
 export class CoreProperties extends XmlComponent {

src/file/document/body/section-properties/header-reference/header-reference.ts

@@ -2,12 +2,12 @@ import { XmlComponent } from "file/xml-components";
 import { HeaderReferenceAttributes } from "./header-reference-attributes";
 
 export class HeaderReference extends XmlComponent {
-    constructor() {
+    constructor(order: string, refID: number) {
         super("w:headerReference");
         this.root.push(
             new HeaderReferenceAttributes({
-                type: "default",
-                id: `rId${3}`,
+                type: order,
+                id: `rId${refID}`,
             }),
         );
     }

src/file/document/body/section-properties/section-properties.ts

@@ -10,6 +10,7 @@ import { PageMargin } from "./page-margin/page-margin";
 import { IPageMarginAttributes } from "./page-margin/page-margin-attributes";
 import { PageSize } from "./page-size/page-size";
 import { IPageSizeAttributes } from "./page-size/page-size-attributes";
+import { TitlePage } from "./title-page/title-page";
 
 export type SectionPropertiesOptions = IPageSizeAttributes & IPageMarginAttributes & IColumnsAttributes & IDocGridAttributesProperties;
 
@@ -30,6 +31,7 @@ export class SectionProperties extends XmlComponent {
             space: 708,
             linePitch: 360,
             orientation: "portrait",
+            differentFirstPageHeader: false,
         };
 
         const mergedOptions = {
@@ -51,7 +53,13 @@ export class SectionProperties extends XmlComponent {
         );
         this.root.push(new Columns(mergedOptions.space));
         this.root.push(new DocumentGrid(mergedOptions.linePitch));
-        this.root.push(new HeaderReference());
+        this.root.push(new HeaderReference("default", 3));
+
+        if (mergedOptions.differentFirstPageHeader) {
+            this.root.push(new HeaderReference("first", 5));
+            this.root.push(new TitlePage());
+        }
+
         this.root.push(new FooterReference());
     }
 }

src/file/document/body/section-properties/title-page/title-page-attributes.ts

@@ -0,0 +1,11 @@
+import { XmlAttributeComponent } from "file/xml-components";
+
+export interface IHeaderReferenceAttributes {
+    value: string;
+}
+
+export class TitlePageAttributes extends XmlAttributeComponent<IHeaderReferenceAttributes> {
+    protected xmlKeys = {
+        value: "w:val",
+    };
+}

src/file/document/body/section-properties/title-page/title-page.spec.ts

@@ -0,0 +1,17 @@
+import { expect } from "chai";
+
+import { Formatter } from "../../../../../export/formatter";
+import { TitlePage } from "./title-page";
+
+describe("PageSize", () => {
+    describe("#constructor()", () => {
+        it("should create title page property for different first page header", () => {
+            const properties = new TitlePage();
+            const tree = new Formatter().format(properties);
+
+            expect(Object.keys(tree)).to.deep.equal(["w:titlePg"]);
+            expect(tree["w:titlePg"]).to.be.an.instanceof(Array);
+            expect(tree["w:titlePg"][0]).to.deep.equal({ _attr: { "w:val": "1" } });
+        });
+    });
+});

src/file/document/body/section-properties/title-page/title-page.ts

@@ -0,0 +1,13 @@
+import { XmlComponent } from "file/xml-components";
+import { TitlePageAttributes } from "./title-page-attributes";
+
+export class TitlePage extends XmlComponent {
+    constructor() {
+        super("w:titlePg");
+        this.root.push(
+            new TitlePageAttributes({
+                value: "1",
+            }),
+        );
+    }
+}

src/file/file.ts

@@ -1,15 +1,17 @@
+import { IMediaData } from "file/media";
 import { AppProperties } from "./app-properties/app-properties";
 import { ContentTypes } from "./content-types/content-types";
 import { CoreProperties, IPropertiesOptions } from "./core-properties";
 import { Document } from "./document";
 import { SectionPropertiesOptions } from "./document/body/section-properties/section-properties";
 import { FooterWrapper } from "./footer-wrapper";
-import { HeaderWrapper } from "./header-wrapper";
+import { FirstPageHeaderWrapper, HeaderWrapper } from "./header-wrapper";
 import { Media } from "./media";
 import { Numbering } from "./numbering";
-import { Paragraph, PictureRun } from "./paragraph";
+import { Hyperlink, Paragraph, PictureRun } from "./paragraph";
 import { Relationships } from "./relationships";
 import { Styles } from "./styles";
+import { ExternalStylesFactory } from "./styles/external-styles-factory";
 import { DefaultStylesFactory } from "./styles/factory";
 import { Table } from "./table";
 
@@ -22,14 +24,15 @@ export class File {
     private readonly docRelationships: Relationships;
     private readonly fileRelationships: Relationships;
     private readonly headerWrapper: HeaderWrapper;
+
+    private readonly firstPageHeaderWrapper: FirstPageHeaderWrapper;
+
     private readonly footerWrapper: FooterWrapper;
     private readonly contentTypes: ContentTypes;
     private readonly appProperties: AppProperties;
 
     constructor(options?: IPropertiesOptions, sectionPropertiesOptions?: SectionPropertiesOptions) {
         this.document = new Document(sectionPropertiesOptions);
-        const stylesFactory = new DefaultStylesFactory();
-        this.styles = stylesFactory.newInstance();
 
         if (!options) {
             options = {
@@ -39,6 +42,14 @@ export class File {
             };
         }
 
+        if (options.externalStyles) {
+            const stylesFactory = new ExternalStylesFactory();
+            this.styles = stylesFactory.newInstance(options.externalStyles);
+        } else {
+            const stylesFactory = new DefaultStylesFactory();
+            this.styles = stylesFactory.newInstance();
+        }
+
         this.coreProperties = new CoreProperties(options);
         this.numbering = new Numbering();
         this.docRelationships = new Relationships();
@@ -57,13 +68,23 @@ export class File {
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header",
             "header1.xml",
         );
+
+        this.docRelationships.createRelationship(
+            5,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header",
+            "header2.xml",
+        );
+
         this.docRelationships.createRelationship(
             4,
             "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer",
             "footer1.xml",
         );
         this.media = new Media();
+
         this.headerWrapper = new HeaderWrapper(this.media);
+        this.firstPageHeaderWrapper = new FirstPageHeaderWrapper(this.media);
+
         this.footerWrapper = new FooterWrapper(this.media);
         this.contentTypes = new ContentTypes();
         this.fileRelationships = new Relationships();
@@ -111,6 +132,28 @@ export class File {
         return this.document.createDrawing(mediaData);
     }
 
+    public createImageData(imageName: string, data: Buffer, width?: number, height?: number): IMediaData {
+        const mediaData = this.media.addMediaWithData(imageName, data, this.docRelationships.RelationshipCount, width, height);
+        this.docRelationships.createRelationship(
+            mediaData.referenceId,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+            `media/${mediaData.fileName}`,
+        );
+        return mediaData;
+    }
+
+    public createHyperlink(link: string, text?: string): Hyperlink {
+        text = text === undefined ? link : text;
+        const hyperlink = new Hyperlink(text, this.docRelationships.RelationshipCount);
+        this.docRelationships.createRelationship(
+            hyperlink.linkId,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
+            link,
+            "External",
+        );
+        return hyperlink;
+    }
+
     public get Document(): Document {
         return this.document;
     }
@@ -143,6 +186,10 @@ export class File {
         return this.headerWrapper;
     }
 
+    public get firstPageHeader(): FirstPageHeaderWrapper {
+        return this.firstPageHeaderWrapper;
+    }
+
     public get Footer(): FooterWrapper {
         return this.footerWrapper;
     }

src/file/header-wrapper.ts

@@ -4,6 +4,56 @@ import { Paragraph } from "./paragraph";
 import { Relationships } from "./relationships";
 import { Table } from "./table";
 
+export class FirstPageHeaderWrapper {
+    private readonly header: Header;
+    private readonly relationships: Relationships;
+
+    constructor(private readonly media: Media) {
+        this.header = new Header();
+        this.relationships = new Relationships();
+    }
+
+    public addParagraph(paragraph: Paragraph): void {
+        this.header.addParagraph(paragraph);
+    }
+
+    public createParagraph(text?: string): Paragraph {
+        const para = new Paragraph(text);
+        this.addParagraph(para);
+        return para;
+    }
+
+    public addTable(table: Table): void {
+        this.header.addTable(table);
+    }
+
+    public createTable(rows: number, cols: number): Table {
+        return this.header.createTable(rows, cols);
+    }
+
+    public addDrawing(imageData: IMediaData): void {
+        this.header.addDrawing(imageData);
+    }
+
+    public createImage(image: string): void {
+        const mediaData = this.media.addMedia(image, this.relationships.RelationshipCount);
+        this.relationships.createRelationship(
+            mediaData.referenceId,
+            "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+            `media/${mediaData.fileName}`,
+        );
+        this.addDrawing(mediaData);
+    }
+
+    public get Header(): Header {
+        return this.header;
+    }
+
+    public get Relationships(): Relationships {
+        return this.relationships;
+    }
+}
+
 export class HeaderWrapper {
     private readonly header: Header;
     private readonly relationships: Relationships;

src/file/index.ts

@@ -5,3 +5,4 @@ export * from "./numbering";
 export * from "./media";
 export * from "./drawing";
 export * from "./styles";
+export * from "./xml-components";

src/file/media/data.ts

@@ -13,8 +13,8 @@ export interface IMediaDataDimensions {
 
 export interface IMediaData {
     referenceId: number;
-    stream: fs.ReadStream;
-    path: string;
+    stream: fs.ReadStream | Buffer;
+    path?: string;
     fileName: string;
     dimensions: IMediaDataDimensions;
 }

src/file/media/media.ts

@@ -24,10 +24,34 @@ export class Media {
     public addMedia(filePath: string, relationshipsCount: number): IMediaData {
         const key = path.basename(filePath);
         const dimensions = sizeOf(filePath);
+        return this.createMedia(key, relationshipsCount, dimensions, fs.createReadStream(filePath), filePath);
+    }
 
+    public addMediaWithData(fileName: string, data: Buffer, relationshipsCount: number, width?: number, height?: number): IMediaData {
+        const key = fileName;
+        let dimensions;
+        if (width && height) {
+            dimensions = {
+                width: width,
+                height: height,
+            };
+        } else {
+            dimensions = sizeOf(data);
+        }
+
+        return this.createMedia(key, relationshipsCount, dimensions, data);
+    }
+
+    private createMedia(
+        key: string,
+        relationshipsCount: number,
+        dimensions: { width: number; height: number },
+        data: fs.ReadStream | Buffer,
+        filePath?: string,
+    ): IMediaData {
         const imageData = {
             referenceId: this.map.size + relationshipsCount + 1,
-            stream: fs.createReadStream(filePath),
+            stream: data,
             path: filePath,
             fileName: key,
             dimensions: {

src/file/numbering/index.ts

@@ -1 +1,2 @@
 export * from "./numbering";
+export * from "./abstract-numbering";

src/file/numbering/numbering.ts

@@ -1,12 +1,15 @@
-import { XmlComponent } from "file/xml-components";
+import { Indent } from "file/paragraph";
+import { IXmlableObject, XmlComponent } from "file/xml-components";
 import { DocumentAttributes } from "../document/document-attributes";
-import { Indent } from "../paragraph/formatting";
 import { AbstractNumbering } from "./abstract-numbering";
 import { Num } from "./num";
 
 export class Numbering extends XmlComponent {
     private nextId: number;
 
+    private abstractNumbering: XmlComponent[] = [];
+    private concreteNumbering: XmlComponent[] = [];
+
     constructor() {
         super("w:numbering");
         this.root.push(
@@ -58,13 +61,19 @@ export class Numbering extends XmlComponent {
 
     public createAbstractNumbering(): AbstractNumbering {
         const num = new AbstractNumbering(this.nextId++);
-        this.root.push(num);
+        this.abstractNumbering.push(num);
         return num;
     }
 
     public createConcreteNumbering(abstractNumbering: AbstractNumbering): Num {
         const num = new Num(this.nextId++, abstractNumbering.id);
-        this.root.push(num);
+        this.concreteNumbering.push(num);
         return num;
     }
+
+    public prepForXml(): IXmlableObject {
+        this.abstractNumbering.forEach((x) => this.root.push(x));
+        this.concreteNumbering.forEach((x) => this.root.push(x));
+        return super.prepForXml();
+    }
 }

src/file/paragraph/index.ts

@@ -2,3 +2,4 @@ export * from "./formatting";
 export * from "./paragraph";
 export * from "./properties";
 export * from "./run";
+export * from "./links";

src/file/paragraph/links/hyperlink-attributes.ts

@@ -0,0 +1,13 @@
+import { XmlAttributeComponent } from "file/xml-components";
+
+export interface IHyperlinkAttributesProperties {
+    id?: string;
+    history: number;
+}
+
+export class HyperlinkAttributes extends XmlAttributeComponent<IHyperlinkAttributesProperties> {
+    protected xmlKeys = {
+        id: "r:id",
+        history: "w:history",
+    };
+}

src/file/paragraph/links/hyperlink.spec.ts

@@ -0,0 +1,40 @@
+import { assert, expect } from "chai";
+
+import { Formatter } from "../../../export/formatter";
+import { Utility } from "../../../tests/utility";
+import { Hyperlink } from "./";
+
+describe("Hyperlink", () => {
+    let hyperlink: Hyperlink;
+
+    beforeEach(() => {
+        hyperlink = new Hyperlink("https://example.com", 0);
+    });
+
+    describe("#constructor()", () => {
+        it("should create a hyperlink with correct root key", () => {
+            const newJson = Utility.jsonify(hyperlink);
+            assert.equal(newJson.rootKey, "w:hyperlink");
+        });
+
+        it("should create a hyperlink with right attributes", () => {
+            const newJson = Utility.jsonify(hyperlink);
+            const attributes = {
+                id: "rId1",
+                history: 1,
+            };
+            assert.equal(JSON.stringify(newJson.root[0].root), JSON.stringify(attributes));
+        });
+
+        it("should create a hyperlink with a run component", () => {
+            const tree = new Formatter().format(hyperlink);
+            const runJson = {
+                "w:r": [
+                    { "w:rPr": [{ "w:rStyle": [{ _attr: { "w:val": "Hyperlink" } }] }] },
+                    { "w:t": [{ _attr: { "xml:space": "preserve" } }, "https://example.com"] },
+                ],
+            };
+            expect(tree["w:hyperlink"][1]).to.deep.equal(runJson);
+        });
+    });
+});

src/file/paragraph/links/hyperlink.ts

@@ -0,0 +1,21 @@
+// http://officeopenxml.com/WPhyperlink.php
+
+import { XmlComponent } from "file/xml-components";
+import { TextRun } from "../run";
+import { HyperlinkAttributes } from "./hyperlink-attributes";
+
+export class Hyperlink extends XmlComponent {
+    public linkId: number;
+
+    constructor(text: string, relationshipsCount: number) {
+        super("w:hyperlink");
+
+        this.linkId = relationshipsCount + 1;
+        const attributes = new HyperlinkAttributes({
+            id: `rId${this.linkId}`,
+            history: 1,
+        });
+        this.root.push(attributes);
+        this.root.push(new TextRun(text).style("Hyperlink"));
+    }
+}

src/file/paragraph/links/index.ts

@@ -0,0 +1 @@
+export * from "./hyperlink";

src/file/paragraph/paragraph.ts

@@ -13,6 +13,7 @@ import { ISpacingProperties, Spacing } from "./formatting/spacing";
 import { Style } from "./formatting/style";
 import { CenterTabStop, LeftTabStop, MaxRightTabStop, RightTabStop } from "./formatting/tab-stop";
 import { NumberProperties } from "./formatting/unordered-list";
+import { Hyperlink } from "./links";
 import { ParagraphProperties } from "./properties";
 
 export class Paragraph extends XmlComponent {
@@ -32,6 +33,11 @@ export class Paragraph extends XmlComponent {
         return this;
     }
 
+    public addHyperLink(hyperlink: Hyperlink): Paragraph {
+        this.root.push(hyperlink);
+        return this;
+    }
+
     public createTextRun(text: string): TextRun {
         const run = new TextRun(text);
         this.addRun(run);
@@ -141,6 +147,11 @@ export class Paragraph extends XmlComponent {
         return this;
     }
 
+    public setCustomNumbering(numberId: number, indentLevel: number): Paragraph {
+        this.properties.push(new NumberProperties(numberId, indentLevel));
+        return this;
+    }
+
     public style(styleId: string): Paragraph {
         this.properties.push(new Style(styleId));
         return this;

src/file/paragraph/run/page-number.ts

@@ -0,0 +1,38 @@
+import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+
+class FidCharAttrs extends XmlAttributeComponent<{ type: "begin" | "end" | "separate" }> {
+    protected xmlKeys = { type: "w:fldCharType" };
+}
+
+class TextAttributes extends XmlAttributeComponent<{ space: "default" | "preserve" }> {
+    protected xmlKeys = { space: "xml:space" };
+}
+
+export class Begin extends XmlComponent {
+    constructor() {
+        super("w:fldChar");
+        this.root.push(new FidCharAttrs({ type: "begin" }));
+    }
+}
+
+export class Page extends XmlComponent {
+    constructor() {
+        super("w:instrText");
+        this.root.push(new TextAttributes({ space: "preserve" }));
+        this.root.push("PAGE");
+    }
+}
+
+export class Separate extends XmlComponent {
+    constructor() {
+        super("w:fldChar");
+        this.root.push(new FidCharAttrs({ type: "separate" }));
+    }
+}
+
+export class End extends XmlComponent {
+    constructor() {
+        super("w:fldChar");
+        this.root.push(new FidCharAttrs({ type: "end" }));
+    }
+}

src/file/paragraph/run/run.ts

@@ -2,6 +2,7 @@
 import { Break } from "./break";
 import { Caps, SmallCaps } from "./caps";
 import { Bold, Color, DoubleStrike, Italics, Size, Strike } from "./formatting";
+import { Begin, End, Page, Separate } from "./page-number";
 import { RunProperties } from "./properties";
 import { RunFonts } from "./run-fonts";
 import { SubScript, SuperScript } from "./script";
@@ -55,6 +56,14 @@ export class Run extends XmlComponent {
         return this;
     }
 
+    public pageNumber(): Run {
+        this.root.push(new Begin());
+        this.root.push(new Page());
+        this.root.push(new Separate());
+        this.root.push(new End());
+        return this;
+    }
+
     public smallCaps(): Run {
         this.properties.push(new SmallCaps());
         return this;

src/file/relationships/relationship/relationship-attributes.ts

@@ -4,6 +4,7 @@ export interface IRelationshipAttributesProperties {
     id: string;
     type: string;
     target: string;
+    targetMode?: string;
 }
 
 export class RelationshipAttributes extends XmlAttributeComponent<IRelationshipAttributesProperties> {
@@ -11,5 +12,6 @@ export class RelationshipAttributes extends XmlAttributeComponent<IRelationshipA
         id: "Id",
         type: "Type",
         target: "Target",
+        targetMode: "TargetMode",
     };
 }

src/file/relationships/relationship/relationship.ts

@@ -13,10 +13,13 @@ export type RelationshipType =
     | "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer"
     | "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"
     | "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"
-    | "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";
+    | "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"
+    | "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
+
+export type TargetModeType = "External";
 
 export class Relationship extends XmlComponent {
-    constructor(id: string, type: RelationshipType, target: string) {
+    constructor(id: string, type: RelationshipType, target: string, targetMode?: TargetModeType) {
         super("Relationship");
 
         this.root.push(
@@ -24,6 +27,7 @@ export class Relationship extends XmlComponent {
                 id,
                 type,
                 target,
+                targetMode,
             }),
         );
     }

src/file/relationships/relationships.ts

@@ -1,6 +1,6 @@
 import { XmlComponent } from "file/xml-components";
 import { RelationshipsAttributes } from "./attributes";
-import { Relationship, RelationshipType } from "./relationship/relationship";
+import { Relationship, RelationshipType, TargetModeType } from "./relationship/relationship";
 
 export class Relationships extends XmlComponent {
     constructor() {
@@ -16,8 +16,8 @@ export class Relationships extends XmlComponent {
         this.root.push(relationship);
     }
 
-    public createRelationship(id: number, type: RelationshipType, target: string): Relationship {
-        const relationship = new Relationship(`rId${id}`, type, target);
+    public createRelationship(id: number, type: RelationshipType, target: string, targetMode?: TargetModeType): Relationship {
+        const relationship = new Relationship(`rId${id}`, type, target, targetMode);
         this.addRelationship(relationship);
 
         return relationship;

src/file/styles/external-styles-factory.spec.ts

@@ -0,0 +1,159 @@
+import { expect } from "chai";
+
+import { ExternalStylesFactory } from "./external-styles-factory";
+
+describe("External styles factory", () => {
+    let externalStyles;
+
+    beforeEach(() => {
+        externalStyles = `
+        <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+        <w:styles xmlns:mc="first" xmlns:r="second">
+            <w:docDefaults>
+            </w:docDefaults>
+            
+            <w:latentStyles w:defLockedState="1" w:defUIPriority="99">
+            </w:latentStyles>
+
+            <w:style w:type="paragraph" w:default="1" w:styleId="Normal">
+                <w:name w:val="Normal"/>
+                <w:qFormat/>
+            </w:style>
+
+            <w:style w:type="paragraph" w:styleId="Heading1">
+                <w:name w:val="heading 1"/>
+                <w:basedOn w:val="Normal"/>
+                <w:pPr>
+                    <w:keepNext/>
+                    <w:keepLines/>
+
+                    <w:pBdr>
+                        <w:bottom w:val="single" w:sz="4" w:space="1" w:color="auto"/>
+                  </w:pBdr>
+                </w:pPr>
+            </w:style>
+        </w:styles>`;
+    });
+
+    describe("#parse", () => {
+        it("should parse w:styles attributes", () => {
+            const importedStyle = new ExternalStylesFactory().newInstance(externalStyles) as any;
+
+            expect(importedStyle.rootKey).to.equal("w:styles");
+            expect(importedStyle.root[0]._attr).to.eql({
+                "xmlns:mc": "first",
+                "xmlns:r": "second",
+            });
+        });
+
+        it("should parse other child elements of w:styles", () => {
+            const importedStyle = new ExternalStylesFactory().newInstance(externalStyles) as any;
+
+            expect(importedStyle.root.length).to.equal(5);
+            expect(importedStyle.root[1]).to.eql({
+                deleted: false,
+                root: [],
+                rootKey: "w:docDefaults",
+            });
+            expect(importedStyle.root[2]).to.eql({
+                _attr: {
+                    "w:defLockedState": "1",
+                    "w:defUIPriority": "99",
+                },
+                deleted: false,
+                root: [],
+                rootKey: "w:latentStyles",
+            });
+        });
+
+        it("should parse styles elements", () => {
+            const importedStyle = new ExternalStylesFactory().newInstance(externalStyles) as any;
+
+            expect(importedStyle.root.length).to.equal(5);
+            expect(importedStyle.root[3]).to.eql({
+                _attr: {
+                    "w:default": "1",
+                    "w:styleId": "Normal",
+                    "w:type": "paragraph",
+                },
+                deleted: false,
+                root: [
+                    {
+                        _attr: {
+                            "w:val": "Normal",
+                        },
+                        deleted: false,
+                        root: [],
+                        rootKey: "w:name",
+                    },
+                    {
+                        deleted: false,
+                        root: [],
+                        rootKey: "w:qFormat",
+                    },
+                ],
+                rootKey: "w:style",
+            });
+
+            expect(importedStyle.root[4]).to.eql({
+                _attr: {
+                    "w:styleId": "Heading1",
+                    "w:type": "paragraph",
+                },
+                deleted: false,
+                root: [
+                    {
+                        _attr: {
+                            "w:val": "heading 1",
+                        },
+                        deleted: false,
+                        root: [],
+                        rootKey: "w:name",
+                    },
+                    {
+                        _attr: {
+                            "w:val": "Normal",
+                        },
+                        deleted: false,
+                        root: [],
+                        rootKey: "w:basedOn",
+                    },
+                    {
+                        deleted: false,
+                        root: [
+                            {
+                                deleted: false,
+                                root: [],
+                                rootKey: "w:keepNext",
+                            },
+                            {
+                                deleted: false,
+                                root: [],
+                                rootKey: "w:keepLines",
+                            },
+                            {
+                                deleted: false,
+                                root: [
+                                    {
+                                        _attr: {
+                                            "w:color": "auto",
+                                            "w:space": "1",
+                                            "w:sz": "4",
+                                            "w:val": "single",
+                                        },
+                                        deleted: false,
+                                        root: [],
+                                        rootKey: "w:bottom",
+                                    },
+                                ],
+                                rootKey: "w:pBdr",
+                            },
+                        ],
+                        rootKey: "w:pPr",
+                    },
+                ],
+                rootKey: "w:style",
+            });
+        });
+    });
+});

src/file/styles/external-styles-factory.ts

@@ -0,0 +1,64 @@
+import * as fastXmlParser from "fast-xml-parser";
+
+import { Styles } from "./";
+import { ImportedRootElementAttributes, ImportedXmlComponent } from "./../../file/xml-components";
+
+const parseOptions = {
+    ignoreAttributes: false,
+    attributeNamePrefix: "",
+    attrNodeName: "_attr",
+};
+
+export class ExternalStylesFactory {
+    /**
+     * Creates new Style based on the given styles.
+     * Parses the styles and convert them to XmlComponent.
+     * Example content from styles.xml:
+     * <?xml version="1.0">
+     * <w:styles xmlns:mc="some schema" ...>
+     *
+     *   <w:style w:type="paragraph" w:styleId="Heading1">
+     *           <w:name w:val="heading 1"/>
+     *           .....
+     *   </w:style>
+     *
+     *   <w:style w:type="paragraph" w:styleId="Heading2">
+     *           <w:name w:val="heading 2"/>
+     *           .....
+     *   </w:style>
+     *
+     *   <w:docDefaults>Or any other element will be parsed to</w:docDefaults>
+     *
+     * </w:styles>
+     * @param externalStyles context from styles.xml
+     */
+    public newInstance(externalStyles: string): Styles {
+        const xmlStyles = fastXmlParser.parse(externalStyles, parseOptions)["w:styles"];
+        // create styles with attributes from the parsed xml
+        const importedStyle = new Styles(new ImportedRootElementAttributes(xmlStyles._attr));
+
+        // convert other elements (not styles definitions, but default styles and so on ...)
+        Object.keys(xmlStyles)
+            .filter((element) => element !== "_attr" && element !== "w:style")
+            .forEach((element) => {
+                importedStyle.push(new ImportedXmlComponent(element, xmlStyles[element]._attr));
+            });
+
+        // convert the styles one by one
+        xmlStyles["w:style"].map((style) => this.convertElement("w:style", style)).forEach(importedStyle.push.bind(importedStyle));
+
+        return importedStyle;
+    }
+
+    // tslint:disable-next-line:no-any
+    public convertElement(elementName: string, element: any): ImportedXmlComponent {
+        const xmlElement = new ImportedXmlComponent(elementName, element._attr);
+        if (typeof element === "object") {
+            Object.keys(element)
+                .filter((key) => key !== "_attr")
+                .map((item) => this.convertElement(item, element[item]))
+                .forEach(xmlElement.push.bind(xmlElement));
+        }
+        return xmlElement;
+    }
+}

src/file/styles/factory.ts

@@ -1,7 +1,7 @@
+import { DocumentAttributes } from "../document/document-attributes";
 import { Color, Italics, Size } from "../paragraph/run/formatting";
-
 import { Styles } from "./";
-// import { DocumentDefaults } from "./defaults";
+
 import {
     Heading1Style,
     Heading2Style,
@@ -9,13 +9,22 @@ import {
     Heading4Style,
     Heading5Style,
     Heading6Style,
+    HyperlinkStyle,
     ListParagraph,
     TitleStyle,
 } from "./style";
 
 export class DefaultStylesFactory {
     public newInstance(): Styles {
-        const styles = new Styles();
+        const documentAttributes = new DocumentAttributes({
+            mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
+            r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+            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",
+            Ignorable: "w14 w15",
+        });
+        const styles = new Styles(documentAttributes);
         styles.createDocumentDefaults();
 
         const titleStyle = new TitleStyle();
@@ -54,6 +63,8 @@ export class DefaultStylesFactory {
         // listParagraph.addParagraphProperty();
         styles.push(listParagraph);
 
+        const hyperLinkStyle = new HyperlinkStyle();
+        styles.push(hyperLinkStyle);
         return styles;
     }
 }

src/file/styles/index.ts

@@ -1,21 +1,13 @@
-import { XmlComponent } from "file/xml-components";
-import { DocumentAttributes } from "../document/document-attributes";
+import { BaseXmlComponent, XmlComponent } from "file/xml-components";
 import { DocumentDefaults } from "./defaults";
 import { ParagraphStyle } from "./style";
 
 export class Styles extends XmlComponent {
-    constructor() {
+    constructor(initialStyles?: BaseXmlComponent) {
         super("w:styles");
-        this.root.push(
-            new DocumentAttributes({
-                mc: "http://schemas.openxmlformats.org/markup-compatibility/2006",
-                r: "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-                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",
-                Ignorable: "w14 w15",
-            }),
-        );
+        if (initialStyles) {
+            this.root.push(initialStyles);
+        }
     }
 
     public push(style: XmlComponent): Styles {

src/file/styles/style/index.ts

@@ -3,7 +3,7 @@ import * as paragraph from "../../paragraph";
 import * as formatting from "../../paragraph/run/formatting";
 import { RunProperties } from "../../paragraph/run/properties";
 
-import { BasedOn, Name, Next, QuickFormat } from "./components";
+import { BasedOn, Name, Next, QuickFormat, UiPriority, UnhideWhenUsed } from "./components";
 
 export interface IStyleAttributes {
     type?: string;
@@ -249,3 +249,43 @@ export class ListParagraph extends ParagraphStyle {
         this.root.push(new QuickFormat());
     }
 }
+
+export class CharacterStyle extends Style {
+    private readonly runProperties: RunProperties;
+
+    constructor(styleId: string, name?: string) {
+        super({ type: "character", styleId: styleId }, name);
+        this.runProperties = new RunProperties();
+        this.root.push(this.runProperties);
+        this.root.push(new UiPriority("99"));
+        this.root.push(new UnhideWhenUsed(""));
+    }
+
+    public basedOn(parentId: string): CharacterStyle {
+        this.root.push(new BasedOn(parentId));
+        return this;
+    }
+
+    public addRunProperty(property: XmlComponent): void {
+        this.runProperties.push(property);
+    }
+
+    public color(color: string): CharacterStyle {
+        this.addRunProperty(new formatting.Color(color));
+        return this;
+    }
+
+    public underline(underlineType?: string, color?: string): CharacterStyle {
+        this.addRunProperty(new formatting.Underline(underlineType, color));
+        return this;
+    }
+}
+
+export class HyperlinkStyle extends CharacterStyle {
+    constructor() {
+        super("Hyperlink", "Hyperlink");
+        this.basedOn("DefaultParagraphFont")
+            .color("0563C1")
+            .underline("single");
+    }
+}

src/file/table/index.ts

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

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

@@ -0,0 +1,181 @@
+import { expect } from "chai";
+
+import { TableCellBorders, BorderStyle, TableCellWidth, WidthType } from "./table-cell";
+import { Formatter } from "../../export/formatter";
+
+describe("TableCellBorders", () => {
+    describe("#prepForXml", () => {
+        it("should not add empty borders element if there are no borders defined", () => {
+            const tb = new TableCellBorders();
+            const tree = new Formatter().format(tb);
+            expect(tree).to.deep.equal("");
+        });
+    });
+
+    describe("#addingBorders", () => {
+        it("should add top border", () => {
+            const tb = new TableCellBorders();
+            tb.addTopBorder(BorderStyle.DOTTED, 1, "FF00FF");
+
+            const tree = new Formatter().format(tb);
+            expect(tree).to.deep.equal({
+                "w:tcBorders": [
+                    {
+                        "w:top": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 1,
+                                    "w:val": "dotted",
+                                },
+                            },
+                        ],
+                    },
+                ],
+            });
+        });
+
+        it("should add start(left) border", () => {
+            const tb = new TableCellBorders();
+            tb.addStartBorder(BorderStyle.SINGLE, 2, "FF00FF");
+
+            const tree = new Formatter().format(tb);
+            expect(tree).to.deep.equal({
+                "w:tcBorders": [
+                    {
+                        "w:start": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 2,
+                                    "w:val": "single",
+                                },
+                            },
+                        ],
+                    },
+                ],
+            });
+        });
+
+        it("should add bottom border", () => {
+            const tb = new TableCellBorders();
+            tb.addBottomBorder(BorderStyle.DOUBLE, 1, "FF00FF");
+
+            const tree = new Formatter().format(tb);
+            expect(tree).to.deep.equal({
+                "w:tcBorders": [
+                    {
+                        "w:bottom": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 1,
+                                    "w:val": "double",
+                                },
+                            },
+                        ],
+                    },
+                ],
+            });
+        });
+
+        it("should add end(right) border", () => {
+            const tb = new TableCellBorders();
+            tb.addEndBorder(BorderStyle.THICK, 3, "FF00FF");
+
+            const tree = new Formatter().format(tb);
+            expect(tree).to.deep.equal({
+                "w:tcBorders": [
+                    {
+                        "w:end": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 3,
+                                    "w:val": "thick",
+                                },
+                            },
+                        ],
+                    },
+                ],
+            });
+        });
+
+        it("should add multiple borders", () => {
+            const tb = new TableCellBorders();
+            tb.addTopBorder(BorderStyle.DOTTED, 1, "FF00FF");
+            tb.addEndBorder(BorderStyle.THICK, 3, "FF00FF");
+            tb.addBottomBorder(BorderStyle.DOUBLE, 1, "FF00FF");
+            tb.addStartBorder(BorderStyle.SINGLE, 2, "FF00FF");
+
+            const tree = new Formatter().format(tb);
+            expect(tree).to.deep.equal({
+                "w:tcBorders": [
+                    {
+                        "w:top": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 1,
+                                    "w:val": "dotted",
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        "w:end": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 3,
+                                    "w:val": "thick",
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        "w:bottom": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 1,
+                                    "w:val": "double",
+                                },
+                            },
+                        ],
+                    },
+                    {
+                        "w:start": [
+                            {
+                                _attr: {
+                                    "w:color": "FF00FF",
+                                    "w:sz": 2,
+                                    "w:val": "single",
+                                },
+                            },
+                        ],
+                    },
+                ],
+            });
+        });
+    });
+});
+
+describe("TableCellWidth", () => {
+    describe("#constructor", () => {
+        it("should create object", () => {
+            const tcWidth = new TableCellWidth(100, WidthType.DXA);
+            const tree = new Formatter().format(tcWidth);
+            expect(tree).to.deep.equal({
+                "w:tcW": [
+                    {
+                        _attr: {
+                            "w:type": "dxa",
+                            "w:w": 100,
+                        },
+                    },
+                ],
+            });
+        });
+    });
+});

src/file/table/table-cell.ts

@@ -0,0 +1,207 @@
+import { IXmlableObject, XmlAttributeComponent, XmlComponent } from "file/xml-components";
+
+export enum BorderStyle {
+    SINGLE = "single",
+    DASH_DOT_STROKED = "dashDotStroked",
+    DASHED = "dashed",
+    DASH_SMALL_GAP = "dashSmallGap",
+    DOT_DASH = "dotDash",
+    DOT_DOT_DASH = "dotDotDash",
+    DOTTED = "dotted",
+    DOUBLE = "double",
+    DOUBLE_WAVE = "doubleWave",
+    INSET = "inset",
+    NIL = "nil",
+    NONE = "none",
+    OUTSET = "outset",
+    THICK = "thick",
+    THICK_THIN_LARGE_GAP = "thickThinLargeGap",
+    THICK_THIN_MEDIUM_GAP = "thickThinMediumGap",
+    THICK_THIN_SMALL_GAP = "thickThinSmallGap",
+    THIN_THICK_LARGE_GAP = "thinThickLargeGap",
+    THIN_THICK_MEDIUM_GAP = "thinThickMediumGap",
+    THIN_THICK_SMALL_GAP = "thinThickSmallGap",
+    THIN_THICK_THIN_LARGE_GAP = "thinThickThinLargeGap",
+    THIN_THICK_THIN_MEDIUM_GAP = "thinThickThinMediumGap",
+    THIN_THICK_THIN_SMALL_GAP = "thinThickThinSmallGap",
+    THREE_D_EMBOSS = "threeDEmboss",
+    THREE_D_ENGRAVE = "threeDEngrave",
+    TRIPLE = "triple",
+    WAVE = "wave",
+}
+
+interface ICellBorder {
+    style: BorderStyle;
+    size: number;
+    color: string;
+}
+
+class CellBorderAttributes extends XmlAttributeComponent<ICellBorder> {
+    protected xmlKeys = { style: "w:val", size: "w:sz", color: "w:color" };
+}
+
+class BaseTableCellBorder extends XmlComponent {
+    public setProperties(style: BorderStyle, size: number, color: string): BaseTableCellBorder {
+        const attrs = new CellBorderAttributes({
+            style: style,
+            size: size,
+            color: color,
+        });
+        this.root.push(attrs);
+
+        return this;
+    }
+}
+
+export class TableCellBorders extends XmlComponent {
+    constructor() {
+        super("w:tcBorders");
+    }
+
+    public prepForXml(): IXmlableObject {
+        return this.root.length > 0 ? super.prepForXml() : "";
+    }
+
+    public addTopBorder(style: BorderStyle, size: number, color: string): TableCellBorders {
+        const top = new BaseTableCellBorder("w:top");
+        top.setProperties(style, size, color);
+        this.root.push(top);
+
+        return this;
+    }
+
+    public addStartBorder(style: BorderStyle, size: number, color: string): TableCellBorders {
+        const start = new BaseTableCellBorder("w:start");
+        start.setProperties(style, size, color);
+        this.root.push(start);
+
+        return this;
+    }
+
+    public addBottomBorder(style: BorderStyle, size: number, color: string): TableCellBorders {
+        const bottom = new BaseTableCellBorder("w:bottom");
+        bottom.setProperties(style, size, color);
+        this.root.push(bottom);
+
+        return this;
+    }
+
+    public addEndBorder(style: BorderStyle, size: number, color: string): TableCellBorders {
+        const end = new BaseTableCellBorder("w:end");
+        end.setProperties(style, size, color);
+        this.root.push(end);
+
+        return this;
+    }
+}
+
+/**
+ * Attributes fot the GridSpan element.
+ */
+class GridSpanAttributes extends XmlAttributeComponent<{ val: number }> {
+    protected xmlKeys = { val: "w:val" };
+}
+
+/**
+ * GridSpan element. Should be used in a table cell. Pass the number of columns that this cell need to span.
+ */
+export class GridSpan extends XmlComponent {
+    constructor(value: number) {
+        super("w:gridSpan");
+
+        this.root.push(
+            new GridSpanAttributes({
+                val: value,
+            }),
+        );
+    }
+}
+
+/**
+ * Vertical merge types.
+ */
+export enum VMergeType {
+    /**
+     * Cell that is merged with upper one.
+     */
+    CONTINUE = "continue",
+    /**
+     * Cell that is starting the vertical merge.
+     */
+    RESTART = "restart",
+}
+
+class VMergeAttributes extends XmlAttributeComponent<{ val: VMergeType }> {
+    protected xmlKeys = { val: "w:val" };
+}
+
+/**
+ * Vertical merge element. Should be used in a table cell.
+ */
+export class VMerge extends XmlComponent {
+    constructor(value: VMergeType) {
+        super("w:vMerge");
+
+        this.root.push(
+            new VMergeAttributes({
+                val: value,
+            }),
+        );
+    }
+}
+
+export enum VerticalAlign {
+    BOTTOM = "bottom",
+    CENTER = "center",
+    TOP = "top",
+}
+
+class VAlignAttributes extends XmlAttributeComponent<{ val: VerticalAlign }> {
+    protected xmlKeys = { val: "w:val" };
+}
+
+/**
+ * Vertical align element.
+ */
+export class VAlign extends XmlComponent {
+    constructor(value: VerticalAlign) {
+        super("w:vAlign");
+
+        this.root.push(
+            new VAlignAttributes({
+                val: value,
+            }),
+        );
+    }
+}
+
+export enum WidthType {
+    /** Auto. */
+    AUTO = "auto",
+    /** Value is in twentieths of a point */
+    DXA = "dxa",
+    /** No (empty) value. */
+    NIL = "nil",
+    /** Value is in percentage. */
+    PERCENTAGE = "pct",
+}
+
+class TableCellWidthAttributes extends XmlAttributeComponent<{ type: WidthType; width: string | number }> {
+    protected xmlKeys = { width: "w:w", type: "w:type" };
+}
+
+/**
+ * Table cell width element.
+ */
+export class TableCellWidth extends XmlComponent {
+    constructor(value: string | number, type: WidthType) {
+        super("w:tcW");
+
+        this.root.push(
+            new TableCellWidthAttributes({
+                width: value,
+                type: type,
+            }),
+        );
+    }
+}

src/file/table/table.ts

@@ -1,3 +1,4 @@
+import { GridSpan, TableCellBorders, TableCellWidth, VAlign, VerticalAlign, VMerge, VMergeType, WidthType } from "file/table/table-cell";
 import { IXmlableObject, XmlComponent } from "file/xml-components";
 import { Paragraph } from "../paragraph";
 import { TableGrid } from "./grid";
@@ -8,27 +9,32 @@ export class Table extends XmlComponent {
     private readonly rows: TableRow[];
     private readonly grid: TableGrid;
 
-    constructor(rows: number, cols: number) {
+    constructor(rows: number, cols: number, colSizes?: number[]) {
         super("w:tbl");
         this.properties = new TableProperties();
         this.root.push(this.properties);
         this.properties.setBorder();
 
-        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);
+        if (colSizes && colSizes.length > 0) {
+            this.grid = new TableGrid(colSizes);
+        } else {
+            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.grid = new TableGrid(gridCols);
+
         this.root.push(this.grid);
 
         this.rows = [];
@@ -112,10 +118,45 @@ export class TableCell extends XmlComponent {
         this.addContent(para);
         return para;
     }
+
+    get cellProperties(): TableCellProperties {
+        return this.properties;
+    }
 }
 
 export class TableCellProperties extends XmlComponent {
+    private cellBorder: TableCellBorders;
     constructor() {
         super("w:tcPr");
+        this.cellBorder = new TableCellBorders();
+        this.root.push(this.cellBorder);
+    }
+
+    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(vAlignType: VerticalAlign): TableCellProperties {
+        this.root.push(new VAlign(vAlignType));
+
+        return this;
+    }
+
+    public setWidth(width: string | number, type: WidthType): TableCellProperties {
+        this.root.push(new TableCellWidth(width, type));
+
+        return this;
     }
 }

src/file/xml-components/base.ts

@@ -2,10 +2,15 @@ import { IXmlableObject } from "./xmlable-object";
 
 export abstract class BaseXmlComponent {
     protected rootKey: string;
+    protected deleted: boolean = false;
 
     constructor(rootKey: string) {
         this.rootKey = rootKey;
     }
 
     public abstract prepForXml(): IXmlableObject;
+
+    public get isDeleted(): boolean {
+        return this.deleted;
+    }
 }

src/file/xml-components/imported-xml-component.spec.ts

@@ -0,0 +1,34 @@
+import { expect } from "chai";
+import { ImportedXmlComponent } from "./";
+
+describe("ImportedXmlComponent", () => {
+    let importedXmlComponent: ImportedXmlComponent;
+
+    beforeEach(() => {
+        const attributes = {
+            someAttr: "1",
+            otherAttr: "2",
+        };
+        importedXmlComponent = new ImportedXmlComponent("w:test", attributes);
+        importedXmlComponent.push(new ImportedXmlComponent("w:child"));
+    });
+
+    describe("#prepForXml()", () => {
+        it("should transform for xml", () => {
+            const converted = importedXmlComponent.prepForXml();
+            expect(converted).to.eql({
+                "w:test": [
+                    {
+                        _attr: {
+                            someAttr: "1",
+                            otherAttr: "2",
+                        },
+                    },
+                    {
+                        "w:child": [],
+                    },
+                ],
+            });
+        });
+    });
+});

src/file/xml-components/imported-xml-component.ts

@@ -0,0 +1,74 @@
+// tslint:disable:no-any
+// tslint:disable:variable-name
+import { IXmlableObject, XmlComponent } from "./";
+
+/**
+ * Represents imported xml component from xml file.
+ */
+export class ImportedXmlComponent extends XmlComponent {
+    private _attr: any;
+
+    constructor(rootKey: string, attr?: any) {
+        super(rootKey);
+
+        if (attr) {
+            this._attr = attr;
+        }
+    }
+
+    /**
+     * Transforms the object so it can be converted to xml. Example:
+     * <w:someKey someAttr="1" otherAttr="11">
+     *    <w:child childAttr="2">
+     *    </w:child>
+     * </w:someKey>
+     * {
+     *   'w:someKey': [
+     *      {
+     *          _attr: {
+     *              someAttr: "1",
+     *              otherAttr: "11"
+     *          }
+     *      },
+     *      {
+     *          'w:child': [
+     *              {
+     *                  _attr: {
+     *                      childAttr: "2"
+     *                  }
+     *              }
+     *           ]
+     *      }
+     *    ]
+     * }
+     */
+    public prepForXml(): IXmlableObject {
+        const result = super.prepForXml();
+        if (!!this._attr) {
+            if (!Array.isArray(result[this.rootKey])) {
+                result[this.rootKey] = [result[this.rootKey]];
+            }
+            result[this.rootKey].unshift({ _attr: this._attr });
+        }
+        return result;
+    }
+
+    public push(xmlComponent: XmlComponent): void {
+        this.root.push(xmlComponent);
+    }
+}
+
+/**
+ * Used for the attributes of root element that is being imported.
+ */
+export class ImportedRootElementAttributes extends XmlComponent {
+    constructor(private _attr: any) {
+        super("");
+    }
+
+    public prepForXml(): IXmlableObject {
+        return {
+            _attr: this._attr,
+        };
+    }
+}

src/file/xml-components/index.ts

@@ -1,4 +1,5 @@
 export * from "./xml-component";
 export * from "./attributes";
 export * from "./default-attributes";
+export * from "./imported-xml-component";
 export * from "./xmlable-object";

src/file/xml-components/xml-component.spec.ts

@@ -18,4 +18,15 @@ describe("XmlComponent", () => {
             assert.equal(newJson.rootKey, "w:test");
         });
     });
+
+    describe("#prepForXml()", () => {
+        it("should skip deleted elements", () => {
+            const child = new TestComponent("w:test1");
+            child.delete();
+            xmlComponent.addChildElement(child);
+
+            const xml = xmlComponent.prepForXml();
+            assert.equal(xml["w:test"].length, 0);
+        });
+    });
 });

src/file/xml-components/xml-component.ts

@@ -12,6 +12,12 @@ export abstract class XmlComponent extends BaseXmlComponent {
 
     public prepForXml(): IXmlableObject {
         const children = this.root
+            .filter((c) => {
+                if (c instanceof BaseXmlComponent) {
+                    return !c.isDeleted;
+                }
+                return true;
+            })
             .map((comp) => {
                 if (comp instanceof BaseXmlComponent) {
                     return comp.prepForXml();
@@ -23,4 +29,15 @@ export abstract class XmlComponent extends BaseXmlComponent {
             [this.rootKey]: children,
         };
     }
+
+    // TODO: Unused method
+    public addChildElement(child: XmlComponent | string): XmlComponent {
+        this.root.push(child);
+
+        return this;
+    }
+
+    public delete(): void {
+        this.deleted = true;
+    }
 }