0.4.2 - Upgrade to TypeScript 3.1, update dependencies, remove compiled bin tarball in favor of git tags.

TeamworkGuy2 · TeamworkGuy2 · commit 698bc9cdfdeb · 2018-10-17T12:59:57.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,16 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-### [0.4.1](N/A) - 2018-06-22
+### [0.4.2](N/A) - 2018-10-17
+#### Changed
+* Update to TypeScript 3.1
+* Update dev dependencies and @types
+* Enable `tsconfig.json` `strict` and fix compile errors
+* Removed compiled bin tarball in favor of git tags
+
+
+--------
+### [0.4.1](https://github.com/TeamworkGuy2/excel-builder-ts/commit/41e334ce51bf376b53f4a7eee86efcffe6835bc7) - 2018-06-22
 #### Added
 * Support for worksheet `<autoFilter>` and workbook `<definedName name="_FilterDatabase">` which add filter/search dropdowns on column header cells
 
diff --git a/bin/excel-builder-ts-0.4.0.tgz b/bin/excel-builder-ts-0.4.0.tgz
diff --git a/bin/excel-builder-ts-0.4.1.tgz b/bin/excel-builder-ts-0.4.1.tgz
diff --git a/drawings/Drawing.js b/drawings/Drawing.js
@@ -12,6 +12,7 @@ var Drawing = /** @class */ (function () {
      * @constructor
      */
     function Drawing() {
+        this.anchor = null;
         this.id = Util._uniqueId("Drawing");
     }
     /**
@@ -24,16 +25,12 @@ var Drawing = /** @class */ (function () {
         cfg.drawing = this;
         switch (type) {
             case "absoluteAnchor":
-                this.anchor = new AbsoluteAnchor(cfg);
-                break;
+                return this.anchor = new AbsoluteAnchor(cfg);
             case "oneCellAnchor":
-                this.anchor = new OneCellAnchor(cfg);
-                break;
+                return this.anchor = new OneCellAnchor(cfg);
             case "twoCellAnchor":
-                this.anchor = new TwoCellAnchor(cfg);
-                break;
+                return this.anchor = new TwoCellAnchor(cfg);
         }
-        return this.anchor;
     };
     return Drawing;
 }());
diff --git a/drawings/Drawing.ts b/drawings/Drawing.ts
@@ -10,7 +10,7 @@ import TwoCellAnchor = require("./TwoCellAnchor");
  * @module Excel/Drawing
  */
 abstract class Drawing implements Drawings.Drawing {
-    anchor: Drawing.AnchorLike;
+    anchor: Drawing.AnchorLike | null = null;
     id: string;
 
 
@@ -32,16 +32,12 @@ abstract class Drawing implements Drawings.Drawing {
         cfg.drawing = this;
         switch (type) {
             case "absoluteAnchor":
-                this.anchor = new AbsoluteAnchor(cfg);
-                break;
+                return this.anchor = new AbsoluteAnchor(cfg);
             case "oneCellAnchor":
-                this.anchor = new OneCellAnchor(cfg);
-                break;
+                return this.anchor = new OneCellAnchor(cfg);
             case "twoCellAnchor":
-                this.anchor = new TwoCellAnchor(<{ from: Util.OffsetConfig; to: Util.OffsetConfig; }><any>cfg);
-                break;
+                return this.anchor = new TwoCellAnchor(<{ from: Util.OffsetConfig; to: Util.OffsetConfig; }><any>cfg);
         }
-        return this.anchor;
     }
 
 
diff --git a/drawings/Picture.js b/drawings/Picture.js
@@ -3,6 +3,8 @@ var Util = require("../util/Util");
 var Drawing = require("./Drawing");
 var Picture = /** @class */ (function () {
     function Picture() {
+        this.anchor = null;
+        this.description = null;
         this.media = null;
         this.id = Util._uniqueId("Picture");
         this.pictureId = Util.uniqueId("Picture");
@@ -85,7 +87,13 @@ var Picture = /** @class */ (function () {
         //             </a:ext>
         //         </a:extLst>
         //     </xdr:spPr>
-        return this.anchor.toXML(xmlDoc, pictureNode);
+        var ach = this.anchor;
+        if (ach == null) {
+            throw new Error("picture " + this.id + " anchor null, cannot conver to XML");
+        }
+        else {
+            return ach.toXML(xmlDoc, pictureNode);
+        }
     };
     Picture.Cctor = (function () {
         var thisProto = Picture.prototype;
diff --git a/drawings/Picture.ts b/drawings/Picture.ts
@@ -10,8 +10,8 @@ class Picture implements Drawings.Drawing {
         Object.assign(Picture.prototype, thisProto);
     } ());
 
-    anchor: Drawing.AnchorLike;
-    description: string;
+    anchor: Drawing.AnchorLike | null = null;
+    description: string | null;
     fill: any;
     id: string;
     media: any;
@@ -20,6 +20,7 @@ class Picture implements Drawings.Drawing {
 
 
     constructor() {
+        this.description = null;
         this.media = null;
         this.id = Util._uniqueId("Picture");
         this.pictureId = Util.uniqueId("Picture");
@@ -126,7 +127,13 @@ class Picture implements Drawings.Drawing {
         //         </a:extLst>
         //     </xdr:spPr>
 
-        return this.anchor.toXML(xmlDoc, pictureNode);
+        var ach = this.anchor;
+        if (ach == null) {
+            throw new Error("picture " + this.id + " anchor null, cannot conver to XML");
+        }
+        else {
+            return ach.toXML(xmlDoc, pictureNode);
+        }
     }
 
 }
diff --git a/export/ZipWorker.js b/export/ZipWorker.js
@@ -1,3 +1,4 @@
+"use strict";
 onmessage = function (event) {
     importScripts(event.data.ziplib);
     var zip = new JSZip();
diff --git a/package.json b/package.json
@@ -1,24 +1,23 @@
 {
   "name": "excel-builder-ts",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "TypeScript Port of the excel-builder.js Library - 'A way to build excel files with javascript'",
   "author": "TeamworkGuy2",
   "homepage": "https://github.com/TeamworkGuy2/excel-builder-ts",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/TeamworkGuy2/ts-simplog.git"
+    "url": "https://github.com/TeamworkGuy2/excel-builder-ts.git"
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/chai": "~4.1.2",
-    "@types/mocha": "~5.0.0",
-    "chai": "~4.1.2",
-    "mocha": "~5.0.5",
-    "typescript": "~2.8.0"
+    "@types/chai": "~4.1.6",
+    "@types/mocha": "~5.2.5",
+    "chai": "~4.2.0",
+    "mocha": "~5.2.0",
+    "typescript": "~3.1.3"
   },
   "scripts": {
-    "build-package": "node ../package-tarball/index.js -exclude \\excel-builder-orig\\",
     "test": "mocha -u tdd --recursive",
     "tsc": "tsc"
   }
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,12 +5,10 @@
     "lib": ["es2017", "dom", "dom.iterable"],
     "module": "commonjs",
     "noEmitOnError": true,
-    "noImplicitAny": true,
     "noImplicitReturns": true,
-    "noImplicitThis": true,
     "removeComments": false,
     "sourceMap": false,
-    "strictNullChecks": true,
+    "strict": true,
     "target": "es5"
   }
 }
diff --git a/workbook/Workbook.js b/workbook/Workbook.js
@@ -35,7 +35,15 @@ var Workbook = /** @class */ (function () {
         this.tables = [];
         this.drawings = [];
         this.media = {};
-        this.initialize(config);
+        this.printTitles = {};
+        this.filterDatabases = {};
+        // copy from initialize() to appease TypeScript
+        this.id = Util._uniqueId("Workbook");
+        this.styleSheet = new StyleSheet();
+        this.sharedStrings = new SharedStrings();
+        this.relations = new RelationshipManager();
+        this.relations.addRelation(this.styleSheet, "stylesheet");
+        this.relations.addRelation(this.sharedStrings, "sharedStrings");
     }
     Workbook.prototype.initialize = function (config) {
         this.id = Util._uniqueId("Workbook");
diff --git a/workbook/Workbook.ts b/workbook/Workbook.ts
@@ -71,7 +71,15 @@ class Workbook {
         this.tables = [];
         this.drawings = [];
         this.media = {};
-        this.initialize(config);
+        this.printTitles = {};
+        this.filterDatabases = {};
+        // copy from initialize() to appease TypeScript
+        this.id = Util._uniqueId("Workbook");
+        this.styleSheet = new StyleSheet();
+        this.sharedStrings = new SharedStrings();
+        this.relations = new RelationshipManager();
+        this.relations.addRelation(this.styleSheet, "stylesheet");
+        this.relations.addRelation(this.sharedStrings, "sharedStrings");
     }
 
 
diff --git a/worksheet/SharedStrings.ts b/worksheet/SharedStrings.ts
@@ -50,7 +50,7 @@ class SharedStrings {
 
         while (l--) {
             var clone = template.cloneNode(true);
-            (<XmlDom.XMLNode>clone.firstChild).firstChild.nodeValue = strings[l];
+            (<XmlDom.XMLNode>(<XmlDom.XMLNode>clone.firstChild).firstChild).nodeValue = strings[l];
             sharedStringTable.appendChild(clone);
         }
 
diff --git a/worksheet/Table.js b/worksheet/Table.js
@@ -5,35 +5,25 @@ var Util = require("../util/Util");
  */
 var Table = /** @class */ (function () {
     function Table(config) {
-        var _this = this;
-        var defaults = {
-            autoFilter: null,
-            dataCellStyle: null,
-            dataDfxId: null,
-            displayName: "",
-            headerRowBorderDxfId: null,
-            headerRowCellStyle: null,
-            headerRowCount: 1,
-            headerRowDxfId: null,
-            insertRow: false,
-            insertRowShift: false,
-            name: "",
-            ref: null,
-            sortState: null,
-            styleInfo: {},
-            tableBorderDxfId: null,
-            totalsRowBorderDxfId: null,
-            totalsRowCellStyle: null,
-            totalsRowCount: 0,
-            totalsRowDxfId: null,
-            tableColumns: [],
-        };
-        Object.keys(defaults).forEach(function (key) {
-            if (_this[key] == null) {
-                _this[key] = defaults[key];
-            }
-        });
-        this.initialize(config);
+        this.autoFilter = null;
+        this.displayName = "";
+        this.headerRowBorderDxfId = null;
+        this.headerRowCount = 1;
+        this.headerRowDxfId = null;
+        this.name = "";
+        this.ref = null;
+        this.sortState = null;
+        this.styleInfo = {};
+        this.totalsRowCount = 0;
+        this.tableColumns = [];
+        // copy from intialize() to appease TypeScript
+        this.displayName = Util._uniqueId("Table");
+        this.name = this.displayName;
+        this.id = this.name;
+        this.tableId = this.id.replace("Table", '');
+        if (config != null) {
+            Object.assign(this, config);
+        }
     }
     Table.prototype.initialize = function (config) {
         this.displayName = Util._uniqueId("Table");
diff --git a/worksheet/Table.ts b/worksheet/Table.ts
@@ -34,34 +34,25 @@ class Table {
 
 
     constructor(config?: any) {
-        var defaults = {
-            autoFilter: <[[number, number], [number, number]]><any>null,
-            dataCellStyle: <any>null,
-            dataDfxId: <any>null,
-            displayName: "",
-            headerRowBorderDxfId: <string><any>null,
-            headerRowCellStyle: <any>null,
-            headerRowCount: 1,
-            headerRowDxfId: <string | number><any>null,
-            insertRow: false,
-            insertRowShift: false,
-            name: "",
-            ref: <[[number, number], [number, number]]><any>null,
-            sortState: <SortState><any>null,
-            styleInfo: {},
-            tableBorderDxfId: <any>null,
-            totalsRowBorderDxfId: <any>null,
-            totalsRowCellStyle: <any>null,
-            totalsRowCount: 0,
-            totalsRowDxfId: <any>null,
-            tableColumns: <{ name: string; [prop: string]: any; }[]>[],
-        };
-        (<(keyof typeof defaults)[]>Object.keys(defaults)).forEach((key) => {
-            if ((<any>this)[key] == null) {
-                (<any>this)[key] = defaults[key];
-            }
-        });
-        this.initialize(config);
+        this.autoFilter = <[[number, number], [number, number]]><any>null;
+        this.displayName = "";
+        this.headerRowBorderDxfId = <string><any>null;
+        this.headerRowCount = 1;
+        this.headerRowDxfId = <string | number><any>null;
+        this.name = "";
+        this.ref = <[[number, number], [number, number]]><any>null;
+        this.sortState = <SortState><any>null;
+        this.styleInfo = {};
+        this.totalsRowCount = 0;
+        this.tableColumns = <{ name: string; [prop: string]: any; }[]>[];
+        // copy from intialize() to appease TypeScript
+        this.displayName = Util._uniqueId("Table");
+        this.name = this.displayName;
+        this.id = this.name;
+        this.tableId = this.id.replace("Table", '');
+        if (config != null) {
+            Object.assign(this, config);
+        }
     }
 
 
diff --git a/worksheet/Worksheet.js b/worksheet/Worksheet.js
@@ -20,6 +20,9 @@ var Worksheet = /** @class */ (function () {
         this._footers = [];
         this._tables = [];
         this._drawings = [];
+        this._orientation = null;
+        this._margin = null;
+        this.sharedStrings = { strings: {} };
         // A two dimensional array of objects with custom XML attributes to add this worksheet's cells
         // for example an object { style: 12b } at index [1][2] would add a {@code style="12b"} attribute to cell 'C2'
         this.customCellAttributes = [];
@@ -29,14 +32,11 @@ var Worksheet = /** @class */ (function () {
         // The ID and settings for pageMargins and pageSetup
         this._printerSettings;
         // An array of attributes to apply to the 'pageMargins' element of the spreadsheet
-        this.pageMargins;
+        this.pageMargins = null;
         // An array of attributes (only "ref" Ex: "A1:D1" for now) to apply to the autoFilter element of the spreadsheet
-        this.autoFilter;
+        this.autoFilter = null;
         // An array of attributes to apply to the 'pageSetup' element of the spreadsheet
-        this.pageSetup;
-        this.initialize(config);
-    }
-    Worksheet.prototype.initialize = function (config) {
+        this.pageSetup = null;
         var cfg = (config != null ? config : {});
         this.name = cfg.name;
         this.id = Util._uniqueId("Worksheet");
@@ -45,7 +45,7 @@ var Worksheet = /** @class */ (function () {
             this.setColumns(cfg.columns);
         }
         this.relations = new RelationshipManager();
-    };
+    }
     /** Returns an object that can be consumed by a WorksheetExportWorker
      * @returns export ready data object containing this worksheet's data
      */
diff --git a/worksheet/Worksheet.ts b/worksheet/Worksheet.ts
diff --git a/xml/XmlDom.js b/xml/XmlDom.js
diff --git a/xml/XmlDom.ts b/xml/XmlDom.ts

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+"use strict";`
`1`	`2`	`onmessage = function (event) {`
`2`	`3`	`importScripts(event.data.ziplib);`
`3`	`4`	`var zip = new JSZip();`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,10 @@`
`5`	`5`	`"lib": ["es2017", "dom", "dom.iterable"],`
`6`	`6`	`"module": "commonjs",`
`7`	`7`	`"noEmitOnError": true,`
`8`		`- "noImplicitAny": true,`
`9`	`8`	`"noImplicitReturns": true,`
`10`		`- "noImplicitThis": true,`
`11`	`9`	`"removeComments": false,`
`12`	`10`	`"sourceMap": false,`
`13`		`- "strictNullChecks": true,`
	`11`	`+ "strict": true,`
`14`	`12`	`"target": "es5"`
`15`	`13`	`}`
`16`	`14`	`}`