From 3fb563f9c83e9f1fee51376d56d7bd1ae604005b Mon Sep 17 00:00:00 2001
From: h4buli <34742290+h4buli@users.noreply.github.com>
Date: Mon, 26 Mar 2018 16:28:40 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"(styles):=20add=20support=20to=20prov?=
 =?UTF-8?q?ide=20external=20styles=20(as=20complete=20file=20co=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |  1 -
 src/export/packer/compiler.spec.ts | 65 ------------------------------
 src/export/packer/compiler.ts      | 11 +----
 src/file/file.ts                   |  9 -----
 4 files changed, 1 insertion(+), 85 deletions(-)
 delete mode 100644 src/export/packer/compiler.spec.ts

diff --git a/package.json b/package.json
index 191127d18c..639d230273 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,6 @@
     "awesome-typescript-loader": "^3.4.1",
     "chai": "^3.5.0",
     "glob": "^7.1.2",
-    "jszip": "^3.1.5",
     "mocha": "^3.2.0",
     "mocha-webpack": "^1.0.1",
     "prettier": "^1.10.2",
diff --git a/src/export/packer/compiler.spec.ts b/src/export/packer/compiler.spec.ts
deleted file mode 100644
index dcdbb2afc6..0000000000
--- a/src/export/packer/compiler.spec.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/* tslint:disable:typedef space-before-function-paren */
-import * as fs from "fs";
-import * as os from 'os';
-import { expect } from "chai";
-
-import { File, Paragraph } from "../../file";
-import {Compiler} from './compiler';
-import * as jszip from 'jszip';
-
-async function getDocxXmlFileContent(filePath: string, xmlFileName: string): Promise<any> {
-    let zipFile = fs.readFileSync(filePath);
-    const zipData = await jszip.loadAsync(zipFile).then(zip => zip);
-    return zipData.files[xmlFileName].async('text');
-}
-
-describe("compiler", () => {
-    let compiler: Compiler;
-    let file: File;
-    let externalStyles: string;
-
-    beforeEach(() => {
-        file = new File({
-            creator: "Dolan Miu",
-            revision: "1",
-            lastModifiedBy: "Dolan Miu",
-        });
-        const paragraph = new Paragraph("test text");
-        const heading = new Paragraph("Hello world").heading1();
-        file.addParagraph(new Paragraph("title").title());
-        file.addParagraph(heading);
-        file.addParagraph(new Paragraph("heading 2").heading2());
-        file.addParagraph(paragraph);
-
-        file.Styles.createParagraphStyle("testStyle").basedOn("Normal").bold();
-        
-        externalStyles = "Some external styles";
-        file.setExternalStyles(externalStyles);
-
-        compiler = new Compiler(file);
-    });
-
-    describe("#compile()", () => {
-        
-        it("should use document styles when they are no external styles provided", async function() {
-            file.setExternalStyles('');
-            const filePath = `${os.tmpdir()}/test-compile.zip`;
-            let stream = fs.createWriteStream(filePath);
-            
-            await compiler.compile(stream);
-            
-            const styles = await getDocxXmlFileContent(filePath, 'word/styles.xml')
-            expect(styles).not.to.equal(externalStyles);
-        });
-
-        it("should use provided external styles", async function() {
-            const filePath = `${os.tmpdir()}/test-compile.zip`;
-            let stream = fs.createWriteStream(filePath);
-            
-            await compiler.compile(stream);
-            
-            const styles = await getDocxXmlFileContent(filePath, 'word/styles.xml')
-            expect(styles).to.equal(externalStyles);
-        });
-    });
-});
diff --git a/src/export/packer/compiler.ts b/src/export/packer/compiler.ts
index 935c0a354b..44c7817249 100644
--- a/src/export/packer/compiler.ts
+++ b/src/export/packer/compiler.ts
@@ -23,7 +23,7 @@ export class Compiler {
         this.archive.pipe(output);
 
         const xmlDocument = xml(this.formatter.format(this.file.Document), true);
-        const xmlStyles = this.resolveStyles();
+        const xmlStyles = xml(this.formatter.format(this.file.Styles));
         const xmlProperties = xml(this.formatter.format(this.file.CoreProperties), {
             declaration: {
                 standalone: "yes",
@@ -102,13 +102,4 @@ export class Compiler {
             });
         });
     }
-
-    private resolveStyles(): string {
-        if (this.file.ExternalStyles) {
-            return this.file.ExternalStyles;
-        } else {
-            return xml(this.formatter.format(this.file.Styles));
-        }
-        
-    }
 }
diff --git a/src/file/file.ts b/src/file/file.ts
index f3aab5d24f..81cc8405fb 100644
--- a/src/file/file.ts
+++ b/src/file/file.ts
@@ -25,8 +25,6 @@ export class File {
     private readonly footerWrapper: FooterWrapper;
     private readonly contentTypes: ContentTypes;
     private readonly appProperties: AppProperties;
-    private externalStyles: string;    
-    
 
     constructor(options?: IPropertiesOptions, sectionPropertiesOptions?: SectionPropertiesOptions) {
         this.document = new Document(sectionPropertiesOptions);
@@ -113,10 +111,6 @@ export class File {
         this.document.createDrawing(mediaData);
     }
 
-    public setExternalStyles(styles: string): void {
-        this.externalStyles = styles;
-    }
-
     public get Document(): Document {
         return this.document;
     }
@@ -160,7 +154,4 @@ export class File {
     public get AppProperties(): AppProperties {
         return this.appProperties;
     }
-    public get ExternalStyles(): string {
-        return this.externalStyles;
-    }
 }