From 43ebfe7a2f576f58f01381d1aaa34b589969a9fd Mon Sep 17 00:00:00 2001 From: Dolan Date: Wed, 20 Dec 2017 00:58:24 +0000 Subject: [PATCH] Move properties to sub folder --- src/docx/file.ts | 2 +- src/{ => docx}/properties/components.ts | 4 ++-- src/docx/properties/index.ts | 1 + src/{ => docx}/properties/properties.spec.ts | 4 ++-- src/{properties/index.ts => docx/properties/properties.ts} | 4 ++-- src/export/formatter.spec.ts | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) rename src/{ => docx}/properties/components.ts (94%) create mode 100644 src/docx/properties/index.ts rename src/{ => docx}/properties/properties.spec.ts (97%) rename src/{properties/index.ts => docx/properties/properties.ts} (92%) diff --git a/src/docx/file.ts b/src/docx/file.ts index 414639ea53..59e913743f 100644 --- a/src/docx/file.ts +++ b/src/docx/file.ts @@ -1,8 +1,8 @@ -import { IPropertiesOptions, Properties } from "../properties"; import { Document } from "./document"; import { Media } from "./media"; import { Numbering } from "./numbering"; import { Paragraph } from "./paragraph"; +import { IPropertiesOptions, Properties } from "./properties"; import { Styles } from "./styles"; import { DefaultStylesFactory } from "./styles/factory"; import { Table } from "./table"; diff --git a/src/properties/components.ts b/src/docx/properties/components.ts similarity index 94% rename from src/properties/components.ts rename to src/docx/properties/components.ts index 387524a35b..bfcf28f5f1 100644 --- a/src/properties/components.ts +++ b/src/docx/properties/components.ts @@ -1,5 +1,5 @@ -import { DocumentAttributes } from "../docx/document/document-attributes"; -import { XmlComponent } from "../docx/xml-components"; +import { DocumentAttributes } from "../document/document-attributes"; +import { XmlComponent } from "../xml-components"; export class Title extends XmlComponent { diff --git a/src/docx/properties/index.ts b/src/docx/properties/index.ts new file mode 100644 index 0000000000..99d40e003c --- /dev/null +++ b/src/docx/properties/index.ts @@ -0,0 +1 @@ +export * from "./properties"; diff --git a/src/properties/properties.spec.ts b/src/docx/properties/properties.spec.ts similarity index 97% rename from src/properties/properties.spec.ts rename to src/docx/properties/properties.spec.ts index f28c0ae72f..d938873b56 100644 --- a/src/properties/properties.spec.ts +++ b/src/docx/properties/properties.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "../export/formatter"; -import { Properties } from "./"; +import { Formatter } from "../../export/formatter"; +import { Properties } from "./properties"; describe("Properties", () => { diff --git a/src/properties/index.ts b/src/docx/properties/properties.ts similarity index 92% rename from src/properties/index.ts rename to src/docx/properties/properties.ts index 943a620677..bd3229b434 100644 --- a/src/properties/index.ts +++ b/src/docx/properties/properties.ts @@ -1,5 +1,5 @@ -import { DocumentAttributes } from "../docx/document/document-attributes"; -import { XmlComponent } from "../docx/xml-components"; +import { DocumentAttributes } from "../document/document-attributes"; +import { XmlComponent } from "../xml-components"; import { Created, Creator, Description, Keywords, LastModifiedBy, Modified, Revision, Subject, Title } from "./components"; export interface IPropertiesOptions { diff --git a/src/export/formatter.spec.ts b/src/export/formatter.spec.ts index 5bab6ab24b..9b3433c3bb 100644 --- a/src/export/formatter.spec.ts +++ b/src/export/formatter.spec.ts @@ -1,9 +1,9 @@ import { assert } from "chai"; import * as docx from "../docx"; +import { Properties } from "../docx/properties"; import { Attributes } from "../docx/xml-components"; import { Formatter } from "../export/formatter"; -import { Properties } from "../properties"; import { Utility } from "../tests/utility"; describe("Formatter", () => {