fix(stateless-to-stateful): fixed crash when converting component wit…

…h JSX behind logical opetator
wix-incubator · Nov 8, 2018 · 9427e5e · 9427e5e
1 parent da18600
commit 9427e5e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/modules/statless-to-stateful.ts b/src/modules/statless-to-stateful.ts
@@ -24,6 +24,8 @@ function getRenderFunctionBody(statelessComponentBody) {
   } else if(t.isJSXElement(statelessComponentBody)) {
     const body  = t.isParenthesizedExpression(statelessComponentBody) ? statelessComponentBody : t.parenthesizedExpression(statelessComponentBody);
     return t.blockStatement([t.returnStatement(body)]);
+  } else {
+    return t.blockStatement([t.returnStatement(statelessComponentBody)]);
   }
 }
 

diff --git a/src/test/jsx.test.ts b/src/test/jsx.test.ts
@@ -260,6 +260,28 @@ describe('jsx module', function () {
             expect(fileSystem.replaceTextInFile).to.have.been.calledWith('class foo extends Component {\n  constructor(props) {\n    super(props);\n  }\n\n  render() {\n    return (<div></div>);\n  }\n\n}', selectedTextStart, selectedTextEnd, '/source.js');
         });
 
+        it('creates stateful component from arrow function', async () => {
+          sandbox.stub(editor, 'selectedText').returns(`
+              const foo = (props) => {
+                  return (<div></div>);
+              }
+          `);
+
+          await statelessToStatefulComponent();
+
+          expect(fileSystem.replaceTextInFile).to.have.been.calledWith('class foo extends Component {\n  constructor(props) {\n    super(props);\n  }\n\n  render() {\n    return (<div></div>);\n  }\n\n}', selectedTextStart, selectedTextEnd, '/source.js');
+      });
+
+      it('creates stateful component from arrow function with JSX element being behind an AND operator', async () => {
+        sandbox.stub(editor, 'selectedText').returns(`
+            const foo = (props) => true && <div></div>;
+        `);
+
+        await statelessToStatefulComponent();
+
+        expect(fileSystem.replaceTextInFile).to.have.been.calledWith('class foo extends Component {\n  constructor(props) {\n    super(props);\n  }\n\n  render() {\n    return true && <div></div>;\n  }\n\n}', selectedTextStart, selectedTextEnd, '/source.js');
+    });
+
         it('wraps returned JSX in parenthesis if they are missing ', async () => {
           sandbox.stub(editor, 'selectedText').returns(`
               const foo = (props) => {