Merge pull request #13 from Simbiat/main

ESM/CJS support and type correction

Author: Akronae

src/index.ts

@@ -1,18 +1,12 @@
-import { RuleModule } from "@typescript-eslint/utils/ts-eslint";
 import { ESLint } from "eslint";
 import { rules } from "./rules";
 import noUnhandled from "./rules/no-unhandled/no-unhandled";
 import mightThrow from "./rules/might-throw/might-throw";
 import useErrorCause from "./rules/use-error-cause/use-error-cause";
 
-type RuleKey = keyof typeof rules;
-
-interface Plugin extends Omit<ESLint.Plugin, "rules"> {
-  rules: Record<RuleKey, RuleModule<string>>;
-}
-
 export const name = "eslint-plugin-exception-handling";
-export const plugin: Plugin = {
+
+export const plugin: ESLint.Plugin = {
   meta: {
     name,
     version: "1.0.0",
@@ -27,7 +21,7 @@ export const plugin: Plugin = {
       },
     },
   },
-  rules,
+  rules: rules as unknown as ESLint.Plugin["rules"],
 };
 
 export { rules };

src/utils/get-import-declaration.ts

@@ -41,7 +41,25 @@ function resolveTSAlias(tsconfigpath: string, to: string, cwd: string) {
   return to;
 }
 
-const codeExt = [".ts", ".js", ".tsx", ".jsx"];
+const codeExt = [".ts", ".js", ".tsx", ".jsx", ".mjs", ".mjsx", ".mts", ".mtsx",  ".cjs", ".cjsx", ".cts", ".ctsx"];
+const extAlts = {
+    // Base family
+    ".js":   [".jsx", ".ts", ".tsx"],
+    ".jsx":  [".js",  ".tsx", ".ts"],
+    ".ts":   [".tsx", ".js", ".jsx"],
+    ".tsx":  [".ts",  ".jsx", ".js"],
+    // ESM-explicit family (m*)
+    ".mjs":  [".mts", ".mjsx", ".mtsx"],
+    ".mjsx": [".mjs", ".mtsx", ".mts"],
+    ".mts":  [".mtsx", ".mjs", ".mjsx"],
+    ".mtsx": [".mts", ".mjsx", ".mjs"],
+    // CJS-explicit family (c*)
+    ".cjs":  [".cts", ".cjsx", ".ctsx"],
+    ".cjsx": [".cjs", ".ctsx", ".cts"],
+    ".cts":  [".ctsx", ".cjs", ".cjsx"],
+    ".ctsx": [".cts", ".cjsx", ".cjs"],
+};
+
 
 function endsWithAny(str: string, arr: string[]) {
   return arr.some((ext) => str.endsWith(ext));
@@ -92,14 +110,11 @@ export function getImportDeclaration(
   }
 
   if (!existsSync(res)) {
-    if (res.endsWith(".js")) {
-      res = findFileExtension(res.replace(".js", ""), [".jsx", ".ts", ".tsx"]);
-    } else if (res.endsWith(".jsx")) {
-      res = findFileExtension(res.replace(".jsx", ""), [".js", ".tsx", ".ts"]);
-    } else if (res.endsWith(".ts")) {
-      res = findFileExtension(res.replace(".ts", ""), [".tsx", ".js", ".jsx"]);
-    } else if (res.endsWith(".tsx")) {
-      res = findFileExtension(res.replace(".tsx", ""), [".ts", ".jsx", ".js"]);
+    for (const [ext, alternatives] of Object.entries(extAlts)) {
+        if (res.endsWith(ext)) {
+            res = findFileExtension(res.slice(0, -ext.length), alternatives);
+            break;
+        }
     }
   }