Skip to content

Fix parsing of boolean attributes #1849

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 1 commit into from
Oct 8, 2021
Merged

Fix parsing of boolean attributes #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions lib/utils/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
12 changes: 4 additions & 8 deletions lib/xlsx/xform/sheet/col-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const utils = require('../../../utils/utils');
const BaseXform = require('../base-xform');

class ColXform extends BaseXform {
Expand Down Expand Up @@ -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;
Expand Down
12 changes: 2 additions & 10 deletions lib/xlsx/xform/sheet/data-validations-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
12 changes: 4 additions & 8 deletions lib/xlsx/xform/sheet/row-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const BaseXform = require('../base-xform');
const utils = require('../../../utils/utils');

const CellXform = require('./cell-xform');

Expand Down Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions lib/xlsx/xform/style/alignment-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions lib/xlsx/xform/style/border-xform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');

Expand Down Expand Up @@ -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];
Expand Down