Merge pull request #13 from nteract/carriage

Escape carriage symbol

Author: rgbkrk

package.json

@@ -25,7 +25,8 @@
   "author": "Kyle Kelley <[email protected]>",
   "license": "MPL-2.0",
   "dependencies": {
-    "anser": "^1.1.0"
+    "anser": "^1.1.0",
+    "escape-carriage": "^1.0.1"
   },
   "peerDependencies": {
     "react": "^0.14.0 || ^15.0.0-0"

src/index.js

@@ -1,5 +1,6 @@
 const React = require('react');
 const Anser = require('anser');
+const escapeCarriageReturn = require('escape-carriage');
 
 /**
  * ansiToJson
@@ -11,13 +12,13 @@ const Anser = require('anser');
  * @return {Array} The parsed input.
  */
 function ansiToJSON(input) {
+  input = escapeCarriageReturn(input);
   return Anser.ansiToJson(input, {
     json: true,
     remove_empty: true,
   });
 }
 
-
 function ansiJSONtoStyleBundle(ansiBundle) {
   const style = {};
   if (ansiBundle.bg) {

test/index-spec.js

@@ -27,4 +27,10 @@ describe('Ansi', () => {
     expect(el.text()).to.equal('hello world');
     expect(el.html()).to.equal('<code><span>hello </span><span style="color:rgb(0, 187, 0);">wo</span><span style="background-color:rgb(187, 187, 0);color:rgb(0, 187, 0);">rl</span><span>d</span></code>');
   });
+
+  it('can handle carrigage symbol', () => {
+    const el = enzyme.shallow(React.createElement(Ansi, null, 'this sentence\rthat\nwill make you pause'));
+    expect(el).to.not.be.null;
+    expect(el.text()).to.equal('that sentence\nwill make you pause');
+  });
 });