@so1ve/eslint-config 4.0.1 → 4.1.1

package/dist/index.d.mts

@@ -3469,10 +3469,10 @@ interface RuleOptions {
    */
   'so1ve/no-import-promises-as'?: Linter.RuleEntry<[]>;
   /**
-   * Disallow inline type import.
-   * @see no-inline-type-import
+   * Disallow inline type modifiers in import/export.
+   * @see no-inline-type-modifier
    */
-  'so1ve/no-inline-type-import'?: Linter.RuleEntry<[]>;
+  'so1ve/no-inline-type-modifier'?: Linter.RuleEntry<[]>;
   /**
    * Disallow negated comparison.
    * @see no-negated-comparison
@@ -3493,6 +3493,16 @@ interface RuleOptions {
    * @see require-async-with-await
    */
   'so1ve/require-async-with-await'?: Linter.RuleEntry<[]>;
+  /**
+   * Sort export declarations.
+   * @see sort-exports
+   */
+  'so1ve/sort-exports'?: Linter.RuleEntry<[]>;
+  /**
+   * Sort import declarations.
+   * @see sort-imports
+   */
+  'so1ve/sort-imports'?: Linter.RuleEntry<So1VeSortImports>;
   /**
    * Sort attributes of root <script>, <template>, and <style> elements in Vue files.
    * @see vue-root-element-sort-attributes
@@ -3604,14 +3614,6 @@ interface RuleOptions {
    * @see https://eslint.org/docs/latest/rules/sort-imports
    */
   'sort-imports'?: Linter.RuleEntry<SortImports>;
-  /**
-   * @see https://github.com/lydell/eslint-plugin-simple-import-sort#sort-order
-   */
-  'sort-imports/exports'?: Linter.RuleEntry<[]>;
-  /**
-   * @see https://github.com/lydell/eslint-plugin-simple-import-sort#sort-order
-   */
-  'sort-imports/imports'?: Linter.RuleEntry<SortImportsImports>;
   /**
    * Require object keys to be sorted
    * @see https://eslint.org/docs/latest/rules/sort-keys
@@ -12085,6 +12087,10 @@ type SemiSpacing = [] | [{
 }];
 // ----- semi-style -----
 type SemiStyle = [] | [("last" | "first")];
+// ----- so1ve/sort-imports -----
+type So1VeSortImports = [] | [{
+  groups?: string[][];
+}];
 // ----- so1ve/vue-root-element-sort-attributes -----
 type So1VeVueRootElementSortAttributes = [] | [{
   script?: string[];
@@ -12140,10 +12146,6 @@ type SortImports = [] | [{
   ignoreMemberSort?: boolean;
   allowSeparatedGroups?: boolean;
 }];
-// ----- sort-imports/imports -----
-type SortImportsImports = [] | [{
-  groups?: string[][];
-}];
 // ----- sort-keys -----
 type SortKeys = [] | [("asc" | "desc")] | [("asc" | "desc"), {
   caseSensitive?: boolean;
@@ -16303,7 +16305,7 @@ type Yoda = [] | [("always" | "never")] | [("always" | "never"), {
   onlyEquality?: boolean;
 }];
 // Names of all the configs
-type ConfigNames = 'so1ve/ignores' | 'so1ve/javascript/setup' | 'so1ve/javascript/rules' | 'so1ve/javascript/regexp' | 'so1ve/javascript/cli' | 'so1ve/comments/setup' | 'so1ve/comments/rules' | 'so1ve/node/setup' | 'so1ve/node/rules' | 'so1ve/only-error' | 'so1ve/promise/setup' | 'so1ve/promise/rules' | 'so1ve/sort-imports/setup' | 'so1ve/sort-imports/rules' | 'so1ve/imports/setup' | 'so1ve/imports/rules' | 'so1ve/imports/rules/dts' | 'so1ve/unicorn/setup' | 'so1ve/unicorn/rules' | 'so1ve/command' | 'so1ve/de-morgan' | 'so1ve/pnpm/package-json' | 'so1ve/pnpm/pnpm-workspace-yaml' | 'so1ve/yaml/pnpm-workspace-yaml-sort' | 'so1ve/html/setup' | 'so1ve/html/rules' | 'so1ve/typescript/setup' | 'so1ve/typescript/rules' | 'so1ve/typescript/rules/type-aware' | 'so1ve/typescript/rules/dts' | 'so1ve/typescript/rules/js' | 'so1ve/test/setup' | 'so1ve/test/rules' | 'antfu/astro/setup' | 'antfu/astro/rules' | 'so1ve/vue/setup' | 'so1ve/vue/rules' | 'so1ve/solid/setup' | 'so1ve/solid/rules' | 'so1ve/formatting/setup' | 'so1ve/formatting/rules' | 'so1ve/formatting/rules/sort-package-json' | 'so1ve/formatting/rules/sort-tsconfig' | 'so1ve/formatting/rules/test' | 'so1ve/perfectionist/setup' | 'so1ve/perfectionist/rules' | 'so1ve/jsonc/setup' | 'so1ve/jsonc/rules' | 'so1ve/toml/setup' | 'so1ve/toml/rules' | 'so1ve/yaml/setup' | 'so1ve/yaml/rules' | 'so1ve/mdx/setup' | 'so1ve/mdx/rules';
+type ConfigNames = 'so1ve/ignores' | 'so1ve/javascript/setup' | 'so1ve/javascript/rules' | 'so1ve/javascript/regexp' | 'so1ve/javascript/cli' | 'so1ve/comments/setup' | 'so1ve/comments/rules' | 'so1ve/node/setup' | 'so1ve/node/rules' | 'so1ve/only-error' | 'so1ve/promise/setup' | 'so1ve/promise/rules' | 'so1ve/sort-imports/rules' | 'so1ve/imports/setup' | 'so1ve/imports/rules' | 'so1ve/imports/rules/dts' | 'so1ve/unicorn/setup' | 'so1ve/unicorn/rules' | 'so1ve/command' | 'so1ve/de-morgan' | 'so1ve/pnpm/package-json' | 'so1ve/pnpm/pnpm-workspace-yaml' | 'so1ve/yaml/pnpm-workspace-yaml-sort' | 'so1ve/html/setup' | 'so1ve/html/rules' | 'so1ve/typescript/setup' | 'so1ve/typescript/rules' | 'so1ve/typescript/rules/type-aware' | 'so1ve/typescript/rules/dts' | 'so1ve/typescript/rules/js' | 'so1ve/test/setup' | 'so1ve/test/rules' | 'antfu/astro/setup' | 'antfu/astro/rules' | 'so1ve/vue/setup' | 'so1ve/vue/rules' | 'so1ve/solid/setup' | 'so1ve/solid/rules' | 'so1ve/formatting/setup' | 'so1ve/formatting/rules' | 'so1ve/formatting/rules/sort-package-json' | 'so1ve/formatting/rules/sort-tsconfig' | 'so1ve/formatting/rules/test' | 'so1ve/perfectionist/setup' | 'so1ve/perfectionist/rules' | 'so1ve/jsonc/setup' | 'so1ve/jsonc/rules' | 'so1ve/toml/setup' | 'so1ve/toml/rules' | 'so1ve/yaml/setup' | 'so1ve/yaml/rules' | 'so1ve/mdx/setup' | 'so1ve/mdx/rules';
 //#endregion
 //#region src/types.d.ts
 type MaybePromise<T> = T | Promise<T>;

package/dist/index.mjs

@@ -1,7 +1,6 @@
 import createCommand from "eslint-plugin-command/config";
 import pluginComments from "@eslint-community/eslint-plugin-eslint-comments";
 import pluginSo1ve from "@so1ve/eslint-plugin";
-import pluginSortImports from "@so1ve/eslint-plugin-sort-imports";
 import pluginArrayFunc from "eslint-plugin-array-func";
 import pluginImportLite from "eslint-plugin-import-lite";
 import pluginImport from "eslint-plugin-import-x";
@@ -13,10 +12,10 @@ import * as pluginRegexp from "eslint-plugin-regexp";
 import pluginUnicorn from "eslint-plugin-unicorn";
 import pluginUnusedImports from "eslint-plugin-unused-imports";
 import globals from "globals";
-import fsPromises from "node:fs/promises";
+import fs from "node:fs/promises";
 import process$1 from "node:process";
 import { fileURLToPath } from "node:url";
-import fs from "node:fs";
+import fs$1 from "node:fs";
 import path from "node:path";
 import tseslint from "typescript-eslint";
 import { FlatConfigComposer } from "eslint-flat-config-utils";
@@ -1072,7 +1071,6 @@ async function javascript({ overrides } = {}) {
 				"array-func": pluginArrayFunc,
 				"no-await-in-promise": pluginNoAwaitInPromise,
 				"so1ve": pluginSo1ve,
-				"sort-imports": pluginSortImports,
 				"unused-imports": pluginUnusedImports
 			}
 		},
@@ -1346,8 +1344,6 @@ async function javascript({ overrides } = {}) {
 				"require-await": "off",
 				"so1ve/import-dedupe": "error",
 				"so1ve/require-async-with-await": "error",
-				"sort-imports/exports": "error",
-				"sort-imports/imports": ["error"],
 				"switch-colon-spacing": "off",
 				"symbol-description": "off",
 				"unused-imports/no-unused-imports": "error",
@@ -1517,7 +1513,7 @@ async function findUp(name$1, { cwd = process$1.cwd(), type = "file", stopAt } =
 	while (directory) {
 		const filePath = isAbsoluteName ? name$1 : path.join(directory, name$1);
 		try {
-			const stats = await fsPromises.stat(filePath);
+			const stats = await fs.stat(filePath);
 			if (type === "file" && stats.isFile() || type === "directory" && stats.isDirectory()) return filePath;
 		} catch {}
 		if (directory === stopAt || directory === root) break;
@@ -1532,7 +1528,7 @@ function findUpSync(name$1, { cwd = process$1.cwd(), type = "file", stopAt } = {
 	while (directory) {
 		const filePath = isAbsoluteName ? name$1 : path.join(directory, name$1);
 		try {
-			const stats = fs.statSync(filePath, { throwIfNoEntry: false });
+			const stats = fs$1.statSync(filePath, { throwIfNoEntry: false });
 			if (type === "file" && stats?.isFile() || type === "directory" && stats?.isDirectory()) return filePath;
 		} catch {}
 		if (directory === stopAt || directory === root) break;
@@ -1545,7 +1541,7 @@ function findUpSync(name$1, { cwd = process$1.cwd(), type = "file", stopAt } = {
 async function detectCatalogUsage() {
 	const workspaceFile = await findUp("pnpm-workspace.yaml");
 	if (!workspaceFile) return false;
-	const yaml$1 = await fsPromises.readFile(workspaceFile, "utf-8");
+	const yaml$1 = await fs.readFile(workspaceFile, "utf-8");
 	return yaml$1.includes("catalog:") || yaml$1.includes("catalogs:");
 }
 async function pnpm(options) {
@@ -1689,13 +1685,10 @@ async function solid({ overrides, typescript: typescript$1 } = {}) {
 //#endregion
 //#region src/configs/sort-imports.ts
 const sortImports = () => [{
-	name: "so1ve/sort-imports/setup",
-	plugins: { "sort-imports": pluginSortImports }
-}, {
 	name: "so1ve/sort-imports/rules",
 	rules: {
-		"sort-imports/imports": "error",
-		"sort-imports/exports": "error"
+		"so1ve/sort-imports": "error",
+		"so1ve/sort-exports": "error"
 	}
 }];
 
@@ -1817,7 +1810,7 @@ const typescript = async ({ componentExts = [], parserOptions, overrides } = {})
 			"no-use-before-define": "off",
 			"no-useless-constructor": "off",
 			"object-curly-spacing": "off",
-			"so1ve/no-inline-type-import": "error",
+			"so1ve/no-inline-type-modifier": "error",
 			"so1ve/prefer-ts-expect-error": "error",
 			"space-before-blocks": "off",
 			"space-before-function-paren": "off",
@@ -1830,8 +1823,8 @@ const typescript = async ({ componentExts = [], parserOptions, overrides } = {})
 			"ts/consistent-indexed-object-style": ["error", "record"],
 			"ts/consistent-type-definitions": ["error", "interface"],
 			"ts/consistent-type-imports": ["error", {
-				prefer: "type-imports",
-				disallowTypeAnnotations: false
+				disallowTypeAnnotations: false,
+				prefer: "type-imports"
 			}],
 			"ts/explicit-function-return-type": "off",
 			"ts/explicit-member-accessibility": ["error", {
@@ -2040,7 +2033,6 @@ const unicorn = () => [{
 		"unicorn/prefer-spread": "error",
 		"unicorn/prefer-string-slice": "error",
 		"unicorn/prefer-string-starts-ends-with": "error",
-		"unicorn/prefer-ternary": "error",
 		"unicorn/prefer-type-error": "error",
 		"unicorn/relative-url-style": ["error", "always"],
 		"unicorn/require-module-specifiers": "error",
@@ -2292,7 +2284,7 @@ function so1ve(options = {}, ...userConfigs) {
 	const { astro: enableAstro = isPackageExists("astro"), componentExts = [], gitignore: enableGitignore = true, ignores: userIgnores = [], pnpm: enablePnpm = !!findUpSync("pnpm-workspace.yaml"), solid: enableSolid = isPackageExists("solid-js"), typescript: enableTypeScript = isPackageExists("typescript"), vue: enableVue = VuePackages.some((i) => isPackageExists(i)) } = options;
 	const configs$1 = [];
 	if (enableGitignore) if (typeof enableGitignore === "boolean") {
-		if (fs.existsSync(".gitignore")) configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r()]));
+		if (fs$1.existsSync(".gitignore")) configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r()]));
 	} else configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r(enableGitignore)]));
 	configs$1.push(ignores(userIgnores), javascript({ overrides: getOverrides(options, "javascript") }), comments(), node(), onlyError(), promise(), sortImports(), imports(), unicorn(), command(), deMorgan());
 	if (enablePnpm) configs$1.push(pnpm({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-config",
-  "version": "4.0.1",
+  "version": "4.1.1",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "type": "module",
   "description": "Ray's eslint config.",
@@ -76,8 +76,7 @@
     "typescript-eslint": "^8.50.1",
     "vue-eslint-parser": "^10.2.0",
     "yaml-eslint-parser": "^1.3.2",
-    "@so1ve/eslint-plugin": "4.0.1",
-    "@so1ve/eslint-plugin-sort-imports": "4.0.1"
+    "@so1ve/eslint-plugin": "4.1.1"
   },
   "devDependencies": {
     "eslint-plugin-de-morgan": "^2.0.0",