fix: use correct line endings on windows when using prettyprint, ndjs…

…on or transforms
juanjoDiaz · Apr 23, 2022 · 3c27a69 · 3c27a69
1 parent 60dcefc
commit 3c27a69
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 27 deletions.
diff --git a/bin/json2csv.js b/bin/json2csv.js
@@ -76,9 +76,9 @@ function getOutputStream(outputPath, config) {
   return process.stdout;
 }
 
-async function getInput(inputPath, ndjson) {
+async function getInput(inputPath, ndjson, eol) {
   if (!inputPath) return getInputFromStdin();
-  if (ndjson) return parseNdJson(await readFile(inputPath, 'utf8'));
+  if (ndjson) return parseNdJson(await readFile(inputPath, 'utf8'), eol);
   return require(inputPath);
 }
 
@@ -104,15 +104,15 @@ async function getInputFromStdin() {
 async function processOutput(outputPath, csv, config) {
   if (!outputPath) {
     // eslint-disable-next-line no-console
-    config.pretty ? (new TablePrinter(config)).printCSV(csv) : console.log(csv);
+    config.pretty ? (new TablePrinter(config)).printCSV(csv) : process.stdout.write(csv);
     return;
   }
 
   await writeFile(outputPath, csv);
 }
 
 async function processInMemory(config, opts) {
-  const input = await getInput(program.input, config.ndjson);
+  const input = await getInput(program.input, config.ndjson, config.eol);
   const output = new JSON2CSVParser(opts).parse(input);
   await processOutput(program.output, output, config);
 }

diff --git a/bin/utils/TablePrinter.js b/bin/utils/TablePrinter.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const os = require('os');
 const { Writable } = require('stream');
 
 const MIN_CELL_WIDTH = 15;
@@ -44,14 +45,14 @@ class TablePrinter {
   }
 
   print(top, lines, bottom) {
-    const table = `${top}\n`
+    const table = `${top}${os.EOL}`
       + lines
         .map(row => this.formatRow(row))
-        .join(`\n${this.middleLine}\n`)
-      + (bottom ? `\n${bottom}` : '');
+        .join(`${os.EOL}${this.middleLine}${os.EOL}`)
+      + os.EOL
+      + (bottom ? bottom : '');
 
-    // eslint-disable-next-line no-console
-    console.log(table);  
+    process.stdout.write(table);  
   }
 
   formatRow(row) {
@@ -66,7 +67,7 @@ class TablePrinter {
 
     return Array(height).fill('')
       .map((_, i) => `│${processedCells.map(cell => cell[i]).join('│')}│`)
-      .join('\n');
+      .join(os.EOL);
   }
 
   formatCell(content, heigth, width) {

diff --git a/bin/utils/parseNdjson.js b/bin/utils/parseNdjson.js
@@ -1,8 +1,8 @@
 'use strict';
 
-function parseNdJson(input) {
+function parseNdJson(input, eol) {
   return input
-    .split('\n')
+    .split(eol)
     .map(line => line.trim())
     .filter(line => line !== '')
     .map(line=> JSON.parse(line));

diff --git a/lib/JSON2CSVStreamParser.js b/lib/JSON2CSVStreamParser.js
@@ -50,8 +50,8 @@ class JSON2CSVStreamParser extends JSON2CSVBase {
   }
 
   getNdJsonTokenizer(asyncOpts) {
-    const tokenizer = new Tokenizer({ ...asyncOpts, separator: '\n' });
-    this.tokenParser = new TokenParser({ paths: ['$'], keepStack: false, separator: '\n' });
+    const tokenizer = new Tokenizer({ ...asyncOpts, separator: this.opts.eol });
+    this.tokenParser = new TokenParser({ paths: ['$'], keepStack: false, separator: this.opts.eol });
     this.configureCallbacks(tokenizer, this.tokenParser);
     return tokenizer;
   }

diff --git a/test/CLI.js b/test/CLI.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const os = require('os');
 const { mkdir, rm, readFile } = require('fs').promises;
 const { join: joinPath } = require('path');
 const { exec } = require('child_process');
@@ -53,7 +54,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
       t.fail('Exception expected.');  
     } catch (err) {
-      t.ok(err.message.includes('Unexpected SEPARATOR ("\\n") in state COMMA'));
+      t.ok(err.message.includes(`Unexpected SEPARATOR ("${os.EOL.replace('\r', '\\r').replace('\n', '\\n')}") in state COMMA`));
     }
   });
 
@@ -62,7 +63,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
     const { stdout: csv } = await execAsync(`${cli} -i "${getFixturePath('/json/ndjson.json')}" ${opts}`);
 
-    t.equal(csv, csvFixtures.ndjson + '\n'); // console.log append the new line
+    t.equal(csv, csvFixtures.ndjson);
   });
 
   testRunner.add('should error on invalid input file path', async (t) => {
@@ -116,7 +117,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
     const { stdout: csv } = await execAsync(`${cli} -i "${getFixturePath('/json/deepJSON.json')}" ${opts}`);
 
-    t.equal(csv, csvFixtures.deepJSON + '\n'); // console.log append the new line
+    t.equal(csv, csvFixtures.deepJSON);
   });
 
   testRunner.add('should parse json to csv and infer the fields automatically ', async (t) => {
@@ -354,7 +355,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
     const { stdout: csv } = await execution;
 
-    t.equal(csv, csvFixtures.default + '\n'); // console.log append the new line
+    t.equal(csv, csvFixtures.default);
   });
 
   testRunner.add('should error if stdin data is not valid with -s flag', async (t) => {

diff --git a/test/JSON2CSVAsyncParser.js b/test/JSON2CSVAsyncParser.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const os = require('os');
+
 const {
   AsyncParser: Parser,
   transforms: { flatten, unwind },
@@ -73,7 +75,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
       t.fail('Exception expected');
     } catch(err) {
-      t.equal(err.message, 'Unexpected SEPARATOR ("\\n") in state COMMA');
+      t.equal(err.message, `Unexpected SEPARATOR ("${os.EOL.replace('\r', '\\r').replace('\n', '\\n')}") in state COMMA`);
     }
   });
 
@@ -89,7 +91,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
       t.fail('Exception expected');
     } catch (err) {
-      t.equal(err.message, 'Unexpected SEPARATOR ("\\n") in state COMMA');
+      t.ok(err.message.includes(`Unexpected SEPARATOR ("${os.EOL.replace('\r', '\\r').replace('\n', '\\n')}") in state COMMA`));
     }
   });
 

