fix: from-map rule is not working on TS files

package.json

@@ -16,13 +16,15 @@
     "@ava/babel": "^1.0.1",
     "@freaktechnik/eslint-config-node": "^7.1.0",
     "@freaktechnik/eslint-config-test": "^7.1.0",
+    "@typescript-eslint/parser": "^2.25.0",
     "ava": "^3.5.2",
     "codecov": "^3.6.5",
     "eclint": "^2.8.1",
     "eslint": "^6.8.0",
     "eslint-ava-rule-tester": "^4.0.0",
     "eslint-plugin-eslint-plugin": "^2.2.1",
-    "nyc": "^15.0.1"
+    "nyc": "^15.0.1",
+    "typescript": "^3.8.3"
   },
   "peerDependencies": {
     "eslint": ">=3.0.0"
@@ -49,6 +51,10 @@
   },
   "dependencies": {},
   "ava": {
-    "babel": true
+    "babel": true,
+    "files": [
+      "test/**/*",
+      "!test/helpers"
+    ]
   }
 }

rules/from-map.js

@@ -76,18 +76,32 @@ module.exports = {
                             }
                             // The original map callback from Array.from gets nested as a parameter to the callback from map.
                             const lastCallback = getCallback(mapCallback, mapThisArgument, `${firstCallback}${restParameterString}`),
-                                restParameters = sourceCode.getText().slice(callback.end, parent.end);
+                                [
+                                    callbackStartLocation
+                                    , callbackEndLocation
+                                ] = callback.range,
+                                [
+                                    , parentEndLocation
+                                ] = parent.range,
+                                [
+                                    , nodeEndLocation
+                                ] = node.range,
+                                restParameters = sourceCode.getText().slice(callbackEndLocation, parentEndLocation);
                             return fixer.replaceTextRange([
-                                callback.start,
-                                node.end
+                                callbackStartLocation,
+                                nodeEndLocation
                             ], `${functionStart}${lastCallback}${functionEnd}${restParameters}`);
                         }
 
                         // Move the map arguments to from.
-                        const [ firstArgument ] = node.arguments;
+                        const [ firstArgument ] = node.arguments,
+                            [ argumentStartLocation ] = firstArgument.range,
+                            [
+                                , parentEndLocation
+                            ] = parent.range;
                         return fixer.replaceTextRange([
-                            parent.end - FUNCTION_END.length,
-                            firstArgument.start
+                            parentEndLocation - FUNCTION_END.length,
+                            argumentStartLocation
                         ], PARAM_SEPARATOR);
                     }
                 });

test/helpers/from-map-test-cases.js

@@ -0,0 +1,63 @@
+module.exports = {
+    valid: [
+        'array.map((t) => t.id)',
+        'Array.from(iterable).some((t) => t !== "a")',
+        'Array.from(iterable, (t) => t.id)'
+    ],
+    invalid: [
+        {
+            code: 'Array.from(iterable).map((t) => t.id)',
+            errors: [ {
+                message: 'Use mapFn callback of Array.from instead of map()',
+                column: 1,
+                line: 1
+            } ],
+            output: 'Array.from(iterable, (t) => t.id)'
+        },
+        {
+            code: 'Array.from(iterable, (t) => t.id, a).map((t) => t[0], b)',
+            errors: [ {
+                message: 'Use mapFn callback of Array.from instead of map()',
+                column: 1,
+                line: 1
+            } ],
+            output: 'Array.from(iterable, (t) => ((t) => t[0])(((t) => t.id)(t)), a)'
+        },
+        {
+            code: 'Array.from(iterable, function(t) { return t.id; }, a).map((t) => t[0])',
+            errors: [ {
+                message: 'Use mapFn callback of Array.from instead of map()',
+                column: 1,
+                line: 1
+            } ],
+            output: 'Array.from(iterable, function(t) { return ((t) => t[0])((function(t) { return t.id; }).call(this, t)); }, a)'
+        },
+        {
+            code: 'Array.from(iterable, function(t) { return t.id; }, a).map(function(t) { return t[0]; }, b)',
+            errors: [ {
+                message: 'Use mapFn callback of Array.from instead of map()',
+                column: 1,
+                line: 1
+            } ],
+            output: 'Array.from(iterable, function(t) { return (function(t) { return t[0]; }).call(b, (function(t) { return t.id; }).call(this, t)); }, a)'
+        },
+        {
+            code: 'Array.from(iterable, function(u) { return u.id; }, a).map(function(t, i) { return t[0]; }, b)',
+            errors: [ {
+                message: 'Use mapFn callback of Array.from instead of map()',
+                column: 1,
+                line: 1
+            } ],
+            output: 'Array.from(iterable, function(t, i) { return (function(t, i) { return t[0]; }).call(b, (function(u) { return u.id; }).call(this, t, i), i); }, a)'
+        },
+        {
+            code: 'Array.from(iterable, function(u, i) { return u.id; }, a).map(function(t) { return t[0]; }, b)',
+            errors: [ {
+                message: 'Use mapFn callback of Array.from instead of map()',
+                column: 1,
+                line: 1
+            } ],
+            output: 'Array.from(iterable, function(u, i) { return (function(t) { return t[0]; }).call(b, (function(u, i) { return u.id; }).call(this, u, i), i); }, a)'
+        }
+    ]
+};

