Update rules

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  plugins: ['unicorn', 'jsdoc'],
+  plugins: ['unicorn', 'jsdoc', 'import-x'],
   env: { node: true, browser: true, es2023: true },
   reportUnusedDisableDirectives: true,
   parserOptions: {
@@ -14,7 +14,6 @@ module.exports = {
     'plugin:@typescript-eslint/recommended-type-checked',
     'plugin:jsdoc/recommended-typescript',
   ],
-
   overrides: [
     {
       files: ['repl.ts', 'scripts/**/*.ts'],
@@ -31,6 +30,22 @@ module.exports = {
     },
   ],
   rules: {
+    'import-x/order': [
+      'error',
+      {
+        groups: [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index',
+          'object',
+        ],
+        'newlines-between': 'always-and-inside-groups',
+        alphabetize: { order: 'asc', caseInsensitive: true },
+      },
+    ],
     'arrow-body-style': ['error', 'as-needed'],
     'class-methods-use-this': 'warn',
     'func-style': ['error', 'declaration', { allowArrowFunctions: true }],

dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aet/eslint-rules",
-  "version": "1.0.1-beta.25",
+  "version": "1.0.1-beta.28",
   "license": "UNLICENSED",
   "bin": {
     "eslint-install": "install.js",
@@ -11,16 +11,16 @@
     "typescript": "^5.4.4"
   },
   "dependencies": {
-    "@antfu/install-pkg": "^0.3.3",
+    "@antfu/install-pkg": "^0.3.4",
     "@nolyfill/is-core-module": "^1.0.39",
-    "@aet/eslint-define-config": "^0.1.0-beta.21",
+    "@aet/eslint-define-config": "^0.1.0-beta.22",
     "@eslint-community/eslint-utils": "^4.4.0",
     "@tanstack/eslint-plugin-query": "^5.51.15",
     "@types/eslint": "^9.6.0",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/parser": "^8.1.0",
-    "@typescript-eslint/type-utils": "^7.18.0",
+    "@typescript-eslint/type-utils": "^8.1.0",
-    "@typescript-eslint/utils": "^7.18.0",
+    "@typescript-eslint/utils": "^8.1.0",
     "@eslint-react/eslint-plugin": "1.10.0",
     "@stylistic/eslint-plugin": "^2.6.2",
     "aria-query": "^5.3.0",

package.json

@@ -8,8 +8,8 @@
   },
   "private": true,
   "devDependencies": {
-    "@aet/eslint-define-config": "^0.1.0-beta.21",
+    "@aet/eslint-define-config": "^0.1.0-beta.22",
-    "@antfu/install-pkg": "^0.3.3",
+    "@antfu/install-pkg": "^0.3.4",
     "@babel/core": "^7.25.2",
     "@babel/plugin-transform-flow-strip-types": "^7.25.2",
     "@babel/preset-env": "^7.25.3",
@@ -22,11 +22,11 @@
     "@types/estree-jsx": "^1.0.5",
     "@types/lodash": "^4.17.7",
     "@types/node": "^22.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.0.1",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/type-utils": "^8.0.1",
+    "@typescript-eslint/type-utils": "^8.1.0",
-    "@typescript-eslint/types": "^8.0.1",
+    "@typescript-eslint/types": "^8.1.0",
-    "@typescript-eslint/typescript-estree": "^8.0.1",
+    "@typescript-eslint/typescript-estree": "^8.1.0",
-    "@typescript-eslint/utils": "^8.0.1",
+    "@typescript-eslint/utils": "^8.1.0",
     "babel-plugin-macros": "^3.1.0",
     "dts-bundle-generator": "9.4.0",
     "esbuild": "0.23.0",

pnpm-lock.yaml

@@ -28,8 +28,8 @@ importers:
   .:
     devDependencies:
       '@aet/eslint-define-config':
-        specifier: ^0.1.0-beta.18
+        specifier: ^0.1.0-beta.22
-        version: 0.1.0-beta.18
+        version: 0.1.0-beta.22
       '@antfu/install-pkg':
         specifier: ^0.3.3
         version: 0.3.3
@@ -156,8 +156,8 @@ importers:
 
 packages:
 
-  '@aet/eslint-define-config@0.1.0-beta.18':
+  '@aet/eslint-define-config@0.1.0-beta.22':
-    resolution: {integrity: sha512-s5BWjeE78j8cNvIfjztTGsvRM03Asx9wG62Ibf1lkUt/ZMGcw2GBTMgzOoURb9HXdxnTbaz7MmGK0ZxzVXTYDQ==}
+    resolution: {integrity: sha512-c2G0WwfvrOxCGoJ1lYw5c+gKKlXp4ahdyAgJW+Mmir53SKGQjYUt/5Vr6cx2Qn9MjoLWPX4VgTQLmlRq/MS3wg==}
     engines: {node: '>=18.0.0', npm: '>=9.0.0'}
 
   '@ampproject/remapping@2.3.0':
@@ -2143,7 +2143,7 @@ packages:
 
 snapshots:
 
-  '@aet/eslint-define-config@0.1.0-beta.18': {}
+  '@aet/eslint-define-config@0.1.0-beta.22': {}
 
   '@ampproject/remapping@2.3.0':
     dependencies:

src/custom/restrict-template-expressions.ts

@@ -1,6 +1,4 @@
 // https://github.com/typescript-eslint/typescript-eslint/blob/75c128856b1ce05a4fec799bfa6de03b3dab03d0/packages/eslint-plugin/src/rules/restrict-template-expressions.ts
-import * as ts from 'typescript';
-import { AST_NODE_TYPES, ESLintUtils, type TSESTree } from '@typescript-eslint/utils';
 import {
   getConstrainedTypeAtLocation,
   getTypeName,
@@ -8,7 +6,9 @@ import {
   isTypeFlagSet,
   isTypeNeverType,
 } from '@typescript-eslint/type-utils';
+import { AST_NODE_TYPES, ESLintUtils, type TSESTree } from '@typescript-eslint/utils';
 import { getParserServices } from '@typescript-eslint/utils/eslint-utils';
+import * as ts from 'typescript';
 
 const createRule = ESLintUtils.RuleCreator(
   name => `https://typescript-eslint.io/rules/${name}`,

src/env.ts

@@ -1,11 +1,12 @@
 import * as fs from 'node:fs';
 import { resolve } from 'node:path';
+
+import type { Middleware } from './middleware';
+import { jsdoc } from './presets/jsdoc';
+import { reactQuery, storybook } from './presets/misc';
 import { react, reactRefresh } from './presets/react';
 import { tailwind } from './presets/tailwind';
-import { jsdoc } from './presets/jsdoc';
-import { storybook, reactQuery } from './presets/misc';
 import { testingLibrary } from './presets/testing-library';
-import type { Middleware } from './middleware';
 
 const middlewares = {
   react,

src/index.ts

@@ -1,18 +1,18 @@
 /// <reference path="./modules.d.ts" />
 import './redirect';
-import { uniq } from 'lodash';
-import type { Rule } from 'eslint';
-import type { ESLintUtils } from '@typescript-eslint/utils';
 import type { ESLintConfig, Extends, Plugin, Rules } from '@aet/eslint-define-config';
+import type { ESLintUtils } from '@typescript-eslint/utils';
+import type { Rule } from 'eslint';
+import { uniq } from 'lodash';
 
-import type { Middleware, MiddlewareConfig, MiddlewareFunctions } from './middleware';
-import { importTypeScript } from './presets/typescript';
-import { unicorn } from './presets/unicorn';
-import { eslintRules } from './presets/eslint';
-import { custom } from './presets/custom';
 import { off } from './constants';
 import { checkEnv } from './env';
+import type { Middleware, MiddlewareConfig, MiddlewareFunctions } from './middleware';
+import { custom } from './presets/custom';
+import { eslintRules } from './presets/eslint';
 import { stylistic } from './presets/stylistic';
+import { importTypeScript } from './presets/typescript';
+import { unicorn } from './presets/unicorn';
 
 export { graphql } from './presets/graphql';
 export { jsdoc } from './presets/jsdoc';

src/install.ts

@@ -1,6 +1,7 @@
 import { installPackage } from '@antfu/install-pkg';
 import { uniq } from 'lodash';
-import { getProjectDependencies, envs } from './env';
+
+import { envs, getProjectDependencies } from './env';
 
 const deps = getProjectDependencies();
 const packages = uniq(

src/local/index.ts

@@ -1,10 +1,11 @@
-import type { ESLint } from 'eslint';
 import * as fs from 'node:fs';
 import { basename, extname, isAbsolute, resolve } from 'node:path';
-import { glob } from 'fast-glob';
+
+import type { ESLint } from 'eslint';
 import { parseModule } from 'esprima';
 import query from 'esquery';
 import type { Node, Property } from 'estree';
+import { glob } from 'fast-glob';
 
 // https://github.com/gulpjs/interpret
 const transpilers = [

src/middleware.ts

@@ -1,5 +1,6 @@
-import type { Merge, SetRequired } from 'type-fest';
 import type { ESLintConfig, KnownExtends, Settings } from '@aet/eslint-define-config';
+import type { Merge, SetRequired } from 'type-fest';
+
 import type { RuleOptions } from './index';
 
 type OptionalObjectKey<T> = Exclude<

src/presets/custom.ts

@@ -1,5 +1,5 @@
-import type { LocalRuleOptions } from '../index';
 import { error } from '../constants';
+import type { LocalRuleOptions } from '../index';
 import { defineMiddleware } from '../middleware';
 
 const customRules: Partial<LocalRuleOptions> = {

src/presets/eslint.ts

@@ -1,5 +1,7 @@
-import { type EslintRulesObject } from '@aet/eslint-define-config/src/rules/eslint';
+import type { EslintRulesObject } from '@aet/eslint-define-config/src/rules/eslint';
+
 import { error, off, warn } from '../constants';
+
 import restrictedGlobals from './_restrictedGlobals.json';
 
 export const eslintRules: Partial<EslintRulesObject> = {

src/presets/graphql.ts

@@ -1,4 +1,5 @@
 import type { GraphQLRulesObject } from '@aet/eslint-define-config/src/rules/graphql-eslint';
+
 import { defineMiddleware } from '../middleware';
 
 // https://the-guild.dev/graphql/eslint/rules

src/presets/jsdoc.ts

@@ -1,6 +1,7 @@
 import type { JSDocRulesObject } from '@aet/eslint-define-config/src/rules/jsdoc';
-import { defineMiddleware } from '../middleware';
+
 import { off } from '../constants';
+import { defineMiddleware } from '../middleware';
 
 const jsdocRules: Partial<JSDocRulesObject> = {
   'jsdoc/require-jsdoc': off,

src/presets/react.ts

@@ -1,5 +1,6 @@
 import type { ReactRulesObject } from '@aet/eslint-define-config/src/rules/react';
 import type { ReactRefreshRulesObject } from '@aet/eslint-define-config/src/rules/react-refresh';
+
 import { error, off, warn } from '../constants';
 import { defineMiddleware } from '../middleware';
 

src/presets/stylistic.ts

@@ -1,9 +1,10 @@
-import { error } from '../constants';
-import { defineMiddleware } from '../middleware';
 import type { StylisticRulesObject } from '@aet/eslint-define-config/src/rules/stylistic';
 
+import { error } from '../constants';
+import { defineMiddleware } from '../middleware';
+
 const stylisticRules: Partial<StylisticRulesObject> = {
-  'stylistic/spaced-comment': [
+  '@stylistic/spaced-comment': [
     error,
     'always',
     {
@@ -14,6 +15,7 @@ const stylisticRules: Partial<StylisticRulesObject> = {
   ],
 };
 
-export const stylistic = defineMiddleware((_, { addRules }) => {
+export const stylistic = defineMiddleware((config, { addRules }) => {
+  config.plugins.push('@stylistic');
   addRules(stylisticRules);
 });

src/presets/tailwind.ts

@@ -1,6 +1,7 @@
 import type { TailwindRulesObject } from '@aet/eslint-define-config/src/rules/tailwind';
-import { defineMiddleware } from '../middleware';
+
 import { off } from '../constants';
+import { defineMiddleware } from '../middleware';
 
 const tailwindRules: Partial<TailwindRulesObject> = {
   'tailwindcss/no-custom-classname': off,

src/presets/testing-library.ts

@@ -1,4 +1,5 @@
 import type { TestingLibraryRulesObject } from '@aet/eslint-define-config/src/rules/testing-library';
+
 import { defineMiddleware } from '../middleware';
 
 const testingLibraryRules: Partial<TestingLibraryRulesObject> = {};

src/presets/typescript.ts

@@ -1,12 +1,32 @@
-import { error, off, warn } from '../constants';
-import type { TypeScriptRulesObject } from '@aet/eslint-define-config/src/rules/typescript-eslint';
 import type { ImportXRulesObject } from '@aet/eslint-define-config/src/rules/import-x';
+import type { TypeScriptRulesObject } from '@aet/eslint-define-config/src/rules/typescript-eslint';
+
+import { error, off, warn } from '../constants';
 import { defineMiddleware } from '../middleware';
 
 const importRules: Partial<ImportXRulesObject> = {
-  'import-x/export': off,
+  'import-x/first': error,
+  'import-x/no-absolute-path': error,
   'import-x/no-duplicates': error,
-  'import-x/order': [error, { groups: ['builtin', 'external'] }],
+  'import-x/no-useless-path-segments': error,
+  'import-x/order': [
+    error,
+    {
+      groups: [
+        'builtin',
+        'external',
+        'internal',
+        'parent',
+        'sibling',
+        'index',
+        'object',
+        'type',
+      ],
+      'newlines-between': 'always-and-inside-groups',
+      alphabetize: { order: 'asc', caseInsensitive: true },
+    },
+  ],
+  'import-x/unambiguous': error,
 };
 
 const typescriptRules: Partial<TypeScriptRulesObject> = {
@@ -66,8 +86,8 @@ export const importTypeScript = defineMiddleware((config, { addRules, addSetting
       files: ['.eslintrc.js', '.eslintrc.cjs', '*.config.js', 'index.js'],
       extends: ['plugin:@typescript-eslint/disable-type-checked'],
       rules: {
-        '@typescript-eslint/no-require-imports': off,
         'import-x/no-commonjs': off,
+        '@typescript-eslint/no-require-imports': off,
         'rules/restrict-template-expressions': off,
       },
     },

src/presets/unicorn.ts

@@ -1,7 +1,8 @@
 /* eslint-disable unicorn/string-content */
 import type { UnicornRulesObject } from '@aet/eslint-define-config/src/rules/unicorn';
-import { defineMiddleware } from '../middleware';
+
 import { error, warn } from '../constants';
+import { defineMiddleware } from '../middleware';
 
 const suggest = (suggest: string) => ({ suggest, fix: false });
 
@@ -85,6 +86,10 @@ const unicornRules: Partial<UnicornRulesObject> = {
         '<=>': suggest('⇔'),
         '\\.\\.\\.': suggest('…'),
         "'s ": suggest('’s '),
+        "l'": suggest('l’'),
+        "d'": suggest('d’'),
+        '?!': suggest('⁈'),
+        '!?': suggest('⁉'),
       },
     },
   ],

src/redirect.ts

@@ -1,4 +1,4 @@
-import Module from 'module';
+import Module from 'node:module';
 const { name } = [require][0]('./package.json');
 
 const _resolveFilename = Module._resolveFilename;