Version bump

add keepLines and keepNext support for paragraph formatting

.gitignore

@@ -37,4 +37,4 @@ build
 build-tests
 
 # vscode
-ts/.vscode
+.vscode

.npmignore

@@ -0,0 +1,43 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+# build
+# build  <-- we want this in the package
+build-tests
+
+# vscode
+.vscode
+
+# docs
+docs

.travis.yml

@@ -1,10 +1,15 @@
 language: node_js
 node_js:
-  - "6"
+  - "stable"
-  - "node"
 install:
   - npm install
 script:
   - npm test
 after_failure: 
-  - "cat /home/travis/builds/dolanmiu/docx/npm-debug.log"
+  - "cat /home/travis/builds/dolanmiu/docx/npm-debug.log"
+after_success:
+  - bash ./deploy-docs.sh
+env:
+  global:
+  - ENCRYPTION_LABEL: "ad385fa3b525"
+  

README.md

@@ -1,50 +1,40 @@
-#  [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url]
+<p align="center">
+    <img alt="clippy the assistant" src="http://i60.tinypic.com/339pvtt.png">
+</p>
 
-> A tool to create Word Documents (.docx) with JS or TS, written in TS.
+<p align="center">
+    Generate .docx files with JS/TS very easily, written in TS.
+</p>
+
+-----
+
+[![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][gemnasium-image]][gemnasium-url] [![Known Vulnerabilities][snky-image]][snky-url] [![Chat on Gitter][gitter-image]][gitter-url]
 
 [![NPM](https://nodei.co/npm/docx.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/docx/)
 
-![Clippy in Microsoft Office](http://i60.tinypic.com/339pvtt.png "Clippy in Microsoft Office")
+# docx
 
-# Table of Contents
+## Install
-- [Install](#)
-- [Usage](#)
-	- [Create simple Word Document](#)
-	- [Create Paragraph](#)
-		- [Styles](#)
-			- [Heading1 - Heading5](#)
-			- [Title](#)
-		- [Text Alignment](#)
-			- [Example](#)
-		- [Thematic Break (Page Break)](#)
-	- [Text](#)
-		- [Typographical Emphasis](#)
-			- [Bold](#)
-			- [Italics](#)
-			- [Underline](#)
-		- [Break](#)
-		- [Chaining](#)
-	- [Bullet Points](#)
-	- [Tab Stops](#)
-		- [Left Tab Stop](#)
-		- [Center Tab Stop](#)
-		- [Right Tab Stop](#)
-		- [Max Right Tab Stop](#)
-		- [Example](#)
-- [Exporting](#)
-	- [Express](#)
-	- [Standalone .docx file](#)
-- [Examples](#)
-- [License](#)
-
-# Install
 
 ```sh
 $ npm install --save docx
 ```
 
+## Demo
 
-# Usage
+```sh
+$ npm run demo
+```
+
+will run the demo selector app in the `demo` folder. It will prompt you to select a demo number, which will run a demo from that folder.
+
+## Guide
+
+Please refer to [the Wiki](https://github.com/dolanmiu/docx/wiki) for details on how to use this library, examples and much more!
+
+Full documentation can be found here: [http://dolanmiu.github.io/docx](http://dolanmiu.github.io/docx)
+
+## Simple Usage
 
 ```js
 // Used to create docx files
@@ -53,330 +43,45 @@ var docx = require('docx');
 // Create document
 var doc = new docx.Document();
 
+// Add some content in the document
+var paragraph = new docx.Paragraph("Some cool text here.");
+// Add more text into the paragraph if you wish
+paragraph.addRun(new docx.TextRun('Lorem Ipsum Foo Bar'));
+doc.addParagraph(paragraph);
+
 // Used to export the file into a .docx file
+var exporter = new docx.LocalPacker(doc);
+
+// Or use the express packer to make the file downloadable.
 // res is express' Response object
 var exporter = new docx.ExpressPacker(doc, res);
-var exporter = new docx.LocalPacker(doc);
+
-```
+exporter.pack('My First Document');
-## Create simple Word Document
+
-```js
+// done! A file called 'My First Document.docx'
-var doc = new docx.Document();
+// will be in your file system if you used LocalPacker
-        
+// Or it will start downloading if you are using Express
-var paragraph = new docx.Paragraph();
-var text = new docx.TextRun('Hello World');
-paragraph.addText(text);
-doc.addParagraph(paragraph);
 ```
 
-### Document properties
+## Examples
-You can add properties to the Word document by specifying options, for example:
+Check [the Wiki](https://github.com/dolanmiu/docx/wiki/Examples) for examples.
-```js
-var doc = new docx.Document({
-    creator: 'Dolan Miu',
-    description: 'My extremely interesting document',
-    title: 'My Document'
-});
-```
 
-#### Full list of options:
+-----
-```
-creator
-description
-title
-subject
-keywords
-lastModifiedBy
-revision
-```
 
-You can mix and match whatever properties you want, or provide no properties.
+Made with 💖
 
-## Create Paragraph
+Huge thanks to [@felipeochoa](https://github.com/felipeochoa) for awesome contributions to this project
-Every text block in OpenXML is organised in paragraphs. You can add more text to the paragraph by doing this:
-```js
-var paragraph = new docx.Paragraph(),
-```
-```js
-var text = new docx.TextRun('Lorem Ipsum Foo Bar');
-var paragraph = new docx.Paragraph();
-paragraph.addText(text);
-```
-```js
-var paragraph = new docx.Paragraph("Short hand notation for adding text.");
-```
-
-After you create the paragraph, you must add the paragraph into the `document`:
-```js
-doc.addParagraph(paragraph);
-```
-
-### Styles
-Styles is a very important part of the look of a word document. At the moment, only headings and title is supported, but son the rest will be supported along with custom styles!
-
-![Word 2013 Styles menu](http://content.gcflearnfree.org/topics/233/style_apply_choose.png "Word 2013 Styles menu")
-
-#### Heading1 - Heading5
-```js
-paragraph.heading1();
-paragraph.heading2();
-paragraph.heading3();
-paragraph.heading4();
-paragraph.heading5();
-```
-
-#### Title
-```js
-paragraph.title();
-```
-
-### Text Alignment
-To change the text alignment of a paragraph, for center, left, right or justified:
-```js
-paragraph.center();
-```
-```js
-paragraph.left();
-```
-```js
-paragraph.right();
-```
-```js
-paragraph.justified();
-```
-
-#### Example
-```js
-paragraph.heading1().center();
-```
-The above will create a `heading 1` which is `centered`.
-
-### Thematic Break
-To add a break in the page, simply add `.thematicBreak()` on a paragraph:
-
-```js
-var paragraph = new docx.Paragraph("Amazing Heading").heading1().thematicBreak();
-```
-The above example will create a heading with a page break directly under it.
-
-### Page Break
-To move to a new page (insert a page break), simply add `.pageBreak()` on a paragraph:
-
-```js
-var paragraph = new docx.Paragraph("Amazing Heading").heading1().pageBreak();
-```
-The above example will create a heading and start a new page immediately afterwards.
-
-## Text
-Paragraphs need `text run` objects. To create text:
-```js
-var text = new docx.TextRun("My awesome text here for my university dissertation");
-paragraph.addText(text);
-```
-Text objects have methods inside which changes the way the text is displayed.
-
-### Typographical Emphasis
-More info [here](https://english.stackexchange.com/questions/97081/what-is-the-typography-term-which-refers-to-the-usage-of-bold-italics-and-unde)
-#### Bold
-```js
-text.bold();
-```
-
-#### Italics
-```js
-text.italic();
-```
-
-#### Underline
-```js
-text.underline();
-```
-
-#### Strike through
-```js
-text.strike();
-```
-
-#### Double strike through
-```js
-text.doubleStrike();
-```
-
-#### Superscript
-```js
-text.superScript();
-```
-
-#### Subscript
-```js
-text.subScript();
-```
-
-#### All Capitals
-```js
-text.allCaps();
-```
-
-#### Small Capitals
-```js
-text.smallCaps();
-```
-
-### Break
-Sometimes you would want to put text underneath another line of text but inside the same paragraph.
-```js
-text.break();
-```
-
-### Chaining
-What if you want to create a paragraph which is ***bold*** and ***italic***?
-```js
-paragraph.bold().italic();
-```
-
-## Bullet Points
-To make a bullet point, simply make a paragraph into a bullet point:
-```js
-var text = new docx.TextRun("Bullet points");
-var paragraph = new docx.Paragraph(text).bullet();
-
-var text2 = new docx.TextRun("Are awesome");
-var paragraph2 = new docx.Paragraph(text2).bullet();
-
-doc.addParagraph(paragraph);
-doc.addParagraph(paragraph2);
-```
-This will produce:
-* Bullet points
-* Are awesome
-
-## Tab Stops
-If you do not know why tab stops are useful, then I recommend you do a bit of research. It enables side by side text which is nicely laid out without the need for tables, or constantly pressing space bar.
-
-**Note**: At the moment, the unit of measurement for a tab stop is counter intuitive for a human. It is using OpenXMLs own measuring system. For example, 2268 roughly translates to 3cm. Therefore in the future, I may consider changing it to percentages or even cm.
-
-![Word 2013 Tabs](http://www.teachucomp.com/wp-content/uploads/blog-4-22-2015-UsingTabStopsInWord-1024x577.png "Word 2013 Tab Stops")
-
-Simply call the relevant methods on the paragraph listed below. Then just add a `tab()` method call to a text object. Adding multiple `tabStops` will mean you would have to chain `tab()` until the desired `tabStop` is selected. Example is shown below.
-
-### Left Tab Stop
-```js
-paragraph.leftTabStop(2268);
-```
-2268 is the distance from the left side.
-
-### Center Tab Stop
-```js
-paragraph.centerTabStp(2268);
-```
-2268 is the distance from the left side.
-
-### Right Tab Stop
-```js
-paragraph.rightTabStop(2268);
-```
-2268 is the distance from the left side.
-
-### Max Right Tab Stop
-```js
-paragraph.maxRightTabStop();
-```
-This will create a tab stop on the very edge of the right hand side. Handy for right aligning and left aligning text on the same line.
-
-### Example
-```js
-var paragraph = new docx.Paragraph().maxRightTabStop();
-var leftText = new docx.TextRun("Hey everyone").bold();
-var rightText = new docx.TextRun("11th November 2015").tab();
-paragraph.addText(leftText);
-paragraph.addText(rightText);
-```
-The example above will create a left aligned text, and a right aligned text on the same line. The laymans approach to this problem would be to either use text boxes or tables. YUK!
-
-```js
-var paragraph = new docx.Paragraph();
-paragraph.maxRightTabStop();
-paragraph.leftTabStop(1000);
-var text = new docx.TextRun("Second tab stop here I come!").tab().tab();
-paragraph.addText(text);
-```
-The above shows the use of two tab stops, and how to select/use it.
-
-# Exporting
-I used the express exporter in my [website](http://www.dolan.bio). It's very useful, and is the preferred way if you want to make a downloadable file for a visitor. it is much better than generating a physical file on the server, and then passing a download link to that file.
-## Express
-Simply use the exporter, and pass in the necessary parameters:
-```js
-var docx = require('docx');
-
-var doc = new docx.Document();
-var exporter = new docx.ExpressPacker(doc, res);
-exporter.pack('My Document');
-```
-where `res` is the response object obtained through the Express router. It is that simple. The file will begin downloading in the browser.
-
-## Standalone .docx file
-```js
-var docx = require('docx');
-
-var doc = new docx.Document();
-var exporter = new docx.LocalPacker(doc);
-exporter.pack('My Document');
-```
-
-# Examples
-## In practice
-I used this library in my personal portfolio/CV website. Click generate CV for a demonstration. [http://www.dolan.bio](http://www.dolan.bio)
-
-## General
-#### Simple paragraph
-```js
-var doc = new docx.Document();
-
-var paragraph = new docx.Paragraph("Hello World");
-var institutionText = new docx.TextRun("University College London").bold(),
-var dateText = new docx.TextRun("5th Dec 2015").tab().bold();
-paragraph.addText(institutionText);
-paragraph.addText(dateText);
-
-doc.addParagraph(paragraph);
-var exporter = new docx.LocalPacker(doc);
-exporter.pack('My Document');
-```
-
-Or:
-```js
-var doc = new docx.Document();
-
-var paragraph = new docx.Paragraph("Hello World");
-var institutionText = new docx.TextRun("University College London").bold(),
-var dateText = new docx.TextRun("5th Dec 2015").tab().bold();
-paragraph.addText(institutionText);
-paragraph.addText(dateText);
-
-var exporter = new docx.ExpressPacker(doc, res);
-exporter.pack('My Document');
-```
-Would produce:
-
-***University College London***
-
-***5th Dec 2015***
-
-Made with 💖 by Dolan Miu 🍆 💦 😝
-
-# License
-
-MIT © [Dolan Miu](http://www.dolan.bio)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 [npm-image]: https://badge.fury.io/js/docx.svg
 [npm-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
-[daviddm-url]: https://david-dm.org/dolanmiu/docx
+[daviddm-url]: https://david-dm.org/dolanmiu/docx
+[snky-image]: https://snyk.io/test/github/dolanmiu/docx/badge.svg
+[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
+

demo/demo1.js

@@ -0,0 +1,22 @@
+const docx = require('../build');
+
+var doc = new docx.Document();
+
+var paragraph = new docx.Paragraph("Hello World");
+var institutionText = new docx.TextRun("University College London").bold();
+var dateText = new docx.TextRun("5th Dec 2015").tab().bold();
+paragraph.addRun(institutionText);
+paragraph.addRun(dateText);
+
+doc.addParagraph(paragraph);
+
+// Feature coming soon
+// var media = new docx.Media();
+// media.addMedia("happy-penguins", "./demo/penguins.jpg");
+// var pictureRun = new docx.PictureRun(media.getMedia("happy-penguins"));
+
+// var exporter = new docx.LocalPacker(doc);
+var exporter = new docx.LocalPacker(doc);
+exporter.pack('My Document');
+
+console.log('Document created succesfully at project root!');

demo/demo2.js

@@ -0,0 +1,74 @@
+const docx = require('../build');
+
+const styles = new docx.Styles();
+styles.createParagraphStyle('Heading1', 'Heading 1')
+    .basedOn("Normal")
+    .next("Normal")
+    .quickFormat()
+    .size(28)
+    .bold()
+    .italics()
+    .spacing({after: 120});
+
+styles.createParagraphStyle('Heading2', 'Heading 2')
+    .basedOn("Normal")
+    .next("Normal")
+    .quickFormat()
+    .size(26)
+    .bold()
+    .underline('double', 'FF0000')
+    .spacing({before: 240, after: 120});
+
+styles.createParagraphStyle('aside', 'Aside')
+    .basedOn('Normal')
+    .next('Normal')
+    .color('999999')
+    .italics()
+    .indent(720)
+    .spacing({line: 276});
+
+styles.createParagraphStyle('wellSpaced', 'Well Spaced')
+    .basedOn('Normal')
+    .spacing({line: 276, before: 20 * 72 * .1, after: 20 * 72 * .05});
+
+styles.createParagraphStyle('ListParagraph', 'List Paragraph')
+    .quickFormat()
+    .basedOn('Normal');
+
+
+const numbering = new docx.Numbering();
+const numberedAbstract = numbering.createAbstractNumbering();
+numberedAbstract.createLevel(0, "lowerLetter", "%1)", "left");
+
+const doc = new docx.Document({
+    creator: 'Clippy',
+    title: 'Sample Document',
+    description: 'A brief example of using docx',
+});
+
+doc.createParagraph('Test heading1, bold and italicized').heading1();
+doc.createParagraph('Some simple content');
+doc.createParagraph('Test heading2 with double red underline').heading2();
+
+const letterNumbering = numbering.createConcreteNumbering(numberedAbstract);
+const letterNumbering5 = numbering.createConcreteNumbering(numberedAbstract);
+letterNumbering5.overrideLevel(0, 5);
+
+doc.createParagraph('Option1').setNumbering(letterNumbering, 0);
+doc.createParagraph('Option5 -- override 2 to 5').setNumbering(letterNumbering5, 0);
+doc.createParagraph('Option3').setNumbering(letterNumbering, 0);
+
+doc.createParagraph()
+    .createTextRun('Some monospaced content')
+    .font('Monospace');
+
+doc.createParagraph('An aside, in light gray italics and indented').style('aside');
+doc.createParagraph('This is normal, but well-spaced text').style('wellSpaced');
+const para = doc.createParagraph();
+para.createTextRun('This is a bold run,').bold();
+para.createTextRun(' switching to normal ');
+para.createTextRun('and then underlined ').underline();
+para.createTextRun('and back to normal.');
+
+const exporter = new docx.LocalPacker(doc, styles, undefined, numbering);
+exporter.pack('test.docx');

demo/index.js

@@ -0,0 +1,29 @@
+var prompt = require('prompt');
+var shelljs = require('shelljs');
+var fs = require('fs');
+
+console.log('What demo do you wish to run? (Enter a number)');
+
+var schema = {
+    properties: {
+        number: {
+            pattern: /^[0-9]+$/,
+            message: 'Please enter a number.',
+            required: true
+        }
+    }
+};
+
+prompt.start();
+
+prompt.get(schema, function (err, result) {
+    var demoNumber = result.number;
+    var filePath = `./demo/demo${demoNumber}.js`;
+
+    if (!fs.existsSync(filePath)) {
+        console.error(`demo${demoNumber} does not exist: ${filePath}`);
+        return;
+    }
+    console.log(`Running demo ${demoNumber}`);
+    shelljs.exec(`node ${filePath}`);
+});

deploy-docs.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+set -e # Exit with nonzero exit code if anything fails
+
+SOURCE_BRANCH="master"
+TARGET_BRANCH="gh-pages"
+
+function doCompile {
+  npm run typedoc
+}
+
+# Pull requests and commits to other branches shouldn't try to deploy, just build to verify
+if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
+    echo "Skipping deploy; just doing a build."
+    doCompile
+    exit 0
+fi
+
+# Save some useful information
+REPO=`git config remote.origin.url`
+SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
+SHA=`git rev-parse --verify HEAD`
+
+# Clone the existing gh-pages for this repo into docs/
+# Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deply)
+git clone $REPO docs
+cd docs
+git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH
+cd ..
+
+# Clean out existing contents
+# echo "Cleaning out existing contents."
+# rm -rf docs/*
+
+# Run our compile script
+doCompile
+
+# Now let's go have some fun with the cloned repo
+cd docs
+git config user.name "Travis CI"
+git config user.email "dolan_miu@hotmail.com"
+ls
+
+# add .nojekyll file
+touch .nojekyll
+
+# If there are no changes to the compiled out (e.g. this is a README update) then just bail.
+if [ -z `git diff --exit-code` ]; then
+    echo "No changes to the output on this push; exiting."
+    exit 0
+fi
+
+# Commit the "changes", i.e. the new version.
+# The delta will show diffs between new and old versions.
+git add .
+git commit -m "Deploy to GitHub Pages: ${SHA}"
+
+# Get the deploy key by using Travis's stored variables to decrypt deploy-key.enc
+ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
+ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
+ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
+ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
+openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy-key.enc -out deploy-key -d
+chmod 600 deploy-key
+eval `ssh-agent -s`
+ssh-add deploy-key
+
+# Now that we're all set up, we can push.
+git push $SSH_REPO $TARGET_BRANCH

package.json

@@ -1,32 +1,44 @@
 {
   "name": "docx",
-  "version": "1.0.1",
+  "version": "2.1.0",
   "description": "Generate .docx documents with JavaScript (formerly Office-Clippy)",
   "main": "build/index.js",
   "scripts": {
     "pretest": "rimraf ./build-tests && tsc -p ts/test-tsconfig.json",
     "test": "mocha ./build-tests --recursive",
-    "prepublish": "tsc -p ts"
+    "prepublishOnly": "npm run build",
+    "lint": "tslint --project ./ts",
+    "build": "rimraf ./build && tsc -p ts",
+    "demo": "npm run build && node ./demo",
+    "typedoc": "typedoc --out docs/ ts/ --module commonjs --target ES6 --disableOutputCheck"
   },
+  "files": [
+    "ts",
+    "build",
+    "template"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dolanmiu/docx.git"
   },
   "keywords": [
     "office",
+    "word",
     "generate",
+    "creator",
+    "create",
     "document",
-    "doc"
+    "doc",
+    "officegen",
+    "clippy"
   ],
+  "types": "./build/index.d.ts",
   "dependencies": {
-    "app-root-path": "^2.0.1",
+    "@types/archiver": "^1.3.2",
+    "@types/express": "^4.0.35",
     "archiver": "^1.3.0",
-    "lodash": "^4.6.1",
     "xml": "^1.0.1"
   },
-  "typescript": {
-    "definition": "ts/typings/index.d.ts"
-  },
   "author": "Dolan Miu",
   "license": "MIT",
   "bugs": {
@@ -34,9 +46,15 @@
   },
   "homepage": "https://github.com/dolanmiu/docx#readme",
   "devDependencies": {
+    "@types/chai": "^3.4.35",
+    "@types/mocha": "^2.2.39",
     "chai": "^3.5.0",
     "mocha": "^3.2.0",
+    "prompt": "^1.0.0",
     "rimraf": "^2.5.2",
+    "shelljs": "^0.7.7",
+    "tslint": "^5.1.0",
+    "typedoc": "^0.5.10",
     "typescript": "^2.2.1"
   }
 }

ts/docx/document/body/columns.ts

@@ -1,11 +1,11 @@
-import {XmlComponent, Attributes} from "../../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export class Columns extends XmlComponent {
 
     constructor() {
         super("w:cols");
         this.root.push(new Attributes({
-            space: "708"
+            space: "708",
         }));
     }
-}
+}

ts/docx/document/body/doc-grid.ts

@@ -1,11 +1,11 @@
-import {XmlComponent, Attributes} from "../../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export class DocumentGrid extends XmlComponent {
 
     constructor() {
         super("w:docGrid");
         this.root.push(new Attributes({
-            linePitch: "360"
+            linePitch: "360",
         }));
     }
-}
+}

ts/docx/document/body/index.ts

@@ -1,15 +1,12 @@
-import {XmlComponent, Attributes} from "../../xml-components";
+import { XmlComponent } from "../../xml-components";
-import {SectionProperties} from "./section-properties";
 
 export class Body extends XmlComponent {
 
     constructor() {
         super("w:body");
-        // this.root.push(new SectionProperties()); not actually needed
     }
 
-    push(component: XmlComponent) {
+    public push(component: XmlComponent): void {
-        // this.root.splice(this.body.length - 1, 0, component);
         this.root.push(component);
     }
 }

ts/docx/document/body/page-margin.ts

@@ -1,4 +1,4 @@
-import {XmlComponent, Attributes} from "../../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export class PageMargin extends XmlComponent {
 
@@ -11,7 +11,7 @@ export class PageMargin extends XmlComponent {
             left: "1440",
             header: "708",
             footer: "708",
-            gutter: "0"
+            gutter: "0",
         }));
     }
-}
+}

ts/docx/document/body/page-size.ts

@@ -1,4 +1,4 @@
-import {XmlComponent, Attributes} from "../../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export class PageSize extends XmlComponent {
 
@@ -6,7 +6,7 @@ export class PageSize extends XmlComponent {
         super("w:pgSz");
         this.root.push(new Attributes({
             w: "11906",
-            h: "16838"
+            h: "16838",
         }));
     }
-}
+}

ts/docx/document/body/section-properties.ts

@@ -1,8 +1,8 @@
-import {XmlComponent, Attributes} from "../../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
-import {PageSize} from "./page-size";
+import { Columns } from "./columns";
-import {PageMargin} from "./page-margin";
+import { DocumentGrid } from "./doc-grid";
-import {Columns} from "./columns";
+import { PageMargin } from "./page-margin";
-import {DocumentGrid} from "./doc-grid";
+import { PageSize } from "./page-size";
 
 export class SectionProperties extends XmlComponent {
 
@@ -11,11 +11,11 @@ export class SectionProperties extends XmlComponent {
         this.root.push(new Attributes({
             rsidR: "00B64E8F",
             rsidRPr: "00D842E4",
-            rsidSect: "000A6AD0"
+            rsidSect: "000A6AD0",
         }));
         this.root.push(new PageSize());
         this.root.push(new PageMargin());
         this.root.push(new Columns());
         this.root.push(new DocumentGrid());
     }
-}
+}

ts/docx/document/document-attributes.ts

@@ -1,6 +1,6 @@
-import {XmlAttributeComponent} from "../xml-components";
+import { XmlAttributeComponent } from "../xml-components";
 
-interface DocumentAttributesProperties {
+export interface IDocumentAttributesProperties {
     wpc?: string;
     mc?: string;
     o?: string;
@@ -26,39 +26,30 @@ interface DocumentAttributesProperties {
     type?: string;
 }
 
-export class DocumentAttributes extends XmlAttributeComponent {
+export class DocumentAttributes extends XmlAttributeComponent<IDocumentAttributesProperties> {
-
+    protected xmlKeys = {
-    constructor(properties?: DocumentAttributesProperties) {
+        wpc: "xmlns:wpc",
-        super({
+        mc: "xmlns:mc",
-            wpc: "xmlns:wpc",
+        o: "xmlns:o",
-            mc: "xmlns:mc",
+        r: "xmlns:r",
-            o: "xmlns:o",
+        m: "xmlns:m",
-            r: "xmlns:r",
+        v: "xmlns:v",
-            m: "xmlns:m",
+        wp14: "xmlns:wp14",
-            v: "xmlns:v",
+        wp: "xmlns:wp",
-            wp14: "xmlns:wp14",
+        w10: "xmlns:w10",
-            wp: "xmlns:wp",
+        w: "xmlns:w",
-            w10: "xmlns:w10",
+        w14: "xmlns:w14",
-            w: "xmlns:w",
+        w15: "xmlns:w15",
-            w14: "xmlns:w14",
+        wpg: "xmlns:wpg",
-            w15: "xmlns:w15",
+        wpi: "xmlns:wpi",
-            wpg: "xmlns:wpg",
+        wne: "xmlns:wne",
-            wpi: "xmlns:wpi",
+        wps: "xmlns:wps",
-            wne: "xmlns:wne",
+        Ignorable: "mc:Ignorable",
-            wps: "xmlns:wps",
+        cp: "xmlns:cp",
-            Ignorable: "mc:Ignorable",
+        dc: "xmlns:dc",
-            cp: "xmlns:cp",
+        dcterms: "xmlns:dcterms",
-            dc: "xmlns:dc",
+        dcmitype: "xmlns:dcmitype",
-            dcterms: "xmlns:dcterms",
+        xsi: "xmlns:xsi",
-            dcmitype: "xmlns:dcmitype",
+        type: "xsi:type",
-            xsi: "xmlns:xsi",
+    };
-            type: "xsi:type"
+}
-        }, properties);
-
-        this.root = properties;
-
-        if (!properties) {
-            this.root = {};
-        }
-    }
-}

ts/docx/document/index.ts

@@ -1,7 +1,8 @@
-import {XmlComponent} from "../xml-components";
+import { Paragraph } from "../paragraph";
-import {DocumentAttributes} from "./document-attributes";
+import { Table } from "../table";
-import {Body} from "./body";
+import { XmlComponent } from "../xml-components";
-import {Paragraph} from "../paragraph";
+import { Body } from "./body";
+import { DocumentAttributes } from "./document-attributes";
 
 export class Document extends XmlComponent {
     private body: Body;
@@ -25,18 +26,30 @@ export class Document extends XmlComponent {
             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"
+            Ignorable: "w14 w15 wp14",
         }));
         this.body = new Body();
         this.root.push(this.body);
     }
 
-    addParagraph(paragraph: Paragraph): void {
+    public addParagraph(paragraph: Paragraph): void {
         this.body.push(paragraph);
     }
 
-    clearVariables(): void {
+    public createParagraph(text?: string): Paragraph {
-        this.body.clearVariables();
+        const para = new Paragraph(text);
-        delete this.body;
+        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,4 +1,7 @@
-export {Document} from "./document";
+export { Document } from "./document";
-export {Paragraph} from "./paragraph";
+export { Paragraph } from "./paragraph";
-export {Run} from "./run"
+export { Run } from "./run";
-export {TextRun} from "./run/text-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/alignment.ts

@@ -0,0 +1,15 @@
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+
+export type AlignmentOptions = "left" | "center" | "right" | "both";
+
+export class AlignmentAttributes extends XmlAttributeComponent<{val: AlignmentOptions}> {
+    protected xmlKeys = {val: "w:val"};
+}
+
+export class Alignment extends XmlComponent {
+
+    constructor(type: AlignmentOptions) {
+        super("w:jc");
+        this.root.push(new AlignmentAttributes({val: type}));
+    }
+}

ts/docx/paragraph/border.ts

@@ -1,4 +1,4 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Attributes, XmlComponent } from "../xml-components";
 
 class Border extends XmlComponent {
 
@@ -8,7 +8,7 @@ class Border extends XmlComponent {
             color: "auto",
             space: "1",
             val: "single",
-            sz: "6"
+            sz: "6",
         }));
     }
 }
@@ -19,4 +19,4 @@ export class ThematicBreak extends XmlComponent {
         super("w:pBdr");
         this.root.push(new Border());
     }
-}
+}

ts/docx/paragraph/formatting.ts

@@ -0,0 +1,10 @@
+export { Alignment } from "./alignment";
+export { ThematicBreak } from "./border";
+export { Indent } from "./indent";
+export { KeepLines, KeepNext } from "./keep";
+export { PageBreak } from "./page-break";
+export { ParagraphProperties } from "./properties";
+export { ISpacingProperties, Spacing } from "./spacing";
+export { Style } from "./style";
+export { LeftTabStop, MaxRightTabStop } from "./tab-stop";
+export { NumberProperties } from "./unordered-list";

ts/docx/paragraph/indent.ts

@@ -0,0 +1,24 @@
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+
+interface IIndentAttributesProperties {
+    left?: number;
+    hanging?: number;
+}
+
+class IndentAttributes extends XmlAttributeComponent<IIndentAttributesProperties> {
+    protected xmlKeys = {
+        left: "w:left",
+        hanging: "w:hanging",
+    };
+}
+
+export class Indent extends XmlComponent {
+
+    constructor(left: number, hanging?: number) {
+        super("w:ind");
+        this.root.push(new IndentAttributes({
+            left: left,
+            hanging: hanging,
+        }));
+    }
+}

ts/docx/paragraph/index.ts

@@ -1,21 +1,20 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { IData } from "../../media/data";
-import {ThematicBreak} from "./border";
+import { Num } from "../../numbering/num";
-import {PageBreak} from "./page-break";
+import { Run } from "../run";
-import {TextRun} from "../run/text-run";
+import { PictureRun } from "../run/picture-run";
-import {ParagraphProperties} from "./properties";
+import { TextRun } from "../run/text-run";
-import {MaxRightTabStop, LeftTabStop} from "./tab-stop";
+import { XmlComponent } from "../xml-components";
-import {Style} from "./style";
-import {NumberProperties} from "./unordered-list";
 
-class Alignment extends XmlComponent {
+import { Alignment } from "./alignment";
-
+import { ThematicBreak } from "./border";
-    constructor(type: string) {
+import { Indent } from "./indent";
-        super("w:jc");
+import { KeepLines, KeepNext } from "./keep";
-        this.root.push(new Attributes({
+import { PageBreak } from "./page-break";
-            val: type
+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 class Paragraph extends XmlComponent {
     private properties: ParagraphProperties;
@@ -29,84 +28,127 @@ export class Paragraph extends XmlComponent {
         }
     }
 
-    addText(run: TextRun): Paragraph {
+    public addRun(run: Run): Paragraph {
         this.root.push(run);
         return this;
     }
 
-    heading1(): Paragraph {
+    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;
     }
 
-    heading2(): Paragraph {
+    public heading2(): Paragraph {
         this.properties.push(new Style("Heading2"));
         return this;
     }
 
-    heading3(): Paragraph {
+    public heading3(): Paragraph {
         this.properties.push(new Style("Heading3"));
         return this;
     }
 
-    heading4(): Paragraph {
+    public heading4(): Paragraph {
         this.properties.push(new Style("Heading4"));
         return this;
     }
 
-    heading5(): Paragraph {
+    public heading5(): Paragraph {
         this.properties.push(new Style("Heading5"));
         return this;
     }
 
-    title(): Paragraph {
+    public title(): Paragraph {
         this.properties.push(new Style("Title"));
         return this;
     }
 
-    center(): Paragraph {
+    public center(): Paragraph {
         this.properties.push(new Alignment("center"));
         return this;
     }
 
-    left(): Paragraph {
+    public left(): Paragraph {
         this.properties.push(new Alignment("left"));
         return this;
     }
 
-    right(): Paragraph {
+    public right(): Paragraph {
         this.properties.push(new Alignment("right"));
         return this;
     }
 
-    justified(): Paragraph {
+    public justified(): Paragraph {
         this.properties.push(new Alignment("both"));
         return this;
     }
 
-    thematicBreak(): Paragraph {
+    public thematicBreak(): Paragraph {
         this.properties.push(new ThematicBreak());
         return this;
     }
 
-    pageBreak(): Paragraph {
+    public pageBreak(): Paragraph {
         this.properties.push(new PageBreak());
         return this;
     }
 
-    maxRightTabStop(): Paragraph {
+    public maxRightTabStop(): Paragraph {
         this.properties.push(new MaxRightTabStop());
         return this;
     }
 
-    leftTabStop(position: number): Paragraph {
+    public leftTabStop(position: number): Paragraph {
         this.properties.push(new LeftTabStop(position));
         return this;
     }
 
-    bullet(): Paragraph {
+    public bullet(): Paragraph {
         this.properties.push(new Style("ListParagraph"));
-        this.properties.push(new NumberProperties());
+        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(start: number, hanging?: number): Paragraph {
+        this.properties.push(new Indent(start, hanging));
+        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/keep.ts

@@ -0,0 +1,13 @@
+import { XmlComponent } from "../xml-components";
+
+export class KeepLines extends XmlComponent {
+    constructor() {
+        super("w:keepLines");
+    }
+}
+
+export class KeepNext extends XmlComponent {
+    constructor() {
+        super("w:keepNext");
+    }
+}

ts/docx/paragraph/page-break.ts

@@ -1,12 +1,12 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Run } from "../run";
-import {Run} from "../run";
+import { Attributes, XmlComponent } from "../xml-components";
 
 class Break extends XmlComponent {
 
     constructor() {
         super("w:br");
         this.root.push(new Attributes({
-            type: "page"
+            type: "page",
         }));
     }
 }
@@ -17,4 +17,4 @@ export class PageBreak extends Run {
         super();
         this.root.push(new Break());
     }
-}
+}

ts/docx/paragraph/properties.ts

@@ -1,13 +1,12 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { XmlComponent } from "../xml-components";
 
 export class ParagraphProperties extends XmlComponent {
 
     constructor() {
         super("w:pPr");
-        this.root.push(new Attributes());
     }
 
-    push(item: XmlComponent): void {
+    public push(item: XmlComponent): void {
         this.root.push(item);
     }
-}
+}

ts/docx/paragraph/spacing.ts

@@ -0,0 +1,22 @@
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+
+export interface ISpacingProperties {
+    after?: number;
+    before?: number;
+    line?: number;
+}
+
+class SpacingAttributes extends XmlAttributeComponent<ISpacingProperties> {
+    protected xmlKeys = {
+        after: "w:after",
+        before: "w:before",
+        line: "w:line",
+    };
+}
+
+export class Spacing extends XmlComponent {
+    constructor(opts: ISpacingProperties) {
+        super("w:spacing");
+        this.root.push(new SpacingAttributes(opts));
+    }
+}

ts/docx/paragraph/style.ts

@@ -1,11 +1,11 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Attributes, XmlComponent } from "../xml-components";
 
 export class Style extends XmlComponent {
 
     constructor(type: string) {
         super("w:pStyle");
         this.root.push(new Attributes({
-            val: type
+            val: type,
         }));
     }
-}
+}

ts/docx/paragraph/tab-stop.ts

@@ -1,6 +1,6 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
 
-class TabStop extends XmlComponent {
+export class TabStop extends XmlComponent {
 
     constructor(tab: Tab) {
         super("w:tabs");
@@ -8,13 +8,19 @@ class TabStop extends XmlComponent {
     }
 }
 
-class Tab extends XmlComponent {
+export type TabOptions = "left" | "right";
 
-    constructor(value: string, position: any) {
+export class TabAttributes extends XmlAttributeComponent<{val: TabOptions, pos: string | number}> {
+    protected xmlKeys = {val: "w:val", pos: "w:pos"};
+}
+
+export class Tab extends XmlComponent {
+
+    constructor(value: TabOptions, position: string | number) {
         super("w:tab");
-        this.root.push(new Attributes({
+        this.root.push(new TabAttributes({
             val: value,
-            pos: position
+            pos: position,
         }));
     }
 }

ts/docx/paragraph/unordered-list.ts

@@ -1,12 +1,11 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Attributes, XmlComponent } from "../xml-components";
-import {Style} from "./style";
 
 export class NumberProperties extends XmlComponent {
 
-    constructor() {
+    constructor(numberId: number, indentLevel: number) {
         super("w:numPr");
-        this.root.push(new IndentLevel(0));
+        this.root.push(new IndentLevel(indentLevel));
-        this.root.push(new NumberId(1));
+        this.root.push(new NumberId(numberId));
     }
 }
 
@@ -15,7 +14,7 @@ class IndentLevel extends XmlComponent {
     constructor(level: number) {
         super("w:ilvl");
         this.root.push(new Attributes({
-            val: level
+            val: level,
         }));
     }
 }
@@ -24,7 +23,7 @@ class NumberId extends XmlComponent {
     constructor(id: number) {
         super("w:numId");
         this.root.push(new Attributes({
-            val: id
+            val: id,
         }));
     }
-}
+}

ts/docx/run/break.ts

@@ -1,8 +1,8 @@
-import {XmlComponent} from "../xml-components";
+import { XmlComponent } from "../xml-components";
 
 export class Break extends XmlComponent {
 
     constructor() {
         super("w:br");
     }
-}
+}

ts/docx/run/caps.ts

@@ -1,4 +1,4 @@
-import {XmlComponent} from "../xml-components";
+import { XmlComponent } from "../xml-components";
 
 export class SmallCaps extends XmlComponent {
 

ts/docx/run/formatting.ts

@@ -1,11 +1,14 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Attributes, XmlComponent } from "../xml-components";
+export { Underline } from "./underline";
+export { SubScript, SuperScript } from "./script";
+export { RunFonts } from "./run-fonts";
 
 export class Bold extends XmlComponent {
 
     constructor() {
         super("w:b");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -15,7 +18,7 @@ export class Italics extends XmlComponent {
     constructor() {
         super("w:i");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -25,7 +28,7 @@ export class Caps extends XmlComponent {
     constructor() {
         super("w:caps");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -35,7 +38,7 @@ export class Color extends XmlComponent {
     constructor(color: string) {
         super("w:color");
         this.root.push(new Attributes({
-            val: color
+            val: color,
         }));
     }
 }
@@ -45,7 +48,7 @@ export class DoubleStrike extends XmlComponent {
     constructor() {
         super("w:dstrike");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -55,7 +58,7 @@ export class Emboss extends XmlComponent {
     constructor() {
         super("w:emboss");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -65,7 +68,7 @@ export class Imprint extends XmlComponent {
     constructor() {
         super("w:imprint");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -75,7 +78,7 @@ export class Shadow extends XmlComponent {
     constructor() {
         super("w:shadow");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -85,7 +88,7 @@ export class SmallCaps extends XmlComponent {
     constructor() {
         super("w:smallCaps");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -95,7 +98,7 @@ export class Strike extends XmlComponent {
     constructor() {
         super("w:strike");
         this.root.push(new Attributes({
-            val: true
+            val: true,
         }));
     }
 }
@@ -105,7 +108,7 @@ export class Size extends XmlComponent {
     constructor(size: number) {
         super("w:sz");
         this.root.push(new Attributes({
-            val: size
+            val: size,
         }));
     }
-}
+}

ts/docx/run/index.ts

@@ -1,75 +1,96 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Break } from "./break";
-import {RunProperties} from "./properties";
+import { Caps, SmallCaps } from "./caps";
-import {Bold, Italics} from "./formatting";
+import { Bold, Color, DoubleStrike, Italics, Size, Strike } from "./formatting";
-import {Tab} from "./tab";
+import { RunProperties } from "./properties";
-import {Break} from "./break";
+import { RunFonts } from "./run-fonts";
-import {SmallCaps, Caps} from "./caps";
+import { SubScript, SuperScript } from "./script";
-import {Strike, DoubleStrike} from "./strike";
+import { Style } from "./style";
-import {SubScript, SuperScript} from "./script";
+import { Tab } from "./tab";
-import {Underline} from "./underline"
+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);
     }
 
-    bold(): Run {
+    public bold(): Run {
         this.properties.push(new Bold());
         return this;
     }
 
-    italic(): Run {
+    public italic(): Run {
         this.properties.push(new Italics());
         return this;
     }
 
-    underline(): Run {
+    public underline(underlineType?: string, color?: string): Run {
-        this.properties.push(new Underline());
+        this.properties.push(new Underline(underlineType, color));
         return this;
     }
 
-    break(): Run {
+    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;
     }
 
-    tab(): Run {
+    public tab(): Run {
         this.root.splice(1, 0, new Tab());
         return this;
     }
 
-    smallCaps(): Run {
+    public smallCaps(): Run {
         this.properties.push(new SmallCaps());
         return this;
     }
 
-    allCaps(): Run {
+    public allCaps(): Run {
         this.properties.push(new Caps());
         return this;
     }
 
-    strike(): Run {
+    public strike(): Run {
         this.properties.push(new Strike());
         return this;
     }
 
-    doubleStrike(): Run {
+    public doubleStrike(): Run {
         this.properties.push(new DoubleStrike());
         return this;
     }
 
-    subScript(): Run {
+    public subScript(): Run {
         this.properties.push(new SubScript());
         return this;
     }
 
-    superScript(): Run {
+    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/picture-run.ts

@@ -0,0 +1,16 @@
+import { IData } from "../../media/data";
+import { Run } from "../run";
+import { Drawing } from "./run-components/drawing";
+
+export class PictureRun extends Run {
+
+    constructor(imageData: IData) {
+        super();
+
+        if (imageData === undefined) {
+            throw new Error("imageData cannot be undefined");
+        }
+
+        this.root.push(new Drawing(imageData));
+    }
+}

ts/docx/run/properties.ts

@@ -1,4 +1,4 @@
-import {XmlComponent} from "../xml-components";
+import { XmlComponent } from "../xml-components";
 
 export class RunProperties extends XmlComponent {
 
@@ -6,7 +6,7 @@ export class RunProperties extends XmlComponent {
         super("w:rPr");
     }
 
-    push(item: XmlComponent): void {
+    public push(item: XmlComponent): void {
         this.root.push(item);
     }
 }

ts/docx/run/run-components/drawing/index.ts

@@ -0,0 +1,16 @@
+import { IData } from "../../../../media/data";
+import { XmlComponent } from "../../../xml-components";
+import { Inline } from "./inline";
+
+export class Drawing extends XmlComponent {
+
+    constructor(imageData: IData) {
+        super("w:drawing");
+
+        if (imageData === undefined) {
+            throw new Error("imageData cannot be undefined");
+        }
+
+        this.root.push(new Inline(imageData.referenceId));
+    }
+}

ts/docx/run/run-components/drawing/inline/graphic/graphic-data/index.ts

@@ -0,0 +1,10 @@
+import { XmlComponent } from "../../../../../../xml-components";
+import { Pic } from "./pic";
+
+export class GraphicData extends XmlComponent {
+
+    constructor(referenceId: number) {
+        super("a:graphicData");
+        this.root.push(new Pic(referenceId));
+    }
+}

ts/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts

@@ -0,0 +1,14 @@
+import { XmlComponent } from "../../../../../../../../xml-components";
+import { Blip } from "./blip";
+import { SourceRectangle } from "./source-rectangle";
+import { Stretch } from "./stretch";
+
+export class BlipFill extends XmlComponent {
+
+    constructor(referenceId: number) {
+        super("pic:blipFill");
+        this.root.push(new Blip(referenceId));
+        this.root.push(new SourceRectangle());
+        this.root.push(new Stretch());
+    }
+}

ts/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/blip.ts

@@ -0,0 +1,21 @@
+import { XmlAttributeComponent, XmlComponent } from "../../../../../../../../xml-components";
+
+interface IBlipProperties {
+    embed: string;
+}
+
+class BlipAttributes extends XmlAttributeComponent<IBlipProperties> {
+    protected xmlKeys = {
+        embed: "r:embed",
+    };
+}
+
+export class Blip extends XmlComponent {
+
+    constructor(referenceId: number) {
+        super("a:blip");
+        this.root.push(new BlipAttributes({
+            embed: `rId${referenceId}`,
+        }));
+    }
+}

ts/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts

@@ -0,0 +1,8 @@
+import { XmlComponent } from "../../../../../../../../xml-components";
+
+export class SourceRectangle extends XmlComponent {
+
+    constructor() {
+        super("a:srcRect");
+    }
+}

ts/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts

@@ -0,0 +1,16 @@
+import { XmlComponent } from "../../../../../../../../xml-components";
+
+class FillRectangle extends XmlComponent {
+
+    constructor() {
+        super("a:fillRect");
+    }
+}
+
+export class Stretch extends XmlComponent {
+
+    constructor() {
+        super("a:stretch");
+        this.root.push(new FillRectangle());
+    }
+}

ts/docx/run/run-components/drawing/inline/graphic/graphic-data/pic/index.ts

@@ -0,0 +1,10 @@
+import { XmlComponent } from "../../../../../../../xml-components";
+import { BlipFill } from "./blip/blip-fill";
+
+export class Pic extends XmlComponent {
+
+    constructor(referenceId: number) {
+        super("pic:pic");
+        this.root.push(new BlipFill(referenceId));
+    }
+}

ts/docx/run/run-components/drawing/inline/graphic/index.ts

@@ -0,0 +1,23 @@
+import { XmlAttributeComponent, XmlComponent } from "../../../../../xml-components";
+import { GraphicData } from "./graphic-data";
+
+interface IGraphicProperties {
+    a: string;
+}
+
+class GraphicAttributes extends XmlAttributeComponent<IGraphicProperties> {
+    protected xmlKeys = {
+        a: "xmlns:a",
+    };
+}
+
+export class Graphic extends XmlComponent {
+
+    constructor(referenceId: number) {
+        super("a:graphic");
+        this.root.push(new GraphicAttributes({
+            a: "http://schemas.openxmlformats.org/drawingml/2006/main",
+        }));
+        this.root.push(new GraphicData(referenceId));
+    }
+}

ts/docx/run/run-components/drawing/inline/index.ts

@@ -0,0 +1,10 @@
+import { XmlComponent } from "../../../../xml-components";
+import { Graphic } from "./graphic";
+
+export class Inline extends XmlComponent {
+
+    constructor(referenceId: number) {
+        super("wp:inline");
+        this.root.push(new Graphic(referenceId));
+    }
+}

ts/docx/run/run-components/text.ts

@@ -0,0 +1,15 @@
+import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+
+class TextAttributes extends XmlAttributeComponent<{space: "default" | "preserve"}> {
+    protected xmlKeys = {space: "xml:space"};
+}
+
+export class Text extends XmlComponent {
+    constructor(text: string) {
+        super("w:t");
+        this.root.push(new TextAttributes({space: "preserve"}));
+        if (text) {
+            this.root.push(text);
+        }
+    }
+}

ts/docx/run/run-fonts.ts

@@ -0,0 +1,27 @@
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+
+interface IRunFontAttributesProperties {
+    ascii: string;
+    hAnsi: string;
+    hint?: string;
+}
+
+class RunFontAttributes extends XmlAttributeComponent<IRunFontAttributesProperties> {
+    protected xmlKeys = {
+        ascii: "w:ascii",
+        hAnsi: "w:hAnsi",
+        hint: "w:hint",
+    };
+}
+
+export class RunFonts extends XmlComponent {
+
+    constructor(ascii: string, hint?: string) {
+        super("w:rFonts");
+        this.root.push(new RunFontAttributes({
+            ascii: ascii,
+            hAnsi: ascii,
+            hint: hint,
+        }));
+    }
+}

ts/docx/run/script.ts

@@ -1,11 +1,11 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Attributes, XmlComponent } from "../xml-components";
 
-abstract class VerticalAlign extends XmlComponent {
+export abstract class VerticalAlign extends XmlComponent {
 
     constructor(type: string) {
         super("w:vertAlign");
         this.root.push(new Attributes({
-            val: type
+            val: type,
         }));
     }
 }
@@ -22,4 +22,4 @@ export class SubScript extends VerticalAlign {
     constructor() {
         super("subscript");
     }
-}
+}

ts/docx/run/strike.ts

@@ -1,15 +0,0 @@
-import {XmlComponent} from "../xml-components";
-
-export class Strike extends XmlComponent {
-
-    constructor() {
-        super("w:strike");
-    }
-}
-
-export class DoubleStrike extends XmlComponent {
-
-    constructor() {
-        super("w:dstrike");
-    }
-}

ts/docx/run/style.ts

@@ -0,0 +1,13 @@
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+
+class StyleAttributes extends XmlAttributeComponent<{val: string}> {
+    protected xmlKeys = {val: "w:val"};
+}
+
+export class Style extends XmlComponent {
+
+    constructor(styleId: string) {
+        super("w:rStyle");
+        this.root.push(new StyleAttributes({val: styleId}));
+    }
+}

ts/docx/run/tab.ts

@@ -1,8 +1,8 @@
-import {XmlComponent} from "../xml-components";
+import { XmlComponent } from "../xml-components";
 
 export class Tab extends XmlComponent {
 
     constructor() {
         super("w:tab");
     }
-}
+}

ts/docx/run/text-run.ts

@@ -1,5 +1,5 @@
-import {Text} from "./text";
+import { Run } from "../run";
-import {Run} from "../run";
+import { Text } from "./run-components/text";
 
 export class TextRun extends Run {
 
@@ -7,4 +7,4 @@ export class TextRun extends Run {
         super();
         this.root.push(new Text(text));
     }
-}
+}

ts/docx/run/text.ts

@@ -1,9 +0,0 @@
-import {XmlUnitComponent} from "../xml-components"
-
-export class Text extends XmlUnitComponent {
-
-    constructor(text: string) {
-        super("w:t");
-        this.root = text;
-    }
-}

ts/docx/run/underline.ts

@@ -1,20 +1,20 @@
-import {XmlComponent, Attributes} from "../xml-components";
+import { Attributes, XmlComponent } from "../xml-components";
 
-abstract class BaseUnderline extends XmlComponent {
+export abstract class BaseUnderline extends XmlComponent {
 
     constructor(underlineType: string, color?: string) {
         super("w:u");
         this.root.push(new Attributes({
             val: underlineType,
-            color: color
+            color: color,
         }));
     }
 }
 
 export class Underline extends BaseUnderline {
 
-    constructor() {
+    constructor(underlineType: string = "single", color?: string) {
-        super("");
+        super(underlineType, color);
     }
 }
 
@@ -88,7 +88,6 @@ export class DoubleUnderline extends BaseUnderline {
     }
 }
 
-
 export class SingleUnderline extends BaseUnderline {
 
     constructor() {
@@ -129,4 +128,4 @@ export class WordsUnderline extends BaseUnderline {
     constructor() {
         super("words");
     }
-}
+}

ts/docx/table.ts

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

ts/docx/table/grid.ts

@@ -0,0 +1,21 @@
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+
+export class TableGrid extends XmlComponent {
+    constructor(cols: number[]) {
+        super("w:tblGrid");
+        cols.forEach((col) => this.root.push(new GridCol(col)));
+    }
+}
+
+class GridColAttributes extends XmlAttributeComponent<{w: number}> {
+    protected xmlKeys = {w: "w:w"};
+}
+
+export class GridCol extends XmlComponent {
+    constructor(width?: number) {
+        super("w:gridCol");
+        if (width !== undefined) {
+            this.root.push(new GridColAttributes({w: width}));
+        }
+    }
+}

ts/docx/table/index.ts

@@ -0,0 +1,123 @@
+import { Paragraph } from "../paragraph";
+import { XmlComponent } from "../xml-components";
+
+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(): XmlableObject {
+        // 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/properties.ts

@@ -0,0 +1,48 @@
+import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+
+export type WidthTypes = "dxa" | "pct" | "nil" | "auto";
+
+export class TableProperties extends XmlComponent {
+    constructor() {
+        super("w:tblPr");
+    }
+
+    public setWidth(type: WidthTypes, w: number | string): TableProperties {
+        this.root.push(new PreferredTableWidth(type, w));
+        return this;
+    }
+
+    public fixedWidthLayout(): TableProperties {
+        this.root.push(new TableLayout("fixed"));
+        return this;
+    }
+}
+
+interface ITableWidth {
+    type: WidthTypes;
+    w: number | string;
+}
+
+class TableWidthAttributes extends XmlAttributeComponent<ITableWidth> {
+    protected xmlKeys = {type: "w:type", w: "w:w"};
+}
+
+class PreferredTableWidth extends XmlComponent {
+    constructor(type: WidthTypes, w: number | string) {
+        super("w:tblW");
+        this.root.push(new TableWidthAttributes({type, w}));
+    }
+}
+
+type TableLayoutOptions = "autofit" | "fixed";
+
+class TableLayoutAttributes extends XmlAttributeComponent<{type: TableLayoutOptions}> {
+    protected xmlKeys = {type: "w:type"};
+}
+
+class TableLayout extends XmlComponent {
+    constructor(type: TableLayoutOptions) {
+        super("w:tblLayout");
+        this.root.push(new TableLayoutAttributes({type}));
+    }
+}

ts/docx/xml-components/attributes.ts

@@ -1,7 +1,7 @@
-import {XmlAttributeComponent} from "./default-attributes";
+import { XmlAttributeComponent } from "./default-attributes";
 
-interface AttributesProperties {
+export interface IAttributesProperties {
-    val?: any;
+    val?: string | number | boolean;
     color?: string;
     space?: string;
     sz?: string;
@@ -19,32 +19,29 @@ interface AttributesProperties {
     footer?: string;
     gutter?: string;
     linePitch?: string;
-    pos?: string;
+    pos?: string | number; // Little strange. Perhaps it is normal. Need to clarify in the spec.
 }
 
-export class Attributes extends XmlAttributeComponent {
+export class Attributes extends XmlAttributeComponent<IAttributesProperties> {
-
+    protected xmlKeys = {
-    constructor(properties?: AttributesProperties) {
+        val: "w:val",
-        super({
+        color: "w:color",
-            val: "w:val",
+        space: "w:space",
-            color: "w:color",
+        sz: "w:sz",
-            space: "w:space",
+        type: "w:type",
-            sz: "w:sz",
+        rsidR: "w:rsidR",
-            type: "w:type",
+        rsidRPr: "w:rsidRPr",
-            rsidR: "w:rsidR",
+        rsidSect: "w:rsidSect",
-            rsidRPr: "w:rsidRPr",
+        w: "w:w",
-            rsidSect: "w:rsidSect",
+        h: "w:h",
-            w: "w:w",
+        top: "w:top",
-            h: "w:h",
+        right: "w:right",
-            top: "w:top",
+        bottom: "w:bottom",
-            right: "w:right",
+        left: "w:left",
-            bottom: "w:bottom",
+        header: "w:header",
-            left: "w:left",
+        footer: "w:footer",
-            header: "w:header",
+        gutter: "w:gutter",
-            footer: "w:footer",
+        linePitch: "w:linePitch",
-            gutter: "w:gutter",
+        pos: "w:pos",
-            linePitch: "w:linePitch",
+    };
-            pos: "w:pos"
+}
-        }, properties);
-    }
-}

ts/docx/xml-components/base.ts

@@ -5,7 +5,5 @@ export abstract class BaseXmlComponent {
         this.rootKey = rootKey;
     }
 
-    abstract replaceKey(): void;
+    public abstract prepForXml(): XmlableObject;
-    clearVariables(): void {
+}
-    };
-}

ts/docx/xml-components/default-attributes.ts

@@ -1,30 +1,25 @@
-import {BaseXmlComponent} from "./base";
+import { BaseXmlComponent } from "./base";
-import * as _ from "lodash";
 
-export abstract class XmlAttributeComponent extends BaseXmlComponent {
+export type AttributeMap<T> = {[P in keyof T]: string};
-    protected root: Object;
-    private xmlKeys: Object;
 
-    constructor(xmlKeys: Object, properties: Object) {
+export abstract class XmlAttributeComponent<T> extends BaseXmlComponent {
+    protected root: T;
+    protected xmlKeys: AttributeMap<T>;
+
+    constructor(properties: T) {
         super("_attr");
-        this.xmlKeys = xmlKeys;
-
         this.root = properties;
-
-        if (!properties) {
-            this.root = {};
-        }
     }
 
-    replaceKey(): void {
+    public prepForXml(): XmlableObject {
-        if (this.root !== undefined) {
+        const attrs = {};
-            _.forOwn(this.root, (value, key) => {
+        Object.keys(this.root).forEach((key) => {
-                let newKey = this.xmlKeys[key];
+            const value = this.root[key];
-                this.root[newKey] = value;
+            if (value !== undefined) {
-                delete this.root[key];
+                const newKey = this.xmlKeys[key];
-            });
+                attrs[newKey] = value;
-            this[this.rootKey] = this.root;
+            }
-            delete this.root;
+        });
-        }
+        return {_attr: attrs};
     }
-}
+}

ts/docx/xml-components/index.ts

@@ -1,30 +1,26 @@
-import * as _ from "lodash";
+import { BaseXmlComponent } from "./base";
-import {BaseXmlComponent} from "./base";
+export { BaseXmlComponent };
 
 export abstract class XmlComponent extends BaseXmlComponent {
-    protected root: Array<BaseXmlComponent>;
+    protected root: Array<BaseXmlComponent | string>;
 
     constructor(rootKey: string) {
         super(rootKey);
         this.root = new Array<BaseXmlComponent>();
     }
 
-    replaceKey(): void {
+    public prepForXml(): XmlableObject {
-        // console.log(this.rootKey);
+        const children = this.root.map((comp) => {
-        // console.log(this.root);
+            if (comp instanceof BaseXmlComponent) {
-        if (this.root !== undefined) {
+                return comp.prepForXml();
-            this.root.forEach(root => {
+            }
-                if (root && root instanceof BaseXmlComponent) {
+            return comp;
-                    root.replaceKey();
+        }).filter((comp) => comp); // Exclude null, undefined, and empty strings
-                }
+        return {
-            });
+            [this.rootKey]: children,
-            this[this.rootKey] = this.root;
+        };
-            delete this.root;
-        }
     }
 }
 
-export * from "./attributes"
+export * from "./attributes";
 export * from "./default-attributes";
-export * from "./unit";
-export * from "./property";

ts/docx/xml-components/property.ts

@@ -1,57 +0,0 @@
-import {XmlComponent} from "./";
-import {ParagraphProperties} from "../paragraph/properties";
-import {RunProperties} from "../run/properties";
-
-export class ParagraphPropertyXmlComponent extends XmlComponent {
-    private paragraphProperties: ParagraphProperties;
-
-    constructor(rootKey) {
-        super(rootKey);
-        this.paragraphProperties = new ParagraphProperties();
-        this.root.push(this.paragraphProperties);
-    }
-
-    clearVariables(): void {
-        this.paragraphProperties.clearVariables();
-
-        delete this.paragraphProperties;
-    }
-}
-
-export class RunPropertyXmlComponent extends XmlComponent {
-    private runProperties: RunProperties;
-
-    constructor(rootKey) {
-        super(rootKey);
-        this.runProperties = new RunProperties();
-        this.root.push(this.runProperties);
-    }
-
-    clearVariables(): void {
-        this.runProperties.clearVariables();
-
-        delete this.runProperties;
-    }
-}
-
-export class MultiPropertyXmlComponent extends XmlComponent {
-    private runProperties: RunProperties;
-    private paragraphProperties: ParagraphProperties;
-
-    constructor(rootKey) {
-        super(rootKey);
-        this.runProperties = new RunProperties();
-        this.root.push(this.runProperties);
-
-        this.paragraphProperties = new ParagraphProperties();
-        this.root.push(this.paragraphProperties);
-    }
-
-    clearVariables(): void {
-        this.runProperties.clearVariables();
-        this.paragraphProperties.clearVariables();
-
-        delete this.runProperties;
-        delete this.paragraphProperties;
-    }
-}

ts/docx/xml-components/unit.ts

@@ -1,16 +0,0 @@
-import {BaseXmlComponent} from "./base";
-
-export abstract class XmlUnitComponent extends BaseXmlComponent {
-    protected root: string;
-
-    constructor(rootKey: string) {
-        super(rootKey);
-    }
-
-    replaceKey(): void {
-        if (this.root !== undefined) {
-            this[this.rootKey] = this.root;
-            delete this.root;
-        }
-    }
-}

ts/docx/xml-components/xmlable-object.d.ts

@@ -0,0 +1,3 @@
+declare interface XmlableObject extends Object {
+    _attr?: { [key: string]: (string | number | boolean) }
+}

ts/export/formatter.ts

@@ -1,52 +1,7 @@
-import * as _ from "lodash";
+import { BaseXmlComponent } from "../docx/xml-components";
-import {XmlComponent} from "../docx/xml-components";
 
 export class Formatter {
-
+    public format(input: BaseXmlComponent): XmlableObject {
-    format(input: any): Object {
+        return input.prepForXml();
-        input.clearVariables();
-        this.replaceKeys(input);
-        let newJson = this.clense(input);
-        // console.log(JSON.stringify(newJson, null, "  "));
-        return newJson;
     }
-
+}
-    private replaceKeys(input: XmlComponent): Object {
-        input.replaceKey();
-
-        return input;
-    }
-
-    private clense(input: any): Object {
-        let newJson = this.jsonify(input);
-
-        this.deepTraverseJson(newJson, (parent, value, key) => {
-            if (key === "properties") {
-                delete parent[key];
-            }
-            if (key === "xmlKeys") {
-                delete parent[key];
-            }
-            if (key === "rootKey") {
-                delete parent[key];
-            }
-        });
-
-        return newJson;
-    }
-
-    private jsonify(obj: Object): Object {
-        let stringifiedJson = JSON.stringify(obj);
-        return JSON.parse(stringifiedJson);
-    }
-
-    private deepTraverseJson(json: Object, lambda: (json: any, value: any, key: any) => void): void {
-        _.forOwn(json, (value, key) => {
-            if (_.isObject(value) && key !== "xmlKeys" && key !== "rootKey") {
-                this.deepTraverseJson(value, lambda);
-            }
-            lambda(json, value, key);
-        });
-    }
-
-}

ts/export/index.ts

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

ts/export/packer/express.ts

@@ -1,15 +1,16 @@
-import {Packer} from "./packer";
-import * as fs from "fs";
 import * as express from "express";
-import {Document} from "../../docx/document";
+import { Document } from "../../docx/document";
-import {Properties} from "../../properties";
+import { Media } from "../../media";
-import {Numbering} from "../../numbering";
+import { Numbering } from "../../numbering";
+import { Properties } from "../../properties";
+import { Styles } from "../../styles";
+import { Packer } from "./packer";
 
 export class ExpressPacker extends Packer {
     private res: express.Response;
 
-    constructor(document: Document, res: express.Response, styles?: any, properties?: Properties, numbering?: Numbering) {
+    constructor(document: Document, res: express.Response, styles?: Styles, properties?: Properties, numbering?: Numbering, media?: Media) {
-        super(document, styles, properties, numbering);
+        super(document, styles, properties, numbering, media);
         this.res = res;
 
         this.res.on("close", () => {
@@ -17,8 +18,8 @@ export class ExpressPacker extends Packer {
         });
     }
 
-    pack(name: string): void {
+    public pack(name: string): void {
-        this.res.attachment(name + ".docx");
+        this.res.attachment(`${name}.docx`);
-        super.pack(this.res);
+        super.compile(this.res);
     }
-}
+}

ts/export/packer/local.ts

@@ -1,18 +1,21 @@
-import {Packer} from "./packer";
 import * as fs from "fs";
-import {Document} from "../../docx/document";
+import { Document } from "../../docx/document";
-import {Properties} from "../../properties";
+import { Media } from "../../media";
-import {Numbering} from "../../numbering";
+import { Numbering } from "../../numbering";
+import { Properties } from "../../properties";
+import { Styles } from "../../styles";
+import { Packer } from "./packer";
 
 export class LocalPacker extends Packer {
     private stream: fs.WriteStream;
 
-    constructor(document: Document, styles?: any, properties?: Properties, numbering?: Numbering) {
+    constructor(document: Document, styles?: Styles, properties?: Properties, numbering?: Numbering, media?: Media) {
-        super(document, styles, properties, numbering);
+        super(document, styles, properties, numbering, media);
     }
 
-    pack(path: string): void {
+    public pack(path: string): void {
-        this.stream = fs.createWriteStream(path);
+        path = path.replace(/.docx$/, "");
-        super.pack(this.stream);
+        this.stream = fs.createWriteStream(`${path}.docx`);
+        super.compile(this.stream);
     }
-}
+}

ts/export/packer/packer.ts

@@ -1,96 +1,91 @@
 import * as archiver from "archiver";
+import * as express from "express";
 import * as fs from "fs";
+import * as path from "path";
 import * as xml from "xml";
-import {Formatter} from "../formatter";
+import { Document } from "../../docx";
-import {Document} from "../../docx";
+import { Media } from "../../media";
-import {Styles} from "../../styles";
+import { Numbering } from "../../numbering";
-import {Properties} from "../../properties";
+import { Properties } from "../../properties";
-import {Numbering} from "../../numbering";
+import { Styles } from "../../styles";
-import {DefaultStylesFactory} from "../../styles/factory";
+import { DefaultStylesFactory } from "../../styles/factory";
+import { Formatter } from "../formatter";
 
-let appRoot = require("app-root-path");
+const TEMPLATE_PATH = path.resolve(__dirname, "../../../template");
 
 export abstract class Packer {
-    protected archive: any;
+    protected archive: archiver.Archiver;
     private formatter: Formatter;
-    protected document: Document;
     private style: Styles;
-    private properties: Properties;
-    private numbering: Numbering;
 
-    constructor(document: Document, style?: any, properties?: Properties, numbering?: Numbering) {
+    constructor(
+        protected document: Document,
+        style?: Styles,
+        private properties: Properties = new Properties({
+            creator: "Un-named",
+            revision: "1",
+            lastModifiedBy: "Un-named",
+        }),
+        private numbering: Numbering = new Numbering(),
+        private media: Media = new Media(),
+    ) {
         this.formatter = new Formatter();
-        this.document = document;
-        this.style = style;
-        this.properties = properties;
-        this.numbering = numbering;
         this.archive = archiver.create("zip", {});
 
-        if (!style) {
+        if (style) {
-            let stylesFactory = new DefaultStylesFactory();
+            this.style = style;
+        } else {
+            const stylesFactory = new DefaultStylesFactory();
             this.style = stylesFactory.newInstance();
         }
 
-        if (!properties) {
-            this.properties = new Properties({
-                creator: "Un-named",
-                revision: "1",
-                lastModifiedBy: "Un-named"
-            });
-        }
-
-        if (!numbering) {
-            this.numbering = new Numbering();
-        }
-
         this.archive.on("error", (err) => {
             throw err;
         });
     }
 
-    pack(output: any): void {
+    protected compile(output: fs.WriteStream | express.Response): void {
         this.archive.pipe(output);
-        console.log(appRoot.path + "/template");
         this.archive.glob("**", {
-            expand: true,
+            cwd: TEMPLATE_PATH,
-            cwd: appRoot.path + "/template",
         });
 
         this.archive.glob("**/.rels", {
-            expand: true,
+            cwd: TEMPLATE_PATH,
-            cwd: appRoot.path + "/template",
         });
 
-        // this.archive.file(appRoot.path + "/template/[Content_Types].xml", { name: "[Content_Types].xml" });
+        const xmlDocument = xml(this.formatter.format(this.document));
-        // console.log(__dirname + "/packer.js");
+        const xmlStyles = xml(this.formatter.format(this.style));
-        // this.archive.file(__dirname + "/packer.js", { name: "/[Content_Types].xml" });
+        const xmlProperties = xml(this.formatter.format(this.properties), {
+            declaration: {
+                standalone: "yes",
+                encoding: "UTF-8",
+            },
+        });
+        const xmlNumbering = xml(this.formatter.format(this.numbering));
 
-        /*this.archive.directory(appRoot.path + "/template", {
-            name: "/root/g.txt",
-            prefix: "root"
-        });*/
-        let xmlDocument = xml(this.formatter.format(this.document));
-        let xmlStyles = xml(this.formatter.format(this.style));
-        let xmlProperties = xml(this.formatter.format(this.properties), { declaration: { standalone: "yes", encoding: "UTF-8" } });
-        let xmlNumbering = xml(this.formatter.format(this.numbering));
-        // console.log(JSON.stringify(this.numbering, null, " "));
-        console.log(xmlNumbering);
         this.archive.append(xmlDocument, {
-            name: "word/document.xml"
+            name: "word/document.xml",
         });
 
         this.archive.append(xmlStyles, {
-            name: "word/styles.xml"
+            name: "word/styles.xml",
         });
 
         this.archive.append(xmlProperties, {
-            name: "docProps/core.xml"
+            name: "docProps/core.xml",
         });
 
         this.archive.append(xmlNumbering, {
-            name: "word/numbering.xml"
+            name: "word/numbering.xml",
         });
 
+        for (const data of this.media.array) {
+            this.archive.append(data.stream, {
+                name: `media/${data.fileName}`,
+            });
+        }
+
         this.archive.finalize();
     }
-}
+}

ts/index.ts

@@ -1,2 +1,6 @@
 export * from "./docx";
-export * from "./export";
+export * from "./export";
+export { Numbering } from "./numbering";
+export { Styles } from "./styles";
+export { Media } from "./media";
+export * from "./export";

ts/media/data.ts

@@ -0,0 +1,8 @@
+import * as fs from "fs";
+
+export interface IData {
+    referenceId: number;
+    stream: fs.ReadStream;
+    path: string;
+    fileName: string;
+}

ts/media/index.ts

@@ -0,0 +1,40 @@
+import * as fs from "fs";
+import * as path from "path";
+import { IData } from "./data";
+
+export class Media {
+    private map: Map<string, IData>;
+
+    constructor() {
+        this.map = new Map<string, IData>();
+    }
+
+    public getMedia(key: string): IData {
+        const data = this.map.get(key);
+
+        if (data === undefined) {
+            throw new Error(`Cannot find image with the key ${key}`);
+        }
+
+        return data;
+    }
+
+    public addMedia(key: string, filePath: string): void {
+        this.map.set(key, {
+            referenceId: this.map.values.length,
+            stream: fs.createReadStream(filePath),
+            path: filePath,
+            fileName: path.basename(filePath),
+        });
+    }
+
+    public get array(): IData[] {
+        const array = new Array<IData>();
+
+        this.map.forEach((data) => {
+            array.push(data);
+        });
+
+        return array;
+    }
+}

ts/numbering/abstract-numbering.ts

@@ -1,42 +1,39 @@
-import {XmlComponent} from "../docx/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
-import {XmlAttributeComponent} from "../docx/xml-components";
+import { Level } from "./level";
-import {Level} from "./level";
+import { MultiLevelType } from "./multi-level-type";
-import {MultiLevelType} from "./multi-level-type";
-import * as _ from "lodash";
 
-interface AbstractNumberingAttributesProperties {
+interface IAbstractNumberingAttributesProperties {
     abstractNumId?: number;
     restartNumberingAfterBreak?: number;
 }
 
-class AbstractNumberingAttributes extends XmlAttributeComponent {
+class AbstractNumberingAttributes extends XmlAttributeComponent<IAbstractNumberingAttributesProperties> {
-
+    protected xmlKeys = {
-    constructor(properties: AbstractNumberingAttributesProperties) {
+        abstractNumId: "w:abstractNumId",
-        super({
+        restartNumberingAfterBreak: "w15:restartNumberingAfterBreak",
-            abstractNumId: "w:abstractNumId",
+    };
-            restartNumberingAfterBreak: "w15:restartNumberingAfterBreak"
-        }, properties);
-    }
 }
 
 export class AbstractNumbering extends XmlComponent {
+    public id: number;
 
     constructor(id: number) {
         super("w:abstractNum");
         this.root.push(new AbstractNumberingAttributes({
             abstractNumId: id,
-            restartNumberingAfterBreak: 0
+            restartNumberingAfterBreak: 0,
         }));
         this.root.push(new MultiLevelType("hybridMultilevel"));
+        this.id = id;
     }
 
-    addLevel(level: Level): void {
+    public addLevel(level: Level): void {
         this.root.push(level);
     }
 
-    clearVariables() {
+    public createLevel(num: number, format: string, text: string, align: string = "start"): Level {
-        _.forEach(this.root, element => {
+        const level = new Level(num, format, text, align);
-            element.clearVariables();
+        this.addLevel(level);
-        });
+        return level;
     }
-}
+}

ts/numbering/indent.ts

@@ -1,27 +0,0 @@
-import {XmlComponent, XmlAttributeComponent} from "../docx/xml-components";
-
-interface IndentAttributesProperties {
-    left: number;
-    hanging: number;
-}
-
-class IndentAttributes extends XmlAttributeComponent {
-
-    constructor(properties: IndentAttributesProperties) {
-        super({
-            left: "w:left",
-            hanging: "w:hanging"
-        }, properties);
-    }
-}
-
-export class Indent extends XmlComponent {
-
-    constructor(left: number, hanging: number) {
-        super("w:ind");
-        this.root.push(new IndentAttributes({
-            left: left,
-            hanging: hanging
-        }));
-    }
-}

ts/numbering/index.ts

@@ -1,13 +1,12 @@
-import {MultiPropertyXmlComponent} from "../docx/xml-components";
+import { DocumentAttributes } from "../docx/document/document-attributes";
-import {DocumentAttributes} from "../docx/document/document-attributes";
+import { Indent } from "../docx/paragraph/indent";
-import {AbstractNumbering} from "./abstract-numbering";
+import { RunFonts } from "../docx/run/run-fonts";
-import {Level} from "./level";
+import { XmlComponent } from "../docx/xml-components";
-import {Indent} from "./indent";
+import { AbstractNumbering } from "./abstract-numbering";
-import {RunFonts} from "./run-fonts";
+import { Num } from "./num";
-import {Num} from "./num";
-import * as _ from "lodash";
 
-export class Numbering extends MultiPropertyXmlComponent {
+export class Numbering extends XmlComponent {
+    private nextId: number;
 
     constructor() {
         super("w:numbering");
@@ -28,65 +27,61 @@ export class Numbering extends MultiPropertyXmlComponent {
             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"
+            Ignorable: "w14 w15 wp14",
         }));
 
-        let abstractNumbering = new AbstractNumbering(0);
+        this.nextId = 0;
 
-        let level0 = new Level(0, "bullet", "•", "left");
+        const abstractNumbering = this.createAbstractNumbering();
-        level0.addParagraphProperty(new Indent(720, 360));
-        level0.addRunProperty(new RunFonts("Symbol", "default"));
-        abstractNumbering.addLevel(level0);
 
-        let level1 = new Level(1, "bullet", "o", "left");
+        abstractNumbering.createLevel(0, "bullet", "•", "left")
-        level1.addParagraphProperty(new Indent(1440, 360));
+            .addParagraphProperty(new Indent(720, 360))
-        level1.addRunProperty(new RunFonts("Courier New", "default"));
+            .addRunProperty(new RunFonts("Symbol", "default"));
-        abstractNumbering.addLevel(level1);
 
-        let level2 = new Level(2, "bullet", "•", "left");
+        abstractNumbering.createLevel(1, "bullet", "o", "left")
-        level2.addParagraphProperty(new Indent(2160, 360));
+            .addParagraphProperty(new Indent(1440, 360))
-        level2.addRunProperty(new RunFonts("Wingdings", "default"));
+            .addRunProperty(new RunFonts("Courier New", "default"));
-        abstractNumbering.addLevel(level2);
 
-        let level3 = new Level(3, "bullet", "•", "left");
+        abstractNumbering.createLevel(2, "bullet", "•", "left")
-        level3.addParagraphProperty(new Indent(2880, 360));
+            .addParagraphProperty(new Indent(2160, 360))
-        level3.addRunProperty(new RunFonts("Symbol", "default"));
+            .addRunProperty(new RunFonts("Wingdings", "default"));
-        abstractNumbering.addLevel(level3);
 
-        let level4 = new Level(4, "bullet", "o", "left");
+        abstractNumbering.createLevel(3, "bullet", "•", "left")
-        level4.addParagraphProperty(new Indent(3600, 360));
+            .addParagraphProperty(new Indent(2880, 360))
-        level4.addRunProperty(new RunFonts("Courier New", "default"));
+            .addRunProperty(new RunFonts("Symbol", "default"));
-        abstractNumbering.addLevel(level4);
 
-        let level5 = new Level(5, "bullet", "•", "left");
+        abstractNumbering.createLevel(4, "bullet", "o", "left")
-        level5.addParagraphProperty(new Indent(4320, 360));
+            .addParagraphProperty(new Indent(3600, 360))
-        level5.addRunProperty(new RunFonts("Wingdings", "default"));
+            .addRunProperty(new RunFonts("Courier New", "default"));
-        abstractNumbering.addLevel(level5);
 
-        let level6 = new Level(6, "bullet", "•", "left");
+        abstractNumbering.createLevel(5, "bullet", "•", "left")
-        level6.addParagraphProperty(new Indent(5040, 360));
+            .addParagraphProperty(new Indent(4320, 360))
-        level6.addRunProperty(new RunFonts("Symbol", "default"));
+            .addRunProperty(new RunFonts("Wingdings", "default"));
-        abstractNumbering.addLevel(level6);
 
-        let level7 = new Level(4, "bullet", "o", "left");
+        abstractNumbering.createLevel(6, "bullet", "•", "left")
-        level7.addParagraphProperty(new Indent(5760, 360));
+            .addParagraphProperty(new Indent(5040, 360))
-        level7.addRunProperty(new RunFonts("Courier New", "default"));
+            .addRunProperty(new RunFonts("Symbol", "default"));
-        abstractNumbering.addLevel(level7);
 
-        let level8 = new Level(5, "bullet", "•", "left");
+        abstractNumbering.createLevel(7, "bullet", "o", "left")
-        level8.addParagraphProperty(new Indent(6480, 360));
+            .addParagraphProperty(new Indent(5760, 360))
-        level8.addRunProperty(new RunFonts("Wingdings", "default"));
+            .addRunProperty(new RunFonts("Courier New", "default"));
-        abstractNumbering.addLevel(level8);
 
-        this.root.push(abstractNumbering);
+        abstractNumbering.createLevel(8, "bullet", "•", "left")
-        this.root.push(new Num(1, 0));
+            .addParagraphProperty(new Indent(6480, 360))
+            .addRunProperty(new RunFonts("Wingdings", "default"));
+
+        this.createConcreteNumbering(abstractNumbering);
     }
 
-    clearVariables() {
+    public createAbstractNumbering(): AbstractNumbering {
-        super.clearVariables();
+        const num = new AbstractNumbering(this.nextId++);
-        _.forEach(this.root, element => {
+        this.root.push(num);
-            console.log(element);
+        return num;
-            element.clearVariables();
-        });
     }
-}
+
+    public createConcreteNumbering(abstractNumbering: AbstractNumbering): Num {
+        const num = new Num(this.nextId++, abstractNumbering.id);
+        this.root.push(num);
+        return num;
+    }
+}

ts/numbering/level.ts

@@ -1,21 +1,19 @@
-import {XmlComponent, Attributes, MultiPropertyXmlComponent} from "../docx/xml-components";
+import * as paragraph from "../docx/paragraph/formatting";
-import {XmlAttributeComponent} from "../docx/xml-components";
+import { ParagraphProperties } from "../docx/paragraph/properties";
-import {RunProperties} from "../docx/run/properties";
+import * as formatting from "../docx/run/formatting";
-import {ParagraphProperties} from "../docx/paragraph/properties";
+import { RunProperties } from "../docx/run/properties";
+import { Attributes, XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
 
-interface LevelAttributesProperties {
+interface ILevelAttributesProperties {
     ilvl?: number;
     tentative?: number;
 }
 
-class LevelAttributes extends XmlAttributeComponent {
+class LevelAttributes extends XmlAttributeComponent<ILevelAttributesProperties> {
-
+    protected xmlKeys = {
-    constructor(properties: LevelAttributesProperties) {
+        ilvl: "w:ilvl",
-        super({
+        tentative: "w15:tentative",
-            ilvl: "w:ilvl",
+    };
-            tentative: "w15:tentative"
-        }, properties);
-    }
 }
 
 class Start extends XmlComponent {
@@ -23,7 +21,7 @@ class Start extends XmlComponent {
     constructor(value: number) {
         super("w:start");
         this.root.push(new Attributes({
-            val: value
+            val: value,
         }));
     }
 }
@@ -33,7 +31,7 @@ class NumberFormat extends XmlComponent {
     constructor(value: string) {
         super("w:numFmt");
         this.root.push(new Attributes({
-            val: value
+            val: value,
         }));
     }
 }
@@ -43,7 +41,7 @@ class LevelText extends XmlComponent {
     constructor(value: string) {
         super("w:lvlText");
         this.root.push(new Attributes({
-            val: value
+            val: value,
         }));
     }
 }
@@ -53,26 +51,34 @@ class LevelJc extends XmlComponent {
     constructor(value: string) {
         super("w:lvlJc");
         this.root.push(new Attributes({
-            val: value
+            val: value,
         }));
     }
 }
 
-export class Level extends XmlComponent {
+export class LevelBase extends XmlComponent {
     private paragraphProperties: ParagraphProperties;
     private runProperties: RunProperties;
 
-    constructor(level: number, numberFormat: string, levelText: string, lvlJc: string) {
+    constructor(level: number, start?: number, numberFormat?: string, levelText?: string, lvlJc?: string) {
         super("w:lvl");
         this.root.push(new LevelAttributes({
             ilvl: level,
-            tentative: 1
+            tentative: 1,
         }));
 
-        this.root.push(new Start(1));
+        if (start !== undefined) {
-        this.root.push(new NumberFormat(numberFormat));
+            this.root.push(new Start(start));
-        this.root.push(new LevelText(levelText));
+        }
-        this.root.push(new LevelJc(lvlJc));
+        if (numberFormat !== undefined) {
+            this.root.push(new NumberFormat(numberFormat));
+        }
+        if (levelText !== undefined) {
+            this.root.push(new LevelText(levelText));
+        }
+        if (lvlJc !== undefined) {
+            this.root.push(new LevelJc(lvlJc));
+        }
 
         this.paragraphProperties = new ParagraphProperties();
         this.runProperties = new RunProperties();
@@ -81,19 +87,142 @@ export class Level extends XmlComponent {
         this.root.push(this.runProperties);
     }
 
-    clearVariables(): void {
+    public addParagraphProperty(property: XmlComponent): Level {
-        this.paragraphProperties.clearVariables();
-        this.runProperties.clearVariables();
-
-        delete this.paragraphProperties;
-        delete this.runProperties;
-    }
-
-    addParagraphProperty(property: XmlComponent): void {
         this.paragraphProperties.push(property);
+        return this;
     }
 
-    addRunProperty(property: XmlComponent): void {
+    public addRunProperty(property: XmlComponent): Level {
         this.runProperties.push(property);
+        return this;
     }
-}
+
+    // ----------  Run formatting ---------------------- //
+
+    public size(twips: number): Level {
+        this.addRunProperty(new formatting.Size(twips));
+        return this;
+    }
+
+    public bold(): Level {
+        this.addRunProperty(new formatting.Bold());
+        return this;
+    }
+
+    public italics(): Level {
+        this.addRunProperty(new formatting.Italics());
+        return this;
+    }
+
+    public smallCaps(): Level {
+        this.addRunProperty(new formatting.SmallCaps());
+        return this;
+    }
+
+    public allCaps(): Level {
+        this.addRunProperty(new formatting.Caps());
+        return this;
+    }
+
+    public strike(): Level {
+        this.addRunProperty(new formatting.Strike());
+        return this;
+    }
+
+    public doubleStrike(): Level {
+        this.addRunProperty(new formatting.DoubleStrike());
+        return this;
+    }
+
+    public subScript(): Level {
+        this.addRunProperty(new formatting.SubScript());
+        return this;
+    }
+
+    public superScript(): Level {
+        this.addRunProperty(new formatting.SuperScript());
+        return this;
+    }
+
+    public underline(underlineType?: string, color?: string): Level {
+        this.addRunProperty(new formatting.Underline(underlineType, color));
+        return this;
+    }
+
+    public color(color: string): Level {
+        this.addRunProperty(new formatting.Color(color));
+        return this;
+    }
+
+    public font(fontName: string): Level {
+        this.addRunProperty(new formatting.RunFonts(fontName));
+        return this;
+    }
+
+    // --------------------- Paragraph formatting ------------------------ //
+
+    public center(): Level {
+        this.addParagraphProperty(new paragraph.Alignment("center"));
+        return this;
+    }
+
+    public left(): Level {
+        this.addParagraphProperty(new paragraph.Alignment("left"));
+        return this;
+    }
+
+    public right(): Level {
+        this.addParagraphProperty(new paragraph.Alignment("right"));
+        return this;
+    }
+
+    public justified(): Level {
+        this.addParagraphProperty(new paragraph.Alignment("both"));
+        return this;
+    }
+
+    public thematicBreak(): Level {
+        this.addParagraphProperty(new paragraph.ThematicBreak());
+        return this;
+    }
+
+    public maxRightTabStop(): Level {
+        this.addParagraphProperty(new paragraph.MaxRightTabStop());
+        return this;
+    }
+
+    public leftTabStop(position: number): Level {
+        this.addParagraphProperty(new paragraph.LeftTabStop(position));
+        return this;
+    }
+
+    public indent(left: number, hanging?: number): Level {
+        this.addParagraphProperty(new paragraph.Indent(left, hanging));
+        return this;
+    }
+
+    public spacing(params: paragraph.ISpacingProperties): Level {
+        this.addParagraphProperty(new paragraph.Spacing(params));
+        return this;
+    }
+
+    public keepNext(): Level {
+        this.addParagraphProperty(new paragraph.KeepNext());
+        return this;
+    }
+
+    public keepLines(): Level {
+        this.addParagraphProperty(new paragraph.KeepLines());
+        return this;
+    }
+}
+
+export class Level extends LevelBase {
+    // This is the level that sits under abstractNum. We make a
+    // handful of properties required
+    constructor(level: number, numberFormat: string, levelText: string, lvlJc: string) {
+        super(level, 1, numberFormat, levelText, lvlJc);
+    }
+}
+
+export class LevelForOverride extends LevelBase {}

ts/numbering/multi-level-type.ts

@@ -1,11 +1,11 @@
-import {XmlComponent, Attributes} from "../docx/xml-components";
+import { Attributes, XmlComponent } from "../docx/xml-components";
 
 export class MultiLevelType extends XmlComponent {
 
     constructor(value: string) {
         super("w:multiLevelType");
         this.root.push(new Attributes({
-            val: value
+            val: value,
         }));
     }
-}
+}

ts/numbering/num.ts

@@ -1,35 +1,80 @@
-import {XmlComponent, Attributes, XmlAttributeComponent} from "../docx/xml-components";
+import { Attributes, XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
+import { LevelForOverride } from "./level";
 
 class AbstractNumId extends XmlComponent {
 
     constructor(value: number) {
         super("w:abstractNumId");
         this.root.push(new Attributes({
-            val: value
+            val: value,
         }));
     }
 }
 
-interface NumAttributesProperties {
+interface INumAttributesProperties {
     numId: number;
 }
 
-class NumAttributes extends XmlAttributeComponent {
+class NumAttributes extends XmlAttributeComponent<INumAttributesProperties> {
-
+    protected xmlKeys = {numId: "w:numId"};
-    constructor(properties: NumAttributesProperties) {
-        super({
-            numId: "w:numId"
-        }, properties);
-    }
 }
 
 export class Num extends XmlComponent {
+    public id: number;
 
     constructor(numId: number, abstractNumId: number) {
         super("w:num");
         this.root.push(new NumAttributes({
-            numId: numId
+            numId: numId,
         }));
         this.root.push(new AbstractNumId(abstractNumId));
+        this.id = numId;
     }
-}
+
+    public overrideLevel(num: number, start?: number): LevelOverride {
+        const olvl = new LevelOverride(num, start);
+        this.root.push(olvl);
+        return olvl;
+    }
+}
+
+class LevelOverrideAttributes extends XmlAttributeComponent<{ilvl: number}> {
+    protected xmlKeys = {ilvl: "w:ilvl"};
+}
+
+export class LevelOverride extends XmlComponent {
+    private levelNum: number;
+    private lvl?: LevelForOverride;
+
+    constructor(levelNum: number, start?: number) {
+        super("w:lvlOverride");
+        this.root.push(new LevelOverrideAttributes({ilvl: levelNum}));
+        if (start !== undefined) {
+            this.root.push(new StartOverride(start));
+        }
+        this.levelNum = levelNum;
+    }
+
+    get level(): LevelForOverride {
+        let lvl: LevelForOverride;
+        if (!this.lvl) {
+            lvl = new LevelForOverride(this.levelNum);
+            this.root.push(lvl);
+            this.lvl = lvl;
+        } else {
+            lvl = this.lvl;
+        }
+        return lvl;
+    }
+}
+
+class StartOverrideAttributes extends XmlAttributeComponent<{val: number}> {
+    protected xmlKeys = {val: "w:val"};
+}
+
+class StartOverride extends XmlComponent {
+    constructor(start: number) {
+        super("w:startOverride");
+        this.root.push(new StartOverrideAttributes({val: start}));
+    }
+}

ts/numbering/run-fonts.ts

@@ -1,29 +0,0 @@
-import {XmlComponent, XmlAttributeComponent} from "../docx/xml-components";
-
-interface RunFontAttributesProperties {
-    ascii: string;
-    hAnsi: string;
-    hint: string;
-}
-
-class RunFontAttributes extends XmlAttributeComponent {
-
-    constructor(properties: RunFontAttributesProperties) {
-        super({
-            left: "w:left",
-            hanging: "w:hanging"
-        }, properties);
-    }
-}
-
-export class RunFonts extends XmlComponent {
-
-    constructor(ascii: string, hint: string) {
-        super("w:ind");
-        this.root.push(new RunFontAttributes({
-            ascii: ascii,
-            hAnsi: ascii,
-            hint: hint
-        }));
-    }
-}

ts/properties/components.ts

@@ -1,73 +1,71 @@
-import {XmlUnitComponent} from "../docx/xml-components";
+import { DocumentAttributes } from "../docx/document/document-attributes";
-import {XmlComponent} from "../docx/xml-components";
+import { XmlComponent } from "../docx/xml-components";
-import {DocumentAttributes} from "../docx/document/document-attributes";
 
-export class Title extends XmlUnitComponent {
+export class Title extends XmlComponent {
 
     constructor(value: string) {
         super("dc:title");
-        this.root = value;
+        this.root.push(value);
     }
 }
 
-export class Subject extends XmlUnitComponent {
+export class Subject extends XmlComponent {
 
     constructor(value: string) {
         super("dc:subject");
-        this.root = value;
+        this.root.push(value);
     }
 }
 
-export class Creator extends XmlUnitComponent {
+export class Creator extends XmlComponent {
 
     constructor(value: string) {
         super("dc:creator");
-        this.root = value;
+        this.root.push(value);
     }
 }
 
-export class Keywords extends XmlUnitComponent {
+export class Keywords extends XmlComponent {
 
     constructor(value: string) {
         super("cp:keywords");
-        this.root = value;
+        this.root.push(value);
     }
 }
 
-export class Description extends XmlUnitComponent {
+export class Description extends XmlComponent {
 
     constructor(value: string) {
         super("dc:description");
-        this.root = value;
+        this.root.push(value);
     }
 }
 
-export class LastModifiedBy extends XmlUnitComponent {
+export class LastModifiedBy extends XmlComponent {
 
     constructor(value: string) {
         super("cp:lastModifiedBy");
-        this.root = value;
+        this.root.push(value);
     }
 }
 
-export class Revision extends XmlUnitComponent {
+export class Revision extends XmlComponent {
 
     constructor(value: string) {
         super("cp:revision");
-        let revision = value;
+        this.root.push(value);
-        this.root = value;
     }
 }
 
-abstract class DateComponent extends XmlComponent {
+export abstract class DateComponent extends XmlComponent {
-    protected getCurrentDate(): any {
+    protected getCurrentDate(): string {
-        let date = new Date(),
+        const date = new Date();
-            year = date.getFullYear(),
+        const year = date.getFullYear();
-            month = ("0" + (date.getMonth() + 1)).slice(-2),
+        const month = ("0" + (date.getMonth() + 1)).slice(-2);
-            day = ("0" + date.getDate()).slice(-2),
+        const day = ("0" + date.getDate()).slice(-2);
-            hours = ("0" + date.getHours()).slice(-2),
+        const hours = ("0" + date.getHours()).slice(-2);
-            minutes = ("0" + date.getMinutes()).slice(-2),
+        const minutes = ("0" + date.getMinutes()).slice(-2);
-            seconds = ("0" + date.getSeconds()).slice(-2);
+        const seconds = ("0" + date.getSeconds()).slice(-2);
 
         return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds + "Z";
     }
@@ -78,7 +76,7 @@ export class Created extends DateComponent {
     constructor() {
         super("dcterms:created");
         this.root.push(new DocumentAttributes({
-            type: "dcterms:W3CDTF"
+            type: "dcterms:W3CDTF",
         }));
         this.root.push(this.getCurrentDate());
     }
@@ -89,8 +87,8 @@ export class Modified extends DateComponent {
     constructor() {
         super("dcterms:modified");
         this.root.push(new DocumentAttributes({
-            type: "dcterms:W3CDTF"
+            type: "dcterms:W3CDTF",
         }));
         this.root.push(this.getCurrentDate());
     }
-}
+}

ts/properties/index.ts

@@ -1,8 +1,8 @@
-import {XmlComponent} from "../docx/xml-components";
+import { DocumentAttributes } from "../docx/document/document-attributes";
-import {DocumentAttributes} from "../docx/document/document-attributes";
+import { XmlComponent } from "../docx/xml-components";
-import {Title, Subject, Creator, Keywords, Description, LastModifiedBy, Revision, Created, Modified} from "./components";
+import { Created, Creator, Description, Keywords, LastModifiedBy, Modified, Revision, Subject, Title } from "./components";
 
-interface PropertiesOptions {
+export interface IPropertiesOptions {
     title?: string;
     subject?: string;
     creator?: string;
@@ -14,23 +14,37 @@ interface PropertiesOptions {
 
 export class Properties extends XmlComponent {
 
-    constructor(options: PropertiesOptions) {
+    constructor(options: IPropertiesOptions) {
         super("cp:coreProperties");
         this.root.push(new DocumentAttributes({
             cp: "http://schemas.openxmlformats.org/package/2006/metadata/core-properties",
             dc: "http://purl.org/dc/elements/1.1/",
             dcterms: "http://purl.org/dc/terms/",
             dcmitype: "http://purl.org/dc/dcmitype/",
-            xsi: "http://www.w3.org/2001/XMLSchema-instance"
+            xsi: "http://www.w3.org/2001/XMLSchema-instance",
         }));
-        this.root.push(new Title(options.title));
+        if (options.title) {
-        this.root.push(new Subject(options.subject));
+            this.root.push(new Title(options.title));
-        this.root.push(new Creator(options.creator));
+        }
-        this.root.push(new Keywords(options.keywords));
+        if (options.subject) {
-        this.root.push(new Description(options.description));
+            this.root.push(new Subject(options.subject));
-        this.root.push(new LastModifiedBy(options.lastModifiedBy));
+        }
-        this.root.push(new Revision(options.revision));
+        if (options.creator) {
+            this.root.push(new Creator(options.creator));
+        }
+        if (options.keywords) {
+            this.root.push(new Keywords(options.keywords));
+        }
+        if (options.description) {
+            this.root.push(new Description(options.description));
+        }
+        if (options.lastModifiedBy) {
+            this.root.push(new LastModifiedBy(options.lastModifiedBy));
+        }
+        if (options.revision) {
+            this.root.push(new Revision(options.revision));
+        }
         this.root.push(new Created());
         this.root.push(new Modified());
     }
-}
+}

ts/relationships/attributes.ts

@@ -0,0 +1,11 @@
+import { XmlAttributeComponent } from "../docx/xml-components";
+
+export interface IRelationshipsAttributesProperties {
+    xmlns: string;
+}
+
+export class RelationshipsAttributes extends XmlAttributeComponent<IRelationshipsAttributesProperties> {
+    protected xmlKeys = {
+        xmlns: "xmlns",
+    };
+}

ts/relationships/index.ts

@@ -0,0 +1,14 @@
+import { XmlComponent } from "../docx/xml-components";
+import { RelationshipsAttributes } from "./attributes";
+
+export class Relationships extends XmlComponent {
+
+    constructor() {
+        super("Relationships");
+        this.root.push(new RelationshipsAttributes({
+            xmlns: "http://schemas.openxmlformats.org/package/2006/relationships",
+        }));
+
+        // this.root.push(new Created());
+    }
+}

ts/styles/defaults/index.ts

@@ -1,6 +1,6 @@
-import {XmlComponent} from "../../docx/xml-components";
+import { XmlComponent } from "../../docx/xml-components";
-import {ParagraphPropertiesDefaults} from "./paragraph-properties";
+import { ParagraphPropertiesDefaults } from "./paragraph-properties";
-import {RunPropertiesDefaults} from "./run-properties";
+import { RunPropertiesDefaults } from "./run-properties";
 
 export class DocumentDefaults extends XmlComponent {
 
@@ -14,11 +14,4 @@ export class DocumentDefaults extends XmlComponent {
         this.root.push(this.runPropertiesDefaults);
         this.root.push(this.paragraphPropertiesDefaults);
     }
-
+}
-    clearVariables(): void {
-        this.runPropertiesDefaults.clearVariables();
-        this.paragraphPropertiesDefaults.clearVariables();
-        delete this.runPropertiesDefaults;
-        delete this.paragraphPropertiesDefaults;
-    }
-}

ts/styles/defaults/paragraph-properties.ts

@@ -1,5 +1,5 @@
-import {XmlComponent} from "../../docx/xml-components";
+import { ParagraphProperties } from "../../docx/paragraph/properties";
-import {ParagraphProperties} from "../../docx/paragraph/properties";
+import { XmlComponent } from "../../docx/xml-components";
 
 export class ParagraphPropertiesDefaults extends XmlComponent {
 
@@ -7,4 +7,4 @@ export class ParagraphPropertiesDefaults extends XmlComponent {
         super("w:pPrDefault");
         this.root.push(new ParagraphProperties());
     }
-}
+}

ts/styles/defaults/run-properties.ts

@@ -1,5 +1,5 @@
-import {XmlComponent} from "../../docx/xml-components";
+import { RunProperties } from "../../docx/run/properties";
-import {RunProperties} from "../../docx/run/properties";
+import { XmlComponent } from "../../docx/xml-components";
 
 export class RunPropertiesDefaults extends XmlComponent {
 
@@ -7,4 +7,4 @@ export class RunPropertiesDefaults extends XmlComponent {
         super("w:rPrDefault");
         this.root.push(new RunProperties());
     }
-}
+}

ts/styles/factory.ts

@@ -1,56 +1,54 @@
-import {Styles} from "./";
+import { Color, Italics, Size } from "../docx/run/formatting";
-import {DocumentDefaults} from "./defaults";
+
-import {ParagraphPropertiesDefaults} from "./defaults/paragraph-properties";
+import { Styles } from "./";
-import {RunPropertiesDefaults} from "./defaults/run-properties";
+import { DocumentDefaults } from "./defaults";
-import {Heading1Style, Heading2Style, TitleStyle, Heading3Style, Heading4Style, Heading5Style, Heading6Style, ListParagraph} from "./style";
+import {
-// import {StyleAttributes} from "./style/attributes";
+    Heading1Style, Heading2Style, Heading3Style, Heading4Style, Heading5Style, Heading6Style,
-import {ParagraphProperties} from "../docx/paragraph/properties";
+    ListParagraph, TitleStyle,
-import {RunProperties} from "../docx/run/properties";
+} from "./style";
-import {Color, Size, Italics} from "../docx/run/formatting";
 
 export class DefaultStylesFactory {
 
-    newInstance(): Styles {
+    public newInstance(): Styles {
-        let styles = new Styles();
+        const styles = new Styles();
         styles.push(new DocumentDefaults());
 
-        let titleStyle = new TitleStyle();
+        const titleStyle = new TitleStyle();
         titleStyle.addRunProperty(new Size(56));
         styles.push(titleStyle);
 
-        let heading1Style = new Heading1Style();
+        const heading1Style = new Heading1Style();
         heading1Style.addRunProperty(new Color("2E74B5"));
         heading1Style.addRunProperty(new Size(32));
         styles.push(heading1Style);
 
-        let heading2Style = new Heading2Style();
+        const heading2Style = new Heading2Style();
         heading2Style.addRunProperty(new Color("2E74B5"));
         heading2Style.addRunProperty(new Size(26));
         styles.push(heading2Style);
 
-        let heading3Style = new Heading3Style();
+        const heading3Style = new Heading3Style();
         heading3Style.addRunProperty(new Color("1F4D78"));
         heading3Style.addRunProperty(new Size(24));
         styles.push(heading3Style);
 
-        let heading4Style = new Heading4Style();
+        const heading4Style = new Heading4Style();
         heading4Style.addRunProperty(new Color("2E74B5"));
         heading4Style.addRunProperty(new Italics());
         styles.push(heading4Style);
 
-        let heading5Style = new Heading5Style();
+        const heading5Style = new Heading5Style();
         heading5Style.addRunProperty(new Color("2E74B5"));
         styles.push(heading5Style);
 
-        let heading6Style = new Heading6Style();
+        const heading6Style = new Heading6Style();
         heading6Style.addRunProperty(new Color("1F4D78"));
         styles.push(heading6Style);
 
-        let listParagraph = new ListParagraph();
+        const listParagraph = new ListParagraph();
         // listParagraph.addParagraphProperty();
         styles.push(listParagraph);
 
-        // console.log(JSON.stringify(styles, null, "  "));
         return styles;
     }
-}
+}

ts/styles/index.ts

@@ -1,9 +1,6 @@
-import {XmlComponent} from "../docx/xml-components";
+import { DocumentAttributes } from "../docx/document/document-attributes";
-import {DocumentAttributes} from "../docx/document/document-attributes";
+import { XmlComponent } from "../docx/xml-components";
-import {DocumentDefaults} from "./defaults";
+import { ParagraphStyle } from "./style";
-import {LatentStyles} from "./latent-styles";
-import {LatentStyleException} from "./latent-styles/exceptions";
-import {LatentStyleExceptionAttributes} from "./latent-styles/exceptions/attributes";
 
 export class Styles extends XmlComponent {
 
@@ -15,7 +12,7 @@ export class Styles extends XmlComponent {
             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"
+            Ignorable: "w14 w15",
         }));
         // let latentStyles = new LatentStyles();
         // latentStyles.push(new LatentStyleException(new LatentStyleExceptionAttributes({
@@ -24,13 +21,14 @@ export class Styles extends XmlComponent {
         // this.root.push(latentStyles);
     }
 
-    push(style: XmlComponent): void {
+    public push(style: XmlComponent): Styles {
         this.root.push(style);
+        return this;
     }
 
-    clearVariables() {
+    public createParagraphStyle(styleId: string, name?: string): ParagraphStyle {
-        this.root.forEach(element => {
+        const para = new ParagraphStyle(styleId, name);
-            element.clearVariables();
+        this.push(para);
-        });
+        return para;
     }
-}
+}

ts/styles/latent-styles/exceptions.ts

@@ -0,0 +1,27 @@
+import { XmlAttributeComponent, XmlComponent } from "../../docx/xml-components";
+
+export interface ILatentStyleExceptionAttributesProperties {
+    name?: string;
+    uiPriority?: string;
+    qFormat?: string;
+    semiHidden?: string;
+    unhideWhenUsed?: string;
+}
+
+export class LatentStyleExceptionAttributes extends XmlAttributeComponent<ILatentStyleExceptionAttributesProperties> {
+    protected xmlKeys = {
+        name: "w:name",
+        uiPriority: "w:uiPriority",
+        qFormat: "w:qFormat",
+        semiHidden: "w:semiHidden",
+        unhideWhenUsed: "w:unhideWhenUsed",
+    };
+}
+
+export class LatentStyleException extends XmlComponent {
+
+    constructor(attributes: ILatentStyleExceptionAttributesProperties) {
+        super("w:lsdException");
+        this.root.push(new LatentStyleExceptionAttributes(attributes));
+    }
+}

ts/styles/latent-styles/exceptions/attributes.ts

@@ -1,31 +0,0 @@
-import {XmlComponent} from "../../../docx/xml-components";
-
-interface LatentStyleExceptionAttributesProperties {
-    name?: string;
-    uiPriority?: string;
-    qFormat?: string;
-    semiHidden?: string;
-    unhideWhenUsed?: string;
-}
-
-export class LatentStyleExceptionAttributes extends XmlComponent {
-    private _attr: Object;
-
-    xmlKeys = {
-        name: "w:name",
-        uiPriority: "w:uiPriority",
-        qFormat: "w:qFormat",
-        semiHidden: "w:semiHidden",
-        unhideWhenUsed: "w:unhideWhenUsed"
-    };
-
-    constructor(properties?: LatentStyleExceptionAttributesProperties) {
-        super("_attr");
-        this._attr = properties;
-
-        if (!properties) {
-            this._attr = {};
-        }
-        this._attr["xmlKeys"] = this.xmlKeys;
-    }
-}

ts/styles/latent-styles/exceptions/index.ts

@@ -1,10 +0,0 @@
-import {XmlComponent} from "../../../docx/xml-components";
-import {LatentStyleExceptionAttributes} from "./attributes";
-
-export class LatentStyleException extends XmlComponent {
-
-    constructor(attributes: LatentStyleExceptionAttributes) {
-        super("w:lsdException");
-        this.root.push(attributes);
-    }
-}

ts/styles/latent-styles/index.ts

@@ -1,5 +1,5 @@
-import {XmlComponent} from "../../docx/xml-components";
+import { XmlComponent } from "../../docx/xml-components";
-import {LatentStyleException} from "./exceptions";
+import { LatentStyleException } from "./exceptions";
 
 export class LatentStyles extends XmlComponent {
 
@@ -7,7 +7,7 @@ export class LatentStyles extends XmlComponent {
         super("w:latentStyles");
     }
 
-    push(latentException: LatentStyleException): void {
+    public push(latentException: LatentStyleException): void {
         this.root.push(latentException);
     }
-}
+}

ts/styles/sample/index.ts

@@ -1,3 +1,4 @@
+/* tslint:disable */
 function createLsdException(name, uiPriority, qFormat?, semiHidden?, unhideWhenUsed?) {
     'use strict';
 

ts/styles/style/attributes.ts

@@ -1,24 +0,0 @@
-import {XmlComponent} from "../../docx/xml-components";
-import {XmlAttributeComponent} from "../../docx/xml-components";
-
-interface StyleAttributesProperties {
-    type?: string;
-    styleId?: string;
-    default?: string;
-    customStyle?: string;
-    val?: string;
-}
-
-export class StyleAttributes extends XmlAttributeComponent {
-    private _attr: Object;
-
-    constructor(properties: StyleAttributesProperties) {
-        super({
-            type: "w:type",
-            styleId: "w:styleId",
-            default: "w:default",
-            customStyle: "w:customStyle",
-            val: "w:val"
-        }, properties);
-    }
-}

ts/styles/style/components.ts

@@ -1,13 +1,18 @@
-import {XmlComponent} from "../../docx/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../docx/xml-components";
-import {StyleAttributes} from "./attributes";
+
+interface IComponentAttributes {
+    val: string;
+}
+
+class ComponentAttributes extends XmlAttributeComponent<IComponentAttributes> {
+    protected xmlKeys = {val: "w:val"};
+}
 
 export class Name extends XmlComponent {
 
     constructor(value: string) {
         super("w:name");
-        this.root.push(new StyleAttributes({
+        this.root.push(new ComponentAttributes({val: value}));
-            val: value
-        }));
     }
 }
 
@@ -15,9 +20,7 @@ export class BasedOn extends XmlComponent {
 
     constructor(value: string) {
         super("w:basedOn");
-        this.root.push(new StyleAttributes({
+        this.root.push(new ComponentAttributes({val: value}));
-            val: value
-        }));
     }
 }
 
@@ -25,10 +28,7 @@ export class Next extends XmlComponent {
 
     constructor(value: string) {
         super("w:next");
-        this.root.push(new StyleAttributes({
+        this.root.push(new ComponentAttributes({val: value}));
-            styleId: "1",
-            val: value
-        }));
     }
 }
 
@@ -36,9 +36,7 @@ export class Link extends XmlComponent {
 
     constructor(value: string) {
         super("w:link");
-        this.root.push(new StyleAttributes({
+        this.root.push(new ComponentAttributes({val: value}));
-            val: value
-        }));
     }
 }
 
@@ -46,9 +44,8 @@ export class UiPriority extends XmlComponent {
 
     constructor(value: string) {
         super("w:uiPriority");
-        this.root.push(new StyleAttributes({
+        // TODO: this value should be a ST_DecimalNumber
-            val: value
+        this.root.push(new ComponentAttributes({val: value}));
-        }));
     }
 }
 
@@ -73,4 +70,4 @@ export class RsId extends XmlComponent {
 
 export class SemiHidden extends XmlComponent {
 
-}
+}

ts/styles/style/index.ts

@@ -1,63 +1,204 @@
-import {XmlComponent} from "../../docx/xml-components";
+import * as paragraph from "../../docx/paragraph/formatting";
-import {StyleAttributes} from "./attributes";
+import * as formatting from "../../docx/run/formatting";
-import {ParagraphProperties} from "../../docx/paragraph/properties";
+import { RunProperties } from "../../docx/run/properties";
-import {RunProperties} from "../../docx/run/properties";
+import { XmlAttributeComponent, XmlComponent } from "../../docx/xml-components";
-import {Name, BasedOn, Next, QuickFormat} from "./components";
+
+import { BasedOn, Name, Next, QuickFormat } from "./components";
+
+export interface IStyleAttributes {
+    type?: string;
+    styleId?: string;
+    default?: boolean;
+    customStyle?: string;
+}
+
+class StyleAttributes extends XmlAttributeComponent<IStyleAttributes> {
+    protected xmlKeys = {
+        type: "w:type",
+        styleId: "w:styleId",
+        default: "w:default",
+        customStyle: "w:customStyle",
+    };
+}
 
 export class Style extends XmlComponent {
 
-    constructor(attributes: StyleAttributes) {
+    constructor(attributes: IStyleAttributes, name?: string) {
         super("w:style");
-        this.root.push(attributes);
+        this.root.push(new StyleAttributes(attributes));
+        if (name) {
+            this.root.push(new Name(name));
+        }
     }
 
-    push(styleSegment: XmlComponent): void {
+    public push(styleSegment: XmlComponent): void {
         this.root.push(styleSegment);
     }
 }
 
 export class ParagraphStyle extends Style {
 
-    private paragraphProperties: ParagraphProperties;
+    private paragraphProperties: paragraph.ParagraphProperties;
     private runProperties: RunProperties;
 
-    constructor(styleId: string) {
+    constructor(styleId: string, name?: string) {
-
+        super({type: "paragraph", styleId: styleId}, name);
-        let attributes = new StyleAttributes({
+        this.paragraphProperties = new paragraph.ParagraphProperties();
-            type: "paragraph",
-            styleId: styleId
-        });
-        super(attributes);
-        this.paragraphProperties = new ParagraphProperties();
         this.runProperties = new RunProperties();
         this.root.push(this.paragraphProperties);
         this.root.push(this.runProperties);
     }
 
-    clearVariables(): void {
+    public addParagraphProperty(property: XmlComponent): void {
-        this.paragraphProperties.clearVariables();
-        this.runProperties.clearVariables();
-        delete this.paragraphProperties;
-        delete this.runProperties;
-    }
-
-    addParagraphProperty(property: XmlComponent): void {
         this.paragraphProperties.push(property);
     }
 
-    addRunProperty(property: XmlComponent): void {
+    public addRunProperty(property: XmlComponent): void {
         this.runProperties.push(property);
     }
+
+    public basedOn(parentId: string): ParagraphStyle {
+        this.root.push(new BasedOn(parentId));
+        return this;
+    }
+
+    public quickFormat(): ParagraphStyle {
+        this.root.push(new QuickFormat());
+        return this;
+    }
+
+    public next(nextId: string): ParagraphStyle {
+        this.root.push(new Next(nextId));
+        return this;
+    }
+
+    // ----------  Run formatting ---------------------- //
+
+    public size(twips: number): ParagraphStyle {
+        this.addRunProperty(new formatting.Size(twips));
+        return this;
+    }
+
+    public bold(): ParagraphStyle {
+        this.addRunProperty(new formatting.Bold());
+        return this;
+    }
+
+    public italics(): ParagraphStyle {
+        this.addRunProperty(new formatting.Italics());
+        return this;
+    }
+
+    public smallCaps(): ParagraphStyle {
+        this.addRunProperty(new formatting.SmallCaps());
+        return this;
+    }
+
+    public allCaps(): ParagraphStyle {
+        this.addRunProperty(new formatting.Caps());
+        return this;
+    }
+
+    public strike(): ParagraphStyle {
+        this.addRunProperty(new formatting.Strike());
+        return this;
+    }
+
+    public doubleStrike(): ParagraphStyle {
+        this.addRunProperty(new formatting.DoubleStrike());
+        return this;
+    }
+
+    public subScript(): ParagraphStyle {
+        this.addRunProperty(new formatting.SubScript());
+        return this;
+    }
+
+    public superScript(): ParagraphStyle {
+        this.addRunProperty(new formatting.SuperScript());
+        return this;
+    }
+
+    public underline(underlineType?: string, color?: string): ParagraphStyle {
+        this.addRunProperty(new formatting.Underline(underlineType, color));
+        return this;
+    }
+
+    public color(color: string): ParagraphStyle {
+        this.addRunProperty(new formatting.Color(color));
+        return this;
+    }
+
+    public font(fontName: string): ParagraphStyle {
+        this.addRunProperty(new formatting.RunFonts(fontName));
+        return this;
+    }
+
+    // --------------------- Paragraph formatting ------------------------ //
+
+    public center(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.Alignment("center"));
+        return this;
+    }
+
+    public left(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.Alignment("left"));
+        return this;
+    }
+
+    public right(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.Alignment("right"));
+        return this;
+    }
+
+    public justified(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.Alignment("both"));
+        return this;
+    }
+
+    public thematicBreak(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.ThematicBreak());
+        return this;
+    }
+
+    public maxRightTabStop(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.MaxRightTabStop());
+        return this;
+    }
+
+    public leftTabStop(position: number): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.LeftTabStop(position));
+        return this;
+    }
+
+    public indent(left: number, hanging?: number): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.Indent(left, hanging));
+        return this;
+    }
+
+    public spacing(params: paragraph.ISpacingProperties): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.Spacing(params));
+        return this;
+    }
+
+    public keepNext(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.KeepNext());
+        return this;
+    }
+
+    public keepLines(): ParagraphStyle {
+        this.addParagraphProperty(new paragraph.KeepLines());
+        return this;
+    }
 }
 
 export class HeadingStyle extends ParagraphStyle {
 
     constructor(styleId: string, name: string) {
-        super(styleId);
+        super(styleId, name);
-        this.root.push(new Name(name));
+        this.basedOn("Normal");
-        this.root.push(new BasedOn("Normal"));
+        this.next("Normal");
-        this.root.push(new Next("Normal"));
+        this.quickFormat();
-        this.root.push(new QuickFormat());
     }
 }
 
@@ -118,4 +259,4 @@ export class ListParagraph extends ParagraphStyle {
         this.root.push(new BasedOn("Normal"));
         this.root.push(new QuickFormat());
     }
-}
+}