@mrpalmer/eslint-plugin 1.1.0 → 1.1.1

package/lib/rules/shorten-paths.js

@@ -39,7 +39,7 @@ export default createRule({
         },
     ],
     create(context, options) {
-        const config = loadConfig(context.settings);
+        const config = loadConfig(context.settings, context.filename);
         const absolutePath = path.resolve(process.cwd(), context.filename);
         return {
             'ImportDeclaration,ExportNamedDeclaration,ExportAllDeclaration'(node) {

package/lib/rules/sort-imports.js

@@ -533,7 +533,8 @@ export default createRule({
     ],
     create(context, [options]) {
         const settings = getSettings(context);
-        const tsConfigPaths = loadConfig(settings)?.config.compilerOptions?.paths ?? {};
+        const tsConfigPaths = loadConfig(settings, context.filename)?.config.compilerOptions?.paths ??
+            {};
         let ranks;
         try {
             const { pathGroups, maxPosition } = convertPathGroupsForRanks(options.pathGroups ?? [], Object.keys(tsConfigPaths));

package/lib/utils/import-path-options.js

@@ -80,13 +80,8 @@ function findAliases({ filePath, originalImportPath, baseUrlAbsolutePath, paths,
     }
     return options;
 }
-const importExtensionMappings = {
-    '': ['.js', '.ts', '.jsx', '.tsx'],
-    '.js': ['.ts', '.js'],
-};
+const candidateExtensions = ['', '.js', '.jsx', '.ts', '.tsx'];
 function fileExistsAtPath(filePath) {
-    const { ext } = path.parse(filePath);
-    const candidateExtensions = importExtensionMappings[ext] ?? [ext];
     return candidateExtensions.some((ext) => fs.existsSync(filePath + ext));
 }
 function resolveAlias(importPath, matcher) {

package/lib/utils/ts-config.d.ts

@@ -1,7 +1,7 @@
 import { createPathsMatcher } from 'get-tsconfig';
 import type { PluginSettings } from '../types.js';
 export { createPathsMatcher };
-export declare function loadConfig(settings: PluginSettings): {
+export declare function loadConfig(settings: PluginSettings, currentFilePath: string): {
     path: string;
     config: {
         compilerOptions?: import("get-tsconfig").TsConfigJson.CompilerOptions | undefined;

package/lib/utils/ts-config.js

@@ -2,11 +2,13 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { createPathsMatcher, parseTsconfig } from 'get-tsconfig';
 export { createPathsMatcher };
-export function loadConfig(settings) {
-    const eslintConfigPath = findUp([
+export function loadConfig(settings, currentFilePath) {
+    const eslintConfigPath = findUp(currentFilePath, [
         'eslint.config.js',
         'eslint.config.mjs',
         'eslint.config.cjs',
+        'eslint.config.ts',
+        'eslint.config.mts',
     ]);
     if (!eslintConfigPath || !fs.existsSync(eslintConfigPath)) {
         return undefined;
@@ -21,8 +23,8 @@ export function loadConfig(settings) {
 function getRelativeConfigFilePath(settings) {
     return settings['mrpalmer/tsconfig'] ?? 'tsconfig.json';
 }
-function findUp(filenames) {
-    let directory = process.cwd();
+function findUp(currentFilePath, filenames) {
+    let directory = currentFilePath;
     const { root: stopAt } = path.parse(directory);
     while (directory !== stopAt) {
         const found = firstExistingPath(filenames, directory);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrpalmer/eslint-plugin",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Custom ESLint rules for Mike Palmer's projects",
   "license": "MIT",
   "type": "module",