Merge pull request #108 from oliviertassinari/issue-106

fix: more aggressive remove-proptypes exploration

Author: oliviertassinari

package.json

@@ -36,6 +36,7 @@
     "babel-cli": "^6.22.2",
     "babel-core": "^6.22.1",
     "babel-eslint": "^7.1.1",
+    "babel-generator": "^6.24.1",
     "babel-plugin-flow-react-proptypes": "^2.1.3",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-preset-es2015": "^6.22.0",

src/index.js

@@ -2,6 +2,8 @@
 /* eslint-disable global-require, import/no-dynamic-require */
 
 import { visitors } from 'babel-traverse';
+// import generate from 'babel-generator';
+// console.log(generate(node).code);
 import isAnnotatedForRemoval from './isAnnotatedForRemoval';
 import isStatelessComponent from './isStatelessComponent';
 import remove from './remove';
@@ -138,27 +140,27 @@ export default function ({ template, types }) {
               return;
             }
 
+            const forceRemoval = isAnnotatedForRemoval(path.node.left);
+
+            if (forceRemoval) {
+              remove(path, globalOptions, { type: 'assign' });
+            }
+
             const className = node.left.object.name;
             const binding = scope.getBinding(className);
 
             if (!binding) {
               return;
             }
 
-            const forceRemoval = isAnnotatedForRemoval(path.node.left);
-
             if (binding.path.isClassDeclaration()) {
               const superClass = binding.path.get('superClass');
 
-              if (isReactClass(superClass, scope) || forceRemoval) {
-                remove(path, globalOptions, {
-                  type: 'class assign',
-                });
+              if (isReactClass(superClass, scope)) {
+                remove(path, globalOptions, { type: 'assign' });
               }
-            } else if (isStatelessComponent(binding.path) || forceRemoval) {
-              remove(path, globalOptions, {
-                type: 'stateless',
-              });
+            } else if (isStatelessComponent(binding.path)) {
+              remove(path, globalOptions, { type: 'assign' });
             }
           },
         });

src/remove.js

@@ -78,8 +78,7 @@ export default function remove(path, globalOptions, options) {
         break;
       }
 
-      case 'class assign':
-      case 'stateless':
+      case 'assign':
         if (mode === 'unsafe-wrap') {
           path.replaceWith(unsafeWrapTemplate(
             {

test/fixtures.spec.js

@@ -21,7 +21,7 @@ describe('fixtures', () => {
       const fixtureDir = path.join(fixturesDir, caseName);
 
       // Only run a specific test
-      // if (caseName !== 'create-class') {
+      // if (caseName !== 'issue-106') {
       //   return;
       // }
 

test/fixtures/issue-106/actual.js

@@ -0,0 +1,28 @@
+import React, { Component, createElement } from 'react';
+import PropTypes from 'prop-types';
+
+class RouteNode extends Component {
+  render() {
+    const { previousRoute, route } = this.state;
+    return createElement(RouteSegment, Object.assign({}, this.props, route, previousRoute));
+  }
+}
+
+const storeName = 'storeName';
+
+RouteNode.wrappedComponent.propTypes /* remove-proptypes */ = {
+  [storeName]: PropTypes.object.isRequired,
+};
+
+class BaseLink extends Component {
+  render() {
+    return React.createElement('a', { href, className, onClick }, this.props.children);
+  }
+}
+
+BaseLink.propTypes = {
+  routeOptions: PropTypes.object,
+  [storeName]: PropTypes.object,
+  route: PropTypes.object,
+  ['previousRoute']: PropTypes.object,
+};

test/fixtures/issue-106/expected-wrap-es6.js

@@ -0,0 +1,28 @@
+import React, { Component, createElement } from 'react';
+import PropTypes from 'prop-types';
+
+class RouteNode extends Component {
+  render() {
+    const { previousRoute, route } = this.state;
+    return createElement(RouteSegment, Object.assign({}, this.props, route, previousRoute));
+  }
+}
+
+const storeName = 'storeName';
+
+RouteNode.wrappedComponent.propTypes /* remove-proptypes */ = process.env.NODE_ENV !== "production" ? {
+  [storeName]: PropTypes.object.isRequired
+} : {};
+
+class BaseLink extends Component {
+  render() {
+    return React.createElement('a', { href, className, onClick }, this.props.children);
+  }
+}
+
+BaseLink.propTypes = process.env.NODE_ENV !== "production" ? {
+  routeOptions: PropTypes.object,
+  [storeName]: PropTypes.object,
+  route: PropTypes.object,
+  ['previousRoute']: PropTypes.object
+} : {};