diff --git a/src/file/index.ts b/src/file/index.ts index 309a3c2d56..23fdcbc4e4 100644 --- a/src/file/index.ts +++ b/src/file/index.ts @@ -18,4 +18,3 @@ export * from "./track-revision"; export * from "./shared"; export * from "./border"; export * from "./vertical-align"; -export * from "./space-type"; diff --git a/src/file/paragraph/links/pageref-field-instruction.ts b/src/file/paragraph/links/pageref-field-instruction.ts index 8163418ea2..ca5dc4f4dd 100644 --- a/src/file/paragraph/links/pageref-field-instruction.ts +++ b/src/file/paragraph/links/pageref-field-instruction.ts @@ -1,4 +1,4 @@ -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "../run/text-attributes"; diff --git a/src/file/paragraph/paragraph.spec.ts b/src/file/paragraph/paragraph.spec.ts index ad32517207..c8b4135288 100644 --- a/src/file/paragraph/paragraph.spec.ts +++ b/src/file/paragraph/paragraph.spec.ts @@ -3,6 +3,7 @@ import { SinonStub, stub } from "sinon"; import * as convenienceFunctions from "@util/convenience-functions"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared"; import { Formatter } from "@export/formatter"; import { BorderStyle } from "@file/border"; import { EMPTY_OBJECT } from "@file/xml-components"; @@ -10,7 +11,6 @@ import { EMPTY_OBJECT } from "@file/xml-components"; import { IViewWrapper } from "../document-wrapper"; import { File } from "../file"; import { ShadingType } from "../shading"; -import { HorizontalPositionAlign, VerticalPositionAlign } from "../shared"; import { AlignmentType, HeadingLevel, LeaderType, PageBreak, TabStopPosition, TabStopType } from "./formatting"; import { FrameAnchorType } from "./frame"; import { Bookmark, ExternalHyperlink } from "./links"; diff --git a/src/file/paragraph/run/page-number.ts b/src/file/paragraph/run/page-number.ts index 5b25763a10..cab81614ca 100644 --- a/src/file/paragraph/run/page-number.ts +++ b/src/file/paragraph/run/page-number.ts @@ -1,4 +1,4 @@ -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "./text-attributes"; diff --git a/src/file/paragraph/run/run-components/text.ts b/src/file/paragraph/run/run-components/text.ts index 3d402038a1..94b71073c9 100644 --- a/src/file/paragraph/run/run-components/text.ts +++ b/src/file/paragraph/run/run-components/text.ts @@ -1,4 +1,4 @@ -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "../text-attributes"; diff --git a/src/file/paragraph/run/sequential-identifier-instruction.ts b/src/file/paragraph/run/sequential-identifier-instruction.ts index e1742a5c33..4de568aebc 100644 --- a/src/file/paragraph/run/sequential-identifier-instruction.ts +++ b/src/file/paragraph/run/sequential-identifier-instruction.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPfieldInstructions.php -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "./text-attributes"; diff --git a/src/file/paragraph/run/text-attributes.ts b/src/file/paragraph/run/text-attributes.ts index 742f640002..e56d091126 100644 --- a/src/file/paragraph/run/text-attributes.ts +++ b/src/file/paragraph/run/text-attributes.ts @@ -1,4 +1,4 @@ -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlAttributeComponent } from "@file/xml-components"; export class TextAttributes extends XmlAttributeComponent<{ readonly space: SpaceType }> { diff --git a/src/file/shared/index.ts b/src/file/shared/index.ts index 6abfbc0a8e..7edbd8d752 100644 --- a/src/file/shared/index.ts +++ b/src/file/shared/index.ts @@ -1,2 +1,3 @@ export * from "./alignment"; export * from "./number-format"; +export * from "./space-type"; diff --git a/src/file/space-type.ts b/src/file/shared/space-type.ts similarity index 100% rename from src/file/space-type.ts rename to src/file/shared/space-type.ts diff --git a/src/file/table-of-contents/field-instruction.ts b/src/file/table-of-contents/field-instruction.ts index 759e502dc1..e902febeb6 100644 --- a/src/file/table-of-contents/field-instruction.ts +++ b/src/file/table-of-contents/field-instruction.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPfieldInstructions.php import { TextAttributes } from "@file/paragraph/run/text-attributes"; -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlComponent } from "@file/xml-components"; import { ITableOfContentsOptions } from "./table-of-contents-properties"; diff --git a/src/file/track-revision/track-revision-components/deleted-page-number.ts b/src/file/track-revision/track-revision-components/deleted-page-number.ts index 83971df259..034335179b 100644 --- a/src/file/track-revision/track-revision-components/deleted-page-number.ts +++ b/src/file/track-revision/track-revision-components/deleted-page-number.ts @@ -1,5 +1,5 @@ import { TextAttributes } from "@file/paragraph/run/text-attributes"; -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlComponent } from "@file/xml-components"; export class DeletedPage extends XmlComponent { diff --git a/src/file/track-revision/track-revision-components/deleted-text.ts b/src/file/track-revision/track-revision-components/deleted-text.ts index e6c3e33c2a..7245a151d3 100644 --- a/src/file/track-revision/track-revision-components/deleted-text.ts +++ b/src/file/track-revision/track-revision-components/deleted-text.ts @@ -1,5 +1,5 @@ import { TextAttributes } from "@file/paragraph/run/text-attributes"; -import { SpaceType } from "@file/space-type"; +import { SpaceType } from "@file/shared"; import { XmlComponent } from "@file/xml-components"; export class DeletedText extends XmlComponent { diff --git a/tsconfig.json b/tsconfig.json index f56947caa9..53cf5a12fe 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,8 @@ "paths": { "@util/*": ["./util/*"], "@export/*": ["./export/*"], - "@file/*": ["./file/*"] + "@file/*": ["./file/*"], + "@shared": ["./shared/index.ts"] } }, "include": ["src"]