Version bump

Merge pull request #1567 from dolanmiu/dependabot/npm_and_yarn/types/sinon-10.0.12
build(deps-dev): bump @types/sinon from 10.0.11 to 10.0.12
2022-07-04 03:03:36 +01:00 · 2022-06-30 21:32:26 +01:00 · 2022-06-30 21:32:17 +01:00 · 2022-06-30 21:32:06 +01:00 · 2022-06-29 11:01:00 +00:00 · 2022-06-28 11:01:35 +00:00
398 changed files with 10560 additions and 1543 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,2 @@
+# https://prettier.io/docs/en/options.html#end-of-line
+* text=auto eol=lf
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@ -15,7 +15,7 @@ jobs:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Build
              run: npm run build
            - name: Archive Production Artifact
@ -30,7 +30,7 @@ jobs:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Test
              run: npm run test.coverage
            - name: Codecov
@ -45,7 +45,7 @@ jobs:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Lint
              run: npm run lint
    prettier:
@ -55,6 +55,6 @@ jobs:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Prettier
              run: npm run style
--- a/.github/workflows/demos.yml
+++ b/.github/workflows/demos.yml
@ -15,7 +15,7 @@ jobs:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Build
              run: npm run build
            - name: Archive Production Artifact
@ -31,7 +31,7 @@ jobs:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Download Artifact
              uses: actions/download-artifact@master
              with:
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@ -12,7 +12,7 @@ jobs:
            - name: Checkout Repo
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Build 🔧
              run: |
                  npm run typedoc
@ -30,7 +30,7 @@ jobs:
            - name: Checkout Repo 🛎️
              uses: actions/checkout@master
            - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
            - name: Download Artifact
              uses: actions/download-artifact@master
              with:
--- a/.mocharc.json
+++ b/.mocharc.json
@ -0,0 +1,13 @@
+{
+    "diff": true,
+    "spec": "src/**/*.ts",
+    "extension": ["ts"],
+    "package": "./package.json",
+    "reporter": "spec",
+    "slow": "75",
+    "timeout": "2000",
+    "ui": "bdd",
+    "watch-files": ["src/**/*.ts"],
+    "watch-ignore": ["build", "demo"],
+    "require": ["mocha.env", "ts-node/register", "tsconfig-paths/register"]
+}
--- a/.nycrc
+++ b/.nycrc
@ -1,9 +1,9 @@
 {
  "check-coverage": true,
-  "statements": 99.32,
-  "branches": 96.27,
-  "functions": 99.11,
-  "lines": 99.32,
+  "statements": 99.43,
+  "branches": 96.6,
+  "functions": 99.47,
+  "lines": 99.43,
  "include": [
    "src/**/*.ts"
  ],
--- a/README.md
+++ b/README.md
@ -11,7 +11,6 @@
 [![NPM version][npm-image]][npm-url]
 [![Downloads per month][downloads-image]][downloads-url]
 [![GitHub Action Workflow Status][github-actions-workflow-image]][github-actions-workflow-url]
-[![Dependency Status][daviddm-image]][daviddm-url]
 [![Known Vulnerabilities][snky-image]][snky-url]
 [![Chat on Gitter][gitter-image]][gitter-url]
 [![PRs Welcome][pr-image]][pr-url]
@ -105,8 +104,6 @@ Made with 💖
 [downloads-url]: https://npmjs.org/package/docx
 [github-actions-workflow-image]: https://github.com/dolanmiu/docx/workflows/Default/badge.svg
 [github-actions-workflow-url]: https://github.com/dolanmiu/docx/actions
-[daviddm-image]: https://david-dm.org/dolanmiu/docx.svg?theme=shields.io
-[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
--- a/demo/26-paragraph-borders.ts
+++ b/demo/26-paragraph-borders.ts
@ -1,7 +1,7 @@
 // Creates two paragraphs, one with a border and one without
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { BorderStyle, Document, Packer, Paragraph } from "../build";
+import { BorderStyle, Document, Packer, Paragraph, TextRun } from "../build";

 const doc = new Document({
    sections: [
@ -25,6 +25,25 @@ const doc = new Document({
                        },
                    },
                }),
+                new Paragraph({
+                    children: [
+                        new TextRun({
+                            text: "This will ",
+                        }),
+                        new TextRun({
+                            text: "have a border.",
+                            border: {
+                                color: "auto",
+                                space: 1,
+                                style: BorderStyle.SINGLE,
+                                size: 6,
+                            },
+                        }),
+                        new TextRun({
+                            text: " This will not.",
+                        }),
+                    ],
+                }),
            ],
        },
    ],
