lint-rules-alvin 2.2.1 → 2.2.3

package/eslint/configs/custom.ts

@@ -1,6 +1,5 @@
 import { TSESLint } from '@typescript-eslint/utils';
 import { newlineBetweenImportsRule } from '../custom_rules/newline-between-imports';
-import { unnamedImportsLastRule } from '../custom_rules/unnamed-imports-last';
 import { jsxMultilinePropNewlineRule } from '../custom_rules/jsx-multiline-prop-newline';
 import { maxChainPerLineRule } from '../custom_rules/max-chain-per-line';
 import { multilineParenNewlineRule } from '../custom_rules/multiline-paren-newline';
@@ -15,7 +14,6 @@ export const custom: TSESLint.FlatConfig.Config = {
 		custom: {
 			rules: {
 				'newline-between-imports': newlineBetweenImportsRule,
-				'unnamed-imports-last': unnamedImportsLastRule,
 				'jsx-multiline-prop-newline': jsxMultilinePropNewlineRule,
 				'max-chain-per-line': maxChainPerLineRule,
 				'multiline-paren-newline': multilineParenNewlineRule,
@@ -29,7 +27,6 @@ export const custom: TSESLint.FlatConfig.Config = {
 			'error',
 			{ minItems: 2 }
 		],
-		'custom/unnamed-imports-last': 'error',
 		'custom/jsx-multiline-prop-newline': [
 			'error',
 			{

package/eslint/configs/importX.ts

@@ -7,8 +7,8 @@ import { importX as eslintPluginImportX } from 'eslint-plugin-import-x';
 export const importX: TSESLint.FlatConfig.Config = {
 	name: 'eslint-plugin-import-x',
 	plugins: { 'import-x': eslintPluginImportX },
-	...eslintPluginImportX.flatConfigs.typescript,
 	files: [ '**/*.{js,ts}' ],
+	...eslintPluginImportX.flatConfigs.typescript,
 	settings: {
 		'import-x/resolver': {
 			typescript: true,
@@ -50,7 +50,7 @@ export const importX: TSESLint.FlatConfig.Config = {
 		'import-x/no-relative-parent-imports': 'off',
 		'import-x/no-restricted-paths': 'off', // Allow the user to override
 		'import-x/no-self-import': 'error',
-		'import-x/no-unresolved': 'error',
+		'import-x/no-unresolved': 'off', // Messes with some things, so make user override
 		'import-x/no-useless-path-segments': 'error',
 		'import-x/no-webpack-loader-syntax': 'error',
 
@@ -63,7 +63,7 @@ export const importX: TSESLint.FlatConfig.Config = {
 		'import-x/extensions': 'off',
 		'import-x/first': 'error',
 		'import-x/group-exports': 'off',
-		'import-x/imports-first': 'off', // Replaced by 'import/first'
+		'import-x/imports-first': 'off', // Replaced by 'import-x/first'
 		'import-x/max-dependencies': 'off',
 		'import-x/newline-after-import': [
 			'error',
@@ -72,14 +72,14 @@ export const importX: TSESLint.FlatConfig.Config = {
 		'import-x/no-anonymous-default-export': 'off', // See next rule
 		'import-x/no-default-export': 'error',
 		'import-x/no-duplicates': 'error',
-		'import-x/no-named-default': 'off', // In favor of 'import/no-default-export'
+		'import-x/no-named-default': 'off', // In favor of 'import-x/no-default-export'
 		'import-x/no-named-export': 'off',
 		'import-x/no-namespace': 'off',
 		'import-x/no-unassigned-import': [
 			'error',
 			{ allow: [ '**/*.css' ] }
 		],
-		'import-x/order': 'error',
+		'import-x/order': 'off',
 		'import-x/prefer-default-export': 'off',
 		'import-x/prefer-namespace-import': 'off'
 	}

package/eslint/configs/perfectionist.ts

@@ -4,5 +4,27 @@ import eslintPluginPerfectionist from 'eslint-plugin-perfectionist';
 export const perfectionist: TSESLint.FlatConfig.Config = {
 	name: 'eslint-plugin-perfectionist',
 	plugins: { eslintPluginPerfectionist },
-	...eslintPluginPerfectionist.configs['recommended-natural']
+	...eslintPluginPerfectionist.configs['recommended-natural'],
+	rules: {
+
+		'perfectionist/sort-imports': [
+			'error',
+			{
+				type: 'natural',
+				order: 'asc',
+				fallbackSort: { type: 'unsorted' },
+				ignoreCase: true,
+				specialCharacters: 'keep',
+				locales: 'en-US',
+				sortBy: 'path',
+				sortSideEffects: true,
+				partitionByComment: false,
+				partitionByNewLine: true,
+				newlinesBetween: 'ignore',
+				newlinesInside: 'ignore'
+
+			}
+		]
+
+	}
 };

package/eslint/configs/typescript.ts

@@ -466,7 +466,7 @@ export const typescript: TSESLint.FlatConfig.Config = {
 			'error',
 			'always'
 		],
-		'@typescript-eslint/sort-type-constituents': 'off', // Deprecated in favor of sort-intersection-types, etc.
+		'@typescript-eslint/sort-type-constituents': 'off', // Deprecated in favor of perfectionist/sort-intersection-types, etc.
 		'@typescript-eslint/strict-boolean-expressions': [
 			'error',
 			{

package/eslint/presets/sveltekitPreset.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-type-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { defineConfig } from 'eslint/config';
-import { importX as eslintPluginImportX } from 'eslint-plugin-import-x';
 import { Linter } from 'eslint/universal';
 import { base } from '../configs/base';
 import { importX } from '../configs/importX';
@@ -18,11 +17,7 @@ export const sveltekitPreset = defineConfig(
 	base as any,
 	typescript as Linter.Config,
 	sveltekit as Linter.Config[],
-	{
-		...eslintPluginImportX.configs['flat/typescript'],
-		...importX
-
-	} as Linter.Config,
+	importX as Linter.Config,
 	stylistic as Linter.Config,
 	perfectionist as Linter.Config,
 	custom as Linter.Config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lint-rules-alvin",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "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"

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

@@ -1,105 +0,0 @@
-
-import {
-	AST_NODE_TYPES,
-	ESLintUtils
-} from '@typescript-eslint/utils';
-
-export const unnamedImportsLastRule = ESLintUtils.RuleCreator.withoutDocs({
-	meta: {
-		type: 'layout',
-		docs: { description: 'Enforce that unnamed imports (side-effect imports) are last' },
-		fixable: 'code',
-		schema: [],
-		messages: { error: 'Unnamed (side-effect) imports should be at the bottom of the import block.' }
-	},
-	defaultOptions: [],
-	create(context) {
-
-		return {
-			// eslint-disable-next-line @typescript-eslint/naming-convention
-			'Program:exit'(program) {
-
-				const sourceCode = context.sourceCode;
-				const allImports = program.body.filter((node)=> node.type === AST_NODE_TYPES.ImportDeclaration);
-
-				if (allImports.length < 2) {
-
-					return;
-
-				}
-
-				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) {
-
-					return;
-
-				}
-
-				const lastRegularImport = regularImports[regularImports.length - 1];
-
-				const misplacedImports = sideEffectImports.filter((node)=> node.range[0] < lastRegularImport.range[0]);
-
-				if (misplacedImports.length === 0) {
-
-					return;
-
-				}
-
-				// Report on the first misplaced import
-				const firstMisplaced = misplacedImports[0];
-
-				context.report({
-					node: firstMisplaced,
-					messageId: 'error',
-					fix(fixer) {
-
-						// Move the first misplaced side-effect import to after the last regular import
-						const moveNode = firstMisplaced;
-						const moveStart = moveNode.range[0];
-						let moveEnd = moveNode.range[1];
-						const text = sourceCode.text;
-						const endsWithSemicolon = text[moveEnd - 1] === ';';
-
-						if (!endsWithSemicolon) {
-
-							const ch = text[moveEnd] ?? '';
-							if (ch === '\n') {
-
-								moveEnd += 1;
-
-							} else if (ch === '\r') {
-
-								moveEnd += text[moveEnd + 1] === '\n'
-									? 2
-									: 1;
-
-							}
-
-						}
-
-						const chunk = text.slice(
-							moveStart,
-							moveEnd
-						);
-
-						return [
-							fixer.removeRange([
-								moveStart,
-								moveEnd
-							]),
-							fixer.insertTextAfter(
-								lastRegularImport,
-								chunk
-							)
-						];
-
-					}
-				});
-
-			}
-		};
-
-	}
-});

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

@@ -1,25 +0,0 @@
-import { RuleTester } from '@typescript-eslint/rule-tester';
-import { unnamedImportsLastRule } from '../../eslint/custom_rules/unnamed-imports-last.js';
-
-new RuleTester().run(
-	'unnamed-imports-last',
-	unnamedImportsLastRule,
-	{
-		valid: [
-			'import { a } from \'./a\';import b from \'./b\';\nimport \'./side-effect\';',
-			'import a from \'./a\'\nimport { b } from \'./b\';\nimport \'./side-effect\';'
-		],
-		invalid: [
-			{
-				code: 'import \'./side-effect\';\nimport a from \'./a\';',
-				errors: [ { messageId: 'error' } ],
-				output: '\nimport a from \'./a\';import \'./side-effect\';'
-			},
-			{
-				code: '\nimport { a } from \'./a\';\nimport \'./side-effect\';import b from \'./b\';',
-				errors: [ { messageId: 'error' } ],
-				output: '\nimport { a } from \'./a\';\nimport b from \'./b\';import \'./side-effect\';'
-			}
-		]
-	}
-);