@html-validate/eslint-config-typescript 5.28.1 → 6.0.0

package/index.mjs

@@ -1,20 +1,112 @@
-import { fileURLToPath } from "node:url";
-import path from "node:path";
-import { FlatCompat } from "@eslint/eslintrc";
-import legacyConfig from "./legacy.cjs";
+import { configs as tseConfig, parser as tseParser, plugin as tsePlugin } from "typescript-eslint";
+import tsdocPlugin from "eslint-plugin-tsdoc";
+import importPlugin from "eslint-plugin-import";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+/**
+ * @typedef {import("eslint").Linter.Config} Config
+ */
 
-const compat = new FlatCompat({
-	baseDirectory: __dirname,
-	resolvePluginsRelativeTo: __dirname,
-});
-
-const migrated = compat.config(legacyConfig);
+/**
+ * @param {Config} config
+ * @returns {Config}
+ */
+function defineConfig(config) {
+	return config;
+}
 
-for (const ruleset of migrated) {
-	ruleset.files = ["**/*.ts"];
+function flatten(result, it) {
+	return {
+		...result,
+		...it,
+		languageOptions: {
+			...result.languageOptions,
+			...it.languageOptions,
+		},
+		plugins: {
+			...result.plugins,
+			...it.plugins,
+		},
+		rules: {
+			...result.rules,
+			...it.rules,
+		},
+	};
 }
 
-export default migrated;
+/** @type {Config} */
+const strict = tseConfig.strict.reduce(flatten, {});
+
+/** @type {Config} */
+const stylistic = tseConfig.stylistic.reduce(flatten, {});
+
+/** @type {Config} */
+const importConfig = importPlugin.flatConfigs.typescript;
+
+export default defineConfig({
+	languageOptions: {
+		parser: tseParser,
+		sourceType: "module",
+	},
+	plugins: {
+		"@typescript-eslint": tsePlugin,
+		tsdoc: tsdocPlugin,
+	},
+	settings: {
+		...importConfig.settings,
+	},
+	rules: {
+		...strict.rules,
+		...stylistic.rules,
+		...importConfig.rules,
+
+		/* typescript handles the return types */
+		"consistent-return": "off",
+
+		"tsdoc/syntax": "error",
+
+		/* prefer T[] for simple types, Array<T> for complex types (unions, etc) */
+		"@typescript-eslint/array-type": ["error", { default: "array-simple" }],
+
+		/* allow getters which returns a literal */
+		"@typescript-eslint/class-literal-property-style": "off",
+
+		"@typescript-eslint/explicit-function-return-type": [
+			"error",
+			{
+				allowExpressions: true,
+			},
+		],
+		"@typescript-eslint/explicit-member-accessibility": "error",
+		"@typescript-eslint/no-inferrable-types": "off",
+
+		/* allow function(this: void, ...) */
+		"@typescript-eslint/no-invalid-void-type": [
+			"error",
+			{
+				allowAsThisParameter: true,
+			},
+		],
+
+		/* allow constructs such as `unknown | null`, while `unknown` does override
+		 * `null` it can still serve as a self-documenting type to signal that
+		 * `null` has a special meaning. It also helps when the type is to be
+		 * replaced with a better type later. */
+		"@typescript-eslint/no-redundant-type-constituents": "off",
+
+		"@typescript-eslint/no-unused-vars": [
+			"error",
+			{
+				ignoreRestSiblings: true,
+				argsIgnorePattern: "^_",
+			},
+		],
+
+		/* allow overloading only if the parameters have different names */
+		"@typescript-eslint/unified-signatures": [
+			"error",
+			{
+				ignoreDifferentlyNamedParameters: true,
+			},
+		],
+	},
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-validate/eslint-config-typescript",
-  "version": "5.28.1",
+  "version": "6.0.0",
   "description": "Eslint sharable config used by the various HTML-validate packages",
   "keywords": [
     "eslint",
@@ -17,6 +17,7 @@
   },
   "license": "MIT",
   "author": "David Sveningsson <ext@sidvind.com>",
+  "type": "module",
   "main": "index.mjs",
   "files": [
     "*.cjs",
@@ -28,13 +29,12 @@
     "prepublishOnly": "release-prepublish --retain-scripts"
   },
   "dependencies": {
-    "@eslint/eslintrc": "3.3.0",
-    "@typescript-eslint/eslint-plugin": "8.26.1",
-    "@typescript-eslint/parser": "8.26.1",
-    "eslint-plugin-tsdoc": "0.4.0"
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-tsdoc": "0.4.0",
+    "typescript-eslint": "8.26.1"
   },
   "peerDependencies": {
-    "eslint": "^8.0.0"
+    "eslint": "^9.0.0"
   },
   "engines": {
     "node": ">= 20.9.0",
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d805d4df29d160c9bbc91240d0906d522cc87d89"
+  "gitHead": "f54dcbae0ccae318895e34d32fbfa02b05cd38d1"
 }

package/legacy.cjs

@@ -1,63 +0,0 @@
-module.exports = {
-	parser: "@typescript-eslint/parser",
-
-	plugins: ["@typescript-eslint", "tsdoc"],
-
-	extends: [
-		"plugin:@typescript-eslint/strict",
-		"plugin:@typescript-eslint/stylistic",
-		"plugin:import/typescript",
-	],
-
-	rules: {
-		/* typescript handles the return types */
-		"consistent-return": "off",
-
-		"tsdoc/syntax": "error",
-
-		/* prefer T[] for simple types, Array<T> for complex types (unions, etc) */
-		"@typescript-eslint/array-type": ["error", { default: "array-simple" }],
-
-		/* allow getters which returns a literal */
-		"@typescript-eslint/class-literal-property-style": "off",
-
-		"@typescript-eslint/explicit-function-return-type": [
-			"error",
-			{
-				allowExpressions: true,
-			},
-		],
-		"@typescript-eslint/explicit-member-accessibility": "error",
-		"@typescript-eslint/no-inferrable-types": "off",
-
-		/* allow function(this: void, ...) */
-		"@typescript-eslint/no-invalid-void-type": [
-			"error",
-			{
-				allowAsThisParameter: true,
-			},
-		],
-
-		/* allow constructs such as `unknown | null`, while `unknown` does override
-		 * `null` it can still serve as a self-documenting type to signal that
-		 * `null` has a special meaning. It also helps when the type is to be
-		 * replaced with a better type later. */
-		"@typescript-eslint/no-redundant-type-constituents": "off",
-
-		"@typescript-eslint/no-unused-vars": [
-			"error",
-			{
-				ignoreRestSiblings: true,
-				argsIgnorePattern: "^_",
-			},
-		],
-
-		/* allow overloading only if the parameters have different names */
-		"@typescript-eslint/unified-signatures": [
-			"error",
-			{
-				ignoreDifferentlyNamedParameters: true,
-			},
-		],
-	},
-};