Merge pull request #228 from natergj/issue218-null-string

fix issue 228 #228
natergj · Sep 9, 2018 · 8d1ee19 · 8d1ee19
2 parents 9b63171 + f732832
commit 8d1ee19
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/source/lib/cell/index.js b/source/lib/cell/index.js
@@ -8,22 +8,21 @@ const util = require('util');
 
 function stringSetter(val) {
     let logger = this.ws.wb.logger;
+
+    if (typeof (val) !== 'string') {
+        logger.warn('Value sent to String function of cells %s was not a string, it has type of %s',
+            JSON.stringify(this.excelRefs),
+            typeof (val));
+        val = '';
+    }
+
     let chars, chr;
     chars = /[\u0000-\u0008\u000B-\u000C\u000E-\u001F\uD800-\uDFFF\uFFFE-\uFFFF]/;
     chr = val.match(chars);
     if (chr) {
         logger.warn('Invalid Character for XML "' + chr + '" in string "' + val + '"');
         val = val.replace(chr, '');
     }
-
-    if (typeof(val) !== 'string') {
-        logger.warn('Value sent to String function of cells %s was not a string, it has type of %s', 
-                    JSON.stringify(this.excelRefs), 
-                    typeof(val));
-        val = '';
-    }
-
-    val = val.toString();
     // Remove Control characters, they aren't understood by xmlbuilder
     val = val.replace(/[\u0000-\u0008\u000B-\u000C\u000E-\u001F\uD800-\uDFFF\uFFFE-\uFFFF]/, '');
 
@@ -54,7 +53,7 @@ function numberSetter(val) {
     if (val === undefined || parseFloat(val) !== val) {
         throw new TypeError(util.format('Value sent to Number function of cells %s was not a number, it has type of %s and value of %s',
             JSON.stringify(this.excelRefs),
-            typeof(val),
+            typeof (val),
             val
         ));
     }
@@ -68,14 +67,14 @@ function numberSetter(val) {
         var c = this.cells[0];
         c.number(val);
     }
-    return this;    
+    return this;
 }
 
 function booleanSetter(val) {
     if (val === undefined || typeof (val.toString().toLowerCase() === 'true' || ((val.toString().toLowerCase() === 'false') ? false : val)) !== 'boolean') {
         throw new TypeError(util.format('Value sent to Bool function of cells %s was not a bool, it has type of %s and value of %s',
             JSON.stringify(this.excelRefs),
-            typeof(val),
+            typeof (val),
             val
         ));
     }
@@ -93,8 +92,8 @@ function booleanSetter(val) {
 }
 
 function formulaSetter(val) {
-    if (typeof(val) !== 'string') {
-        throw new TypeError(util.format('Value sent to Formula function of cells %s was not a string, it has type of %s', JSON.stringify(this.excelRefs), typeof(val)));
+    if (typeof (val) !== 'string') {
+        throw new TypeError(util.format('Value sent to Formula function of cells %s was not a string, it has type of %s', JSON.stringify(this.excelRefs), typeof (val)));
     }
     if (this.merged !== true) {
         this.cells.forEach((c, i) => {

diff --git a/tests/cell.test.js b/tests/cell.test.js
@@ -24,18 +24,29 @@ test('Add String to cell', (t) => {
     let cell = ws.cell(1, 1).string('my test string');
     let thisCell = ws.cells[cell.excelRefs[0]];
     t.ok(thisCell.t === 's', 'cellType set to sharedString');
-    t.ok(typeof(thisCell.v) === 'number', 'cell Value is a number');
+    t.ok(typeof (thisCell.v) === 'number', 'cell Value is a number');
     t.ok(wb.sharedStrings[thisCell.v] === 'my test string', 'Cell sharedString value is correct');
 });
 
+test('Replace null or undefined value with empty string', (t) => {
+    t.plan(3);
+    let wb = new xl.Workbook();
+    let ws = wb.addWorksheet('test');
+    let cell = ws.cell(1, 1).string(null);
+    let thisCell = ws.cells[cell.excelRefs[0]];
+    t.ok(thisCell.t === 's', 'cellType set to sharedString');
+    t.ok(typeof (thisCell.v) === 'number', 'cell Value is a number');
+    t.ok(wb.sharedStrings[thisCell.v] === '', 'Cell is empty string');
+});
+
 test('Add Number to cell', (t) => {
     t.plan(3);
     let wb = new xl.Workbook();
     let ws = wb.addWorksheet('test');
     let cell = ws.cell(1, 1).number(10);
     let thisCell = ws.cells[cell.excelRefs[0]];
     t.ok(thisCell.t === 'n', 'cellType set to number');
-    t.ok(typeof(thisCell.v) === 'number', 'cell Value is a number');
+    t.ok(typeof (thisCell.v) === 'number', 'cell Value is a number');
     t.ok(thisCell.v === 10, 'Cell value value is correct');
 });
 
@@ -46,7 +57,7 @@ test('Add Boolean to cell', (t) => {
     let cell = ws.cell(1, 1).bool(true);
     let thisCell = ws.cells[cell.excelRefs[0]];
     t.ok(thisCell.t === 'b', 'cellType set to boolean');
-    t.ok(typeof(thisCell.v) === 'string', 'cell Value is a string');
+    t.ok(typeof (thisCell.v) === 'string', 'cell Value is a string');
     t.ok(thisCell.v === 'true' || thisCell.v === 'false', 'Cell value value is correct');
 });
 
@@ -58,6 +69,6 @@ test('Add Formula to cell', (t) => {
     let thisCell = ws.cells[cell.excelRefs[0]];
     t.ok(thisCell.t === null, 'cellType is not set');
     t.ok(thisCell.v === null, 'cellValue is not set');
-    t.ok(typeof(thisCell.f) === 'string', 'cell Formula is a string');
+    t.ok(typeof (thisCell.f) === 'string', 'cell Formula is a string');
     t.ok(thisCell.f === 'SUM(A1:A10)', 'Cell value value is correct');
 });