Version bump

#1583 Comments to always write default data

.cspell.json

@@ -0,0 +1,58 @@
+// cSpell Settings
+{
+    // Version of the setting file.  Always 0.2
+    "version": "0.2",
+    // language - current active spelling language
+    "language": "en_US",
+    "dictionaries": ["en_US", "typescript", "softwareTerms", "fonts", "npm"],
+    // words - list of words to be always considered correct
+    "words": [
+        "Xmlable",
+        "twip",
+        "twips",
+        "jsonify",
+        "falsey",
+        "aiueo",
+        "iroha",
+        "aiueo",
+        "iroha",
+        "chosung",
+        "Abjad",
+        "Initializable",
+        "rels",
+        "dolan",
+        "xmlify",
+        "Xmlifyed",
+        "xmlified",
+        "datas",
+        "jszip",
+        "rsid",
+        "NUMPAGES",
+        "ATLEAST",
+        "ooxml",
+        "clippy",
+        "docsify"
+    ],
+    "ignoreRegExpList": [
+        "/\"w:.+\"/",
+        "/\"s:.+\"/",
+        "/\"a:.+\"/",
+        "/\"pic:.+\"/",
+        "/\"xmlns:.+\"/",
+        "/\"vt:.+\"/",
+        "/[^\\s]{40,}/",
+        "/<xsd:.+/>/",
+        "/[A-Z_]+ = \".+\"/",
+        "/XmlAttributeComponent<{[^}]+}>/g",
+        "/xmlKeys = {[^}]+}/g",
+        "/\\.to\\.deep\\.equal\\({[^)]+}\\)/g",
+        "\\.to\\.include\\.members\\(\\[[^\\]]+]\\)",
+        "/new [a-zA-Z]+\\({[^£]+}\\)/g"
+    ],
+    "ignorePaths": ["package.json", "docs/api"],
+    "allowCompoundWords": true,
+    // flagWords - list of words to be always considered incorrect
+    // This is useful for offensive words and common spelling errors.
+    // For example "hte" should be "the"
+    "flagWords": ["hte"]
+}

.gitattributes

@@ -0,0 +1,2 @@
+# https://prettier.io/docs/en/options.html#end-of-line
+* text=auto eol=lf

.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,16 @@ jobs:
             - name: Checkout Repo
               uses: actions/checkout@master
             - name: Install Dependencies
-              run: npm ci
+              run: npm ci --force
             - name: Prettier
               run: npm run style
+    cspell:
+        name: CSpell
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout Repo
+              uses: actions/checkout@master
+            - name: Install Dependencies
+              run: npm ci --force
+            - name: Prettier
+              run: npm run cspell

.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:

.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:

.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"]
+}

.nycrc

@@ -1,9 +1,9 @@
 {
   "check-coverage": true,
-  "statements": 99.32,
-  "branches": 96.27,
-  "functions": 99.11,
-  "lines": 99.32,
+  "statements": 99.62,
+  "branches": 96.81,
+  "functions": 99.82,
+  "lines": 99.62,
   "include": [
     "src/**/*.ts"
   ],

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "streetsidesoftware.code-spell-checker"
+    ]
+}

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]
@@ -27,21 +26,21 @@
 
 Here are examples of `docx` being used with basic `HTML/JS` in a browser environment:
 
-*   https://codepen.io/dolanmiu/pen/RwNeObg
-*   https://jsfiddle.net/dolanmiu/onadx1gu/
+-   https://codepen.io/dolanmiu/pen/RwNeObg
+-   https://jsfiddle.net/dolanmiu/onadx1gu/
 
 Here is an example of `docx` working in `Angular`:
 
-*   https://stackblitz.com/edit/angular-docx
+-   https://stackblitz.com/edit/angular-docx
 
 Here is an example of `docx` working in `React`:
 
-*   https://stackblitz.com/edit/react-docx
-*   https://stackblitz.com/edit/react-docx-images (adding images to Word Document)
+-   https://stackblitz.com/edit/react-docx
+-   https://stackblitz.com/edit/react-docx-images (adding images to Word Document)
 
 Here is an example of `docx` working in `Vue.js`:
 
-*   https://stackblitz.com/edit/vuejs-docx
+-   https://stackblitz.com/edit/vuejs-docx
 
 ## Node
 
