From ee958dc35188291b8f15b27f00d5267313747808 Mon Sep 17 00:00:00 2001
From: Dolan <dolan_miu@hotmail.com>
Date: Fri, 2 Feb 2018 01:56:08 +0000
Subject: [PATCH] Fix exported type definitions

---
 package.json                              | 10 ++++++----
 src/export/formatter.ts                   |  3 +--
 src/file/table/table.ts                   |  3 +--
 src/file/xml-components/index.ts          |  1 +
 src/file/xml-components/xmlable-object.ts |  3 +++
 types-absolute-fixer.js                   | 20 ++++++++++++++++++++
 6 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 types-absolute-fixer.js

diff --git a/package.json b/package.json
index 917e1d4adc..23f58e9b44 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,13 @@
     "test-watch": "mocha-webpack \"src/**/*.ts\" --watch",
     "prepublishOnly": "npm run build",
     "lint": "tslint --project .",
-    "build": "npm run webpack",
+    "build": "npm run webpack && npm run fix-types",
     "tsc": "rimraf ./build && tsc -p .",
     "webpack": "rimraf ./build && webpack",
     "demo": "npm run build && node ./demo",
     "typedoc": "npm run build && typedoc --out docs/ src/ --module commonjs --target ES6 --disableOutputCheck",
-    "style": "prettier -l --trailing-comma all --print-width 140 --arrow-parens always \"src/**/*.ts\""
+    "style": "prettier -l --trailing-comma all --print-width 140 --arrow-parens always \"src/**/*.ts\"",
+    "fix-types": "node types-absolute-fixer.js"
   },
   "files": [
     "src",
@@ -42,8 +43,7 @@
     "@types/archiver": "^2.1.0",
     "@types/express": "^4.0.35",
     "@types/image-size": "0.0.29",
-    "@types/request": "^2.0.3",
-    "@types/request-promise": "^4.1.39",
+    "@types/request-promise": "^4.1.41",
     "archiver": "^2.1.1",
     "image-size": "^0.6.2",
     "request": "^2.83.0",
@@ -61,10 +61,12 @@
     "@types/mocha": "^2.2.39",
     "awesome-typescript-loader": "^3.4.1",
     "chai": "^3.5.0",
+    "glob": "^7.1.2",
     "mocha": "^3.2.0",
     "mocha-webpack": "^1.0.1",
     "prettier": "^1.10.2",
     "prompt": "^1.0.0",
+    "replace-in-file": "^3.1.0",
     "rimraf": "^2.5.2",
     "shelljs": "^0.7.7",
     "tslint": "^5.1.0",
diff --git a/src/export/formatter.ts b/src/export/formatter.ts
index 95c4e38e78..199c32185f 100644
--- a/src/export/formatter.ts
+++ b/src/export/formatter.ts
@@ -1,5 +1,4 @@
-import { BaseXmlComponent } from "file/xml-components";
-import { IXmlableObject } from "file/xml-components/xmlable-object";
+import { BaseXmlComponent, IXmlableObject } from "file/xml-components";
 
 export class Formatter {
     public format(input: BaseXmlComponent): IXmlableObject {
diff --git a/src/file/table/table.ts b/src/file/table/table.ts
index f11b6959c7..6a7bb1a928 100644
--- a/src/file/table/table.ts
+++ b/src/file/table/table.ts
@@ -1,5 +1,4 @@
-import { XmlComponent } from "file/xml-components";
-import { IXmlableObject } from "file/xml-components/xmlable-object";
+import { IXmlableObject, XmlComponent } from "file/xml-components";
 import { Paragraph } from "../paragraph";
 import { TableGrid } from "./grid";
 import { TableProperties, WidthTypes } from "./properties";
diff --git a/src/file/xml-components/index.ts b/src/file/xml-components/index.ts
index 9be5c0d219..5d20da53d2 100644
--- a/src/file/xml-components/index.ts
+++ b/src/file/xml-components/index.ts
@@ -1,3 +1,4 @@
 export * from "./xml-component";
 export * from "./attributes";
 export * from "./default-attributes";
+export * from "./xmlable-object";
diff --git a/src/file/xml-components/xmlable-object.ts b/src/file/xml-components/xmlable-object.ts
index de6d2090da..9fa0d5b600 100644
--- a/src/file/xml-components/xmlable-object.ts
+++ b/src/file/xml-components/xmlable-object.ts
@@ -1,3 +1,6 @@
 export interface IXmlableObject extends Object {
     _attr?: { [key: string]: string | number | boolean };
 }
+
+// Needed because of: https://github.com/s-panferov/awesome-typescript-loader/issues/432
+export const WORKAROUND3 = "workaround";
diff --git a/types-absolute-fixer.js b/types-absolute-fixer.js
new file mode 100644
index 0000000000..7ef4bc18ef
--- /dev/null
+++ b/types-absolute-fixer.js
@@ -0,0 +1,20 @@
+const glob = require("glob");
+const replace = require("replace-in-file");
+
+const files = glob.sync("build/**/*.d.ts");
+
+for (const file of files) {
+    replace({
+        files: file,
+        from: /"file[a-z/-]*"/gi,
+        to: (match) => {
+            const matchSlug = match.replace(/['"]+/g, "").trim();
+            const levelCount = file.split("/").length - 2;
+            const backLevels = Array(levelCount)
+                .fill("../")
+                .join("");
+
+           return `"${backLevels}${matchSlug}"`;
+        },
+    });
+}