@kitql/eslint-config 0.5.6 → 0.5.8

package/cmd.js

@@ -312,6 +312,7 @@ const took = []
 const display = (text, time) => {
 	return `${gray(text)} ${green((time / 1000).toFixed(3))}${gray('s')}`
 }
+const displayTook = () => `${gray('(')}${took.join(gray(', '))}${gray(')')}`
 
 // If changed-only flag is set, get the list of changed files
 if (diffOnly) {
@@ -335,7 +336,7 @@ if (!prettierOnly && glob) {
 	took.push(display('eslint', esLintTook))
 	if (eslintCode.status) {
 		spinner.prefixText = bgRedBright(` kitql-lint `)
-		spinner.fail(red(`eslint failed, check logs above.`))
+		spinner.fail(red(`eslint failed, check logs above. ${displayTook()}`))
 		process.exit(eslintCode.status)
 	}
 }
@@ -347,14 +348,22 @@ if (!eslintOnly && glob) {
 	took.push(display('prettier', prettierTook))
 	if (prettierCode.status) {
 		spinner.prefixText = bgRedBright(` kitql-lint `)
-		spinner.fail(red(`prettier failed, check logs above.`))
+		spinner.fail(red(`prettier failed, check logs above. ${displayTook()}`))
 		process.exit(prettierCode.status)
 	}
 }
 
 spinner.prefixText = bgGreen(` kitql-lint `)
 spinner.succeed(
-	`All good, ${glob === '' ? 'nothing to do!' : filesLength !== -1 ? `your ${filesLength} files looks great!` : 'your files looks great!'} ${gray('(')}${took.join(gray(', '))}${gray(')')}`,
+	`All good, ` +
+		`${
+			glob === ''
+				? 'nothing to do!'
+				: filesLength !== -1
+					? `your ${filesLength === 1 ? 'single file' : `${filesLength} files`} looks great!`
+					: 'your files looks great!'
+		} ` +
+		displayTook(),
 )
 spinner.stop()
 process.exit(0)

package/eslint.config.js

@@ -9,30 +9,50 @@ import ts from 'typescript-eslint'
 
 import { findFileOrUp } from './helper/findFileOrUp.js'
 
-const rulePrettierIgnore = ({ pnpmCatalogs = true }) => {
+/**
+ * @typedef {Object} PnpmCatalogsConfig
+ * @property {boolean} [enable=true] - Whether to enable pnpm catalogs rules
+ * @property {string[]} [files] - Files to apply the rules to
+ * @property {Record<string, string>} [rules] - Rules configuration
+ */
+
+const rulePrettierIgnore = ({ pnpmCatalogsEnabled = true }) => {
 	const pathPrettierIgnore = findFileOrUp('.prettierignore', { absolute: true })
-	const rowIgnore = pathPrettierIgnore ? includeIgnoreFile(pathPrettierIgnore).ignores : []
-	const ignores = pnpmCatalogs ? rowIgnore.filter((c) => !c.includes('package.json')) : rowIgnore
+	const rowIgnore = pathPrettierIgnore ? (includeIgnoreFile(pathPrettierIgnore).ignores ?? []) : []
+	const ignores = pnpmCatalogsEnabled
+		? rowIgnore.filter((c) => !c.includes('package.json'))
+		: rowIgnore
 	return {
 		name: '@kitql:prettier:ignores',
 		ignores,
 	}
 }
 
-const rulePnpmCatalogs = () => {
+/**
+ * @param {PnpmCatalogsConfig} options
+ */
+const rulePnpmCatalogs = (options = {}) => {
+	const {
+		enable = true,
+		files = ['package.json', '**/package.json'],
+		rules = {
+			'pnpm-catalogs/enforce-catalog': 'error',
+			'pnpm-catalogs/valid-catalog': 'error',
+		},
+	} = options
+
+	if (!enable) return null
+
 	return {
 		name: 'pnpm-catalogs:package.json',
-		files: ['package.json'],
+		files,
 		languageOptions: {
 			parser: jsoncParser,
 		},
 		plugins: {
 			'pnpm-catalogs': pnpmCatalogs,
 		},
-		rules: {
-			'pnpm-catalogs/enforce-catalog': 'error',
-			'pnpm-catalogs/valid-catalog': 'error',
-		},
+		rules,
 	}
 }
 
@@ -122,7 +142,7 @@ const othersRules = () => {
 /** @type {import('eslint').Linter.Config[]} */
 const config = [
 	//
-	rulePrettierIgnore({ pnpmCatalogs: true }),
+	rulePrettierIgnore({ pnpmCatalogsEnabled: true }),
 	...othersRules(),
 	rulePnpmCatalogs(),
 ]
@@ -130,16 +150,22 @@ const config = [
 export default config
 
 /**
- * @param {Object} options
- * @param {boolean} options.pnpmCatalogs
+ * @typedef {Object} KitqlOptions
+ * @property {PnpmCatalogsConfig} [pnpmCatalogs] - Configuration object for pnpm catalogs
+ */
+
+/**
+ * @param {KitqlOptions} [options]
  * @returns {import('eslint').Linter.Config[]}
  */
-export const kitql = (options) => {
-	const pnpmCatalogs = options?.pnpmCatalogs ?? true
+export const kitql = (options = {}) => {
+	const pnpmCatalogsConfig = options?.pnpmCatalogs ?? { enable: true }
+	const pnpmCatalogsEnabled = pnpmCatalogsConfig.enable !== false
+
 	return [
 		//
-		rulePrettierIgnore({ pnpmCatalogs }),
+		rulePrettierIgnore({ pnpmCatalogsEnabled }),
 		...othersRules(),
-		...(pnpmCatalogs ? [rulePnpmCatalogs()] : []),
+		...(pnpmCatalogsEnabled ? [rulePnpmCatalogs(pnpmCatalogsConfig)] : []),
 	]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitql/eslint-config",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "type": "module",
   "description": "opinionated linting and formatting for projects",
   "repository": {
@@ -16,12 +16,9 @@
     "kitql-lint": "./cmd.js"
   },
   "main": "eslint.config.js",
-  "types": "eslint.config.d.ts",
   "files": [
     ".prettierrc.mjs",
     "cmd.js",
-    "cmd.sh",
-    "eslint.config.d.ts",
     "eslint.config.js",
     "helper/findFileOrUp.js"
   ],
@@ -32,12 +29,12 @@
   ],
   "dependencies": {
     "@eslint/compat": "1.2.7",
-    "@eslint/js": "9.10.0",
+    "@eslint/js": "9.22.0",
     "@theguild/prettier-config": "3.0.0",
     "@types/eslint": "9.6.1",
     "@typescript-eslint/parser": "8.26.0",
     "commander": "13.1.0",
-    "eslint": "9.10.0",
+    "eslint": "9.22.0",
     "eslint-plugin-pnpm-catalogs": "0.1.0",
     "eslint-plugin-svelte": "3.0.3",
     "eslint-plugin-unused-imports": "4.1.4",

package/eslint.config.d.ts

@@ -1,17 +0,0 @@
-import type { Linter } from 'eslint'
-
-export default config
-
-/**
- * KitQL's ESLint configuration with customizable options
- *
- * @param options - Configuration options
- * @returns ESLint configuration array
- */
-export function kitql(options?: {
-	/**
-	 * Whether to include pnpm catalogs rules
-	 * @default true
-	 */
-	pnpmCatalogs?: boolean
-}): Linter.Config[]