Merge pull request #197 from smacker/fix_error_handling

Small face-lifting before solving the issue with blank screen

package.json

@@ -19,7 +19,7 @@
     "redux-devtools-extension": "^2.13.2",
     "redux-thunk": "^2.2.0",
     "styled-components": "^3.3.3",
-    "uast-viewer": "^0.2.0"
+    "uast-viewer": "^0.3.0"
   },
   "devDependencies": {
     "enzyme": "^3.3.0",
@@ -42,6 +42,7 @@
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "lint": "eslint 'src/**/*.js' && prettier -l 'src/**/*.js'",
-    "fix-lint-errors": "eslint --fix 'src/**/*.js'; prettier --write 'src/**/*.js'"
+    "fix-lint-errors":
+      "eslint --fix 'src/**/*.js'; prettier --write 'src/**/*.js'"
   }
 }

src/components/UASTViewer.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import Viewer from 'uast-viewer';
+import FlatUASTViewer from 'uast-viewer';
 import styled from 'styled-components';
 
 const ROOT_ID = 1;
@@ -30,21 +30,21 @@ const NotFound = styled.div`
 class UASTViewer extends Component {
   render() {
     const { uastViewerProps, showLocations } = this.props;
-    const { uast } = uastViewerProps;
+    const { flatUast } = uastViewerProps;
 
-    if (!uast) {
+    if (!flatUast) {
       return null;
     }
 
-    const searchResults = getSearchResults(uast);
+    const searchResults = getSearchResults(flatUast);
     let rootIds = searchResults || [ROOT_ID];
 
     if (searchResults && !searchResults.length) {
       return <NotFound>Nothing found</NotFound>;
     }
 
     return (
-      <Viewer
+      <FlatUASTViewer
         {...uastViewerProps}
         rootIds={rootIds}
         showLocations={showLocations}

src/components/UASTViewer.test.js

@@ -9,7 +9,7 @@ const shouldMatchSnapshot = comp => {
 };
 
 it('empty render', () => {
-  shouldMatchSnapshot(<UASTViewer uastViewerProps={{ uast: {} }} />);
+  shouldMatchSnapshot(<UASTViewer uastViewerProps={{ flatUast: {} }} />);
 });
 
 const posValue = {
@@ -28,7 +28,7 @@ const posValue = {
 
 it('tree render', () => {
   const uastViewerProps = {
-    uast: {
+    flatUast: {
       1: { id: 1, expanded: true, n: { '@pos': posValue } },
     },
   };
@@ -40,7 +40,7 @@ it('tree render', () => {
 
 it('tree render with locations', () => {
   const uastViewerProps = {
-    uast: {
+    flatUast: {
       1: { id: 1, expanded: true, n: { '@pos': posValue } },
     },
   };
@@ -53,7 +53,7 @@ it('tree render with locations', () => {
 describe('search results', () => {
   it('render', () => {
     const uastViewerProps = {
-      uast: {
+      flatUast: {
         1: { id: 1, n: [{ id: 2 }] },
         2: { id: 2, n: { '@type': 'TestType' } },
       },
@@ -64,7 +64,7 @@ describe('search results', () => {
 
   it('empty', () => {
     const uastViewerProps = {
-      uast: {
+      flatUast: {
         1: { id: 1, n: [] },
       },
     };

src/examples/javascript.js.js

@@ -1,4 +1,4 @@
-export const javascript_example_1 = `  // Set variables
+export const javascript_example_1 = `// Set variables
 var user = { firstname: "Homer", surname: "Rubble", email: "[email protected]" };
 var output = "";
 

src/state/__snapshots__/errors.test.js.snap

@@ -13,6 +13,19 @@ Array [
 ]
 `;
 
+exports[`errors/reducer ADD single error 1`] = `
+Array [
+  "error1",
+]
+`;
+
+exports[`errors/reducer ADD single error 2`] = `
+Array [
+  "error1",
+  "error2",
+]
+`;
+
 exports[`errors/reducer CLEAR 1`] = `Array []`;
 
 exports[`errors/reducer REMOVE 1`] = `

src/state/errors.js

@@ -31,6 +31,10 @@ function error(obj, type) {
 }
 
 function convertErrors(errors, type) {
+  // it's hard to make sure that errors is an array on higher level
+  if (!Array.isArray(errors)) {
+    errors = [errors];
+  }
   return errors.filter(e => !!e).map(e => error(e, type));
 }
 

src/state/errors.test.js

@@ -13,6 +13,18 @@ describe('errors/reducer', () => {
     ).toMatchSnapshot();
   });
 
+  it('ADD single error', () => {
+    expect(
+      reducer(initialState, { type: ADD, errors: 'error1' })
+    ).toMatchSnapshot();
+    expect(
+      reducer(initialState.concat(['error1']), {
+        type: ADD,
+        errors: ['error2'],
+      })
+    ).toMatchSnapshot();
+  });
+
   it('SET', () => {
     expect(
       reducer(initialState.concat(['error1']), {

yarn.lock

@@ -8454,10 +8454,10 @@ ua-parser-js@^0.7.18:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
   integrity sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==
 
-uast-viewer@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/uast-viewer/-/uast-viewer-0.2.0.tgz#081cc7f2f67bf5db03dc53cd8a451f491c49e699"
-  integrity sha512-BTYLYY6xSu0ITjC4lO2Kb14Nw4oYKh7i3mChf4HygNJRTJ93FHaYTmyqS38cA3+1FsGnEyKSz+BwATGONLJPDQ==
+uast-viewer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/uast-viewer/-/uast-viewer-0.3.0.tgz#ea5857521e573418cd71c050027f40a413bd8a7c"
+  integrity sha512-uSYBdRX5GRsrYHqBo6m07YcM7nkoP6RnbUkH0x7+eRUlxpwaNthYjsjv0rgt2yGMfn5NEjdBULBCG9ob4TZs0Q==
 
 [email protected], uglify-js@^3.0.13, uglify-js@^3.1.4:
   version "3.4.9"