Fix parsing of boolean attributes (#1849)

bno1 · Alexandru Șorodoc · web-flow · commit fb838ea7a03f · 2021-10-08T03:01:42.000+02:00
Co-authored-by: Alexandru Șorodoc &lt;alex.sorodoc@techsteps.ro&gt;
diff --git a/lib/utils/utils.js b/lib/utils/utils.js
@@ -163,6 +163,10 @@ const utils = {
   toIsoDateString(dt) {
     return dt.toIsoString().subsstr(0, 10);
   },
+
+  parseBoolean(value) {
+    return value === true || value === 'true' || value === 1 || value === '1';
+  },
 };
 
 module.exports = utils;
diff --git a/lib/xlsx/xform/sheet/col-xform.js b/lib/xlsx/xform/sheet/col-xform.js
@@ -1,3 +1,4 @@
+const utils = require('../../../utils/utils');
 const BaseXform = require('../base-xform');
 
 class ColXform extends BaseXform {
@@ -51,21 +52,16 @@ class ColXform extends BaseXform {
       if (node.attributes.style) {
         model.styleId = parseInt(node.attributes.style, 10);
       }
-      if (
-        node.attributes.hidden === true ||
-        node.attributes.hidden === 'true' ||
-        node.attributes.hidden === 1 ||
-        node.attributes.hidden === '1'
-      ) {
+      if (utils.parseBoolean(node.attributes.hidden)) {
         model.hidden = true;
       }
-      if (node.attributes.bestFit) {
+      if (utils.parseBoolean(node.attributes.bestFit)) {
         model.bestFit = true;
       }
       if (node.attributes.outlineLevel) {
         model.outlineLevel = parseInt(node.attributes.outlineLevel, 10);
       }
-      if (node.attributes.collapsed) {
+      if (utils.parseBoolean(node.attributes.collapsed)) {
         model.collapsed = true;
       }
       return true;
diff --git a/lib/xlsx/xform/sheet/data-validations-xform.js b/lib/xlsx/xform/sheet/data-validations-xform.js
@@ -12,19 +12,11 @@ function assign(definedName, attributes, name, defaultValue) {
     definedName[name] = defaultValue;
   }
 }
-function parseBool(value) {
-  switch (value) {
-    case '1':
-    case 'true':
-      return true;
-    default:
-      return false;
-  }
-}
+
 function assignBool(definedName, attributes, name, defaultValue) {
   const value = attributes[name];
   if (value !== undefined) {
-    definedName[name] = parseBool(value);
+    definedName[name] = utils.parseBoolean(value);
   } else if (defaultValue !== undefined) {
     definedName[name] = defaultValue;
   }
diff --git a/lib/xlsx/xform/sheet/row-xform.js b/lib/xlsx/xform/sheet/row-xform.js
@@ -1,4 +1,5 @@
 const BaseXform = require('../base-xform');
+const utils = require('../../../utils/utils');
 
 const CellXform = require('./cell-xform');
 
@@ -79,15 +80,10 @@ class RowXform extends BaseXform {
       if (node.attributes.s) {
         model.styleId = parseInt(node.attributes.s, 10);
       }
-      if (
-        node.attributes.hidden === true ||
-        node.attributes.hidden === 'true' ||
-        node.attributes.hidden === 1 ||
-        node.attributes.hidden === '1'
-      ) {
+      if (utils.parseBoolean(node.attributes.hidden)) {
         model.hidden = true;
       }
-      if (node.attributes.bestFit) {
+      if (utils.parseBoolean(node.attributes.bestFit)) {
         model.bestFit = true;
       }
       if (node.attributes.ht) {
@@ -96,7 +92,7 @@ class RowXform extends BaseXform {
       if (node.attributes.outlineLevel) {
         model.outlineLevel = parseInt(node.attributes.outlineLevel, 10);
       }
-      if (node.attributes.collapsed) {
+      if (utils.parseBoolean(node.attributes.collapsed)) {
         model.collapsed = true;
       }
       return true;
diff --git a/lib/xlsx/xform/style/alignment-xform.js b/lib/xlsx/xform/style/alignment-xform.js
@@ -145,8 +145,8 @@ class AlignmentXform extends BaseXform {
       'vertical',
       node.attributes.vertical === 'center' ? 'middle' : node.attributes.vertical
     );
-    add(node.attributes.wrapText, 'wrapText', !!node.attributes.wrapText);
-    add(node.attributes.shrinkToFit, 'shrinkToFit', !!node.attributes.shrinkToFit);
+    add(node.attributes.wrapText, 'wrapText', utils.parseBoolean(node.attributes.wrapText));
+    add(node.attributes.shrinkToFit, 'shrinkToFit', utils.parseBoolean(node.attributes.shrinkToFit));
     add(node.attributes.indent, 'indent', parseInt(node.attributes.indent, 10));
     add(
       node.attributes.textRotation,
diff --git a/lib/xlsx/xform/style/border-xform.js b/lib/xlsx/xform/style/border-xform.js
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 const BaseXform = require('../base-xform');
+const utils = require('../../../utils/utils');
 
 const ColorXform = require('./color-xform');
 
@@ -156,8 +157,8 @@ class BorderXform extends BaseXform {
     switch (node.name) {
       case 'border':
         this.reset();
-        this.diagonalUp = !!node.attributes.diagonalUp;
-        this.diagonalDown = !!node.attributes.diagonalDown;
+        this.diagonalUp = utils.parseBoolean(node.attributes.diagonalUp);
+        this.diagonalDown = utils.parseBoolean(node.attributes.diagonalDown);
         return true;
       default:
         this.parser = this.map[node.name];

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+const utils = require('../../../utils/utils');`
`1`	`2`	`const BaseXform = require('../base-xform');`
`2`	`3`
`3`	`4`	`class ColXform extends BaseXform {`
`@@ -51,21 +52,16 @@ class ColXform extends BaseXform {`
`51`	`52`	`if (node.attributes.style) {`
`52`	`53`	`model.styleId = parseInt(node.attributes.style, 10);`
`53`	`54`	`}`
`54`		`- if (`
`55`		`- node.attributes.hidden === true \|\|`
`56`		`- node.attributes.hidden === 'true' \|\|`
`57`		`- node.attributes.hidden === 1 \|\|`
`58`		`- node.attributes.hidden === '1'`
`59`		`- ) {`
	`55`	`+ if (utils.parseBoolean(node.attributes.hidden)) {`
`60`	`56`	`model.hidden = true;`
`61`	`57`	`}`
`62`		`- if (node.attributes.bestFit) {`
	`58`	`+ if (utils.parseBoolean(node.attributes.bestFit)) {`
`63`	`59`	`model.bestFit = true;`
`64`	`60`	`}`
`65`	`61`	`if (node.attributes.outlineLevel) {`
`66`	`62`	`model.outlineLevel = parseInt(node.attributes.outlineLevel, 10);`
`67`	`63`	`}`
`68`		`- if (node.attributes.collapsed) {`
	`64`	`+ if (utils.parseBoolean(node.attributes.collapsed)) {`
`69`	`65`	`model.collapsed = true;`
`70`	`66`	`}`
`71`	`67`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`const BaseXform = require('../base-xform');`
	`2`	`+const utils = require('../../../utils/utils');`
`2`	`3`
`3`	`4`	`const CellXform = require('./cell-xform');`
`4`	`5`
`@@ -79,15 +80,10 @@ class RowXform extends BaseXform {`
`79`	`80`	`if (node.attributes.s) {`
`80`	`81`	`model.styleId = parseInt(node.attributes.s, 10);`
`81`	`82`	`}`
`82`		`- if (`
`83`		`- node.attributes.hidden === true \|\|`
`84`		`- node.attributes.hidden === 'true' \|\|`
`85`		`- node.attributes.hidden === 1 \|\|`
`86`		`- node.attributes.hidden === '1'`
`87`		`- ) {`
	`83`	`+ if (utils.parseBoolean(node.attributes.hidden)) {`
`88`	`84`	`model.hidden = true;`
`89`	`85`	`}`
`90`		`- if (node.attributes.bestFit) {`
	`86`	`+ if (utils.parseBoolean(node.attributes.bestFit)) {`
`91`	`87`	`model.bestFit = true;`
`92`	`88`	`}`
`93`	`89`	`if (node.attributes.ht) {`
`@@ -96,7 +92,7 @@ class RowXform extends BaseXform {`
`96`	`92`	`if (node.attributes.outlineLevel) {`
`97`	`93`	`model.outlineLevel = parseInt(node.attributes.outlineLevel, 10);`
`98`	`94`	`}`
`99`		`- if (node.attributes.collapsed) {`
	`95`	`+ if (utils.parseBoolean(node.attributes.collapsed)) {`
`100`	`96`	`model.collapsed = true;`
`101`	`97`	`}`
`102`	`98`	`return true;`