Merge pull request #1748 from dolanmiu/feat/clean-up

Move SpaceType to shared

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

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

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

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

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

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

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

src/file/shared/index.ts

@@ -1,2 +1,3 @@
 export * from "./alignment";
 export * from "./number-format";
+export * from "./space-type";

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

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 {

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 {

tsconfig.json

@@ -16,7 +16,8 @@
         "paths": {
             "@util/*": ["./util/*"],
             "@export/*": ["./export/*"],
-            "@file/*": ["./file/*"]
+            "@file/*": ["./file/*"],
+            "@shared": ["./shared/index.ts"]
         }
     },
     "include": ["src"]