Merge pull request #604 from dolanmiu/feat/prettier-update

Update tslint to v6
Merge pull request #598 from dolanmiu/dependabot/npm_and_yarn/rimraf-3.0.2
2020-08-01 18:04:47 +01:00 · 2020-08-01 17:58:31 +01:00 · 2020-08-01 17:58:16 +01:00 · 2020-08-01 17:55:38 +01:00 · 2020-08-01 17:49:25 +01:00 · 2020-08-01 17:40:57 +01:00
19 changed files with 127 additions and 133 deletions
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-v8
+v10
--- a/.travis.yml
+++ b/.travis.yml
@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 9
+  - 10
 install:
  - npm install
  - npm install -g codecov
--- a/package-lock.json
+++ b/package-lock.json
@ -1,16 +1,16 @@
 {
  "name": "docx",
-  "version": "5.2.2",
+  "version": "5.3.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
      "dev": true,
      "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "^7.10.4"
      }
    },
    "@babel/core": {
@ -246,13 +246,13 @@
      }
    },
    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+      "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
      "dev": true,
      "requires": {
+        "@babel/helper-validator-identifier": "^7.10.4",
        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
        "js-tokens": "^4.0.0"
      },
      "dependencies": {
@ -1029,7 +1029,7 @@
        },
        "util": {
          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
          "dev": true,
          "requires": {
@ -1058,7 +1058,7 @@
    },
    "async": {
      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "resolved": "http://registry.npmjs.org/async/-/async-0.9.2.tgz",
      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
      "dev": true
    },
@ -1132,7 +1132,7 @@
        },
        "chalk": {
          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
          "dev": true,
          "requires": {
@ -1881,7 +1881,7 @@
    },
    "commander": {
      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
      "dev": true
    },
@ -3015,7 +3015,7 @@
    },
    "fast-deep-equal": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
      "dev": true
    },
@ -4843,7 +4843,7 @@
    },
    "jsesc": {
      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
      "dev": true
    },
@ -5098,7 +5098,7 @@
    },
    "load-json-file": {
      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
      "dev": true,
      "requires": {
@ -5430,7 +5430,7 @@
    },
    "mkdirp": {
      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
      "dev": true,
      "requires": {
@ -6103,7 +6103,7 @@
    },
    "os-locale": {
      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
      "dev": true,
      "requires": {
@ -6315,7 +6315,7 @@
    },
    "path-is-absolute": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
      "dev": true
    },
@ -6392,7 +6392,7 @@
    },
    "pify": {
      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
      "dev": true
    },
@ -6492,9 +6492,9 @@
      "dev": true
    },
    "prettier": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
