Merge branch 'master' of github.com:mgcrea/node-xlsx

mgcrea · Jul 23, 2017 · db8f258 · db8f258
2 parents faf095a + 26f67bd
commit db8f258
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -7,7 +7,7 @@ export function parse(mixed, options = {}) {
   const workSheet = XLSX[isString(mixed) ? 'readFile' : 'read'](mixed, options);
   return Object.keys(workSheet.Sheets).map((name) => {
     const sheet = workSheet.Sheets[name];
-    return {name, data: XLSX.utils.sheet_to_json(sheet, {header: 1, raw: true})};
+    return {name, data: XLSX.utils.sheet_to_json(sheet, {header: 1, raw: options.raw !== false})};
   });
 }
 

diff --git a/test/fixtures/dateField.json b/test/fixtures/dateField.json
@@ -0,0 +1,31 @@
+[
+ {
+  "name": "Sheet1",
+  "data": [
+   [
+    "Serial 1",
+    "Serial 2",
+    "Serial 3",
+    "UPC",
+    "PO#",
+    "Date Received"
+   ],
+   [
+    "SPKA19BD170C53",
+    "SPKA19BD170420",
+    "SPKA19BD1707F3",
+    "861453000227",
+    "10012",
+    "5/25/17"
+   ],
+   [
+    "SPKA19BD16007A",
+    "SPKA19BD170927",
+    "SPKA19BD1702B9",
+    "861453000227",
+    "10012",
+    "5/25/17"
+   ]
+  ]
+ }
+]
diff --git a/test/fixtures/dateField.xlsx b/test/fixtures/dateField.xlsx
diff --git a/test/specs/parse.spec.js b/test/specs/parse.spec.js
@@ -18,4 +18,10 @@ describe('node-xlsx parser', () => {
     const result = JSON.parse(JSON.stringify(parseXSLX(file)));
     expect(result).toEqual(expected);
   });
+  it('should properly parse an XLSX file with date field', () => {
+    const expected = JSON.parse(fs.readFileSync(`${__dirname}/../fixtures/dateField.json`));
+    const file = `${__dirname}/../fixtures/dateField.xlsx`;
+    const result = JSON.parse(JSON.stringify(parseXSLX(file, {raw: false})));
+    expect(result).toEqual(expected);
+  });
 });