Merge branch 'master' into async-iterators

alubbe · alubbe · commit 24d7a5aa0cf4 · 2020-05-18T17:55:03.000+02:00
diff --git a/README.md b/README.md
@@ -352,9 +352,21 @@ workbook.eachSheet(function(worksheet, sheetId) {
 const worksheet = workbook.getWorksheet('My Sheet');
 
 // fetch sheet by id
+// INFO: Be careful when using it!
+// It tries to access to `worksheet.id` field. Sometimes (really very often) workbook has worksheets with id not starting from 1.
+// For instance It happens when any worksheet has been deleted.
+// It's much more safety when you assume that ids are random. And stop to use this function.
+// If you need to access all worksheets in a loop please look to the next example.
 const worksheet = workbook.getWorksheet(1);
+
+// access by `worksheets` array:
+workbook.worksheets[0]; //the first one;
+
 ```
 
+It's important to know that `workbook.getWorksheet(1) != Workbook.worksheets[0]` and `workbook.getWorksheet(1) != Workbook.worksheets[1]`,
+becouse `workbook.worksheets[0].id` may have any value.
+
 ## Worksheet State
 
 ```javascript
diff --git a/lib/csv/csv.js b/lib/csv/csv.js
@@ -48,7 +48,7 @@ class CSV {
     return new Promise((resolve, reject) => {
       const worksheet = this.workbook.addWorksheet(options.sheetName);
 
-      const dateFormats = options.dateFormats || ['YYYY-MM-DD[T]HH:mm:ss', 'MM-DD-YYYY', 'YYYY-MM-DD'];
+      const dateFormats = options.dateFormats || ['YYYY-MM-DD[T]HH:mm:ssZ', 'YYYY-MM-DD[T]HH:mm:ss', 'MM-DD-YYYY', 'YYYY-MM-DD'];
       const map =
         options.map ||
         function(datum) {
diff --git a/lib/xlsx/xform/book/workbook-xform.js b/lib/xlsx/xform/book/workbook-xform.js
@@ -157,7 +157,9 @@ class WorkbookXform extends BaseXform {
       if (!rel) {
         return;
       }
-      worksheet = model.worksheetHash[`xl/${rel.Target}`];
+      // if rel.Target start with `[space]/xl/` or `/xl/` , then it will be replaced with `''` and spliced behind `xl/`,
+      // otherwise it will be spliced directly behind `xl/`. i.g.
+      worksheet = model.worksheetHash[`xl/${rel.Target.replace(/^(\s|\/xl\/)+/, '')}`];
       // If there are "chartsheets" in the file, rel.Target will
       // come out as chartsheets/sheet1.xml or similar here, and
       // that won't be in model.worksheetHash.
diff --git a/lib/xlsx/xform/sheet/worksheet-xform.js b/lib/xlsx/xform/sheet/worksheet-xform.js
@@ -379,12 +379,12 @@ class WorkSheetXform extends BaseXform {
     }
     switch (name) {
       case 'worksheet': {
-        const properties = this.map.sheetFormatPr.model;
+        const properties = this.map.sheetFormatPr.model || {};
         if (this.map.sheetPr.model && this.map.sheetPr.model.tabColor) {
           properties.tabColor = this.map.sheetPr.model.tabColor;
         }
         if (this.map.sheetPr.model && this.map.sheetPr.model.outlineProperties) {
-          properties.outlineProperties = this.map.sheetPr.model.outlinePropertiesx;
+          properties.outlineProperties = this.map.sheetPr.model.outlineProperties;
         }
         const sheetProperties = {
           fitToPage: (this.map.sheetPr.model && this.map.sheetPr.model.pageSetup && this.map.sheetPr.model.pageSetup.fitToPage) || false,
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
   ],
   "dependencies": {
     "archiver": "^4.0.1",
-    "dayjs": "^1.8.25",
+    "dayjs": "^1.8.26",
     "fast-csv": "^4.1.2",
     "jszip": "^3.4.0",
     "readable-stream": "^3.6.0",
diff --git a/spec/integration/data/test-pr-1220.xlsx b/spec/integration/data/test-pr-1220.xlsx
diff --git a/spec/integration/pr/test-pr-1220.spec.js b/spec/integration/pr/test-pr-1220.spec.js
@@ -0,0 +1,10 @@
+const ExcelJS = verquire('exceljs');
+
+describe('github issues', () => {
+  it('pull request 1220 - The worksheet should not be undefined', async () => {
+    const wb = new ExcelJS.Workbook();
+    await wb.xlsx.readFile('./spec/integration/data/test-pr-1220.xlsx');
+    const ws = wb.getWorksheet(1);
+    expect(ws).to.not.equal(undefined);
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -379,12 +379,12 @@ class WorkSheetXform extends BaseXform {`
`379`	`379`	`}`
`380`	`380`	`switch (name) {`
`381`	`381`	`case 'worksheet': {`
`382`		`- const properties = this.map.sheetFormatPr.model;`
	`382`	`+ const properties = this.map.sheetFormatPr.model \|\| {};`
`383`	`383`	`if (this.map.sheetPr.model && this.map.sheetPr.model.tabColor) {`
`384`	`384`	`properties.tabColor = this.map.sheetPr.model.tabColor;`
`385`	`385`	`}`
`386`	`386`	`if (this.map.sheetPr.model && this.map.sheetPr.model.outlineProperties) {`
`387`		`- properties.outlineProperties = this.map.sheetPr.model.outlinePropertiesx;`
	`387`	`+ properties.outlineProperties = this.map.sheetPr.model.outlineProperties;`
`388`	`388`	`}`
`389`	`389`	`const sheetProperties = {`
`390`	`390`	`fitToPage: (this.map.sheetPr.model && this.map.sheetPr.model.pageSetup && this.map.sheetPr.model.pageSetup.fitToPage) \|\| false,`