Fix bug related to non exported functions

bvic23 · Sep 14, 2017 · 5bb2510 · 5bb2510
1 parent 53d2472
commit 5bb2510
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 5 deletions.
diff --git a/lib/__fixtures__/class-and-function-output.js b/lib/__fixtures__/class-and-function-output.js
@@ -0,0 +1,16 @@
+/* eslint-disable */
+import { TouchableNativeFeedback, Text } from 'react-native';
+import React, { Component, PropTypes } from 'react';
+
+const renderItem = ({ item: { date } }) => <View>{date}</View>;
+
+export default class Button extends Component {
+    render() {
+        return <TouchableNativeFeedback onPress={this.props.onPress}>
+                <Text style={{ color: 'green' }}>
+                    {this.props.title}
+                </Text>
+            </TouchableNativeFeedback>;
+    }
+}
+
diff --git a/lib/__fixtures__/class-and-function.js b/lib/__fixtures__/class-and-function.js
@@ -0,0 +1,17 @@
+/* eslint-disable */
+import { TouchableNativeFeedback, Text } from 'react-native';
+import React, { Component, PropTypes } from 'react';
+
+const renderItem = ({ item: { date } }) => <View>{date}</View>;
+
+export default class Button extends Component {
+    render() {
+        return (
+            <TouchableNativeFeedback onPress={this.props.onPress}>
+                <Text style={{ color: 'green' }}>
+                    {this.props.title}
+                </Text>
+            </TouchableNativeFeedback>
+        );
+    }
+}
diff --git a/lib/__tests__/plugin.test.js b/lib/__tests__/plugin.test.js
@@ -162,3 +162,14 @@ test('const with destructure in param, should change', () => {
     // When
     expect(l(code)).toEqual(l(target));
 });
+
+test('simple function with destructed param', () => {
+    // Given
+    const { source, target } = given('class-and-function');
+
+    // When
+    const code = transform(source);
+
+    // When
+    expect(l(code)).toEqual(l(target));
+});
diff --git a/lib/index.js b/lib/index.js
@@ -85,6 +85,7 @@ module.exports = function({ Plugin, types: t }) {
     const arrowVisitor = function(state) {
         return function(path) {
             if (process.env.BABEL_ENV === 'production') return;
+
             const filename = state.file.opts.filename;
             const arrowFunction = path.node;
             const arrowBody = arrowFunction.body;
@@ -102,8 +103,16 @@ module.exports = function({ Plugin, types: t }) {
                 arrowBody.type === 'BlockStatement' &&
                 lastStatement.type === 'ReturnStatement' &&
                 lastStatement.argument.type === 'JSXElement';
+            const isExportDefaultOrVariable = ['ExportDefaultDeclaration', 'VariableDeclarator'].includes(path.parentPath.type)
             if (!(isJSXElement || isEmbeddedReturn)) return;
-            if (!['ExportDefaultDeclaration', 'VariableDeclarator'].includes(path.parentPath.type)) return;
+            if (!isExportDefaultOrVariable) return;
+
+            if (path.parent.id) {
+                const code = state.file.code;
+                const functionName = path.parent.id.name;
+                const isExportConst = path.parentPath.parentPath.parentPath.type === 'ExportNamedDeclaration';
+                if (!isExportConst && code.indexOf("export default " + functionName) === -1) return
+            }
 
             const id = path.parentPath.node.id;
             const className = id ? id.name : 'Comp';

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-functional-hmr",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "HMR for functional components in React Native",
   "repository" : { 
     "type" : "git",
@@ -23,9 +23,9 @@
     "hot-reload",
     "hmr",
     "functional-components"],
-  "author": "bvic23",
-  "license": "MIT",
-  "devDependencies": {
+    "author": "bvic23",
+    "license": "MIT",
+    "devDependencies": {
     "babel-core": "^6.25.0",
     "babel-eslint": "^7.2.3",
     "babel-jest": "^20.0.3",