0.1.4 - TypeScript 2.0 compatibility and merged latest excel-builder.js changes.

TeamworkGuy2 · TeamworkGuy2 · commit 2aa41518ff61 · 2016-12-31T13:37:14.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 This project does its best to adhere to [Semantic Versioning](http://semver.org/).
 
 
+--------
+### [0.1.4](N/A) - 2016-12-31
+#### Changed
+* TypeScript 2.0 compatibility tweaks
+* Merged up to latest excel-builder.js commit from 2016-10-30 (https://github.com/stephenliberty/excel-builder.js/commit/162004ecb6b745f33924fff3f22692638a296306)
+
+
 --------
 ### [0.1.3](N/A) - 2016-06-21
 #### Changed
diff --git a/ExcelBuilder.js b/ExcelBuilder.js
@@ -65,7 +65,7 @@ var ExcelBuilder = (function () {
                 zip.file(path, content, { base64: true, binary: true });
             }
         });
-        return zip.generate({
+        return zip.generateAsync({
             base64: (!options || options.base64 !== false)
         });
     };
diff --git a/ExcelBuilder.ts b/ExcelBuilder.ts
@@ -69,7 +69,7 @@ class ExcelBuilder {
                 zip.file(path, content, { base64: true, binary: true });
             }
         })
-        return zip.generate({
+        return zip.generateAsync({
             base64: (!options || options.base64 !== false)
         });
     }
diff --git a/StyleSheet.js b/StyleSheet.js
@@ -475,7 +475,7 @@ var StyleSheet = (function () {
         var end = doc.createElement("stop");
         var endColor = doc.createElement("color");
         end.setAttribute("position", data.end.pureAt || 1);
-        if (isStr(data.start) || data.end.color) {
+        if (isStr(data.end) || data.end.color) {
             endColor.setAttribute("rgb", data.end.color || data.end);
         }
         else if (typeof data.end.theme) {
diff --git a/StyleSheet.ts b/StyleSheet.ts
@@ -519,19 +519,19 @@ class StyleSheet {
             fillDef.setAttribute("bottom", data.bottom);
         }
         var start = doc.createElement("stop");
-        start.setAttribute("position", data.start.pureAt || 0);
+        start.setAttribute("position", (<any>data.start).pureAt || 0);
         var startColor = doc.createElement("color");
         if (isStr(data.start) || data.start.color) {
-            startColor.setAttribute("rgb", data.start.color || data.start);
+            startColor.setAttribute("rgb", (<any>data.start).color || data.start);
         } else if (typeof data.start.theme) {
             startColor.setAttribute("theme", data.start.theme);
         }
 
         var end = doc.createElement("stop");
         var endColor = doc.createElement("color");
-        end.setAttribute("position", data.end.pureAt || 1);
-        if (isStr(data.start) || data.end.color) {
-            endColor.setAttribute("rgb", data.end.color || data.end);
+        end.setAttribute("position", (<any>data.end).pureAt || 1);
+        if (isStr(data.end) || data.end.color) {
+            endColor.setAttribute("rgb", (<any>data.end).color || data.end);
         } else if (typeof data.end.theme) {
             endColor.setAttribute("theme", data.end.theme);
         }
@@ -740,8 +740,8 @@ module StyleSheet {
         right?;
         top?;
         bottom?;
-        start?: string & { pureAt?: number; color?; theme?; };
-        end?: string & { pureAt?: number; color?; theme?; };
+        start?: string | { pureAt?: number; color?; theme?; };
+        end?: string | { pureAt?: number; color?; theme?; };
     }
 
 }
diff --git a/Util.js b/Util.js
@@ -110,28 +110,28 @@ var Util = (function () {
         Util.LETTER_REFS[x] = string;
         return string.concat(y);
     };
-    Util._idSpaces = {};
-    Util._id = 0;
-    Util.LETTER_REFS = {};
-    Util.schemas = {
-        "worksheet": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet",
-        "sharedStrings": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings",
-        "stylesheet": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles",
-        "relationships": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-        "relationshipPackage": "http://schemas.openxmlformats.org/package/2006/relationships",
-        "contentTypes": "http://schemas.openxmlformats.org/package/2006/content-types",
-        "spreadsheetml": "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
-        "markupCompat": "http://schemas.openxmlformats.org/markup-compatibility/2006",
-        "x14ac": "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac",
-        "officeDocument": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
-        "package": "http://schemas.openxmlformats.org/package/2006/relationships",
-        "table": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table",
-        "spreadsheetDrawing": "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing",
-        "drawing": "http://schemas.openxmlformats.org/drawingml/2006/main",
-        "drawingRelationship": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
-        "image": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
-        "chart": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
-    };
     return Util;
 }());
+Util._idSpaces = {};
+Util._id = 0;
+Util.LETTER_REFS = {};
+Util.schemas = {
+    "worksheet": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet",
+    "sharedStrings": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings",
+    "stylesheet": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles",
+    "relationships": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+    "relationshipPackage": "http://schemas.openxmlformats.org/package/2006/relationships",
+    "contentTypes": "http://schemas.openxmlformats.org/package/2006/content-types",
+    "spreadsheetml": "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
+    "markupCompat": "http://schemas.openxmlformats.org/markup-compatibility/2006",
+    "x14ac": "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac",
+    "officeDocument": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
+    "package": "http://schemas.openxmlformats.org/package/2006/relationships",
+    "table": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table",
+    "spreadsheetDrawing": "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing",
+    "drawing": "http://schemas.openxmlformats.org/drawingml/2006/main",
+    "drawingRelationship": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing",
+    "image": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
+    "chart": "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
+};
 module.exports = Util;
diff --git a/Util.ts b/Util.ts
@@ -41,8 +41,8 @@ class Util {
 
     static defaults<T1, T2>(obj: T1, overrides: T2): T1 & T2 {
         for (var key in overrides) {
-            if (overrides.hasOwnProperty(key) && (obj[key] === undefined)) {
-                obj[key] = overrides[key];
+            if (overrides.hasOwnProperty(key) && (obj[<string>key] === undefined)) {
+                obj[<string>key] = overrides[key];
             }
         }
         return <any>obj;
diff --git a/XmlDom.js b/XmlDom.js
@@ -15,7 +15,6 @@ var XmlDom = (function () {
     };
     return XmlDom;
 }());
-var XmlDom;
 (function (XmlDom) {
     var Node = (function () {
         function Node() {
diff --git a/ZipWorker.js b/ZipWorker.js
@@ -10,10 +10,12 @@ onmessage = function (event) {
     postMessage({
         base64: !!event.data.base64
     }, undefined);
-    postMessage({
-        status: "done",
-        data: zip.generate({
-            base64: !!event.data.base64
-        })
-    }, undefined);
+    zip.generateAsync({
+        base64: !!event.data.base64
+    }).then(function (data) {
+        postMessage({
+            status: 'done',
+            data: data
+        }, undefined);
+    });
 };
diff --git a/ZipWorker.ts b/ZipWorker.ts
@@ -14,10 +14,12 @@ onmessage = function (event: { data: any; }) {
         base64: !!event.data.base64
     }, undefined);
 
-    postMessage({
-        status: "done",
-        data: zip.generate({
-            base64: !!event.data.base64
-        })
-    }, undefined);
+    zip.generateAsync({
+        base64: !!event.data.base64
+    }).then(function (data) {
+        postMessage({
+            status: 'done',
+            data: data
+        }, undefined);
+    });
 };
diff --git a/drawings/Picture.js b/drawings/Picture.js
@@ -87,11 +87,11 @@ var Picture = (function () {
         //     </xdr:spPr>
         return this.anchor.toXML(xmlDoc, pictureNode);
     };
-    Picture.Cctor = (function () {
-        var thisProto = Picture.prototype;
-        Picture.prototype = new Drawing();
-        Object.assign(Picture.prototype, thisProto);
-    }());
     return Picture;
 }());
+Picture.Cctor = (function () {
+    var thisProto = Picture.prototype;
+    Picture.prototype = new Drawing();
+    Object.assign(Picture.prototype, thisProto);
+}());
 module.exports = Picture;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "excel-builder-ts",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "TypeScript Port of the excel-builder.js Library - 'A way to build excel files with javascript'",
   "dependencies": {
   },

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ var ExcelBuilder = (function () {`
`65`	`65`	`zip.file(path, content, { base64: true, binary: true });`
`66`	`66`	`}`
`67`	`67`	`});`
`68`		`- return zip.generate({`
	`68`	`+ return zip.generateAsync({`
`69`	`69`	`base64: (!options \|\| options.base64 !== false)`
`70`	`70`	`});`
`71`	`71`	`};`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class ExcelBuilder {`
`69`	`69`	`zip.file(path, content, { base64: true, binary: true });`
`70`	`70`	`}`
`71`	`71`	`})`
`72`		`- return zip.generate({`
	`72`	`+ return zip.generateAsync({`
`73`	`73`	`base64: (!options \|\| options.base64 !== false)`
`74`	`74`	`});`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ var StyleSheet = (function () {`
`475`	`475`	`var end = doc.createElement("stop");`
`476`	`476`	`var endColor = doc.createElement("color");`
`477`	`477`	`end.setAttribute("position", data.end.pureAt \|\| 1);`
`478`		`- if (isStr(data.start) \|\| data.end.color) {`
	`478`	`+ if (isStr(data.end) \|\| data.end.color) {`
`479`	`479`	`endColor.setAttribute("rgb", data.end.color \|\| data.end);`
`480`	`480`	`}`
`481`	`481`	`else if (typeof data.end.theme) {`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ class Util {`
`41`	`41`
`42`	`42`	`static defaults<T1, T2>(obj: T1, overrides: T2): T1 & T2 {`
`43`	`43`	`for (var key in overrides) {`
`44`		`- if (overrides.hasOwnProperty(key) && (obj[key] === undefined)) {`
`45`		`- obj[key] = overrides[key];`
	`44`	`+ if (overrides.hasOwnProperty(key) && (obj[<string>key] === undefined)) {`
	`45`	`+ obj[<string>key] = overrides[key];`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`return <any>obj;`