lint-rules-alvin 2.1.3 → 2.2.1

package/.vscode/settings.json

@@ -13,4 +13,4 @@
 		"typescriptreact"
 	],
 	"typescript.tsdk": "node_modules\\typescript\\lib"
-}
+}

package/.zed/settings.json

@@ -3,7 +3,7 @@
 	"format_on_save": "on",
 	"formatter": {
 		"code_actions": {
-			"source.fixAll.eslint": true,
-		},
+			"source.fixAll.eslint": true
+		}
 	}
 }

package/eslint/configs/importX.ts

@@ -4,14 +4,11 @@ import { importX as eslintPluginImportX } from 'eslint-plugin-import-x';
 /**
  * The ESLint import config. Configures all rules.
  */
-// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 export const importX: TSESLint.FlatConfig.Config = {
 	name: 'eslint-plugin-import-x',
-
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 	plugins: { 'import-x': eslintPluginImportX },
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 	...eslintPluginImportX.flatConfigs.typescript,
+	files: [ '**/*.{js,ts}' ],
 	settings: {
 		'import-x/resolver': {
 			typescript: true,

package/eslint/configs/index.d.ts

@@ -5,7 +5,8 @@ export const custom: TSESLint.FlatConfig.Config;
 export const importX: TSESLint.FlatConfig.Config;
 export const json: TSESLint.FlatConfig.ConfigArray;
 export const markdown: TSESLint.FlatConfig.Config;
+export const perfectionist: TSESLint.FlatConfig.Config;
 export const reactHooks: TSESLint.FlatConfig.Config;
 export const stylistic: TSESLint.FlatConfig.Config;
 export const sveltekit: TSESLint.FlatConfig.ConfigArray;
-export const typescript: TSESLint.FlatConfig.Config;
+export const typescript: TSESLint.FlatConfig.Config;

package/eslint/configs/index.ts

@@ -4,6 +4,7 @@ export { custom } from './custom';
 export { importX } from './importX';
 export { json } from './json';
 export { markdown } from './markdown';
+export { perfectionist } from './perfectionist';
 export { reactHooks } from './reactHooks';
 export { stylistic } from './stylistic';
 export { sveltekit } from './sveltekit';

package/eslint/configs/perfectionist.ts

@@ -0,0 +1,8 @@
+import { TSESLint } from '@typescript-eslint/utils';
+import eslintPluginPerfectionist from 'eslint-plugin-perfectionist';
+
+export const perfectionist: TSESLint.FlatConfig.Config = {
+	name: 'eslint-plugin-perfectionist',
+	plugins: { eslintPluginPerfectionist },
+	...eslintPluginPerfectionist.configs['recommended-natural']
+};

package/eslint/configs/stylistic.ts

@@ -179,19 +179,6 @@ export const stylistic: TSESLint.FlatConfig.Config = {
 			'error',
 			{ component: true }
 		],
-		'@stylistic/jsx-sort-props': [
-			'error',
-			{
-				ignoreCase: false,
-				callbacksLast: true,
-				shorthandFirst: true,
-				shorthandLast: false,
-				multiline: 'ignore',
-				noSortAlphabetically: true,
-				reservedFirst: true,
-				locale: 'en'
-			}
-		],
 		'@stylistic/jsx-tag-spacing': [
 			'error',
 			{

package/eslint/custom_rules/jsx-multiline-prop-newline.ts

@@ -60,9 +60,8 @@ export const jsxMultilinePropNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 
 			// Only enforce for JSX props (attributes), not for children
 			/* eslint-disable-next-line
-			@typescript-eslint/no-unnecessary-condition,
-			@typescript-eslint/strict-boolean-expressions */
-			if (!node?.parent || node.parent.type !== AST_NODE_TYPES.JSXAttribute)
+			@typescript-eslint/no-unnecessary-condition */
+			if (node?.parent?.type !== AST_NODE_TYPES.JSXAttribute)
 				return;
 
 			const expr = node.expression;
@@ -113,7 +112,7 @@ export const jsxMultilinePropNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: openBrace,
 						messageId: 'collapse',
-						fix: (fixer) => fixer.removeRange([
+						fix: (fixer)=> fixer.removeRange([
 							openBrace.range[1],
 							firstTokenOfExpr.range[0]
 						])
@@ -133,7 +132,7 @@ export const jsxMultilinePropNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: closeBrace,
 						messageId: 'collapse',
-						fix: (fixer) => fixer.removeRange([
+						fix: (fixer)=> fixer.removeRange([
 							lastTokenOfExpr.range[1],
 							closeBrace.range[0]
 						])
@@ -160,7 +159,7 @@ export const jsxMultilinePropNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: openBrace,
 						messageId: 'expand',
-						fix: (fixer) => fixer.insertTextAfter(
+						fix: (fixer)=> fixer.insertTextAfter(
 							openBrace,
 							'\n'
 						)
@@ -180,7 +179,7 @@ export const jsxMultilinePropNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: closeBrace,
 						messageId: 'expand',
-						fix: (fixer) => fixer.insertTextBefore(
+						fix: (fixer)=> fixer.insertTextBefore(
 							closeBrace,
 							'\n'
 						)
@@ -207,7 +206,7 @@ export const jsxMultilinePropNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: openBrace,
 						messageId: 'collapse',
-						fix: (fixer) => fixer.removeRange([
+						fix: (fixer)=> fixer.removeRange([
 							openBrace.range[1],
 							firstTokenOfExpr.range[0]
 						])
@@ -227,7 +226,7 @@ export const jsxMultilinePropNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: closeBrace,
 						messageId: 'collapse',
-						fix: (fixer) => fixer.removeRange([
+						fix: (fixer)=> fixer.removeRange([
 							lastTokenOfExpr.range[1],
 							closeBrace.range[0]
 						])

package/eslint/custom_rules/max-chain-per-line.ts

@@ -173,7 +173,7 @@ export const maxChainPerLineRule = ESLintUtils.RuleCreator.withoutDocs({
 					// Find the dot separator for this link.
 					const separatorToken = sourceCode.getTokenBefore(
 						linkNode.property,
-						{ filter: (token) => token.value === '.' || token.value === '?.' }
+						{ filter: (token)=> token.value === '.' || token.value === '?.' }
 					);
 
 					// If we couldn't find the separator token, bail out for safety.
@@ -199,7 +199,7 @@ export const maxChainPerLineRule = ESLintUtils.RuleCreator.withoutDocs({
 							node: linkNode.property,
 							loc: separatorToken.loc,
 							messageId: 'expand',
-							fix: (fixer) => fixer.insertTextBefore(
+							fix: (fixer)=> fixer.insertTextBefore(
 								separatorToken,
 								`\n${baseIndent}`
 							)
@@ -218,7 +218,7 @@ export const maxChainPerLineRule = ESLintUtils.RuleCreator.withoutDocs({
 					const previousNode = linkNode.object;
 					const separatorToken2 = sourceCode.getTokenBefore(
 						linkNode.property,
-						{ filter: (token) => token.value === '.' || token.value === '?.' }
+						{ filter: (token)=> token.value === '.' || token.value === '?.' }
 					);
 					if (!separatorToken2)
 						continue;
@@ -241,7 +241,7 @@ export const maxChainPerLineRule = ESLintUtils.RuleCreator.withoutDocs({
 								node: linkNode.property,
 								loc: separatorToken2.loc,
 								messageId: 'collapse',
-								fix: (fixer) => {
+								fix: (fixer)=> {
 
 									const between = sourceCode.text.slice(
 										from,
@@ -255,11 +255,9 @@ export const maxChainPerLineRule = ESLintUtils.RuleCreator.withoutDocs({
 
 									}
 
-									const segments = between.split(
-										/\r\n|\r|\n/
-									);
+									const segments = between.split(/\r\n|\r|\n/);
 
-									let collapsed = '';
+									let collapsed;
 
 									if (segments.length === 1) {
 

package/eslint/custom_rules/multiline-array-accessor-newline.ts

@@ -24,7 +24,7 @@ export const multilineArrayAccessorNewlineRule = ESLintUtils.RuleCreator.without
 
 			const openBracket = sourceCode.getTokenAfter(
 				node.object,
-				{ filter: (t) => t.value === '[' }
+				{ filter: (t)=> t.value === '[' }
 			);
 
 			if (!openBracket) {
@@ -199,7 +199,7 @@ export const multilineArrayAccessorNewlineRule = ESLintUtils.RuleCreator.without
 				context.report({
 					node: openBracket,
 					messageId: 'expandAfter',
-					fix: (fixer) => fixer.insertTextAfter(
+					fix: (fixer)=> fixer.insertTextAfter(
 						openBracket,
 						'\n'
 					)
@@ -221,7 +221,7 @@ export const multilineArrayAccessorNewlineRule = ESLintUtils.RuleCreator.without
 				context.report({
 					node: closeBracket,
 					messageId: 'expandBefore',
-					fix: (fixer) => fixer.insertTextBefore(
+					fix: (fixer)=> fixer.insertTextBefore(
 						closeBracket,
 						'\n'
 					)

package/eslint/custom_rules/multiline-paren-newline.ts

@@ -73,7 +73,7 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 
 			const openParen = sourceCode.getTokenAfter(
 				callee,
-				{ filter: (t) => t.value === '(' }
+				{ filter: (t)=> t.value === '(' }
 			);
 
 			if (!openParen) { // e.g. `new Date`
@@ -229,12 +229,11 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 			const contentIsSingleLine = node.arguments.length === 0
 				? true
 				: Boolean(
-					firstTokenOfFirstArg && lastTokenOfLastArg
-					&& firstTokenOfFirstArg
+					firstTokenOfFirstArg && firstTokenOfFirstArg
 						.loc
 						.start
 						.line === lastTokenOfLastArg
-						.loc
+						?.loc
 						.end
 						.line
 				);
@@ -345,11 +344,11 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 			if (firstArg) {
 
 				if (
-					firstTokenOfFirstArg && openParen
+					openParen
 						.loc
 						.end
 						.line === firstTokenOfFirstArg
-						.loc
+						?.loc
 						.start
 						.line
 				) {
@@ -357,7 +356,7 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: openParen,
 						messageId: 'expandAfter',
-						fix: (fixer) => fixer.insertTextAfter(
+						fix: (fixer)=> fixer.insertTextAfter(
 							openParen,
 							'\n'
 						)
@@ -374,8 +373,8 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 			if (lastArg) {
 
 				if (
-					lastTokenOfLastArg && lastTokenOfLastArg
-						.loc
+					lastTokenOfLastArg
+						?.loc
 						.end
 						.line === closeParen
 						.loc
@@ -386,7 +385,7 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 					context.report({
 						node: closeParen,
 						messageId: 'expandBefore',
-						fix: (fixer) => fixer.insertTextBefore(
+						fix: (fixer)=> fixer.insertTextBefore(
 							closeParen,
 							'\n'
 						)
@@ -477,12 +476,11 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 			const lastTokenOfNode = sourceCode.getLastToken(node);
 
 			const contentIsSingleLine = Boolean(
-				firstTokenOfNode && lastTokenOfNode
-				&& firstTokenOfNode
+				firstTokenOfNode && firstTokenOfNode
 					.loc
 					.start
 					.line === lastTokenOfNode
-					.loc
+					?.loc
 					.end
 					.line
 			);
@@ -568,11 +566,11 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 			}
 
 			if (
-				firstTokenOfNode && openParen
+				openParen
 					.loc
 					.end
 					.line === firstTokenOfNode
-					.loc
+					?.loc
 					.start
 					.line
 			) {
@@ -580,7 +578,7 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 				context.report({
 					node: openParen,
 					messageId: 'expandAfter',
-					fix: (fixer) => fixer.insertTextAfter(
+					fix: (fixer)=> fixer.insertTextAfter(
 						openParen,
 						'\n'
 					)
@@ -589,8 +587,8 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 			}
 
 			if (
-				lastTokenOfNode && lastTokenOfNode
-					.loc
+				lastTokenOfNode
+					?.loc
 					.end
 					.line === closeParen
 					.loc
@@ -601,7 +599,7 @@ export const multilineParenNewlineRule = ESLintUtils.RuleCreator.withoutDocs({
 				context.report({
 					node: closeParen,
 					messageId: 'expandBefore',
-					fix: (fixer) => fixer.insertTextBefore(
+					fix: (fixer)=> fixer.insertTextBefore(
 						closeParen,
 						'\n'
 					)

package/eslint/custom_rules/newline-between-imports.ts

@@ -32,7 +32,7 @@ export const newlineBetweenImportsRule = ESLintUtils.RuleCreator.withoutDocs({
 		return {
 			ImportDeclaration(node) {
 
-				const specifiers = node.specifiers.filter((specifier) => specifier.type === AST_NODE_TYPES.ImportSpecifier);
+				const specifiers = node.specifiers.filter((specifier)=> specifier.type === AST_NODE_TYPES.ImportSpecifier);
 
 				if (specifiers.length < minItems) {
 

package/eslint/custom_rules/unnamed-imports-last.ts

@@ -20,7 +20,7 @@ export const unnamedImportsLastRule = ESLintUtils.RuleCreator.withoutDocs({
 			'Program:exit'(program) {
 
 				const sourceCode = context.sourceCode;
-				const allImports = program.body.filter((node) => node.type === AST_NODE_TYPES.ImportDeclaration);
+				const allImports = program.body.filter((node)=> node.type === AST_NODE_TYPES.ImportDeclaration);
 
 				if (allImports.length < 2) {
 
@@ -28,8 +28,8 @@ export const unnamedImportsLastRule = ESLintUtils.RuleCreator.withoutDocs({
 
 				}
 
-				const regularImports = allImports.filter((node) => node.specifiers.length > 0);
-				const sideEffectImports = allImports.filter((node) => node.specifiers.length === 0);
+				const regularImports = allImports.filter((node)=> node.specifiers.length > 0);
+				const sideEffectImports = allImports.filter((node)=> node.specifiers.length === 0);
 
 				if (regularImports.length === 0 || sideEffectImports.length === 0) {
 
@@ -39,7 +39,7 @@ export const unnamedImportsLastRule = ESLintUtils.RuleCreator.withoutDocs({
 
 				const lastRegularImport = regularImports[regularImports.length - 1];
 
-				const misplacedImports = sideEffectImports.filter((node) => node.range[0] < lastRegularImport.range[0]);
+				const misplacedImports = sideEffectImports.filter((node)=> node.range[0] < lastRegularImport.range[0]);
 
 				if (misplacedImports.length === 0) {
 

package/eslint/presets/astroReactPreset.ts

@@ -12,6 +12,7 @@ import { typescript } from '../configs/typescript';
 import { reactHooks } from '../configs/reactHooks';
 import { stylistic } from '../configs/stylistic';
 import { importX } from '../configs/importX';
+import { perfectionist } from '../configs/perfectionist';
 
 /**
  * The `ESLint` Astro/React config with typescript.
@@ -27,6 +28,7 @@ export const astroReactPreset = defineConfig(
 	} as any,
 	reactHooks as any,
 	stylistic as any,
+	perfectionist as any,
 	custom as any,
 	{
 		name: 'eslint-plugin-astro-stylistic-override',

package/eslint/presets/sveltekitPreset.ts

@@ -7,6 +7,7 @@ import { base } from '../configs/base';
 import { importX } from '../configs/importX';
 import { sveltekit } from '../configs/sveltekit';
 import { stylistic } from '../configs/stylistic';
+import { perfectionist } from '../configs/perfectionist';
 import { custom } from '../configs/custom';
 import { typescript } from '../configs/typescript';
 
@@ -23,6 +24,7 @@ export const sveltekitPreset = defineConfig(
 
 	} as Linter.Config,
 	stylistic as Linter.Config,
+	perfectionist as Linter.Config,
 	custom as Linter.Config,
 	{
 		name: 'sveltekit-override',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-rules-alvin",
-  "version": "2.1.3",
+  "version": "2.2.1",
   "description": "My own personal linting ruleset for a bunch of different plugins. Includes a few custom rules. Used in a few of my repos.",
   "keywords": [
     "eslint"
@@ -24,36 +24,38 @@
     }
   },
   "devDependencies": {
-    "@eslint/compat": "^2.0.2",
-    "@eslint/js": "^9.39.2",
+    "@eslint/compat": "^2.0.3",
+    "@eslint/js": "^10.0.1",
     "@eslint/markdown": "^7.5.1",
-    "@stylistic/eslint-plugin": "^5.8.0",
+    "@stylistic/eslint-plugin": "^5.10.0",
     "@types/estree": "^1.0.8",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^25.2.2",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
-    "@typescript-eslint/rule-tester": "^8.54.0",
-    "@typescript-eslint/utils": "^8.54.0",
-    "astro-eslint-parser": "^1.2.2",
-    "eslint": "^9.39.2",
+    "@types/node": "^25.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.0",
+    "@typescript-eslint/parser": "^8.57.0",
+    "@typescript-eslint/rule-tester": "^8.57.0",
+    "@typescript-eslint/utils": "^8.57.0",
+    "astro-eslint-parser": "^1.3.0",
+    "eslint": "^10.0.3",
     "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-astro": "^1.5.0",
-    "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-jsonc": "^2.21.1",
+    "eslint-plugin-astro": "^1.6.0",
+    "eslint-plugin-import-x": "^4.16.2",
+    "eslint-plugin-jsonc": "^3.1.2",
+    "eslint-plugin-perfectionist": "^5.6.0",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-svelte": "^3.14.0",
-    "eslint-plugin-vue": "^10.7.0",
-    "globals": "^17.3.0",
+    "eslint-plugin-svelte": "^3.15.2",
+    "eslint-plugin-vue": "^10.8.0",
+    "globals": "^17.4.0",
     "jiti": "^2.6.1",
     "mocha": "^11.7.5",
-    "svelte": "^5.50.0",
+    "svelte": "^5.53.11",
+    "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0"
+    "typescript-eslint": "^8.57.0"
   },
   "peerDependencies": {
     "@eslint/compat": "^2",
-    "@eslint/js": "^9",
+    "@eslint/js": "^10",
     "@eslint/markdown": "^7",
     "@stylistic/eslint-plugin": "^5",
     "@types/estree": "^1",
@@ -62,17 +64,17 @@
     "@typescript-eslint/parser": "^8",
     "@typescript-eslint/utils": "^8",
     "astro-eslint-parser": "^1",
-    "eslint": "^9",
+    "eslint": "^10",
     "eslint-import-resolver-typescript": "^4",
     "eslint-plugin-astro": "^1",
     "eslint-plugin-import-x": "^4",
-    "eslint-plugin-jsonc": "^2",
+    "eslint-plugin-jsonc": "^3",
+    "eslint-plugin-perfectionist": "^5",
     "eslint-plugin-react-hooks": "^7",
     "eslint-plugin-svelte": "^3",
     "eslint-plugin-vue": "^10",
     "globals": "^17",
     "svelte": "^5",
-    "ts-node": "^10",
     "typescript": "^5",
     "typescript-eslint": "^8"
   },
@@ -119,6 +121,9 @@
     "eslint-plugin-jsonc": {
       "optional": true
     },
+    "eslint-plugin-perfectionist": {
+      "optional": true
+    },
     "eslint-plugin-react-hooks": {
       "optional": true
     },
@@ -141,6 +146,10 @@
       "optional": true
     }
   },
+  "overrides": {
+    "diff": "^8.0.3",
+    "serialize-javascript": "^7.0.4"
+  },
   "scripts": {
     "test": "npm run test:eslint",
     "test:eslint": "node --no-warnings --import ./test/eslint/test-bootstrap.mjs ./node_modules/mocha/bin/mocha --extensions ts --recursive \"test/**/*.test.ts\""

package/tsconfig.test.json

@@ -15,4 +15,4 @@
     "test/**/*.ts",
     "eslint/custom_rules/**/*.ts"
   ]
-}
+}