@cuiqg/eslint-config 2.8.9 → 2.8.10

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,178 +444,164 @@ async function unocss() {
 
 //#endregion
 //#region src/configs/vue.js
-async function vue() {
-	let additionalParserOptions = {};
+async function vue(options = {}) {
+	const { typescript: typescript$1 = false, stylistic: stylistic$1 = true, vueVersion = 3 } = options;
+	let parserOptions = null;
 	const files = [GLOB_VUE];
+	const { indent = 2 } = typeof stylistic$1 === "boolean" ? {} : stylistic$1;
 	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",
 		plugins: { vue: pluginVue },
 		languageOptions: {
+			globals: {
+				computed: "readonly",
+				defineEmits: "readonly",
+				defineExpose: "readonly",
+				defineProps: "readonly",
+				onMounted: "readonly",
+				onUnmounted: "readonly",
+				reactive: "readonly",
+				ref: "readonly",
+				shallowReactive: "readonly",
+				shallowRef: "readonly",
+				toRef: "readonly",
+				toRefs: "readonly",
+				watch: "readonly",
+				watchEffect: "readonly"
+			},
 			parser: parserVue,
 			parserOptions: {
+				ecmaFeatures: { jsx: true },
 				ecmaVersion: "latest",
 				extraFileExtensions: [".vue"],
 				sourceType: "module",
-				...additionalParserOptions
+				...parserOptions
 			}
 		},
 		processor: pluginVue.processors[".vue"],
 		rules: {
-			"vue/attribute-hyphenation": ["error", "always"],
+			...pluginVue.configs.base.rules,
+			...vueVersion === 2 ? {
+				...pluginVue.configs["vue2-essential"].rules,
+				...pluginVue.configs["vue2-strongly-recommended"].rules,
+				...pluginVue.configs["vue2-recommended"].rules
+			} : {
+				...pluginVue.configs["flat/essential"].map((c) => c.rules).reduce((acc, c) => ({
+					...acc,
+					...c
+				}), {}),
+				...pluginVue.configs["flat/strongly-recommended"].map((c) => c.rules).reduce((acc, c) => ({
+					...acc,
+					...c
+				}), {}),
+				...pluginVue.configs["flat/recommended"].map((c) => c.rules).reduce((acc, c) => ({
+					...acc,
+					...c
+				}), {})
+			},
 			"vue/block-order": ["error", { order: [
 				"script",
 				"template",
 				"style"
 			] }],
-			"vue/comment-directive": "error",
-			"vue/component-api-style": "error",
-			"vue/component-definition-name-casing": ["error", "kebab-case"],
-			"vue/component-name-in-template-casing": ["error", "kebab-case"],
-			"vue/component-options-name-casing": ["error", "kebab-case"],
-			"vue/custom-event-name-casing": ["error", "kebab-case"],
-			"vue/define-emits-declaration": "error",
-			"vue/define-props-declaration": "error",
-			"vue/define-props-destructuring": ["error", { destructure: "always" }],
-			"vue/enforce-style-attribute": ["error", { allow: ["scoped", "plain"] }],
-			"vue/html-button-has-type": "error",
-			"vue/html-end-tags": "error",
-			"vue/jsx-uses-vars": "error",
-			"vue/no-async-in-computed-properties": "error",
-			"vue/no-child-content": "error",
-			"vue/no-computed-properties-in-data": "error",
-			"vue/no-deprecated-data-object-declaration": "error",
-			"vue/no-deprecated-delete-set": "error",
-			"vue/no-deprecated-destroyed-lifecycle": "error",
-			"vue/no-deprecated-dollar-listeners-api": "error",
-			"vue/no-deprecated-dollar-scopedslots-api": "error",
-			"vue/no-deprecated-events-api": "error",
-			"vue/no-deprecated-filter": "error",
-			"vue/no-deprecated-functional-template": "error",
-			"vue/no-deprecated-html-element-is": "error",
-			"vue/no-deprecated-inline-template": "error",
-			"vue/no-deprecated-model-definition": "error",
-			"vue/no-deprecated-props-default-this": "error",
-			"vue/no-deprecated-router-link-tag-prop": "error",
-			"vue/no-deprecated-scope-attribute": "error",
-			"vue/no-deprecated-slot-attribute": "error",
-			"vue/no-deprecated-slot-scope-attribute": "error",
-			"vue/no-deprecated-v-bind-sync": "error",
-			"vue/no-deprecated-v-is": "error",
-			"vue/no-deprecated-v-on-native-modifier": "error",
-			"vue/no-deprecated-v-on-number-modifiers": "error",
-			"vue/no-deprecated-vue-config-keycodes": "error",
-			"vue/no-dupe-keys": "error",
-			"vue/no-dupe-v-else-if": "error",
-			"vue/no-duplicate-attr-inheritance": "error",
-			"vue/no-duplicate-attributes": "error",
-			"vue/no-duplicate-class-names": "error",
-			"vue/no-empty-component-block": "error",
-			"vue/no-export-in-script-setup": "error",
-			"vue/no-expose-after-await": "error",
-			"vue/no-lifecycle-after-await": "error",
-			"vue/no-lone-template": "error",
-			"vue/no-multiple-objects-in-class": "error",
-			"vue/no-multiple-slot-args": "error",
-			"vue/no-mutating-props": "error",
-			"vue/no-negated-condition": "error",
-			"vue/no-negated-v-if-condition": "error",
-			"vue/no-parsing-error": "error",
-			"vue/no-potential-component-option-typo": "error",
-			"vue/no-ref-as-operand": "error",
-			"vue/no-ref-object-reactivity-loss": "error",
-			"vue/no-required-prop-with-default": "error",
-			"vue/no-reserved-component-names": "error",
-			"vue/no-reserved-keys": "error",
-			"vue/no-reserved-props": "error",
-			"vue/no-setup-props-reactivity-loss": "error",
-			"vue/no-shared-component-data": "error",
-			"vue/no-side-effects-in-computed-properties": "error",
-			"vue/no-template-key": "error",
-			"vue/no-template-shadow": "error",
-			"vue/no-template-target-blank": "error",
-			"vue/no-textarea-mustache": "error",
-			"vue/no-this-in-before-route-enter": "error",
-			"vue/no-undef-components": "error",
-			"vue/no-undef-properties": "error",
-			"vue/no-unused-components": "error",
-			"vue/no-unused-emit-declarations": "error",
-			"vue/no-unused-vars": "error",
-			"vue/no-use-computed-property-like-method": "error",
-			"vue/no-use-v-else-with-v-for": "error",
-			"vue/no-use-v-if-with-v-for": "error",
-			"vue/no-useless-mustaches": "error",
-			"vue/no-useless-template-attributes": "error",
+			"vue/component-name-in-template-casing": ["error", "PascalCase"],
+			"vue/component-options-name-casing": ["error", "PascalCase"],
+			"vue/component-tags-order": "off",
+			"vue/custom-event-name-casing": ["error", "camelCase"],
+			"vue/define-macros-order": ["error", { order: [
+				"defineOptions",
+				"defineProps",
+				"defineEmits",
+				"defineSlots"
+			] }],
+			"vue/dot-location": ["error", "property"],
+			"vue/dot-notation": ["error", { allowKeywords: true }],
+			"vue/eqeqeq": ["error", "smart"],
+			"vue/html-indent": ["error", indent],
+			"vue/html-quotes": ["error", "double"],
+			"vue/max-attributes-per-line": "off",
+			"vue/multi-word-component-names": "off",
+			"vue/no-dupe-keys": "off",
+			"vue/no-empty-pattern": "error",
+			"vue/no-irregular-whitespace": "error",
+			"vue/no-loss-of-precision": "error",
+			"vue/no-restricted-syntax": [
+				"error",
+				"DebuggerStatement",
+				"LabeledStatement",
+				"WithStatement"
+			],
+			"vue/no-restricted-v-bind": ["error", "/^v-/"],
+			"vue/no-setup-props-reactivity-loss": "off",
+			"vue/no-sparse-arrays": "error",
+			"vue/no-unused-refs": "error",
 			"vue/no-useless-v-bind": "error",
-			"vue/no-v-for-template-key-on-child": "error",
-			"vue/no-v-html": "error",
-			"vue/no-v-text-v-html-on-component": "error",
-			"vue/no-watch-after-await": "error",
-			"vue/prefer-define-options": "error",
-			"vue/prefer-import-from-vue": "error",
+			"vue/no-v-html": "off",
+			"vue/object-shorthand": [
+				"error",
+				"always",
+				{
+					avoidQuotes: true,
+					ignoreConstructors: false
+				}
+			],
 			"vue/prefer-separate-static-class": "error",
-			"vue/prefer-true-attribute-shorthand": "error",
+			"vue/prefer-template": "error",
 			"vue/prop-name-casing": ["error", "camelCase"],
-			"vue/require-component-is": "error",
-			"vue/require-default-prop": "error",
-			"vue/require-emit-validator": "error",
-			"vue/require-explicit-emits": "error",
-			"vue/require-explicit-slots": "error",
-			"vue/require-macro-variable-name": ["error", {
-				defineEmits: "emit",
-				defineProps: "props",
-				defineSlots: "slots",
-				useAttrs: "attrs",
-				useSlots: "slots"
+			"vue/require-default-prop": "off",
+			"vue/require-prop-types": "off",
+			"vue/space-infix-ops": "error",
+			"vue/space-unary-ops": ["error", {
+				nonwords: false,
+				words: true
 			}],
-			"vue/require-name-property": "error",
-			"vue/require-prop-type-constructor": "error",
-			"vue/require-render-return": "error",
-			"vue/require-slots-as-functions": "error",
-			"vue/require-toggle-inside-transition": "error",
-			"vue/require-typed-ref": "error",
-			"vue/require-v-for-key": "error",
-			"vue/require-valid-default-prop": "error",
-			"vue/return-in-computed-property": "error",
-			"vue/return-in-emits-validator": "error",
-			"vue/this-in-template": "error",
-			"vue/use-v-on-exact": "error",
-			"vue/v-bind-style": "error",
-			"vue/v-on-event-hyphenation": "error",
-			"vue/v-on-style": "error",
-			"vue/v-slot-style": "error",
-			"vue/valid-attribute-name": "error",
-			"vue/valid-define-emits": "error",
-			"vue/valid-define-options": "error",
-			"vue/valid-define-props": "error",
-			"vue/valid-next-tick": "error",
-			"vue/valid-template-root": "error",
-			"vue/valid-v-bind": "error",
-			"vue/valid-v-cloak": "error",
-			"vue/valid-v-else": "error",
-			"vue/valid-v-else-if": "error",
-			"vue/valid-v-for": "error",
-			"vue/valid-v-html": "error",
-			"vue/valid-v-if": "error",
-			"vue/valid-v-is": "error",
-			"vue/valid-v-memo": "error",
-			"vue/valid-v-model": "error",
-			"vue/valid-v-on": "error",
-			"vue/valid-v-once": "error",
-			"vue/valid-v-pre": "error",
-			"vue/valid-v-show": "error",
-			"vue/valid-v-slot": "error",
-			"vue/valid-v-text": "error"
+			...stylistic$1 ? {
+				"vue/array-bracket-spacing": ["error", "never"],
+				"vue/arrow-spacing": ["error", {
+					after: true,
+					before: true
+				}],
+				"vue/block-spacing": ["error", "always"],
+				"vue/block-tag-newline": ["error", {
+					multiline: "always",
+					singleline: "always"
+				}],
+				"vue/brace-style": [
+					"error",
+					"stroustrup",
+					{ allowSingleLine: true }
+				],
+				"vue/comma-dangle": ["error", "always-multiline"],
+				"vue/comma-spacing": ["error", {
+					after: true,
+					before: false
+				}],
+				"vue/comma-style": ["error", "last"],
+				"vue/html-comment-content-spacing": [
+					"error",
+					"always",
+					{ exceptions: ["-"] }
+				],
+				"vue/key-spacing": ["error", {
+					afterColon: true,
+					beforeColon: false
+				}],
+				"vue/keyword-spacing": ["error", {
+					after: true,
+					before: true
+				}],
+				"vue/object-curly-newline": "off",
+				"vue/object-curly-spacing": ["error", "always"],
+				"vue/object-property-newline": ["error", { allowAllPropertiesOnSameLine: true }],
+				"vue/operator-linebreak": ["error", "before"],
+				"vue/padding-line-between-blocks": ["error", "always"],
+				"vue/quote-props": ["error", "consistent-as-needed"],
+				"vue/space-in-parens": ["error", "never"],
+				"vue/template-curly-spacing": "error"
+			} : {}
 		}
 	}];
 }
@@ -652,7 +638,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 +826,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 +858,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.10",
   "description": "Eslint config for @cuiqg",
   "keywords": [
     "eslint-config"