Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 14:11:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 'JSON to CSV' data flattening.

Browse Source
This commit is contained in:
n1474335 2021-02-16 14:48:56 +00:00
parent 61e85474d3
commit b69373f5e7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/operations/JSONToCSV.mjs
View File

@ -43,15 +43,16 @@ class JSONToCSV extends Operation {
/** /**
* Converts JSON to a CSV equivalent. * Converts JSON to a CSV equivalent.
* *
* @param {boolean} force - Whether to force conversion of data to fit in a cell
* @returns {string} * @returns {string}
*/ */
toCSV() { toCSV(force=false) {
const self = this; const self = this;
// If the JSON is an array of arrays, this is easy // If the JSON is an array of arrays, this is easy
if (this.flattened[0] instanceof Array) { if (this.flattened[0] instanceof Array) {
return this.flattened return this.flattened
.map(row => row .map(row => row
.map(self.escapeCellContents.bind(self)) .map(d => self.escapeCellContents(d, force))
.join(this.cellDelim) .join(this.cellDelim)
) )
.join(this.rowDelim) + .join(this.rowDelim) +
@ -61,13 +62,13 @@ class JSONToCSV extends Operation {
// If it's an array of dictionaries... // If it's an array of dictionaries...
const header = Object.keys(this.flattened[0]); const header = Object.keys(this.flattened[0]);
return header return header
.map(self.escapeCellContents.bind(self)) .map(d => self.escapeCellContents(d, force))
.join(this.cellDelim) + .join(this.cellDelim) +
this.rowDelim + this.rowDelim +
this.flattened this.flattened
.map(row => header .map(row => header
.map(h => row[h]) .map(h => row[h])
.map(self.escapeCellContents.bind(self)) .map(d => self.escapeCellContents(d, force))
.join(this.cellDelim) .join(this.cellDelim)
) )
.join(this.rowDelim) + .join(this.rowDelim) +
@ -98,7 +99,7 @@ class JSONToCSV extends Operation {
if (!(this.flattened instanceof Array)) { if (!(this.flattened instanceof Array)) {
this.flattened = [this.flattened]; this.flattened = [this.flattened];
} }
return this.toCSV(); return this.toCSV(true);
} catch (err) { } catch (err) {
throw new OperationError("Unable to parse JSON to CSV: " + err.toString()); throw new OperationError("Unable to parse JSON to CSV: " + err.toString());
} }
@ -109,11 +110,12 @@ class JSONToCSV extends Operation {
* Correctly escapes a cell's contents based on the cell and row delimiters. * Correctly escapes a cell's contents based on the cell and row delimiters.
* *
* @param {string} data * @param {string} data
* @param {boolean} force - Whether to force conversion of data to fit in a cell
* @returns {string} * @returns {string}
*/ */
escapeCellContents(data) { escapeCellContents(data, force=false) {
if (typeof data === "number") data = data.toString(); if (typeof data === "number") data = data.toString();
if (typeof data !== "string") data = JSON.stringify(data); if (force && typeof data !== "string") data = JSON.stringify(data);
// Double quotes should be doubled up // Double quotes should be doubled up
data = data.replace(/"/g, '""'); data = data.replace(/"/g, '""');