Re-order package

src/docx/drawing/drawing.spec.ts

@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import * as fs from "fs";
 
-import { Utility } from "../../../../tests/utility";
+import { Utility } from "../../tests/utility";
 import { Drawing } from "./";
 
 describe("Drawing", () => {

src/docx/drawing/index.ts

@@ -1,5 +1,5 @@
-import { IData } from "../../../../media/data";
+import { XmlComponent } from "../../docx/xml-components";
-import { XmlComponent } from "../../../xml-components";
+import { IData } from "../../media/data";
 import { Inline } from "./inline";
 
 export class Drawing extends XmlComponent {

src/docx/drawing/inline/graphic/graphic-data/index.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../xml-components";
+import { XmlComponent } from "../../../../xml-components";
 import { Pic } from "./pic";
 
 export class GraphicData extends XmlComponent {

src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../../xml-components";
 import { Blip } from "./blip";
 import { SourceRectangle } from "./source-rectangle";
 import { Stretch } from "./stretch";

src/docx/drawing/inline/graphic/graphic-data/pic/blip/blip.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../../../../../../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../../../../../xml-components";
 
 interface IBlipProperties {
     embed: string;

src/docx/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../../xml-components";
 
 export class SourceRectangle extends XmlComponent {
 

src/docx/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../../xml-components";
 
 class FillRectangle extends XmlComponent {
 

src/docx/drawing/inline/graphic/graphic-data/pic/index.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../../../../xml-components";
+import { XmlComponent } from "../../../../../xml-components";
 import { BlipFill } from "./blip/blip-fill";
 
 export class Pic extends XmlComponent {

src/docx/drawing/inline/graphic/index.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../../../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../../../docx/xml-components";
 import { GraphicData } from "./graphic-data";
 
 interface IGraphicProperties {

src/docx/drawing/inline/index.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../../../../xml-components";
+import { XmlComponent } from "../../../docx/xml-components";
 import { Graphic } from "./graphic";
 
 export class Inline extends XmlComponent {

src/docx/index.ts

@@ -1,5 +1,4 @@
 export * from "./document";
 export * from "./paragraph";
-export * from "./run";
+export * from "./table";
-export { Table } from "./table";
+export * from "./file";
-export { File } from "./file";

src/docx/paragraph/formatting/page-break.ts

@@ -1,6 +1,6 @@
 // http://officeopenxml.com/WPtextSpecialContent-break.php
-import { Run } from "../../run";
 import { Attributes, XmlComponent } from "../../xml-components";
+import { Run } from "../run";
 
 class Break extends XmlComponent {
 

src/docx/paragraph/index.ts

@@ -1,3 +1,5 @@
 export * from "./formatting";
 export * from "./paragraph";
 export * from "./properties";
+export * from "./run";
+

src/docx/paragraph/paragraph.ts

@@ -1,10 +1,8 @@
 // http://officeopenxml.com/WPparagraph.php
 import { IData } from "../../media/data";
 import { Num } from "../../numbering/num";
-import { Run } from "../run";
-import { PictureRun } from "../run/picture-run";
-import { TextRun } from "../run/text-run";
 import { XmlComponent } from "../xml-components";
+import { PictureRun, Run, TextRun } from "./run";
 
 import { Alignment } from "./formatting/alignment";
 import { ThematicBreak } from "./formatting/border";

src/docx/paragraph/run/break.spec.ts

@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { Break } from "./break";
 
 describe("Break", () => {

src/docx/paragraph/run/break.ts

@@ -1,5 +1,5 @@
 // http://officeopenxml.com/WPtextSpecialContent-break.php
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class Break extends XmlComponent {
 

src/docx/paragraph/run/caps.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class SmallCaps extends XmlComponent {
 

src/docx/paragraph/run/formatting.ts

@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 export { Underline } from "./underline";
 export { SubScript, SuperScript } from "./script";
 export { RunFonts } from "./run-fonts";

src/docx/paragraph/run/picture-run.ts

@@ -1,6 +1,6 @@
-import { IData } from "../../media/data";
+import { IData } from "../../../media/data";
+import { Drawing } from "../../drawing";
 import { Run } from "../run";
-import { Drawing } from "./run-components/drawing";
 
 export class PictureRun extends Run {
 

src/docx/paragraph/run/properties.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class RunProperties extends XmlComponent {
 

src/docx/paragraph/run/run-components/text.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../../export/formatter";
+import { Formatter } from "../../../../export/formatter";
 import { Text } from "./text";
 
 describe("Text", () => {

src/docx/paragraph/run/run-components/text.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../../xml-components";
 
 class TextAttributes extends XmlAttributeComponent<{space: "default" | "preserve"}> {
     protected xmlKeys = {space: "xml:space"};

src/docx/paragraph/run/run-fonts.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
+import { Formatter } from "../../../export/formatter";
 import { RunFonts } from "./run-fonts";
 
 describe("RunFonts", () => {

src/docx/paragraph/run/run-fonts.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
 
 interface IRunFontAttributesProperties {
     ascii: string;

src/docx/paragraph/run/run.spec.ts

@@ -1,7 +1,7 @@
 import { assert, expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
+import { Formatter } from "../../../export/formatter";
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { Run } from "./";
 
 describe("Run", () => {

src/docx/paragraph/run/run.ts

@@ -9,7 +9,7 @@ import { Style } from "./style";
 import { Tab } from "./tab";
 import { Underline } from "./underline";
 
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class Run extends XmlComponent {
     private properties: RunProperties;

src/docx/paragraph/run/script.spec.ts

@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { SubScript, SuperScript } from "./script";
 
 describe("SubScript", () => {

src/docx/paragraph/run/script.ts

@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export abstract class VerticalAlign extends XmlComponent {
 

src/docx/paragraph/run/strike.spec.ts

@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { DoubleStrike, Strike } from "./formatting";
 
 describe("Strike", () => {

src/docx/paragraph/run/style.ts

@@ -1,4 +1,4 @@
-import { XmlAttributeComponent, XmlComponent } from "../xml-components";
+import { XmlAttributeComponent, XmlComponent } from "../../xml-components";
 
 class StyleAttributes extends XmlAttributeComponent<{val: string}> {
     protected xmlKeys = {val: "w:val"};

src/docx/paragraph/run/tab.spec.ts

@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import { Tab } from "./tab";
 
 describe("Tab", () => {

src/docx/paragraph/run/tab.ts

@@ -1,4 +1,4 @@
-import { XmlComponent } from "../xml-components";
+import { XmlComponent } from "../../xml-components";
 
 export class Tab extends XmlComponent {
 

src/docx/paragraph/run/text-run.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
+import { Formatter } from "../../../export/formatter";
 import { TextRun } from "./text-run";
 
 describe("TextRun", () => {

src/docx/paragraph/run/underline.spec.ts

@@ -1,7 +1,7 @@
 import { assert, expect } from "chai";
 
-import { Formatter } from "../../export/formatter";
+import { Formatter } from "../../../export/formatter";
-import { Utility } from "../../tests/utility";
+import { Utility } from "../../../tests/utility";
 import * as u from "./underline";
 
 describe("Underline", () => {

src/docx/paragraph/run/underline.ts

@@ -1,4 +1,4 @@
-import { Attributes, XmlComponent } from "../xml-components";
+import { Attributes, XmlComponent } from "../../xml-components";
 
 export abstract class BaseUnderline extends XmlComponent {
 

src/export/packer/local.spec.ts

@@ -5,7 +5,7 @@ import { File } from "../../docx";
 import { Paragraph } from "../../docx/paragraph";
 import { LocalPacker } from "../../export/packer/local";
 
-describe.only("LocalPacker", () => {
+describe("LocalPacker", () => {
     let packer: LocalPacker;
 
     beforeEach(() => {

src/numbering/level.ts

@@ -1,7 +1,7 @@
 import * as paragraph from "../docx/paragraph/formatting";
 import { ParagraphProperties } from "../docx/paragraph/properties";
-import * as formatting from "../docx/run/formatting";
+import * as formatting from "../docx/paragraph/run/formatting";
-import { RunProperties } from "../docx/run/properties";
+import { RunProperties } from "../docx/paragraph/run/properties";
 import { Attributes, XmlAttributeComponent, XmlComponent } from "../docx/xml-components";
 
 interface ILevelAttributesProperties {

src/numbering/numbering.ts

@@ -1,6 +1,6 @@
 import { DocumentAttributes } from "../docx/document/document-attributes";
 import { Indent } from "../docx/paragraph/formatting";
-import { RunFonts } from "../docx/run/run-fonts";
+import { RunFonts } from "../docx/paragraph/run/run-fonts";
 import { XmlComponent } from "../docx/xml-components";
 import { AbstractNumbering } from "./abstract-numbering";
 import { Num } from "./num";

src/styles/defaults/run-properties.ts

@@ -1,6 +1,6 @@
-import { Size } from "../../docx/run/formatting";
+import { Size } from "../../docx/paragraph/run/formatting";
-import { RunProperties } from "../../docx/run/properties";
+import { RunProperties } from "../../docx/paragraph/run/properties";
-import { RunFonts } from "../../docx/run/run-fonts";
+import { RunFonts } from "../../docx/paragraph/run/run-fonts";
 import { XmlComponent } from "../../docx/xml-components";
 
 export class RunPropertiesDefaults extends XmlComponent {

src/styles/factory.ts

@@ -1,4 +1,4 @@
-import { Color, Italics, Size } from "../docx/run/formatting";
+import { Color, Italics, Size } from "../docx/paragraph/run/formatting";
 
 import { Styles } from "./";
 // import { DocumentDefaults } from "./defaults";

src/styles/style/index.ts

@@ -1,6 +1,6 @@
 import * as paragraph from "../../docx/paragraph";
-import * as formatting from "../../docx/run/formatting";
+import * as formatting from "../../docx/paragraph/run/formatting";
-import { RunProperties } from "../../docx/run/properties";
+import { RunProperties } from "../../docx/paragraph/run/properties";
 import { XmlAttributeComponent, XmlComponent } from "../../docx/xml-components";
 
 import { BasedOn, Name, Next, QuickFormat } from "./components";