Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 15 additions & 16 deletions src/io/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -2272,6 +2272,16 @@ function escapeHelper(content) {
.replace(/'/g, ''');
}

// RFC 4180 escape: double inner quotes, wrap when value has comma/quote/newline
function csvEscape(val, ext) {
if (ext !== 'csv') return String(val);
let s = String(val);
if (s.includes(',') || s.includes('"') || s.includes('\n')) {
return '"' + s.replace(/"/g, '""') + '"';
}
return s;
}

/**
* Writes the contents of a <a href="#/p5.Table">Table</a> object to a file. Defaults to a
* text file with comma-separated-values ('csv') but can also
Expand Down Expand Up @@ -2331,32 +2341,21 @@ p5.prototype.saveTable = function(table, filename, options) {
if (header[0] !== '0') {
for (let h = 0; h < header.length; h++) {
if (h < header.length - 1) {
pWriter.write(header[h] + sep);
pWriter.write(csvEscape(header[h], ext) + sep);
} else {
pWriter.write(header[h]);
pWriter.write(csvEscape(header[h], ext));
}
}
pWriter.write('\n');
}

// make rows
for (let i = 0; i < table.rows.length; i++) {
let j;
for (j = 0; j < table.rows[i].arr.length; j++) {
for (let j = 0; j < table.rows[i].arr.length; j++) {
if (j < table.rows[i].arr.length - 1) {
//double quotes should be inserted in csv only if contains comma separated single value
if (ext === 'csv' && String(table.rows[i].arr[j]).includes(',')) {
pWriter.write('"' + table.rows[i].arr[j] + '"' + sep);
} else {
pWriter.write(table.rows[i].arr[j] + sep);
}
pWriter.write(csvEscape(table.rows[i].arr[j], ext) + sep);
} else {
//double quotes should be inserted in csv only if contains comma separated single value
if (ext === 'csv' && String(table.rows[i].arr[j]).includes(',')) {
pWriter.write('"' + table.rows[i].arr[j] + '"');
} else {
pWriter.write(table.rows[i].arr[j]);
}
pWriter.write(csvEscape(table.rows[i].arr[j], ext));
}
}
pWriter.write('\n');
Expand Down
12 changes: 6 additions & 6 deletions test/unit/io/saveTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ suite('saveTable', function() {
myp5.saveTable(myTable, 'filename');
let myBlob = blobContainer.blob;
let text = await myBlob.text();
let myTableStr = myTable.columns.join(',') + '\n';
for (let i = 0; i < myTable.rows.length; i++) {
myTableStr += myTable.rows[i].arr.join(',') + '\n';
}

assert.strictEqual(text, myTableStr);
let expected =
'name,age,height\n' +
'David,31,80\n' +
'"David, Jr.",11,61.5\n' +
'"David,\nSr. ""the boss""",95,88\n';
assert.strictEqual(text, expected);
},
true
);
Expand Down