--- a/demo/3-numbering-and-bullet-points.ts
+++ b/demo/3-numbering-and-bullet-points.ts
@ -1,7 +1,7 @@
 // Numbering and bullet points example
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { AlignmentType, convertInchesToTwip, Document, HeadingLevel, LevelFormat, Packer, Paragraph } from "../build";
+import { AlignmentType, convertInchesToTwip, Document, Footer, Header, HeadingLevel, LevelFormat, Packer, Paragraph } from "../build";

 const doc = new Document({
    numbering: {
@ -119,6 +119,46 @@ const doc = new Document({
    },
    sections: [
        {
+            headers: {
+                default: new Header({
+                    children: [
+                        new Paragraph({
+                            text: "Hey you",
+                            numbering: {
+                                reference: "my-crazy-numbering",
+                                level: 0,
+                            },
+                        }),
+                        new Paragraph({
+                            text: "What's up fam",
+                            numbering: {
+                                reference: "my-crazy-numbering",
+                                level: 1,
+                            },
+                        }),
+                    ],
+                }),
+            },
+            footers: {
+                default: new Footer({
+                    children: [
+                        new Paragraph({
+                            text: "Hey you",
+                            numbering: {
+                                reference: "my-crazy-numbering",
+                                level: 0,
+                            },
+                        }),
+                        new Paragraph({
+                            text: "What's up fam",
+                            numbering: {
+                                reference: "my-crazy-numbering",
+                                level: 1,
+                            },
+                        }),
+                    ],
+                }),
+            },
            children: [
                new Paragraph({
                    text: "Hey you",
--- a/demo/72-word-wrap.ts
+++ b/demo/72-word-wrap.ts
@ -0,0 +1,37 @@
+// Example on how to preserve word wrap text. Works with all languages.
+// Import from 'docx' rather than '../build' if you install from npm
+import * as fs from "fs";
+import { Document, Packer, Paragraph, TextRun, SpaceType } from "../build";
+
+const doc = new Document({
+    sections: [
+        {
+            children: [
+                new Paragraph({
+                    children: [
+                        new TextRun("我今天遛狗去公园"),
+                        new TextRun({
+                            text: "456435234523456435564745673456345456435234523456435564745673456345456435234523456435564745673456345456435234523456435564745673456345456435234523456435564745673456345",
+                            space: SpaceType.PRESERVE,
+                        }),
+                    ],
+                }),
+                new Paragraph({
+                    children: [
+                        new TextRun(
+                            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua",
+                        ),
+                        new TextRun({
+                            text: "456435234523456435564745673456345456435234523456435564745673456345456435234523456435564745673456345456435234523456435564745673456345456435234523456435564745673456345",
+                            space: SpaceType.PRESERVE,
+                        }),
+                    ],
+                }),
+            ],
+        },
+    ],
+});
+
+Packer.toBuffer(doc).then((buffer) => {
+    fs.writeFileSync("My Document.docx", buffer);
+});
--- a/demo/73-comments.ts
+++ b/demo/73-comments.ts
@ -0,0 +1,36 @@
+// Simple example to add comments to a document
+// Import from 'docx' rather than '../build' if you install from npm
+import * as fs from "fs";
+import { Document, Packer, Paragraph, TextRun, CommentRangeStart, CommentRangeEnd, CommentReference } from "../build";
+
+const doc = new Document({
+    comments: {
+        children: [{ id: 0, author: "Ray Chen", date: new Date(), text: "comment text content" }],
+    },
+    sections: [
+        {
+            properties: {},
+            children: [
+                new Paragraph({
+                    children: [
+                        new TextRun("Hello World"),
+                        new CommentRangeStart(0),
+                        new TextRun({
+                            text: "Foo Bar",
+                            bold: true,
+                        }),
+                        new CommentRangeEnd(0),
+                        new TextRun({
+                            children: [new CommentReference(0)],
+                            bold: true,
+                        }),
+                    ],
+                }),
+            ],
+        },
+    ],
+});
+
+Packer.toBuffer(doc).then((buffer) => {
+    fs.writeFileSync("My Document.docx", buffer);
+});
--- a/docs/usage/comments.md
+++ b/docs/usage/comments.md
@ -0,0 +1,17 @@
+# Comments
+
+!> Comments requires an understanding of [Sections](usage/sections.md) and [Paragraphs](usage/paragraph.md).
+
+## Intro
+
+To add comments in `docx`, a `comments` block is specified in the `Document`. This block defines all the comments in your document. Each comment has an `id`, which you then reference later.
+
+In the spot you want to add a comment, you simply add a `CommentRangeStart` and a `CommentRangeEnd` to specify where the comment starts and ends.
+
+Alternatively, you can use `CommentReference` to specify a comment at a specific singular point.
+
+### Example
+
+[Example](https://raw.githubusercontent.com/dolanmiu/docx/master/demo/73-comments.ts ':include')
+
+_Source: https://github.com/dolanmiu/docx/blob/master/demo/73-comments.ts_
--- a/docs/usage/headers-and-footers.md
+++ b/docs/usage/headers-and-footers.md
@ -42,6 +42,17 @@ Example showing basic header and footer

 _Source: https://github.com/dolanmiu/docx/blob/master/demo/8-header-footer.ts_

+## Different First Page
+
+To specify `'Different First Page'`, set `titlePage: true` in the sections array as shown below.
+
+```
+sections: [
+        {
+          properties: {
+            titlePage: true,
+```
+
 ## Multiple Headers and Footers

 More headers and footers can be accomplished by creating more `Section`. New headers and footers can be set per `Section`
--- a/docs/usage/tables.md
+++ b/docs/usage/tables.md
@ -104,7 +104,7 @@ Here is a list of options you can add to the `table row`:
 | children    | `Array<TableCell>`                     | Required |
 | cantSplit   | `boolean`                              | Optional |
 | tableHeader | `boolean`                              | Optional |
-| height      | `{ height: number, rule: HeightRule }` | Optional |
+| height      | `{ value: number, rule: HeightRule }`  | Optional |

 ### Repeat row

--- a/mocha.env
+++ b/mocha.env
@ -0,0 +1 @@
+process.env.TS_NODE_PROJECT = 'tsconfig.spec.json'
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,11 +1,11 @@
 {
  "name": "docx",
-  "version": "7.3.0",
+  "version": "7.4.0",
  "description": "Easily generate .docx files with JS/TS with a nice declarative API. Works for Node and on the Browser.",
  "main": "build/index.js",
  "scripts": {
    "pretest": "rimraf ./build",
-    "test": "cross-env TS_NODE_PROJECT=\"tsconfig.spec.json\" mocha -r ts-node/register -r tsconfig-paths/register \"src/**/*.ts\"",
+    "test": "mocha --config=.mocharc.json",
    "test.coverage": "nyc npm test",
    "test.watch": "npm test -- --watch",
    "prepublishOnly": "npm run build --production",
@ -49,7 +49,7 @@
  ],
  "types": "./build/index.d.ts",
  "dependencies": {
-    "@types/node": "^17.0.0",
+    "@types/node": "^18.0.0",
    "jszip": "^3.1.5",
    "nanoid": "^3.1.20",
    "xml": "^1.0.1",
@ -73,11 +73,10 @@
    "@types/webpack": "^5.0.0",
    "buffer": "^6.0.3",
    "chai": "^3.5.0",
-    "cross-env": "^7.0.3",
    "docsify-cli": "^4.3.0",
-    "glob": "^7.1.2",
+    "glob": "^8.0.1",
    "jszip": "^3.1.5",
-    "mocha": "^9.0.2",
+    "mocha": "^10.0.0",
    "nyc": "^15.1.0",
    "pre-commit": "^1.2.2",
    "prettier": "^2.3.1",
@ -88,15 +87,16 @@
    "request-promise": "^4.2.2",
    "rimraf": "^3.0.2",
    "shelljs": "^0.8.4",
-    "sinon": "^12.0.1",
+    "sinon": "^14.0.0",
    "stream-browserify": "^3.0.0",
    "ts-loader": "^9.0.0",
    "ts-node": "^10.2.1",
-    "tsconfig-paths": "^3.9.0",
+    "tsconfig-paths": "^4.0.0",
+    "tsconfig-paths-webpack-plugin": "^3.5.2",
    "tslint": "^6.1.3",
    "tslint-immutable": "^6.0.1",
-    "typedoc": "^0.22.3",
-    "typescript": "4.5.4",
+    "typedoc": "^0.23.2",
+    "typescript": "4.7.4",
    "unzipper": "^0.10.11",
    "webpack": "^5.28.0",
    "webpack-cli": "^4.6.0"
--- a/scripts/types-absolute-fixer.ts
+++ b/scripts/types-absolute-fixer.ts
@ -6,9 +6,9 @@ const files = glob.sync("build/**/*.d.ts");
 for (const file of files) {
    replaceInFile({
        files: file,
-        from: /"file[a-z/-]*"/gi,
+        from: /"@[a-z/-]*"/gi,
        to: (match) => {
-            const matchSlug = match.replace(/['"]+/g, "").trim();
+            const matchSlug = match.replace(/['"]+/g, "").replace(/[@]+/g, "").trim();
            const levelCount = file.split("/").length - 2;
            const backLevels = Array(levelCount).fill("../").join("");

--- a/src/export/formatter.spec.ts
+++ b/src/export/formatter.spec.ts
@ -2,9 +2,9 @@ import { assert, expect } from "chai";
 import * as sinon from "sinon";

 import { Formatter } from "@export/formatter";
-import { Paragraph, TextRun } from "file";
-import { CoreProperties } from "file/core-properties";
-import { Attributes } from "file/xml-components";
+import { CoreProperties } from "@file/core-properties";
+import { Paragraph, TextRun } from "@file/paragraph";
+import { Attributes } from "@file/xml-components";

 describe("Formatter", () => {
    let formatter: Formatter;
--- a/src/export/formatter.ts
+++ b/src/export/formatter.ts
@ -1,4 +1,4 @@
-import { BaseXmlComponent, IContext, IXmlableObject } from "file/xml-components";
+import { BaseXmlComponent, IContext, IXmlableObject } from "@file/xml-components";

 export class Formatter {
    // tslint:disable-next-line: no-object-literal-type-assertion
--- a/src/export/packer/image-replacer.spec.ts
+++ b/src/export/packer/image-replacer.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Media } from "file";
+import { Media } from "@file/media";

 import { ImageReplacer } from "./image-replacer";

--- a/src/export/packer/image-replacer.ts
+++ b/src/export/packer/image-replacer.ts
@ -1,4 +1,4 @@
-import { IMediaData, Media } from "file/media";
+import { IMediaData, Media } from "@file/media";

 export class ImageReplacer {
    public replace(xmlData: string, mediaData: IMediaData[], offset: number): string {
--- a/src/export/packer/next-compiler.spec.ts
+++ b/src/export/packer/next-compiler.spec.ts
@ -2,7 +2,9 @@
 import { expect } from "chai";
 import * as sinon from "sinon";

-import { File, Footer, Header, Paragraph } from "file";
+import { File } from "@file/file";
+import { Footer, Header } from "@file/header";
+import { Paragraph } from "@file/paragraph";

 import { Compiler } from "./next-compiler";

@ -18,12 +20,15 @@ describe("Compiler", () => {
            this.timeout(99999999);
            const file = new File({
                sections: [],
+                comments: {
+                    children: [],
+                },
            });
            const zipFile = compiler.compile(file);
            const fileNames = Object.keys(zipFile.files).map((f) => zipFile.files[f].name);

            expect(fileNames).is.an.instanceof(Array);
-            expect(fileNames).has.length(16);
+            expect(fileNames).has.length(17);
            expect(fileNames).to.include("word/document.xml");
            expect(fileNames).to.include("word/styles.xml");
            expect(fileNames).to.include("docProps/core.xml");
@ -33,6 +38,7 @@ describe("Compiler", () => {
            expect(fileNames).to.include("word/footnotes.xml");
            expect(fileNames).to.include("word/_rels/footnotes.xml.rels");
            expect(fileNames).to.include("word/settings.xml");
+            expect(fileNames).to.include("word/comments.xml");
            expect(fileNames).to.include("word/_rels/document.xml.rels");
            expect(fileNames).to.include("[Content_Types].xml");
            expect(fileNames).to.include("_rels/.rels");
@ -43,19 +49,27 @@ describe("Compiler", () => {
                sections: [
                    {
                        headers: {
-                            default: new Header(),
+                            default: new Header({
+                                children: [new Paragraph("test")],
+                            }),
                        },
                        footers: {
-                            default: new Footer(),
+                            default: new Footer({
+                                children: [new Paragraph("test")],
+                            }),
                        },
                        children: [],
                    },
                    {
                        headers: {
-                            default: new Header(),
+                            default: new Header({
+                                children: [new Paragraph("test")],
+                            }),
                        },
                        footers: {
-                            default: new Footer(),
+                            default: new Footer({
+                                children: [new Paragraph("test")],
+                            }),
                        },
                        children: [],
                    },
@ -68,7 +82,7 @@ describe("Compiler", () => {
            const fileNames = Object.keys(zipFile.files).map((f) => zipFile.files[f].name);

            expect(fileNames).is.an.instanceof(Array);
-            expect(fileNames).has.length(24);
+            expect(fileNames).has.length(25);

            expect(fileNames).to.include("word/header1.xml");
            expect(fileNames).to.include("word/_rels/header1.xml.rels");
@ -99,5 +113,39 @@ describe("Compiler", () => {
            compiler.compile(file);
            expect(spy.callCount).to.equal(12);
        });
+
+        it("should work with media datas", () => {
+            // This test is required because before, there was a case where Document was formatted twice, which was inefficient
+            // This also caused issues such as running prepForXml multiple times as format() was ran multiple times.
+            const paragraph = new Paragraph("");
+            const file = new File({
+                sections: [
+                    {
+                        properties: {},
+                        children: [paragraph],
+                    },
+                ],
+            });
+
+            // tslint:disable-next-line: no-string-literal
+            sinon.stub(compiler["imageReplacer"], "getMediaData").returns([
+                {
+                    stream: Buffer.from(""),
+                    fileName: "test",
+                    transformation: {
+                        pixels: {
+                            x: 100,
+                            y: 100,
+                        },
+                        emus: {
+                            x: 100,
+                            y: 100,
+                        },
+                    },
+                },
+            ]);
+
+            compiler.compile(file);
+        });
    });
 });
--- a/src/export/packer/next-compiler.ts
+++ b/src/export/packer/next-compiler.ts
@ -1,10 +1,12 @@
 import * as JSZip from "jszip";
 import * as xml from "xml";

-import { File } from "file";
+import { File } from "@file/file";
+
 import { Formatter } from "../formatter";
 import { ImageReplacer } from "./image-replacer";
 import { NumberingReplacer } from "./numbering-replacer";
+import { PrettityType } from "./packer";

 interface IXmlifyedFile {
    readonly data: string;
@ -28,6 +30,7 @@ interface IXmlifyedFileMapping {
    readonly FootNotes: IXmlifyedFile;
    readonly FootNotesRelationships: IXmlifyedFile;
    readonly Settings: IXmlifyedFile;
+    readonly Comments?: IXmlifyedFile;
 }

 export class Compiler {
@ -41,7 +44,7 @@ export class Compiler {
        this.numberingReplacer = new NumberingReplacer();
    }

-    public compile(file: File, prettifyXml?: boolean): JSZip {
+    public compile(file: File, prettifyXml?: boolean | PrettityType): JSZip {
        const zip = new JSZip();
        const xmlifiedFileMapping = this.xmlifyFile(file, prettifyXml);
        const map = new Map<string, IXmlifyedFile | IXmlifyedFile[]>(Object.entries(xmlifiedFileMapping));
@ -64,7 +67,7 @@ export class Compiler {
        return zip;
    }

-    private xmlifyFile(file: File, prettify?: boolean): IXmlifyedFileMapping {
+    private xmlifyFile(file: File, prettify?: boolean | PrettityType): IXmlifyedFileMapping {
        const documentRelationshipCount = file.Document.Relationships.RelationshipCount + 1;

        const documentXmlData = xml(
@ -112,7 +115,6 @@ export class Compiler {
                data: (() => {
                    const xmlData = this.imageReplacer.replace(documentXmlData, documentMediaDatas, documentRelationshipCount);
                    const referenedXmlData = this.numberingReplacer.replace(xmlData, file.Numbering.ConcreteNumbering);
-
                    return referenedXmlData;
                })(),
                path: "word/document.xml",
@ -279,8 +281,10 @@ export class Compiler {
                // TODO: 0 needs to be changed when headers get relationships of their own
                const xmlData = this.imageReplacer.replace(tempXmlData, mediaDatas, 0);

+                const referenedXmlData = this.numberingReplacer.replace(xmlData, file.Numbering.ConcreteNumbering);
+
                return {
-                    data: xmlData,
+                    data: referenedXmlData,
                    path: `word/header${index + 1}.xml`,
                };
            }),
@ -301,8 +305,10 @@ export class Compiler {
                // TODO: 0 needs to be changed when headers get relationships of their own
                const xmlData = this.imageReplacer.replace(tempXmlData, mediaDatas, 0);

+                const referenedXmlData = this.numberingReplacer.replace(xmlData, file.Numbering.ConcreteNumbering);
+
                return {
-                    data: xmlData,
+                    data: referenedXmlData,
                    path: `word/footer${index + 1}.xml`,
                };
            }),
@ -399,6 +405,29 @@ export class Compiler {
                ),
                path: "word/settings.xml",
            },
+            Comments: {
+                data: (() => {
+                    if (!file.Comments) {
+                        return;
+                    }
+
+                    const data = xml(
+                        this.formatter.format(file.Comments, {
+                            viewWrapper: file.Document,
+                            file,
+                        }),
+                        {
+                            indent: prettify,
+                            declaration: {
+                                standalone: "yes",
+                                encoding: "UTF-8",
+                            },
+                        },
+                    );
+                    return data;
+                })(),
+                path: "word/comments.xml",
+            },
        };
    }
 }
--- a/src/export/packer/numbering-replacer.ts
+++ b/src/export/packer/numbering-replacer.ts
@ -1,4 +1,4 @@
-import { ConcreteNumbering } from "file";
+import { ConcreteNumbering } from "@file/numbering";

 export class NumberingReplacer {
    public replace(xmlData: string, concreteNumberings: ConcreteNumbering[]): string {
--- a/src/export/packer/packer.spec.ts
+++ b/src/export/packer/packer.spec.ts
@ -2,7 +2,8 @@
 import { assert } from "chai";
 import { mock, stub } from "sinon";

-import { File, HeadingLevel, Paragraph } from "file";
+import { File } from "@file/file";
+import { HeadingLevel, Paragraph } from "@file/paragraph";

 import { Packer } from "./packer";

--- a/src/export/packer/packer.ts
+++ b/src/export/packer/packer.ts
@ -1,8 +1,19 @@
-import { File } from "file";
+import { File } from "@file/file";
+
 import { Compiler } from "./next-compiler";

+/**
+ * Use blanks to prettify
+ */
+export enum PrettityType {
+    NONE = "",
+    WITH_2_BLANKS = "  ",
+    WITH_4_BLANKS = "    ",
+    WITH_TAB = "\t",
+}
+
 export class Packer {
-    public static async toBuffer(file: File, prettify?: boolean): Promise<Buffer> {
+    public static async toBuffer(file: File, prettify?: boolean | PrettityType): Promise<Buffer> {
        const zip = this.compiler.compile(file, prettify);
        const zipData = await zip.generateAsync({
            type: "nodebuffer",
@ -13,7 +24,7 @@ export class Packer {
        return zipData;
    }

-    public static async toBase64String(file: File, prettify?: boolean): Promise<string> {
+    public static async toBase64String(file: File, prettify?: boolean | PrettityType): Promise<string> {
        const zip = this.compiler.compile(file, prettify);
        const zipData = await zip.generateAsync({
            type: "base64",
@ -24,7 +35,7 @@ export class Packer {
        return zipData;
    }

-    public static async toBlob(file: File, prettify?: boolean): Promise<Blob> {
+    public static async toBlob(file: File, prettify?: boolean | PrettityType): Promise<Blob> {
        const zip = this.compiler.compile(file, prettify);
        const zipData = await zip.generateAsync({
            type: "blob",
--- a/src/file/app-properties/app-properties-attributes.ts
+++ b/src/file/app-properties/app-properties-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class AppPropertiesAttributes extends XmlAttributeComponent<{
    readonly xmlns: string;
--- a/src/file/app-properties/app-properties.ts
+++ b/src/file/app-properties/app-properties.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { AppPropertiesAttributes } from "./app-properties-attributes";

 export class AppProperties extends XmlComponent {
--- a/src/file/border/border.spec.ts
+++ b/src/file/border/border.spec.ts
@ -1,7 +1,7 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
-import { BorderStyle } from "file/border";
+import { Formatter } from "@export/formatter";
+import { BorderStyle } from "@file/border";

 import { BorderElement } from "./border";

--- a/src/file/border/border.ts
+++ b/src/file/border/border.ts
@ -19,8 +19,8 @@
 //     <xsd:attribute name="shadow" type="s:ST_OnOff" use="optional"/>
 //     <xsd:attribute name="frame" type="s:ST_OnOff" use="optional"/>
 // </xsd:complexType>
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
-import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "../values";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "@util/values";

 export interface IBorderOptions {
    readonly style: BorderStyle;
--- a/src/file/content-types/content-types-attributes.ts
+++ b/src/file/content-types/content-types-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class ContentTypeAttributes extends XmlAttributeComponent<{
    readonly xmlns?: string;
--- a/src/file/content-types/content-types.spec.ts
+++ b/src/file/content-types/content-types.spec.ts
@ -2,7 +2,7 @@

 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { ContentTypes } from "./content-types";

@ -102,7 +102,7 @@ describe("ContentTypes", () => {
            contentTypes.addFooter(102);
            const tree = new Formatter().format(contentTypes);

-            expect(tree["Types"][16]).to.deep.equal({
+            expect(tree["Types"][17]).to.deep.equal({
                Override: {
                    _attr: {
                        ContentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml",
@ -111,7 +111,7 @@ describe("ContentTypes", () => {
                },
            });

-            expect(tree["Types"][17]).to.deep.equal({
+            expect(tree["Types"][18]).to.deep.equal({
                Override: {
                    _attr: {
                        ContentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml",
@ -128,7 +128,7 @@ describe("ContentTypes", () => {
            contentTypes.addHeader(202);
            const tree = new Formatter().format(contentTypes);

-            expect(tree["Types"][16]).to.deep.equal({
+            expect(tree["Types"][17]).to.deep.equal({
                Override: {
                    _attr: {
                        ContentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml",
@ -137,7 +137,7 @@ describe("ContentTypes", () => {
                },
            });

-            expect(tree["Types"][17]).to.deep.equal({
+            expect(tree["Types"][18]).to.deep.equal({
                Override: {
                    _attr: {
                        ContentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml",
--- a/src/file/content-types/content-types.ts
+++ b/src/file/content-types/content-types.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { ContentTypeAttributes } from "./content-types-attributes";
 import { Default } from "./default/default";
 import { Override } from "./override/override";
@ -32,6 +32,7 @@ export class ContentTypes extends XmlComponent {
        this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml", "/word/numbering.xml"));
        this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml", "/word/footnotes.xml"));
        this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml", "/word/settings.xml"));
+        this.root.push(new Override("application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml", "/word/comments.xml"));
    }

    public addFooter(index: number): void {
--- a/src/file/content-types/default/default-attributes.ts
+++ b/src/file/content-types/default/default-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class DefaultAttributes extends XmlAttributeComponent<{
    readonly contentType: string;
--- a/src/file/content-types/default/default.ts
+++ b/src/file/content-types/default/default.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { DefaultAttributes } from "./default-attributes";

 export class Default extends XmlComponent {
--- a/src/file/content-types/override/override-attributes.ts
+++ b/src/file/content-types/override/override-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class OverrideAttributes extends XmlAttributeComponent<{
    readonly contentType: string;
--- a/src/file/content-types/override/override.ts
+++ b/src/file/content-types/override/override.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { OverrideAttributes } from "./override-attributes";

 export class Override extends XmlComponent {
--- a/src/file/core-properties/properties.spec.ts
+++ b/src/file/core-properties/properties.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { CoreProperties } from "./properties";

--- a/src/file/core-properties/properties.ts
+++ b/src/file/core-properties/properties.ts
@ -1,4 +1,7 @@
-import { StringContainer, XmlComponent } from "file/xml-components";
+import { ICommentsOptions } from "@file/paragraph/run/comment-run";
+import { StringContainer, XmlComponent } from "@file/xml-components";
+import { dateTimeValue } from "@util/values";
+
 import { ICustomPropertyOptions } from "../custom-properties";
 import { IDocumentBackgroundOptions } from "../document";

@ -7,7 +10,6 @@ import { ISectionOptions } from "../file";
 import { INumberingOptions } from "../numbering";
 import { Paragraph } from "../paragraph";
 import { IStylesOptions } from "../styles";
-import { dateTimeValue } from "../values";

 export interface IPropertiesOptions {
    readonly sections: ISectionOptions[];
@ -21,6 +23,7 @@ export interface IPropertiesOptions {
    readonly externalStyles?: string;
    readonly styles?: IStylesOptions;
    readonly numbering?: INumberingOptions;
+    readonly comments?: ICommentsOptions;
    readonly footnotes?: {
        readonly [key: string]: {
            readonly children: Paragraph[];
--- a/src/file/custom-properties/custom-properties-attributes.ts
+++ b/src/file/custom-properties/custom-properties-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class CustomPropertiesAttributes extends XmlAttributeComponent<{
    readonly xmlns: string;
--- a/src/file/custom-properties/custom-properties.spec.ts
+++ b/src/file/custom-properties/custom-properties.spec.ts
@ -1,5 +1,7 @@
 import { expect } from "chai";
-import { Formatter } from "export/formatter";
+
+import { Formatter } from "@export/formatter";
+
 import { CustomProperties } from "./custom-properties";

 describe("CustomProperties", () => {
--- a/src/file/custom-properties/custom-properties.ts
+++ b/src/file/custom-properties/custom-properties.ts
@ -1,4 +1,4 @@
-import { IContext, IXmlableObject, XmlComponent } from "file/xml-components";
+import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components";
 import { CustomPropertiesAttributes } from "./custom-properties-attributes";
 import { CustomProperty, ICustomPropertyOptions } from "./custom-property";

--- a/src/file/custom-properties/custom-property-attributes.ts
+++ b/src/file/custom-properties/custom-property-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class CustomPropertyAttributes extends XmlAttributeComponent<{
    readonly fmtid: string;
--- a/src/file/custom-properties/custom-property.ts
+++ b/src/file/custom-properties/custom-property.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { CustomPropertyAttributes } from "./custom-property-attributes";

 export interface ICustomPropertyOptions {
--- a/src/file/document/body/body.spec.ts
+++ b/src/file/document/body/body.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { Body } from "./body";
 import { sectionMarginDefaults } from "./section-properties";
--- a/src/file/document/body/body.ts
+++ b/src/file/document/body/body.ts
@ -1,6 +1,6 @@
-import { IContext, IXmlableObject, XmlComponent } from "file/xml-components";
+import { Paragraph, ParagraphProperties } from "@file/paragraph";
+import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components";

-import { Paragraph, ParagraphProperties } from "../..";
 import { ISectionPropertiesOptions, SectionProperties } from "./section-properties/section-properties";

 export class Body extends XmlComponent {
--- a/src/file/document/body/section-properties/properties/column.ts
+++ b/src/file/document/body/section-properties/properties/column.ts
@ -1,5 +1,5 @@
-import { twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { twipsMeasureValue } from "@util/values";

 export interface IColumnAttributes {
    readonly width: number | string;
--- a/src/file/document/body/section-properties/properties/columns.spec.ts
+++ b/src/file/document/body/section-properties/properties/columns.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { Column, Columns } from ".";

--- a/src/file/document/body/section-properties/properties/columns.ts
+++ b/src/file/document/body/section-properties/properties/columns.ts
@ -1,5 +1,6 @@
-import { decimalNumber, twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber, twipsMeasureValue } from "@util/values";
+
 import { Column } from "./column";

 // <xsd:complexType name="CT_Columns">
--- a/src/file/document/body/section-properties/properties/doc-grid.spec.ts
+++ b/src/file/document/body/section-properties/properties/doc-grid.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { DocumentGrid, DocumentGridType } from ".";

--- a/src/file/document/body/section-properties/properties/doc-grid.ts
+++ b/src/file/document/body/section-properties/properties/doc-grid.ts
@ -1,5 +1,5 @@
-import { decimalNumber } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber } from "@util/values";

 // not implemented
 // <xsd:simpleType name="ST_DocGrid">
--- a/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts
+++ b/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./header-footer-reference";

 describe("HeaderFooterReference", () => {
--- a/src/file/document/body/section-properties/properties/header-footer-reference.ts
+++ b/src/file/document/body/section-properties/properties/header-footer-reference.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";

 // <xsd:simpleType name="ST_HdrFtr">
 // <xsd:restriction base="xsd:string">
--- a/src/file/document/body/section-properties/properties/line-number.ts
+++ b/src/file/document/body/section-properties/properties/line-number.ts
@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPsectionLineNumbering.php
-import { decimalNumber, twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber, twipsMeasureValue } from "@util/values";

 // <xsd:simpleType name="ST_LineNumberRestart">
 // <xsd:restriction base="xsd:string">
--- a/src/file/document/body/section-properties/properties/page-borders.spec.ts
+++ b/src/file/document/body/section-properties/properties/page-borders.spec.ts
@ -1,7 +1,7 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
-import { BorderStyle } from "file/border";
+import { Formatter } from "@export/formatter";
+import { BorderStyle } from "@file/border";

 import { PageBorderDisplay, PageBorders, PageBorderZOrder } from "./page-borders";

--- a/src/file/document/body/section-properties/properties/page-borders.ts
+++ b/src/file/document/body/section-properties/properties/page-borders.ts
@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPsectionBorders.php
-import { BorderElement, IBorderOptions } from "file/border";
-import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "file/xml-components";
+import { BorderElement, IBorderOptions } from "@file/border";
+import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "@file/xml-components";

 // <xsd:simpleType name="ST_PageBorderDisplay">
 // <xsd:restriction base="xsd:string">
--- a/src/file/document/body/section-properties/properties/page-margin.ts
+++ b/src/file/document/body/section-properties/properties/page-margin.ts
@ -1,5 +1,5 @@
-import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values";

 // <xsd:complexType name="CT_PageMar">
 //     <xsd:attribute name="top" type="ST_SignedTwipsMeasure" use="required"/>
--- a/src/file/document/body/section-properties/properties/page-number.ts
+++ b/src/file/document/body/section-properties/properties/page-number.ts
@ -1,7 +1,7 @@
 // http://officeopenxml.com/WPSectionPgNumType.php
-import { NumberFormat } from "file/shared/number-format";
-import { decimalNumber } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { NumberFormat } from "@file/shared/number-format";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { decimalNumber } from "@util/values";

 // <xsd:simpleType name="ST_ChapterSep">
 // <xsd:restriction base="xsd:string">
--- a/src/file/document/body/section-properties/properties/page-size.spec.ts
+++ b/src/file/document/body/section-properties/properties/page-size.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { PageOrientation, PageSize } from "./page-size";

--- a/src/file/document/body/section-properties/properties/page-size.ts
+++ b/src/file/document/body/section-properties/properties/page-size.ts
@ -1,5 +1,5 @@
-import { twipsMeasureValue } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { twipsMeasureValue } from "@util/values";

 // <xsd:simpleType name="ST_PageOrientation">
 // <xsd:restriction base="xsd:string">
--- a/src/file/document/body/section-properties/properties/page-text-direction.spec.ts
+++ b/src/file/document/body/section-properties/properties/page-text-direction.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { PageTextDirection, PageTextDirectionType } from "./page-text-direction";

 describe("PageTextDirection", () => {
--- a/src/file/document/body/section-properties/properties/page-text-direction.ts
+++ b/src/file/document/body/section-properties/properties/page-text-direction.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";

 export enum PageTextDirectionType {
    LEFT_TO_RIGHT_TOP_TO_BOTTOM = "lrTb",
--- a/src/file/document/body/section-properties/properties/section-type.spec.ts
+++ b/src/file/document/body/section-properties/properties/section-type.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";
 import { SectionType, Type } from "./section-type";

 describe("Type", () => {
--- a/src/file/document/body/section-properties/properties/section-type.ts
+++ b/src/file/document/body/section-properties/properties/section-type.ts
@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPsection.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";

 // <xsd:simpleType name="ST_SectionMark">
 // <xsd:restriction base="xsd:string">
--- a/src/file/document/body/section-properties/section-properties.spec.ts
+++ b/src/file/document/body/section-properties/section-properties.spec.ts
@ -1,12 +1,12 @@
 import { expect } from "chai";

-import { convertInchesToTwip } from "convenience-functions";
-import { Formatter } from "export/formatter";
-import { FooterWrapper } from "file/footer-wrapper";
-import { HeaderWrapper } from "file/header-wrapper";
-import { Media } from "file/media";
-import { NumberFormat } from "file/shared/number-format";
-import { VerticalAlign } from "file/vertical-align";
+import { Formatter } from "@export/formatter";
+import { FooterWrapper } from "@file/footer-wrapper";
+import { HeaderWrapper } from "@file/header-wrapper";
+import { Media } from "@file/media";
+import { NumberFormat } from "@file/shared/number-format";
+import { VerticalAlign } from "@file/vertical-align";
+import { convertInchesToTwip } from "@util/convenience-functions";

 import { PageOrientation } from "./properties";
 import { DocumentGridType } from "./properties/doc-grid";
--- a/src/file/document/body/section-properties/section-properties.ts
+++ b/src/file/document/body/section-properties/section-properties.ts
@ -1,10 +1,10 @@
 // http://officeopenxml.com/WPsection.php
 // tslint:disable: no-unnecessary-initializer

-import { FooterWrapper } from "file/footer-wrapper";
-import { HeaderWrapper } from "file/header-wrapper";
-import { VerticalAlign, VerticalAlignElement } from "file/vertical-align";
-import { OnOffElement, XmlComponent } from "file/xml-components";
+import { FooterWrapper } from "@file/footer-wrapper";
+import { HeaderWrapper } from "@file/header-wrapper";
+import { VerticalAlign, VerticalAlignElement } from "@file/vertical-align";
+import { OnOffElement, XmlComponent } from "@file/xml-components";

 import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./properties/header-footer-reference";

--- a/src/file/document/document-attributes.ts
+++ b/src/file/document/document-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export interface IDocumentAttributesProperties {
    readonly wpc?: string;
@ -24,6 +24,22 @@ export interface IDocumentAttributesProperties {
    readonly dcmitype?: string;
    readonly xsi?: string;
    readonly type?: string;
+    readonly cx?: string;
+    readonly cx1?: string;
+    readonly cx2?: string;
+    readonly cx3?: string;
+    readonly cx4?: string;
+    readonly cx5?: string;
+    readonly cx6?: string;
+    readonly cx7?: string;
+    readonly cx8?: string;
+    readonly aink?: string;
+    readonly am3d?: string;
+    readonly w16cex?: string;
+    readonly w16cid?: string;
+    readonly w16?: string;
+    readonly w16sdtdh?: string;
+    readonly w16se?: string;
 }

 export class DocumentAttributes extends XmlAttributeComponent<IDocumentAttributesProperties> {
@ -51,5 +67,21 @@ export class DocumentAttributes extends XmlAttributeComponent<IDocumentAttribute
        dcmitype: "xmlns:dcmitype",
        xsi: "xmlns:xsi",
        type: "xsi:type",
+        cx: "xmlns:cx",
+        cx1: "xmlns:cx1",
+        cx2: "xmlns:cx2",
+        cx3: "xmlns:cx3",
+        cx4: "xmlns:cx4",
+        cx5: "xmlns:cx5",
+        cx6: "xmlns:cx6",
+        cx7: "xmlns:cx7",
+        cx8: "xmlns:cx8",
+        aink: "xmlns:aink",
+        am3d: "xmlns:am3d",
+        w16cex: "xmlns:w16cex",
+        w16cid: "xmlns:w16cid",
+        w16: "xmlns:w16",
+        w16sdtdh: "xmlns:w16sdtdh",
+        w16se: "xmlns:w16se",
    };
 }
--- a/src/file/document/document-background/document-background.spec.ts
+++ b/src/file/document/document-background/document-background.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { DocumentBackground } from "./document-background";

--- a/src/file/document/document-background/document-background.ts
+++ b/src/file/document/document-background/document-background.ts
@ -1,7 +1,7 @@
 // http://officeopenxml.com/WPdocument.php
 // http://www.datypic.com/sc/ooxml/e-w_background-1.html
-import { hexColorValue, uCharHexNumber } from "file/values";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
+import { hexColorValue, uCharHexNumber } from "@util/values";

 // <xsd:simpleType name="ST_ThemeColor">
 // <xsd:restriction base="xsd:string">
--- a/src/file/document/document.spec.ts
+++ b/src/file/document/document.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { Document } from "./document";

@ -31,11 +31,27 @@ describe("Document", () => {
                            "xmlns:w": "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
                            "xmlns:w14": "http://schemas.microsoft.com/office/word/2010/wordml",
                            "xmlns:w15": "http://schemas.microsoft.com/office/word/2012/wordml",
+                            "xmlns:w16": "http://schemas.microsoft.com/office/word/2018/wordml",
+                            "xmlns:w16cex": "http://schemas.microsoft.com/office/word/2018/wordml/cex",
+                            "xmlns:w16cid": "http://schemas.microsoft.com/office/word/2016/wordml/cid",
+                            "xmlns:w16sdtdh": "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash",
+                            "xmlns:w16se": "http://schemas.microsoft.com/office/word/2015/wordml/symex",
                            "xmlns:wpg": "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup",
                            "xmlns:wpi": "http://schemas.microsoft.com/office/word/2010/wordprocessingInk",
                            "xmlns:wne": "http://schemas.microsoft.com/office/word/2006/wordml",
                            "xmlns:wps": "http://schemas.microsoft.com/office/word/2010/wordprocessingShape",
                            "mc:Ignorable": "w14 w15 wp14",
+                            "xmlns:aink": "http://schemas.microsoft.com/office/drawing/2016/ink",
+                            "xmlns:am3d": "http://schemas.microsoft.com/office/drawing/2017/model3d",
+                            "xmlns:cx": "http://schemas.microsoft.com/office/drawing/2014/chartex",
+                            "xmlns:cx1": "http://schemas.microsoft.com/office/drawing/2015/9/8/chartex",
+                            "xmlns:cx2": "http://schemas.microsoft.com/office/drawing/2015/10/21/chartex",
+                            "xmlns:cx3": "http://schemas.microsoft.com/office/drawing/2016/5/9/chartex",
+                            "xmlns:cx4": "http://schemas.microsoft.com/office/drawing/2016/5/10/chartex",
+                            "xmlns:cx5": "http://schemas.microsoft.com/office/drawing/2016/5/11/chartex",
+                            "xmlns:cx6": "http://schemas.microsoft.com/office/drawing/2016/5/12/chartex",
+                            "xmlns:cx7": "http://schemas.microsoft.com/office/drawing/2016/5/13/chartex",
+                            "xmlns:cx8": "http://schemas.microsoft.com/office/drawing/2016/5/14/chartex",
                        },
                    },
                    {
--- a/src/file/document/document.ts
+++ b/src/file/document/document.ts
@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPdocument.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { ConcreteHyperlink, Paragraph } from "../paragraph";
 import { Table } from "../table";
 import { TableOfContents } from "../table-of-contents";
@ -53,6 +53,22 @@ 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",
+                cx: "http://schemas.microsoft.com/office/drawing/2014/chartex",
+                cx1: "http://schemas.microsoft.com/office/drawing/2015/9/8/chartex",
+                cx2: "http://schemas.microsoft.com/office/drawing/2015/10/21/chartex",
+                cx3: "http://schemas.microsoft.com/office/drawing/2016/5/9/chartex",
+                cx4: "http://schemas.microsoft.com/office/drawing/2016/5/10/chartex",
+                cx5: "http://schemas.microsoft.com/office/drawing/2016/5/11/chartex",
+                cx6: "http://schemas.microsoft.com/office/drawing/2016/5/12/chartex",
+                cx7: "http://schemas.microsoft.com/office/drawing/2016/5/13/chartex",
+                cx8: "http://schemas.microsoft.com/office/drawing/2016/5/14/chartex",
+                aink: "http://schemas.microsoft.com/office/drawing/2016/ink",
+                am3d: "http://schemas.microsoft.com/office/drawing/2017/model3d",
+                w16cex: "http://schemas.microsoft.com/office/word/2018/wordml/cex",
+                w16cid: "http://schemas.microsoft.com/office/word/2016/wordml/cid",
+                w16: "http://schemas.microsoft.com/office/word/2018/wordml",
+                w16sdtdh: "http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash",
+                w16se: "http://schemas.microsoft.com/office/word/2015/wordml/symex",
                Ignorable: "w14 w15 wp14",
            }),
        );
--- a/src/file/drawing/anchor/anchor-attributes.ts
+++ b/src/file/drawing/anchor/anchor-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 import { IDistance } from "../drawing";

 export interface IAnchorAttributes extends IDistance {
--- a/src/file/drawing/anchor/anchor.ts
+++ b/src/file/drawing/anchor/anchor.ts
@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating.php
-import { IMediaData, IMediaDataTransformation } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData, IMediaDataTransformation } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 import { IDrawingOptions } from "../drawing";
 import { HorizontalPosition, IFloating, SimplePos, VerticalPosition } from "../floating";
 import { Graphic } from "../inline/graphic";
--- a/src/file/drawing/doc-properties/doc-properties-attributes.ts
+++ b/src/file/drawing/doc-properties/doc-properties-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class DocPropertiesAttributes extends XmlAttributeComponent<{
    readonly id?: number;
--- a/src/file/drawing/doc-properties/doc-properties.ts
+++ b/src/file/drawing/doc-properties/doc-properties.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { DocPropertiesAttributes } from "./doc-properties-attributes";

 export class DocProperties extends XmlComponent {
--- a/src/file/drawing/drawing.spec.ts
+++ b/src/file/drawing/drawing.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { Drawing, IDrawingOptions } from "./drawing";

--- a/src/file/drawing/drawing.ts
+++ b/src/file/drawing/drawing.ts
@ -1,5 +1,5 @@
-import { IMediaData } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData } from "@file/media";
+import { XmlComponent } from "@file/xml-components";
 import { Anchor } from "./anchor";
 import { IFloating } from "./floating";
 import { Inline } from "./inline";
--- a/src/file/drawing/effect-extent/effect-extent-attributes.ts
+++ b/src/file/drawing/effect-extent/effect-extent-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class EffectExtentAttributes extends XmlAttributeComponent<{
    readonly b?: number;
--- a/src/file/drawing/effect-extent/effect-extent.ts
+++ b/src/file/drawing/effect-extent/effect-extent.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { EffectExtentAttributes } from "./effect-extent-attributes";

 export class EffectExtent extends XmlComponent {
--- a/src/file/drawing/extent/extent-attributes.ts
+++ b/src/file/drawing/extent/extent-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class ExtentAttributes extends XmlAttributeComponent<{
    readonly cx?: number;
--- a/src/file/drawing/extent/extent.ts
+++ b/src/file/drawing/extent/extent.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";

 import { ExtentAttributes } from "./extent-attributes";

--- a/src/file/drawing/floating/align.spec.ts
+++ b/src/file/drawing/floating/align.spec.ts
@ -1,7 +1,7 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
-import { VerticalPositionAlign } from "file/shared/alignment";
+import { Formatter } from "@export/formatter";
+import { VerticalPositionAlign } from "@file/shared/alignment";

 import { Align } from "./align";

--- a/src/file/drawing/floating/align.ts
+++ b/src/file/drawing/floating/align.ts
@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment";
-import { XmlComponent } from "file/xml-components";
+import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment";
+import { XmlComponent } from "@file/xml-components";

 export class Align extends XmlComponent {
    constructor(value: HorizontalPositionAlign | VerticalPositionAlign) {
--- a/src/file/drawing/floating/floating-position.ts
+++ b/src/file/drawing/floating/floating-position.ts
@ -1,6 +1,6 @@
 // http://officeopenxml.com/drwPicFloating-position.php
 // http://officeopenxml.com/drwPicFloating.php
-import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment";
+import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment";

 import { ITextWrapping } from "../text-wrap";

--- a/src/file/drawing/floating/horizontal-position.spec.ts
+++ b/src/file/drawing/floating/horizontal-position.spec.ts
@ -1,7 +1,7 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
-import { HorizontalPositionAlign } from "file/shared/alignment";
+import { Formatter } from "@export/formatter";
+import { HorizontalPositionAlign } from "@file/shared/alignment";

 import { HorizontalPositionRelativeFrom } from "./floating-position";
 import { HorizontalPosition } from "./horizontal-position";
--- a/src/file/drawing/floating/horizontal-position.ts
+++ b/src/file/drawing/floating/horizontal-position.ts
@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 import { Align } from "./align";
 import { HorizontalPositionRelativeFrom, IHorizontalPositionOptions } from "./floating-position";
 import { PositionOffset } from "./position-offset";
--- a/src/file/drawing/floating/position-offset.spec.ts
+++ b/src/file/drawing/floating/position-offset.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { PositionOffset } from "./position-offset";

--- a/src/file/drawing/floating/position-offset.ts
+++ b/src/file/drawing/floating/position-offset.ts
@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";

 export class PositionOffset extends XmlComponent {
    constructor(offsetValue: number) {
--- a/src/file/drawing/floating/simple-pos.spec.ts
+++ b/src/file/drawing/floating/simple-pos.spec.ts
@ -1,6 +1,6 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
+import { Formatter } from "@export/formatter";

 import { SimplePos } from "./simple-pos";

--- a/src/file/drawing/floating/simple-pos.ts
+++ b/src/file/drawing/floating/simple-pos.ts
@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";

 class SimplePosAttributes extends XmlAttributeComponent<{
    readonly x: number;
--- a/src/file/drawing/floating/vertical-position.spec.ts
+++ b/src/file/drawing/floating/vertical-position.spec.ts
@ -1,7 +1,7 @@
 import { expect } from "chai";

-import { Formatter } from "export/formatter";
-import { VerticalPositionAlign } from "file/shared/alignment";
+import { Formatter } from "@export/formatter";
+import { VerticalPositionAlign } from "@file/shared/alignment";

 import { VerticalPositionRelativeFrom } from "./floating-position";
 import { VerticalPosition } from "./vertical-position";
--- a/src/file/drawing/floating/vertical-position.ts
+++ b/src/file/drawing/floating/vertical-position.ts
@ -1,5 +1,5 @@
 // http://officeopenxml.com/drwPicFloating-position.php
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";
 import { Align } from "./align";
 import { IVerticalPositionOptions, VerticalPositionRelativeFrom } from "./floating-position";
 import { PositionOffset } from "./position-offset";
--- a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts
+++ b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class GraphicFrameLockAttributes extends XmlAttributeComponent<{
    readonly xmlns?: string;
--- a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts
+++ b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { GraphicFrameLockAttributes } from "./graphic-frame-lock-attributes";

 export class GraphicFrameLocks extends XmlComponent {
--- a/src/file/drawing/graphic-frame/graphic-frame-properties.ts
+++ b/src/file/drawing/graphic-frame/graphic-frame-properties.ts
@ -1,4 +1,4 @@
-import { XmlComponent } from "file/xml-components";
+import { XmlComponent } from "@file/xml-components";
 import { GraphicFrameLocks } from "./graphic-frame-locks/graphic-frame-locks";

 export class GraphicFrameProperties extends XmlComponent {
--- a/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts
@ -1,4 +1,4 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";

 export class GraphicDataAttributes extends XmlAttributeComponent<{
    readonly uri?: string;
--- a/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts
@ -1,5 +1,5 @@
-import { IMediaData, IMediaDataTransformation } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData, IMediaDataTransformation } from "@file/media";
+import { XmlComponent } from "@file/xml-components";

 import { GraphicDataAttributes } from "./graphic-data-attribute";
 import { Pic } from "./pic";
--- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts
@ -1,5 +1,5 @@
-import { IMediaData } from "file/media";
-import { XmlComponent } from "file/xml-components";
+import { IMediaData } from "@file/media";
+import { XmlComponent } from "@file/xml-components";

 import { Blip } from "./blip";
 import { SourceRectangle } from "./source-rectangle";
--- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
+++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts
@ -1,5 +1,5 @@
-import { IMediaData } from "file/media";
-import { XmlAttributeComponent, XmlComponent } from "file/xml-components";
+import { IMediaData } from "@file/media";
+import { XmlAttributeComponent, XmlComponent } from "@file/xml-components";

 class BlipAttributes extends XmlAttributeComponent<{
    readonly embed: string;
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`process.env.TS_NODE_PROJECT = 'tsconfig.spec.json'`