@shayanthenerd/eslint-config 0.26.7 → 0.27.0

package/dist/configs/base.mjs

@@ -12,6 +12,7 @@ function getBaseConfig(options) {
 		name: "shayanthenerd/base",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/baseline.mjs

@@ -10,6 +10,7 @@ function getBaselineConfig(options) {
 		name: "shayanthenerd/baseline",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/importX.mjs

@@ -13,6 +13,7 @@ function getImportXConfig(options) {
 		name: "shayanthenerd/import-x",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/next.mjs

@@ -10,7 +10,7 @@ function getNextConfig(options) {
 	const { overrides } = isEnabled(next) ? next : defaultOptions.configs.next;
 	return mergeConfigs({
 		name: "shayanthenerd/next",
-		files: [globs.src],
+		files: [globs.src, globs.jsxLike],
 		plugins: { next: eslintPluginNext },
 		settings: { next: { rootDir: packageDir } },
 		rules: getNextRules()

package/dist/configs/node.mjs

@@ -15,6 +15,7 @@ function getNodeConfig(options) {
 		name: "shayanthenerd/node",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/perfectionist.mjs

@@ -13,6 +13,7 @@ function getPerfectionistConfig(options) {
 		name: "shayanthenerd/perfectionist",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/promise.mjs

@@ -13,6 +13,7 @@ function getPromiseConfig(options) {
 		name: "shayanthenerd/promise",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/react.mjs

@@ -13,7 +13,7 @@ function getReactConfig(options) {
 	const { overrides, accessibility } = isEnabled(react) ? react : defaultOptions.configs.react;
 	return mergeConfigs({
 		name: "shayanthenerd/react",
-		files: [globs.src],
+		files: [globs.src, globs.jsxLike],
 		plugins: {
 			"@eslint-react": eslintPluginReact,
 			"@html-eslint/react": eslintPluginHtmlReact,

package/dist/configs/stylistic.mjs

@@ -13,6 +13,7 @@ function getStylisticConfig(options) {
 		name: "shayanthenerd/stylistic",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/tailwind.mjs

@@ -58,6 +58,7 @@ function getTailwindConfig(options) {
 		name: "shayanthenerd/tailwind",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(html) ? globs.html : "",
 			isEnabled(astro) ? globs.astro : ""

package/dist/configs/typescript.mjs

@@ -15,6 +15,7 @@ function getTypeScriptConfig(options) {
 		name: "shayanthenerd/typescript",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/unicorn.mjs

@@ -13,6 +13,7 @@ function getUnicornConfig(options) {
 		name: "shayanthenerd/unicorn",
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/configs/vueMiddlewares.mjs

@@ -0,0 +1,14 @@
+import { globs } from "../helpers/globs.mjs";
+//#region src/configs/vueMiddlewares.ts
+function getVueMiddlewaresConfig() {
+	return {
+		name: "shayanthenerd/vue/middlewares",
+		files: [globs.vueMiddlewares],
+		rules: {
+			"consistent-return": "off",
+			"@typescript-eslint/consistent-return": "off"
+		}
+	};
+}
+//#endregion
+export { getVueMiddlewaresConfig };

package/dist/configs/zod.mjs

@@ -14,6 +14,7 @@ function getZodConfig(options) {
 		name: `shayanthenerd/${mini ? "zod-mini" : "zod"}`,
 		files: [
 			globs.src,
+			globs.jsxLike,
 			isEnabled(vue) ? globs.vue : "",
 			isEnabled(astro) ? globs.astro : ""
 		].filter(isTruthy),

package/dist/helpers/globs.mjs

@@ -1,17 +1,20 @@
 //#region src/helpers/globs.ts
-const srcExtensions = "?([mc])[jt]s?(x)";
-const vueExtensions = `{vue,${srcExtensions}}`;
+const srcExtensions = "?([mc])[jt]s";
+const jsxLikeExtensions = "[jt]sx";
+const vueExtensions = `{vue,${srcExtensions},${jsxLikeExtensions}}`;
 const globs = {
 	src: `**/*.${srcExtensions}`,
+	jsxLike: `**/*.${jsxLikeExtensions}`,
 	packageJson: "**/package.json",
 	markdown: "**/*.md",
 	html: "**/*.html",
 	css: "**/*.css",
 	astro: "**/*.astro",
 	vue: `**/*.${vueExtensions}`,
+	vueMiddlewares: `**/middleware?(s)/**/*.${srcExtensions}`,
 	vueServerComponents: `**/*.server.${vueExtensions}`,
 	vueAppErrorLayoutsPages: `**/{{app,error},{layouts,pages}/**/*}.${vueExtensions}`,
-	storybook: `**/*.(story|stories).${srcExtensions}`,
+	storybook: `**/*.(story|stories).{${srcExtensions},${jsxLikeExtensions}}`,
 	test: `**/{__tests__/*,*.{test,spec,cy,bench?(mark)}.${srcExtensions}`,
 	coverage: "**/coverage/**"
 };

package/dist/helpers/options/mergeWithDefaults.mjs

@@ -18,7 +18,8 @@ const mergeOptions = createDefu((object, key, value) => {
 	return isEmptyString(value) || isValueTrue && !isDefaultValueFalse;
 });
 function mergeWithDefaults(options) {
-	return mergeOptions(enableDetectedConfigs(options), defaultOptions);
+	const optionsWithDetectedConfigs = enableDetectedConfigs(options);
+	return mergeOptions(optionsWithDetectedConfigs, defaultOptions);
 }
 //#endregion
 export { mergeWithDefaults };

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import { Options } from "./types/index.mjs";
 import { Linter } from "eslint";
 
 //#region src/index.d.ts
-/** Valid argument combinations for the `defineConfig` function. */
+/** Valid argument combinations for `defineConfig`. */
 type DefineConfigArguments = [] | [options: Options] | [configs: Linter.Config[]] | [options: Options, configs: Linter.Config[]];
 /**
 * Define your ESLint configuration based on the provided options and/or custom Flat Config Objects.

package/dist/index.mjs

@@ -23,6 +23,7 @@ import { getPlaywrightConfig } from "./configs/playwright.mjs";
 import { getTypeScriptConfig } from "./configs/typescript.mjs";
 import { getPackageJsonConfig } from "./configs/packageJson.mjs";
 import { getPerfectionistConfig } from "./configs/perfectionist.mjs";
+import { getVueMiddlewaresConfig } from "./configs/vueMiddlewares.mjs";
 import { getIgnorePatterns } from "./helpers/ignores/getIgnorePatterns.mjs";
 import { mergeWithDefaults } from "./helpers/options/mergeWithDefaults.mjs";
 import { getVueComponentNamesConfig } from "./configs/vueComponentNames.mjs";
@@ -105,6 +106,7 @@ function defineConfig(...args) {
 		isEnabled(react) && getReactConfig(mergedOptions),
 		isEnabled(next) && getNextConfig(mergedOptions),
 		isEnabled(vue) && getVueConfig(mergedOptions),
+		isEnabled(vue) && getVueMiddlewaresConfig(),
 		isEnabled(vue) && getVueComponentNamesConfig(),
 		isEnabled(vue) && isEnabled(nuxt) && getVueServerComponentsConfig(),
 		isEnabled(storybook) && getStorybookConfig(mergedOptions),

package/dist/rules/perfectionist.mjs

@@ -1,6 +1,105 @@
 import { isEnabled } from "../utils/isEnabled.mjs";
 import { defaultOptions } from "../helpers/options/defaultOptions.mjs";
 //#region src/rules/perfectionist.ts
+const literalCustomGroups = [
+	{
+		groupName: "template-literal",
+		selector: "literal",
+		elementNamePattern: "^`.*`$"
+	},
+	{
+		groupName: "bigint-literal",
+		selector: "literal",
+		elementNamePattern: "^-?\\d[\\d_]*n$"
+	},
+	{
+		groupName: "string-literal",
+		selector: "literal",
+		elementNamePattern: "^(?:'.*'|\".*\")$"
+	},
+	{
+		groupName: "boolean-literal",
+		selector: "literal",
+		elementNamePattern: "^(?:true|false)$"
+	},
+	{
+		groupName: "number-literal",
+		selector: "literal",
+		elementNamePattern: "^-?(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)(?:[eE][+-]?\\d[\\d_]*)?$"
+	}
+];
+const booleanKeywordCustomGroup = {
+	groupName: "boolean-keyword",
+	selector: "keyword",
+	elementNamePattern: "^boolean$"
+};
+const sharedTypeLikeGroups = [
+	"boolean-literal",
+	"number-literal",
+	"bigint-literal",
+	"string-literal",
+	"template-literal",
+	"literal",
+	"keyword",
+	"named",
+	"operator",
+	"tuple",
+	"object",
+	"union",
+	"intersection",
+	"conditional",
+	"function",
+	"import",
+	"unknown",
+	"nullish"
+];
+const typeConstituentSortOptions = {
+	customGroups: [booleanKeywordCustomGroup, ...literalCustomGroups],
+	groups: ["boolean-keyword", ...sharedTypeLikeGroups]
+};
+const sortArrayIncludesOptions = {
+	customGroups: literalCustomGroups,
+	groups: sharedTypeLikeGroups
+};
+const sortImportsCustomGroups = [{
+	groupName: "component",
+	elementNamePattern: ["\\.(vue|[jt]sx)$"],
+	modifiers: ["value"]
+}, {
+	groupName: "image",
+	elementNamePattern: ["\\.(ico|svg|gif|png|jpe?g|webp|avif|heic)$"]
+}];
+const sortImportsGroups = [
+	["style", "side-effect-style"],
+	{ newlinesBetween: 0 },
+	"side-effect",
+	"image",
+	"component",
+	"type-external",
+	{ newlinesBetween: 0 },
+	"type-builtin",
+	{ newlinesBetween: 0 },
+	["type-tsconfig-path", "type-subpath"],
+	{ newlinesBetween: 0 },
+	[
+		"type-internal",
+		"type-index",
+		"type-parent",
+		"type-sibling"
+	],
+	"external",
+	{ newlinesBetween: 0 },
+	"builtin",
+	["tsconfig-path", "subpath"],
+	{ newlinesBetween: 0 },
+	[
+		"internal",
+		"index",
+		"parent",
+		"sibling"
+	],
+	["import", "unknown"]
+];
 function getPerfectionistRules(options) {
 	const { env, tsConfig, configs: { stylistic, perfectionist } } = options;
 	const { maxLineLength } = isEnabled(stylistic) ? stylistic : defaultOptions.configs.stylistic;
@@ -8,9 +107,9 @@ function getPerfectionistRules(options) {
 	return {
 		"perfectionist/sort-maps": "warn",
 		"perfectionist/sort-exports": "warn",
-		"perfectionist/sort-union-types": "warn",
-		"perfectionist/sort-array-includes": "warn",
-		"perfectionist/sort-intersection-types": "warn",
+		"perfectionist/sort-union-types": ["warn", typeConstituentSortOptions],
+		"perfectionist/sort-array-includes": ["warn", sortArrayIncludesOptions],
+		"perfectionist/sort-intersection-types": ["warn", typeConstituentSortOptions],
 		"perfectionist/sort-named-imports": "warn",
 		"perfectionist/sort-named-exports": "warn",
 		"perfectionist/sort-imports": ["warn", {
@@ -25,45 +124,8 @@ function getPerfectionistRules(options) {
 			specialCharacters: "trim",
 			type: sortType,
 			maxLineLength,
-			customGroups: [{
-				groupName: "vue-sfc",
-				elementNamePattern: ["\\.(vue|[jt]sx)$"],
-				modifiers: ["value"]
-			}, {
-				groupName: "image",
-				elementNamePattern: ["\\.(ico|svg|gif|png|jpe?g|webp|avif|heic)$"]
-			}],
-			groups: [
-				["style", "side-effect-style"],
-				{ newlinesBetween: 0 },
-				"side-effect",
-				"image",
-				"vue-sfc",
-				"type-external",
-				{ newlinesBetween: 0 },
-				"type-builtin",
-				{ newlinesBetween: 0 },
-				["type-tsconfig-path", "type-subpath"],
-				{ newlinesBetween: 0 },
-				[
-					"type-internal",
-					"type-index",
-					"type-parent",
-					"type-sibling"
-				],
-				"external",
-				{ newlinesBetween: 0 },
-				"builtin",
-				["tsconfig-path", "subpath"],
-				{ newlinesBetween: 0 },
-				[
-					"internal",
-					"index",
-					"parent",
-					"sibling"
-				],
-				["import", "unknown"]
-			]
+			customGroups: sortImportsCustomGroups,
+			groups: sortImportsGroups
 		}]
 	};
 }