Handle carriage returns properly

papb · Oct 22, 2020 · 65cb099 · 65cb099
1 parent c21c19f
commit 65cb099
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/source/tsv2json.ts b/source/tsv2json.ts
@@ -24,10 +24,11 @@ function extractFirstCell(tsvCharacters: NonemptyArray<string>): CellExtractionR
 
 	while (index < tsvCharacters.length) {
 		const char = tsvCharacters[index];
+		const nextChar = tsvCharacters[index + 1];
 
 		if (escapedMode) {
 			if (char === '"') {
-				if (tsvCharacters[index + 1] === '"') {
+				if (nextChar === '"') {
 					result.push('"');
 					index++;
 				} else {
@@ -37,6 +38,11 @@ function extractFirstCell(tsvCharacters: NonemptyArray<string>): CellExtractionR
 				result.push(char);
 			}
 		} else {
+			if (char === '\r' && nextChar === '\n') {
+				index++;
+				return done(true);
+			}
+
 			if (char === '\n') return done(true);
 			if (char === '\t') return done(false);
 			result.push(char);

diff --git a/test/test.ts b/test/test.ts
@@ -44,6 +44,9 @@ test('tsv2json', t => {
 	const complexJsonWithPreparedEmptyRow = complexJson.map(x => x.length === 0 ? [''] : x);
 	t.deepEqual(tsv2json(complexFullyQuotedTsv), complexJsonWithPreparedEmptyRow);
 	t.deepEqual(tsv2json(complexQuotedAsNeededTsv), complexJsonWithPreparedEmptyRow);
+
+	t.deepEqual(tsv2json('"aa\r\nbb"'), [['aa\r\nbb']]);
+	t.deepEqual(tsv2json('aa\r\nbb'), [['aa'], ['bb']]);
 });
 
 test('tsv2json throws on invalid input', t => {