diff --git a/test/JSON2CSVStreamParser.js b/test/JSON2CSVStreamParser.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const os = require('os');
+
 const {
   StreamParser: Parser,
   transforms: { flatten, unwind },
@@ -74,7 +76,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
       t.fail('Exception expected');
     } catch (err) {
-      t.equal(err.message, 'Unexpected SEPARATOR ("\\n") in state COMMA');
+      t.ok(err.message.includes(`Unexpected SEPARATOR ("${os.EOL.replace('\r', '\\r').replace('\n', '\\n')}") in state COMMA`));
     }
   });
 

diff --git a/test/JSON2CSVTransform.js b/test/JSON2CSVTransform.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const os = require('os');
+
 const {
   Transform: Parser,
   transforms: { flatten, unwind },
@@ -71,7 +73,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
       t.fail('Exception expected');
     } catch(err) {
-      t.equal(err.message, 'Unexpected SEPARATOR ("\\n") in state COMMA');
+      t.equal(err.message, `Unexpected SEPARATOR ("${os.EOL.replace('\r', '\\r').replace('\n', '\\n')}") in state COMMA`);
     }
   });
 
@@ -87,7 +89,7 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
       t.fail('Exception expected');
     } catch (err) {
-      t.equal(err.message, 'Unexpected SEPARATOR ("\\n") in state COMMA');
+      t.ok(err.message.includes(`Unexpected SEPARATOR ("${os.EOL.replace('\r', '\\r').replace('\n', '\\n')}") in state COMMA`));
     }
   });
 

diff --git a/test/fixtures/csv/prettyprint.txt b/test/fixtures/csv/prettyprint.txt
@@ -8,4 +8,4 @@
 │ "Mercedes"         │ 20000         │ "yellow"      │
 ├────────────────────┼───────────────┼───────────────┤
 │ "Porsche"          │ 30000         │ "green"       │
-└────────────────────┴───────────────┴───────────────┘
+└────────────────────┴───────────────┴───────────────┘
diff --git a/test/fixtures/csv/prettyprintWithoutHeader.txt b/test/fixtures/csv/prettyprintWithoutHeader.txt
@@ -6,4 +6,4 @@
 │ "Mercedes"    │ 20000         │ "yellow"      │
 ├───────────────┼───────────────┼───────────────┤
 │ "Porsche"     │ 30000         │ "green"       │
-└───────────────┴───────────────┴───────────────┘
+└───────────────┴───────────────┴───────────────┘
diff --git a/test/fixtures/csv/prettyprintWithoutRows.txt b/test/fixtures/csv/prettyprintWithoutRows.txt
@@ -1,3 +1,3 @@
 ┌────────────────┬────────────────┬────────────────┐
 │ "fieldA"       │ "fieldB"       │ "fieldC"       │
-└────────────────┴────────────────┴────────────────┘
+└────────────────┴────────────────┴────────────────┘
diff --git a/test/parseNdjson.js b/test/parseNdjson.js
@@ -1,10 +1,11 @@
 'use strict';
 
+const os = require('os');
 const parsendjson = require('../bin/utils/parseNdjson');
 
 module.exports = (testRunner, jsonFixtures) => {
   testRunner.add('should parse line-delimited JSON', (t) => {
-    const parsed = parsendjson(jsonFixtures.ndjson());
+    const parsed = parsendjson(jsonFixtures.ndjson(), os.EOL);
 
     t.equal(parsed.length, 4, 'parsed input has correct length');
   });