Skip to content

Don't break when attempting to import a zip file that's not an Excel file (eg. .numbers) #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2017
Merged

Don't break when attempting to import a zip file that's not an Excel file (eg. .numbers) #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb93c9
Don't break when attempting to load a zip file that isn't an Excel sp…
papandreou Oct 18, 2017
0b34f96
Add regression test
papandreou Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/xlsx/xform/book/workbook-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ utils.inherits(WorkbookXform, BaseXform, {
},

reconcile: function(model) {
var rels = model.workbookRels.reduce(function(map, rel) {
var rels = (model.workbookRels || []).reduce(function(map, rel) {
map[rel.Id] = rel;
return map;
}, {});
Expand All @@ -152,7 +152,7 @@ utils.inherits(WorkbookXform, BaseXform, {
var worksheet;
var index = 0;

model.sheets.forEach(function(sheet) {
(model.sheets || []).forEach(function(sheet) {
var rel = rels[sheet.rId];
if (!rel) {
return;
Expand Down
2 changes: 1 addition & 1 deletion lib/xlsx/xlsx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ XLSX.prototype = {
sharedStrings: model.sharedStrings,
media: model.media,
mediaIndex: model.mediaIndex,
date1904: model.properties.date1904,
date1904: model.properties && model.properties.date1904,
drawings: model.drawings,
};
model.worksheets.forEach(function(worksheet) {
Expand Down
Binary file added spec/integration/data/numbers.numbers
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions spec/integration/worksheet.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var expect = require('chai').expect;
var verquire = require('../utils/verquire');
var testutils = require('./../utils/index');
var path = require('path');

var Excel = verquire('excel');
var Range = verquire('doc/range');
Expand Down Expand Up @@ -619,4 +620,14 @@ describe('Worksheet', function() {
expect(ws.getCell('C3').numFmt).to.equal(testutils.styles.numFmts.numFmt1);
});
});

describe('When passed a non-Excel file', function() {
it('Should not break when importing a .numbers file', function() {
return new Excel.Workbook().xlsx.readFile(path.resolve(__dirname, 'data', 'numbers.numbers'))
.then(function(workbook) {
expect(workbook).to.have.property('worksheets');
expect(workbook.worksheets).to.have.length(0);
});
});
});
});