-      "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
      "dev": true
    },
    "prismjs": {
@ -7091,9 +7091,9 @@
      }
    },
    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
      "dev": true,
      "requires": {
        "glob": "^7.1.3"
@ -7701,7 +7701,7 @@
    },
    "strip-ansi": {
      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
      "dev": true,
      "requires": {
@ -7946,30 +7946,53 @@
      }
    },
    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
      "dev": true
    },
    "tslint": {
-      "version": "5.18.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.18.0.tgz",
-      "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
+      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
      "dev": true,
      "requires": {
        "@babel/code-frame": "^7.0.0",
        "builtin-modules": "^1.1.1",
        "chalk": "^2.3.0",
        "commander": "^2.12.1",
-        "diff": "^3.2.0",
+        "diff": "^4.0.1",
        "glob": "^7.1.1",
        "js-yaml": "^3.13.1",
        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^0.5.3",
        "resolve": "^1.3.2",
        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
+        "tslib": "^1.13.0",
        "tsutils": "^2.29.0"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
      }
    },
    "tslint-immutable": {
@ -8195,7 +8218,7 @@
        },
        "yargs": {
          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
          "dev": true,
          "requires": {
@ -8394,6 +8417,17 @@
        "mkdirp": "0.x.x",
        "ncp": "1.0.x",
        "rimraf": "2.x.x"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
      }
    },
    "utils-merge": {
@ -8620,7 +8654,7 @@
        },
        "load-json-file": {
          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
          "dev": true,
          "requires": {
@ -8836,13 +8870,13 @@
      "dependencies": {
        "async": {
          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/async/-/async-1.0.0.tgz",
          "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=",
          "dev": true
        },
        "colors": {
          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+          "resolved": "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
          "dev": true
        },
@ -8856,7 +8890,7 @@
    },
    "wrap-ansi": {
      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
      "dev": true,
      "requires": {
@ -8989,7 +9023,7 @@
    },
    "yargs": {
      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
+      "resolved": "http://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
      "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
      "dev": true,
      "requires": {
@ -9033,7 +9067,7 @@
    },
    "yargs-parser": {
      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",
+      "resolved": "http://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz",
      "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=",
      "dev": true,
      "requires": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "docx",
-  "version": "5.2.2",
+  "version": "5.3.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": {
@ -79,22 +79,22 @@
    "mocha-webpack": "^1.0.1",
    "nyc": "^15.1.0",
    "pre-commit": "^1.2.2",
-    "prettier": "^1.15.2",
+    "prettier": "^2.0.5",
    "prompt": "^1.0.0",
    "replace-in-file": "^3.1.0",
    "request": "^2.88.0",
    "request-promise": "^4.2.2",
-    "rimraf": "^2.5.2",
+    "rimraf": "^3.0.2",
    "shelljs": "^0.8.4",
    "sinon": "^9.0.2",
    "ts-node": "^8.10.2",
-    "tslint": "^5.11.0",
+    "tslint": "^6.1.3",
    "tslint-immutable": "^4.9.0",
    "typedoc": "^0.16.11",
    "typescript": "2.9.2",
    "webpack": "^3.10.0"
  },
  "engines": {
-    "node": ">=8"
+    "node": ">=10"
  }
 }
--- a/src/export/packer/next-compiler.spec.ts
+++ b/src/export/packer/next-compiler.spec.ts
@ -16,7 +16,7 @@ describe("Compiler", () => {
    });

    describe("#compile()", () => {
-        it("should pack all the content", async function() {
+        it("should pack all the content", async function () {
            this.timeout(99999999);
            const zipFile = compiler.compile(file);
            const fileNames = Object.keys(zipFile.files).map((f) => zipFile.files[f].name);
@ -35,7 +35,7 @@ describe("Compiler", () => {
            expect(fileNames).to.include("_rels/.rels");
        });

-        it("should pack all additional headers and footers", async function() {
+        it("should pack all additional headers and footers", async function () {
            file.addSection({
                headers: {
                    default: new Header(),
--- a/src/export/packer/packer.spec.ts
+++ b/src/export/packer/packer.spec.ts
@ -36,7 +36,7 @@ describe("Packer", () => {
    });

    describe("#toBuffer()", () => {
-        it("should create a standard docx file", async function() {
+        it("should create a standard docx file", async function () {
            this.timeout(99999999);
            const buffer = await Packer.toBuffer(file);

@ -61,7 +61,7 @@ describe("Packer", () => {
    });

    describe("#toBase64String()", () => {
-        it("should create a standard docx file", async function() {
+        it("should create a standard docx file", async function () {
            this.timeout(99999999);
            const str = await Packer.toBase64String(file);

--- a/src/file/file.ts
+++ b/src/file/file.ts
@ -41,7 +41,7 @@ export interface ISectionOptions {
    readonly size?: IPageSizeAttributes;
    readonly margins?: IPageMarginAttributes;
    readonly properties?: SectionPropertiesOptions;
-    readonly children: Array<Paragraph | Table | TableOfContents | HyperlinkRef>;
+    readonly children: (Paragraph | Table | TableOfContents | HyperlinkRef)[];
 }

 export class File {
--- a/src/file/header.ts
+++ b/src/file/header.ts
@ -2,7 +2,7 @@ import { Paragraph } from "./paragraph";
 import { Table } from "./table";

 export interface IHeaderOptions {
-    readonly children: Array<Paragraph | Table>;
+    readonly children: (Paragraph | Table)[];
 }

 export class Header {
--- a/src/file/media/media.ts
+++ b/src/file/media/media.ts
@ -21,14 +21,7 @@ export class Media {

    private static generateId(): string {
        // https://gist.github.com/6174/6062387
-        return (
-            Math.random()
-                .toString(36)
-                .substring(2, 15) +
-            Math.random()
-                .toString(36)
-                .substring(2, 15)
-        );
+        return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
    }

    private readonly map: Map<string, IMediaData>;
--- a/src/file/numbering/numbering.ts
+++ b/src/file/numbering/numbering.ts
@ -8,10 +8,10 @@ import { ILevelsOptions } from "./level";
 import { ConcreteNumbering } from "./num";

 export interface INumberingOptions {
-    readonly config: Array<{
+    readonly config: {
        readonly levels: ILevelsOptions[];
        readonly reference: string;
-    }>;
+    }[];
 }

 export class Numbering extends XmlComponent {
--- a/src/file/paragraph/paragraph.spec.ts
+++ b/src/file/paragraph/paragraph.spec.ts
@ -542,14 +542,8 @@ describe("Paragraph", () => {
                },
            });
            const tree = new Formatter().format(paragraph);
-            expect(tree)
-                .to.have.property("w:p")
-                .which.is.an("array")
-                .which.has.length.at.least(1);
-            expect(tree["w:p"][0])
-                .to.have.property("w:pPr")
-                .which.is.an("array")
-                .which.has.length.at.least(1);
+            expect(tree).to.have.property("w:p").which.is.an("array").which.has.length.at.least(1);
+            expect(tree["w:p"][0]).to.have.property("w:pPr").which.is.an("array").which.has.length.at.least(1);
            expect(tree["w:p"][0]["w:pPr"][0]).to.deep.equal({
                "w:pStyle": { _attr: { "w:val": "ListParagraph" } },
            });
@ -562,14 +556,8 @@ describe("Paragraph", () => {
                },
            });
            const tree = new Formatter().format(paragraph);
-            expect(tree)
-                .to.have.property("w:p")
-                .which.is.an("array")
-                .which.has.length.at.least(1);
-            expect(tree["w:p"][0])
-                .to.have.property("w:pPr")
-                .which.is.an("array")
-                .which.has.length.at.least(1);
+            expect(tree).to.have.property("w:p").which.is.an("array").which.has.length.at.least(1);
+            expect(tree["w:p"][0]).to.have.property("w:pPr").which.is.an("array").which.has.length.at.least(1);
            expect(tree["w:p"][0]["w:pPr"][0]).to.deep.equal({
                "w:pStyle": { _attr: { "w:val": "ListParagraph" } },
            });
@ -582,14 +570,8 @@ describe("Paragraph", () => {
                },
            });
            const tree = new Formatter().format(paragraph);
-            expect(tree)
-                .to.have.property("w:p")
-                .which.is.an("array")
-                .which.has.length.at.least(1);
-            expect(tree["w:p"][0])
-                .to.have.property("w:pPr")
-                .which.is.an("array")
-                .which.has.length.at.least(2);
+            expect(tree).to.have.property("w:p").which.is.an("array").which.has.length.at.least(1);
+            expect(tree["w:p"][0]).to.have.property("w:pPr").which.is.an("array").which.has.length.at.least(2);
            expect(tree["w:p"][0]["w:pPr"][1]).to.deep.equal({
                "w:numPr": [{ "w:ilvl": { _attr: { "w:val": 1 } } }, { "w:numId": { _attr: { "w:val": 1 } } }],
            });
@ -605,14 +587,8 @@ describe("Paragraph", () => {
                },
            });
            const tree = new Formatter().format(paragraph);
-            expect(tree)
-                .to.have.property("w:p")
-                .which.is.an("array")
-                .which.has.length.at.least(1);
-            expect(tree["w:p"][0])
-                .to.have.property("w:pPr")
-                .which.is.an("array")
-                .which.has.length.at.least(1);
+            expect(tree).to.have.property("w:p").which.is.an("array").which.has.length.at.least(1);
+            expect(tree["w:p"][0]).to.have.property("w:pPr").which.is.an("array").which.has.length.at.least(1);
            expect(tree["w:p"][0]["w:pPr"][0]).to.deep.equal({
                "w:pStyle": { _attr: { "w:val": "ListParagraph" } },
            });
--- a/src/file/paragraph/paragraph.ts
+++ b/src/file/paragraph/paragraph.ts
@ -10,9 +10,16 @@ import { PictureRun, Run, SequentialIdentifier, SymbolRun, TextRun } from "./run

 export interface IParagraphOptions extends IParagraphPropertiesOptions {
    readonly text?: string;
-    readonly children?: Array<
-        TextRun | PictureRun | SymbolRun | Bookmark | PageBreak | SequentialIdentifier | FootnoteReferenceRun | HyperlinkRef
-    >;
+    readonly children?: (
+        | TextRun
+        | PictureRun
+        | SymbolRun
+        | Bookmark
+        | PageBreak
+        | SequentialIdentifier
+        | FootnoteReferenceRun
+        | HyperlinkRef
+    )[];
 }

 export class Paragraph extends XmlComponent {
--- a/src/file/paragraph/properties.ts
+++ b/src/file/paragraph/properties.ts
@ -30,11 +30,11 @@ export interface IParagraphPropertiesOptions extends IParagraphStylePropertiesOp
    readonly heading?: HeadingLevel;
    readonly bidirectional?: boolean;
    readonly pageBreakBefore?: boolean;
-    readonly tabStops?: Array<{
+    readonly tabStops?: {
        readonly position: number | TabStopPosition;
        readonly type: TabStopType;
        readonly leader?: LeaderType;
-    }>;
+    }[];
    readonly style?: string;
    readonly bullet?: {
        readonly level: number;
--- a/src/file/paragraph/run/run.ts
+++ b/src/file/paragraph/run/run.ts
@ -10,7 +10,7 @@ import { IRunPropertiesOptions, RunProperties } from "./properties";
 import { Text } from "./run-components/text";

 export interface IRunOptions extends IRunPropertiesOptions {
-    readonly children?: Array<Begin | FieldInstruction | Separate | End | PageNumber | FootnoteReferenceRun | string>;
+    readonly children?: (Begin | FieldInstruction | Separate | End | PageNumber | FootnoteReferenceRun | string)[];
    readonly text?: string;
 }

--- a/src/file/styles/styles.ts
+++ b/src/file/styles/styles.ts
@ -9,7 +9,7 @@ export interface IStylesOptions {
    readonly initialStyles?: BaseXmlComponent;
    readonly paragraphStyles?: IParagraphStyleOptions[];
    readonly characterStyles?: ICharacterStyleOptions[];
-    readonly importedStyles?: Array<XmlComponent | ParagraphStyle | CharacterStyle | ImportedXmlComponent>;
+    readonly importedStyles?: (XmlComponent | ParagraphStyle | CharacterStyle | ImportedXmlComponent)[];
 }

 export class Styles extends XmlComponent {
--- a/src/file/table/table-cell/table-cell.ts
+++ b/src/file/table/table-cell/table-cell.ts
@ -44,7 +44,7 @@ export interface ITableCellOptions {
            readonly color: string;
        };
    };
-    readonly children: Array<Paragraph | Table>;
+    readonly children: (Paragraph | Table)[];
 }

 export class TableCell extends XmlComponent {
--- a/src/file/table/table.spec.ts
+++ b/src/file/table/table.spec.ts
@ -268,10 +268,7 @@ describe("Table", () => {
                layout: TableLayoutType.FIXED,
            });
            const tree = new Formatter().format(table);
-            expect(tree)
-                .to.have.property("w:tbl")
-                .which.is.an("array")
-                .with.has.length.at.least(1);
+            expect(tree).to.have.property("w:tbl").which.is.an("array").with.has.length.at.least(1);
            expect(tree["w:tbl"][0]).to.deep.equal({
                "w:tblPr": [DEFAULT_TABLE_PROPERTIES, BORDERS, WIDTHS, { "w:tblLayout": { _attr: { "w:type": "fixed" } } }],
            });
@ -291,10 +288,7 @@ describe("Table", () => {
                alignment: AlignmentType.CENTER,
            });
            const tree = new Formatter().format(table);
-            expect(tree)
-                .to.have.property("w:tbl")
-                .which.is.an("array")
-                .with.has.length.at.least(1);
+            expect(tree).to.have.property("w:tbl").which.is.an("array").with.has.length.at.least(1);
            expect(tree["w:tbl"][0]).to.deep.equal({
                "w:tblPr": [DEFAULT_TABLE_PROPERTIES, BORDERS, WIDTHS, { "w:jc": { _attr: { "w:val": "center" } } }],
            });
@ -318,10 +312,7 @@ describe("Table", () => {
                layout: TableLayoutType.FIXED,
            });
            const tree = new Formatter().format(table);
-            expect(tree)
-                .to.have.property("w:tbl")
-                .which.is.an("array")
-                .with.has.length.at.least(1);
+            expect(tree).to.have.property("w:tbl").which.is.an("array").with.has.length.at.least(1);
            expect(tree["w:tbl"][0]).to.deep.equal({
                "w:tblPr": [
                    DEFAULT_TABLE_PROPERTIES,
@ -355,14 +346,10 @@ describe("Table", () => {
                    ],
                });
                const tree = new Formatter().format(table);
-                expect(tree)
-                    .to.have.property("w:tbl")
-                    .which.is.an("array");
+                expect(tree).to.have.property("w:tbl").which.is.an("array");
                const row = tree["w:tbl"].find((x) => x["w:tr"]);
                expect(row).not.to.be.undefined;
-                expect(row["w:tr"])
-                    .to.be.an("array")
-                    .which.has.length.at.least(1);
+                expect(row["w:tr"]).to.be.an("array").which.has.length.at.least(1);
                expect(row["w:tr"].find((x) => x["w:tc"])).to.deep.equal({
                    "w:tc": [
                        {
@ -487,10 +474,7 @@ describe("Table", () => {
                },
            });
            const tree = new Formatter().format(table);
-            expect(tree)
-                .to.have.property("w:tbl")
-                .which.is.an("array")
-                .with.has.length.at.least(1);
+            expect(tree).to.have.property("w:tbl").which.is.an("array").with.has.length.at.least(1);
            expect(tree["w:tbl"][0]).to.deep.equal({
                "w:tblPr": [
                    DEFAULT_TABLE_PROPERTIES,
--- a/src/file/xml-components/xml-component.ts
+++ b/src/file/xml-components/xml-component.ts
@ -6,7 +6,7 @@ export const EMPTY_OBJECT = Object.seal({});

 export abstract class XmlComponent extends BaseXmlComponent {
    // tslint:disable-next-line:readonly-keyword no-any
-    protected root: Array<BaseXmlComponent | string | any>;
+    protected root: (BaseXmlComponent | string | any)[];

    constructor(rootKey: string) {
        super(rootKey);
--- a/src/import-dotx/import-dotx.ts
+++ b/src/import-dotx/import-dotx.ts
@ -17,8 +17,8 @@ const schemeToType = {
 };

 interface IDocumentRefs {
-    readonly headers: Array<{ readonly id: number; readonly type: HeaderReferenceType }>;
-    readonly footers: Array<{ readonly id: number; readonly type: FooterReferenceType }>;
+    readonly headers: { readonly id: number; readonly type: HeaderReferenceType }[];
+    readonly footers: { readonly id: number; readonly type: FooterReferenceType }[];
 }

 enum RelationshipType {
@ -99,7 +99,7 @@ export class ImportDotx {

                return { type: reference.type, footer: wrapper };
            })
-            .filter((x) => !!x) as Array<Promise<IDocumentFooter>>;
+            .filter((x) => !!x) as Promise<IDocumentFooter>[];

        return Promise.all(result);
    }
@ -134,7 +134,7 @@ export class ImportDotx {

                return { type: reference.type, header: wrapper };
            })
-            .filter((x) => !!x) as Array<Promise<IDocumentHeader>>;
+            .filter((x) => !!x) as Promise<IDocumentHeader>[];

        return Promise.all(result);
    }
Author	SHA1	Message	Date
Dolan	a6eb8e01df	Merge pull request #604 from dolanmiu/feat/prettier-update Update tslint to v6	2020-08-01 18:04:47 +01:00
Dolan	8c45c30753	Merge pull request #598 from dolanmiu/dependabot/npm_and_yarn/rimraf-3.0.2 build(deps-dev): bump rimraf from 2.6.3 to 3.0.2	2020-08-01 17:58:31 +01:00
Dolan Miu	d18cfbc26f	Update tslint to v6	2020-08-01 17:58:16 +01:00
Dolan	f4af5f9e33	Merge pull request #603 from dolanmiu/feat/prettier-update Update prettier	2020-08-01 17:55:38 +01:00
Dolan Miu	69adbbc1c1	Bump node version	2020-08-01 17:49:25 +01:00
Dolan Miu	4f6a9f734c	Update prettier	2020-08-01 17:40:57 +01:00
Dolan Miu	8b78f2d200	Version bump	2020-08-01 17:28:11 +01:00
dependabot-preview[bot]	f955a18936	build(deps-dev): bump rimraf from 2.6.3 to 3.0.2 Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.6.3 to 3.0.2. - [Release notes](https://github.com/isaacs/rimraf/releases) - [Changelog](https://github.com/isaacs/rimraf/blob/master/CHANGELOG.md) - [Commits](https://github.com/isaacs/rimraf/compare/v2.6.3...v3.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-08-01 01:59:37 +00:00