diff --git a/package-lock.json b/package-lock.json index 9b59ca7e0e..fd91f3501a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,6 +46,7 @@ "ts-loader": "^9.0.0", "ts-node": "^10.2.1", "tsconfig-paths": "^4.0.0", + "tsconfig-paths-webpack-plugin": "^3.5.2", "tslint": "^6.1.3", "tslint-immutable": "^6.0.1", "typedoc": "^0.22.3", @@ -768,6 +769,12 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, "node_modules/@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -6953,6 +6960,111 @@ "strip-bom": "^3.0.0" } }, + "node_modules/tsconfig-paths-webpack-plugin": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz", + "integrity": "sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.7.0", + "tsconfig-paths": "^3.9.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tsconfig-paths-webpack-plugin/node_modules/tsconfig-paths": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, "node_modules/tslib": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", @@ -8686,6 +8798,12 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, "@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -13475,6 +13593,89 @@ "strip-bom": "^3.0.0" } }, + "tsconfig-paths-webpack-plugin": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.5.2.tgz", + "integrity": "sha512-EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "enhanced-resolve": "^5.7.0", + "tsconfig-paths": "^3.9.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "tsconfig-paths": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + } + } + }, "tslib": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", diff --git a/package.json b/package.json index b321778a4f..9a67b04bca 100644 --- a/package.json +++ b/package.json @@ -92,6 +92,7 @@ "ts-loader": "^9.0.0", "ts-node": "^10.2.1", "tsconfig-paths": "^4.0.0", + "tsconfig-paths-webpack-plugin": "^3.5.2", "tslint": "^6.1.3", "tslint-immutable": "^6.0.1", "typedoc": "^0.22.3", diff --git a/scripts/types-absolute-fixer.ts b/scripts/types-absolute-fixer.ts index 6eea3c600e..43a338f20d 100644 --- a/scripts/types-absolute-fixer.ts +++ b/scripts/types-absolute-fixer.ts @@ -6,9 +6,9 @@ const files = glob.sync("build/**/*.d.ts"); for (const file of files) { replaceInFile({ files: file, - from: /"file[a-z/-]*"/gi, + from: /"@[a-z/-]*"/gi, to: (match) => { - const matchSlug = match.replace(/['"]+/g, "").trim(); + const matchSlug = match.replace(/['"]+/g, "").replace(/[@]+/g, "").trim(); const levelCount = file.split("/").length - 2; const backLevels = Array(levelCount).fill("../").join(""); diff --git a/src/export/formatter.spec.ts b/src/export/formatter.spec.ts index 463ec38c7f..fed4319697 100644 --- a/src/export/formatter.spec.ts +++ b/src/export/formatter.spec.ts @@ -2,9 +2,9 @@ import { assert, expect } from "chai"; import * as sinon from "sinon"; import { Formatter } from "@export/formatter"; -import { Paragraph, TextRun } from "file"; -import { CoreProperties } from "file/core-properties"; -import { Attributes } from "file/xml-components"; +import { CoreProperties } from "@file/core-properties"; +import { Paragraph, TextRun } from "@file/paragraph"; +import { Attributes } from "@file/xml-components"; describe("Formatter", () => { let formatter: Formatter; diff --git a/src/export/formatter.ts b/src/export/formatter.ts index cf71dc9ba1..60a372cdd5 100644 --- a/src/export/formatter.ts +++ b/src/export/formatter.ts @@ -1,4 +1,4 @@ -import { BaseXmlComponent, IContext, IXmlableObject } from "file/xml-components"; +import { BaseXmlComponent, IContext, IXmlableObject } from "@file/xml-components"; export class Formatter { // tslint:disable-next-line: no-object-literal-type-assertion diff --git a/src/export/packer/image-replacer.spec.ts b/src/export/packer/image-replacer.spec.ts index 63cbe9bf9d..db7571cffa 100644 --- a/src/export/packer/image-replacer.spec.ts +++ b/src/export/packer/image-replacer.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Media } from "file"; +import { Media } from "@file/media"; import { ImageReplacer } from "./image-replacer"; diff --git a/src/export/packer/image-replacer.ts b/src/export/packer/image-replacer.ts index 0d2e2854f8..3dce0de58d 100644 --- a/src/export/packer/image-replacer.ts +++ b/src/export/packer/image-replacer.ts @@ -1,4 +1,4 @@ -import { IMediaData, Media } from "file/media"; +import { IMediaData, Media } from "@file/media"; export class ImageReplacer { public replace(xmlData: string, mediaData: IMediaData[], offset: number): string { diff --git a/src/export/packer/next-compiler.spec.ts b/src/export/packer/next-compiler.spec.ts index 727c617007..c31a8c4ce7 100644 --- a/src/export/packer/next-compiler.spec.ts +++ b/src/export/packer/next-compiler.spec.ts @@ -2,7 +2,9 @@ import { expect } from "chai"; import * as sinon from "sinon"; -import { File, Footer, Header, Paragraph } from "file"; +import { File } from "@file/file"; +import { Footer, Header } from "@file/header"; +import { Paragraph } from "@file/paragraph"; import { Compiler } from "./next-compiler"; diff --git a/src/export/packer/next-compiler.ts b/src/export/packer/next-compiler.ts index 90d08a2232..5604cdabbb 100644 --- a/src/export/packer/next-compiler.ts +++ b/src/export/packer/next-compiler.ts @@ -1,7 +1,8 @@ import * as JSZip from "jszip"; import * as xml from "xml"; -import { File } from "file"; +import { File } from "@file/file"; + import { Formatter } from "../formatter"; import { ImageReplacer } from "./image-replacer"; import { NumberingReplacer } from "./numbering-replacer"; diff --git a/src/export/packer/numbering-replacer.ts b/src/export/packer/numbering-replacer.ts index eeecad929f..d0416340b1 100644 --- a/src/export/packer/numbering-replacer.ts +++ b/src/export/packer/numbering-replacer.ts @@ -1,4 +1,4 @@ -import { ConcreteNumbering } from "file"; +import { ConcreteNumbering } from "@file/numbering"; export class NumberingReplacer { public replace(xmlData: string, concreteNumberings: ConcreteNumbering[]): string { diff --git a/src/export/packer/packer.spec.ts b/src/export/packer/packer.spec.ts index a0e9f10326..5500144eff 100644 --- a/src/export/packer/packer.spec.ts +++ b/src/export/packer/packer.spec.ts @@ -2,7 +2,8 @@ import { assert } from "chai"; import { mock, stub } from "sinon"; -import { File, HeadingLevel, Paragraph } from "file"; +import { File } from "@file/file"; +import { HeadingLevel, Paragraph } from "@file/paragraph"; import { Packer } from "./packer"; diff --git a/src/export/packer/packer.ts b/src/export/packer/packer.ts index b32cd0aa8d..66bfe583e6 100644 --- a/src/export/packer/packer.ts +++ b/src/export/packer/packer.ts @@ -1,4 +1,5 @@ -import { File } from "file"; +import { File } from "@file/file"; + import { Compiler } from "./next-compiler"; /** diff --git a/src/file/app-properties/app-properties-attributes.ts b/src/file/app-properties/app-properties-attributes.ts index dfd26d6fcb..fcfd5aacae 100644 --- a/src/file/app-properties/app-properties-attributes.ts +++ b/src/file/app-properties/app-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class AppPropertiesAttributes extends XmlAttributeComponent<{ readonly xmlns: string; diff --git a/src/file/app-properties/app-properties.ts b/src/file/app-properties/app-properties.ts index 62e22c0a62..77f60ef67b 100644 --- a/src/file/app-properties/app-properties.ts +++ b/src/file/app-properties/app-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { AppPropertiesAttributes } from "./app-properties-attributes"; export class AppProperties extends XmlComponent { diff --git a/src/file/border/border.spec.ts b/src/file/border/border.spec.ts index e652c50422..b51ff6a434 100644 --- a/src/file/border/border.spec.ts +++ b/src/file/border/border.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; import { BorderElement } from "./border"; diff --git a/src/file/border/border.ts b/src/file/border/border.ts index 04e487ff61..fe5cc604ab 100644 --- a/src/file/border/border.ts +++ b/src/file/border/border.ts @@ -19,8 +19,8 @@ // // // -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; -import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "../values"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { eighthPointMeasureValue, hexColorValue, pointMeasureValue } from "@util/values"; export interface IBorderOptions { readonly style: BorderStyle; diff --git a/src/file/content-types/content-types-attributes.ts b/src/file/content-types/content-types-attributes.ts index 0338cfc1b7..4b5eb4a4f9 100644 --- a/src/file/content-types/content-types-attributes.ts +++ b/src/file/content-types/content-types-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ContentTypeAttributes extends XmlAttributeComponent<{ readonly xmlns?: string; diff --git a/src/file/content-types/content-types.spec.ts b/src/file/content-types/content-types.spec.ts index 93fca7c8e1..c66095fb80 100644 --- a/src/file/content-types/content-types.spec.ts +++ b/src/file/content-types/content-types.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { ContentTypes } from "./content-types"; diff --git a/src/file/content-types/content-types.ts b/src/file/content-types/content-types.ts index d2331c2cbd..4437680d9a 100644 --- a/src/file/content-types/content-types.ts +++ b/src/file/content-types/content-types.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ContentTypeAttributes } from "./content-types-attributes"; import { Default } from "./default/default"; import { Override } from "./override/override"; diff --git a/src/file/content-types/default/default-attributes.ts b/src/file/content-types/default/default-attributes.ts index dd9872f3f9..66cc118b6d 100644 --- a/src/file/content-types/default/default-attributes.ts +++ b/src/file/content-types/default/default-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class DefaultAttributes extends XmlAttributeComponent<{ readonly contentType: string; diff --git a/src/file/content-types/default/default.ts b/src/file/content-types/default/default.ts index fc72f15255..673e3b0247 100644 --- a/src/file/content-types/default/default.ts +++ b/src/file/content-types/default/default.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { DefaultAttributes } from "./default-attributes"; export class Default extends XmlComponent { diff --git a/src/file/content-types/override/override-attributes.ts b/src/file/content-types/override/override-attributes.ts index 9f5e5eca34..974ef09e4d 100644 --- a/src/file/content-types/override/override-attributes.ts +++ b/src/file/content-types/override/override-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class OverrideAttributes extends XmlAttributeComponent<{ readonly contentType: string; diff --git a/src/file/content-types/override/override.ts b/src/file/content-types/override/override.ts index 8c0ba6d919..268a849c21 100644 --- a/src/file/content-types/override/override.ts +++ b/src/file/content-types/override/override.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { OverrideAttributes } from "./override-attributes"; export class Override extends XmlComponent { diff --git a/src/file/core-properties/properties.spec.ts b/src/file/core-properties/properties.spec.ts index 7947d98e92..5bcc83c2f6 100644 --- a/src/file/core-properties/properties.spec.ts +++ b/src/file/core-properties/properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { CoreProperties } from "./properties"; diff --git a/src/file/core-properties/properties.ts b/src/file/core-properties/properties.ts index 44a6878272..039a04df05 100644 --- a/src/file/core-properties/properties.ts +++ b/src/file/core-properties/properties.ts @@ -1,5 +1,6 @@ -import { ICommentsOptions } from "file/paragraph/run/comment-run"; -import { StringContainer, XmlComponent } from "file/xml-components"; +import { ICommentsOptions } from "@file/paragraph/run/comment-run"; +import { StringContainer, XmlComponent } from "@file/xml-components"; +import { dateTimeValue } from "@util/values"; import { ICustomPropertyOptions } from "../custom-properties"; import { IDocumentBackgroundOptions } from "../document"; @@ -9,7 +10,6 @@ import { ISectionOptions } from "../file"; import { INumberingOptions } from "../numbering"; import { Paragraph } from "../paragraph"; import { IStylesOptions } from "../styles"; -import { dateTimeValue } from "../values"; export interface IPropertiesOptions { readonly sections: ISectionOptions[]; diff --git a/src/file/custom-properties/custom-properties-attributes.ts b/src/file/custom-properties/custom-properties-attributes.ts index 2b91ce0ac0..fdae344710 100644 --- a/src/file/custom-properties/custom-properties-attributes.ts +++ b/src/file/custom-properties/custom-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class CustomPropertiesAttributes extends XmlAttributeComponent<{ readonly xmlns: string; diff --git a/src/file/custom-properties/custom-properties.spec.ts b/src/file/custom-properties/custom-properties.spec.ts index a8bc92b7e4..4c4efe3392 100644 --- a/src/file/custom-properties/custom-properties.spec.ts +++ b/src/file/custom-properties/custom-properties.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { CustomProperties } from "./custom-properties"; describe("CustomProperties", () => { diff --git a/src/file/custom-properties/custom-properties.ts b/src/file/custom-properties/custom-properties.ts index 2ddd01919b..47d2abf11c 100644 --- a/src/file/custom-properties/custom-properties.ts +++ b/src/file/custom-properties/custom-properties.ts @@ -1,4 +1,4 @@ -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; import { CustomPropertiesAttributes } from "./custom-properties-attributes"; import { CustomProperty, ICustomPropertyOptions } from "./custom-property"; diff --git a/src/file/custom-properties/custom-property-attributes.ts b/src/file/custom-properties/custom-property-attributes.ts index e681eee135..7f2c873c6c 100644 --- a/src/file/custom-properties/custom-property-attributes.ts +++ b/src/file/custom-properties/custom-property-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class CustomPropertyAttributes extends XmlAttributeComponent<{ readonly fmtid: string; diff --git a/src/file/custom-properties/custom-property.ts b/src/file/custom-properties/custom-property.ts index fc18db2667..704d4c697d 100644 --- a/src/file/custom-properties/custom-property.ts +++ b/src/file/custom-properties/custom-property.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { CustomPropertyAttributes } from "./custom-property-attributes"; export interface ICustomPropertyOptions { diff --git a/src/file/document/body/body.spec.ts b/src/file/document/body/body.spec.ts index a65f86b69e..c39acbb10b 100644 --- a/src/file/document/body/body.spec.ts +++ b/src/file/document/body/body.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Body } from "./body"; import { sectionMarginDefaults } from "./section-properties"; diff --git a/src/file/document/body/body.ts b/src/file/document/body/body.ts index deb2e573cf..8e8e84f290 100644 --- a/src/file/document/body/body.ts +++ b/src/file/document/body/body.ts @@ -1,6 +1,6 @@ -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { Paragraph, ParagraphProperties } from "@file/paragraph"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; -import { Paragraph, ParagraphProperties } from "../.."; import { ISectionPropertiesOptions, SectionProperties } from "./section-properties/section-properties"; export class Body extends XmlComponent { diff --git a/src/file/document/body/section-properties/properties/column.ts b/src/file/document/body/section-properties/properties/column.ts index d1f48a7aa5..7ffaef6bdc 100644 --- a/src/file/document/body/section-properties/properties/column.ts +++ b/src/file/document/body/section-properties/properties/column.ts @@ -1,5 +1,5 @@ -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; export interface IColumnAttributes { readonly width: number | string; diff --git a/src/file/document/body/section-properties/properties/columns.spec.ts b/src/file/document/body/section-properties/properties/columns.spec.ts index 596b30bdb1..c301d4efeb 100644 --- a/src/file/document/body/section-properties/properties/columns.spec.ts +++ b/src/file/document/body/section-properties/properties/columns.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Column, Columns } from "."; diff --git a/src/file/document/body/section-properties/properties/columns.ts b/src/file/document/body/section-properties/properties/columns.ts index e418b0ff1f..789e0f103e 100644 --- a/src/file/document/body/section-properties/properties/columns.ts +++ b/src/file/document/body/section-properties/properties/columns.ts @@ -1,5 +1,6 @@ -import { decimalNumber, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber, twipsMeasureValue } from "@util/values"; + import { Column } from "./column"; // diff --git a/src/file/document/body/section-properties/properties/doc-grid.spec.ts b/src/file/document/body/section-properties/properties/doc-grid.spec.ts index d4cd235011..6ffae75860 100644 --- a/src/file/document/body/section-properties/properties/doc-grid.spec.ts +++ b/src/file/document/body/section-properties/properties/doc-grid.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { DocumentGrid, DocumentGridType } from "."; diff --git a/src/file/document/body/section-properties/properties/doc-grid.ts b/src/file/document/body/section-properties/properties/doc-grid.ts index 1b3a8bfb38..5a9d3a26ed 100644 --- a/src/file/document/body/section-properties/properties/doc-grid.ts +++ b/src/file/document/body/section-properties/properties/doc-grid.ts @@ -1,5 +1,5 @@ -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; // not implemented // diff --git a/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts b/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts index adb0bc70b6..0a7ab4bebe 100644 --- a/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts +++ b/src/file/document/body/section-properties/properties/header-footer-reference.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./header-footer-reference"; describe("HeaderFooterReference", () => { diff --git a/src/file/document/body/section-properties/properties/header-footer-reference.ts b/src/file/document/body/section-properties/properties/header-footer-reference.ts index 1966790da9..8cd6753f1a 100644 --- a/src/file/document/body/section-properties/properties/header-footer-reference.ts +++ b/src/file/document/body/section-properties/properties/header-footer-reference.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/document/body/section-properties/properties/line-number.ts b/src/file/document/body/section-properties/properties/line-number.ts index 0ab1218568..6d494bd552 100644 --- a/src/file/document/body/section-properties/properties/line-number.ts +++ b/src/file/document/body/section-properties/properties/line-number.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPsectionLineNumbering.php -import { decimalNumber, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber, twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-borders.spec.ts b/src/file/document/body/section-properties/properties/page-borders.spec.ts index 977bcbd1b7..db1a4b1775 100644 --- a/src/file/document/body/section-properties/properties/page-borders.spec.ts +++ b/src/file/document/body/section-properties/properties/page-borders.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; import { PageBorderDisplay, PageBorders, PageBorderZOrder } from "./page-borders"; diff --git a/src/file/document/body/section-properties/properties/page-borders.ts b/src/file/document/body/section-properties/properties/page-borders.ts index d3a8ecbb61..c9b97983a6 100644 --- a/src/file/document/body/section-properties/properties/page-borders.ts +++ b/src/file/document/body/section-properties/properties/page-borders.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPsectionBorders.php -import { BorderElement, IBorderOptions } from "file/border"; -import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "file/xml-components"; +import { BorderElement, IBorderOptions } from "@file/border"; +import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent } from "@file/xml-components"; // // diff --git a/src/file/document/body/section-properties/properties/page-margin.ts b/src/file/document/body/section-properties/properties/page-margin.ts index 91df7db51a..a6e40fe80d 100644 --- a/src/file/document/body/section-properties/properties/page-margin.ts +++ b/src/file/document/body/section-properties/properties/page-margin.ts @@ -1,5 +1,5 @@ -import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-number.ts b/src/file/document/body/section-properties/properties/page-number.ts index 0bca61ebba..9788c62efd 100644 --- a/src/file/document/body/section-properties/properties/page-number.ts +++ b/src/file/document/body/section-properties/properties/page-number.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPSectionPgNumType.php -import { NumberFormat } from "file/shared/number-format"; -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { NumberFormat } from "@file/shared/number-format"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-size.spec.ts b/src/file/document/body/section-properties/properties/page-size.spec.ts index aa7ca8ae1d..69285e6262 100644 --- a/src/file/document/body/section-properties/properties/page-size.spec.ts +++ b/src/file/document/body/section-properties/properties/page-size.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageOrientation, PageSize } from "./page-size"; diff --git a/src/file/document/body/section-properties/properties/page-size.ts b/src/file/document/body/section-properties/properties/page-size.ts index ff99c52201..88d6f70527 100644 --- a/src/file/document/body/section-properties/properties/page-size.ts +++ b/src/file/document/body/section-properties/properties/page-size.ts @@ -1,5 +1,5 @@ -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/document/body/section-properties/properties/page-text-direction.spec.ts b/src/file/document/body/section-properties/properties/page-text-direction.spec.ts index b8c9fa6f68..7e77840f54 100644 --- a/src/file/document/body/section-properties/properties/page-text-direction.spec.ts +++ b/src/file/document/body/section-properties/properties/page-text-direction.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageTextDirection, PageTextDirectionType } from "./page-text-direction"; describe("PageTextDirection", () => { diff --git a/src/file/document/body/section-properties/properties/page-text-direction.ts b/src/file/document/body/section-properties/properties/page-text-direction.ts index 0136f18428..600b738916 100644 --- a/src/file/document/body/section-properties/properties/page-text-direction.ts +++ b/src/file/document/body/section-properties/properties/page-text-direction.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum PageTextDirectionType { LEFT_TO_RIGHT_TOP_TO_BOTTOM = "lrTb", diff --git a/src/file/document/body/section-properties/properties/section-type.spec.ts b/src/file/document/body/section-properties/properties/section-type.spec.ts index bbf08799f3..0dd8622a5d 100644 --- a/src/file/document/body/section-properties/properties/section-type.spec.ts +++ b/src/file/document/body/section-properties/properties/section-type.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SectionType, Type } from "./section-type"; describe("Type", () => { diff --git a/src/file/document/body/section-properties/properties/section-type.ts b/src/file/document/body/section-properties/properties/section-type.ts index e09d3c6508..a9d6509a5d 100644 --- a/src/file/document/body/section-properties/properties/section-type.ts +++ b/src/file/document/body/section-properties/properties/section-type.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPsection.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // 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 c0ab27f7e7..f3a357bc04 100644 --- a/src/file/document/body/section-properties/section-properties.spec.ts +++ b/src/file/document/body/section-properties/section-properties.spec.ts @@ -1,12 +1,12 @@ import { expect } from "chai"; -import { convertInchesToTwip } from "convenience-functions"; -import { Formatter } from "export/formatter"; -import { FooterWrapper } from "file/footer-wrapper"; -import { HeaderWrapper } from "file/header-wrapper"; -import { Media } from "file/media"; -import { NumberFormat } from "file/shared/number-format"; -import { VerticalAlign } from "file/vertical-align"; +import { Formatter } from "@export/formatter"; +import { FooterWrapper } from "@file/footer-wrapper"; +import { HeaderWrapper } from "@file/header-wrapper"; +import { Media } from "@file/media"; +import { NumberFormat } from "@file/shared/number-format"; +import { VerticalAlign } from "@file/vertical-align"; +import { convertInchesToTwip } from "@util/convenience-functions"; import { PageOrientation } from "./properties"; import { DocumentGridType } from "./properties/doc-grid"; diff --git a/src/file/document/body/section-properties/section-properties.ts b/src/file/document/body/section-properties/section-properties.ts index 60eaa66313..90a59bd555 100644 --- a/src/file/document/body/section-properties/section-properties.ts +++ b/src/file/document/body/section-properties/section-properties.ts @@ -1,10 +1,10 @@ // http://officeopenxml.com/WPsection.php // tslint:disable: no-unnecessary-initializer -import { FooterWrapper } from "file/footer-wrapper"; -import { HeaderWrapper } from "file/header-wrapper"; -import { VerticalAlign, VerticalAlignElement } from "file/vertical-align"; -import { OnOffElement, XmlComponent } from "file/xml-components"; +import { FooterWrapper } from "@file/footer-wrapper"; +import { HeaderWrapper } from "@file/header-wrapper"; +import { VerticalAlign, VerticalAlignElement } from "@file/vertical-align"; +import { OnOffElement, XmlComponent } from "@file/xml-components"; import { HeaderFooterReference, HeaderFooterReferenceType, HeaderFooterType } from "./properties/header-footer-reference"; diff --git a/src/file/document/document-attributes.ts b/src/file/document/document-attributes.ts index dc759faea0..1dd1546e4c 100644 --- a/src/file/document/document-attributes.ts +++ b/src/file/document/document-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export interface IDocumentAttributesProperties { readonly wpc?: string; diff --git a/src/file/document/document-background/document-background.spec.ts b/src/file/document/document-background/document-background.spec.ts index 30b93ea96d..1cb08b1efb 100644 --- a/src/file/document/document-background/document-background.spec.ts +++ b/src/file/document/document-background/document-background.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { DocumentBackground } from "./document-background"; diff --git a/src/file/document/document-background/document-background.ts b/src/file/document/document-background/document-background.ts index 578cc7f137..b795f036c2 100644 --- a/src/file/document/document-background/document-background.ts +++ b/src/file/document/document-background/document-background.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPdocument.php // http://www.datypic.com/sc/ooxml/e-w_background-1.html -import { hexColorValue, uCharHexNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { hexColorValue, uCharHexNumber } from "@util/values"; // // diff --git a/src/file/document/document.spec.ts b/src/file/document/document.spec.ts index 6cea17d009..a0beae6cb6 100644 --- a/src/file/document/document.spec.ts +++ b/src/file/document/document.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Document } from "./document"; diff --git a/src/file/document/document.ts b/src/file/document/document.ts index 8296d50436..7d09551266 100644 --- a/src/file/document/document.ts +++ b/src/file/document/document.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPdocument.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ConcreteHyperlink, Paragraph } from "../paragraph"; import { Table } from "../table"; import { TableOfContents } from "../table-of-contents"; diff --git a/src/file/drawing/anchor/anchor-attributes.ts b/src/file/drawing/anchor/anchor-attributes.ts index 31d6574a8e..2e4ca7a33d 100644 --- a/src/file/drawing/anchor/anchor-attributes.ts +++ b/src/file/drawing/anchor/anchor-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; import { IDistance } from "../drawing"; export interface IAnchorAttributes extends IDistance { diff --git a/src/file/drawing/anchor/anchor.ts b/src/file/drawing/anchor/anchor.ts index 5fe56d3305..7f712cc031 100644 --- a/src/file/drawing/anchor/anchor.ts +++ b/src/file/drawing/anchor/anchor.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicFloating.php -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { IDrawingOptions } from "../drawing"; import { HorizontalPosition, IFloating, SimplePos, VerticalPosition } from "../floating"; import { Graphic } from "../inline/graphic"; diff --git a/src/file/drawing/doc-properties/doc-properties-attributes.ts b/src/file/drawing/doc-properties/doc-properties-attributes.ts index 69771d0472..a65aa9352b 100644 --- a/src/file/drawing/doc-properties/doc-properties-attributes.ts +++ b/src/file/drawing/doc-properties/doc-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class DocPropertiesAttributes extends XmlAttributeComponent<{ readonly id?: number; diff --git a/src/file/drawing/doc-properties/doc-properties.ts b/src/file/drawing/doc-properties/doc-properties.ts index fa0f97462a..c5ea22661b 100644 --- a/src/file/drawing/doc-properties/doc-properties.ts +++ b/src/file/drawing/doc-properties/doc-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { DocPropertiesAttributes } from "./doc-properties-attributes"; export class DocProperties extends XmlComponent { diff --git a/src/file/drawing/drawing.spec.ts b/src/file/drawing/drawing.spec.ts index 52c76c791f..b7b9c61acc 100644 --- a/src/file/drawing/drawing.spec.ts +++ b/src/file/drawing/drawing.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Drawing, IDrawingOptions } from "./drawing"; diff --git a/src/file/drawing/drawing.ts b/src/file/drawing/drawing.ts index df20c8f5f0..b31725adec 100644 --- a/src/file/drawing/drawing.ts +++ b/src/file/drawing/drawing.ts @@ -1,5 +1,5 @@ -import { IMediaData } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { Anchor } from "./anchor"; import { IFloating } from "./floating"; import { Inline } from "./inline"; diff --git a/src/file/drawing/effect-extent/effect-extent-attributes.ts b/src/file/drawing/effect-extent/effect-extent-attributes.ts index 4c9986d486..be6245885e 100644 --- a/src/file/drawing/effect-extent/effect-extent-attributes.ts +++ b/src/file/drawing/effect-extent/effect-extent-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class EffectExtentAttributes extends XmlAttributeComponent<{ readonly b?: number; diff --git a/src/file/drawing/effect-extent/effect-extent.ts b/src/file/drawing/effect-extent/effect-extent.ts index b62dcc8dd0..1d1e2b370d 100644 --- a/src/file/drawing/effect-extent/effect-extent.ts +++ b/src/file/drawing/effect-extent/effect-extent.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { EffectExtentAttributes } from "./effect-extent-attributes"; export class EffectExtent extends XmlComponent { diff --git a/src/file/drawing/extent/extent-attributes.ts b/src/file/drawing/extent/extent-attributes.ts index 6f0562fab6..8dd447ffe5 100644 --- a/src/file/drawing/extent/extent-attributes.ts +++ b/src/file/drawing/extent/extent-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ExtentAttributes extends XmlAttributeComponent<{ readonly cx?: number; diff --git a/src/file/drawing/extent/extent.ts b/src/file/drawing/extent/extent.ts index 1945fd0eae..52a43d1642 100644 --- a/src/file/drawing/extent/extent.ts +++ b/src/file/drawing/extent/extent.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ExtentAttributes } from "./extent-attributes"; diff --git a/src/file/drawing/floating/align.spec.ts b/src/file/drawing/floating/align.spec.ts index b181725709..491708acaf 100644 --- a/src/file/drawing/floating/align.spec.ts +++ b/src/file/drawing/floating/align.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { VerticalPositionAlign } from "file/shared/alignment"; +import { Formatter } from "@export/formatter"; +import { VerticalPositionAlign } from "@file/shared/alignment"; import { Align } from "./align"; diff --git a/src/file/drawing/floating/align.ts b/src/file/drawing/floating/align.ts index 5eba22c6a9..877aaa4496 100644 --- a/src/file/drawing/floating/align.ts +++ b/src/file/drawing/floating/align.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment"; -import { XmlComponent } from "file/xml-components"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment"; +import { XmlComponent } from "@file/xml-components"; export class Align extends XmlComponent { constructor(value: HorizontalPositionAlign | VerticalPositionAlign) { diff --git a/src/file/drawing/floating/floating-position.ts b/src/file/drawing/floating/floating-position.ts index 82652bbf91..e2c97b601b 100644 --- a/src/file/drawing/floating/floating-position.ts +++ b/src/file/drawing/floating/floating-position.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicFloating-position.php // http://officeopenxml.com/drwPicFloating.php -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment"; import { ITextWrapping } from "../text-wrap"; diff --git a/src/file/drawing/floating/horizontal-position.spec.ts b/src/file/drawing/floating/horizontal-position.spec.ts index 7e9a6223d4..d049d67108 100644 --- a/src/file/drawing/floating/horizontal-position.spec.ts +++ b/src/file/drawing/floating/horizontal-position.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { HorizontalPositionAlign } from "file/shared/alignment"; +import { Formatter } from "@export/formatter"; +import { HorizontalPositionAlign } from "@file/shared/alignment"; import { HorizontalPositionRelativeFrom } from "./floating-position"; import { HorizontalPosition } from "./horizontal-position"; diff --git a/src/file/drawing/floating/horizontal-position.ts b/src/file/drawing/floating/horizontal-position.ts index c083392f5f..d92edaad1f 100644 --- a/src/file/drawing/floating/horizontal-position.ts +++ b/src/file/drawing/floating/horizontal-position.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Align } from "./align"; import { HorizontalPositionRelativeFrom, IHorizontalPositionOptions } from "./floating-position"; import { PositionOffset } from "./position-offset"; diff --git a/src/file/drawing/floating/position-offset.spec.ts b/src/file/drawing/floating/position-offset.spec.ts index f3fb6c35af..6a0ce0ef6c 100644 --- a/src/file/drawing/floating/position-offset.spec.ts +++ b/src/file/drawing/floating/position-offset.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PositionOffset } from "./position-offset"; diff --git a/src/file/drawing/floating/position-offset.ts b/src/file/drawing/floating/position-offset.ts index 4d3aa96b07..bb8f74ac7b 100644 --- a/src/file/drawing/floating/position-offset.ts +++ b/src/file/drawing/floating/position-offset.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class PositionOffset extends XmlComponent { constructor(offsetValue: number) { diff --git a/src/file/drawing/floating/simple-pos.spec.ts b/src/file/drawing/floating/simple-pos.spec.ts index 395781a358..b4f0a2565f 100644 --- a/src/file/drawing/floating/simple-pos.spec.ts +++ b/src/file/drawing/floating/simple-pos.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SimplePos } from "./simple-pos"; diff --git a/src/file/drawing/floating/simple-pos.ts b/src/file/drawing/floating/simple-pos.ts index 0a82e12693..335f374b84 100644 --- a/src/file/drawing/floating/simple-pos.ts +++ b/src/file/drawing/floating/simple-pos.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class SimplePosAttributes extends XmlAttributeComponent<{ readonly x: number; diff --git a/src/file/drawing/floating/vertical-position.spec.ts b/src/file/drawing/floating/vertical-position.spec.ts index 29c69b5bdc..2c9fca9384 100644 --- a/src/file/drawing/floating/vertical-position.spec.ts +++ b/src/file/drawing/floating/vertical-position.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { VerticalPositionAlign } from "file/shared/alignment"; +import { Formatter } from "@export/formatter"; +import { VerticalPositionAlign } from "@file/shared/alignment"; import { VerticalPositionRelativeFrom } from "./floating-position"; import { VerticalPosition } from "./vertical-position"; diff --git a/src/file/drawing/floating/vertical-position.ts b/src/file/drawing/floating/vertical-position.ts index 830306b237..26a2046d5a 100644 --- a/src/file/drawing/floating/vertical-position.ts +++ b/src/file/drawing/floating/vertical-position.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-position.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Align } from "./align"; import { IVerticalPositionOptions, VerticalPositionRelativeFrom } from "./floating-position"; import { PositionOffset } from "./position-offset"; diff --git a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts index ec57ceb4ae..96024b7682 100644 --- a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts +++ b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-lock-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class GraphicFrameLockAttributes extends XmlAttributeComponent<{ readonly xmlns?: string; diff --git a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts index 42e38435b1..9f37290a36 100644 --- a/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts +++ b/src/file/drawing/graphic-frame/graphic-frame-locks/graphic-frame-locks.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { GraphicFrameLockAttributes } from "./graphic-frame-lock-attributes"; export class GraphicFrameLocks extends XmlComponent { diff --git a/src/file/drawing/graphic-frame/graphic-frame-properties.ts b/src/file/drawing/graphic-frame/graphic-frame-properties.ts index defa900216..cff5006483 100644 --- a/src/file/drawing/graphic-frame/graphic-frame-properties.ts +++ b/src/file/drawing/graphic-frame/graphic-frame-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { GraphicFrameLocks } from "./graphic-frame-locks/graphic-frame-locks"; export class GraphicFrameProperties extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts b/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts index 5c7fa30e34..09c9074308 100644 --- a/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts +++ b/src/file/drawing/inline/graphic/graphic-data/graphic-data-attribute.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class GraphicDataAttributes extends XmlAttributeComponent<{ readonly uri?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts b/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts index b1a8337690..3de43021aa 100644 --- a/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts +++ b/src/file/drawing/inline/graphic/graphic-data/graphic-data.ts @@ -1,5 +1,5 @@ -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { GraphicDataAttributes } from "./graphic-data-attribute"; import { Pic } from "./pic"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts index ea0ee27023..ed5a3c012a 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip-fill.ts @@ -1,5 +1,5 @@ -import { IMediaData } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { Blip } from "./blip"; import { SourceRectangle } from "./source-rectangle"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts index 4460affa73..3891ce9dc0 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/blip.ts @@ -1,5 +1,5 @@ -import { IMediaData } from "file/media"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { IMediaData } from "@file/media"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class BlipAttributes extends XmlAttributeComponent<{ readonly embed: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts index d815fb9879..abdbe442bb 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/source-rectangle.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class SourceRectangle extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts b/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts index ac3f33aec9..2805e0db22 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/blip/stretch.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; class FillRectangle extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts index 2bddee94c5..38a544d188 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/child-non-visual-pic-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { PicLocks } from "./pic-locks/pic-locks"; export class ChildNonVisualProperties extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts index c544d8ccfc..448eec9057 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class PicLocksAttributes extends XmlAttributeComponent<{ readonly noChangeAspect?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts index 3d30f2836f..98f7d01b9c 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/child-non-visual-pic-properties/pic-locks/pic-locks.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { PicLocksAttributes } from "./pic-locks-attributes"; export class PicLocks extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts index 65e83f8d54..c8c1b46ccd 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-pic-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ChildNonVisualProperties } from "./child-non-visual-pic-properties/child-non-visual-pic-properties"; import { NonVisualProperties } from "./non-visual-properties/non-visual-properties"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts index 8d8951c12c..b3a4cfc47b 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class NonVisualPropertiesAttributes extends XmlAttributeComponent<{ readonly id?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts index c4d4c76634..6b43562540 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/non-visual-pic-properties/non-visual-properties/non-visual-properties.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { NonVisualPropertiesAttributes } from "./non-visual-properties-attributes"; export class NonVisualProperties extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts index 00cc5b7cc2..cc234b4976 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/pic-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class PicAttributes extends XmlAttributeComponent<{ readonly xmlns?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts b/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts index df1254331e..545297eef2 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/pic.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPic.php -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { BlipFill } from "./blip/blip-fill"; import { NonVisualPicProperties } from "./non-visual-pic-properties/non-visual-pic-properties"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts index 3cf724d656..d57df659c9 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Form } from "./form/form"; describe("Form", () => { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts index db957965f5..985efe9aa1 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ExtentsAttributes extends XmlAttributeComponent<{ readonly cx?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts index f17c8de426..21e0b1e10a 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/extents/extents.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-size.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { ExtentsAttributes } from "./extents-attributes"; export class Extents extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts index 541f862cd5..f11073c47d 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/form.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/drwSp-size.php // http://officeopenxml.com/drwSp-rotate.php -import { IMediaDataTransformation } from "file/media"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { IMediaDataTransformation } from "@file/media"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Extents } from "./extents/extents"; import { Offset } from "./offset/off"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts index 5dd6a1d071..a122813e34 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class OffsetAttributes extends XmlAttributeComponent<{ readonly x?: number; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts index 791ed8921c..1b25c1a1dd 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/form/offset/off.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-size.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { OffsetAttributes } from "./off-attributes"; export class Offset extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts index e12ee1a3b9..670a9a86b0 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { NoFill } from "./no-fill"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts index 4e847a1d56..6cf7225676 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/no-fill.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class NoFill extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts index 732f74004b..eb4e148afe 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Outline } from "./outline"; describe("Outline", () => { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts index effded5399..5b33a412d1 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/outline/outline.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-outline.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { NoFill } from "./no-fill"; export class Outline extends XmlComponent { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts index b781479b64..9ae34cfdad 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/adjustment-values/adjustment-values.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-prstGeom.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class AdjustmentValues extends XmlComponent { constructor() { diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts index 85d9626a91..ba6dae1121 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class PresetGeometryAttributes extends XmlAttributeComponent<{ readonly prst?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts index 3ffbb1c045..a826766c76 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/preset-geometry/preset-geometry.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwSp-prstGeom.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { AdjustmentValues } from "./adjustment-values/adjustment-values"; import { PresetGeometryAttributes } from "./preset-geometry-attributes"; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts index c39c466b3c..1f2bc8d230 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class ShapePropertiesAttributes extends XmlAttributeComponent<{ readonly bwMode?: string; diff --git a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts index 2d22b00796..6c228f169c 100644 --- a/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts +++ b/src/file/drawing/inline/graphic/graphic-data/pic/shape-properties/shape-properties.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwSp-SpPr.php -import { IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { Form } from "./form"; // import { NoFill } from "./no-fill"; // import { Outline } from "./outline/outline"; diff --git a/src/file/drawing/inline/graphic/graphic.ts b/src/file/drawing/inline/graphic/graphic.ts index ca0d23a3a5..5e21d257ed 100644 --- a/src/file/drawing/inline/graphic/graphic.ts +++ b/src/file/drawing/inline/graphic/graphic.ts @@ -1,5 +1,5 @@ -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { GraphicData } from "./graphic-data"; diff --git a/src/file/drawing/inline/inline-attributes.ts b/src/file/drawing/inline/inline-attributes.ts index 2220fc8493..cd61e8953d 100644 --- a/src/file/drawing/inline/inline-attributes.ts +++ b/src/file/drawing/inline/inline-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; import { IDistance } from "../drawing"; // distT, distB etc have no effect on inline images, only floating diff --git a/src/file/drawing/inline/inline.ts b/src/file/drawing/inline/inline.ts index ee37094b84..2b576d4d0b 100644 --- a/src/file/drawing/inline/inline.ts +++ b/src/file/drawing/inline/inline.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/drwPicInline.php -import { IMediaData, IMediaDataTransformation } from "file/media"; -import { XmlComponent } from "file/xml-components"; +import { IMediaData, IMediaDataTransformation } from "@file/media"; +import { XmlComponent } from "@file/xml-components"; import { DocProperties } from "./../doc-properties/doc-properties"; import { EffectExtent } from "./../effect-extent/effect-extent"; import { Extent } from "./../extent/extent"; diff --git a/src/file/drawing/text-wrap/wrap-none.ts b/src/file/drawing/text-wrap/wrap-none.ts index 0ac4c632f0..282bc5fdaa 100644 --- a/src/file/drawing/text-wrap/wrap-none.ts +++ b/src/file/drawing/text-wrap/wrap-none.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class WrapNone extends XmlComponent { constructor() { diff --git a/src/file/drawing/text-wrap/wrap-square.ts b/src/file/drawing/text-wrap/wrap-square.ts index 5bd4948572..8a866cf6fe 100644 --- a/src/file/drawing/text-wrap/wrap-square.ts +++ b/src/file/drawing/text-wrap/wrap-square.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { ITextWrapping, TextWrappingSide } from "."; import { IDistance } from "../drawing"; import { IMargins } from "../floating"; diff --git a/src/file/drawing/text-wrap/wrap-tight.ts b/src/file/drawing/text-wrap/wrap-tight.ts index c652d81c18..d0e8d70914 100644 --- a/src/file/drawing/text-wrap/wrap-tight.ts +++ b/src/file/drawing/text-wrap/wrap-tight.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { IMargins } from "../floating"; diff --git a/src/file/drawing/text-wrap/wrap-top-and-bottom.ts b/src/file/drawing/text-wrap/wrap-top-and-bottom.ts index 261559b325..5b0f53ddec 100644 --- a/src/file/drawing/text-wrap/wrap-top-and-bottom.ts +++ b/src/file/drawing/text-wrap/wrap-top-and-bottom.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/drwPicFloating-textWrap.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { IMargins } from "../floating"; diff --git a/src/file/file.spec.ts b/src/file/file.spec.ts index e759ee15c3..150d728d14 100644 --- a/src/file/file.spec.ts +++ b/src/file/file.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { sectionMarginDefaults, sectionPageSizeDefaults } from "./document"; import { File } from "./file"; diff --git a/src/file/footer-wrapper.ts b/src/file/footer-wrapper.ts index 34162320c0..4b55f970d3 100644 --- a/src/file/footer-wrapper.ts +++ b/src/file/footer-wrapper.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { HeaderFooterReferenceType } from "./document"; import { IViewWrapper } from "./document-wrapper"; diff --git a/src/file/footer/footer-attributes.ts b/src/file/footer/footer-attributes.ts index db7bdb03d8..58fa0ce8dd 100644 --- a/src/file/footer/footer-attributes.ts +++ b/src/file/footer/footer-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class FooterAttributes extends XmlAttributeComponent<{ readonly wpc?: string; diff --git a/src/file/footer/footer.spec.ts b/src/file/footer/footer.spec.ts index 4f970a119a..a5d408392e 100644 --- a/src/file/footer/footer.spec.ts +++ b/src/file/footer/footer.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Paragraph } from "../paragraph"; import { Footer } from "./footer"; diff --git a/src/file/footer/footer.ts b/src/file/footer/footer.ts index d8b8cfe2ea..ce77b6c789 100644 --- a/src/file/footer/footer.ts +++ b/src/file/footer/footer.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPfooters.php -import { InitializableXmlComponent, XmlComponent } from "file/xml-components"; +import { InitializableXmlComponent, XmlComponent } from "@file/xml-components"; import { Paragraph } from "../paragraph"; import { Table } from "../table"; import { FooterAttributes } from "./footer-attributes"; diff --git a/src/file/footnotes/footnote/footnote-attributes.ts b/src/file/footnotes/footnote/footnote-attributes.ts index 027f9213fe..8f156b79f8 100644 --- a/src/file/footnotes/footnote/footnote-attributes.ts +++ b/src/file/footnotes/footnote/footnote-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class FootnoteAttributes extends XmlAttributeComponent<{ readonly type?: string; diff --git a/src/file/footnotes/footnote/footnote.spec.ts b/src/file/footnotes/footnote/footnote.spec.ts index e2ce67d7b3..b5f347ce49 100644 --- a/src/file/footnotes/footnote/footnote.spec.ts +++ b/src/file/footnotes/footnote/footnote.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { Paragraph, TextRun } from "file/paragraph"; +import { Formatter } from "@export/formatter"; +import { Paragraph, TextRun } from "@file/paragraph"; import { Footnote, FootnoteType } from "./footnote"; diff --git a/src/file/footnotes/footnote/footnote.ts b/src/file/footnotes/footnote/footnote.ts index 19c41824b7..2014c4d085 100644 --- a/src/file/footnotes/footnote/footnote.ts +++ b/src/file/footnotes/footnote/footnote.ts @@ -1,5 +1,5 @@ -import { Paragraph } from "file/paragraph"; -import { XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { XmlComponent } from "@file/xml-components"; import { FootnoteAttributes } from "./footnote-attributes"; import { FootnoteRefRun } from "./run/footnote-ref-run"; diff --git a/src/file/footnotes/footnote/run/continuation-seperator-run.ts b/src/file/footnotes/footnote/run/continuation-seperator-run.ts index 8e55b9bb7f..17b55a8a3b 100644 --- a/src/file/footnotes/footnote/run/continuation-seperator-run.ts +++ b/src/file/footnotes/footnote/run/continuation-seperator-run.ts @@ -1,4 +1,4 @@ -import { Run } from "file/paragraph"; +import { Run } from "@file/paragraph"; import { ContinuationSeperator } from "./continuation-seperator"; export class ContinuationSeperatorRun extends Run { diff --git a/src/file/footnotes/footnote/run/continuation-seperator.ts b/src/file/footnotes/footnote/run/continuation-seperator.ts index 6e9cc87c77..2a085e7032 100644 --- a/src/file/footnotes/footnote/run/continuation-seperator.ts +++ b/src/file/footnotes/footnote/run/continuation-seperator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class ContinuationSeperator extends XmlComponent { constructor() { diff --git a/src/file/footnotes/footnote/run/footnote-ref-run.ts b/src/file/footnotes/footnote/run/footnote-ref-run.ts index 4be3493b33..2623875e99 100644 --- a/src/file/footnotes/footnote/run/footnote-ref-run.ts +++ b/src/file/footnotes/footnote/run/footnote-ref-run.ts @@ -1,4 +1,5 @@ -import { Run } from "file/paragraph"; +import { Run } from "@file/paragraph"; + import { FootnoteRef } from "./footnote-ref"; export class FootnoteRefRun extends Run { diff --git a/src/file/footnotes/footnote/run/footnote-ref.ts b/src/file/footnotes/footnote/run/footnote-ref.ts index 4a7d11fd7f..9076bf1dae 100644 --- a/src/file/footnotes/footnote/run/footnote-ref.ts +++ b/src/file/footnotes/footnote/run/footnote-ref.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class FootnoteRef extends XmlComponent { constructor() { diff --git a/src/file/footnotes/footnote/run/reference-run.ts b/src/file/footnotes/footnote/run/reference-run.ts index c355bb17a3..ebb4c7510c 100644 --- a/src/file/footnotes/footnote/run/reference-run.ts +++ b/src/file/footnotes/footnote/run/reference-run.ts @@ -1,5 +1,5 @@ -import { Run } from "file/paragraph/run"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Run } from "@file/paragraph/run"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export class FootNoteReferenceRunAttributes extends XmlAttributeComponent<{ readonly id: number; diff --git a/src/file/footnotes/footnote/run/seperator-run.ts b/src/file/footnotes/footnote/run/seperator-run.ts index c5a0f9b252..78c51545d1 100644 --- a/src/file/footnotes/footnote/run/seperator-run.ts +++ b/src/file/footnotes/footnote/run/seperator-run.ts @@ -1,4 +1,4 @@ -import { Run } from "file/paragraph"; +import { Run } from "@file/paragraph"; import { Seperator } from "./seperator"; export class SeperatorRun extends Run { diff --git a/src/file/footnotes/footnote/run/seperator.ts b/src/file/footnotes/footnote/run/seperator.ts index e6038e33ad..3847a4dc91 100644 --- a/src/file/footnotes/footnote/run/seperator.ts +++ b/src/file/footnotes/footnote/run/seperator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class Seperator extends XmlComponent { constructor() { diff --git a/src/file/footnotes/footnotes-attributes.ts b/src/file/footnotes/footnotes-attributes.ts index 59690ff23d..71d8d705c6 100644 --- a/src/file/footnotes/footnotes-attributes.ts +++ b/src/file/footnotes/footnotes-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class FootnotesAttributes extends XmlAttributeComponent<{ readonly wpc?: string; diff --git a/src/file/footnotes/footnotes.ts b/src/file/footnotes/footnotes.ts index d0ac12a99f..29bac58cfc 100644 --- a/src/file/footnotes/footnotes.ts +++ b/src/file/footnotes/footnotes.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { LineRuleType, Paragraph } from "../paragraph"; import { Footnote, FootnoteType } from "./footnote/footnote"; diff --git a/src/file/header-wrapper.ts b/src/file/header-wrapper.ts index 40fbd7bb1a..371dc028f2 100644 --- a/src/file/header-wrapper.ts +++ b/src/file/header-wrapper.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { HeaderFooterReferenceType } from "./document"; import { IViewWrapper } from "./document-wrapper"; diff --git a/src/file/header/header-attributes.ts b/src/file/header/header-attributes.ts index 8ccb49c7d2..cc3cc944d8 100644 --- a/src/file/header/header-attributes.ts +++ b/src/file/header/header-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class HeaderAttributes extends XmlAttributeComponent<{ readonly wpc?: string; diff --git a/src/file/header/header.spec.ts b/src/file/header/header.spec.ts index 651c21b545..c124a08815 100644 --- a/src/file/header/header.spec.ts +++ b/src/file/header/header.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Paragraph } from "../paragraph"; import { Header } from "./header"; diff --git a/src/file/header/header.ts b/src/file/header/header.ts index ef7a3f4d5d..31ca0d7854 100644 --- a/src/file/header/header.ts +++ b/src/file/header/header.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPheaders.php -import { InitializableXmlComponent, XmlComponent } from "file/xml-components"; +import { InitializableXmlComponent, XmlComponent } from "@file/xml-components"; import { Paragraph } from "../paragraph"; import { Table } from "../table"; import { HeaderAttributes } from "./header-attributes"; diff --git a/src/file/index.ts b/src/file/index.ts index c001054d72..309a3c2d56 100644 --- a/src/file/index.ts +++ b/src/file/index.ts @@ -17,6 +17,5 @@ export * from "./footnotes"; export * from "./track-revision"; export * from "./shared"; export * from "./border"; -export * from "./values"; export * from "./vertical-align"; export * from "./space-type"; diff --git a/src/file/media/media.spec.ts b/src/file/media/media.spec.ts index e8469c0c81..79f6591888 100644 --- a/src/file/media/media.spec.ts +++ b/src/file/media/media.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; +import * as convenienceFunctions from "@util/convenience-functions"; import { Media } from "./media"; diff --git a/src/file/media/media.ts b/src/file/media/media.ts index d71f4fc15a..8e366f4608 100644 --- a/src/file/media/media.ts +++ b/src/file/media/media.ts @@ -1,7 +1,6 @@ -import { uniqueId } from "convenience-functions"; +import { uniqueId } from "@util/convenience-functions"; import { IMediaData } from "./data"; -// import { Image } from "./image"; export interface IMediaTransformation { readonly width: number; diff --git a/src/file/numbering/abstract-numbering.spec.ts b/src/file/numbering/abstract-numbering.spec.ts index 8ab0845ed8..e17c826c2d 100644 --- a/src/file/numbering/abstract-numbering.spec.ts +++ b/src/file/numbering/abstract-numbering.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { AlignmentType, EmphasisMarkType, TabStopPosition } from "../paragraph"; import { UnderlineType } from "../paragraph/run/underline"; diff --git a/src/file/numbering/abstract-numbering.ts b/src/file/numbering/abstract-numbering.ts index 6c4af129c3..bf692c9602 100644 --- a/src/file/numbering/abstract-numbering.ts +++ b/src/file/numbering/abstract-numbering.ts @@ -1,5 +1,5 @@ -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; import { ILevelsOptions, Level } from "./level"; import { MultiLevelType } from "./multi-level-type"; diff --git a/src/file/numbering/concrete-numbering.spec.ts b/src/file/numbering/concrete-numbering.spec.ts index 76ef39ccc7..4e0e6e03ad 100644 --- a/src/file/numbering/concrete-numbering.spec.ts +++ b/src/file/numbering/concrete-numbering.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { ConcreteNumbering } from "./num"; diff --git a/src/file/numbering/level.ts b/src/file/numbering/level.ts index 1ebf2222dd..225a1f2004 100644 --- a/src/file/numbering/level.ts +++ b/src/file/numbering/level.ts @@ -1,6 +1,7 @@ // http://officeopenxml.com/WPnumbering-numFmt.php -import { decimalNumber } from "file/values"; -import { Attributes, NumberValueElement, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Attributes, NumberValueElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; + import { AlignmentType } from "../paragraph/formatting"; import { ILevelParagraphStylePropertiesOptions, ParagraphProperties } from "../paragraph/properties"; import { IRunStylePropertiesOptions, RunProperties } from "../paragraph/run/properties"; diff --git a/src/file/numbering/multi-level-type.ts b/src/file/numbering/multi-level-type.ts index c2d53bb8cf..7419d84432 100644 --- a/src/file/numbering/multi-level-type.ts +++ b/src/file/numbering/multi-level-type.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; // // ... diff --git a/src/file/numbering/num.ts b/src/file/numbering/num.ts index 87cd399a96..3f07074596 100644 --- a/src/file/numbering/num.ts +++ b/src/file/numbering/num.ts @@ -1,5 +1,5 @@ -import { decimalNumber } from "file/values"; -import { Attributes, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Attributes, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; class AbstractNumId extends XmlComponent { constructor(value: number) { diff --git a/src/file/numbering/numbering.spec.ts b/src/file/numbering/numbering.spec.ts index 83314eabcd..fb81a17e2b 100644 --- a/src/file/numbering/numbering.spec.ts +++ b/src/file/numbering/numbering.spec.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; +import * as convenienceFunctions from "@util/convenience-functions"; import { Numbering } from "./numbering"; diff --git a/src/file/numbering/numbering.ts b/src/file/numbering/numbering.ts index 998cd144a2..f323745db1 100644 --- a/src/file/numbering/numbering.ts +++ b/src/file/numbering/numbering.ts @@ -1,8 +1,8 @@ // http://officeopenxml.com/WPnumbering.php // https://stackoverflow.com/questions/58622437/purpose-of-abstractnum-and-numberinginstance -import { convertInchesToTwip, uniqueNumericId } from "convenience-functions"; -import { AlignmentType } from "file/paragraph"; -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { AlignmentType } from "@file/paragraph"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; +import { convertInchesToTwip, uniqueNumericId } from "@util/convenience-functions"; import { DocumentAttributes } from "../document/document-attributes"; import { AbstractNumbering } from "./abstract-numbering"; diff --git a/src/file/paragraph/formatting/alignment.spec.ts b/src/file/paragraph/formatting/alignment.spec.ts index cb2a5babce..9fcca0a5c7 100644 --- a/src/file/paragraph/formatting/alignment.spec.ts +++ b/src/file/paragraph/formatting/alignment.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Alignment, AlignmentType } from "./alignment"; describe("Alignment", () => { diff --git a/src/file/paragraph/formatting/alignment.ts b/src/file/paragraph/formatting/alignment.ts index 117b584a01..16cb3dc2da 100644 --- a/src/file/paragraph/formatting/alignment.ts +++ b/src/file/paragraph/formatting/alignment.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPalignment.php // http://officeopenxml.com/WPtableAlignment.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum AlignmentType { START = "start", diff --git a/src/file/paragraph/formatting/border.spec.ts b/src/file/paragraph/formatting/border.spec.ts index 33e026f7c4..5071d92bbe 100644 --- a/src/file/paragraph/formatting/border.spec.ts +++ b/src/file/paragraph/formatting/border.spec.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; -import { BorderStyle } from "file/border"; +import { BorderStyle } from "@file/border"; import { Border, ThematicBreak } from "./border"; describe("Border", () => { diff --git a/src/file/paragraph/formatting/border.ts b/src/file/paragraph/formatting/border.ts index b84b24df99..2fe58082fc 100644 --- a/src/file/paragraph/formatting/border.ts +++ b/src/file/paragraph/formatting/border.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPborders.php -import { BorderElement, BorderStyle, IBorderOptions } from "file/border"; -import { IgnoreIfEmptyXmlComponent, XmlComponent } from "file/xml-components"; +import { BorderElement, BorderStyle, IBorderOptions } from "@file/border"; +import { IgnoreIfEmptyXmlComponent, XmlComponent } from "@file/xml-components"; export interface IBordersOptions { readonly top?: IBorderOptions; diff --git a/src/file/paragraph/formatting/break.spec.ts b/src/file/paragraph/formatting/break.spec.ts index 5f838438e4..7d41e3ed42 100644 --- a/src/file/paragraph/formatting/break.spec.ts +++ b/src/file/paragraph/formatting/break.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { ColumnBreak, PageBreak, PageBreakBefore } from "./break"; diff --git a/src/file/paragraph/formatting/break.ts b/src/file/paragraph/formatting/break.ts index 9e9d400d21..8792d13b58 100644 --- a/src/file/paragraph/formatting/break.ts +++ b/src/file/paragraph/formatting/break.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtextSpecialContent-break.php -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; import { Run } from "../run"; enum BreakType { diff --git a/src/file/paragraph/formatting/indent.spec.ts b/src/file/paragraph/formatting/indent.spec.ts index 9a4991c56f..4f00d89ee4 100644 --- a/src/file/paragraph/formatting/indent.spec.ts +++ b/src/file/paragraph/formatting/indent.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Indent } from "./indent"; diff --git a/src/file/paragraph/formatting/indent.ts b/src/file/paragraph/formatting/indent.ts index aad272fa7c..b868192347 100644 --- a/src/file/paragraph/formatting/indent.ts +++ b/src/file/paragraph/formatting/indent.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPindentation.php -import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values"; export interface IIndentAttributesProperties { readonly start?: number | string; diff --git a/src/file/paragraph/formatting/spacing.spec.ts b/src/file/paragraph/formatting/spacing.spec.ts index 09d88dc31c..3a3cc23c64 100644 --- a/src/file/paragraph/formatting/spacing.spec.ts +++ b/src/file/paragraph/formatting/spacing.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Spacing } from "./spacing"; diff --git a/src/file/paragraph/formatting/spacing.ts b/src/file/paragraph/formatting/spacing.ts index bac1a17049..5a893d7018 100644 --- a/src/file/paragraph/formatting/spacing.ts +++ b/src/file/paragraph/formatting/spacing.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPspacing.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum LineRuleType { AT_LEAST = "atLeast", diff --git a/src/file/paragraph/formatting/style.spec.ts b/src/file/paragraph/formatting/style.spec.ts index af3fd9e3a7..0bf230c4bf 100644 --- a/src/file/paragraph/formatting/style.spec.ts +++ b/src/file/paragraph/formatting/style.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Style } from "./style"; diff --git a/src/file/paragraph/formatting/style.ts b/src/file/paragraph/formatting/style.ts index edde301290..a6dc0c1ab7 100644 --- a/src/file/paragraph/formatting/style.ts +++ b/src/file/paragraph/formatting/style.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export enum HeadingLevel { HEADING_1 = "Heading1", diff --git a/src/file/paragraph/formatting/tab-stop.ts b/src/file/paragraph/formatting/tab-stop.ts index cfe121b119..31eab5d33a 100644 --- a/src/file/paragraph/formatting/tab-stop.ts +++ b/src/file/paragraph/formatting/tab-stop.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtab.php -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export class TabStop extends XmlComponent { constructor(type: TabStopType, position: number, leader?: LeaderType) { diff --git a/src/file/paragraph/formatting/unordered-list.spec.ts b/src/file/paragraph/formatting/unordered-list.spec.ts index 1bcab8855d..cc0181c2db 100644 --- a/src/file/paragraph/formatting/unordered-list.spec.ts +++ b/src/file/paragraph/formatting/unordered-list.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { NumberProperties } from "./unordered-list"; diff --git a/src/file/paragraph/formatting/unordered-list.ts b/src/file/paragraph/formatting/unordered-list.ts index 82fa3924f9..a2a34d07a4 100644 --- a/src/file/paragraph/formatting/unordered-list.ts +++ b/src/file/paragraph/formatting/unordered-list.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export class NumberProperties extends XmlComponent { constructor(numberId: number | string, indentLevel: number) { diff --git a/src/file/paragraph/frame/frame-properties.spec.ts b/src/file/paragraph/frame/frame-properties.spec.ts index 33a5bb4d4a..495bad9d20 100644 --- a/src/file/paragraph/frame/frame-properties.spec.ts +++ b/src/file/paragraph/frame/frame-properties.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared"; +import { Formatter } from "@export/formatter"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared"; import { FrameAnchorType, FrameProperties } from "./frame-properties"; diff --git a/src/file/paragraph/frame/frame-properties.ts b/src/file/paragraph/frame/frame-properties.ts index baac4e79f4..06abbff615 100644 --- a/src/file/paragraph/frame/frame-properties.ts +++ b/src/file/paragraph/frame/frame-properties.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPparagraph-textFrames.php -import { HeightRule } from "file"; -import { HorizontalPositionAlign, VerticalPositionAlign } from "file/shared/alignment"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { HorizontalPositionAlign, VerticalPositionAlign } from "@file/shared/alignment"; +import { HeightRule } from "@file/table"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export enum DropCapType { NONE = "none", diff --git a/src/file/paragraph/links/bookmark-attributes.ts b/src/file/paragraph/links/bookmark-attributes.ts index f5f3425da1..c6174732dc 100644 --- a/src/file/paragraph/links/bookmark-attributes.ts +++ b/src/file/paragraph/links/bookmark-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class BookmarkStartAttributes extends XmlAttributeComponent<{ readonly id: number; diff --git a/src/file/paragraph/links/bookmark.ts b/src/file/paragraph/links/bookmark.ts index f329b87701..ded57ebc42 100644 --- a/src/file/paragraph/links/bookmark.ts +++ b/src/file/paragraph/links/bookmark.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPbookmark.php -import { uniqueNumericId } from "convenience-functions"; -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; +import { uniqueNumericId } from "@util/convenience-functions"; import { ParagraphChild } from "../paragraph"; import { BookmarkEndAttributes, BookmarkStartAttributes } from "./bookmark-attributes"; diff --git a/src/file/paragraph/links/hyperlink-attributes.ts b/src/file/paragraph/links/hyperlink-attributes.ts index 983331154a..c31f943ce0 100644 --- a/src/file/paragraph/links/hyperlink-attributes.ts +++ b/src/file/paragraph/links/hyperlink-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export interface IHyperlinkAttributesProperties { readonly id?: string; diff --git a/src/file/paragraph/links/hyperlink.spec.ts b/src/file/paragraph/links/hyperlink.spec.ts index 9f79a19ff1..8ef9e532b6 100644 --- a/src/file/paragraph/links/hyperlink.spec.ts +++ b/src/file/paragraph/links/hyperlink.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { TextRun } from "../run"; import { ConcreteHyperlink, ExternalHyperlink, InternalHyperlink } from "./hyperlink"; diff --git a/src/file/paragraph/links/hyperlink.ts b/src/file/paragraph/links/hyperlink.ts index 2c39997908..23f7b10219 100644 --- a/src/file/paragraph/links/hyperlink.ts +++ b/src/file/paragraph/links/hyperlink.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPhyperlink.php -import { uniqueId } from "convenience-functions"; -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; +import { uniqueId } from "@util/convenience-functions"; import { ParagraphChild } from "../paragraph"; import { HyperlinkAttributes, IHyperlinkAttributesProperties } from "./hyperlink-attributes"; diff --git a/src/file/paragraph/links/outline-level.spec.ts b/src/file/paragraph/links/outline-level.spec.ts index 96cb3ab500..7b58d704fe 100644 --- a/src/file/paragraph/links/outline-level.spec.ts +++ b/src/file/paragraph/links/outline-level.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { OutlineLevel } from "./outline-level"; diff --git a/src/file/paragraph/links/outline-level.ts b/src/file/paragraph/links/outline-level.ts index bb3258a02b..3e6165b949 100644 --- a/src/file/paragraph/links/outline-level.ts +++ b/src/file/paragraph/links/outline-level.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPparagraph.php -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export class OutlineLevel extends XmlComponent { constructor(public readonly level: number) { diff --git a/src/file/paragraph/links/pageref-field-instruction.spec.ts b/src/file/paragraph/links/pageref-field-instruction.spec.ts index 942c108be9..b113c84cd1 100644 --- a/src/file/paragraph/links/pageref-field-instruction.spec.ts +++ b/src/file/paragraph/links/pageref-field-instruction.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageReferenceFieldInstruction } from "./pageref-field-instruction"; describe("PageReference field instruction", () => { diff --git a/src/file/paragraph/links/pageref-field-instruction.ts b/src/file/paragraph/links/pageref-field-instruction.ts index af15635256..2285b0f4d4 100644 --- a/src/file/paragraph/links/pageref-field-instruction.ts +++ b/src/file/paragraph/links/pageref-field-instruction.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "../run/text-attributes"; import { IPageReferenceOptions } from "./pageref-properties"; diff --git a/src/file/paragraph/links/pageref.spec.ts b/src/file/paragraph/links/pageref.spec.ts index c26c8c8632..f65cd2be67 100644 --- a/src/file/paragraph/links/pageref.spec.ts +++ b/src/file/paragraph/links/pageref.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { PageReference } from "./pageref"; describe("PageReference", () => { diff --git a/src/file/paragraph/links/pageref.ts b/src/file/paragraph/links/pageref.ts index b2f1880d2d..72e7803e41 100644 --- a/src/file/paragraph/links/pageref.ts +++ b/src/file/paragraph/links/pageref.ts @@ -1,5 +1,5 @@ // See https://www.ecma-international.org/publications/standards/Ecma-376.htm (at Part 1, Page 1234) -import { Begin, End } from "file/paragraph/run/field"; +import { Begin, End } from "@file/paragraph/run/field"; import { Run } from "../run"; import { PageReferenceFieldInstruction } from "./pageref-field-instruction"; import type { IPageReferenceOptions } from "./pageref-properties"; diff --git a/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts b/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts index ccd73b192b..4e147deca8 100644 --- a/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-angled-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathAngledBrackets } from "./math-angled-brackets"; diff --git a/src/file/paragraph/math/brackets/math-angled-brackets.ts b/src/file/paragraph/math/brackets/math-angled-brackets.ts index 48fe0d415d..6d4cf78476 100644 --- a/src/file/paragraph/math/brackets/math-angled-brackets.ts +++ b/src/file/paragraph/math/brackets/math-angled-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/brackets/math-beginning-character.spec.ts b/src/file/paragraph/math/brackets/math-beginning-character.spec.ts index bf9196c0a9..8306228161 100644 --- a/src/file/paragraph/math/brackets/math-beginning-character.spec.ts +++ b/src/file/paragraph/math/brackets/math-beginning-character.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathBeginningCharacter } from "./math-beginning-character"; diff --git a/src/file/paragraph/math/brackets/math-beginning-character.ts b/src/file/paragraph/math/brackets/math-beginning-character.ts index aa9e06d87a..ed4320572a 100644 --- a/src/file/paragraph/math/brackets/math-beginning-character.ts +++ b/src/file/paragraph/math/brackets/math-beginning-character.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_begChr-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathBeginningCharacterAttributes extends XmlAttributeComponent<{ readonly character: string }> { protected readonly xmlKeys = { character: "m:val" }; diff --git a/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts b/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts index d80976d8f6..59b0dbb482 100644 --- a/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts +++ b/src/file/paragraph/math/brackets/math-bracket-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathBracketProperties } from "./math-bracket-properties"; diff --git a/src/file/paragraph/math/brackets/math-bracket-properties.ts b/src/file/paragraph/math/brackets/math-bracket-properties.ts index 5bba7bf935..33f1a8c94c 100644 --- a/src/file/paragraph/math/brackets/math-bracket-properties.ts +++ b/src/file/paragraph/math/brackets/math-bracket-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_dPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathBeginningCharacter } from "./math-beginning-character"; import { MathEndingCharacter } from "./math-ending-char"; diff --git a/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts b/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts index d6defd57ef..4df8f16499 100644 --- a/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-curly-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathCurlyBrackets } from "./math-curly-brackets"; diff --git a/src/file/paragraph/math/brackets/math-curly-brackets.ts b/src/file/paragraph/math/brackets/math-curly-brackets.ts index ccce71e6a7..d402df098f 100644 --- a/src/file/paragraph/math/brackets/math-curly-brackets.ts +++ b/src/file/paragraph/math/brackets/math-curly-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/brackets/math-ending-char.ts b/src/file/paragraph/math/brackets/math-ending-char.ts index 86d0a0a58c..2ff644ae10 100644 --- a/src/file/paragraph/math/brackets/math-ending-char.ts +++ b/src/file/paragraph/math/brackets/math-ending-char.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_endChr-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathEndingCharacterAttributes extends XmlAttributeComponent<{ readonly character: string }> { protected readonly xmlKeys = { character: "m:val" }; diff --git a/src/file/paragraph/math/brackets/math-ending-character.spec.ts b/src/file/paragraph/math/brackets/math-ending-character.spec.ts index ba28ac7840..ffbfed444d 100644 --- a/src/file/paragraph/math/brackets/math-ending-character.spec.ts +++ b/src/file/paragraph/math/brackets/math-ending-character.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathEndingCharacter } from "./math-ending-char"; diff --git a/src/file/paragraph/math/brackets/math-round-brackets.spec.ts b/src/file/paragraph/math/brackets/math-round-brackets.spec.ts index 5138e9d085..2514e8149e 100644 --- a/src/file/paragraph/math/brackets/math-round-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-round-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathRoundBrackets } from "./math-round-brackets"; diff --git a/src/file/paragraph/math/brackets/math-round-brackets.ts b/src/file/paragraph/math/brackets/math-round-brackets.ts index 6fe60318a4..37c8fd0703 100644 --- a/src/file/paragraph/math/brackets/math-round-brackets.ts +++ b/src/file/paragraph/math/brackets/math-round-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/brackets/math-square-brackets.spec.ts b/src/file/paragraph/math/brackets/math-square-brackets.spec.ts index b0e2ec9e26..ba53d7a918 100644 --- a/src/file/paragraph/math/brackets/math-square-brackets.spec.ts +++ b/src/file/paragraph/math/brackets/math-square-brackets.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSquareBrackets } from "./math-square-brackets"; diff --git a/src/file/paragraph/math/brackets/math-square-brackets.ts b/src/file/paragraph/math/brackets/math-square-brackets.ts index fdfe88a004..6cc4b852dd 100644 --- a/src/file/paragraph/math/brackets/math-square-brackets.ts +++ b/src/file/paragraph/math/brackets/math-square-brackets.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_d-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/fraction/math-denominator.spec.ts b/src/file/paragraph/math/fraction/math-denominator.spec.ts index f2e7459e1e..e899da4bd7 100644 --- a/src/file/paragraph/math/fraction/math-denominator.spec.ts +++ b/src/file/paragraph/math/fraction/math-denominator.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathDenominator } from "./math-denominator"; diff --git a/src/file/paragraph/math/fraction/math-denominator.ts b/src/file/paragraph/math/fraction/math-denominator.ts index 8df68bf4b0..6e6f11ef04 100644 --- a/src/file/paragraph/math/fraction/math-denominator.ts +++ b/src/file/paragraph/math/fraction/math-denominator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/fraction/math-fraction.spec.ts b/src/file/paragraph/math/fraction/math-fraction.spec.ts index 51cac646bf..0613960f8b 100644 --- a/src/file/paragraph/math/fraction/math-fraction.spec.ts +++ b/src/file/paragraph/math/fraction/math-fraction.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathFraction } from "./math-fraction"; diff --git a/src/file/paragraph/math/fraction/math-fraction.ts b/src/file/paragraph/math/fraction/math-fraction.ts index 84a803a872..385071c20f 100644 --- a/src/file/paragraph/math/fraction/math-fraction.ts +++ b/src/file/paragraph/math/fraction/math-fraction.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathDenominator } from "./math-denominator"; diff --git a/src/file/paragraph/math/fraction/math-numerator.spec.ts b/src/file/paragraph/math/fraction/math-numerator.spec.ts index e3aaf35c0e..104b9ee85d 100644 --- a/src/file/paragraph/math/fraction/math-numerator.spec.ts +++ b/src/file/paragraph/math/fraction/math-numerator.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathNumerator } from "./math-numerator"; diff --git a/src/file/paragraph/math/fraction/math-numerator.ts b/src/file/paragraph/math/fraction/math-numerator.ts index b7a49d9a75..323af84e35 100644 --- a/src/file/paragraph/math/fraction/math-numerator.ts +++ b/src/file/paragraph/math/fraction/math-numerator.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/function/math-function-name.spec.ts b/src/file/paragraph/math/function/math-function-name.spec.ts index 8a37ee998e..fc2930f8d8 100644 --- a/src/file/paragraph/math/function/math-function-name.spec.ts +++ b/src/file/paragraph/math/function/math-function-name.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathFunctionName } from "./math-function-name"; diff --git a/src/file/paragraph/math/function/math-function-name.ts b/src/file/paragraph/math/function/math-function-name.ts index e58488dd28..96314a2ccd 100644 --- a/src/file/paragraph/math/function/math-function-name.ts +++ b/src/file/paragraph/math/function/math-function-name.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_fName-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; export class MathFunctionName extends XmlComponent { diff --git a/src/file/paragraph/math/function/math-function-properties.spec.ts b/src/file/paragraph/math/function/math-function-properties.spec.ts index 63ec2e4f60..10be672efe 100644 --- a/src/file/paragraph/math/function/math-function-properties.spec.ts +++ b/src/file/paragraph/math/function/math-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathFunctionProperties } from "./math-function-properties"; diff --git a/src/file/paragraph/math/function/math-function-properties.ts b/src/file/paragraph/math/function/math-function-properties.ts index f6e8d608ac..ba6d85be69 100644 --- a/src/file/paragraph/math/function/math-function-properties.ts +++ b/src/file/paragraph/math/function/math-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_radPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathFunctionProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/function/math-function.spec.ts b/src/file/paragraph/math/function/math-function.spec.ts index 6ea02b6c9d..7e3379e8af 100644 --- a/src/file/paragraph/math/function/math-function.spec.ts +++ b/src/file/paragraph/math/function/math-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathFunction } from "./math-function"; diff --git a/src/file/paragraph/math/function/math-function.ts b/src/file/paragraph/math/function/math-function.ts index 86b66392cc..4b4921d150 100644 --- a/src/file/paragraph/math/function/math-function.ts +++ b/src/file/paragraph/math/function/math-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_func-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/math-run.spec.ts b/src/file/paragraph/math/math-run.spec.ts index 2773a0fb9c..dbc12622cb 100644 --- a/src/file/paragraph/math/math-run.spec.ts +++ b/src/file/paragraph/math/math-run.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "./math-run"; diff --git a/src/file/paragraph/math/math-run.ts b/src/file/paragraph/math/math-run.ts index 0d2c48910f..f13b4364e8 100644 --- a/src/file/paragraph/math/math-run.ts +++ b/src/file/paragraph/math/math-run.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_r-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathText } from "./math-text"; diff --git a/src/file/paragraph/math/math-text.spec.ts b/src/file/paragraph/math/math-text.spec.ts index 0001816ed1..c9d4fe05c0 100644 --- a/src/file/paragraph/math/math-text.spec.ts +++ b/src/file/paragraph/math/math-text.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathText } from "./math-text"; diff --git a/src/file/paragraph/math/math-text.ts b/src/file/paragraph/math/math-text.ts index 6087c7e611..1d943ec5e5 100644 --- a/src/file/paragraph/math/math-text.ts +++ b/src/file/paragraph/math/math-text.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathText extends XmlComponent { constructor(text: string) { diff --git a/src/file/paragraph/math/math.spec.ts b/src/file/paragraph/math/math.spec.ts index d5c4f6f494..cc2591d0e2 100644 --- a/src/file/paragraph/math/math.spec.ts +++ b/src/file/paragraph/math/math.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Math } from "./math"; import { MathRun } from "./math-run"; diff --git a/src/file/paragraph/math/math.ts b/src/file/paragraph/math/math.ts index 69ebae4dff..0f7458d148 100644 --- a/src/file/paragraph/math/math.ts +++ b/src/file/paragraph/math/math.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_oMath-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "./math-component"; diff --git a/src/file/paragraph/math/n-ary/math-accent-character.spec.ts b/src/file/paragraph/math/n-ary/math-accent-character.spec.ts index b414f4c744..7ab553278d 100644 --- a/src/file/paragraph/math/n-ary/math-accent-character.spec.ts +++ b/src/file/paragraph/math/n-ary/math-accent-character.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathAccentCharacter } from "./math-accent-character"; diff --git a/src/file/paragraph/math/n-ary/math-accent-character.ts b/src/file/paragraph/math/n-ary/math-accent-character.ts index 00182bd1f2..663aa644b5 100644 --- a/src/file/paragraph/math/n-ary/math-accent-character.ts +++ b/src/file/paragraph/math/n-ary/math-accent-character.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_chr-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathAccentCharacterAttributes extends XmlAttributeComponent<{ readonly accent: string }> { protected readonly xmlKeys = { accent: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-base.spec.ts b/src/file/paragraph/math/n-ary/math-base.spec.ts index c282537970..fb4d2de0f6 100644 --- a/src/file/paragraph/math/n-ary/math-base.spec.ts +++ b/src/file/paragraph/math/n-ary/math-base.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathBase } from "./math-base"; diff --git a/src/file/paragraph/math/n-ary/math-base.ts b/src/file/paragraph/math/n-ary/math-base.ts index 6c2320439f..f6b5b2cdf6 100644 --- a/src/file/paragraph/math/n-ary/math-base.ts +++ b/src/file/paragraph/math/n-ary/math-base.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_e-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/n-ary/math-limit-location.spec.ts b/src/file/paragraph/math/n-ary/math-limit-location.spec.ts index 426f3d0198..96ab07785f 100644 --- a/src/file/paragraph/math/n-ary/math-limit-location.spec.ts +++ b/src/file/paragraph/math/n-ary/math-limit-location.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathLimitLocation } from "./math-limit-location"; diff --git a/src/file/paragraph/math/n-ary/math-limit-location.ts b/src/file/paragraph/math/n-ary/math-limit-location.ts index 5504e1890d..c7d53bf863 100644 --- a/src/file/paragraph/math/n-ary/math-limit-location.ts +++ b/src/file/paragraph/math/n-ary/math-limit-location.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_limLoc-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathLimitLocationAttributes extends XmlAttributeComponent<{ readonly value: string }> { protected readonly xmlKeys = { value: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-naray-properties.spec.ts b/src/file/paragraph/math/n-ary/math-naray-properties.spec.ts index 70aa74a1c4..bc2d9a72e5 100644 --- a/src/file/paragraph/math/n-ary/math-naray-properties.spec.ts +++ b/src/file/paragraph/math/n-ary/math-naray-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathNArayProperties } from "./math-naray-properties"; diff --git a/src/file/paragraph/math/n-ary/math-naray-properties.ts b/src/file/paragraph/math/n-ary/math-naray-properties.ts index f8e91e746a..a1476eb0fc 100644 --- a/src/file/paragraph/math/n-ary/math-naray-properties.ts +++ b/src/file/paragraph/math/n-ary/math-naray-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_naryPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathAccentCharacter } from "./math-accent-character"; import { MathLimitLocation } from "./math-limit-location"; diff --git a/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts b/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts index 2e9845172f..7f4ed9ced9 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script-hide.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSubScriptHide } from "./math-sub-script-hide"; diff --git a/src/file/paragraph/math/n-ary/math-sub-script-hide.ts b/src/file/paragraph/math/n-ary/math-sub-script-hide.ts index ef735744e0..d9435f617c 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script-hide.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script-hide.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_subHide-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathSubScriptHideAttributes extends XmlAttributeComponent<{ readonly hide: number }> { protected readonly xmlKeys = { hide: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-sub-script.spec.ts b/src/file/paragraph/math/n-ary/math-sub-script.spec.ts index d342946b74..0b98a1d5f9 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script.spec.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSubScriptElement } from "./math-sub-script"; diff --git a/src/file/paragraph/math/n-ary/math-sub-script.ts b/src/file/paragraph/math/n-ary/math-sub-script.ts index 48268312cf..960d8a2234 100644 --- a/src/file/paragraph/math/n-ary/math-sub-script.ts +++ b/src/file/paragraph/math/n-ary/math-sub-script.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sub-3.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/n-ary/math-sum.spec.ts b/src/file/paragraph/math/n-ary/math-sum.spec.ts index 9a7cbbaaa2..7214446a4e 100644 --- a/src/file/paragraph/math/n-ary/math-sum.spec.ts +++ b/src/file/paragraph/math/n-ary/math-sum.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSum } from "./math-sum"; diff --git a/src/file/paragraph/math/n-ary/math-sum.ts b/src/file/paragraph/math/n-ary/math-sum.ts index af14730bbf..d899231a19 100644 --- a/src/file/paragraph/math/n-ary/math-sum.ts +++ b/src/file/paragraph/math/n-ary/math-sum.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_nary-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "./math-base"; diff --git a/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts b/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts index 89a28564ac..7157bebe00 100644 --- a/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts +++ b/src/file/paragraph/math/n-ary/math-super-script-hide.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSuperScriptHide } from "./math-super-script-hide"; diff --git a/src/file/paragraph/math/n-ary/math-super-script-hide.ts b/src/file/paragraph/math/n-ary/math-super-script-hide.ts index a55c15a7ad..a7043621eb 100644 --- a/src/file/paragraph/math/n-ary/math-super-script-hide.ts +++ b/src/file/paragraph/math/n-ary/math-super-script-hide.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_subHide-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathSuperScriptHideAttributes extends XmlAttributeComponent<{ readonly hide: number }> { protected readonly xmlKeys = { hide: "m:val" }; diff --git a/src/file/paragraph/math/n-ary/math-super-script.spec.ts b/src/file/paragraph/math/n-ary/math-super-script.spec.ts index 10e037eba3..ea7a538401 100644 --- a/src/file/paragraph/math/n-ary/math-super-script.spec.ts +++ b/src/file/paragraph/math/n-ary/math-super-script.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathSuperScriptElement } from "./math-super-script"; diff --git a/src/file/paragraph/math/n-ary/math-super-script.ts b/src/file/paragraph/math/n-ary/math-super-script.ts index 8d8386addc..2c922d7739 100644 --- a/src/file/paragraph/math/n-ary/math-super-script.ts +++ b/src/file/paragraph/math/n-ary/math-super-script.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sup-3.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; diff --git a/src/file/paragraph/math/radical/math-degree-hide.spec.ts b/src/file/paragraph/math/radical/math-degree-hide.spec.ts index 0c3f335a13..5e9ce50fda 100644 --- a/src/file/paragraph/math/radical/math-degree-hide.spec.ts +++ b/src/file/paragraph/math/radical/math-degree-hide.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathDegreeHide } from "./math-degree-hide"; diff --git a/src/file/paragraph/math/radical/math-degree-hide.ts b/src/file/paragraph/math/radical/math-degree-hide.ts index c1b9dd2ae5..8b55368c8e 100644 --- a/src/file/paragraph/math/radical/math-degree-hide.ts +++ b/src/file/paragraph/math/radical/math-degree-hide.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_degHide-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class MathDegreeHideAttributes extends XmlAttributeComponent<{ readonly hide: number }> { protected readonly xmlKeys = { hide: "m:val" }; diff --git a/src/file/paragraph/math/radical/math-degree.spec.ts b/src/file/paragraph/math/radical/math-degree.spec.ts index 3d1f17dfa8..656d8d8ac9 100644 --- a/src/file/paragraph/math/radical/math-degree.spec.ts +++ b/src/file/paragraph/math/radical/math-degree.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathDegree } from "./math-degree"; diff --git a/src/file/paragraph/math/radical/math-degree.ts b/src/file/paragraph/math/radical/math-degree.ts index 79923bbde8..24bb672e3e 100644 --- a/src/file/paragraph/math/radical/math-degree.ts +++ b/src/file/paragraph/math/radical/math-degree.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_deg-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; export class MathDegree extends XmlComponent { diff --git a/src/file/paragraph/math/radical/math-radical-properties.spec.ts b/src/file/paragraph/math/radical/math-radical-properties.spec.ts index 12d29a2962..75f3db07cf 100644 --- a/src/file/paragraph/math/radical/math-radical-properties.spec.ts +++ b/src/file/paragraph/math/radical/math-radical-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRadicalProperties } from "./math-radical-properties"; diff --git a/src/file/paragraph/math/radical/math-radical-properties.ts b/src/file/paragraph/math/radical/math-radical-properties.ts index b4e90ed4df..ce545a1c47 100644 --- a/src/file/paragraph/math/radical/math-radical-properties.ts +++ b/src/file/paragraph/math/radical/math-radical-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_radPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathDegreeHide } from "./math-degree-hide"; export class MathRadicalProperties extends XmlComponent { diff --git a/src/file/paragraph/math/radical/math-radical.spec.ts b/src/file/paragraph/math/radical/math-radical.spec.ts index e388edece4..b065794f74 100644 --- a/src/file/paragraph/math/radical/math-radical.spec.ts +++ b/src/file/paragraph/math/radical/math-radical.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../math-run"; import { MathRadical } from "./math-radical"; diff --git a/src/file/paragraph/math/radical/math-radical.ts b/src/file/paragraph/math/radical/math-radical.ts index 1469867a5f..872ff6dcb7 100644 --- a/src/file/paragraph/math/radical/math-radical.ts +++ b/src/file/paragraph/math/radical/math-radical.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_rad-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../math-component"; import { MathBase } from "../n-ary"; diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts index a6f1d5383e..6da12e9082 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathPreSubSuperScriptProperties } from "./math-pre-sub-super-script-function-properties"; describe("MathPreSubSuperScriptProperties", () => { diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts index fed0cb3564..ed2dffa7ae 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sPrePr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathPreSubSuperScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts index 20d00a639d..3311abd304 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathPreSubSuperScript } from "./math-pre-sub-super-script-function"; diff --git a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts index 3a58675b0f..a13e8437fa 100644 --- a/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts +++ b/src/file/paragraph/math/script/pre-sub-super-script/math-pre-sub-super-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sPre-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSubScriptElement, MathSuperScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts index be229e066b..c02b114d31 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSubScriptProperties } from "./math-sub-script-function-properties"; describe("MathSubScriptProperties", () => { diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts index bf37b1d885..48dc3f3198 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSubPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathSubScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts index a3ea8d680c..3a5435167d 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathSubScript } from "./math-sub-script-function"; diff --git a/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts b/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts index 319d4d1f1a..877dedd226 100644 --- a/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts +++ b/src/file/paragraph/math/script/sub-script/math-sub-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSub-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSubScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts index b0f934823a..af5db454b1 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSubSuperScriptProperties } from "./math-sub-super-script-function-properties"; describe("MathSubSuperScriptProperties", () => { diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts index b3218a7d3a..cbd7adde58 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSubSupPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathSubSuperScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts index 68a86fb26b..6edcee075a 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathSubSuperScript } from "./math-sub-super-script-function"; diff --git a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts index c382c9ff4c..c942309566 100644 --- a/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts +++ b/src/file/paragraph/math/script/sub-super-script/math-sub-super-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSubSup-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSubScriptElement, MathSuperScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts index f95920f152..b6d213f481 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathSuperScriptProperties } from "./math-super-script-function-properties"; describe("MathSuperScriptProperties", () => { diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts index ea5dbac20b..275afc1296 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSupPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class MathSuperScriptProperties extends XmlComponent { constructor() { diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts b/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts index ae3740360b..8b3ab1fcad 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { MathRun } from "../../math-run"; import { MathSuperScript } from "./math-super-script-function"; diff --git a/src/file/paragraph/math/script/super-script/math-super-script-function.ts b/src/file/paragraph/math/script/super-script/math-super-script-function.ts index eeffdf124a..31fef60f64 100644 --- a/src/file/paragraph/math/script/super-script/math-super-script-function.ts +++ b/src/file/paragraph/math/script/super-script/math-super-script-function.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-m_sSup-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { MathComponent } from "../../math-component"; import { MathBase, MathSuperScriptElement } from "../../n-ary"; diff --git a/src/file/paragraph/paragraph.spec.ts b/src/file/paragraph/paragraph.spec.ts index a416785d0e..f6440bf23b 100644 --- a/src/file/paragraph/paragraph.spec.ts +++ b/src/file/paragraph/paragraph.spec.ts @@ -1,11 +1,11 @@ import { assert, expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; +import * as convenienceFunctions from "@util/convenience-functions"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { IViewWrapper } from "../document-wrapper"; import { File } from "../file"; diff --git a/src/file/paragraph/paragraph.ts b/src/file/paragraph/paragraph.ts index 4257816375..0647258213 100644 --- a/src/file/paragraph/paragraph.ts +++ b/src/file/paragraph/paragraph.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPparagraph.php -import { uniqueId } from "convenience-functions"; -import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { FootnoteReferenceRun } from "@file/footnotes"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; +import { uniqueId } from "@util/convenience-functions"; import { TargetModeType } from "../relationships/relationship/relationship"; import { DeletedTextRun, InsertedTextRun } from "../track-revision"; diff --git a/src/file/paragraph/properties.spec.ts b/src/file/paragraph/properties.spec.ts index dbf2021e8a..9d466bc33c 100644 --- a/src/file/paragraph/properties.spec.ts +++ b/src/file/paragraph/properties.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { DocumentWrapper } from "../document-wrapper"; import { File } from "../file"; diff --git a/src/file/paragraph/properties.ts b/src/file/paragraph/properties.ts index fd1e18c826..194d4a56fd 100644 --- a/src/file/paragraph/properties.ts +++ b/src/file/paragraph/properties.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPparagraphProperties.php // https://c-rex.net/projects/samples/ooxml/e1/Part4/OOXML_P4_DOCX_suppressLineNumbers_topic_ID0ECJAO.html -import { IContext, IgnoreIfEmptyXmlComponent, IXmlableObject, OnOffElement, XmlComponent } from "file/xml-components"; +import { IContext, IgnoreIfEmptyXmlComponent, IXmlableObject, OnOffElement, XmlComponent } from "@file/xml-components"; import { DocumentWrapper } from "../document-wrapper"; import { IShadingAttributesProperties, Shading } from "../shading"; import { Alignment, AlignmentType } from "./formatting/alignment"; diff --git a/src/file/paragraph/run/break.spec.ts b/src/file/paragraph/run/break.spec.ts index 98e058937d..dbd96cc26f 100644 --- a/src/file/paragraph/run/break.spec.ts +++ b/src/file/paragraph/run/break.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Break } from "./break"; diff --git a/src/file/paragraph/run/break.ts b/src/file/paragraph/run/break.ts index 0d0eac8c8c..850020815d 100644 --- a/src/file/paragraph/run/break.ts +++ b/src/file/paragraph/run/break.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtextSpecialContent-break.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; // // ... diff --git a/src/file/paragraph/run/comment-run.spec.ts b/src/file/paragraph/run/comment-run.spec.ts index d0e90aabc9..4f19d8b28d 100644 --- a/src/file/paragraph/run/comment-run.spec.ts +++ b/src/file/paragraph/run/comment-run.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Comment, CommentRangeEnd, CommentRangeStart, CommentReference, Comments } from "./comment-run"; describe("CommentRangeStart", () => { diff --git a/src/file/paragraph/run/comment-run.ts b/src/file/paragraph/run/comment-run.ts index 16054ad778..acbff137df 100644 --- a/src/file/paragraph/run/comment-run.ts +++ b/src/file/paragraph/run/comment-run.ts @@ -1,5 +1,5 @@ -import { Paragraph } from "file/paragraph"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { TextRun } from "./text-run"; diff --git a/src/file/paragraph/run/emphasis-mark.spec.ts b/src/file/paragraph/run/emphasis-mark.spec.ts index 4ad4878f64..d37bbdffd1 100644 --- a/src/file/paragraph/run/emphasis-mark.spec.ts +++ b/src/file/paragraph/run/emphasis-mark.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import * as em from "./emphasis-mark"; diff --git a/src/file/paragraph/run/emphasis-mark.ts b/src/file/paragraph/run/emphasis-mark.ts index b8af756072..8ce985fed6 100644 --- a/src/file/paragraph/run/emphasis-mark.ts +++ b/src/file/paragraph/run/emphasis-mark.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export enum EmphasisMarkType { DOT = "dot", diff --git a/src/file/paragraph/run/field.ts b/src/file/paragraph/run/field.ts index 462c961cdc..173a0dc10d 100644 --- a/src/file/paragraph/run/field.ts +++ b/src/file/paragraph/run/field.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; enum FieldCharacterType { BEGIN = "begin", diff --git a/src/file/paragraph/run/formatting.spec.ts b/src/file/paragraph/run/formatting.spec.ts index cf590d8cf6..4c8da63fc8 100644 --- a/src/file/paragraph/run/formatting.spec.ts +++ b/src/file/paragraph/run/formatting.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { CharacterSpacing, Color } from "./formatting"; diff --git a/src/file/paragraph/run/formatting.ts b/src/file/paragraph/run/formatting.ts index 5f735fdfbb..284633e2ec 100644 --- a/src/file/paragraph/run/formatting.ts +++ b/src/file/paragraph/run/formatting.ts @@ -1,5 +1,5 @@ -import { hexColorValue, signedTwipsMeasureValue } from "file/values"; -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; +import { hexColorValue, signedTwipsMeasureValue } from "@util/values"; export class CharacterSpacing extends XmlComponent { constructor(value: number | string) { diff --git a/src/file/paragraph/run/image-run.spec.ts b/src/file/paragraph/run/image-run.spec.ts index 9fa1c1a2ee..64c2835b34 100644 --- a/src/file/paragraph/run/image-run.spec.ts +++ b/src/file/paragraph/run/image-run.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; import { SinonStub, stub } from "sinon"; -import * as convenienceFunctions from "convenience-functions"; -import { Formatter } from "export/formatter"; -import { IViewWrapper } from "file/document-wrapper"; -import { File } from "file/file"; +import { Formatter } from "@export/formatter"; +import { IViewWrapper } from "@file/document-wrapper"; +import { File } from "@file/file"; +import * as convenienceFunctions from "@util/convenience-functions"; import { ImageRun } from "./image-run"; diff --git a/src/file/paragraph/run/image-run.ts b/src/file/paragraph/run/image-run.ts index 1ef919c47a..6daf04d31b 100644 --- a/src/file/paragraph/run/image-run.ts +++ b/src/file/paragraph/run/image-run.ts @@ -1,6 +1,6 @@ -import { uniqueId } from "convenience-functions"; +import { uniqueId } from "@util/convenience-functions"; -import { IContext, IXmlableObject } from "file/xml-components"; +import { IContext, IXmlableObject } from "@file/xml-components"; import { Drawing, IFloating } from "../../drawing"; import { IMediaTransformation } from "../../media"; diff --git a/src/file/paragraph/run/page-number.spec.ts b/src/file/paragraph/run/page-number.spec.ts index aa01aa8d71..eb5861d52e 100644 --- a/src/file/paragraph/run/page-number.spec.ts +++ b/src/file/paragraph/run/page-number.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { NumberOfPages, NumberOfPagesSection, Page } from "./page-number"; diff --git a/src/file/paragraph/run/page-number.ts b/src/file/paragraph/run/page-number.ts index 0a652f3d09..55566fe08c 100644 --- a/src/file/paragraph/run/page-number.ts +++ b/src/file/paragraph/run/page-number.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "./text-attributes"; diff --git a/src/file/paragraph/run/properties.ts b/src/file/paragraph/run/properties.ts index 77aec7ae81..32ce33c655 100644 --- a/src/file/paragraph/run/properties.ts +++ b/src/file/paragraph/run/properties.ts @@ -1,8 +1,8 @@ -import { BorderElement, IBorderOptions } from "file/border"; -import { IShadingAttributesProperties, Shading } from "file/shading"; -import { SpaceType } from "file/space-type"; -import { ChangeAttributes, IChangedAttributesProperties } from "file/track-revision/track-revision"; -import { HpsMeasureElement, IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement, XmlComponent } from "file/xml-components"; +import { BorderElement, IBorderOptions } from "@file/border"; +import { IShadingAttributesProperties, Shading } from "@file/shading"; +import { SpaceType } from "@file/space-type"; +import { ChangeAttributes, IChangedAttributesProperties } from "@file/track-revision/track-revision"; +import { HpsMeasureElement, IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement, XmlComponent } from "@file/xml-components"; import { EmphasisMark, EmphasisMarkType } from "./emphasis-mark"; import { CharacterSpacing, Color, Highlight, HighlightComplexScript } from "./formatting"; diff --git a/src/file/paragraph/run/run-components/symbol.spec.ts b/src/file/paragraph/run/run-components/symbol.spec.ts index 559790577e..7df914a2e2 100644 --- a/src/file/paragraph/run/run-components/symbol.spec.ts +++ b/src/file/paragraph/run/run-components/symbol.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Symbol } from "./symbol"; diff --git a/src/file/paragraph/run/run-components/symbol.ts b/src/file/paragraph/run/run-components/symbol.ts index e5350cd998..db72f0d064 100644 --- a/src/file/paragraph/run/run-components/symbol.ts +++ b/src/file/paragraph/run/run-components/symbol.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class SymbolAttributes extends XmlAttributeComponent<{ readonly char: string; diff --git a/src/file/paragraph/run/run-components/text.spec.ts b/src/file/paragraph/run/run-components/text.spec.ts index 6393cebd8b..fd4bbd01b0 100644 --- a/src/file/paragraph/run/run-components/text.spec.ts +++ b/src/file/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"; diff --git a/src/file/paragraph/run/run-components/text.ts b/src/file/paragraph/run/run-components/text.ts index f25c39c1ad..0bc28fcb27 100644 --- a/src/file/paragraph/run/run-components/text.ts +++ b/src/file/paragraph/run/run-components/text.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "../text-attributes"; diff --git a/src/file/paragraph/run/run-fonts.spec.ts b/src/file/paragraph/run/run-fonts.spec.ts index a0180eae81..3e8df6c68c 100644 --- a/src/file/paragraph/run/run-fonts.spec.ts +++ b/src/file/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"; diff --git a/src/file/paragraph/run/run-fonts.ts b/src/file/paragraph/run/run-fonts.ts index c1eed32613..415a3812d0 100644 --- a/src/file/paragraph/run/run-fonts.ts +++ b/src/file/paragraph/run/run-fonts.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export interface IFontAttributesProperties { readonly ascii?: string; diff --git a/src/file/paragraph/run/run.spec.ts b/src/file/paragraph/run/run.spec.ts index e356173b0b..05f7b20ca4 100644 --- a/src/file/paragraph/run/run.spec.ts +++ b/src/file/paragraph/run/run.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -// import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; -import { ShadingType } from "file/shading"; -import { SpaceType } from "file/space-type"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +// import { FootnoteReferenceRun } from "@file/footnotes/footnote/run/reference-run"; +import { ShadingType } from "@file/shading"; +import { SpaceType } from "@file/space-type"; import { Run } from "./"; import { EmphasisMarkType } from "./emphasis-mark"; diff --git a/src/file/paragraph/run/run.ts b/src/file/paragraph/run/run.ts index 8f9dc65011..a24ce75786 100644 --- a/src/file/paragraph/run/run.ts +++ b/src/file/paragraph/run/run.ts @@ -1,8 +1,8 @@ // http://officeopenxml.com/WPtext.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; -import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; -import { FieldInstruction } from "file/table-of-contents/field-instruction"; +import { FootnoteReferenceRun } from "@file/footnotes/footnote/run/reference-run"; +import { FieldInstruction } from "@file/table-of-contents/field-instruction"; import { Break } from "./break"; import { Begin, End, Separate } from "./field"; diff --git a/src/file/paragraph/run/script.ts b/src/file/paragraph/run/script.ts index b0b4862c16..b1f1b0ac2a 100644 --- a/src/file/paragraph/run/script.ts +++ b/src/file/paragraph/run/script.ts @@ -1,4 +1,4 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; export abstract class VerticalAlign extends XmlComponent { constructor(type: string) { diff --git a/src/file/paragraph/run/sequential-identifier-instruction.ts b/src/file/paragraph/run/sequential-identifier-instruction.ts index eb830096a6..81762e7812 100644 --- a/src/file/paragraph/run/sequential-identifier-instruction.ts +++ b/src/file/paragraph/run/sequential-identifier-instruction.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPfieldInstructions.php -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { TextAttributes } from "./text-attributes"; diff --git a/src/file/paragraph/run/sequential-identifier.spec.ts b/src/file/paragraph/run/sequential-identifier.spec.ts index f4a85393b6..f68c356ec9 100644 --- a/src/file/paragraph/run/sequential-identifier.spec.ts +++ b/src/file/paragraph/run/sequential-identifier.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SequentialIdentifier } from "./sequential-identifier"; diff --git a/src/file/paragraph/run/sequential-identifier.ts b/src/file/paragraph/run/sequential-identifier.ts index e193307e83..6931a0eb73 100644 --- a/src/file/paragraph/run/sequential-identifier.ts +++ b/src/file/paragraph/run/sequential-identifier.ts @@ -1,5 +1,5 @@ -import { Run } from "file/paragraph/run"; -import { Begin, End, Separate } from "file/paragraph/run/field"; +import { Run } from "@file/paragraph/run"; +import { Begin, End, Separate } from "@file/paragraph/run/field"; import { SequentialIdentifierInstruction } from "./sequential-identifier-instruction"; export class SequentialIdentifier extends Run { diff --git a/src/file/paragraph/run/simple-field.spec.ts b/src/file/paragraph/run/simple-field.spec.ts index 4368c1f47c..ac42bafdf4 100644 --- a/src/file/paragraph/run/simple-field.spec.ts +++ b/src/file/paragraph/run/simple-field.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { SimpleField, SimpleMailMergeField } from "./simple-field"; diff --git a/src/file/paragraph/run/simple-field.ts b/src/file/paragraph/run/simple-field.ts index 719c2dded5..e741dc374f 100644 --- a/src/file/paragraph/run/simple-field.ts +++ b/src/file/paragraph/run/simple-field.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-w_fldSimple-1.html -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { TextRun } from "./text-run"; class FldSimpleAttrs extends XmlAttributeComponent<{ readonly instr: string }> { diff --git a/src/file/paragraph/run/symbol-run.spec.ts b/src/file/paragraph/run/symbol-run.spec.ts index 06e98a4373..f8393a3751 100644 --- a/src/file/paragraph/run/symbol-run.spec.ts +++ b/src/file/paragraph/run/symbol-run.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; import { EmphasisMarkType } from "./emphasis-mark"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { UnderlineType } from "./underline"; diff --git a/src/file/paragraph/run/tab.spec.ts b/src/file/paragraph/run/tab.spec.ts index 04d3503521..03381200a5 100644 --- a/src/file/paragraph/run/tab.spec.ts +++ b/src/file/paragraph/run/tab.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Tab } from "./tab"; diff --git a/src/file/paragraph/run/tab.ts b/src/file/paragraph/run/tab.ts index 33f2b09427..cd81fbc0a2 100644 --- a/src/file/paragraph/run/tab.ts +++ b/src/file/paragraph/run/tab.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; // // ... diff --git a/src/file/paragraph/run/text-attributes.ts b/src/file/paragraph/run/text-attributes.ts index e380959c40..742f640002 100644 --- a/src/file/paragraph/run/text-attributes.ts +++ b/src/file/paragraph/run/text-attributes.ts @@ -1,5 +1,5 @@ -import { SpaceType } from "file/space-type"; -import { XmlAttributeComponent } from "file/xml-components"; +import { SpaceType } from "@file/space-type"; +import { XmlAttributeComponent } from "@file/xml-components"; export class TextAttributes extends XmlAttributeComponent<{ readonly space: SpaceType }> { protected readonly xmlKeys = { space: "xml:space" }; diff --git a/src/file/paragraph/run/text-run.spec.ts b/src/file/paragraph/run/text-run.spec.ts index b36b3c3139..d3a3c82383 100644 --- a/src/file/paragraph/run/text-run.spec.ts +++ b/src/file/paragraph/run/text-run.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { FootnoteReferenceRun } from "file/footnotes/footnote/run/reference-run"; +import { Formatter } from "@export/formatter"; +import { FootnoteReferenceRun } from "@file/footnotes/footnote/run/reference-run"; import { TextRun } from "./text-run"; diff --git a/src/file/paragraph/run/underline.spec.ts b/src/file/paragraph/run/underline.spec.ts index bc406a1da4..c8a26b3e78 100644 --- a/src/file/paragraph/run/underline.spec.ts +++ b/src/file/paragraph/run/underline.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Underline, UnderlineType } from "./underline"; diff --git a/src/file/paragraph/run/underline.ts b/src/file/paragraph/run/underline.ts index a94c37e1f5..12459398f5 100644 --- a/src/file/paragraph/run/underline.ts +++ b/src/file/paragraph/run/underline.ts @@ -1,5 +1,5 @@ -import { hexColorValue } from "file/values"; -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; +import { hexColorValue } from "@util/values"; export enum UnderlineType { SINGLE = "single", diff --git a/src/file/relationships/attributes.ts b/src/file/relationships/attributes.ts index 5aba4b730a..fbf13a8ef8 100644 --- a/src/file/relationships/attributes.ts +++ b/src/file/relationships/attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class RelationshipsAttributes extends XmlAttributeComponent<{ readonly xmlns: string; diff --git a/src/file/relationships/relationship/relationship-attributes.ts b/src/file/relationships/relationship/relationship-attributes.ts index 8b9db06240..c2d0daaf44 100644 --- a/src/file/relationships/relationship/relationship-attributes.ts +++ b/src/file/relationships/relationship/relationship-attributes.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export class RelationshipAttributes extends XmlAttributeComponent<{ readonly id: string; diff --git a/src/file/relationships/relationship/relationship.ts b/src/file/relationships/relationship/relationship.ts index 79204e4ff8..d6384a08c1 100644 --- a/src/file/relationships/relationship/relationship.ts +++ b/src/file/relationships/relationship/relationship.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { RelationshipAttributes } from "./relationship-attributes"; export type RelationshipType = diff --git a/src/file/relationships/relationships.spec.ts b/src/file/relationships/relationships.spec.ts index 9525bd4fff..fd47ec55c6 100644 --- a/src/file/relationships/relationships.spec.ts +++ b/src/file/relationships/relationships.spec.ts @@ -1,7 +1,7 @@ // tslint:disable:no-string-literal import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Relationships } from "./relationships"; diff --git a/src/file/relationships/relationships.ts b/src/file/relationships/relationships.ts index 3a5447c2d9..4e9d98530b 100644 --- a/src/file/relationships/relationships.ts +++ b/src/file/relationships/relationships.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { RelationshipsAttributes } from "./attributes"; import { Relationship, RelationshipType, TargetModeType } from "./relationship/relationship"; diff --git a/src/file/settings/compatibility-setting/compatibility-setting.spec.ts b/src/file/settings/compatibility-setting/compatibility-setting.spec.ts index 0f65697cda..7d927f283e 100644 --- a/src/file/settings/compatibility-setting/compatibility-setting.spec.ts +++ b/src/file/settings/compatibility-setting/compatibility-setting.spec.ts @@ -1,5 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; import { CompatibilitySetting } from "./compatibility-setting"; diff --git a/src/file/settings/compatibility-setting/compatibility-setting.ts b/src/file/settings/compatibility-setting/compatibility-setting.ts index 43a7c5d71a..5e57503f32 100644 --- a/src/file/settings/compatibility-setting/compatibility-setting.ts +++ b/src/file/settings/compatibility-setting/compatibility-setting.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // Currently, this is hard-coded for Microsoft word compatSettings. // Theoretically, we could add compatSettings for other programs, but diff --git a/src/file/settings/compatibility.spec.ts b/src/file/settings/compatibility.spec.ts index fa9809672d..c264ad70bf 100644 --- a/src/file/settings/compatibility.spec.ts +++ b/src/file/settings/compatibility.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { Compatibility } from "./compatibility"; diff --git a/src/file/settings/compatibility.ts b/src/file/settings/compatibility.ts index 1405697bca..00a3de3d64 100644 --- a/src/file/settings/compatibility.ts +++ b/src/file/settings/compatibility.ts @@ -1,4 +1,4 @@ -import { OnOffElement, XmlComponent } from "file/xml-components"; +import { OnOffElement, XmlComponent } from "@file/xml-components"; import { CompatibilitySetting } from "./compatibility-setting/compatibility-setting"; // diff --git a/src/file/settings/settings.spec.ts b/src/file/settings/settings.spec.ts index b12f340f43..7bd473bdbf 100644 --- a/src/file/settings/settings.spec.ts +++ b/src/file/settings/settings.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Settings } from "./settings"; diff --git a/src/file/settings/settings.ts b/src/file/settings/settings.ts index 4c57532a41..c463ab4d3b 100644 --- a/src/file/settings/settings.ts +++ b/src/file/settings/settings.ts @@ -1,4 +1,4 @@ -import { OnOffElement, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { OnOffElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Compatibility } from "./compatibility"; diff --git a/src/file/shading/shading.spec.ts b/src/file/shading/shading.spec.ts index 7b808aa829..7db9ca2859 100644 --- a/src/file/shading/shading.spec.ts +++ b/src/file/shading/shading.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Shading, ShadingType } from "./shading"; diff --git a/src/file/shading/shading.ts b/src/file/shading/shading.ts index 9199122c78..f6d2c2bbf9 100644 --- a/src/file/shading/shading.ts +++ b/src/file/shading/shading.ts @@ -17,8 +17,8 @@ // // // -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; -import { hexColorValue } from "../values"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { hexColorValue } from "@util/values"; export interface IShadingAttributesProperties { readonly fill?: string; diff --git a/src/file/styles/defaults/document-defaults.spec.ts b/src/file/styles/defaults/document-defaults.spec.ts index 79ca9cccf7..fd89930f4d 100644 --- a/src/file/styles/defaults/document-defaults.spec.ts +++ b/src/file/styles/defaults/document-defaults.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; import { DocumentDefaults } from "./document-defaults"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; describe("DocumentDefaults", () => { it("#constructor", () => { diff --git a/src/file/styles/defaults/document-defaults.ts b/src/file/styles/defaults/document-defaults.ts index 67ddbfd6bd..455da10bd3 100644 --- a/src/file/styles/defaults/document-defaults.ts +++ b/src/file/styles/defaults/document-defaults.ts @@ -1,6 +1,6 @@ -import { IParagraphStylePropertiesOptions } from "file/paragraph/properties"; -import { IRunStylePropertiesOptions } from "file/paragraph/run/properties"; -import { XmlComponent } from "file/xml-components"; +import { IParagraphStylePropertiesOptions } from "@file/paragraph/properties"; +import { IRunStylePropertiesOptions } from "@file/paragraph/run/properties"; +import { XmlComponent } from "@file/xml-components"; import { ParagraphPropertiesDefaults } from "./paragraph-properties"; import { RunPropertiesDefaults } from "./run-properties"; diff --git a/src/file/styles/defaults/paragraph-properties.ts b/src/file/styles/defaults/paragraph-properties.ts index cac92575a4..1ea94b9e15 100644 --- a/src/file/styles/defaults/paragraph-properties.ts +++ b/src/file/styles/defaults/paragraph-properties.ts @@ -1,5 +1,5 @@ -import { IParagraphStylePropertiesOptions, ParagraphProperties } from "file/paragraph/properties"; -import { XmlComponent } from "file/xml-components"; +import { IParagraphStylePropertiesOptions, ParagraphProperties } from "@file/paragraph/properties"; +import { XmlComponent } from "@file/xml-components"; export class ParagraphPropertiesDefaults extends XmlComponent { constructor(options?: IParagraphStylePropertiesOptions) { diff --git a/src/file/styles/defaults/run-properties.ts b/src/file/styles/defaults/run-properties.ts index 9a09001289..3e8db82362 100644 --- a/src/file/styles/defaults/run-properties.ts +++ b/src/file/styles/defaults/run-properties.ts @@ -1,5 +1,5 @@ -import { IRunStylePropertiesOptions, RunProperties } from "file/paragraph/run/properties"; -import { XmlComponent } from "file/xml-components"; +import { IRunStylePropertiesOptions, RunProperties } from "@file/paragraph/run/properties"; +import { XmlComponent } from "@file/xml-components"; export class RunPropertiesDefaults extends XmlComponent { constructor(options?: IRunStylePropertiesOptions) { diff --git a/src/file/styles/external-styles-factory.ts b/src/file/styles/external-styles-factory.ts index 839041d690..b40a0bff46 100644 --- a/src/file/styles/external-styles-factory.ts +++ b/src/file/styles/external-styles-factory.ts @@ -1,4 +1,4 @@ -import { convertToXmlComponent, ImportedRootElementAttributes, ImportedXmlComponent } from "file/xml-components"; +import { convertToXmlComponent, ImportedRootElementAttributes, ImportedXmlComponent } from "@file/xml-components"; import { Element as XMLElement, xml2js } from "xml-js"; import { Styles } from "./"; diff --git a/src/file/styles/latent-styles/exceptions.spec.ts b/src/file/styles/latent-styles/exceptions.spec.ts index 2fc477b762..0b38ea75dd 100644 --- a/src/file/styles/latent-styles/exceptions.spec.ts +++ b/src/file/styles/latent-styles/exceptions.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { LatentStyleException } from "./exceptions"; diff --git a/src/file/styles/latent-styles/exceptions.ts b/src/file/styles/latent-styles/exceptions.ts index 3ae340b922..2db716aac4 100644 --- a/src/file/styles/latent-styles/exceptions.ts +++ b/src/file/styles/latent-styles/exceptions.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; export interface ILatentStyleExceptionAttributesProperties { readonly name?: string; diff --git a/src/file/styles/latent-styles/latent-styles.spec.ts b/src/file/styles/latent-styles/latent-styles.spec.ts index 78807c0306..3364654ef4 100644 --- a/src/file/styles/latent-styles/latent-styles.spec.ts +++ b/src/file/styles/latent-styles/latent-styles.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { LatentStyleException } from "./exceptions"; import { LatentStyles } from "./latent-styles"; diff --git a/src/file/styles/latent-styles/latent-styles.ts b/src/file/styles/latent-styles/latent-styles.ts index d0f9bd3034..5f4ddbb3f9 100644 --- a/src/file/styles/latent-styles/latent-styles.ts +++ b/src/file/styles/latent-styles/latent-styles.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { LatentStyleException } from "./exceptions"; export class LatentStyles extends XmlComponent { diff --git a/src/file/styles/style/character-style.spec.ts b/src/file/styles/style/character-style.spec.ts index 4ddf087f2d..a91cd05f7a 100644 --- a/src/file/styles/style/character-style.spec.ts +++ b/src/file/styles/style/character-style.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EmphasisMarkType } from "file/paragraph/run/emphasis-mark"; -import { UnderlineType } from "file/paragraph/run/underline"; -import { ShadingType } from "file/shading"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EmphasisMarkType } from "@file/paragraph/run/emphasis-mark"; +import { UnderlineType } from "@file/paragraph/run/underline"; +import { ShadingType } from "@file/shading"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { StyleForCharacter } from "./character-style"; diff --git a/src/file/styles/style/character-style.ts b/src/file/styles/style/character-style.ts index 229c8e54c6..bb5f9ac5ee 100644 --- a/src/file/styles/style/character-style.ts +++ b/src/file/styles/style/character-style.ts @@ -1,4 +1,4 @@ -import { IRunStylePropertiesOptions, RunProperties } from "file/paragraph/run/properties"; +import { IRunStylePropertiesOptions, RunProperties } from "@file/paragraph/run/properties"; import { IStyleOptions, Style } from "./style"; diff --git a/src/file/styles/style/components.spec.ts b/src/file/styles/style/components.spec.ts index 7ce7df62ab..5ae8205e25 100644 --- a/src/file/styles/style/components.spec.ts +++ b/src/file/styles/style/components.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import * as components from "./components"; describe("Style components", () => { diff --git a/src/file/styles/style/components.ts b/src/file/styles/style/components.ts index 4b35ba38b3..65046a5c10 100644 --- a/src/file/styles/style/components.ts +++ b/src/file/styles/style/components.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPstyleGenProps.php -import { decimalNumber } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; class ComponentAttributes extends XmlAttributeComponent<{ readonly val: string | number; diff --git a/src/file/styles/style/default-styles.spec.ts b/src/file/styles/style/default-styles.spec.ts index dda921a110..cca9bb74bb 100644 --- a/src/file/styles/style/default-styles.spec.ts +++ b/src/file/styles/style/default-styles.spec.ts @@ -1,8 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import * as defaultStyles from "./default-styles"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { EMPTY_OBJECT } from "@file/xml-components"; describe("Default Styles", () => { it("HeadingStyle#constructor", () => { diff --git a/src/file/styles/style/default-styles.ts b/src/file/styles/style/default-styles.ts index 779f06b6c0..990187bc01 100644 --- a/src/file/styles/style/default-styles.ts +++ b/src/file/styles/style/default-styles.ts @@ -1,6 +1,6 @@ -import { UnderlineType } from "file/paragraph/run/underline"; +import { UnderlineType } from "@file/paragraph/run/underline"; -import { LineRuleType } from "file/paragraph"; +import { LineRuleType } from "@file/paragraph"; import { IBaseCharacterStyleOptions, StyleForCharacter } from "./character-style"; import { IBaseParagraphStyleOptions, IParagraphStyleOptions, StyleForParagraph } from "./paragraph-style"; diff --git a/src/file/styles/style/paragraph-style.spec.ts b/src/file/styles/style/paragraph-style.spec.ts index 28f229677b..4ccac61b5a 100644 --- a/src/file/styles/style/paragraph-style.spec.ts +++ b/src/file/styles/style/paragraph-style.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { AlignmentType, EmphasisMarkType, TabStopPosition } from "file/paragraph"; -import { UnderlineType } from "file/paragraph/run/underline"; -import { ShadingType } from "file/shading"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { AlignmentType, EmphasisMarkType, TabStopPosition } from "@file/paragraph"; +import { UnderlineType } from "@file/paragraph/run/underline"; +import { ShadingType } from "@file/shading"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { StyleForParagraph } from "./paragraph-style"; diff --git a/src/file/styles/style/paragraph-style.ts b/src/file/styles/style/paragraph-style.ts index 5f90a87fe2..da89bbce49 100644 --- a/src/file/styles/style/paragraph-style.ts +++ b/src/file/styles/style/paragraph-style.ts @@ -1,5 +1,5 @@ -import { IParagraphStylePropertiesOptions, IRunStylePropertiesOptions, ParagraphProperties } from "file/paragraph"; -import { RunProperties } from "file/paragraph/run/properties"; +import { IParagraphStylePropertiesOptions, IRunStylePropertiesOptions, ParagraphProperties } from "@file/paragraph"; +import { RunProperties } from "@file/paragraph/run/properties"; import { IStyleOptions, Style } from "./style"; export interface IBaseParagraphStyleOptions extends IStyleOptions { diff --git a/src/file/styles/style/style.spec.ts b/src/file/styles/style/style.spec.ts index 4135272e5d..ea250bfe30 100644 --- a/src/file/styles/style/style.spec.ts +++ b/src/file/styles/style/style.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { Style } from "./style"; describe("Style", () => { diff --git a/src/file/styles/style/style.ts b/src/file/styles/style/style.ts index 767539503b..9b9d49efdf 100644 --- a/src/file/styles/style/style.ts +++ b/src/file/styles/style/style.ts @@ -1,4 +1,4 @@ -import { OnOffElement, StringValueElement, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { OnOffElement, StringValueElement, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; import { Name, UiPriority } from "./components"; // diff --git a/src/file/styles/styles.spec.ts b/src/file/styles/styles.spec.ts index acc782c743..8d0c8c7777 100644 --- a/src/file/styles/styles.spec.ts +++ b/src/file/styles/styles.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Formatter } from "@export/formatter"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { Styles } from "./styles"; diff --git a/src/file/styles/styles.ts b/src/file/styles/styles.ts index e37fe8c263..98c1c83479 100644 --- a/src/file/styles/styles.ts +++ b/src/file/styles/styles.ts @@ -1,5 +1,5 @@ -import { IDefaultStylesOptions } from "file/styles/factory"; -import { BaseXmlComponent, ImportedXmlComponent, XmlComponent } from "file/xml-components"; +import { IDefaultStylesOptions } from "@file/styles/factory"; +import { BaseXmlComponent, ImportedXmlComponent, XmlComponent } from "@file/xml-components"; import { StyleForCharacter, StyleForParagraph } from "./style"; import { ICharacterStyleOptions } from "./style/character-style"; import { IParagraphStyleOptions } from "./style/paragraph-style"; diff --git a/src/file/table-of-contents/alias.ts b/src/file/table-of-contents/alias.ts index 4cc9f82440..2137523c2d 100644 --- a/src/file/table-of-contents/alias.ts +++ b/src/file/table-of-contents/alias.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; class AliasAttributes extends XmlAttributeComponent<{ readonly alias: string }> { protected readonly xmlKeys = { alias: "w:val" }; diff --git a/src/file/table-of-contents/field-instruction.ts b/src/file/table-of-contents/field-instruction.ts index c5ab1144d6..7076296493 100644 --- a/src/file/table-of-contents/field-instruction.ts +++ b/src/file/table-of-contents/field-instruction.ts @@ -1,7 +1,7 @@ // http://officeopenxml.com/WPfieldInstructions.php -import { TextAttributes } from "file/paragraph/run/text-attributes"; -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { TextAttributes } from "@file/paragraph/run/text-attributes"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; import { ITableOfContentsOptions } from "./table-of-contents-properties"; diff --git a/src/file/table-of-contents/sdt-content.ts b/src/file/table-of-contents/sdt-content.ts index 5228ff447f..351ceb973e 100644 --- a/src/file/table-of-contents/sdt-content.ts +++ b/src/file/table-of-contents/sdt-content.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export class StructuredDocumentTagContent extends XmlComponent { constructor() { diff --git a/src/file/table-of-contents/sdt-properties.ts b/src/file/table-of-contents/sdt-properties.ts index 3f7019f561..e1d96164c3 100644 --- a/src/file/table-of-contents/sdt-properties.ts +++ b/src/file/table-of-contents/sdt-properties.ts @@ -1,5 +1,5 @@ // http://www.datypic.com/sc/ooxml/e-w_sdtPr-1.html -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { Alias } from "./alias"; export class StructuredDocumentTagProperties extends XmlComponent { 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 f5cf06cf84..aba9647dc4 100644 --- a/src/file/table-of-contents/table-of-contents.spec.ts +++ b/src/file/table-of-contents/table-of-contents.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { TableOfContents } from "./table-of-contents"; import { StyleLevel } from "./table-of-contents-properties"; diff --git a/src/file/table-of-contents/table-of-contents.ts b/src/file/table-of-contents/table-of-contents.ts index e3d874e4a3..7945140f78 100644 --- a/src/file/table-of-contents/table-of-contents.ts +++ b/src/file/table-of-contents/table-of-contents.ts @@ -1,9 +1,9 @@ // http://officeopenxml.com/WPtableOfContents.php // http://www.datypic.com/sc/ooxml/e-w_sdt-1.html -import { Paragraph } from "file/paragraph"; -import { Run } from "file/paragraph/run"; -import { Begin, End, Separate } from "file/paragraph/run/field"; -import { XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { Run } from "@file/paragraph/run"; +import { Begin, End, Separate } from "@file/paragraph/run/field"; +import { XmlComponent } from "@file/xml-components"; import { FieldInstruction } from "./field-instruction"; import { StructuredDocumentTagContent } from "./sdt-content"; import { StructuredDocumentTagProperties } from "./sdt-properties"; diff --git a/src/file/table/grid.spec.ts b/src/file/table/grid.spec.ts index e38b8da413..43b631c2aa 100644 --- a/src/file/table/grid.spec.ts +++ b/src/file/table/grid.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { GridCol, TableGrid } from "./grid"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { EMPTY_OBJECT } from "@file/xml-components"; describe("GridCol", () => { describe("#constructor", () => { diff --git a/src/file/table/grid.ts b/src/file/table/grid.ts index b8a683f255..7c3fdbaa41 100644 --- a/src/file/table/grid.ts +++ b/src/file/table/grid.ts @@ -9,8 +9,8 @@ // // -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; export class TableGrid extends XmlComponent { constructor(widths: number[] | string[]) { diff --git a/src/file/table/table-cell/table-cell-components.ts b/src/file/table/table-cell/table-cell-components.ts index e57785a19f..bcb8317602 100644 --- a/src/file/table/table-cell/table-cell-components.ts +++ b/src/file/table/table-cell/table-cell-components.ts @@ -1,6 +1,6 @@ -import { BorderElement, IBorderOptions } from "file/border"; -import { decimalNumber } from "file/values"; -import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { BorderElement, IBorderOptions } from "@file/border"; +import { IgnoreIfEmptyXmlComponent, XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { decimalNumber } from "@util/values"; // // diff --git a/src/file/table/table-cell/table-cell-properties.spec.ts b/src/file/table/table-cell/table-cell-properties.spec.ts index 03bd2adc3b..4a26ed46c7 100644 --- a/src/file/table/table-cell/table-cell-properties.spec.ts +++ b/src/file/table/table-cell/table-cell-properties.spec.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -import { VerticalAlign } from "file/vertical-align"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +import { VerticalAlign } from "@file/vertical-align"; import { WidthType } from "../table-width"; diff --git a/src/file/table/table-cell/table-cell-properties.ts b/src/file/table/table-cell/table-cell-properties.ts index a10808ef7c..c89c15fef0 100644 --- a/src/file/table/table-cell/table-cell-properties.ts +++ b/src/file/table/table-cell/table-cell-properties.ts @@ -1,5 +1,5 @@ -import { VerticalAlign, VerticalAlignElement } from "file/vertical-align"; -import { IgnoreIfEmptyXmlComponent } from "file/xml-components"; +import { VerticalAlign, VerticalAlignElement } from "@file/vertical-align"; +import { IgnoreIfEmptyXmlComponent } from "@file/xml-components"; import { IShadingAttributesProperties, Shading } from "../../shading"; import { ITableCellMarginOptions, TableCellMargin, TableCellMarginElementType } from "../table-properties/table-cell-margin"; diff --git a/src/file/table/table-cell/table-cell.spec.ts b/src/file/table/table-cell/table-cell.spec.ts index b4fa5e7429..acd42d7a31 100644 --- a/src/file/table/table-cell/table-cell.spec.ts +++ b/src/file/table/table-cell/table-cell.spec.ts @@ -1,9 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; -import { ShadingType } from "file/shading"; -import { VerticalAlign } from "file/vertical-align"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; +import { ShadingType } from "@file/shading"; +import { VerticalAlign } from "@file/vertical-align"; import { WidthType } from "../table-width"; import { TableCell } from "./table-cell"; diff --git a/src/file/table/table-cell/table-cell.ts b/src/file/table/table-cell/table-cell.ts index 565d389c6d..f77349829a 100644 --- a/src/file/table/table-cell/table-cell.ts +++ b/src/file/table/table-cell/table-cell.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPtableGrid.php -import { Paragraph } from "file/paragraph"; -import { IContext, IXmlableObject, XmlComponent } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { IContext, IXmlableObject, XmlComponent } from "@file/xml-components"; import { Table } from "../table"; import { ITableCellPropertiesOptions, TableCellProperties } from "./table-cell-properties"; diff --git a/src/file/table/table-properties/table-borders.spec.ts b/src/file/table/table-properties/table-borders.spec.ts index a13482f349..cfb869cacf 100644 --- a/src/file/table/table-properties/table-borders.spec.ts +++ b/src/file/table/table-properties/table-borders.spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { BorderStyle } from "file/border"; +import { Formatter } from "@export/formatter"; +import { BorderStyle } from "@file/border"; import { TableBorders } from "./table-borders"; diff --git a/src/file/table/table-properties/table-borders.ts b/src/file/table/table-properties/table-borders.ts index 923a7bb019..bcfe20be8b 100644 --- a/src/file/table/table-properties/table-borders.ts +++ b/src/file/table/table-properties/table-borders.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPtableBorders.php -import { BorderElement, BorderStyle, IBorderOptions } from "file/border"; -import { XmlComponent } from "file/xml-components"; +import { BorderElement, BorderStyle, IBorderOptions } from "@file/border"; +import { XmlComponent } from "@file/xml-components"; export interface ITableBordersOptions { readonly top?: IBorderOptions; diff --git a/src/file/table/table-properties/table-cell-margin.spec.ts b/src/file/table/table-properties/table-cell-margin.spec.ts index 0361b37f27..97c6418bac 100644 --- a/src/file/table/table-properties/table-cell-margin.spec.ts +++ b/src/file/table/table-properties/table-cell-margin.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { WidthType } from "../table-width"; import { TableCellMargin, TableCellMarginElementType } from "./table-cell-margin"; diff --git a/src/file/table/table-properties/table-cell-margin.ts b/src/file/table/table-properties/table-cell-margin.ts index c01cf84f6e..24471f5d93 100644 --- a/src/file/table/table-properties/table-cell-margin.ts +++ b/src/file/table/table-properties/table-cell-margin.ts @@ -1,4 +1,4 @@ -import { IgnoreIfEmptyXmlComponent } from "file/xml-components"; +import { IgnoreIfEmptyXmlComponent } from "@file/xml-components"; import { TableWidthElement, WidthType } from "../table-width"; export interface ITableCellMarginOptions { 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 10d38f31f3..88efe2821f 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,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { RelativeHorizontalPosition, RelativeVerticalPosition, TableAnchorType, TableFloatProperties } from "./table-float-properties"; import { OverlapType } from "./table-overlap"; diff --git a/src/file/table/table-properties/table-float-properties.ts b/src/file/table/table-properties/table-float-properties.ts index 8e365fc93d..f521859885 100644 --- a/src/file/table/table-properties/table-float-properties.ts +++ b/src/file/table/table-properties/table-float-properties.ts @@ -1,5 +1,5 @@ -import { signedTwipsMeasureValue, twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { signedTwipsMeasureValue, twipsMeasureValue } from "@util/values"; import { OverlapType, TableOverlap } from "./table-overlap"; diff --git a/src/file/table/table-properties/table-layout.ts b/src/file/table/table-properties/table-layout.ts index ddbec7e66a..254e842729 100644 --- a/src/file/table/table-properties/table-layout.ts +++ b/src/file/table/table-properties/table-layout.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/table/table-properties/table-overlap.spec.ts b/src/file/table/table-properties/table-overlap.spec.ts index 80ddd13e3d..c4d3830c5e 100644 --- a/src/file/table/table-properties/table-overlap.spec.ts +++ b/src/file/table/table-properties/table-overlap.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { OverlapType, TableOverlap } from "./table-overlap"; diff --git a/src/file/table/table-properties/table-overlap.ts b/src/file/table/table-properties/table-overlap.ts index 102d2afa5d..a14a70accb 100644 --- a/src/file/table/table-properties/table-overlap.ts +++ b/src/file/table/table-properties/table-overlap.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/table/table-properties/table-properties.spec.ts b/src/file/table/table-properties/table-properties.spec.ts index ceadb5c3a8..bf4832691f 100644 --- a/src/file/table/table-properties/table-properties.spec.ts +++ b/src/file/table/table-properties/table-properties.spec.ts @@ -1,9 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; -import { AlignmentType } from "file/paragraph"; -import { ShadingType } from "file/shading"; +import { AlignmentType } from "@file/paragraph"; +import { ShadingType } from "@file/shading"; import { WidthType } from "../table-width"; import { TableLayoutType } from "./table-layout"; diff --git a/src/file/table/table-properties/table-properties.ts b/src/file/table/table-properties/table-properties.ts index 5e46cfa92a..1be92a9392 100644 --- a/src/file/table/table-properties/table-properties.ts +++ b/src/file/table/table-properties/table-properties.ts @@ -21,7 +21,7 @@ // // // -import { IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement } from "file/xml-components"; +import { IgnoreIfEmptyXmlComponent, OnOffElement, StringValueElement } from "@file/xml-components"; import { Alignment, AlignmentType } from "../../paragraph"; import { IShadingAttributesProperties, Shading } from "../../shading"; diff --git a/src/file/table/table-row/table-row-height.ts b/src/file/table/table-row/table-row-height.ts index 84d696b63b..b8b1390fa0 100644 --- a/src/file/table/table-row/table-row-height.ts +++ b/src/file/table/table-row/table-row-height.ts @@ -1,5 +1,5 @@ -import { twipsMeasureValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { twipsMeasureValue } from "@util/values"; // // diff --git a/src/file/table/table-row/table-row-properties.spec.ts b/src/file/table/table-row/table-row-properties.spec.ts index 3f008ce77e..b9cde6078b 100644 --- a/src/file/table/table-row/table-row-properties.spec.ts +++ b/src/file/table/table-row/table-row-properties.spec.ts @@ -1,6 +1,8 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { HeightRule } from "file/table/table-row/table-row-height"; + +import { Formatter } from "@export/formatter"; +import { HeightRule } from "@file/table/table-row/table-row-height"; + import { TableRowProperties } from "./table-row-properties"; describe("TableRowProperties", () => { diff --git a/src/file/table/table-row/table-row-properties.ts b/src/file/table/table-row/table-row-properties.ts index 2168d0774a..d4ebdc0264 100644 --- a/src/file/table/table-row/table-row-properties.ts +++ b/src/file/table/table-row/table-row-properties.ts @@ -27,7 +27,7 @@ // // // -import { IgnoreIfEmptyXmlComponent, OnOffElement } from "file/xml-components"; +import { IgnoreIfEmptyXmlComponent, OnOffElement } from "@file/xml-components"; import { HeightRule, TableRowHeight } from "./table-row-height"; diff --git a/src/file/table/table-row/table-row.spec.ts b/src/file/table/table-row/table-row.spec.ts index f1bcbb1aaf..f8bf783fd8 100644 --- a/src/file/table/table-row/table-row.spec.ts +++ b/src/file/table/table-row/table-row.spec.ts @@ -1,10 +1,10 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; -import { Paragraph } from "file/paragraph"; -import { HeightRule } from "file/table/table-row/table-row-height"; -import { EMPTY_OBJECT } from "file/xml-components"; +import { Paragraph } from "@file/paragraph"; +import { HeightRule } from "@file/table/table-row/table-row-height"; +import { EMPTY_OBJECT } from "@file/xml-components"; import { TableCell } from "../table-cell"; import { TableRow } from "./table-row"; diff --git a/src/file/table/table-row/table-row.ts b/src/file/table/table-row/table-row.ts index 11dc9c776a..cfa22a5b6d 100644 --- a/src/file/table/table-row/table-row.ts +++ b/src/file/table/table-row/table-row.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { TableCell } from "../table-cell"; import { ITableRowPropertiesOptions, TableRowProperties } from "./table-row-properties"; diff --git a/src/file/table/table-width.ts b/src/file/table/table-width.ts index 554654a583..530a34b3e9 100644 --- a/src/file/table/table-width.ts +++ b/src/file/table/table-width.ts @@ -1,6 +1,6 @@ // http://officeopenxml.com/WPtableWidth.php -import { measurementOrPercentValue } from "file/values"; -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; +import { measurementOrPercentValue } from "@util/values"; // // diff --git a/src/file/table/table.spec.ts b/src/file/table/table.spec.ts index 78a273e4e1..38d0620f7d 100644 --- a/src/file/table/table.spec.ts +++ b/src/file/table/table.spec.ts @@ -1,7 +1,7 @@ /* tslint:disable:no-unused-expression */ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { AlignmentType, Paragraph } from "../paragraph"; import { Table } from "./table"; diff --git a/src/file/table/table.ts b/src/file/table/table.ts index 5751207ba9..a7564104c8 100644 --- a/src/file/table/table.ts +++ b/src/file/table/table.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPtableGrid.php -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { AlignmentType } from "../paragraph"; import { TableGrid } from "./grid"; diff --git a/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts b/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts index 5e0238da96..99340152a7 100644 --- a/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts +++ b/src/file/track-revision/track-revision-components/deleted-page-number.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { DeletedNumberOfPages, DeletedNumberOfPagesSection, DeletedPage } from "./deleted-page-number"; describe("Deleted Page", () => { 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 469b9b1700..27b8e52bdf 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,6 +1,6 @@ -import { TextAttributes } from "file/paragraph/run/text-attributes"; -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { TextAttributes } from "@file/paragraph/run/text-attributes"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; export class DeletedPage extends XmlComponent { constructor() { diff --git a/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts b/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts index 9eacb7c23c..0e445888d7 100644 --- a/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts +++ b/src/file/track-revision/track-revision-components/deleted-text-run.spec.ts @@ -1,6 +1,9 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; -import { FootnoteReferenceRun, PageNumber } from "../../index"; + +import { Formatter } from "@export/formatter"; +import { FootnoteReferenceRun } from "@file/footnotes"; +import { PageNumber } from "@file/paragraph"; + import { DeletedTextRun } from "./deleted-text-run"; describe("DeletedTextRun", () => { diff --git a/src/file/track-revision/track-revision-components/deleted-text-run.ts b/src/file/track-revision/track-revision-components/deleted-text-run.ts index 7830d3d63c..cc4d41cf9e 100644 --- a/src/file/track-revision/track-revision-components/deleted-text-run.ts +++ b/src/file/track-revision/track-revision-components/deleted-text-run.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { IRunOptions, RunProperties } from "../../index"; import { Break } from "../../paragraph/run/break"; diff --git a/src/file/track-revision/track-revision-components/deleted-text.spec.ts b/src/file/track-revision/track-revision-components/deleted-text.spec.ts index d9c8de46bf..7a4b859acf 100644 --- a/src/file/track-revision/track-revision-components/deleted-text.spec.ts +++ b/src/file/track-revision/track-revision-components/deleted-text.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { DeletedText } from "./deleted-text"; describe("Deleted Text", () => { 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 1311e056d8..f0e3ee4d34 100644 --- a/src/file/track-revision/track-revision-components/deleted-text.ts +++ b/src/file/track-revision/track-revision-components/deleted-text.ts @@ -1,6 +1,6 @@ -import { TextAttributes } from "file/paragraph/run/text-attributes"; -import { SpaceType } from "file/space-type"; -import { XmlComponent } from "file/xml-components"; +import { TextAttributes } from "@file/paragraph/run/text-attributes"; +import { SpaceType } from "@file/space-type"; +import { XmlComponent } from "@file/xml-components"; export class DeletedText extends XmlComponent { constructor(text: string) { diff --git a/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts b/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts index c23069fbba..ee5e2b957e 100644 --- a/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts +++ b/src/file/track-revision/track-revision-components/inserted-text-run.spec.ts @@ -1,5 +1,7 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; + +import { Formatter } from "@export/formatter"; + import { InsertedTextRun } from "./inserted-text-run"; describe("InsertedTextRun", () => { diff --git a/src/file/track-revision/track-revision-components/inserted-text-run.ts b/src/file/track-revision/track-revision-components/inserted-text-run.ts index 3d39e92c1c..0389de2d89 100644 --- a/src/file/track-revision/track-revision-components/inserted-text-run.ts +++ b/src/file/track-revision/track-revision-components/inserted-text-run.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; import { IRunOptions, TextRun } from "../../index"; import { ChangeAttributes, IChangedAttributesProperties } from "../track-revision"; diff --git a/src/file/track-revision/track-revision.ts b/src/file/track-revision/track-revision.ts index 4318e9a468..37fe5ef951 100644 --- a/src/file/track-revision/track-revision.ts +++ b/src/file/track-revision/track-revision.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent } from "file/xml-components"; +import { XmlAttributeComponent } from "@file/xml-components"; export interface IChangedAttributesProperties { readonly id: number; diff --git a/src/file/vertical-align/vertical-align.ts b/src/file/vertical-align/vertical-align.ts index 1213eec45b..30b8300990 100644 --- a/src/file/vertical-align/vertical-align.ts +++ b/src/file/vertical-align/vertical-align.ts @@ -1,4 +1,4 @@ -import { XmlAttributeComponent, XmlComponent } from "file/xml-components"; +import { XmlAttributeComponent, XmlComponent } from "@file/xml-components"; // // diff --git a/src/file/xml-components/initializable-xml-component.ts b/src/file/xml-components/initializable-xml-component.ts index 5d461c007a..636f6d5a4d 100644 --- a/src/file/xml-components/initializable-xml-component.ts +++ b/src/file/xml-components/initializable-xml-component.ts @@ -1,4 +1,4 @@ -import { XmlComponent } from "file/xml-components"; +import { XmlComponent } from "@file/xml-components"; export abstract class InitializableXmlComponent extends XmlComponent { constructor(rootKey: string, initComponent?: InitializableXmlComponent) { diff --git a/src/file/xml-components/simple-elements.ts b/src/file/xml-components/simple-elements.ts index 02562e4c58..6478d5cec3 100644 --- a/src/file/xml-components/simple-elements.ts +++ b/src/file/xml-components/simple-elements.ts @@ -1,6 +1,6 @@ -import { Attributes, XmlComponent } from "file/xml-components"; +import { Attributes, XmlComponent } from "@file/xml-components"; -import { hpsMeasureValue } from "../values"; +import { hpsMeasureValue } from "@util/values"; // This represents element type CT_OnOff, which indicate a boolean value. // diff --git a/src/file/xml-components/xml-component.spec.ts b/src/file/xml-components/xml-component.spec.ts index 497f14eab2..414059ee61 100644 --- a/src/file/xml-components/xml-component.spec.ts +++ b/src/file/xml-components/xml-component.spec.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; -import { Formatter } from "export/formatter"; +import { Formatter } from "@export/formatter"; import { Attributes, BaseXmlComponent, XmlComponent } from "./"; class TestComponent extends XmlComponent { diff --git a/src/import-dotx/import-dotx.ts b/src/import-dotx/import-dotx.ts index 3ef73208d8..bb621e6384 100644 --- a/src/import-dotx/import-dotx.ts +++ b/src/import-dotx/import-dotx.ts @@ -1,12 +1,12 @@ import * as JSZip from "jszip"; import { Element as XMLElement, ElementCompact as XMLElementCompact, xml2js } from "xml-js"; -import { HeaderFooterReferenceType } from "file/document/body/section-properties"; -import { FooterWrapper, IDocumentFooter } from "file/footer-wrapper"; -import { HeaderWrapper, IDocumentHeader } from "file/header-wrapper"; -import { Media } from "file/media"; -import { TargetModeType } from "file/relationships/relationship/relationship"; -import { convertToXmlComponent, ImportedXmlComponent } from "file/xml-components"; +import { HeaderFooterReferenceType } from "@file/document/body/section-properties"; +import { FooterWrapper, IDocumentFooter } from "@file/footer-wrapper"; +import { HeaderWrapper, IDocumentHeader } from "@file/header-wrapper"; +import { Media } from "@file/media"; +import { TargetModeType } from "@file/relationships/relationship/relationship"; +import { convertToXmlComponent, ImportedXmlComponent } from "@file/xml-components"; const schemeToType = { "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header": "header", diff --git a/src/index.ts b/src/index.ts index a319e4dcfe..3d76a0f70f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,4 +4,4 @@ export { File as Document } from "./file"; export * from "./file"; export * from "./export"; export * from "./import-dotx"; -export * from "./convenience-functions"; +export * from "./util"; diff --git a/src/convenience-functions.spec.ts b/src/util/convenience-functions.spec.ts similarity index 100% rename from src/convenience-functions.spec.ts rename to src/util/convenience-functions.spec.ts diff --git a/src/convenience-functions.ts b/src/util/convenience-functions.ts similarity index 100% rename from src/convenience-functions.ts rename to src/util/convenience-functions.ts diff --git a/src/util/index.ts b/src/util/index.ts new file mode 100644 index 0000000000..36d4db927d --- /dev/null +++ b/src/util/index.ts @@ -0,0 +1,2 @@ +export * from "./convenience-functions"; +export * from "./values"; diff --git a/src/file/values.spec.ts b/src/util/values.spec.ts similarity index 100% rename from src/file/values.spec.ts rename to src/util/values.spec.ts diff --git a/src/file/values.ts b/src/util/values.ts similarity index 100% rename from src/file/values.ts rename to src/util/values.ts diff --git a/tsconfig.json b/tsconfig.json index 1105b2e0ef..f56947caa9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,9 +14,9 @@ "noUnusedParameters": true, "baseUrl": "./src", "paths": { - "convenience-functions": ["./convenience-functions"], + "@util/*": ["./util/*"], "@export/*": ["./export/*"], - "file/*": ["./file/*"] + "@file/*": ["./file/*"] } }, "include": ["src"] diff --git a/tsconfig.lib.json b/tsconfig.lib.json new file mode 100644 index 0000000000..7017350e3a --- /dev/null +++ b/tsconfig.lib.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*.ts"], + "exclude": ["src/**/*.spec.ts"] +} diff --git a/tsconfig.typedoc.json b/tsconfig.typedoc.json index 741f3906df..0f192deeb8 100644 --- a/tsconfig.typedoc.json +++ b/tsconfig.typedoc.json @@ -7,5 +7,5 @@ "excludePrivate": true, "excludeProtected": true, "excludeExternals": false - } + } } diff --git a/webpack.config.ts b/webpack.config.ts index 1c7d3dcb22..0f03537add 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -1,5 +1,6 @@ const path = require("path"); const { ProvidePlugin } = require("webpack"); +const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); const configuration = { mode: "production", @@ -21,6 +22,7 @@ const configuration = { buffer: require.resolve("buffer"), stream: require.resolve("stream-browserify"), }, + plugins: [new TsconfigPathsPlugin()], }, module: { @@ -29,7 +31,7 @@ const configuration = { test: /\.ts$/, loader: "ts-loader", options: { - configFile: "tsconfig.json", + configFile: "tsconfig.lib.json", }, }, ],