@@ -49,15 +48,15 @@ Press `endpoint` on the `RunKit` website:
 
 ![RunKit Instructions](https://user-images.githubusercontent.com/2917613/38582539-f84311b6-3d07-11e8-90db-5885ae02c3c4.png)
 
-*   https://runkit.com/dolanmiu/docx-demo1 - Simple paragraph and text
-*   https://runkit.com/dolanmiu/docx-demo2 - Advanced Paragraphs and text
-*   https://runkit.com/dolanmiu/docx-demo3 - Bullet points
-*   https://runkit.com/dolanmiu/docx-demo4 - Simple table
-*   https://runkit.com/dolanmiu/docx-demo5 - Images
-*   https://runkit.com/dolanmiu/docx-demo6 - Margins
-*   https://runkit.com/dolanmiu/docx-demo7 - Landscape
-*   https://runkit.com/dolanmiu/docx-demo8 - Header and Footer
-*   https://runkit.com/dolanmiu/docx-demo10 - **My CV generated with docx**
+-   https://runkit.com/dolanmiu/docx-demo1 - Simple paragraph and text
+-   https://runkit.com/dolanmiu/docx-demo2 - Advanced Paragraphs and text
+-   https://runkit.com/dolanmiu/docx-demo3 - Bullet points
+-   https://runkit.com/dolanmiu/docx-demo4 - Simple table
+-   https://runkit.com/dolanmiu/docx-demo5 - Images
+-   https://runkit.com/dolanmiu/docx-demo6 - Margins
+-   https://runkit.com/dolanmiu/docx-demo7 - Landscape
+-   https://runkit.com/dolanmiu/docx-demo8 - Header and Footer
+-   https://runkit.com/dolanmiu/docx-demo10 - **My CV generated with docx**
 
 More [here](https://github.com/dolanmiu/docx/tree/master/demo)
 
@@ -89,7 +88,6 @@ Read the contribution guidelines [here](https://docx.js.org/#/contribution-guide
 [<img src="https://i.imgur.com/PXo25um.png" alt="drawing" height="50"/>](https://www.circadianrisk.com/)
 [<img src="https://i.imgur.com/AKGhtlh.png" alt="drawing"/>](https://lexense.com/)
 
-
 ...and many more!
 
 ---
@@ -105,8 +103,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

demo/10-my-cv.ts

@@ -43,7 +43,7 @@ interface Skill {
     readonly name: string;
 }
 
-interface Achivement {
+interface Achievement {
     readonly issuer: string;
     readonly name: string;
 }
@@ -64,7 +64,7 @@ const experiences: Experience[] = [
     {
         isCurrent: false,
         summary:
-            "Full-stack developer working with Angular, Node and TypeScript. Working for the iShares platform. Emphasis on Dev-ops and developing the continous integration pipeline.",
+            "Full-stack developer working with Angular, Node and TypeScript. Working for the iShares platform. Emphasis on Dev-ops and developing the continuous integration pipeline.",
         title: "Software Developer",
         endDate: {
             month: 11,
@@ -98,6 +98,7 @@ const experiences: Experience[] = [
     {
         isCurrent: false,
         summary:
+            // cspell:disable-next-line
             "Develop web commerce platforms for various high profile clients.\n\nCreated a log analysis web application with the Play Framework in Java, incorporating Test Driven Development. It asynchronously uploads and processes large (2 GB) log files, and outputs meaningful results in context with the problem. \n\nAnalysis  and  development  of  the payment system infrastructure and user accounts section to be used by several clients of the company such as Waitrose, Tally Weijl, DJ Sports, Debenhams, Ann Summers, John Lewis and others.\n\nTechnologies used include WebSphere Commerce, Java, JavaScript and JSP.",
         title: "Java Developer",
         endDate: {
@@ -118,7 +119,7 @@ const education: Education[] = [
     {
         degree: "Master of Science (MSc)",
         fieldOfStudy: "Computer Science",
-        notes: "Exam Results: 1st Class with Distinction, Dissertation: 1st Class with Distinction\n\nRelevant Courses: Java and C# Programming, Software Engineering, Artificial Intelligence, \nComputational Photography, Algorithmics, Architecture and Hardware.\n\nCreated a Windows 8 game in JavaScript for the dissertation. \n\nCreated an award-winning 3D stereoscopic game in C# using XNA.",
+        notes: "Exam Results: 1st Class with Distinction, Dissertation: 1st Class with Distinction\n\nRelevant Courses: Java and C# Programming, Software Engineering, Artificial Intelligence, \nComputational Photography, Algorithms, Architecture and Hardware.\n\nCreated a Windows 8 game in JavaScript for the dissertation. \n\nCreated an award-winning 3D stereoscopic game in C# using XNA.",
         schoolName: "University College London",
         startDate: {
             year: 2012,
@@ -156,7 +157,7 @@ const skills: Skill[] = [
     },
 ];
 
-const achievements: Achivement[] = [
+const achievements: Achievement[] = [
     {
         issuer: "Oracle",
         name: "Oracle Certified Expert",
@@ -165,7 +166,7 @@ const achievements: Achivement[] = [
 
 class DocumentCreator {
     // tslint:disable-next-line: typedef
-    public create([experiences, educations, skills, achivements]: [Experience[], Education[], Skill[], Achivement[]]): Document {
+    public create([experiences, educations, skills, achievements]: [Experience[], Education[], Skill[], Achievement[]]): Document {
         const document = new Document({
             sections: [
                 {
@@ -221,7 +222,7 @@ class DocumentCreator {
                         this.createSubHeading("Skills"),
                         this.createSkillList(skills),
                         this.createSubHeading("Achievements"),
-                        ...this.createAchivementsList(achivements),
+                        ...this.createAchievementsList(achievements),
                         this.createSubHeading("Interests"),
                         this.createInterests("Programming, Technology, Music Production, Web Design, 3D Modelling, Dancing."),
                         this.createHeading("References"),
@@ -318,8 +319,8 @@ class DocumentCreator {
     }
 
     // tslint:disable-next-line:no-any
-    public createAchivementsList(achivements: any[]): Paragraph[] {
-        return achivements.map(
+    public createAchievementsList(achievements: any[]): Paragraph[] {
+        return achievements.map(
             (achievement) =>
                 new Paragraph({
                     text: achievement.name,

demo/11-declaritive-styles-2.ts

@@ -52,18 +52,20 @@ const table = new Table({
 });
 
 const doc = new Document({
-    numbering:{
-        config:[{
-            reference: 'ref1',
-            levels: [
+    numbering: {
+        config: [
             {
-                level: 0,
-                format: LevelFormat.DECIMAL,
-                text: '%1)',
-                start: 50,
-            }
-            ],
-        }]
+                reference: "ref1",
+                levels: [
+                    {
+                        level: 0,
+                        format: LevelFormat.DECIMAL,
+                        text: "%1)",
+                        start: 50,
+                    },
+                ],
+            },
+        ],
     },
     styles: {
         default: {
@@ -184,11 +186,11 @@ const doc = new Document({
                     spacing: { line: 276, before: 20 * 72 * 0.1, after: 20 * 72 * 0.05 },
                     rightTabStop: TabStopPosition.MAX,
                     leftTabStop: 453.543307087,
-                    numbering : {
-                        reference: 'ref1',
+                    numbering: {
+                        reference: "ref1",
                         instance: 0,
                         level: 0,
-                    }
+                    },
                 },
             },
         ],

demo/17-footnotes.ts

@@ -18,10 +18,15 @@ const doc = new Document({
                 new Paragraph({
                     children: [
                         new TextRun({
-                            children: ["Hello", new FootnoteReferenceRun(1)],
+                            children: ["Hello"],
                         }),
+                        new FootnoteReferenceRun(1),
                         new TextRun({
-                            children: [" World!", new FootnoteReferenceRun(2)],
+                            children: [" World!"],
+                        }),
+                        new FootnoteReferenceRun(2),
+                        new TextRun({
+                            children: [" GitHub!"],
                         }),
                     ],
                 }),
@@ -35,15 +40,17 @@ const doc = new Document({
                 new Paragraph({
                     children: [
                         new TextRun({
-                            children: ["Hello", new FootnoteReferenceRun(4)],
+                            children: ["Hello"],
                         }),
+                        new FootnoteReferenceRun(4),
                         new TextRun({
-                            children: [" World!", new FootnoteReferenceRun(5)],
+                            children: [" World!"],
                         }),
+                        new FootnoteReferenceRun(5),
                     ],
                 }),
                 new Paragraph({
-                    children: [new TextRun("Hello World"), new FootnoteReferenceRun(6)],
+                    children: [new TextRun("Hello World Again"), new FootnoteReferenceRun(6)],
                 }),
             ],
         },

demo/2-declaritive-styles.ts

@@ -1,4 +1,4 @@
-// Example on how to customise the look at feel using Styles
+// Example on how to customize the look at feel using Styles
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
 import {

demo/21-bookmarks.ts

@@ -1,9 +1,21 @@
 // This demo shows how to create bookmarks then link to them with internal hyperlinks
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { Bookmark, Document, Footer, HeadingLevel, InternalHyperlink, Packer, PageBreak, Paragraph, TextRun, PageReference } from "../build";
+import {
+    Bookmark,
+    Document,
+    Footer,
+    HeadingLevel,
+    InternalHyperlink,
+    Packer,
+    PageBreak,
+    Paragraph,
+    TextRun,
+    PageReference,
+} from "../build";
 
 const LOREM_IPSUM =
+    /* cspell:disable-next-line */
     "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam mi velit, convallis convallis scelerisque nec, faucibus nec leo. Phasellus at posuere mauris, tempus dignissim velit. Integer et tortor dolor. Duis auctor efficitur mattis. Vivamus ut metus accumsan tellus auctor sollicitudin venenatis et nibh. Cras quis massa ac metus fringilla venenatis. Proin rutrum mauris purus, ut suscipit magna consectetur id. Integer consectetur sollicitudin ante, vitae faucibus neque efficitur in. Praesent ultricies nibh lectus. Mauris pharetra id odio eget iaculis. Duis dictum, risus id pellentesque rutrum, lorem quam malesuada massa, quis ullamcorper turpis urna a diam. Cras vulputate metus vel massa porta ullamcorper. Etiam porta condimentum nulla nec tristique. Sed nulla urna, pharetra non tortor sed, sollicitudin molestie diam. Maecenas enim leo, feugiat eget vehicula id, sollicitudin vitae ante.";
 
 const doc = new Document({

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.",
+                        }),
+                    ],
+                }),
             ],
         },
     ],

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",

demo/31-tables.ts

@@ -34,8 +34,7 @@ const doc = new Document({
                                 new TableCell({
                                     children: [
                                         new Paragraph({
-                                            text:
-                                                "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah",
+                                            text: "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah",
                                             heading: HeadingLevel.HEADING_1,
                                         }),
                                     ],

demo/43-images-to-table-cell-2.ts

@@ -1,9 +1,15 @@
 // Add image to table cell
 // Import from 'docx' rather than '../build' if you install from npm
 import * as fs from "fs";
-import { Document, Packer, Paragraph, Table, TableCell, TableRow } from "../build";
+import { Document, ImageRun, Packer, Paragraph, Table, TableCell, TableRow, WidthType } from "../build";
+
+const imageBase64Data = `iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAACzVBMVEUAAAAAAAAAAAAAAAA/AD8zMzMqKiokJCQfHx8cHBwZGRkuFxcqFSonJyckJCQiIiIfHx8eHh4cHBwoGhomGSYkJCQhISEfHx8eHh4nHR0lHBwkGyQjIyMiIiIgICAfHx8mHh4lHh4kHR0jHCMiGyIhISEgICAfHx8lHx8kHh4jHR0hHCEhISEgICAlHx8kHx8jHh4jHh4iHSIhHCEhISElICAkHx8jHx8jHh4iHh4iHSIhHSElICAkICAjHx8jHx8iHh4iHh4hHiEhHSEkICAjHx8iHx8iHx8hHh4hHiEkHSEjHSAjHx8iHx8iHx8hHh4kHiEkHiEjHSAiHx8hHx8hHh4kHiEjHiAjHSAiHx8iHx8hHx8kHh4jHiEjHiAjHiAiICAiHx8kHx8jHh4jHiEjHiAiHiAiHSAiHx8jHx8jHx8jHiAiHiAiHiAiHSAiHx8jHx8jHx8iHiAiHiAiHiAjHx8jHx8jHx8jHx8iHiAiHiAiHiAjHx8jHx8jHx8iHx8iHSAiHiAjHiAjHx8jHx8hHx8iHx8iHyAiHiAjHiAjHiAjHh4hHx8iHx8iHx8iHyAjHSAjHiAjHiAjHh4hHx8iHx8iHx8jHyAjHiAhHh4iHx8iHx8jHyAjHSAjHSAhHiAhHh4iHx8iHx8jHx8jHyAjHSAjHSAiHh4iHh4jHx8jHx8jHyAjHyAhHSAhHSAiHh4iHh4jHx8jHx8jHyAhHyAhHSAiHSAiHh4jHh4jHx8jHx8jHyAhHyAhHSAiHSAjHR4jHh4jHx8jHx8hHyAhHyAiHSAjHSAjHR4jHh4jHx8hHx8hHyAhHyAiHyAjHSAjHR4jHR4hHh4hHx8hHyAiHyAjHyAjHSAjHR4jHR4hHh4hHx8hHyAjHyAjHyAjHSAjHR4hHR4hHR4hHx8iHyAjHyAjHyAjHSAhHR4hHR4hHR4hHx8jHyAjHyAjHyAjHyC9S2xeAAAA7nRSTlMAAQIDBAUGBwgJCgsMDQ4PEBESExQVFxgZGhscHR4fICEiIyQlJicoKSorLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZISUpLTE1OUFFSU1RVVllaW1xdXmBhYmNkZWZnaGprbG1ub3Byc3R1dnd4eXp8fn+AgYKDhIWGiImKi4yNj5CRkpOUlZaXmJmam5ydnp+goaKjpKaoqqusra6vsLGys7S1tri5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+fkZpVQAABcBJREFUGBntwftjlQMcBvDnnLNL22qzJjWlKLHFVogyty3SiFq6EZliqZGyhnSxsLlMRahYoZKRFcul5dKFCatYqWZaNKvWtrPz/A2+7/b27qRzec/lPfvl/XxgMplMJpPJZDKZAtA9HJ3ppnIez0KnSdtC0RCNznHdJrbrh85wdSlVVRaEXuoGamYi5K5430HNiTiEWHKJg05eRWgNfKeV7RxbqUhGKPV/207VupQ8is0IoX5vtFC18SqEHaK4GyHTZ2kzVR8PBTCO4oANIZL4ShNVZcOhKKeYg9DoWdhI1ec3os2VFI0JCIUez5+i6st0qJZRrEAIJCw+QdW223BG/EmKwTBc/IJ/qfp2FDrkUnwFo8U9dZyqnaPhxLqfYjyM1S3vb6p+GGOBszsojoTDSDFz6qj66R4LzvYJxVMwUNRjf1H1ywQr/megg2RzLximy8waqvbda8M5iijegVEiHjlM1W/3h+FcXesphsMY4dMOUnUgOxyuPEzxPQwRNvV3qg5Nj4BreyimwADWe/dRVTMjEm6MoGLzGwtystL6RyOY3qSqdlYU3FpLZw1VW0sK5943MvUCKwJ1noNtjs6Ohge76Zq9ZkfpigU5WWkDYuCfbs1U5HWFR8/Qq4a9W0uK5k4ZmdrTCl8spGIePLPlbqqsc1Afe83O0hULc8alDYiBd7ZyitYMeBfR55rR2fOKP6ioPk2dGvZ+UVI0d8rtqT2tcCexlqK2F3wRn5Q+YVbBqrLKOupkr9lZujAOrmS0UpTb4JeIPkNHZ+cXr6uoPk2vyuBSPhWLEKj45PQJuQWryyqP0Z14uGLdROHIRNBEXDR09EP5r62rOHCazhrD4VKPwxTH+sIA3ZPTJ+YuWV22n+IruHFDC8X2CBjnPoolcGc2FYUwzmsUWXDHsoGKLBhmN0VvuBVfTVE/AAbpaid5CB4MbaLY1QXGuIViLTyZQcVyGGMuxWPwaA0Vk2GI9RRp8Ci2iuLkIBjhT5LNUfAspZFiTwyC72KK7+DNg1SsRvCNp3gZXq2k4iEEXSHFJHgVXUlxejCCbTvFAHiXdIJiXxyCK7KJ5FHoMZGK9xBcwyg2QpdlVMxEUM2iyIMuXXZQNF+HswxMsSAAJRQjoE//eoqDCXBSTO6f1xd+O0iyNRY6jaWi1ALNYCocZROj4JdEikroVkjFk9DcStXxpdfCD2MoXodu4RUU9ptxxmXssOfxnvDVcxRTod9FxyhqLoAqis5aPhwTDp9spRgEH2Q6KLbYoKqlaKTm6Isp0C/sJMnjFvhiERXPQvUNRe9p29lhR04CdBpC8Sl8YiuncIxEuzUUg4Dkgj+paVozygY9plPMh28SaymO9kabAopREGF3vt9MzeFFl8G7lRSZ8FFGK8XX4VA8QjEd7XrM3M0OXz8YCy+qKBLgq3wqnofiTorF0Ax56Rg1J1elW+BBAsVe+My6iYq7IK6keBdOIseV2qn5Pb8f3MqkWAXf9ThM8c8lAOIotuFsF875lRrH5klRcG0+xcPwQ1oLxfeRAP4heQTnGL78X2rqlw2DK59SXAV/zKaiGMAuko5InCt68mcOan5+ohf+z1pP8lQY/GHZQMV4YD3FpXDp4qerqbF/lBWBswyi+AL+ia+maLgcRRQj4IYlY/UpauqKBsPJAxQF8NM1TRQ/RudSPAD34rK3scOuR8/HGcspxsJfOVS8NZbiGXiUtPgINU3v3WFDmx8pEuG3EiqKKVbCC1vm2iZqap5LAtCtleQf8F9sFYWDohzeJczYyQ4V2bEZFGsQgJRGqqqhS2phHTWn9lDkIhBTqWqxQZ+IsRvtdHY9AvI2VX2hW68nfqGmuQsCEl3JdjfCF8OW1bPdtwhQ0gm2mQzfRE3a7KCYj0BNZJs8+Kxf/r6WtTEI2FIqlsMfFgRB5A6KUnSe/vUkX0AnuvUIt8SjM1m6wWQymUwmk8lkMgXRf5vi8rLQxtUhAAAAAElFTkSuQmCC`;
 
 const table = new Table({
+    width: {
+        size: 8640,
+        type: WidthType.DXA,
+    },
     rows: [
         new TableRow({
             children: [
@@ -17,7 +23,19 @@ const table = new Table({
                     children: [],
                 }),
                 new TableCell({
-                    children: [],
+                    children: [
+                        new Paragraph({
+                            children: [
+                                new ImageRun({
+                                    data: Buffer.from(imageBase64Data, "base64"),
+                                    transformation: {
+                                        width: 100,
+                                        height: 100,
+                                    },
+                                }),
+                            ],
+                        }),
+                    ],
                 }),
             ],
         }),
@@ -27,7 +45,19 @@ const table = new Table({
                     children: [],
                 }),
                 new TableCell({
-                    children: [],
+                    children: [
+                        new Paragraph({
+                            children: [
+                                new ImageRun({
+                                    data: fs.readFileSync("./demo/images/image1.jpeg"),
+                                    transformation: {
+                                        width: 100,
+                                        height: 100,
+                                    },
+                                }),
+                            ],
+                        }),
+                    ],
                 }),
                 new TableCell({
                     children: [],

demo/49-table-borders.ts

@@ -123,8 +123,7 @@ const noBorderTable = new Table({
                 new TableCell({
                     children: [
                         new Paragraph({
-                            text:
-                                "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah",
+                            text: "Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah Blah",
                             heading: HeadingLevel.HEADING_1,
                         }),
                     ],

demo/51-character-styles.ts

@@ -43,8 +43,7 @@ const doc = new Document({
                             style: "strong",
                         }),
                         new TextRun({
-                            text:
-                                " - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
+                            text: " - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
                         }),
                     ],
                 }),

demo/60-track-revisions.ts

@@ -121,7 +121,7 @@ const doc = new Document({
                                 author: "Firstname Lastname",
                                 date: "2020-10-06T09:05:00Z",
                                 bold: false,
-                            }
+                            },
                         }),
                     ],
                 }),

demo/66-fields.ts

@@ -4,7 +4,7 @@ import * as fs from "fs";
 import { Bookmark, Document, Packer, Paragraph, SimpleField, TextRun } from "../build";
 
 const doc = new Document({
-    creator: 'Me',
+    creator: "Me",
     sections: [
         {
             properties: {},

demo/67-column-break.ts

@@ -13,11 +13,13 @@ const doc = new Document({
                 },
             },
             children: [
-                new Paragraph({ children: [
-                    new TextRun('This text will be in the first column.'),
-                    new ColumnBreak(),
-                    new TextRun('This text will be in the second column.'),
-                ] }),
+                new Paragraph({
+                    children: [
+                        new TextRun("This text will be in the first column."),
+                        new ColumnBreak(),
+                        new TextRun("This text will be in the second column."),
+                    ],
+                }),
             ],
         },
     ],

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);
+});

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);
+});

docs/README.md

@@ -27,24 +27,26 @@ import { Document, Packer, Paragraph, TextRun } from "docx";
 // Documents contain sections, you can have multiple sections per document, go here to learn more about sections
 // This simple example will only contain one section
 const doc = new Document({
-    sections: [{
-        properties: {},
-        children: [
-            new Paragraph({
-                children: [
-                    new TextRun("Hello World"),
-                    new TextRun({
-                        text: "Foo Bar",
-                        bold: true,
-                    }),
-                    new TextRun({
-                        text: "\tGithub is the best",
-                        bold: true,
-                    }),
-                ],
-            }),
-        ],
-    }],
+    sections: [
+        {
+            properties: {},
+            children: [
+                new Paragraph({
+                    children: [
+                        new TextRun("Hello World"),
+                        new TextRun({
+                            text: "Foo Bar",
+                            bold: true,
+                        }),
+                        new TextRun({
+                            text: "\tGithub is the best",
+                            bold: true,
+                        }),
+                    ],
+                }),
+            ],
+        },
+    ],
 });
 
 // Used to export the file into a .docx file
@@ -56,6 +58,7 @@ Packer.toBuffer(doc).then((buffer) => {
 ```
 
 <p align="center">
+<!-- cspell:disable-next-line -->
     <img alt="clippy the assistant" src="./clippy.png">
 </p>
 

docs/_sidebar.md

@@ -1,37 +1,39 @@
-* [Getting Started](/)
+-   [Getting Started](/)
 
-* [Examples](https://github.com/dolanmiu/docx/tree/master/demo)
+-   [Examples](https://github.com/dolanmiu/docx/tree/master/demo)
 
-* API
+-   API
 
-    * [Documentation](https://docx.js.org/api/)
+    -   [Documentation](https://docx.js.org/api/)
 
-* Usage
+-   Usage
 
-	* [Document](usage/document.md)
-    * [Sections](usage/sections.md)
-	* [Paragraph](usage/paragraph.md)
-	* [Text](usage/text.md)
-	* [Image](usage/images.md)
-	* [Headers & Footers](usage/headers-and-footers.md)
-	* [Bullet Points](usage/bullet-points.md)
-    * [Hyperlinks](usage/hyperlinks.md)
-    * [Numbering](usage/numbering.md)
-    * [Tables](usage/tables.md)
-	* [Tab Stops](usage/tab-stops.md)
-    * [Table of Contents](usage/table-of-contents.md)
-    * [Page Numbers](usage/page-numbers.md)
-    * [Change Tracking](usage/change-tracking.md)
-    * [Math](usage/math.md)
-    * [Text Frames](usage/text-frames.md)
-	* Styling
-        * [Styling with JS](usage/styling-with-js.md)
-        * [Styling with XML](usage/styling-with-xml.md)
-* Exporting
+    -   [Document](usage/document.md)
+    -   [Sections](usage/sections.md)
+    -   [Paragraph](usage/paragraph.md)
+    -   [Text](usage/text.md)
+    -   [Image](usage/images.md)
+    -   [Headers & Footers](usage/headers-and-footers.md)
+    -   [Bullet Points](usage/bullet-points.md)
+    -   [Hyperlinks](usage/hyperlinks.md)
+    -   [Numbering](usage/numbering.md)
+    -   [Tables](usage/tables.md)
+    -   [Tab Stops](usage/tab-stops.md)
+    -   [Table of Contents](usage/table-of-contents.md)
+    -   [Page Numbers](usage/page-numbers.md)
+    -   [Change Tracking](usage/change-tracking.md)
+    -   [Math](usage/math.md)
+    -   [Text Frames](usage/text-frames.md)
+    -   Styling
+        _ [Styling with JS](usage/styling-with-js.md)
+        _ [Styling with XML](usage/styling-with-xml.md)
 
-    * [Packers](usage/packers.md)
-* Utility
+-   Exporting
 
-    * [Convenience functions](usage/convenience-functions.md)
+    -   [Packers](usage/packers.md)
 
-* [Contribution Guidelines](contribution-guidelines.md)
+-   Utility
+
+    -   [Convenience functions](usage/convenience-functions.md)
+
+-   [Contribution Guidelines](contribution-guidelines.md)

docs/contribution-guidelines.md

@@ -26,13 +26,15 @@ Please write good commit messages when making a commit: https://chris.beams.io/p
 
 **Do not:**
 
+<!-- cspell:disable -->
 ```
 c // What?
-rtl // Adding acryonyms without explaining anything else is not helpful
+rtl // Adding acronyms without explaining anything else is not helpful
 works! // Glad its working, but the message is not helpful
 demo updated // Getting better, but capitalize the first letter
 Unesesary coment removed // Make sure to use correct spelling
 ```
+<!-- cspell:enable -->
 
 **Do**
 
@@ -42,9 +44,9 @@ Unesesary coment removed // Make sure to use correct spelling
     public float(tableFloatOptions: ITableFloatOptions): Table
 ```
 
-## Delcariative API
+## Declarative API
 
-Make sure the API is declarative, so no _method calling_ or _mutation_. This is a design decision, consistent with the rest of the project. There are benefits to delcariative code over other styles of code, explained here: https://dzone.com/articles/why-declarative-coding-makes-you-a-better-programm
+Make sure the API is declarative, so no _method calling_ or _mutation_. This is a design decision, consistent with the rest of the project. There are benefits to declarative code over other styles of code, explained here: https://dzone.com/articles/why-declarative-coding-makes-you-a-better-programm
 
 **Do not:**
 

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_

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`

docs/usage/numbering.md

@@ -37,7 +37,7 @@ sub-sublists, etc. Each level includes the following properties:
     numbers from each numbering level before this one. Thus a level
     text of `%d)` with a number format of `lowerLetter` would result in
     the sequence "a)", "b)", ...
-*   and a few others, which you can see in the OXML spec section 17.9.6
+*   and a few others, which you can see in the OOXML spec section 17.9.6
 
 ## Document-level bullets/numbering definitions (concrete)
 

docs/usage/paragraph.md

@@ -121,7 +121,7 @@ Add borders to a `Paragraph`. Good for making the `Paragraph` stand out
 | -------- | -------- | -------- |
 | color    | `string` | Required |
 | space    | `number` | Required |
-| value    | `string` | Required |
+| style    | `string` | Required |
 | size     | `number` | Required |
 
 **Example:**
@@ -135,13 +135,13 @@ const paragraph = new Paragraph({
         top: {
             color: "auto",
             space: 1,
-            value: "single",
+            style: "single",
             size: 6,
         },
         bottom: {
             color: "auto",
             space: 1,
-            value: "single",
+            style: "single",
             size: 6,
         },
     },

docs/usage/styling-with-js.md

@@ -146,7 +146,7 @@ const doc = new Document({
 });
 ```
 
-**Note**: If you are using the `.headingX` or `.title` methods of paragraphs, you must make sure to define `HeadingX` or `Title` styles for these. Otherwise they'll show up unstyled :(. If you are using the `.bullet` or `.setNumbering` methods, you need to define a `ListParagraph` style or the numbers may not show up.
+**Note**: If you are using the `.headingX` or `.title` methods of paragraphs, you must make sure to define `HeadingX` or `Title` styles for these. Otherwise they'll show up un-styled :(. If you are using the `.bullet` or `.setNumbering` methods, you need to define a `ListParagraph` style or the numbers may not show up.
 
 ### Document defaults
 
@@ -199,7 +199,7 @@ For these properties, the rules state the following conflict resolution in case
 
 ## Examples
 
-### Declaritive styles
+### Declarative styles
 
 Importing Images from file system path
 

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
 

mocha.env

@@ -0,0 +1 @@
+process.env.TS_NODE_PROJECT = 'tsconfig.spec.json'

package.json

@@ -1,11 +1,11 @@
 {
   "name": "docx",
-  "version": "7.3.0",
+  "version": "7.4.1",
   "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",
@@ -14,8 +14,9 @@
     "webpack": "rimraf ./build && webpack --config ./webpack.config.ts",
     "demo": "npm run build && npm run ts-node --skip-project ./demo",
     "typedoc": "rimraf ./build && typedoc src/index.ts --tsconfig tsconfig.typedoc.json",
-    "style": "prettier -l \"src/**/*.ts\"",
+    "style": "prettier -l \"{src,scripts,demo}/**/*.{ts,html}\"",
     "style.fix": "npm run style -- --write",
+    "cspell": "cspell \"{src,demo,docs,scripts}/**/*.{ts,scss,html,md}\" && cspell \"./*.*\"",
     "fix-types": "ts-node --skip-project scripts/types-absolute-fixer.ts",
     "e2e": "ts-node scripts/e2e.ts",
     "serve.docs": "cd docs && docsify serve",
@@ -49,7 +50,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 +74,11 @@
     "@types/webpack": "^5.0.0",
     "buffer": "^6.0.3",
     "chai": "^3.5.0",
-    "cross-env": "^7.0.3",
+    "cspell": "^6.2.2",
     "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 +89,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"

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("");
 

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;

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

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";
 

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 {

src/export/packer/next-compiler.spec.ts

@@ -2,7 +2,10 @@
 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 { ImageRun, Paragraph } from "@file/paragraph";
+import * as convenienceFunctions from "@util/convenience-functions";
 
 import { Compiler } from "./next-compiler";
 
@@ -13,17 +16,28 @@ describe("Compiler", () => {
         compiler = new Compiler();
     });
 
+    before(() => {
+        sinon.stub(convenienceFunctions, "uniqueId").callsFake(() => "test");
+    });
+
+    after(() => {
+        (convenienceFunctions.uniqueId as sinon.SinonStub).restore();
+    });
+
     describe("#compile()", () => {
         it("should pack all the content", async function () {
             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 +47,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 +58,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 +91,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");
@@ -97,7 +120,61 @@ describe("Compiler", () => {
             const spy = sinon.spy(compiler["formatter"], "format");
 
             compiler.compile(file);
-            expect(spy.callCount).to.equal(12);
+            expect(spy.callCount).to.equal(13);
+        });
+
+        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 file = new File({
+                sections: [
+                    {
+                        headers: {
+                            default: new Header({
+                                children: [new Paragraph("test")],
+                            }),
+                        },
+                        footers: {
+                            default: new Footer({
+                                children: [new Paragraph("test")],
+                            }),
+                        },
+                        children: [
+                            new Paragraph({
+                                children: [
+                                    new ImageRun({
+                                        data: Buffer.from("", "base64"),
+                                        transformation: {
+                                            width: 100,
+                                            height: 100,
+                                        },
+                                    }),
+                                ],
+                            }),
+                        ],
+                    },
+                ],
+            });
+
+            // 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);
         });
     });
 });

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 { PrettifyType } 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 | PrettifyType): 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 | PrettifyType): 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,22 @@ export class Compiler {
                 ),
                 path: "word/settings.xml",
             },
+            Comments: {
+                data: xml(
+                    this.formatter.format(file.Comments, {
+                        viewWrapper: file.Document,
+                        file,
+                    }),
+                    {
+                        indent: prettify,
+                        declaration: {
+                            standalone: "yes",
+                            encoding: "UTF-8",
+                        },
+                    },
+                ),
+                path: "word/comments.xml",
+            },
         };
     }
 }

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 {

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";
 

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 PrettifyType {
+    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 | PrettifyType): 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 | PrettifyType): 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 | PrettifyType): Promise<Blob> {
         const zip = this.compiler.compile(file, prettify);
         const zipData = await zip.generateAsync({
             type: "blob",

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;

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 {

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";
 

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;

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;

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",

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 {

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;

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 {

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;

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 {

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";
 

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[];
@@ -38,6 +41,7 @@ export interface IPropertiesOptions {
 
 // <xs:element name="coreProperties" type="CT_CoreProperties"/>
 
+/* cSpell:disable */
 // <xs:complexType name="CT_CoreProperties">
 //   <xs:all>
 //     <xs:element name="category" minOccurs="0" maxOccurs="1" type="xs:string"/>
@@ -57,6 +61,7 @@ export interface IPropertiesOptions {
 //     <xs:element name="version" minOccurs="0" maxOccurs="1" type="xs:string"/>
 //   </xs:all>
 // </xs:complexType>
+/* cSpell:enable */
 
 export class CoreProperties extends XmlComponent {
     constructor(options: Omit<IPropertiesOptions, "sections">) {

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;

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", () => {

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";
 

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;

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 {

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";

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 {

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;

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 ".";
 

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">

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 ".";
 

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">

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", () => {

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">

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">

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";
 

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">

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"/>

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">

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";
 

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">

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", () => {

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",

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", () => {

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">

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";

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";
 

src/file/document/document-attributes.ts

@@ -1,5 +1,6 @@
-import { XmlAttributeComponent } from "file/xml-components";
+import { XmlAttributeComponent } from "@file/xml-components";
 
+/* cSpell:disable */
 export interface IDocumentAttributesProperties {
     readonly wpc?: string;
     readonly mc?: string;
@@ -24,7 +25,24 @@ 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;
 }
+/* cSpell:enable */
 
 export class DocumentAttributes extends XmlAttributeComponent<IDocumentAttributesProperties> {
     protected readonly xmlKeys = {
@@ -51,5 +69,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",
     };
 }

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";
 

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">

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",
                         },
                     },
                     {

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",
             }),
         );

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 {

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";

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;

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 {

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";
 

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";

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;

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 {