@icebreakers/eslint-config 4.0.0 → 4.0.2

package/dist/index.js

@@ -179,8 +179,8 @@ const MDX_PACKAGES = ["eslint-plugin-mdx"];
 const VUE_A11Y_PACKAGES = ["eslint-plugin-vuejs-accessibility"];
 const REACT_A11Y_PACKAGES = ["eslint-plugin-jsx-a11y"];
 const QUERY_PACKAGES = ["@tanstack/eslint-plugin-query"];
-function resolveStylelintConfigLoader() {
-	return import.meta.url.endsWith(".ts") ? new URL("./stylelint.ts", import.meta.url).href : new URL("./stylelint.js", import.meta.url).href;
+function resolveStylelintConfigLoader(moduleUrl = import.meta.url) {
+	return moduleUrl.endsWith(".ts") ? new URL("./stylelint.ts", moduleUrl).href : new URL("./stylelint.js", moduleUrl).href;
 }
 function resolveTailwindPresets(option) {
 	if (!option) return [];
@@ -284,8 +284,8 @@ function resolveQueryPresets(isEnabled) {
 	return [(0, antfu_exports.interopDefault)(import("@tanstack/eslint-plugin-query")).then((pluginQuery) => pluginQuery.configs["flat/recommended"])];
 }
 //#endregion
-//#region ../../node_modules/.pnpm/defu@6.1.6/node_modules/defu/dist/defu.mjs
-function isPlainObject(value) {
+//#region ../../node_modules/.pnpm/defu@6.1.7/node_modules/defu/dist/defu.mjs
+function isPlainObject$1(value) {
 	if (value === null || typeof value !== "object") return false;
 	const prototype = Object.getPrototypeOf(value);
 	if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) return false;
@@ -294,7 +294,7 @@ function isPlainObject(value) {
 	return true;
 }
 function _defu(baseObject, defaults, namespace = ".", merger) {
-	if (!isPlainObject(defaults)) return _defu(baseObject, {}, namespace, merger);
+	if (!isPlainObject$1(defaults)) return _defu(baseObject, {}, namespace, merger);
 	const object = { ...defaults };
 	for (const key of Object.keys(baseObject)) {
 		if (key === "__proto__" || key === "constructor") continue;
@@ -302,7 +302,7 @@ function _defu(baseObject, defaults, namespace = ".", merger) {
 		if (value === null || value === void 0) continue;
 		if (merger && merger(object, key, value, namespace)) continue;
 		if (Array.isArray(value) && Array.isArray(object[key])) object[key] = [...value, ...object[key]];
-		else if (isPlainObject(value) && isPlainObject(object[key])) object[key] = _defu(value, object[key], (namespace ? `${namespace}.` : "") + key.toString(), merger);
+		else if (isPlainObject$1(value) && isPlainObject$1(object[key])) object[key] = _defu(value, object[key], (namespace ? `${namespace}.` : "") + key.toString(), merger);
 		else object[key] = value;
 	}
 	return object;
@@ -398,13 +398,14 @@ function isPackageAvailable(name, paths) {
 }
 function getDefaultFormatterOptions(cwd = process.cwd()) {
 	const hasXmlPlugin = isPackageAvailable("@prettier/plugin-xml", [ANTFU_PACKAGE_DIR]);
+	const hasSlidev = isPackageAvailable("@slidev/cli", [cwd]);
 	return {
 		astro: isPackageAvailable("prettier-plugin-astro", [ANTFU_PACKAGE_DIR]),
 		css: true,
 		graphql: true,
 		html: true,
 		markdown: true,
-		slidev: isPackageAvailable("@slidev/cli", [cwd]),
+		slidev: hasSlidev,
 		svg: hasXmlPlugin,
 		xml: hasXmlPlugin
 	};
@@ -474,11 +475,14 @@ function resolveFormattersOption(input, cwd = process.cwd()) {
 	if (input === false) return false;
 	const defaults = getDefaultFormatterOptions(cwd);
 	const inferredEndOfLine = inferPrettierEndOfLineFromEditorConfig(cwd);
-	const defaultsWithPrettier = inferredEndOfLine ? defu({ prettierOptions: { endOfLine: inferredEndOfLine } }, defaults) : defaults;
-	if (input === void 0) return inferredEndOfLine ? defaultsWithPrettier : true;
-	if (input === true) return defaultsWithPrettier;
-	if (isObject(input)) return defu(input, defaultsWithPrettier);
-	return defaultsWithPrettier;
+	const defaultsWithFormattingEngines = inferredEndOfLine ? defu({
+		oxfmtOptions: { endOfLine: inferredEndOfLine },
+		prettierOptions: { endOfLine: inferredEndOfLine }
+	}, defaults) : defaults;
+	if (input === void 0) return defaultsWithFormattingEngines;
+	if (input === true) return defaultsWithFormattingEngines;
+	if (isObject(input)) return defu(input, defaultsWithFormattingEngines);
+	return defaultsWithFormattingEngines;
 }
 function resolveUserOptions(options) {
 	const resolved = defu({}, options ?? {}, BASE_DEFAULTS);
@@ -569,14 +573,74 @@ const OPTIONAL_ANTFU_FEATURE_PACKAGES = {
 		"eslint-plugin-react-hooks",
 		"eslint-plugin-react-refresh"
 	],
-	nextjs: ["@next/eslint-plugin-next"]
+	nextjs: ["@next/eslint-plugin-next"],
+	unocss: ["@unocss/eslint-plugin"]
 };
+function isPlainObject(value) {
+	return value !== null && Object.prototype.toString.call(value) === "[object Object]";
+}
+function cloneUserDefinedOptions(options) {
+	const { settings, ...restOptions } = options;
+	if (settings === void 0) return { ...restOptions };
+	return {
+		...restOptions,
+		settings
+	};
+}
+function getSettingsRecord(settings) {
+	return isPlainObject(settings) ? settings : {};
+}
+function removeNamespacedSetting(options, namespace) {
+	if (!isPlainObject(options.settings)) return options;
+	const settings = getSettingsRecord(options.settings);
+	if (!(namespace in settings)) return options;
+	const { [namespace]: _unusedNamespace, ...restSettings } = settings;
+	const { settings: _settings, ...restOptions } = options;
+	if (Object.keys(restSettings).length === 0) return { ...restOptions };
+	return {
+		...restOptions,
+		settings: restSettings
+	};
+}
 function normalizeOptionalAntfuFeatures(options) {
-	const normalized = { ...options };
+	const normalized = cloneUserDefinedOptions(options);
 	if (normalized.react && !hasAllPackages([...OPTIONAL_ANTFU_FEATURE_PACKAGES.react])) normalized.react = false;
 	if (normalized.nextjs && !hasAllPackages([...OPTIONAL_ANTFU_FEATURE_PACKAGES.nextjs])) normalized.nextjs = false;
+	if (normalized.unocss && !hasAllPackages([...OPTIONAL_ANTFU_FEATURE_PACKAGES.unocss])) {
+		normalized.unocss = false;
+		return removeNamespacedSetting(normalized, "unocss");
+	}
 	return normalized;
 }
+function mergeNamespacedSetting(options, namespace, value) {
+	const currentSettings = getSettingsRecord(options.settings);
+	const currentNamespaceSettings = isPlainObject(currentSettings[namespace]) ? currentSettings[namespace] : {};
+	return {
+		...options,
+		settings: {
+			...currentSettings,
+			[namespace]: {
+				...currentNamespaceSettings,
+				...value
+			}
+		}
+	};
+}
+function normalizeUnoCssOptions(options) {
+	if (!options.unocss || typeof options.unocss !== "object") return options;
+	const { configPath, ...unocssOptions } = options.unocss;
+	const { settings, ...restOptions } = options;
+	const normalized = settings === void 0 ? {
+		...restOptions,
+		unocss: unocssOptions
+	} : {
+		...restOptions,
+		settings,
+		unocss: unocssOptions
+	};
+	if (!configPath) return normalized;
+	return mergeNamespacedSetting(normalized, "unocss", { configPath });
+}
 function hasGlobalIgnoreShape(config) {
 	const keys = Object.keys(config).filter((key) => key !== "name");
 	return keys.length === 1 && keys[0] === "ignores";
@@ -606,13 +670,70 @@ function normalizeUserConfig(userConfig) {
 	const resolvedUserConfig = userConfig;
 	return isComposer(resolvedUserConfig) ? resolvedUserConfig : normalizeResolvedUserConfig(resolvedUserConfig);
 }
+function isFormatterOptionsObject(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function toOxfmtRuleEntry(options) {
+	return ["error", { ...options ?? {} }];
+}
+function normalizePrettierFormatterForAntfu(formatter) {
+	return formatter === "oxfmt" ? true : formatter;
+}
+function normalizeMarkdownFormatterForAntfu(formatter) {
+	return formatter === "oxfmt" ? true : formatter;
+}
+function toAntfuOptions(options) {
+	const { formatters, ...restOptions } = options;
+	if (!isFormatterOptionsObject(formatters)) return restOptions;
+	const { oxfmtOptions: _oxfmtOptions, css, html, markdown, graphql, ...restFormatters } = formatters;
+	return {
+		...restOptions,
+		formatters: {
+			...restFormatters,
+			...css === void 0 ? {} : { css: normalizePrettierFormatterForAntfu(css) },
+			...html === void 0 ? {} : { html: normalizePrettierFormatterForAntfu(html) },
+			...markdown === void 0 ? {} : { markdown: normalizeMarkdownFormatterForAntfu(markdown) },
+			...graphql === void 0 ? {} : { graphql: normalizePrettierFormatterForAntfu(graphql) }
+		}
+	};
+}
+function applyOxfmtFormatterOverrides(composer, formatters) {
+	if (!isFormatterOptionsObject(formatters)) return composer;
+	if (formatters.markdown === "oxfmt" && formatters.slidev) throw new Error("`formatters.markdown: \"oxfmt\"` cannot be combined with `formatters.slidev`.");
+	const oxfmtOptions = formatters.oxfmtOptions;
+	let nextComposer = composer;
+	if (formatters.css === "oxfmt") for (const name of [
+		"antfu/formatter/css",
+		"antfu/formatter/scss",
+		"antfu/formatter/less"
+	]) nextComposer = nextComposer.override(name, { rules: {
+		"format/oxfmt": toOxfmtRuleEntry(oxfmtOptions),
+		"format/prettier": "off"
+	} });
+	if (formatters.html === "oxfmt") nextComposer = nextComposer.override("antfu/formatter/html", { rules: {
+		"format/oxfmt": toOxfmtRuleEntry(oxfmtOptions),
+		"format/prettier": "off"
+	} });
+	if (formatters.markdown === "oxfmt") nextComposer = nextComposer.override("antfu/formatter/markdown", { rules: {
+		"format/oxfmt": toOxfmtRuleEntry(oxfmtOptions),
+		"format/prettier": "off",
+		"format/dprint": "off"
+	} });
+	if (formatters.graphql === "oxfmt") nextComposer = nextComposer.override("antfu/formatter/graphql", { rules: {
+		"format/oxfmt": toOxfmtRuleEntry(oxfmtOptions),
+		"format/prettier": "off"
+	} });
+	return nextComposer;
+}
 function icebreaker(options = {}, ...userConfigs) {
 	const [resolved, ...presets] = getPresets(options);
-	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs.map(normalizeUserConfig));
+	const normalized = normalizeUnoCssOptions(normalizeOptionalAntfuFeatures(resolved));
+	return applyOxfmtFormatterOverrides((0, antfu_exports.antfu)(toAntfuOptions(normalized), ...presets, ...userConfigs.map(normalizeUserConfig)), normalized.formatters);
 }
 function icebreakerLegacy(options = {}, ...userConfigs) {
 	const [resolved, ...presets] = getPresets(options, "legacy");
-	return (0, antfu_exports.antfu)(normalizeOptionalAntfuFeatures(resolved), ...presets, ...userConfigs.map(normalizeUserConfig));
+	const normalized = normalizeUnoCssOptions(normalizeOptionalAntfuFeatures(resolved));
+	return applyOxfmtFormatterOverrides((0, antfu_exports.antfu)(toAntfuOptions(normalized), ...presets, ...userConfigs.map(normalizeUserConfig)), normalized.formatters);
 }
 //#endregion
 export { getPresets, icebreaker, icebreakerLegacy };

package/index.d.ts

@@ -14,14 +14,21 @@ export interface TailwindcssOption {
 }
 
 export type TailwindcssConfig = boolean | TailwindcssOption
+export interface UnocssOption {
+  configPath?: string
+  attributify?: boolean
+  strict?: boolean
+}
+export type UnocssConfig = boolean | UnocssOption
 export interface StylelintBridgeOption extends IcebreakerStylelintOptions {
   cwd?: string
 }
 export type StylelintBridgeConfig = boolean | StylelintBridgeOption
 
-export type UserDefinedOptions = OptionsConfig & TypedFlatConfigItem & {
+export type UserDefinedOptions = Omit<OptionsConfig, 'unocss'> & TypedFlatConfigItem & {
   miniProgram?: boolean
   tailwindcss?: TailwindcssConfig
+  unocss?: UnocssConfig
   stylelint?: StylelintBridgeConfig
   mdx?: boolean
   a11y?: boolean

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/eslint-config",
   "type": "module",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "ESLint preset from Icebreaker's dev-configs",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -50,7 +50,7 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-config": "8.0.0",
+    "@antfu/eslint-config": "8.1.0",
     "@eslint-react/eslint-plugin": "^3.0.0",
     "eslint-plugin-better-tailwindcss": "^4.3.2",
     "eslint-plugin-format": "2.0.1",
@@ -59,13 +59,13 @@
     "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-tailwindcss": "3.18.2",
     "eslint-plugin-vuejs-accessibility": "^2.5.0",
-    "@icebreakers/stylelint-config": "3.0.0",
+    "@icebreakers/stylelint-config": "3.0.2",
     "eslint-plugin-better-stylelint": "1.0.0"
   },
   "optionalDependencies": {
     "@next/eslint-plugin-next": "^16.2.2",
-    "@tanstack/eslint-plugin-query": "^5.96.1",
-    "@unocss/eslint-plugin": "66.6.7",
+    "@tanstack/eslint-plugin-query": "^5.96.2",
+    "@unocss/eslint-plugin": "66.6.8",
     "eslint-plugin-mdx": "3.7.0"
   },
   "publishConfig": {
@@ -91,6 +91,7 @@
   "scripts": {
     "dev": "tsdown --watch --sourcemap",
     "build": "tsdown",
+    "bench:formatters": "node --import tsx ./scripts/benchmark-formatters.ts",
     "test": "vitest run",
     "test:types": "tsd",
     "test:dev": "vitest",