@cuiqg/eslint-config 2.8.9 → 2.8.11

package/dist/index.mjs

@@ -84,43 +84,24 @@ async function ignores() {
 	})];
 }
 
-//#endregion
-//#region src/env.js
-const isInGitHookOrLintStaged = () => {
-	return !!(process$1.env.GIT_PARAMS || process$1.env.VSCODE_GIT_COMMAND || process$1.env.npm_lifecycle_script?.startsWith("lint-staged"));
-};
-const isInEditor = () => {
-	if (process$1.env.CI) return false;
-	if (isInGitHookOrLintStaged()) return false;
-	return !!(process$1.env.VSCODE_PID || process$1.env.VSCODE_CWD || process$1.env.JETBRAINS_IDE || process$1.env.VIM || process$1.env.NVIM);
-};
-const hasVue = () => isPackageExists("vue");
-const hasTypeScript = () => isPackageExists("typescript");
-const hasUnocss = () => isPackageExists("unocss");
-const hasTailwindcss = () => isPackageExists("tailwindcss");
-
 //#endregion
 //#region src/configs/javascript.js
-async function javascript() {
-	const files = [GLOB_SRC];
+async function javascript(options = {}) {
+	const { isInEditor: isInEditor$1 = false } = options;
 	const pluginUnusedImports = await interopDefault(import("eslint-plugin-unused-imports"));
 	return [{
-		files,
 		name: "cuiqg/javascript",
 		plugins: { "unused-imports": pluginUnusedImports },
 		languageOptions: {
-			ecmaVersion: "latest",
 			globals: {
 				...globals.browser,
 				...globals.es2025,
 				...globals.node
 			},
 			parserOptions: {
-				ecmaFeatures: { jsx: true },
 				ecmaVersion: "latest",
 				sourceType: "module"
-			},
-			sourceType: "module"
+			}
 		},
 		linterOptions: { reportUnusedDisableDirectives: true },
 		rules: {
@@ -285,7 +266,7 @@ async function javascript() {
 				allowNamedFunctions: false,
 				allowUnboundThis: true
 			}],
-			"prefer-const": [isInEditor ? "warn" : "error", {
+			"prefer-const": [isInEditor$1 ? "warn" : "error", {
 				destructuring: "all",
 				ignoreReadBeforeAssign: true
 			}],
@@ -297,7 +278,7 @@ async function javascript() {
 			"prefer-template": "error",
 			"symbol-description": "error",
 			"unicode-bom": ["error", "never"],
-			"unused-imports/no-unused-imports": isInEditor ? "warn" : "error",
+			"unused-imports/no-unused-imports": isInEditor$1 ? "warn" : "error",
 			"unused-imports/no-unused-vars": ["error", {
 				args: "after-used",
 				argsIgnorePattern: "^_",
@@ -340,7 +321,8 @@ async function jsdoc() {
 			"jsdoc/require-yields-check": "warn",
 			"jsdoc/check-alignment": "warn",
 			"jsdoc/multiline-blocks": "warn"
-		}
+		},
+		settings: { jsdoc: { mode: "jsdoc" } }
 	}];
 }
 
@@ -414,17 +396,35 @@ const stylisticConfigDefaults = {
 	quotes: "single",
 	semi: false
 };
-async function stylistic() {
+async function stylistic(options = {}) {
+	const { commaDangle = "never", experimental, indent, jsx, quotes, semi } = {
+		...stylisticConfigDefaults,
+		...options
+	};
 	const pluginStylistic = await interopDefault(import("@stylistic/eslint-plugin"));
 	const config = pluginStylistic.configs.customize({
-		...stylisticConfigDefaults,
-		commaDangle: "never",
-		pluginName: "@stylistic"
+		commaDangle,
+		experimental,
+		indent,
+		jsx,
+		pluginName: "@stylistic",
+		quotes,
+		semi
 	});
 	return [{
 		name: "cuiqg/stylistic",
 		plugins: { "@stylistic": pluginStylistic },
-		rules: { ...config.rules }
+		rules: {
+			...config.rules,
+			"@stylistic/generator-star-spacing": ["error", {
+				after: true,
+				before: false
+			}],
+			"@stylistic/yield-star-spacing": ["error", {
+				after: true,
+				before: false
+			}]
+		}
 	}];
 }
 
@@ -444,19 +444,12 @@ async function unocss() {
 
 //#endregion
 //#region src/configs/vue.js
-async function vue() {
-	let additionalParserOptions = {};
+async function vue(options = {}) {
+	const { typescript: typescript$1 = false } = options;
+	let parserOptions = null;
 	const files = [GLOB_VUE];
 	const [pluginVue, parserVue] = await Promise.all([interopDefault(import("eslint-plugin-vue")), interopDefault(import("vue-eslint-parser"))]);
-	if (hasTypeScript) {
-		const parserTs = await interopDefault(import("@typescript-eslint/parser"));
-		additionalParserOptions = {
-			...additionalParserOptions,
-			parser: parserTs,
-			projectService: true,
-			tsconfigRootDir: process.cwd()
-		};
-	}
+	if (typescript$1) parserOptions = { parser: await interopDefault(import("@typescript-eslint/parser")) };
 	return [{
 		files,
 		name: "cuiqg/vue",
@@ -464,10 +457,11 @@ async function vue() {
 		languageOptions: {
 			parser: parserVue,
 			parserOptions: {
+				ecmaFeatures: { jsx: true },
 				ecmaVersion: "latest",
 				extraFileExtensions: [".vue"],
 				sourceType: "module",
-				...additionalParserOptions
+				...parserOptions
 			}
 		},
 		processor: pluginVue.processors[".vue"],
@@ -652,7 +646,11 @@ async function comments() {
 //#endregion
 //#region src/configs/typescript.js
 async function typescript() {
-	const files = [GLOB_TS, GLOB_TSX];
+	const files = [
+		GLOB_TS,
+		GLOB_TSX,
+		GLOB_VUE
+	];
 	const [pluginTs, parserTs] = await Promise.all([interopDefault(import("@typescript-eslint/eslint-plugin")), interopDefault(import("@typescript-eslint/parser"))]);
 	return [{
 		files,
@@ -836,14 +834,29 @@ async function typescript() {
 	}];
 }
 
+//#endregion
+//#region src/env.js
+const isInGitHookOrLintStaged = () => {
+	return !!(process$1.env.GIT_PARAMS || process$1.env.VSCODE_GIT_COMMAND || process$1.env.npm_lifecycle_script?.startsWith("lint-staged"));
+};
+const isInEditor = () => {
+	if (process$1.env.CI) return false;
+	if (isInGitHookOrLintStaged()) return false;
+	return !!(process$1.env.VSCODE_PID || process$1.env.VSCODE_CWD || process$1.env.JETBRAINS_IDE || process$1.env.VIM || process$1.env.NVIM);
+};
+const hasVue = () => isPackageExists("vue");
+const hasTypeScript = () => isPackageExists("typescript");
+const hasUnocss = () => isPackageExists("unocss");
+const hasTailwindcss = () => isPackageExists("tailwindcss");
+
 //#endregion
 //#region src/presets.js
 /**
 *
 * @param {object} options - 设置选项
-* @param {boolean} [options.prettier=false] - 是否启用 Prettier 格式化
+* @param {boolean} [options.typescript] - 是否启用 TypeScript 格式化
 * @param {boolean} [options.unocss] - 是否启用 Unocss 格式化
-* @param {boolean} [options.tailwindcss] - 是否启用 Tailwindcss 格式化
+* @param {boolean} [options.tailwindcss] - 是否启用 TailwindCSS 格式化
 * @param {boolean} [options.vue] - 是否启用 VUE 格式化
 * @param {boolean} [options.jsdoc=true] - 是否启用 JSDoc 格式化
 * @param {...Object} userConfigs - 用户配置
@@ -853,10 +866,10 @@ async function typescript() {
 function cuiqg(options = {}, ...userConfigs) {
 	const { jsdoc: enableJsdoc = true, unocss: enableUnocss = hasUnocss(), tailwindcss: enableTailwindcss = hasTailwindcss(), typescript: enableTypescript = hasTypeScript(), vue: enableVue = hasVue() } = options;
 	const configs = [];
-	configs.push(ignores(), comments(), javascript(), stylistic(), packageJson());
+	configs.push(ignores(), comments(), javascript({ isInEditor }), stylistic(), packageJson());
 	if (enableTypescript) configs.push(typescript());
 	if (enableJsdoc) configs.push(jsdoc());
-	if (enableVue) configs.push(vue(), macros());
+	if (enableVue) configs.push(vue({ typescript: enableTypescript }), macros());
 	if (enableUnocss) configs.push(unocss());
 	if (enableTailwindcss) configs.push(tailwindcss());
 	let composer = new FlatConfigComposer();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuiqg/eslint-config",
-  "version": "2.8.9",
+  "version": "2.8.11",
   "description": "Eslint config for @cuiqg",
   "keywords": [
     "eslint-config"