fix: typescript loading logic (#90)

alexander-akait · web-flow · commit a5018d6038d2 · 2025-08-22T17:15:23.000+03:00
diff --git a/configs/javascript.js b/configs/javascript.js
@@ -2,7 +2,8 @@ import javascriptConfig from "@eslint/js";
 import importPlugin from "eslint-plugin-import";
 import unicornPlugin from "eslint-plugin-unicorn";
 import globals from "globals";
-import { allExtensions } from "./utils/extensions.js";
+import { allExtensions, javascriptExtensions } from "./utils/extensions.js";
+import isTypescriptInstalled from "./utils/is-typescript-installed.js";
 
 const possibleProblems = {
 	"array-callback-return": [
@@ -1182,20 +1183,23 @@ const importRules = {
  * @returns {Record<string, string | number>} config
  */
 function getConfig(esVersion) {
+	const extensions = isTypescriptInstalled()
+		? allExtensions
+		: javascriptExtensions;
 	const config = {
 		...javascriptConfig.configs.recommended,
 		name: `javascript/es${esVersion}`,
-		files: [`**/*.{${allExtensions.map((item) => item.slice(1)).join(",")}}`],
+		files: [`**/*.{${extensions.map((item) => item.slice(1)).join(",")}}`],
 		ignores: ["**/*.d.ts"],
 		settings: {
-			"import/extensions": allExtensions,
+			"import/extensions": extensions,
 			"import/ignore": [
 				"eslint-plugin-.*",
 				"\\.(coffee|scss|css|less|hbs|svg|md|jpg|jpeg|png|gif|webp|avif)$",
 			],
 			"import/resolver": {
 				node: {
-					extensions: [...allExtensions],
+					extensions: [...extensions],
 				},
 			},
 		},
diff --git a/configs/markdown.js b/configs/markdown.js
@@ -24,7 +24,7 @@ async function getMarkdownRecommendedConfig() {
 		},
 		{
 			name: "markdown/code-blocks/js",
-			files: isTypescriptInstalled
+			files: isTypescriptInstalled()
 				? ["**/*.md/*.js", "**/*.md/*.ts"]
 				: ["**/*.md/*.js"],
 			languageOptions: {
diff --git a/configs/node.js b/configs/node.js
@@ -1,5 +1,6 @@
 import importPlugin from "eslint-plugin-import";
 import globals from "globals";
+import isTypescriptInstalled from "./utils/is-typescript-installed.js";
 
 const commonRules = {
 	// No need
@@ -263,50 +264,60 @@ async function getDirtyConfig() {
 
 const dirtyConfig = await getDirtyConfig();
 
+const jsExtensions = isTypescriptInstalled()
+	? ["**/*.{js,jsx,ts,tsx}"]
+	: ["**/*.{js,jsx}"];
+const cjsExtensions = isTypescriptInstalled()
+	? ["**/*.{cjs,cts}"]
+	: ["**/*.{cjs}"];
+const mjsExtensions = isTypescriptInstalled()
+	? ["**/*.{mjs,mts}"]
+	: ["**/*.{mjs}"];
+
 export default {
 	"node/dirty": dirtyConfig,
 	"node/commonjs": commonjsConfig,
 	"node/module": moduleConfig,
 	"node/recommended": moduleConfig,
 	"node/mixed-dirty": [
 		{
-			files: ["**/*.{js,jsx,ts,tsx}"],
+			files: jsExtensions,
 			...dirtyConfig,
 		},
 		{
-			files: ["**/*.{cjs,cts}"],
+			files: cjsExtensions,
 			...commonjsConfig,
 		},
 		{
-			files: ["**/*.{mjs,mts}"],
+			files: mjsExtensions,
 			...moduleConfig,
 		},
 	],
 	"node/mixed-module-and-commonjs": [
 		{
-			files: ["**/*.{js,jsx,ts,tsx}"],
+			files: jsExtensions,
 			...moduleConfig,
 		},
 		{
-			files: ["**/*.{cjs,cts}"],
+			files: cjsExtensions,
 			...commonjsConfig,
 		},
 		{
-			files: ["**/*.{mjs,mts}"],
+			files: mjsExtensions,
 			...moduleConfig,
 		},
 	],
 	"node/mixed-commonjs-and-module": [
 		{
-			files: ["**/*.{js,jsx,ts,tsx}"],
+			files: jsExtensions,
 			...commonjsConfig,
 		},
 		{
-			files: ["**/*.{cjs,cts}"],
+			files: cjsExtensions,
 			...commonjsConfig,
 		},
 		{
-			files: ["**/*.{mjs,mts}"],
+			files: mjsExtensions,
 			...moduleConfig,
 		},
 	],
diff --git a/configs/typescript.js b/configs/typescript.js
@@ -279,8 +279,6 @@ async function getTypescriptJSDocRecommendedConfig() {
 	};
 }
 
-const allExtensions = [...typescriptExtensions, ...javascriptExtensions];
-
 /**
  * @returns {Promise<Record<string, string>>} config
  */
@@ -311,6 +309,8 @@ async function getTypescriptRecommendedConfig() {
 		(item) => item.name === "typescript-eslint/stylistic",
 	);
 
+	const allExtensions = [...typescriptExtensions, ...javascriptExtensions];
+
 	return {
 		...baseConfig,
 		name: "typescript/recommended",

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ async function getMarkdownRecommendedConfig() {`
`24`	`24`	`},`
`25`	`25`	`{`
`26`	`26`	`name: "markdown/code-blocks/js",`
`27`		`- files: isTypescriptInstalled`
	`27`	`+ files: isTypescriptInstalled()`
`28`	`28`	`? ["*/.md/.js", "/.md/*.ts"]`
`29`	`29`	`: ["*/.md/*.js"],`
`30`	`30`	`languageOptions: {`