@w5s/eslint-config 3.12.0 → 3.14.0

package/dist/index.js

@@ -60,7 +60,7 @@ const StylisticConfig = {
 };
 //#endregion
 //#region src/config/e18e.ts
-const defaultFiles$11 = [sourceGlob$1];
+const defaultFiles$10 = [sourceGlob$1];
 /**
 * @see https://e18e.dev
 * @param options
@@ -73,7 +73,7 @@ async function e18e(options = {}) {
 		name: "w5s/e18e/setup",
 		plugins: { e18e: e18ePlugin }
 	}, {
-		files: withDefaultFiles(files, defaultFiles$11),
+		files: withDefaultFiles(files, defaultFiles$10),
 		name: "w5s/e18e/rules",
 		rules: {
 			...modernization ? e18ePlugin.configs.modernization.rules : {},
@@ -102,7 +102,6 @@ const bestPractices = () => ({
 	"default-case": ["error", { commentPattern: "^no default$" }],
 	"default-case-last": "error",
 	"default-param-last": "error",
-	"dot-location": ["error", "property"],
 	"dot-notation": ["error", { allowKeywords: true }],
 	"eqeqeq": [
 		"error",
@@ -155,7 +154,6 @@ const bestPractices = () => ({
 		ignore: [],
 		ignoreArrayIndexes: true
 	}],
-	"no-multi-spaces": ["error", { ignoreEOLComments: false }],
 	"no-multi-str": "error",
 	"no-native-reassign": "off",
 	"no-new": "error",
@@ -300,17 +298,6 @@ const errors = () => ({
 	"no-empty-character-class": "error",
 	"no-ex-assign": "error",
 	"no-extra-boolean-cast": "error",
-	"no-extra-parens": [
-		"off",
-		"all",
-		{
-			conditionalAssign: true,
-			enforceForArrowConditionals: false,
-			ignoreJSX: "all",
-			nestedBinaryExpressions: false,
-			returnAssign: false
-		}
-	],
 	"no-extra-semi": "error",
 	"no-func-assign": "error",
 	"no-import-assign": "error",
@@ -344,21 +331,7 @@ const errors = () => ({
 //#endregion
 //#region src/rules/esRules/es6.ts
 const es6 = () => ({
-	"arrow-body-style": [
-		"error",
-		"as-needed",
-		{ requireReturnForObjectLiteral: false }
-	],
-	"arrow-parens": ["error", "always"],
-	"arrow-spacing": ["error", {
-		after: true,
-		before: true
-	}],
 	"constructor-super": "error",
-	"generator-star-spacing": ["error", {
-		after: true,
-		before: false
-	}],
 	"no-class-assign": "error",
 	"no-confusing-arrow": ["error", { allowParens: true }],
 	"no-const-assign": "error",
@@ -379,57 +352,17 @@ const es6 = () => ({
 		ignoreImport: false
 	}],
 	"no-var": "error",
-	"object-shorthand": [
-		"error",
-		"always",
-		{
-			avoidQuotes: true,
-			ignoreConstructors: false
-		}
-	],
-	"prefer-arrow-callback": ["error", {
-		allowNamedFunctions: false,
-		allowUnboundThis: true
-	}],
 	"prefer-const": ["error", {
 		destructuring: "any",
 		ignoreReadBeforeAssign: true
 	}],
-	"prefer-destructuring": [
-		"error",
-		{
-			AssignmentExpression: {
-				array: true,
-				object: false
-			},
-			VariableDeclarator: {
-				array: false,
-				object: true
-			}
-		},
-		{ enforceForRenamedProperties: false }
-	],
 	"prefer-numeric-literals": "error",
 	"prefer-reflect": "off",
 	"prefer-rest-params": "error",
 	"prefer-spread": "error",
 	"prefer-template": "error",
 	"require-yield": "error",
-	"rest-spread-spacing": ["error", "never"],
-	"sort-imports": ["off", {
-		ignoreCase: false,
-		ignoreDeclarationSort: false,
-		ignoreMemberSort: false,
-		memberSyntaxSortOrder: [
-			"none",
-			"all",
-			"multiple",
-			"single"
-		]
-	}],
-	"symbol-description": "error",
-	"template-curly-spacing": "error",
-	"yield-star-spacing": ["error", "after"]
+	"symbol-description": "error"
 });
 //#endregion
 //#region src/rules/esRules/overrides.ts
@@ -442,8 +375,7 @@ const overrides = () => ({
 	"no-underscore-dangle": "off",
 	"no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
 	"no-use-before-define": ["error", "nofunc"],
-	"no-void": ["error", { allowAsStatement: true }],
-	"unicode-bom": ["error", "never"]
+	"no-void": ["error", { allowAsStatement: true }]
 });
 //#endregion
 //#region src/rules/esRules/strict.ts
@@ -494,7 +426,7 @@ const esRules = () => ({
 });
 //#endregion
 //#region src/config/es.ts
-const defaultFiles$10 = [esSourceGlob];
+const defaultFiles$9 = [esSourceGlob];
 async function es(options) {
 	const { recommended = true, rules = {} } = options;
 	return [{
@@ -521,7 +453,7 @@ async function es(options) {
 		linterOptions: { reportUnusedDisableDirectives: true },
 		name: "w5s/es/setup"
 	}, {
-		files: defaultFiles$10,
+		files: defaultFiles$9,
 		name: "w5s/es/rules",
 		rules: {
 			...recommended ? es["recommended"] : {},
@@ -548,8 +480,10 @@ async function imports(options = {}) {
 	const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
 	const [importPlugin] = await Promise.all([interopDefault(import("eslint-plugin-import"))]);
 	return [{
+		name: "w5s/import/setup",
+		plugins: { import: importPlugin }
+	}, {
 		name: "w5s/import/rules",
-		plugins: { import: importPlugin },
 		rules: {
 			...recommended ? imports["recommended"] : {},
 			...stylisticEnabled ? imports["stylistic"] : {},
@@ -572,42 +506,70 @@ imports["recommended"] = {
 imports["stylistic"] = { "import/newline-after-import": ["error", { count: 1 }] };
 //#endregion
 //#region src/config/jsdoc.ts
-const defaultFiles$9 = [sourceGlob$1];
+const defaultJsFiles = [esSourceGlob];
+const defaultTsFiles = [tsSourceGlob];
 async function jsdoc(options = {}) {
 	const [jsdocPlugin] = await Promise.all([interopDefault(import("eslint-plugin-jsdoc"))]);
 	const { files, recommended = true, rules = {}, stylistic = true } = options;
 	const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
-	return [{
-		name: "w5s/jsdoc/setup",
-		plugins: { jsdoc: jsdocPlugin }
-	}, {
-		files: withDefaultFiles(files, defaultFiles$9),
-		name: "w5s/jsdoc/rules",
-		rules: {
-			...recommended ? jsdocPlugin.configs["flat/recommended-typescript-flavor"].rules : {},
-			...recommended ? {
-				"jsdoc/no-undefined-types": "off",
-				"jsdoc/require-hyphen-before-param-description": ["warn", "always"],
-				"jsdoc/require-jsdoc": "off",
-				"jsdoc/require-param-description": "off",
-				"jsdoc/require-param-type": "off",
-				"jsdoc/require-returns": "off",
-				"jsdoc/valid-types": "off"
-			} : {},
-			...stylisticEnabled ? {
-				...jsdocPlugin.configs["flat/stylistic-typescript"].rules,
-				"jsdoc/check-alignment": "warn",
-				"jsdoc/multiline-blocks": "warn",
-				"jsdoc/tag-lines": [
-					"warn",
-					"any",
-					{ startLines: 1 }
-				]
-			} : {},
-			...rules
+	const recommendedRules = recommended ? jsdocPlugin.configs["flat/recommended-typescript-flavor"].rules : {};
+	const stylisticRules = stylisticEnabled ? {
+		...jsdocPlugin.configs["flat/stylistic-typescript"].rules,
+		"jsdoc/check-alignment": "warn",
+		"jsdoc/multiline-blocks": "warn",
+		"jsdoc/tag-lines": [
+			"warn",
+			"any",
+			{ startLines: 1 }
+		]
+	} : {};
+	return [
+		{
+			name: "w5s/jsdoc/setup",
+			plugins: { jsdoc: jsdocPlugin }
 		},
-		settings: { jsdoc: { mode: "typescript" } }
-	}];
+		{
+			files: withDefaultFiles(files, defaultJsFiles),
+			name: "w5s/jsdoc/rules-js",
+			rules: {
+				...recommendedRules,
+				...recommended ? {
+					"jsdoc/no-undefined-types": "off",
+					"jsdoc/require-hyphen-before-param-description": ["warn", "always"],
+					"jsdoc/require-jsdoc": "off",
+					"jsdoc/require-param-description": "off",
+					"jsdoc/require-param-type": "off",
+					"jsdoc/require-returns": "off",
+					"jsdoc/require-returns-type": "off",
+					"jsdoc/valid-types": "off"
+				} : {},
+				...stylisticRules,
+				...rules
+			},
+			settings: { jsdoc: { mode: "typescript" } }
+		},
+		{
+			files: withDefaultFiles(files, defaultTsFiles),
+			name: "w5s/jsdoc/rules-ts",
+			rules: {
+				...recommendedRules,
+				...recommended ? {
+					"jsdoc/no-types": "warn",
+					"jsdoc/no-undefined-types": "off",
+					"jsdoc/require-hyphen-before-param-description": ["warn", "always"],
+					"jsdoc/require-jsdoc": "off",
+					"jsdoc/require-param-description": "off",
+					"jsdoc/require-param-type": "off",
+					"jsdoc/require-returns": "off",
+					"jsdoc/require-returns-type": "off",
+					"jsdoc/valid-types": "off"
+				} : {},
+				...stylisticRules,
+				...rules
+			},
+			settings: { jsdoc: { mode: "typescript" } }
+		}
+	];
 }
 //#endregion
 //#region src/config/jsonc.ts
@@ -1048,7 +1010,6 @@ async function test(options = {}) {
 const tsRules = () => {
 	const baseRules = esRules();
 	return ESLintConfig.renameRules({
-		"@typescript-eslint/adjacent-overload-signatures": "error",
 		"@typescript-eslint/ban-ts-comment": ["warn", {
 			"minimumDescriptionLength": 3,
 			"ts-check": false,
@@ -1056,37 +1017,14 @@ const tsRules = () => {
 			"ts-ignore": "allow-with-description",
 			"ts-nocheck": true
 		}],
-		"@typescript-eslint/consistent-type-assertions": ["error", {
-			assertionStyle: "as",
-			objectLiteralTypeAssertions: "never"
-		}],
 		"@typescript-eslint/default-param-last": baseRules["default-param-last"],
 		"@typescript-eslint/explicit-function-return-type": "off",
 		"@typescript-eslint/explicit-module-boundary-types": "off",
-		"@typescript-eslint/naming-convention": [
-			"error",
-			{
-				format: [
-					"PascalCase",
-					"camelCase",
-					"UPPER_CASE"
-				],
-				leadingUnderscore: "allow",
-				selector: "variable",
-				trailingUnderscore: "allow"
-			},
-			{
-				format: ["PascalCase"],
-				selector: "typeLike"
-			}
-		],
 		"@typescript-eslint/no-dupe-class-members": baseRules["no-dupe-class-members"],
 		"@typescript-eslint/no-empty-function": baseRules["no-empty-function"],
 		"@typescript-eslint/no-empty-interface": ["error", { allowSingleExtends: true }],
 		"@typescript-eslint/no-empty-object-type": "off",
 		"@typescript-eslint/no-explicit-any": "off",
-		"@typescript-eslint/no-extra-parens": baseRules["no-extra-parens"],
-		"@typescript-eslint/no-inferrable-types": "error",
 		"@typescript-eslint/no-loop-func": baseRules["no-loop-func"],
 		"@typescript-eslint/no-loss-of-precision": baseRules["no-loss-of-precision"],
 		"@typescript-eslint/no-magic-numbers": baseRules["no-magic-numbers"],
@@ -1101,7 +1039,6 @@ const tsRules = () => {
 		"@typescript-eslint/no-unused-vars": baseRules["no-unused-vars"],
 		"@typescript-eslint/no-use-before-define": baseRules["no-use-before-define"],
 		"@typescript-eslint/no-useless-constructor": baseRules["no-useless-constructor"],
-		"@typescript-eslint/no-var-requires": "error",
 		"@typescript-eslint/no-wrapper-object-types": "error",
 		"@typescript-eslint/prefer-namespace-keyword": "error",
 		"@typescript-eslint/require-await": baseRules["require-await"],
@@ -1118,6 +1055,7 @@ async function ts(options = {}) {
 	const tsTypeCheckedRules = tsPlugin.configs["recommended-type-checked-only"].rules;
 	const { files, rules = {}, stylistic = true, typeChecked = false } = options;
 	const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
+	const tsCustomRules = tsRules();
 	return [
 		{
 			name: "w5s/ts/setup",
@@ -1133,8 +1071,33 @@ async function ts(options = {}) {
 			rules: {
 				...ESLintConfig.renameRules(tsRecommendedRules, { "@typescript-eslint": "ts" }),
 				...ESLintConfig.renameRules(tsStrictRules, { "@typescript-eslint": "ts" }),
-				...tsRules(),
-				...stylisticEnabled ? {} : {},
+				...tsCustomRules,
+				...stylisticEnabled ? {
+					...ESLintConfig.renameRules(tsPlugin.configs["stylistic"]?.rules, { "@typescript-eslint": "ts" }),
+					"ts/array-type": ["error", { default: "generic" }],
+					"ts/consistent-type-assertions": ["error", {
+						assertionStyle: "as",
+						objectLiteralTypeAssertions: "allow"
+					}],
+					"ts/naming-convention": [
+						"error",
+						{
+							format: [
+								"PascalCase",
+								"camelCase",
+								"UPPER_CASE"
+							],
+							leadingUnderscore: "allow",
+							selector: "variable",
+							trailingUnderscore: "allow"
+						},
+						{
+							format: ["PascalCase"],
+							selector: "typeLike"
+						}
+					],
+					"ts/no-empty-function": tsCustomRules["ts/no-empty-function"]
+				} : {},
 				...rules
 			}
 		},
@@ -1150,7 +1113,7 @@ async function ts(options = {}) {
 const defaultFiles$1 = [sourceGlob$1];
 async function unicorn(options = {}) {
 	const [unicornPlugin] = await Promise.all([interopDefault(import("eslint-plugin-unicorn"))]);
-	const { files = defaultFiles$1, recommended = true, rules = {}, stylistic = true } = options;
+	const { files, recommended = true, rules = {}, stylistic = true } = options;
 	const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
 	return [
 		{
@@ -1158,7 +1121,7 @@ async function unicorn(options = {}) {
 			plugins: { unicorn: unicornPlugin }
 		},
 		{
-			files,
+			files: withDefaultFiles(files, defaultFiles$1),
 			name: "w5s/unicorn/rules",
 			rules: {
 				...recommended && unicornPlugin.configs["unopinionated"].rules,
@@ -1239,19 +1202,19 @@ async function defineConfig(options = {}) {
 		stylistic: stylisticOptions,
 		..._options
 	});
-	const toOption = (optionsOrBoolean) => withDefaultStylistic(typeof optionsOrBoolean === "boolean" ? { enabled: optionsOrBoolean } : {
-		enabled: true,
+	const toOption = (optionsOrBoolean, defaultEnabled = true) => withDefaultStylistic(typeof optionsOrBoolean === "boolean" ? { enabled: optionsOrBoolean } : optionsOrBoolean === void 0 ? { enabled: defaultEnabled } : {
+		enabled: defaultEnabled,
 		...optionsOrBoolean
 	});
 	const includeEnabled = (factory, input) => input.enabled ? [factory(input)] : [];
-	return ESLintConfig.concat(...includeEnabled(e18e, toOption(plugins.e18e)), ...includeEnabled(es, toOption(plugins.es)), ...includeEnabled(ts, toOption(plugins.ts)), ...includeEnabled(ignores, toOption(options)), ...includeEnabled(jsonc, toOption(plugins.jsonc)), ...includeEnabled(jsdoc, toOption(plugins.jsdoc)), ...includeEnabled(react, toOption(plugins.react)), ...includeEnabled(stylistic, toOption(plugins.stylistic)), ...includeEnabled(imports, toOption(plugins.import)), ...includeEnabled(markdown, toOption(plugins.markdown)), ...includeEnabled(next, toOption(plugins.next)), ...includeEnabled(node, toOption(plugins.node)), ...includeEnabled(perfectionist, toOption(plugins.perfectionist)), ...includeEnabled(unicorn, toOption(plugins.unicorn)), ...includeEnabled(yml, toOption(plugins.yml)), ...includeEnabled(test, toOption(plugins.test)), ...rules ? [{ rules }] : []);
+	return ESLintConfig.concat(...includeEnabled(e18e, toOption(plugins.e18e)), ...includeEnabled(es, toOption(plugins.es)), ...includeEnabled(ts, toOption(plugins.ts)), ...includeEnabled(ignores, toOption(options)), ...includeEnabled(jsonc, toOption(plugins.jsonc)), ...includeEnabled(jsdoc, toOption(plugins.jsdoc)), ...includeEnabled(react, toOption(plugins.react)), ...includeEnabled(stylistic, toOption(plugins.stylistic)), ...includeEnabled(imports, toOption(plugins.import)), ...includeEnabled(markdown, toOption(plugins.markdown)), ...includeEnabled(next, toOption(plugins.next, false)), ...includeEnabled(node, toOption(plugins.node)), ...includeEnabled(perfectionist, toOption(plugins.perfectionist)), ...includeEnabled(unicorn, toOption(plugins.unicorn)), ...includeEnabled(yml, toOption(plugins.yml)), ...includeEnabled(test, toOption(plugins.test)), ...rules ? [{ rules }] : []);
 }
 //#endregion
 //#region src/meta.ts
 const meta = Object.freeze({
 	buildNumber: 1,
 	name: "@w5s/eslint-config",
-	version: "3.12.0"
+	version: "3.14.0"
 });
 //#endregion
 export { StylisticConfig, defineConfig as default, defineConfig, e18e, es, ignores, imports, jsdoc, jsonc, markdown, meta, next, node, perfectionist, react, stylistic, test, ts, unicorn, yml };