From 39fd3a65348fbbf094f085bb7187fbade6bfbf20 Mon Sep 17 00:00:00 2001
From: Alfredo Benassi <alfrebenassi@gmail.com>
Date: Mon, 8 Jul 2019 15:38:28 -0300
Subject: [PATCH 1/2] Add Compression level option to WorkbookWriterOptions for
 streaming #888

  - Added zip options for `WorkbookWriterOptions` based on `archiver` docs.
  - Added `testWbStreamCompressionOptions.js` test.
  - Updated `index.d.ts` with the new interfaces.

Resolves #888
---
 index.d.ts                             |  39 +++++++++-
 lib/stream/xlsx/workbook-writer.js     |   4 +-
 test/testWbStreamCompressionOptions.js | 102 +++++++++++++++++++++++++
 3 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 test/testWbStreamCompressionOptions.js

diff --git a/index.d.ts b/index.d.ts
index d96f04b3b..5970c0fe7 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -1454,8 +1454,45 @@ export namespace stream {
 			useStyles: boolean;
 		}
 
+        interface ArchiverZipOptions {
+            comment: string;
+            forceLocalTime: boolean;
+            forceZip64: boolean;
+            store: boolean;
+            zlib: Partial<ZlibOptions>;
+        }
+
+        interface ZlibOptions {
+            /**
+             * @default constants.Z_NO_FLUSH
+             */
+            flush: number;
+            /**
+             * @default constants.Z_FINISH
+             */
+            finishFlush: number;
+            /**
+             * @default 16*1024
+             */
+            chunkSize: number;
+            windowBits: number;
+            level: number; // compression only
+            memLevel: number; // compression only
+            strategy: number; // compression only
+            dictionary: Buffer | NodeJS.TypedArray | DataView | ArrayBuffer; // deflate/inflate only, empty dictionary by default
+        }
+
+		interface WorkbookStreamWriterOptions extends WorkbookWriterOptions {
+
+            /**
+             * Specifies whether to add style information to the workbook.
+             * Styles can add some performance overhead. Default is false
+             */
+            zip: Partial<ArchiverZipOptions>;
+        }
+
 		class WorkbookWriter extends Workbook {
-			constructor(options: Partial<WorkbookWriterOptions>);
+			constructor(options: Partial<WorkbookStreamWriterOptions>);
 			// commit all worksheets, then add suplimentary files
 			commit(): Promise<void>;
 			addStyles(): Promise<void>;
diff --git a/lib/stream/xlsx/workbook-writer.js b/lib/stream/xlsx/workbook-writer.js
index b9240878e..c881fab4a 100644
--- a/lib/stream/xlsx/workbook-writer.js
+++ b/lib/stream/xlsx/workbook-writer.js
@@ -44,9 +44,11 @@ const WorkbookWriter = (module.exports = function(options) {
   this._worksheets = [];
   this.views = [];
 
+  this.zipOptions = options.zip;
+
   this.media = [];
 
-  this.zip = Archiver('zip');
+  this.zip = Archiver('zip', this.zipOptions);
   if (options.stream) {
     this.stream = options.stream;
   } else if (options.filename) {
diff --git a/test/testWbStreamCompressionOptions.js b/test/testWbStreamCompressionOptions.js
new file mode 100644
index 000000000..441f1319c
--- /dev/null
+++ b/test/testWbStreamCompressionOptions.js
@@ -0,0 +1,102 @@
+const Excel = require('../excel');
+const utils = require('../spec/utils/index');
+
+const filename = process.argv[2];
+console.log(filename);
+const optionsBestCompression = {
+  filename,
+  useStyles: true,
+  zip: {
+    zlib: { level: 9 },// Sets the compression level.
+  },
+};
+const wb = new Excel.stream.xlsx.WorkbookWriter(optionsBestCompression);
+const ws = wb.addWorksheet('blort');
+
+const style = {
+  font: utils.styles.fonts.comicSansUdB16,
+  alignment: utils.styles.alignments[1].alignment,
+};
+ws.columns = [
+  { header: 'A1', width: 10 },
+  { header: 'B1', width: 20, style },
+  { header: 'C1', width: 30 },
+];
+
+ws.getRow(2).font = utils.styles.fonts.broadwayRedOutline20;
+
+ws.getCell('A2').value = 'A2';
+ws.getCell('B2').value = 'B2';
+ws.getCell('C2').value = 'C2';
+ws.getCell('A3').value = 'A3';
+ws.getCell('B3').value = 'B3';
+ws.getCell('C3').value = 'C3';
+
+wb.commit().then(() => {
+  console.log('Done');
+  // var wb2 = new Excel.Workbook();
+  // return wb2.xlsx.readFile('./wb.test2.xlsx');
+});
+
+const filename2 = process.argv[3];
+console.log(filename2);
+const optionsBestSpeed = {
+  filename: filename2,
+  useStyles: true,
+  zip: {
+    zlib: { level: 1 },// Sets the compression level.
+  },
+};
+const wb2 = new Excel.stream.xlsx.WorkbookWriter(optionsBestSpeed);
+const ws2 = wb2.addWorksheet('blort');
+
+ws2.columns = [
+  { header: 'A1', width: 10 },
+  { header: 'B1', width: 20, style },
+  { header: 'C1', width: 30 },
+];
+
+ws2.getRow(2).font = utils.styles.fonts.broadwayRedOutline20;
+
+ws2.getCell('A2').value = 'A2';
+ws2.getCell('B2').value = 'B2';
+ws2.getCell('C2').value = 'C2';
+ws2.getCell('A3').value = 'A3';
+ws2.getCell('B3').value = 'B3';
+ws2.getCell('C3').value = 'C3';
+
+wb2.commit().then(() => {
+  console.log('Done');
+  // var wb2 = new Excel.Workbook();
+  // return wb2.xlsx.readFile('./wb.test2.xlsx');
+});
+
+const filename3 = process.argv[4];
+console.log(filename3);
+const options = {
+  filename: filename3,
+  useStyles: true,
+};
+const wb3 = new Excel.stream.xlsx.WorkbookWriter(options);
+const ws3 = wb3.addWorksheet('blort');
+
+ws3.columns = [
+  { header: 'A1', width: 10 },
+  { header: 'B1', width: 20, style },
+  { header: 'C1', width: 30 },
+];
+
+ws3.getRow(2).font = utils.styles.fonts.broadwayRedOutline20;
+
+ws3.getCell('A2').value = 'A2';
+ws3.getCell('B2').value = 'B2';
+ws3.getCell('C2').value = 'C2';
+ws3.getCell('A3').value = 'A3';
+ws3.getCell('B3').value = 'B3';
+ws3.getCell('C3').value = 'C3';
+
+wb3.commit().then(() => {
+  console.log('Done');
+  // var wb2 = new Excel.Workbook();
+  // return wb2.xlsx.readFile('./wb.test2.xlsx');
+});

From 7309a087c61bc933fdccfd6b086e2f321891ff7a Mon Sep 17 00:00:00 2001
From: Alfredo Benassi <alfrebenassi@gmail.com>
Date: Mon, 8 Jul 2019 16:16:15 -0300
Subject: [PATCH 2/2] Add Compression level option to WorkbookWriterOptions for
 streaming #888

  - Added 'with zip compression option' integration test.

Resolves #888
---
 .../workbook-xlsx-writer.spec.js              | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js b/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js
index 857aec084..2647f313a 100644
--- a/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js
+++ b/spec/integration/workbook-xlsx-writer/workbook-xlsx-writer.spec.js
@@ -384,5 +384,30 @@ describe('WorkbookWriter', () => {
           testUtils.checkTestBook(wb2, 'xlsx', ['dataValidations']);
         });
     });
+
+    it('with zip compression option', () => {
+      const options = {
+        filename: TEST_XLSX_FILE_NAME,
+        useStyles: true,
+        zip: {
+          zlib: { level: 9 },// Sets the compression level.
+        },
+      };
+      const wb = testUtils.createTestBook(
+        new Excel.stream.xlsx.WorkbookWriter(options),
+        'xlsx',
+        ['dataValidations']
+      );
+
+      return wb
+        .commit()
+        .then(() => {
+          const wb2 = new Excel.Workbook();
+          return wb2.xlsx.readFile(TEST_XLSX_FILE_NAME);
+        })
+        .then(wb2 => {
+          testUtils.checkTestBook(wb2, 'xlsx', ['dataValidations']);
+        });
+    });
   });
 });

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/exceljs/exceljs/pull/889.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/exceljs/exceljs/pull/889.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/exceljs/exceljs/pull/889.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/exceljs/exceljs/pull/889.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>