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

Update tslint to v6
dolanmiu · Aug 1, 2020 · a6eb8e0 · a6eb8e0
2 parents 8c45c30 + d18cfbc
commit a6eb8e0
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 35 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "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",

diff --git 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 {

diff --git 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 {

diff --git 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 {

diff --git 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 {

diff --git 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;

diff --git 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;
 }
 

diff --git 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 {

diff --git 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 {

diff --git 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);

diff --git 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);
     }