Handle cases with path like '../index.js'

Author: golopot

src/rules/default-import-match-filename.js

@@ -91,21 +91,18 @@ function getFilename(path, context) {
     return undefined
   }
 
-  // like require('.'), require('..'), require('../..')
-  if (isAncestorRelativePath(path)) {
-    return getNameFromPackageJsonOrDirname(path, context)
-  }
-
   const basename = Path.basename(path)
 
-  const filename = /^index$|^index\./.test(basename)
-    ? Path.basename(Path.dirname(path))
-    : basename
+  const processedPath = /^index$|^index\./.test(basename)
+    ? Path.dirname(path)
+    : path
 
-  if (filename === '' || filename === '.' || filename === '..') {
-    return undefined
+  // like require('.'), require('..'), require('../..')
+  if (isAncestorRelativePath(processedPath)) {
+    return getNameFromPackageJsonOrDirname(processedPath, context)
   }
-  return filename
+
+  return Path.basename(processedPath)
 }
 
 /**

tests/src/rules/default-import-match-filename.js

@@ -58,7 +58,6 @@ ruleTester.run('default-import-match-filename', rule, {
     'import doge from "loud-cat"',
     'import doge from ".cat"',
     'import doge from ""',
-    'import doge from "../index"',
     'import {doge} from "./cat"',
     'import cat, {doge} from "./cat"',
     'const cat = require("./cat")',
@@ -96,6 +95,10 @@ ruleTester.run('default-import-match-filename', rule, {
         'default-import-match-filename/some-directory/a.js'
       ),
     },
+    {
+      code: 'import doge from "../index.js"',
+      filename: 'doge/a/a.js',
+    },
   ],
   invalid: [
     fail('import cat0 from "./cat"', 'cat'),
@@ -125,6 +128,11 @@ ruleTester.run('default-import-match-filename', rule, {
       'package-name',
       testFilePath('default-import-match-filename/some-directory/a.js')
     ),
+    fail(
+      'import nope from "../../index.js"',
+      'package-name',
+      testFilePath('default-import-match-filename/some-directory/foo/a.js')
+    ),
     {
       code: `import QWERTY from '../bbb/ccc';`,
       options: [{ignorePaths: ['aaa']}],