test/rules/from-map-ts.js

@@ -0,0 +1,14 @@
+import AvaRuleTester from "eslint-ava-rule-tester";
+import test from "ava";
+import rule from "../../rules/from-map";
+import testCases from '../helpers/from-map-test-cases';
+
+const ruleTester = new AvaRuleTester(test, {
+    parser: require.resolve('@typescript-eslint/parser'),
+    parserOptions: {
+        ecmaVersion: 2020,
+        sourceType: 'module'
+    }
+});
+
+ruleTester.run('from-map', rule, testCases);

test/rules/from-map.js

@@ -1,73 +1,12 @@
 import test from 'ava';
 import AvaRuleTester from 'eslint-ava-rule-tester';
 import rule from '../../rules/from-map';
+import testCases from "../helpers/from-map-test-cases";
 
 const ruleTester = new AvaRuleTester(test, {
     parserOptions: {
         ecmaVersion: 2015
     }
 });
 
-ruleTester.run('from-map', rule, {
-    valid: [
-        'array.map((t) => t.id)',
-        'Array.from(iterable).some((t) => t !== "a")',
-        'Array.from(iterable, (t) => t.id)'
-    ],
-    invalid: [
-        {
-            code: 'Array.from(iterable).map((t) => t.id)',
-            errors: [ {
-                message: 'Use mapFn callback of Array.from instead of map()',
-                column: 1,
-                line: 1
-            } ],
-            output: 'Array.from(iterable, (t) => t.id)'
-        },
-        {
-            code: 'Array.from(iterable, (t) => t.id, a).map((t) => t[0], b)',
-            errors: [ {
-                message: 'Use mapFn callback of Array.from instead of map()',
-                column: 1,
-                line: 1
-            } ],
-            output: 'Array.from(iterable, (t) => ((t) => t[0])(((t) => t.id)(t)), a)'
-        },
-        {
-            code: 'Array.from(iterable, function(t) { return t.id; }, a).map((t) => t[0])',
-            errors: [ {
-                message: 'Use mapFn callback of Array.from instead of map()',
-                column: 1,
-                line: 1
-            } ],
-            output: 'Array.from(iterable, function(t) { return ((t) => t[0])((function(t) { return t.id; }).call(this, t)); }, a)'
-        },
-        {
-            code: 'Array.from(iterable, function(t) { return t.id; }, a).map(function(t) { return t[0]; }, b)',
-            errors: [ {
-                message: 'Use mapFn callback of Array.from instead of map()',
-                column: 1,
-                line: 1
-            } ],
-            output: 'Array.from(iterable, function(t) { return (function(t) { return t[0]; }).call(b, (function(t) { return t.id; }).call(this, t)); }, a)'
-        },
-        {
-            code: 'Array.from(iterable, function(u) { return u.id; }, a).map(function(t, i) { return t[0]; }, b)',
-            errors: [ {
-                message: 'Use mapFn callback of Array.from instead of map()',
-                column: 1,
-                line: 1
-            } ],
-            output: 'Array.from(iterable, function(t, i) { return (function(t, i) { return t[0]; }).call(b, (function(u) { return u.id; }).call(this, t, i), i); }, a)'
-        },
-        {
-            code: 'Array.from(iterable, function(u, i) { return u.id; }, a).map(function(t) { return t[0]; }, b)',
-            errors: [ {
-                message: 'Use mapFn callback of Array.from instead of map()',
-                column: 1,
-                line: 1
-            } ],
-            output: 'Array.from(iterable, function(u, i) { return (function(t) { return t[0]; }).call(b, (function(u, i) { return u.id; }).call(this, u, i), i); }, a)'
-        }
-    ]
-});
+ruleTester.run('from-map', rule, testCases);