@pengzhanbo/eslint-config 2.9.1 → 2.10.0

package/dist/index.js

@@ -504,7 +504,6 @@ async function stylistic(options = {}) {
 }
 //#endregion
 //#region src/configs/formatters.ts
-const formatPackages = ["eslint-plugin-format"];
 function mergePrettierOptions(options, overrides) {
 	return {
 		...options,
@@ -512,22 +511,122 @@ function mergePrettierOptions(options, overrides) {
 		plugins: [...overrides.plugins || [], ...options.plugins || []]
 	};
 }
-async function formatters(options = {}, stylistic = {}) {
-	if (options === true) {
-		const isPrettierPluginXmlInScope = isPackageInScope("@prettier/plugin-xml");
-		options = {
-			astro: isPackageInScope("prettier-plugin-astro"),
-			css: true,
-			graphql: true,
-			html: true,
-			markdown: true,
-			svg: isPrettierPluginXmlInScope,
-			xml: isPrettierPluginXmlInScope
-		};
-	}
-	if (options.astro) formatPackages.push("prettier-plugin-astro");
-	if (options.svg || options.xml) formatPackages.push("@prettier/plugin-xml");
-	await ensurePackages(formatPackages);
+function buildCssConfigs(prettierOptions) {
+	return [
+		[
+			[GLOB_CSS, GLOB_POSTCSS],
+			"css",
+			"config/formatter/css"
+		],
+		[
+			[GLOB_SCSS],
+			"scss",
+			"config/formatter/scss"
+		],
+		[
+			[GLOB_LESS],
+			"less",
+			"config/formatter/less"
+		]
+	].map(([files, parser, name]) => ({
+		files: [...files],
+		languageOptions: { parser: parserPlain },
+		name,
+		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser })] }
+	}));
+}
+function buildXmlLikeConfig(prettierOptions, prettierXmlOptions, files, name) {
+	return {
+		files,
+		languageOptions: { parser: parserPlain },
+		name,
+		rules: { "format/prettier": ["error", mergePrettierOptions({
+			...prettierXmlOptions,
+			...prettierOptions
+		}, {
+			parser: "xml",
+			plugins: ["@prettier/plugin-xml"]
+		})] }
+	};
+}
+function buildMarkdownConfigs(options, prettierOptions, dprintOptions) {
+	const formater = options.markdown === true ? "prettier" : options.markdown;
+	return [{
+		files: [GLOB_MARKDOWN],
+		ignores: [],
+		languageOptions: { parser: parserPlain },
+		name: "config/formatter/markdown",
+		rules: { [`format/${formater}`]: ["error", formater === "prettier" ? mergePrettierOptions(prettierOptions, {
+			embeddedLanguageFormatting: "off",
+			parser: "markdown"
+		}) : {
+			...dprintOptions,
+			language: "markdown"
+		}] }
+	}];
+}
+function buildAstroConfigs(prettierOptions) {
+	return [{
+		files: [GLOB_ASTRO],
+		languageOptions: { parser: parserPlain },
+		name: "config/formatter/astro",
+		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, {
+			parser: "astro",
+			plugins: ["prettier-plugin-astro"]
+		})] }
+	}, {
+		files: [GLOB_ASTRO, GLOB_ASTRO_TS],
+		name: "config/formatter/astro/disables",
+		rules: {
+			"style/arrow-parens": "off",
+			"style/block-spacing": "off",
+			"style/comma-dangle": "off",
+			"style/indent": "off",
+			"style/no-multi-spaces": "off",
+			"style/quotes": "off",
+			"style/semi": "off"
+		}
+	}];
+}
+function resolveFormattersOptions(options) {
+	if (options !== true) return options;
+	const isPrettierPluginXmlInScope = isPackageInScope("@prettier/plugin-xml");
+	return {
+		astro: isPackageInScope("prettier-plugin-astro"),
+		css: true,
+		graphql: true,
+		html: true,
+		markdown: true,
+		svg: isPrettierPluginXmlInScope,
+		xml: isPrettierPluginXmlInScope
+	};
+}
+function buildHtmlConfig(prettierOptions) {
+	return {
+		files: [GLOB_HTML],
+		languageOptions: { parser: parserPlain },
+		name: "config/formatter/html",
+		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "html" })] }
+	};
+}
+function buildGraphqlConfig(prettierOptions) {
+	return {
+		files: [GLOB_GRAPHQL],
+		languageOptions: { parser: parserPlain },
+		name: "config/formatter/graphql",
+		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "graphql" })] }
+	};
+}
+function getFormattersPackagesToEnsure(options) {
+	return [
+		"eslint-plugin-format",
+		options.astro ? "prettier-plugin-astro" : void 0,
+		options.xml || options.svg ? "@prettier/plugin-xml" : void 0
+	];
+}
+async function formatters(rawOptions = {}, stylistic = {}) {
+	const options = resolveFormattersOptions(rawOptions);
+	await ensurePackages(getFormattersPackagesToEnsure(options));
 	const { indent, quotes, semi } = {
 		...StylisticConfigDefaults,
 		...stylistic
@@ -554,100 +653,16 @@ async function formatters(options = {}, stylistic = {}) {
 		...options.dprintOptions || {}
 	};
 	const configs = [{
-		name: "config/formatters/setup",
+		name: "config/formatter/setup",
 		plugins: { format: await interopDefault(import("eslint-plugin-format")) }
 	}];
-	if (options.css) configs.push({
-		files: [GLOB_CSS, GLOB_POSTCSS],
-		languageOptions: { parser: parserPlain },
-		name: "config/formatter/css",
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "css" })] }
-	}, {
-		files: [GLOB_SCSS],
-		languageOptions: { parser: parserPlain },
-		name: "config/formatter/scss",
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "scss" })] }
-	}, {
-		files: [GLOB_LESS],
-		languageOptions: { parser: parserPlain },
-		name: "config/formatter/less",
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "less" })] }
-	});
-	if (options.html) configs.push({
-		files: [GLOB_HTML],
-		languageOptions: { parser: parserPlain },
-		name: "config/formatter/html",
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "html" })] }
-	});
-	if (options.xml) configs.push({
-		files: [GLOB_XML],
-		languageOptions: { parser: parserPlain },
-		name: "config/formatter/xml",
-		rules: { "format/prettier": ["error", mergePrettierOptions({
-			...prettierXmlOptions,
-			...prettierOptions
-		}, {
-			parser: "xml",
-			plugins: ["@prettier/plugin-xml"]
-		})] }
-	});
-	if (options.svg) configs.push({
-		files: [GLOB_SVG],
-		languageOptions: { parser: parserPlain },
-		name: "config/formatter/svg",
-		rules: { "format/prettier": ["error", mergePrettierOptions({
-			...prettierXmlOptions,
-			...prettierOptions
-		}, {
-			parser: "xml",
-			plugins: ["@prettier/plugin-xml"]
-		})] }
-	});
-	if (options.markdown) {
-		const formater = options.markdown === true ? "prettier" : options.markdown;
-		configs.push({
-			files: [GLOB_MARKDOWN],
-			languageOptions: { parser: parserPlain },
-			name: "config/formatter/markdown",
-			rules: { [`format/${formater}`]: ["error", formater === "prettier" ? mergePrettierOptions(prettierOptions, {
-				embeddedLanguageFormatting: "off",
-				parser: "markdown"
-			}) : {
-				...dprintOptions,
-				language: "markdown"
-			}] }
-		});
-	}
-	if (options.astro) {
-		configs.push({
-			files: [GLOB_ASTRO],
-			languageOptions: { parser: parserPlain },
-			name: "config/formatter/astro",
-			rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, {
-				parser: "astro",
-				plugins: ["prettier-plugin-astro"]
-			})] }
-		});
-		configs.push({
-			files: [GLOB_ASTRO, GLOB_ASTRO_TS],
-			name: "config/formatter/astro/disables",
-			rules: {
-				"style/arrow-parens": "off",
-				"style/block-spacing": "off",
-				"style/comma-dangle": "off",
-				"style/indent": "off",
-				"style/no-multi-spaces": "off",
-				"style/quotes": "off",
-				"style/semi": "off"
-			}
-		});
-	}
-	if (options.graphql) configs.push({
-		files: [GLOB_GRAPHQL],
-		languageOptions: { parser: parserPlain },
-		name: "config/formatter/graphql",
-		rules: { "format/prettier": ["error", mergePrettierOptions(prettierOptions, { parser: "graphql" })] }
-	});
+	if (options.css) configs.push(...buildCssConfigs(prettierOptions));
+	if (options.html) configs.push(buildHtmlConfig(prettierOptions));
+	if (options.xml) configs.push(buildXmlLikeConfig(prettierOptions, prettierXmlOptions, [GLOB_XML], "config/formatter/xml"));
+	if (options.svg) configs.push(buildXmlLikeConfig(prettierOptions, prettierXmlOptions, [GLOB_SVG], "config/formatter/svg"));
+	if (options.markdown) configs.push(...buildMarkdownConfigs(options, prettierOptions, dprintOptions));
+	if (options.astro) configs.push(...buildAstroConfigs(prettierOptions));
+	if (options.graphql) configs.push(buildGraphqlConfig(prettierOptions));
 	return configs;
 }
 //#endregion
