node-xlsx - npm Package Compare versions

Comparing version 0.2.2 to 0.3.0

lib/node-xlsx.js

 'use strict';
 
-var debug = require('debug')('node-xlsx'),
-    fs = require('fs'),
-    vm = require('vm');
+var debug = require('debug')('node-xlsx');
+var fs = require('fs');
+var xlsx = require(__dirname + '/xlsx/xlsx.js');
 
-var sandbox = vm.createContext();
-var loadVendor = function(fileName) {
-    vm.runInNewContext(fs.readFileSync(__dirname + '/' + fileName), sandbox, fileName);
-};
-loadVendor('jszip/jszip.js');
-loadVendor('jszip/jszip-deflate.js');
-loadVendor('jszip/jszip-inflate.js');
-loadVendor('jszip/jszip-load.js');
-loadVendor('xlsx/xlsx.js');
-
 module.exports = {
@@ -21,6 +11,6 @@ parse: function(mixed) {
     debug('parsed a %d-sized xml', mixed.length);
-    return sandbox.xlsx(mixed.toString('base64'));
+    return xlsx(mixed.toString('base64'));
   },
   build: function(object) {
-    var data = sandbox.xlsx(object); // [ 'base64', 'zipTime', 'processTime', 'href' ]
+    var data = xlsx(object); // [ 'base64', 'zipTime', 'processTime', 'href' ]
     if(!data.base64) return false;
@@ -27,0 +17,0 @@ var buffer = new Buffer(data.base64, 'base64');

lib/xlsx/xlsx.js

@@ -0,1 +1,6 @@
+var JSZip = null
+if (typeof require === 'function') {
+	JSZip = require('node-zip');
+}
+
 //----------------------------------------------------------
@@ -6,17 +11,44 @@ // Copyright (C) Microsoft Corporation. All rights reserved.
 //----------------------------------------------------------
-function xlsx(file) { 'use strict'; // v2.2.0
-	var result, zip = new JSZip(), zipTime, processTime, s, f, i, j, k, l, t, w, sharedStrings, styles, index, data, val, style,
-		docProps, xl, xlWorksheets, worksheet, contentTypes = [[], []], props = [], xlRels = [], worksheets = [], id, columns, cell, row,
+function xlsx(file) { 
+	'use strict'; // v2.3.0
+
+	var defaultFontName = 'Calibri';
+	var defaultFontSize = 11;
+
+	var result, zip = new JSZip(), zipTime, processTime, s, f, i, j, k, l, t, w, sharedStrings, styles, index, data, val, style, borders, border, borderIndex, fonts, font, fontIndex,
+		docProps, xl, xlWorksheets, worksheet, contentTypes = [[], []], props = [], xlRels = [], worksheets = [], id, columns, cols, colWidth, cell, row, merges, merged,
 		numFmts = ['General', '0', '0.00', '#,##0', '#,##0.00',,,,, '0%', '0.00%', '0.00E+00', '# ?/?', '# ??/??', 'mm-dd-yy', 'd-mmm-yy', 'd-mmm', 'mmm-yy', 'h:mm AM/PM', 'h:mm:ss AM/PM',
 			'h:mm', 'h:mm:ss', 'm/d/yy h:mm',,,,,,,,,,,,,,, '#,##0 ;(#,##0)', '#,##0 ;[Red](#,##0)', '#,##0.00;(#,##0.00)', '#,##0.00;[Red](#,##0.00)',,,,, 'mm:ss', '[h]:mm:ss', 'mmss.0', '##0.0E+0', '@'],
 		alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	function numAlpha(i) { var t = Math.floor(i / 26) - 1; return (t > -1 ? numAlpha(t) : '') + alphabet.charAt(i % 26); }
-	function alphaNum(s) { var t = 0; if (s.length === 2) { t = alphaNum(s.charAt(0)) + 1; } return t * 26 + alphabet.indexOf(s.substr(-1)); }
-	function convertDate(input) { return typeof input === 'object' ? ((input - new Date(1900, 0, 0)) / 86400000) + 1 : new Date(+new Date(1900, 0, 0) + (input - 1) * 86400000); }
-	function typeOf(obj) { return ({}).toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase(); }
-	function getAttr(s, n) { s = s.substr(s.indexOf(n + '="') + n.length + 2); return s.substring(0, s.indexOf('"')); }
-	function escapeXML(s) { return (s || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;'); } // see http://www.w3.org/TR/xml/#syntax
-	function unescapeXML(s) { return (s || '').replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#x27;/g, '\''); }
 
-    if (typeof file === 'string') { // Load
+	function numAlpha(i) { 
+		var t = Math.floor(i / 26) - 1; return (t > -1 ? numAlpha(t) : '') + alphabet.charAt(i % 26); 
+	}
+
+	function alphaNum(s) { 
+		var t = 0; if (s.length === 2) { t = alphaNum(s.charAt(0)) + 1; } return t * 26 + alphabet.indexOf(s.substr(-1)); 
+	}
+
+	function convertDate(input) { 
+		return typeof input === 'object' ? ((input - new Date(1900, 0, 0)) / 86400000) + 1 : new Date(+new Date(1900, 0, 0) + (input - 1) * 86400000); 
+	}
+
+	function typeOf(obj) {
+		return ({}).toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+	}
+	
+	function getAttr(s, n) { 
+		s = s.substr(s.indexOf(n + '="') + n.length + 2); return s.substring(0, s.indexOf('"')); 
+	}
+	
+	function escapeXML(s) { 
+		return (s || '').replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;'); 
+	} // see http://www.w3.org/TR/xml/#syntax
+	
+	function unescapeXML(s) { 
+		return (s || '').replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#x27;/g, '\''); 
+	}
+
+   if (typeof file === 'string') { 
+   	// Load
 		zipTime = Date.now();
@@ -27,203 +59,404 @@ zip = zip.load(file, { base64: true });
 
-		//{ Process sharedStrings
-			sharedStrings = []; s = zip.file('xl/sharedStrings.xml');
-			if (s) {
-				s = s.asText().split(/<t.*?>/g); i = s.length;
-				while(--i) { sharedStrings[i - 1] = unescapeXML(s[i].substring(0, s[i].indexOf('</t>'))); } // Do not process i === 0, because s[0] is the text before first t element
+		// Process sharedStrings
+		sharedStrings = []; s = zip.file('xl/sharedStrings.xml');
+		if (s) {
+			s = s.asText().split(/<t.*?>/g); i = s.length;
+			while(--i) { sharedStrings[i - 1] = unescapeXML(s[i].substring(0, s[i].indexOf('</t>'))); } // Do not process i === 0, because s[0] is the text before first t element
+		}
+
+		// Get file info from "docProps/core.xml"
+		s = zip.file('docProps/core.xml').asText();
+		s = s.substr(s.indexOf('<dc:creator>') + 12);
+		result.creator = s.substring(0, s.indexOf('</dc:creator>'));
+		s = s.substr(s.indexOf('<cp:lastModifiedBy>') + 19);
+		result.lastModifiedBy = s.substring(0, s.indexOf('</cp:lastModifiedBy>'));
+		s = s.substr(s.indexOf('<dcterms:created xsi:type="dcterms:W3CDTF">') + 43);
+		result.created = new Date(s.substring(0, s.indexOf('</dcterms:created>')));
+		s = s.substr(s.indexOf('<dcterms:modified xsi:type="dcterms:W3CDTF">') + 44);
+		result.modified = new Date(s.substring(0, s.indexOf('</dcterms:modified>')));
+
+		// Get workbook info from "xl/workbook.xml" - Worksheet names exist in other places, but "activeTab" attribute must be gathered from this file anyway
+		s = zip.file('xl/workbook.xml').asText(); index = s.indexOf('activeTab="');
+		if (index > 0) {
+			s = s.substr(index + 11); 
+			// Must eliminate first 11 characters before finding the index of " on the next line. Otherwise, it finds the " before the value.
+			result.activeWorksheet = +s.substring(0, s.indexOf('"'));
+		} else { 
+			result.activeWorksheet = 0; 
+		}
+		s = s.split('<sheet '); i = s.length;
+		while (--i) { // Do not process i === 0, because s[0] is the text before the first sheet element
+			id = s[i].substr(s[i].indexOf('name="') + 6);
+			result.worksheets.unshift({ name: id.substring(0, id.indexOf('"')), data: [] });
+		}
+
+		// Get style info from "xl/styles.xml"
+		styles = [];
+		s = zip.file('xl/styles.xml').asText().split('<numFmt '); i = s.length;
+		while (--i) { 
+			t = s[i]; numFmts[+getAttr(t, 'numFmtId')] = getAttr(t, 'formatCode'); 
+		}
+		s = s[s.length - 1]; s = s.substr(s.indexOf('cellXfs')).split('<xf '); i = s.length;
+		while (--i) {
+			id = getAttr(s[i], 'numFmtId'); f = numFmts[id];
+			if (f.indexOf('m') > -1) {
+				t = 'date'; 
+			} else if (f.indexOf('0') > -1) { 
+				t = 'number'; 
+			} else if (f === '@') { 
+				t = 'string'; 
+			} else { 
+				t = 'unknown'; 
 			}
-		//}
+			styles.unshift({ formatCode: f, type: t });
+		}
 
-		//{ Get file info from "docProps/core.xml"
-			s = zip.file('docProps/core.xml').asText();
-			s = s.substr(s.indexOf('<dc:creator>') + 12);
-			result.creator = s.substring(0, s.indexOf('</dc:creator>'));
-			s = s.substr(s.indexOf('<cp:lastModifiedBy>') + 19);
-			result.lastModifiedBy = s.substring(0, s.indexOf('</cp:lastModifiedBy>'));
-			s = s.substr(s.indexOf('<dcterms:created xsi:type="dcterms:W3CDTF">') + 43);
-			result.created = new Date(s.substring(0, s.indexOf('</dcterms:created>')));
-			s = s.substr(s.indexOf('<dcterms:modified xsi:type="dcterms:W3CDTF">') + 44);
-			result.modified = new Date(s.substring(0, s.indexOf('</dcterms:modified>')));
-		//}
-		//{ Get workbook info from "xl/workbook.xml" - Worksheet names exist in other places, but "activeTab" attribute must be gathered from this file anyway
-			s = zip.file('xl/workbook.xml').asText(); index = s.indexOf('activeTab="');
-			if (index > 0) {
-				s = s.substr(index + 11); // Must eliminate first 11 characters before finding the index of " on the next line. Otherwise, it finds the " before the value.
-				result.activeWorksheet = +s.substring(0, s.indexOf('"'));
-			}
-			else { result.activeWorksheet = 0; }
-			s = s.split('<sheet '); i = s.length;
-			while (--i) { // Do not process i === 0, because s[0] is the text before the first sheet element
-				id = s[i].substr(s[i].indexOf('name="') + 6);
-				result.worksheets.unshift({ name: id.substring(0, id.indexOf('"')), data: [] });
-			}
-		//}
-		//{ Get style info from "xl/styles.xml"
-			styles = [];
-			s = zip.file('xl/styles.xml').asText().split('<numFmt '); i = s.length;
-			while (--i) { t = s[i]; numFmts[+getAttr(t, 'numFmtId')] = getAttr(t, 'formatCode'); }
-			s = s[s.length - 1]; s = s.substr(s.indexOf('cellXfs')).split('<xf '); i = s.length;
-			while (--i) {
-				id = getAttr(s[i], 'numFmtId'); f = numFmts[id];
-				if (f.indexOf('m') > -1) { t = 'date'; }
-				else if (f.indexOf('0') > -1) { t = 'number'; }
-				else if (f === '@') { t = 'string'; }
-				else { t = 'unknown'; }
-				styles.unshift({ formatCode: f, type: t });
-			}
-		//}
-		//{ Get worksheet info from "xl/worksheets/sheetX.xml"
-			i = result.worksheets.length;
-			while (i--) {
-				s = zip.file('xl/worksheets/sheet' + (i + 1) + '.xml' ).asText().split('<row ');
-				w = result.worksheets[i];
-				w.table = s[0].indexOf('<tableParts ') > 0;
-				t = getAttr(s[0].substr(s[0].indexOf('<dimension')), 'ref');
-				t = t.substr(t.indexOf(':') + 1);
-				w.maxCol = alphaNum(t.match(/[a-zA-Z]*/g)[0]) + 1;
-				w.maxRow = +t.match(/\d*/g).join('');
-				w = w.data;
-				j = s.length;
-				while (--j) { // Don't process j === 0, because s[0] is the text before the first row element
-					row = w[+getAttr(s[j], 'r') - 1] = [];
-					columns = s[j].split('<c ');
-					k = columns.length;
-					while (--k) { // Don't process l === 0, because k[0] is the text before the first c (cell) element
-						cell = columns[k];
-						f = styles[+getAttr(cell, 's')] || { type: 'General', formatCode: 'General' };
-						t = getAttr(cell, 't') || f.type;
-						val = cell.substring(cell.indexOf('<v>') + 3, cell.indexOf('</v>'));
-						val = val ? +val : ''; // turn non-zero into number
-						switch (t) {
-							case 's': val = sharedStrings[val]; break;
-							case 'b': val = val === 1; break;
-							case 'date': val = convertDate(val); break;
-						}
-						row[alphaNum(getAttr(cell, 'r').match(/[a-zA-Z]*/g)[0])] = { value: val, formatCode: f.formatCode };
+		// Get worksheet info from "xl/worksheets/sheetX.xml"
+		i = result.worksheets.length;
+		while (i--) {
+			s = zip.file('xl/worksheets/sheet' + (i + 1) + '.xml' ).asText().split('<row ');
+			w = result.worksheets[i];
+			w.table = s[0].indexOf('<tableParts ') > 0;
+			t = getAttr(s[0].substr(s[0].indexOf('<dimension')), 'ref');
+			t = t.substr(t.indexOf(':') + 1);
+			w.maxCol = alphaNum(t.match(/[a-zA-Z]*/g)[0]) + 1;
+			w.maxRow = +t.match(/\d*/g).join('');
+			w = w.data;
+			j = s.length;
+			while (--j) { // Don't process j === 0, because s[0] is the text before the first row element
+				row = w[+getAttr(s[j], 'r') - 1] = [];
+				columns = s[j].split('<c ');
+				k = columns.length;
+				while (--k) { // Don't process l === 0, because k[0] is the text before the first c (cell) element
+					cell = columns[k];
+					f = styles[+getAttr(cell, 's')] || { type: 'General', formatCode: 'General' };
+					t = getAttr(cell, 't') || f.type;
+					val = cell.substring(cell.indexOf('<v>') + 3, cell.indexOf('</v>'));
+					val = val ? +val : ''; // turn non-zero into number
+					switch (t) {
+						case 's': val = sharedStrings[val]; break;
+						case 'b': val = val === 1; break;
+						case 'date': val = convertDate(val); break;
 					}
+					row[alphaNum(getAttr(cell, 'r').match(/[a-zA-Z]*/g)[0])] = { value: val, formatCode: f.formatCode };
 				}
 			}
-		//}
+		}
+
 		result.processTime = Date.now() - processTime;
-	}
-	else { // Save
+
+	} else {
+		// Save
 		processTime = Date.now();
 		sharedStrings = [[], 0];
-		//{ Fully static
-			zip.folder('_rels').file('.rels', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/></Relationships>');
-			docProps = zip.folder('docProps');
+		// Fully static
+		zip.folder('_rels').file('.rels', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/></Relationships>');
+		docProps = zip.folder('docProps');
 
-			xl = zip.folder('xl');
-			xl.folder('theme').file('theme1.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D"/></a:dk2><a:lt2><a:srgbClr val="EEECE1"/></a:lt2><a:accent1><a:srgbClr val="4F81BD"/></a:accent1><a:accent2><a:srgbClr val="C0504D"/></a:accent2><a:accent3><a:srgbClr val="9BBB59"/></a:accent3><a:accent4><a:srgbClr val="8064A2"/></a:accent4><a:accent5><a:srgbClr val="4BACC6"/></a:accent5><a:accent6><a:srgbClr val="F79646"/></a:accent6><a:hlink><a:srgbClr val="0000FF"/></a:hlink><a:folHlink><a:srgbClr val="800080"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="MS P????"/><a:font script="Hang" typeface="?? ??"/><a:font script="Hans" typeface="??"/><a:font script="Hant" typeface="????"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/></a:majorFont><a:minorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="MS P????"/><a:font script="Hang" typeface="?? ??"/><a:font script="Hans" typeface="??"/><a:font script="Hant" typeface="????"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:shade val="51000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="80000"><a:schemeClr val="phClr"><a:shade val="93000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="94000"/><a:satMod val="135000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>');
-			xlWorksheets = xl.folder('worksheets');
-		//}
-		//{ Not content dependent
-			docProps.file('core.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:creator>'
-				+ (file.creator || 'XLSX.js') + '</dc:creator><cp:lastModifiedBy>' + (file.lastModifiedBy || 'XLSX.js') + '</cp:lastModifiedBy><dcterms:created xsi:type="dcterms:W3CDTF">'
-				+ (file.created || new Date()).toISOString() + '</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">' + (file.modified || new Date()).toISOString() + '</dcterms:modified></cp:coreProperties>');
-		//}
-		//{ Content dependent
-            styles = new Array(1);
-			w = file.worksheets.length;
-			while (w--) { // Generate worksheet (gather sharedStrings), and possibly table files, then generate entries for constant files below
-				id = w + 1;
-				//{ Generate sheetX.xml in var s
-					worksheet = file.worksheets[w]; data = worksheet.data;
-					s = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">'
-						+ '<dimension ref="A1:' + numAlpha(data[0].length - 1) + data.length + '"/><sheetViews><sheetView ' + (w === file.activeWorksheet ? 'tabSelected="1" ' : '')
-						+ ' workbookViewId="0"/></sheetViews><sheetFormatPr defaultRowHeight="15" x14ac:dyDescent="0.25"/><sheetData>';
+		xl = zip.folder('xl');
+		xl.folder('theme').file('theme1.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D"/></a:dk2><a:lt2><a:srgbClr val="EEECE1"/></a:lt2><a:accent1><a:srgbClr val="4F81BD"/></a:accent1><a:accent2><a:srgbClr val="C0504D"/></a:accent2><a:accent3><a:srgbClr val="9BBB59"/></a:accent3><a:accent4><a:srgbClr val="8064A2"/></a:accent4><a:accent5><a:srgbClr val="4BACC6"/></a:accent5><a:accent6><a:srgbClr val="F79646"/></a:accent6><a:hlink><a:srgbClr val="0000FF"/></a:hlink><a:folHlink><a:srgbClr val="800080"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="MS P????"/><a:font script="Hang" typeface="?? ??"/><a:font script="Hans" typeface="??"/><a:font script="Hant" typeface="????"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/></a:majorFont><a:minorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="MS P????"/><a:font script="Hang" typeface="?? ??"/><a:font script="Hans" typeface="??"/><a:font script="Hant" typeface="????"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:shade val="51000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="80000"><a:schemeClr val="phClr"><a:shade val="93000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="94000"/><a:satMod val="135000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>');
+		xlWorksheets = xl.folder('worksheets');
 
-					i = -1; l = data.length;
-					while (++i < l) {
-						j = -1; k = data[i].length;
-						s += '<row r="' + (i + 1) + '" x14ac:dyDescent="0.25">';
-						while (++j < k) {
-							cell = data[i][j]; val = cell.hasOwnProperty('value') ? cell.value : cell; t = ''; style = cell.formatCode !== 'General' ? cell.formatCode : '';
-							if (val && typeof val === 'string' && !isFinite(val)) { // If value is string, and not string of just a number, place a sharedString reference instead of the value
-                                val = escapeXML(val);
-								sharedStrings[1]++; // Increment total count, unique count derived from sharedStrings[0].length
-								index = sharedStrings[0].indexOf(val);
-								if (index < 0) { index = sharedStrings[0].push(val) - 1; }
-								val = index;
-								t = 's';
+		// Not content dependent
+		docProps.file('core.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:creator>'
+			+ (file.creator || 'XLSX.js') + '</dc:creator><cp:lastModifiedBy>' + (file.lastModifiedBy || 'XLSX.js') + '</cp:lastModifiedBy><dcterms:created xsi:type="dcterms:W3CDTF">'
+			+ (file.created || new Date()).toISOString() + '</dcterms:created><dcterms:modified xsi:type="dcterms:W3CDTF">' + (file.modified || new Date()).toISOString() + '</dcterms:modified></cp:coreProperties>');
+
+		// Content dependent
+    styles = new Array(1);
+    borders = new Array(1);
+    fonts = new Array(1);
+		w = file.worksheets.length;
+		while (w--) { 
+			// Generate worksheet (gather sharedStrings), and possibly table files, then generate entries for constant files below
+			id = w + 1;
+			// Generate sheetX.xml in var s
+			worksheet = file.worksheets[w]; data = worksheet.data;
+			s = '';
+			columns = [];
+    	merges = [];
+			i = -1; l = data.length;
+			while (++i < l) {
+				j = -1; k = data[i].length;
+				s += '<row r="' + (i + 1) + '" x14ac:dyDescent="0.25">';
+				while (++j < k) {
+					cell = data[i][j]; val = cell.hasOwnProperty('value') ? cell.value : cell; t = ''; 
+					// supported styles: borders, hAlign, formatCode and font style
+					style = {
+						borders: cell.borders, 
+						hAlign: cell.hAlign,
+						vAlign: cell.vAlign,
+						bold: cell.bold,
+						italic: cell.italic,
+						fontName: cell.fontName,
+						fontSize: cell.fontSize,
+						formatCode: cell.formatCode || 'General'
+					};
+					colWidth = 0;
+					if (val && typeof val === 'string' && !isFinite(val)) { 
+						// If value is string, and not string of just a number, place a sharedString reference instead of the value
+            val = escapeXML(val);
+						sharedStrings[1]++; // Increment total count, unique count derived from sharedStrings[0].length
+						index = sharedStrings[0].indexOf(val);
+						colWidth = val.length;
+						if (index < 0) {
+						 	index = sharedStrings[0].push(val) - 1; 
+						}
+						val = index;
+						t = 's';
+					} else if (typeof val === 'boolean') { 
+						val = (val ? 1 : 0); t = 'b'; 
+						colWidth = 1;
+					} else if (typeOf(val) === 'date') { 
+						val = convertDate(val); 
+						style.formatCode = cell.formatCode || 'mm-dd-yy'; 
+						colWidth = val.length;
+					} else if (typeof val === 'object') {
+						// unsupported value
+						val = null
+					} else {
+						// number, or string which is a number 
+						colWidth = (''+val).length;
+					}
+					
+					// use stringified version as unic and reproductible style signature
+					style = JSON.stringify(style);
+					index = styles.indexOf(style);
+					if (index < 0) { 
+						style = styles.push(style) - 1; 
+					} else { 
+						style = index; 
+					}
+					// keeps largest cell in column, and autoWidth flag that may be set on any cell
+					if (columns[j] == null) {
+						columns[j] = {autoWidth: false, max:0};
+					}
+					if (cell.autoWidth) {
+						columns[j].autoWidth = true
+					}
+					if (colWidth > columns[j].max) {
+						columns[j].max = colWidth;
+					}
+					// store merges if needed and add missing cells. Cannot have rowSpan AND colSpan
+					if (cell.colSpan > 1) {
+						// horizontal merge. ex: B12:E12. Add missing cells (with same attribute but value) to current row
+						merges.push([numAlpha(j) + (i + 1), numAlpha(j+cell.colSpan-1) + (i + 1)]);
+						merged = [j, 0]
+						for (var m = 0; m < cell.colSpan-1; m++) {
+							merged.push(cell);
+						}
+						data[i].splice.apply(data[i], merged);
+						k += cell.colSpan-1;
+					} else if (cell.rowSpan > 1) {
+						// vertical merge. ex: B12:B15. Add missing cells (with same attribute but value) to next columns
+						for (var m = 1; m < cell.rowSpan; m++) {
+							if (data[i+m]) {
+								data[i+m].splice(j, 0, cell)
+							} else {
+								// readh the end of data
+								cell.rowSpan = m;
+								break;
 							}
-							else if (typeof val === 'boolean') { val = (val ? 1 : 0); t = 'b'; }
-							else if (typeOf(val) === 'date') { val = convertDate(val); style = style || 'mm-dd-yy'; }
-							if (style) {
-								index = styles.indexOf(style);
-								if (index < 0) { style = styles.push(style) - 1; }
-								else { style = index; }
-							}
-							s += '<c r="' + numAlpha(j) + (i + 1) + '"' + (style ? ' s="' + style + '"' : '') + (t ? ' t="' + t + '"' : '') + '>'
-								+ (cell.formula ? '<f>' + cell.formula + '</f>' : '') + '<v>' + val + '</v></c>';
 						}
-						s += '</row>';
+						merges.push([numAlpha(j) + (i + 1), numAlpha(j) + (i + cell.rowSpan)]);
 					}
-					s += '</sheetData><pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>';
-					if (worksheet.table) { s += '<tableParts count="1"><tablePart r:id="rId1"/></tableParts>'; }
-					xlWorksheets.file('sheet' + id + '.xml', s + '</worksheet>');
-				//}
+					if (cell.rowSpan > 1 ||cell.colSpan > 1) {
+						// deletes value, rowSpan and colSpan from cell to avoid refering it from copied cells
+						delete cell.value;
+						delete cell.rowSpan;
+						delete cell.colSpan;
+					}
+					s += '<c r="' + numAlpha(j) + (i + 1) + '"' + (style ? ' s="' + style + '"' : '') + (t ? ' t="' + t + '"' : '');
+					if (val != null) {
+						s += '>' + (cell.formula ? '<f>' + cell.formula + '</f>' : '') + '<v>' + val + '</v></c>';
+					} else {
+						s += '/>';
+					}
+				}
+				s += '</row>';
+			}
 
-				if (worksheet.table) {
-					i = -1; l = data[0].length; t = numAlpha(data[0].length - 1) + data.length;
-					s = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" id="' + id
-						+ '" name="Table' + id + '" displayName="Table' + id + '" ref="A1:' + t + '" totalsRowShown="0"><autoFilter ref="A1:' + t + '"/><tableColumns count="' + data[0].length + '">';
-					while (++i < l) { s += '<tableColumn id="' + (i + 1) + '" name="' + data[0][i] + '"/>'; }
-					s += '</tableColumns><tableStyleInfo name="TableStyleMedium2" showFirstColumn="0" showLastColumn="0" showRowStripes="1" showColumnStripes="0"/></table>';
+			cols = []
+			for (i = 0; i < columns.length; i++) {
+				if (columns[i].autoWidth) {
+					cols.push('<col min="', i+1, '" max="', i+1, '" width="', columns[i].max, '" bestFit="1"/>');
+				}
+			}
+			// only add cols definition if not empty
+			if (cols.length > 0) {
+				cols = ['<cols>'].concat(cols, ['</cols>']).join('');
+			}
 
-					xl.folder('tables').file('table' + id + '.xml', s);
-					xlWorksheets.folder('_rels').file('sheet' + id + '.xml.rels', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/table" Target="../tables/table' + id + '.xml"/></Relationships>');
-					contentTypes[1].unshift('<Override PartName="/xl/tables/table' + id + '.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"/>');
+			s = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">'
+				+ '<dimension ref="A1:' + numAlpha(data[0].length - 1) + data.length + '"/><sheetViews><sheetView ' + (w === file.activeWorksheet ? 'tabSelected="1" ' : '')
+				+ ' workbookViewId="0"/></sheetViews><sheetFormatPr defaultRowHeight="15" x14ac:dyDescent="0.25"/>'
+				+ cols
+				+ '<sheetData>'
+				+ s 
+				+ '</sheetData>';
+			if (merges.length > 0) {
+				s += '<mergeCells count="' + merges.length + '">';
+				for (i = 0; i < merges.length; i++) {
+					s += '<mergeCell ref="' + merges[i].join(':') + '"/>';
 				}
+				s += '</mergeCells>';
+			}
+			s += '<pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>';
+			if (worksheet.table) { 
+				s += '<tableParts count="1"><tablePart r:id="rId1"/></tableParts>'; 
+			}
+			xlWorksheets.file('sheet' + id + '.xml', s + '</worksheet>');
 
-				contentTypes[0].unshift('<Override PartName="/xl/worksheets/sheet' + id + '.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>');
-				props.unshift(escapeXML(worksheet.name) || 'Sheet' + id);
-				xlRels.unshift('<Relationship Id="rId' + id + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet' + id + '.xml"/>');
-				worksheets.unshift('<sheet name="' + (escapeXML(worksheet.name) || 'Sheet' + id) + '" sheetId="' + id + '" r:id="rId' + id + '"/>');
+			if (worksheet.table) {
+				i = -1; l = data[0].length; t = numAlpha(data[0].length - 1) + data.length;
+				s = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" id="' + id
+					+ '" name="Table' + id + '" displayName="Table' + id + '" ref="A1:' + t + '" totalsRowShown="0"><autoFilter ref="A1:' + t + '"/><tableColumns count="' + data[0].length + '">';
+				while (++i < l) { 
+					s += '<tableColumn id="' + (i + 1) + '" name="' + (data[0][i].hasOwnProperty('value') ? data[0][i].value : data[0][i]) + '"/>'; 
+				}
+				s += '</tableColumns><tableStyleInfo name="TableStyleMedium2" showFirstColumn="0" showLastColumn="0" showRowStripes="1" showColumnStripes="0"/></table>';
+
+				xl.folder('tables').file('table' + id + '.xml', s);
+				xlWorksheets.folder('_rels').file('sheet' + id + '.xml.rels', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/table" Target="../tables/table' + id + '.xml"/></Relationships>');
+				contentTypes[1].unshift('<Override PartName="/xl/tables/table' + id + '.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"/>');
 			}
 
-			//{ xl/styles.xml
-				i = styles.length; t = [];
-				while (--i) { // Don't process index 0, already added
-					index = numFmts.indexOf(styles[i]);
-					if (index < 0) { index = 164 + t.length; t.push('<numFmt formatCode="' + styles[i] + '" numFmtId="' + index + '"/>'); }
-					styles[i] = '<xf numFmtId="' + index + '" borderId="0" fillId="0" fontId="0" xfId="0" applyNumberFormat="1"/>';
+			contentTypes[0].unshift('<Override PartName="/xl/worksheets/sheet' + id + '.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>');
+			props.unshift(escapeXML(worksheet.name) || 'Sheet' + id);
+			xlRels.unshift('<Relationship Id="rId' + id + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet' + id + '.xml"/>');
+			worksheets.unshift('<sheet name="' + (escapeXML(worksheet.name) || 'Sheet' + id) + '" sheetId="' + id + '" r:id="rId' + id + '"/>');
+		}
+
+		// xl/styles.xml
+		i = styles.length; t = [];
+		while (--i) { 
+			// Don't process index 0, already added
+			style = JSON.parse(styles[i]);
+
+			// cell formating, refer to it if necessary
+			if (style.formatCode !== 'General') {
+				index = numFmts.indexOf(style.formatCode);
+				if (index < 0) { 
+					index = 164 + t.length; 
+					t.push('<numFmt formatCode="' + style.formatCode + '" numFmtId="' + index + '"/>'); 
 				}
-				t = t.length ? '<numFmts count="' + t.length + '">' + t.join('') + '</numFmts>' : '';
-				xl.file('styles.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">'
-					+ t + '<fonts count="1" x14ac:knownFonts="1"><font><sz val="11"/><color theme="1"/><name val="Calibri"/><family val="2"/>'
-					+ '<scheme val="minor"/></font></fonts><fills count="2"><fill><patternFill patternType="none"/></fill><fill><patternFill patternType="gray125"/></fill></fills>'
-					+ '<borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders><cellStyleXfs count="1">'
-					+ '<xf numFmtId="0" fontId="0" fillId="0" borderId="0"/></cellStyleXfs><cellXfs count="' + styles.length + '"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>'
-					+ styles.join('') + '</cellXfs><cellStyles count="1"><cellStyle name="Normal" xfId="0" builtinId="0"/></cellStyles><dxfs count="0"/>'
-					+ '<tableStyles count="0" defaultTableStyle="TableStyleMedium2" defaultPivotStyle="PivotStyleLight16"/>'
-					+ '<extLst><ext uri="{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main">'
-					+ '<x14:slicerStyles defaultSlicerStyle="SlicerStyleLight1"/></ext></extLst></styleSheet>');
-			//}
-			//{ [Content_Types].xml
-				zip.file('[Content_Types].xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>'
-					+ contentTypes[0].join('') + '<Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/><Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>'
-					+ contentTypes[1].join('') + '<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/></Types>');
-			//}
-			//{ docProps/app.xml
-				docProps.file('app.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><Application>XLSX.js</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="2" baseType="variant"><vt:variant><vt:lpstr>Worksheets</vt:lpstr></vt:variant><vt:variant><vt:i4>'
-					+ file.worksheets.length + '</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="' + props.length + '" baseType="lpstr"><vt:lpstr>' + props.join('</vt:lpstr><vt:lpstr>')
-					+ '</vt:lpstr></vt:vector></TitlesOfParts><Manager></Manager><Company>Microsoft Corporation</Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>1.0</AppVersion></Properties>');
-			//}
-			//{ xl/_rels/workbook.xml.rels
-				xl.folder('_rels').file('workbook.xml.rels', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">'
-					+ xlRels.join('') + '<Relationship Id="rId' + (xlRels.length + 1) + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>'
-					+ '<Relationship Id="rId' + (xlRels.length + 2) + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>'
-					+ '<Relationship Id="rId' + (xlRels.length + 3) + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/></Relationships>');
-			//}
-			//{ xl/sharedStrings.xml
-				xl.file('sharedStrings.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="'
-					+ sharedStrings[1] + '" uniqueCount="' + sharedStrings[0].length + '"><si><t>' + sharedStrings[0].join('</t></si><si><t>') + '</t></si></sst>');
-			//}
-			//{ xl/workbook.xml
-				xl.file('workbook.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">'
-					+ '<fileVersion appName="xl" lastEdited="5" lowestEdited="5" rupBuild="9303"/><workbookPr defaultThemeVersion="124226"/><bookViews><workbookView '
-					+ (file.activeWorksheet ? 'activeTab="' + file.activeWorksheet + '" ' : '') + 'xWindow="480" yWindow="60" windowWidth="18195" windowHeight="8505"/></bookViews><sheets>'
-					+ worksheets.join('') + '</sheets><calcPr calcId="145621"/></workbook>');
-			//}
-		//}
+				style.formatCode = index
+			} else {
+				style.formatCode = 0
+			}
+
+			// border declaration: add a new declaration and refer to it in style
+			borderIndex = 0
+			if (style.borders) {
+				border = ['<border>']
+				// order is significative
+				for (var edge in {left:0, right:0, top:0, bottom:0, diagonal:0}) {
+					if (style.borders[edge]) {
+						var color = style.borders[edge];
+						// add transparency if missing
+						if (color.length === 6) {
+							color = 'FF'+color;
+						}
+						border.push('<', edge, ' style="thin">', '<color rgb="', style.borders[edge], '"/></', edge, '>');
+					} else {
+						border.push('<', edge, '/>');
+					}
+				}
+				border.push('</border>');
+				border = border.join('');
+				// try to reuse existing border
+				borderIndex = borders.indexOf(border);
+				if (borderIndex < 0) {
+					borderIndex = borders.push(border) - 1;
+				}
+			}
+
+			// font declaration: add a new declaration and refer to it in style
+			fontIndex = 0
+			if (style.bold || style.italic || style.fontSize || style.fontName) {
+				font = ['<font>']
+				if (style.bold) {
+					font.push('<b/>');
+				}
+				if (style.italic) {
+					font.push('<i/>');
+				}
+				font.push('<sz val="', style.fontSize || defaultFontSize, '"/>');
+				font.push('<color theme="1"/>');
+				font.push('<name val="', style.fontName || defaultFontName, '"/>');
+				font.push('<family val="2"/>', '</font>');
+				font = font.join('');
+				// try to reuse existing font
+				fontIndex = fonts.indexOf(font);
+				if (fontIndex < 0) {
+					fontIndex = fonts.push(font) - 1;
+				}
+			}
+
+			// declares style, and refer to optionnal formatCode, font and borders
+			styles[i] = ['<xf xfId="0" fillId="0" borderId="', 
+				borderIndex, 
+				'" fontId="',
+				fontIndex,
+				'" numFmtId="',
+				style.formatCode,
+				'" ',
+				(style.hAlign || style.vAlign? 'applyAlignment="1" ' : ' '),
+				(style.formatCode > 0 ? 'applyNumberFormat="1" ' : ' '),
+				(borderIndex > 0 ? 'applyBorder="1" ' : ' '),
+				(fontIndex > 0 ? 'applyFont="1" ' : ' '),
+				'>'
+			];
+			if (style.hAlign || style.vAlign) {
+				styles[i].push('<alignment');
+				if (style.hAlign) {
+					styles[i].push(' horizontal="', style.hAlign, '"');
+				}
+				if (style.vAlign) {
+					styles[i].push(' vertical="', style.vAlign, '"');
+				}
+				styles[i].push('/>');
+			}
+			styles[i].push('</xf>');
+			styles[i] = styles[i].join('');
+		}
+		t = t.length ? '<numFmts count="' + t.length + '">' + t.join('') + '</numFmts>' : '';
+
+		xl.file('styles.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">'
+			+ t + '<fonts count="'+ fonts.length + '" x14ac:knownFonts="1"><font><sz val="' + defaultFontSize + '"/><color theme="1"/><name val="' + defaultFontName + '"/><family val="2"/>'
+			+ '<scheme val="minor"/></font>' + fonts.join('') + '</fonts><fills count="2"><fill><patternFill patternType="none"/></fill><fill><patternFill patternType="gray125"/></fill></fills>'
+			+ '<borders count="' + borders.length + '"><border><left/><right/><top/><bottom/><diagonal/></border>'
+			+ borders.join('') + '</borders><cellStyleXfs count="1">'
+			+ '<xf numFmtId="0" fontId="0" fillId="0" borderId="0"/></cellStyleXfs><cellXfs count="' + styles.length + '"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>'
+			+ styles.join('') + '</cellXfs><cellStyles count="1"><cellStyle name="Normal" xfId="0" builtinId="0"/></cellStyles><dxfs count="0"/>'
+			+ '<tableStyles count="0" defaultTableStyle="TableStyleMedium2" defaultPivotStyle="PivotStyleLight16"/>'
+			+ '<extLst><ext uri="{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main">'
+			+ '<x14:slicerStyles defaultSlicerStyle="SlicerStyleLight1"/></ext></extLst></styleSheet>');
+
+		// [Content_Types].xml
+		zip.file('[Content_Types].xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/><Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>'
+			+ contentTypes[0].join('') + '<Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/><Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>'
+			+ contentTypes[1].join('') + '<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/></Types>');
+
+		// docProps/app.xml
+		docProps.file('app.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><Application>XLSX.js</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="2" baseType="variant"><vt:variant><vt:lpstr>Worksheets</vt:lpstr></vt:variant><vt:variant><vt:i4>'
+			+ file.worksheets.length + '</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="' + props.length + '" baseType="lpstr"><vt:lpstr>' + props.join('</vt:lpstr><vt:lpstr>')
+			+ '</vt:lpstr></vt:vector></TitlesOfParts><Manager></Manager><Company>Microsoft Corporation</Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>1.0</AppVersion></Properties>');
+
+		// xl/_rels/workbook.xml.rels
+		xl.folder('_rels').file('workbook.xml.rels', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">'
+			+ xlRels.join('') + '<Relationship Id="rId' + (xlRels.length + 1) + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>'
+			+ '<Relationship Id="rId' + (xlRels.length + 2) + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>'
+			+ '<Relationship Id="rId' + (xlRels.length + 3) + '" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/></Relationships>');
+
+		// xl/sharedStrings.xml
+		xl.file('sharedStrings.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="'
+			+ sharedStrings[1] + '" uniqueCount="' + sharedStrings[0].length + '"><si><t>' + sharedStrings[0].join('</t></si><si><t>') + '</t></si></sst>');
+
+		// xl/workbook.xml
+		xl.file('workbook.xml', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">'
+			+ '<fileVersion appName="xl" lastEdited="5" lowestEdited="5" rupBuild="9303"/><workbookPr defaultThemeVersion="124226"/><bookViews><workbookView '
+			+ (file.activeWorksheet ? 'activeTab="' + file.activeWorksheet + '" ' : '') + 'xWindow="480" yWindow="60" windowWidth="18195" windowHeight="8505"/></bookViews><sheets>'
+			+ worksheets.join('') + '</sheets><calcPr calcId="145621"/></workbook>');
+
 		processTime = Date.now() - processTime;
@@ -237,2 +470,7 @@ zipTime = Date.now();
 	return result;
+}
+
+// NodeJs export
+if (typeof exports === 'object' && typeof module === 'object') {
+  module.exports = xlsx;
 }

package.json

@@ -5,3 +5,3 @@ {
   "license": "Microsoft Office Extensible File License",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Node.js excel parser & builder",
@@ -21,3 +21,4 @@ "main": "index.js",
   "dependencies": {
-    "debug": ">= 0.7.2"
+    "debug": ">= 0.7.2",
+    "node-zip": "~1.0.1"
   },
@@ -24,0 +25,0 @@ "devDependencies": {

readme.md

@@ -6,2 +6,4 @@ [node-xlsx](http://mgcrea.github.com/node-xlsx) [![Build Status](https://secure.travis-ci.org/mgcrea/node-xlsx.png?branch=master)](http://travis-ci.org/#!/mgcrea/node-xlsx)
 
+An opensource alternative is currently being developped by [Niggler](https://github.com/Niggler/js-xlsx), reader-only for now.
+
 Quick start
@@ -8,0 +10,0 @@ -----------

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Debug access

Supply chain risk

Uses debug, reflection and dynamic code execution features.

Found 1 instance in 1 package

Improved metrics

Number of lines in readme file

84

increased by2.44%

Worsened metrics

Total package byte prevSize

48391

decreased by-71.73%

Dependency count

2

increased by100%

Number of package files

12

decreased by-25%

Lines of code

558

decreased by-85.68%

Number of low supply chain risk alerts

5

increased by25%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Addednode-zip@~1.0.1

• + Addednode-zip@1.0.1(transitive)