Ignore nested arrow functions (#8)

package.json

@@ -2,7 +2,8 @@
   "version": "1.0.0",
   "license": "MIT",
   "scripts": {
-    "test": "npm run lint && jest",
+    "test": "npm run lint && npm run testonly",
+    "testonly": "jest",
     "lint": "zeit-eslint --ext .jsx,.js .",
     "lint-staged": "git diff --diff-filter=ACMRT --cached --name-only '*.js' '*.jsx' | xargs zeit-eslint"
   },

transforms/__testfixtures__/url-to-withrouter/url-property-not-part-of-this-props.input.js

@@ -0,0 +1,11 @@
+const examples = [{ name: 'ex1', url: 'https://google.fr/' }]
+
+export default () => (
+  <div>
+    {examples.map(example => (
+      <div key={example.name}>
+        {example.name} - {example.url}
+      </div>
+    ))}
+  </div>
+)

transforms/__testfixtures__/url-to-withrouter/url-property-not-part-of-this-props.output.js

@@ -0,0 +1,11 @@
+const examples = [{ name: 'ex1', url: 'https://google.fr/' }]
+
+export default () => (
+  <div>
+    {examples.map(example => (
+      <div key={example.name}>
+        {example.name} - {example.url}
+      </div>
+    ))}
+  </div>
+)

transforms/__tests__/url-to-withrouter.test.js

@@ -21,7 +21,8 @@ const fixtures = [
 	'with-nested-arrow-function',
 	'componentdidupdate',
 	'componentwillreceiveprops',
-	'first-parameter-hoc'
+	'first-parameter-hoc',
+	'url-property-not-part-of-this-props'
 ];
 
 for (const fixture of fixtures) {

transforms/url-to-withrouter.js

@@ -165,24 +165,31 @@ export default function transformer(file, api) {
 
 		const arrowFunctions = j(rule).find(j.ArrowFunctionExpression);
 		(() => {
-			if (arrowFunctions.length > 0) {
-				arrowFunctions.forEach((r) => {
-					if (!r.value.params || !r.value.params[0]) {
-						return;
-					}
-
-					const name = r.value.params[0].name;
-					const propsUrlUsage = getPropsUrlNodes(j, j(r), name);
-					if (propsUrlUsage.length === 0) {
-						return;
-					}
-
-					turnUrlIntoRouter(j, propsUrlUsage);
-					wrapDefaultExportInWithRouter();
-					addWithRouterImport(j, root);
-				});
+			if (arrowFunctions.length === 0) {
 				return;
 			}
+
+			arrowFunctions.forEach((r) => {
+				// This makes sure we don't match nested functions, only the top one
+				if (j(r).closest(j.Expression).length !== 0) {
+					return;
+				}
+
+				if (!r.value.params || !r.value.params[0]) {
+					return;
+				}
+
+				const name = r.value.params[0].name;
+				const propsUrlUsage = getPropsUrlNodes(j, j(r), name);
+				if (propsUrlUsage.length === 0) {
+					return;
+				}
+
+				turnUrlIntoRouter(j, propsUrlUsage);
+				wrapDefaultExportInWithRouter();
+				addWithRouterImport(j, root);
+			});
+			return;
 		})();
 
 		if (declaration.type === 'CallExpression') {