@@ -1230,7 +1245,7 @@ async function pnpm(options) {
 		interopDefault(import("eslint-plugin-yml")),
 		interopDefault(import("yaml-eslint-parser"))
 	]);
-	const { catalogs = await detectCatalogUsage(), isInEditor = false, json = true, sort = true, yaml = true } = options;
+	const { catalogs = await detectCatalogUsage(), isInEditor = false, json = true, sort = true, stylistic = true, yaml = true } = options;
 	const configs = [];
 	if (json) configs.push({
 		files: ["package.json", "**/package.json"],
@@ -1254,6 +1269,7 @@ async function pnpm(options) {
 			plugins: { pnpm: pluginPnpm },
 			rules: {
 				"pnpm/yaml-enforce-settings": ["error", { settings: {
+					minimumReleaseAgeExcludePrune: true,
 					shellEmulator: true,
 					trustPolicy: "no-downgrade"
 				} }],
@@ -1261,6 +1277,13 @@ async function pnpm(options) {
 				"pnpm/yaml-no-unused-catalog-item": "error"
 			}
 		});
+		if (stylistic) configs.push({
+			files: ["pnpm-workspace.yaml"],
+			languageOptions: { parser: yamlParser },
+			name: "config/pnpm/pnpm-workspace-yaml-stylistic",
+			plugins: { pnpm: pluginPnpm },
+			rules: { "pnpm/yaml-blank-lines": "error" }
+		});
 		if (sort) configs.push({
 			files: ["pnpm-workspace.yaml"],
 			languageOptions: { parser: yamlParser },
@@ -1271,65 +1294,190 @@ async function pnpm(options) {
 				{
 					order: [
 						...[
-							"cacheDir",
+							"dedupeInjectedDeps",
+							"disallowWorkspaceCycles",
+							"failIfNoMatch",
+							"ignoreWorkspaceCycles",
+							"ignoreWorkspaceRootCheck",
+							"includeWorkspaceRoot",
+							"injectWorkspacePackages",
+							"legacyDirFiltering",
+							"linkWorkspacePackages",
+							"preferWorkspacePackages",
+							"saveWorkspaceProtocol",
+							"sharedWorkspaceLockfile",
+							"syncInjectedDepsAfterScripts"
+						],
+						...[
 							"catalogMode",
-							"cleanupUnusedCatalogs",
-							"dedupeDirectDeps",
-							"deployAllFiles",
-							"enablePrePostScripts",
-							"engineStrict",
+							"catalogPrune",
+							"cleanupUnusedCatalogs"
+						],
+						...[
+							"allowedDeprecatedVersions",
+							"blockExoticSubdeps",
+							"ignoredOptionalDependencies",
+							"minimumReleaseAge",
+							"minimumReleaseAgeIgnoreMissingTime",
+							"minimumReleaseAgeStrict",
+							"minimumReleaseAgeExcludePrune",
+							"minimumReleaseAgeExclude",
+							"registrySupportsTimeField",
+							"resolutionMode",
+							"supportedArchitectures",
+							"trustLockfile",
+							"trustPolicy",
+							"trustPolicyIgnoreAfter",
+							"trustPolicyExclude",
+							"update"
+						],
+						...[
+							"autoInstallPeers",
+							"dedupePeerDependents",
+							"dedupePeers",
+							"peerDependencyRules",
+							"resolvePeersFromWorkspaceRoot",
+							"strictPeerDependencies"
+						],
+						...[
+							"fetchMinSpeedKiBps",
+							"fetchRetries",
+							"fetchRetryFactor",
+							"fetchRetryMaxtimeout",
+							"fetchRetryMintimeout",
+							"fetchTimeout",
+							"fetchWarnTimeoutMs",
+							"gitShallowHosts",
+							"httpProxy",
+							"httpsProxy",
+							"localAddress",
+							"maxsockets",
+							"namedRegistries",
+							"networkConcurrency",
+							"noProxy",
+							"registries",
+							"registry",
+							"strictSsl"
+						],
+						...[
+							"dlxCacheMaxAge",
+							"enableGlobalVirtualStore",
+							"enableModulesDir",
 							"extendNodePath",
+							"modulesCacheMaxAge",
+							"modulesDir",
+							"nodeExperimentalPackageMap",
+							"nodeLinker",
+							"nodePackageMapType",
+							"packageImportMethod",
+							"preferSymlinkedExecutables",
+							"symlink",
+							"virtualStoreDir",
+							"virtualStoreDirMaxLength",
+							"virtualStoreOnly",
+							"virtualStoreType"
+						],
+						...[
 							"hoist",
+							"hoistingLimits",
 							"hoistPattern",
 							"hoistWorkspacePackages",
-							"ignoreCompatibilityDb",
+							"publicHoistPattern",
+							"shamefullyHoist"
+						],
+						...[
+							"frozenStore",
+							"storeDir",
+							"strictStorePkgContentCheck",
+							"useRunningStoreServer",
+							"verifyStoreIntegrity"
+						],
+						...[
+							"gitBranchLockfile",
+							"lockfile",
+							"lockfileIncludeTarballUrl",
+							"mergeGitBranchLockfilesBranchPattern",
+							"peersSuffixMaxLength",
+							"preferFrozenLockfile"
+						],
+						...[
+							"childConcurrency",
+							"dangerouslyAllowAllBuilds",
+							"enablePrePostScripts",
 							"ignoreDepScripts",
 							"ignoreScripts",
-							"ignoreWorkspaceRootCheck",
+							"nodeOptions",
+							"requiredScripts",
+							"scriptShell",
+							"shellEmulator",
+							"sideEffectsCache",
+							"sideEffectsCacheReadonly",
+							"strictDepBuilds",
+							"unsafePerm",
+							"verifyDepsBeforeRun"
+						],
+						...[
 							"managePackageManagerVersions",
-							"minimumReleaseAge",
-							"minimumReleaseAgeExclude",
-							"modulesDir",
-							"nodeLinker",
+							"nodeDownloadMirrors",
 							"nodeVersion",
-							"optimisticRepeatInstall",
 							"packageManagerStrict",
 							"packageManagerStrictVersion",
-							"preferSymlinkedExecutables",
-							"preferWorkspacePackages",
-							"publicHoistPattern",
-							"registrySupportsTimeField",
-							"requiredScripts",
-							"resolutionMode",
+							"pmOnFail",
+							"runtimeOnFail"
+						],
+						...[
+							"ci",
+							"color",
+							"engineStrict",
+							"loglevel",
+							"npmPath",
+							"recursiveInstall",
+							"updateNotifier",
+							"useBetaCli",
+							"useStderr"
+						],
+						...[
+							"cacheDir",
+							"globalBinDir",
+							"globalDir",
+							"globalPnpmfile",
+							"globalShims",
+							"ignorePnpmfile",
+							"npmrcAuthFile",
+							"pnpmfile",
+							"stateDir"
+						],
+						...["audit", "versioning"],
+						...[
+							"allowNonAppliedPatches",
+							"dedupeDirectDeps",
+							"deployAllFiles",
+							"ignoreCompatibilityDb",
+							"initAuthorEmail",
+							"initAuthorName",
+							"initAuthorUrl",
+							"initLicense",
+							"initVersion",
+							"optimisticRepeatInstall",
+							"saveExact",
 							"savePrefix",
-							"scriptShell",
-							"shamefullyHoist",
-							"shellEmulator",
-							"stateDir",
-							"supportedArchitectures",
-							"symlink",
-							"tag",
-							"trustPolicy",
-							"trustPolicyExclude",
-							"updateNotifier"
+							"tag"
 						],
 						"packages",
+						"packageConfigs",
 						"overrides",
+						"packageExtensions",
 						"patchedDependencies",
-						"catalog",
-						"catalogs",
+						"configDependencies",
+						"allowBuilds",
 						...[
-							"allowedDeprecatedVersions",
-							"allowNonAppliedPatches",
-							"configDependencies",
 							"ignoredBuiltDependencies",
-							"ignoredOptionalDependencies",
 							"neverBuiltDependencies",
 							"onlyBuiltDependencies",
-							"onlyBuiltDependenciesFile",
-							"packageExtensions",
-							"peerDependencyRules"
-						]
+							"onlyBuiltDependenciesFile"
+						],
+						"catalog",
+						"catalogs"
 					],
 					pathPattern: "^$"
 				},
@@ -2042,6 +2190,7 @@ async function typescript(options = {}) {
 			plugins: { "erasable-syntax-only": await interopDefault(import("eslint-plugin-erasable-syntax-only")) },
 			rules: {
 				"erasable-syntax-only/enums": "error",
+				"erasable-syntax-only/export-aliases": "error",
 				"erasable-syntax-only/import-aliases": "error",
 				"erasable-syntax-only/namespaces": "error",
 				"erasable-syntax-only/parameter-properties": "error"
@@ -2336,6 +2485,11 @@ async function yaml(options = {}) {
 				"yaml/flow-sequence-bracket-spacing": "error",
 				"yaml/indent": ["error", typeof indent === "number" ? indent : 2],
 				"yaml/key-spacing": "error",
+				"yaml/no-multiple-empty-lines": ["error", {
+					max: 1,
+					maxBOF: 0,
+					maxEOF: 0
+				}],
 				"yaml/no-tab-indent": "error",
 				"yaml/quotes": ["error", {
 					avoidEscape: true,
@@ -2393,14 +2547,16 @@ function eslintFlatConfig(options = {}, ...userConfigs) {
 	const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
 	if (stylisticOptions && !("jsx" in stylisticOptions)) stylisticOptions.jsx = typeof enableJsx === "object" ? true : enableJsx;
 	const configs = [];
-	if (enableGitignore) if (typeof enableGitignore !== "boolean") configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r({
-		name: "config/gitignore",
-		...enableGitignore
-	})]));
-	else configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r({
-		name: "config/gitignore",
-		strict: false
-	})]));
+	if (enableGitignore) {
+		if (typeof enableGitignore !== "boolean") configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r({
+			name: "config/gitignore",
+			...enableGitignore
+		})]));
+		else configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r({
+			name: "config/gitignore",
+			strict: false
+		})]));
+	}
 	const typescriptOptions = resolveSubOptions(options, "typescript");
 	const tsconfigPath = "tsconfigPath" in typescriptOptions ? typescriptOptions.tsconfigPath : void 0;
 	configs.push(ignores(userIgnores, !enableTypeScript), javascript({