Handle recursive code (#148)

Author: oliviertassinari

src/index.js

@@ -227,7 +227,7 @@ export default function(api) {
             })
           } else {
             throw new Error(
-              'react-remove-prop-types: removeImport and mode=remove can not be used at the same time.'
+              'transform-react-remove-prop-type: removeImport = true and mode != "remove" can not be used at the same time.'
             )
           }
         }

src/isStatelessComponent.js

@@ -1,5 +1,7 @@
 // @flow weak
 
+const traversed = Symbol('traversed')
+
 function isJSXElementOrReactCreateElement(path) {
   let visited = false
 
@@ -9,7 +11,8 @@ function isJSXElementOrReactCreateElement(path) {
 
       if (
         callee.matchesPattern('React.createElement') ||
-        callee.matchesPattern('React.cloneElement')
+        callee.matchesPattern('React.cloneElement') ||
+        callee.node.name === 'cloneElement'
       ) {
         visited = true
       }
@@ -22,12 +25,16 @@ function isJSXElementOrReactCreateElement(path) {
   return visited
 }
 
-function isReturningJSXElement(path) {
+function isReturningJSXElement(path, iteration = 0) {
   // Early exit for ArrowFunctionExpressions, there is no ReturnStatement node.
   if (path.node.init && path.node.init.body && isJSXElementOrReactCreateElement(path)) {
     return true
   }
 
+  if (iteration > 20) {
+    throw new Error('transform-react-remove-prop-type: infinite loop detected.')
+  }
+
   let visited = false
 
   path.traverse({
@@ -57,7 +64,14 @@ function isReturningJSXElement(path) {
           return
         }
 
-        if (isReturningJSXElement(binding.path)) {
+        // Prevents infinite traverse loop.
+        if (binding.path[traversed]) {
+          return
+        }
+
+        binding.path[traversed] = true
+
+        if (isReturningJSXElement(binding.path, iteration + 1)) {
           visited = true
         }
       }

test/fixtures.spec.js test/fixtures.test.jstest/fixtures.spec.js renamed to test/fixtures.test.js

@@ -22,8 +22,8 @@ describe('fixtures', () => {
       const fixtureDir = path.join(fixturesDir, caseName)
 
       // Only run a specific test
-      // if (caseName !== 'issue-106') {
-      //   return;
+      // if (caseName !== 'recursive') {
+      //   return
       // }
 
       modes.forEach(mode => {

test/fixtures/recursive/actual.js

@@ -0,0 +1,27 @@
+import { cloneElement } from 'react'
+import PropTypes from 'prop-types'
+
+export default function Composer(props) {
+  return renderRecursive(props.children, props.components)
+}
+
+Composer.propTypes = {
+  children: PropTypes.func.isRequired,
+  components: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.element, PropTypes.func]))
+    .isRequired,
+}
+
+function renderRecursive(render, remaining, results) {
+  results = results || []
+  if (!remaining[0]) {
+    return render(results)
+  }
+
+  function nextRender(value) {
+    return renderRecursive(render, remaining.slice(1), results.concat([value]))
+  }
+
+  return typeof remaining[0] === 'function'
+    ? remaining[0]({ results, render: nextRender })
+    : cloneElement(remaining[0], { children: nextRender })
+}

test/fixtures/recursive/expected-remove-es6.js

@@ -0,0 +1,24 @@
+import { cloneElement } from 'react';
+import PropTypes from 'prop-types';
+export default function Composer(props) {
+  return renderRecursive(props.children, props.components);
+}
+
+function renderRecursive(render, remaining, results) {
+  results = results || [];
+
+  if (!remaining[0]) {
+    return render(results);
+  }
+
+  function nextRender(value) {
+    return renderRecursive(render, remaining.slice(1), results.concat([value]));
+  }
+
+  return typeof remaining[0] === 'function' ? remaining[0]({
+    results,
+    render: nextRender
+  }) : cloneElement(remaining[0], {
+    children: nextRender
+  });
+}

test/mocha.opts

@@ -1,4 +1,4 @@
 --require @babel/register
 --reporter dot
 --recursive
-test/{,**/}*.spec.js
+test/{,**/}*.test.js