From 4742cf0f3fd27f1aeeb4541c6ea50da4f8f642b9 Mon Sep 17 00:00:00 2001 From: Dolan Date: Fri, 26 Oct 2018 01:04:07 +0100 Subject: [PATCH] Clean imports --- src/export/packer/next-compiler.spec.ts | 4 ++- src/export/packer/packer.spec.ts | 3 +- src/file/content-types/content-types.spec.ts | 4 ++- src/file/core-properties/properties.spec.ts | 3 +- src/file/document/body/body.spec.ts | 3 +- .../page-border/page-borders.spec.ts | 5 +-- .../page-border/page-borders.ts | 2 +- .../page-size/page-size.spec.ts | 3 +- .../section-properties.spec.ts | 12 ++++--- .../section-properties/section-properties.ts | 8 +++-- .../title-page/title-page.spec.ts | 3 +- src/file/document/document.spec.ts | 3 +- src/file/drawing/anchor/anchor.spec.ts | 8 +++-- src/file/drawing/drawing.spec.ts | 5 +-- src/file/drawing/extent/extent.ts | 1 + src/file/drawing/floating/align.spec.ts | 5 +-- .../floating/horizontal-position.spec.ts | 5 +-- .../drawing/floating/position-offset.spec.ts | 3 +- src/file/drawing/floating/simple-pos.spec.ts | 3 +- .../floating/vertical-position.spec.ts | 5 +-- src/file/footnotes/footnote/footnote.spec.ts | 4 ++- src/file/footnotes/footnote/footnote.ts | 3 +- src/file/numbering/numbering.spec.ts | 6 ++-- src/file/paragraph/formatting/border.spec.ts | 3 +- .../paragraph/formatting/page-break.spec.ts | 3 +- src/file/paragraph/formatting/spacing.spec.ts | 3 +- src/file/paragraph/formatting/style.spec.ts | 3 +- .../paragraph/formatting/tab-stop.spec.ts | 2 +- .../formatting/unordered-list.spec.ts | 3 +- src/file/paragraph/image.spec.ts | 3 +- src/file/paragraph/links/bookmark.spec.ts | 5 +-- src/file/paragraph/links/hyperlink.spec.ts | 5 +-- src/file/paragraph/paragraph.spec.ts | 5 +-- src/file/paragraph/run/break.spec.ts | 3 +- .../paragraph/run/run-components/text.spec.ts | 3 +- src/file/paragraph/run/run-fonts.spec.ts | 3 +- src/file/paragraph/run/run.spec.ts | 5 +-- src/file/paragraph/run/script.spec.ts | 3 +- .../run/sequential-identifier.spec.ts | 3 +- src/file/paragraph/run/strike.spec.ts | 3 +- src/file/paragraph/run/tab.spec.ts | 3 +- src/file/paragraph/run/text-run.spec.ts | 3 +- src/file/paragraph/run/underline.spec.ts | 5 +-- src/file/relationships/relationships.spec.ts | 3 +- src/file/settings/settings.spec.ts | 7 +++-- src/file/settings/update-fields.spec.ts | 7 +++-- .../styles/defaults/paragraph-properties.ts | 2 +- src/file/styles/defaults/run-properties.ts | 6 ++-- src/file/styles/index.ts | 31 +------------------ src/file/styles/style/index.ts | 6 ++-- src/file/styles/styles.spec.ts | 6 ++-- src/file/styles/styles.ts | 30 ++++++++++++++++++ .../table-of-contents.spec.ts | 6 ++-- src/file/table/grid.spec.ts | 3 +- src/file/table/table-cell/table-cell.spec.ts | 5 +-- .../table-float-properties.spec.ts | 3 +- .../table-properties/table-properties.spec.ts | 3 +- src/file/table/table.spec.ts | 5 +-- src/file/xml-components/xml-component.spec.ts | 2 +- 59 files changed, 180 insertions(+), 115 deletions(-) create mode 100644 src/file/styles/styles.ts diff --git a/src/export/packer/next-compiler.spec.ts b/src/export/packer/next-compiler.spec.ts index 774b71c26f..2ac32dda33 100644 --- a/src/export/packer/next-compiler.spec.ts +++ b/src/export/packer/next-compiler.spec.ts @@ -1,6 +1,8 @@ /* tslint:disable:typedef space-before-function-paren */ import { expect } from "chai"; -import { File } from "../../file"; + +import { File } from "file"; + import { Compiler } from "./next-compiler"; describe("Compiler", () => { diff --git a/src/export/packer/packer.spec.ts b/src/export/packer/packer.spec.ts index 497e3e46b7..110089da01 100644 --- a/src/export/packer/packer.spec.ts +++ b/src/export/packer/packer.spec.ts @@ -2,7 +2,8 @@ import { assert } from "chai"; import { stub } from "sinon"; -import { File, Paragraph } from "../../file"; +import { File, Paragraph } from "file"; + import { Packer } from "./packer"; describe("Packer", () => { diff --git a/src/file/content-types/content-types.spec.ts b/src/file/content-types/content-types.spec.ts index 7e9b62c88f..e3cd62b984 100644 --- a/src/file/content-types/content-types.spec.ts +++ b/src/file/content-types/content-types.spec.ts @@ -1,7 +1,9 @@ // tslint:disable:no-string-literal import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; + +import { Formatter } from "export/formatter"; + import { ContentTypes } from "./content-types"; describe("ContentTypes", () => { diff --git a/src/file/core-properties/properties.spec.ts b/src/file/core-properties/properties.spec.ts index 8edf920acb..92b2cd6139 100644 --- a/src/file/core-properties/properties.spec.ts +++ b/src/file/core-properties/properties.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; +import { Formatter } from "export/formatter"; + import { CoreProperties } from "./properties"; describe("Properties", () => { diff --git a/src/file/document/body/body.spec.ts b/src/file/document/body/body.spec.ts index 67b9d9ab21..9ba95f33d0 100644 --- a/src/file/document/body/body.spec.ts +++ b/src/file/document/body/body.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { Body } from "./body"; describe("Body", () => { diff --git a/src/file/document/body/section-properties/page-border/page-borders.spec.ts b/src/file/document/body/section-properties/page-border/page-borders.spec.ts index 0bf22633ee..3ac11c1114 100644 --- a/src/file/document/body/section-properties/page-border/page-borders.spec.ts +++ b/src/file/document/body/section-properties/page-border/page-borders.spec.ts @@ -1,7 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "../../../../../export/formatter"; -import { BorderStyle } from "../../../../styles"; +import { Formatter } from "export/formatter"; +import { BorderStyle } from "file/styles"; + import { PageBorderDisplay, PageBorders, PageBorderZOrder } from "./page-borders"; describe("PageBorders", () => { diff --git a/src/file/document/body/section-properties/page-border/page-borders.ts b/src/file/document/body/section-properties/page-border/page-borders.ts index 4017fbb7ae..07aa4eabf1 100644 --- a/src/file/document/body/section-properties/page-border/page-borders.ts +++ b/src/file/document/body/section-properties/page-border/page-borders.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPsectionBorders.php +import { BorderStyle } from "file/styles"; import { IXmlableObject, XmlAttributeComponent, XmlComponent } from "file/xml-components"; -import { BorderStyle } from "../../../../styles"; export enum PageBorderDisplay { ALL_PAGES = "allPages", diff --git a/src/file/document/body/section-properties/page-size/page-size.spec.ts b/src/file/document/body/section-properties/page-size/page-size.spec.ts index bd5b17aaa5..a99c3d2ed8 100644 --- a/src/file/document/body/section-properties/page-size/page-size.spec.ts +++ b/src/file/document/body/section-properties/page-size/page-size.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { PageSize } from "./page-size"; import { PageOrientation } from "./page-size-attributes"; diff --git a/src/file/document/body/section-properties/section-properties.spec.ts b/src/file/document/body/section-properties/section-properties.spec.ts index 8e422f425c..d767744e34 100644 --- a/src/file/document/body/section-properties/section-properties.spec.ts +++ b/src/file/document/body/section-properties/section-properties.spec.ts @@ -1,10 +1,12 @@ import { expect } from "chai"; -import { Formatter } from "../../../../export/formatter"; -import { FooterWrapper } from "../../../footer-wrapper"; -import { HeaderWrapper } from "../../../header-wrapper"; -import { Media } from "../../../media"; -import { PageBorderOffsetFrom, PageNumberFormat } from "./"; +import { Formatter } from "export/formatter"; +import { FooterWrapper } from "file/footer-wrapper"; +import { HeaderWrapper } from "file/header-wrapper"; +import { Media } from "file/media"; + +import { PageBorderOffsetFrom } from "./page-border"; +import { PageNumberFormat } from "./page-number"; import { SectionProperties } from "./section-properties"; describe("SectionProperties", () => { diff --git a/src/file/document/body/section-properties/section-properties.ts b/src/file/document/body/section-properties/section-properties.ts index ec8a6b6746..4a5fed5231 100644 --- a/src/file/document/body/section-properties/section-properties.ts +++ b/src/file/document/body/section-properties/section-properties.ts @@ -1,8 +1,8 @@ // http://officeopenxml.com/WPsection.php +import { FooterWrapper } from "file/footer-wrapper"; +import { HeaderWrapper } from "file/header-wrapper"; import { XmlComponent } from "file/xml-components"; -import { FooterWrapper } from "../../../footer-wrapper"; -import { HeaderWrapper } from "../../../header-wrapper"; -import { IPageBordersOptions, IPageNumberTypeAttributes, PageBorders, PageNumberFormat, PageNumberType } from "./"; + import { Columns } from "./columns/columns"; import { IColumnsAttributes } from "./columns/columns-attributes"; import { DocumentGrid } from "./doc-grid/doc-grid"; @@ -11,8 +11,10 @@ import { FooterReferenceType } from "./footer-reference"; import { FooterReference } from "./footer-reference/footer-reference"; import { HeaderReferenceType } from "./header-reference"; import { HeaderReference } from "./header-reference/header-reference"; +import { IPageBordersOptions, PageBorders } from "./page-border"; import { PageMargin } from "./page-margin/page-margin"; import { IPageMarginAttributes } from "./page-margin/page-margin-attributes"; +import { IPageNumberTypeAttributes, PageNumberFormat, PageNumberType } from "./page-number"; import { PageSize } from "./page-size/page-size"; import { IPageSizeAttributes, PageOrientation } from "./page-size/page-size-attributes"; import { TitlePage } from "./title-page/title-page"; diff --git a/src/file/document/body/section-properties/title-page/title-page.spec.ts b/src/file/document/body/section-properties/title-page/title-page.spec.ts index 75374a22db..3b89c974c4 100644 --- a/src/file/document/body/section-properties/title-page/title-page.spec.ts +++ b/src/file/document/body/section-properties/title-page/title-page.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { TitlePage } from "./title-page"; describe("PageSize", () => { diff --git a/src/file/document/document.spec.ts b/src/file/document/document.spec.ts index e2e8781d7a..16c3b29f95 100644 --- a/src/file/document/document.spec.ts +++ b/src/file/document/document.spec.ts @@ -1,6 +1,7 @@ import { assert, expect } from "chai"; -import { Formatter } from "../../export/formatter"; +import { Formatter } from "export/formatter"; + import { Paragraph } from "../paragraph"; import { Table } from "../table"; import { Document } from "./document"; diff --git a/src/file/drawing/anchor/anchor.spec.ts b/src/file/drawing/anchor/anchor.spec.ts index 58adefd174..cf93b19f7b 100644 --- a/src/file/drawing/anchor/anchor.spec.ts +++ b/src/file/drawing/anchor/anchor.spec.ts @@ -1,8 +1,10 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; -import { IDrawingOptions, TextWrapStyle } from ".././"; -import { Anchor } from "./"; +import { Utility } from "tests/utility"; + +import { IDrawingOptions } from "../drawing"; +import { TextWrapStyle } from "../text-wrap"; +import { Anchor } from "./anchor"; function createDrawing(drawingOptions: IDrawingOptions): Anchor { return new Anchor( diff --git a/src/file/drawing/drawing.spec.ts b/src/file/drawing/drawing.spec.ts index 87ea5e9e44..6cf3761af8 100644 --- a/src/file/drawing/drawing.spec.ts +++ b/src/file/drawing/drawing.spec.ts @@ -1,7 +1,8 @@ import { assert } from "chai"; -import { Utility } from "../../tests/utility"; -import { Drawing, IDrawingOptions, PlacementPosition } from "./"; +import { Utility } from "tests/utility"; + +import { Drawing, IDrawingOptions, PlacementPosition } from "./drawing"; const imageBase64Data = `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`; diff --git a/src/file/drawing/extent/extent.ts b/src/file/drawing/extent/extent.ts index 270a85a8a8..500571425b 100644 --- a/src/file/drawing/extent/extent.ts +++ b/src/file/drawing/extent/extent.ts @@ -1,4 +1,5 @@ import { XmlComponent } from "file/xml-components"; + import { ExtentAttributes } from "./extent-attributes"; export class Extent extends XmlComponent { diff --git a/src/file/drawing/floating/align.spec.ts b/src/file/drawing/floating/align.spec.ts index 5ec77d6fd0..a44ab7039b 100644 --- a/src/file/drawing/floating/align.spec.ts +++ b/src/file/drawing/floating/align.spec.ts @@ -1,8 +1,9 @@ import { assert } from "chai"; -import { VerticalPositionAlign } from "."; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { Align } from "./align"; +import { VerticalPositionAlign } from "./floating-position"; describe("Align", () => { describe("#constructor()", () => { diff --git a/src/file/drawing/floating/horizontal-position.spec.ts b/src/file/drawing/floating/horizontal-position.spec.ts index 1b139b47be..e04434e340 100644 --- a/src/file/drawing/floating/horizontal-position.spec.ts +++ b/src/file/drawing/floating/horizontal-position.spec.ts @@ -1,7 +1,8 @@ import { assert } from "chai"; -import { HorizontalPositionAlign, HorizontalPositionRelativeFrom } from "."; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + +import { HorizontalPositionAlign, HorizontalPositionRelativeFrom } from "./floating-position"; import { HorizontalPosition } from "./horizontal-position"; describe("HorizontalPosition", () => { diff --git a/src/file/drawing/floating/position-offset.spec.ts b/src/file/drawing/floating/position-offset.spec.ts index 74aebaebc2..237490f9f2 100644 --- a/src/file/drawing/floating/position-offset.spec.ts +++ b/src/file/drawing/floating/position-offset.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { PositionOffset } from "./position-offset"; describe("PositionOffset", () => { diff --git a/src/file/drawing/floating/simple-pos.spec.ts b/src/file/drawing/floating/simple-pos.spec.ts index 5eee49f4c1..32218b7a33 100644 --- a/src/file/drawing/floating/simple-pos.spec.ts +++ b/src/file/drawing/floating/simple-pos.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { SimplePos } from "./simple-pos"; describe("SimplePos", () => { diff --git a/src/file/drawing/floating/vertical-position.spec.ts b/src/file/drawing/floating/vertical-position.spec.ts index a9d7ed65f8..42d70d7112 100644 --- a/src/file/drawing/floating/vertical-position.spec.ts +++ b/src/file/drawing/floating/vertical-position.spec.ts @@ -1,7 +1,8 @@ import { assert } from "chai"; -import { VerticalPositionAlign, VerticalPositionRelativeFrom } from "."; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + +import { VerticalPositionAlign, VerticalPositionRelativeFrom } from "./floating-position"; import { VerticalPosition } from "./vertical-position"; describe("VerticalPosition", () => { diff --git a/src/file/footnotes/footnote/footnote.spec.ts b/src/file/footnotes/footnote/footnote.spec.ts index caeb8cc694..2db4fd094b 100644 --- a/src/file/footnotes/footnote/footnote.spec.ts +++ b/src/file/footnotes/footnote/footnote.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; + +import { Formatter } from "export/formatter"; + import { Footnote, FootnoteType } from "./footnote"; describe("Footnote", () => { diff --git a/src/file/footnotes/footnote/footnote.ts b/src/file/footnotes/footnote/footnote.ts index 6760e9bb03..0567695c40 100644 --- a/src/file/footnotes/footnote/footnote.ts +++ b/src/file/footnotes/footnote/footnote.ts @@ -1,5 +1,6 @@ +import { Paragraph } from "file/paragraph"; import { XmlComponent } from "file/xml-components"; -import { Paragraph } from "../../paragraph"; + import { FootnoteAttributes } from "./footnote-attributes"; import { FootnoteRefRun } from "./run/footnote-ref-run"; diff --git a/src/file/numbering/numbering.spec.ts b/src/file/numbering/numbering.spec.ts index 05dc4a391a..d27665a96e 100644 --- a/src/file/numbering/numbering.spec.ts +++ b/src/file/numbering/numbering.spec.ts @@ -1,9 +1,11 @@ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; -import { Numbering } from "./"; + +import { Formatter } from "export/formatter"; + import { AbstractNumbering } from "./abstract-numbering"; import { LevelForOverride } from "./level"; import { Num } from "./num"; +import { Numbering } from "./numbering"; describe("Numbering", () => { let numbering: Numbering; diff --git a/src/file/paragraph/formatting/border.spec.ts b/src/file/paragraph/formatting/border.spec.ts index c86af41154..d0fda56359 100644 --- a/src/file/paragraph/formatting/border.spec.ts +++ b/src/file/paragraph/formatting/border.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { ThematicBreak } from "./border"; describe("Border", () => { diff --git a/src/file/paragraph/formatting/page-break.spec.ts b/src/file/paragraph/formatting/page-break.spec.ts index 6ba877311f..9412da322b 100644 --- a/src/file/paragraph/formatting/page-break.spec.ts +++ b/src/file/paragraph/formatting/page-break.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { PageBreak, PageBreakBefore } from "./page-break"; describe("PageBreak", () => { diff --git a/src/file/paragraph/formatting/spacing.spec.ts b/src/file/paragraph/formatting/spacing.spec.ts index b8306ab821..b6ba808866 100644 --- a/src/file/paragraph/formatting/spacing.spec.ts +++ b/src/file/paragraph/formatting/spacing.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { Spacing } from "./spacing"; describe("Spacing", () => { diff --git a/src/file/paragraph/formatting/style.spec.ts b/src/file/paragraph/formatting/style.spec.ts index 118df1175c..bf70dc35a4 100644 --- a/src/file/paragraph/formatting/style.spec.ts +++ b/src/file/paragraph/formatting/style.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { Style } from "./style"; describe("ParagraphStyle", () => { diff --git a/src/file/paragraph/formatting/tab-stop.spec.ts b/src/file/paragraph/formatting/tab-stop.spec.ts index 5b324623f5..255d7394e5 100644 --- a/src/file/paragraph/formatting/tab-stop.spec.ts +++ b/src/file/paragraph/formatting/tab-stop.spec.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; import { LeftTabStop, MaxRightTabStop, RightTabStop } from "./tab-stop"; describe("LeftTabStop", () => { diff --git a/src/file/paragraph/formatting/unordered-list.spec.ts b/src/file/paragraph/formatting/unordered-list.spec.ts index c0fc274da0..38b65c1ded 100644 --- a/src/file/paragraph/formatting/unordered-list.spec.ts +++ b/src/file/paragraph/formatting/unordered-list.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { NumberProperties } from "./unordered-list"; describe("NumberProperties", () => { diff --git a/src/file/paragraph/image.spec.ts b/src/file/paragraph/image.spec.ts index 45c06b0628..c8289325e5 100644 --- a/src/file/paragraph/image.spec.ts +++ b/src/file/paragraph/image.spec.ts @@ -1,7 +1,8 @@ // tslint:disable:object-literal-key-quotes import { assert, expect } from "chai"; -import { Formatter } from "../../export/formatter"; +import { Formatter } from "export/formatter"; + import { ImageParagraph } from "./image"; describe("Image", () => { diff --git a/src/file/paragraph/links/bookmark.spec.ts b/src/file/paragraph/links/bookmark.spec.ts index 08d0aec91c..a597347013 100644 --- a/src/file/paragraph/links/bookmark.spec.ts +++ b/src/file/paragraph/links/bookmark.spec.ts @@ -1,7 +1,8 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; -import { Bookmark } from "./"; +import { Utility } from "tests/utility"; + +import { Bookmark } from "./bookmark"; describe("Bookmark", () => { let bookmark: Bookmark; diff --git a/src/file/paragraph/links/hyperlink.spec.ts b/src/file/paragraph/links/hyperlink.spec.ts index d6432b432a..34c7d7dc7c 100644 --- a/src/file/paragraph/links/hyperlink.spec.ts +++ b/src/file/paragraph/links/hyperlink.spec.ts @@ -1,7 +1,8 @@ import { assert, expect } from "chai"; -import { Formatter } from "../../../export/formatter"; -import { Utility } from "../../../tests/utility"; +import { Formatter } from "export/formatter"; +import { Utility } from "tests/utility"; + import { Hyperlink } from "./"; describe("Hyperlink", () => { diff --git a/src/file/paragraph/paragraph.spec.ts b/src/file/paragraph/paragraph.spec.ts index 2413769b1e..cafe231325 100644 --- a/src/file/paragraph/paragraph.spec.ts +++ b/src/file/paragraph/paragraph.spec.ts @@ -1,7 +1,8 @@ import { assert, expect } from "chai"; -import { Formatter } from "../../export/formatter"; -import * as file from "../../file"; +import { Formatter } from "export/formatter"; +import * as file from "file"; + import { Numbering } from "../numbering"; describe("Paragraph", () => { diff --git a/src/file/paragraph/run/break.spec.ts b/src/file/paragraph/run/break.spec.ts index 2a317dd8b2..a07e1426bd 100644 --- a/src/file/paragraph/run/break.spec.ts +++ b/src/file/paragraph/run/break.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { Break } from "./break"; describe("Break", () => { diff --git a/src/file/paragraph/run/run-components/text.spec.ts b/src/file/paragraph/run/run-components/text.spec.ts index 02bd2c702d..49ec73f48b 100644 --- a/src/file/paragraph/run/run-components/text.spec.ts +++ b/src/file/paragraph/run/run-components/text.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { Text } from "./text"; describe("Text", () => { diff --git a/src/file/paragraph/run/run-fonts.spec.ts b/src/file/paragraph/run/run-fonts.spec.ts index 366c0e16d5..af766e9f74 100644 --- a/src/file/paragraph/run/run-fonts.spec.ts +++ b/src/file/paragraph/run/run-fonts.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { RunFonts } from "./run-fonts"; describe("RunFonts", () => { diff --git a/src/file/paragraph/run/run.spec.ts b/src/file/paragraph/run/run.spec.ts index cdd925d9d5..c4ff3e8b70 100644 --- a/src/file/paragraph/run/run.spec.ts +++ b/src/file/paragraph/run/run.spec.ts @@ -1,7 +1,8 @@ import { assert, expect } from "chai"; -import { Formatter } from "../../../export/formatter"; -import { Utility } from "../../../tests/utility"; +import { Formatter } from "export/formatter"; +import { Utility } from "tests/utility"; + import { Run } from "./"; describe("Run", () => { diff --git a/src/file/paragraph/run/script.spec.ts b/src/file/paragraph/run/script.spec.ts index df3d6fa01a..7d7a8cb1da 100644 --- a/src/file/paragraph/run/script.spec.ts +++ b/src/file/paragraph/run/script.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { SubScript, SuperScript } from "./script"; describe("SubScript", () => { diff --git a/src/file/paragraph/run/sequential-identifier.spec.ts b/src/file/paragraph/run/sequential-identifier.spec.ts index 1b34997b9c..f0f12cf8a8 100644 --- a/src/file/paragraph/run/sequential-identifier.spec.ts +++ b/src/file/paragraph/run/sequential-identifier.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { SequentialIdentifier } from "./sequential-identifier"; describe("Sequential Identifier", () => { diff --git a/src/file/paragraph/run/strike.spec.ts b/src/file/paragraph/run/strike.spec.ts index 4e266da540..3d4f83db43 100644 --- a/src/file/paragraph/run/strike.spec.ts +++ b/src/file/paragraph/run/strike.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { DoubleStrike, Strike } from "./formatting"; describe("Strike", () => { diff --git a/src/file/paragraph/run/tab.spec.ts b/src/file/paragraph/run/tab.spec.ts index 4ae84e5f2b..600b4778ac 100644 --- a/src/file/paragraph/run/tab.spec.ts +++ b/src/file/paragraph/run/tab.spec.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; -import { Utility } from "../../../tests/utility"; +import { Utility } from "tests/utility"; + import { Tab } from "./tab"; describe("Tab", () => { diff --git a/src/file/paragraph/run/text-run.spec.ts b/src/file/paragraph/run/text-run.spec.ts index 2ed219631d..817e030856 100644 --- a/src/file/paragraph/run/text-run.spec.ts +++ b/src/file/paragraph/run/text-run.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { TextRun } from "./text-run"; describe("TextRun", () => { diff --git a/src/file/paragraph/run/underline.spec.ts b/src/file/paragraph/run/underline.spec.ts index c9943bb5c5..c17efe54a2 100644 --- a/src/file/paragraph/run/underline.spec.ts +++ b/src/file/paragraph/run/underline.spec.ts @@ -1,7 +1,8 @@ import { assert, expect } from "chai"; -import { Formatter } from "../../../export/formatter"; -import { Utility } from "../../../tests/utility"; +import { Formatter } from "export/formatter"; +import { Utility } from "tests/utility"; + import * as u from "./underline"; describe("Underline", () => { diff --git a/src/file/relationships/relationships.spec.ts b/src/file/relationships/relationships.spec.ts index 56cbead788..00ab8c25bb 100644 --- a/src/file/relationships/relationships.spec.ts +++ b/src/file/relationships/relationships.spec.ts @@ -1,7 +1,8 @@ // tslint:disable:no-string-literal import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; +import { Formatter } from "export/formatter"; + import { Relationships } from "./relationships"; describe("Relationships", () => { diff --git a/src/file/settings/settings.spec.ts b/src/file/settings/settings.spec.ts index 9ba0016319..9994be6686 100644 --- a/src/file/settings/settings.spec.ts +++ b/src/file/settings/settings.spec.ts @@ -1,6 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; -import { Settings } from "./"; + +import { Formatter } from "export/formatter"; + +import { Settings } from "./settings"; + describe("Settings", () => { describe("#constructor", () => { it("should create a empty Settings with correct rootKey", () => { diff --git a/src/file/settings/update-fields.spec.ts b/src/file/settings/update-fields.spec.ts index 70fad8685c..90d409ac40 100644 --- a/src/file/settings/update-fields.spec.ts +++ b/src/file/settings/update-fields.spec.ts @@ -1,6 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; -import { UpdateFields } from "./"; + +import { Formatter } from "export/formatter"; + +import { UpdateFields } from "./update-fields"; + const UF_TRUE = { "w:updateFields": [ { diff --git a/src/file/styles/defaults/paragraph-properties.ts b/src/file/styles/defaults/paragraph-properties.ts index 536ba316ab..1ab3b623d6 100644 --- a/src/file/styles/defaults/paragraph-properties.ts +++ b/src/file/styles/defaults/paragraph-properties.ts @@ -1,5 +1,5 @@ +import { ParagraphProperties } from "file/paragraph/properties"; import { XmlComponent } from "file/xml-components"; -import { ParagraphProperties } from "../../paragraph/properties"; export class ParagraphPropertiesDefaults extends XmlComponent { constructor() { diff --git a/src/file/styles/defaults/run-properties.ts b/src/file/styles/defaults/run-properties.ts index 9f30986b84..1ab8f5752c 100644 --- a/src/file/styles/defaults/run-properties.ts +++ b/src/file/styles/defaults/run-properties.ts @@ -1,7 +1,7 @@ +import { Size, SizeComplexScript } from "file/paragraph/run/formatting"; +import { RunProperties } from "file/paragraph/run/properties"; +import { RunFonts } from "file/paragraph/run/run-fonts"; import { XmlComponent } from "file/xml-components"; -import { Size, SizeComplexScript } from "../../paragraph/run/formatting"; -import { RunProperties } from "../../paragraph/run/properties"; -import { RunFonts } from "../../paragraph/run/run-fonts"; export class RunPropertiesDefaults extends XmlComponent { private readonly properties: RunProperties; diff --git a/src/file/styles/index.ts b/src/file/styles/index.ts index d6cdbfc6f9..737bec0771 100644 --- a/src/file/styles/index.ts +++ b/src/file/styles/index.ts @@ -1,30 +1 @@ -import { BaseXmlComponent, XmlComponent } from "file/xml-components"; -import { DocumentDefaults } from "./defaults"; -import { ParagraphStyle } from "./style"; -export * from "./border"; - -export class Styles extends XmlComponent { - constructor(initialStyles?: BaseXmlComponent) { - super("w:styles"); - if (initialStyles) { - this.root.push(initialStyles); - } - } - - public push(style: XmlComponent): Styles { - this.root.push(style); - return this; - } - - public createDocumentDefaults(): DocumentDefaults { - const defaults = new DocumentDefaults(); - this.push(defaults); - return defaults; - } - - public createParagraphStyle(styleId: string, name?: string): ParagraphStyle { - const para = new ParagraphStyle(styleId, name); - this.push(para); - return para; - } -} +export * from "./styles"; diff --git a/src/file/styles/style/index.ts b/src/file/styles/style/index.ts index ee2d6d84aa..f262a473fb 100644 --- a/src/file/styles/style/index.ts +++ b/src/file/styles/style/index.ts @@ -1,7 +1,7 @@ +import * as paragraph from "file/paragraph"; +import * as formatting from "file/paragraph/run/formatting"; +import { RunProperties } from "file/paragraph/run/properties"; import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; -import * as paragraph from "../../paragraph"; -import * as formatting from "../../paragraph/run/formatting"; -import { RunProperties } from "../../paragraph/run/properties"; import { BasedOn, Link, Name, Next, QuickFormat, SemiHidden, UiPriority, UnhideWhenUsed } from "./components"; diff --git a/src/file/styles/styles.spec.ts b/src/file/styles/styles.spec.ts index 6262b3cb9e..8b7a8f793f 100644 --- a/src/file/styles/styles.spec.ts +++ b/src/file/styles/styles.spec.ts @@ -1,8 +1,10 @@ import { assert, expect } from "chai"; -import { Formatter } from "../../export/formatter"; -import { Styles } from "./"; + +import { Formatter } from "export/formatter"; + import { ParagraphStyle, Style } from "./style"; import * as components from "./style/components"; +import { Styles } from "./styles"; describe("Styles", () => { let styles: Styles; diff --git a/src/file/styles/styles.ts b/src/file/styles/styles.ts new file mode 100644 index 0000000000..d6cdbfc6f9 --- /dev/null +++ b/src/file/styles/styles.ts @@ -0,0 +1,30 @@ +import { BaseXmlComponent, XmlComponent } from "file/xml-components"; +import { DocumentDefaults } from "./defaults"; +import { ParagraphStyle } from "./style"; +export * from "./border"; + +export class Styles extends XmlComponent { + constructor(initialStyles?: BaseXmlComponent) { + super("w:styles"); + if (initialStyles) { + this.root.push(initialStyles); + } + } + + public push(style: XmlComponent): Styles { + this.root.push(style); + return this; + } + + public createDocumentDefaults(): DocumentDefaults { + const defaults = new DocumentDefaults(); + this.push(defaults); + return defaults; + } + + public createParagraphStyle(styleId: string, name?: string): ParagraphStyle { + const para = new ParagraphStyle(styleId, name); + this.push(para); + return para; + } +} diff --git a/src/file/table-of-contents/table-of-contents.spec.ts b/src/file/table-of-contents/table-of-contents.spec.ts index a2e25dd68a..02a4c9c877 100644 --- a/src/file/table-of-contents/table-of-contents.spec.ts +++ b/src/file/table-of-contents/table-of-contents.spec.ts @@ -1,7 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; -import { ITableOfContentsOptions, StyleLevel, TableOfContents } from "./"; +import { Formatter } from "export/formatter"; + +import { TableOfContents } from "./table-of-contents"; +import { ITableOfContentsOptions, StyleLevel } from "./table-of-contents-properties"; describe("Table of Contents", () => { describe("#constructor", () => { diff --git a/src/file/table/grid.spec.ts b/src/file/table/grid.spec.ts index d8ace5ccef..75489f9bd9 100644 --- a/src/file/table/grid.spec.ts +++ b/src/file/table/grid.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; +import { Formatter } from "export/formatter"; + import { GridCol, TableGrid } from "./grid"; describe("GridCol", () => { diff --git a/src/file/table/table-cell/table-cell.spec.ts b/src/file/table/table-cell/table-cell.spec.ts index a69c64d642..a83b5812ad 100644 --- a/src/file/table/table-cell/table-cell.spec.ts +++ b/src/file/table/table-cell/table-cell.spec.ts @@ -1,7 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; -import { BorderStyle } from "../../styles"; +import { Formatter } from "export/formatter"; +import { BorderStyle } from "file/styles"; + import { TableCellBorders, TableCellWidth, WidthType } from "./table-cell-components"; describe("TableCellBorders", () => { diff --git a/src/file/table/table-properties/table-float-properties.spec.ts b/src/file/table/table-properties/table-float-properties.spec.ts index e0abea8efe..e527f5504a 100644 --- a/src/file/table/table-properties/table-float-properties.spec.ts +++ b/src/file/table/table-properties/table-float-properties.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { RelativeHorizontalPosition, RelativeVerticalPosition, TableAnchorType, TableFloatProperties } from "./table-float-properties"; describe("Table Float Properties", () => { diff --git a/src/file/table/table-properties/table-properties.spec.ts b/src/file/table/table-properties/table-properties.spec.ts index 6146a52b03..1ffa43e6ff 100644 --- a/src/file/table/table-properties/table-properties.spec.ts +++ b/src/file/table/table-properties/table-properties.spec.ts @@ -1,6 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../../../export/formatter"; +import { Formatter } from "export/formatter"; + import { WidthType } from "../table-cell"; import { TableProperties } from "./table-properties"; diff --git a/src/file/table/table.spec.ts b/src/file/table/table.spec.ts index 65c259ef12..f1ddfe0ed6 100644 --- a/src/file/table/table.spec.ts +++ b/src/file/table/table.spec.ts @@ -1,9 +1,10 @@ /* tslint:disable:no-unused-expression */ import { expect } from "chai"; -import { Formatter } from "../../export/formatter"; +import { Formatter } from "export/formatter"; + import { Paragraph } from "../paragraph"; -import { Table } from "./"; +import { Table } from "./table"; import { WidthType } from "./table-cell"; import { RelativeHorizontalPosition, RelativeVerticalPosition, TableAnchorType } from "./table-properties"; diff --git a/src/file/xml-components/xml-component.spec.ts b/src/file/xml-components/xml-component.spec.ts index 10e2f44dc4..ce198b135c 100644 --- a/src/file/xml-components/xml-component.spec.ts +++ b/src/file/xml-components/xml-component.spec.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import { Utility } from "../../tests/utility"; +import { Utility } from "tests/utility"; import { XmlComponent } from "./"; class TestComponent extends XmlComponent {}