@kitql/eslint-config 0.8.0-next.3 → 0.8.0-next.5

package/cmd.js

@@ -3,7 +3,7 @@ import { spawn } from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
 import { Option, program } from 'commander'
-import ora from 'ora'
+import { Spinner } from 'picospinner'
 
 import { bgBlueBright, bgGreen, bgRedBright, gray, green, red } from '@kitql/helpers'
 
@@ -13,13 +13,6 @@ import { findFileOrUp } from './helper/findFileOrUp.js'
 const TOOLS_ALL = ['eslint', 'prettier', 'oxlint', 'tsgolint']
 const TOOLS_DEFAULT = TOOLS_ALL.slice(0, 2)
 
-const spinner = ora({
-	// hideCursor: true,
-	prefixText: bgBlueBright(` kitql-lint `),
-	text: 'check config',
-})
-spinner.start()
-
 program.addOption(new Option('-f, --format', 'format'))
 program.addOption(new Option('-g, --glob <type>', 'file/dir/glob').default('.'))
 program.addOption(
@@ -51,6 +44,10 @@ const tools = /** @type {typeof TOOLS_ALL} */ (options_cli.tools.split(',') ?? T
 const diffOnly = /** @type {boolean} */ (options_cli.diffOnly ?? false)
 const baseBranch = /** @type {string} */ (options_cli.baseBranch ?? 'main')
 
+const spinner = new Spinner({ symbolFormatter: (msg) => bgBlueBright(` kitql-lint `) + ' ' + msg })
+spinner.start()
+spinner.setText('Action: ' + green(format ? 'formatting' : 'linting'))
+
 let preToUse = ''
 if (pre === 'npm') {
 	preToUse = 'npm exec '
@@ -92,9 +89,9 @@ async function customSpawn(/** @type {string} */ cmd) {
 
 let filesLength = -1
 async function getDiffFiles() {
-	spinner.text = verbose
-		? 'git diff ' + gray(`(getting changed files against ${baseBranch})`)
-		: 'git diff'
+	spinner.setText(
+		verbose ? 'git diff ' + gray(`(getting changed files against ${baseBranch})`) : 'git diff',
+	)
 
 	// First, get the git repository root
 	let gitRootPath = ''
@@ -271,7 +268,7 @@ async function getDiffFiles() {
 	}
 }
 
-async function lintRunOx() {
+async function runOxc(/** @type {string} */ name) {
 	const cmdLint =
 		`oxlint` +
 		`${tools.includes('tsgolint') ? ' --type-aware' : ''}` +
@@ -279,41 +276,30 @@ async function lintRunOx() {
 		`${format ? ' --fix' : ''}` +
 		` ${glob}`
 
-	spinner.text = 'linting ' + gray(`(${verbose ? cmdLint : 'oxc'}) `)
+	spinner.setText(gray(`${verbose ? cmdLint : name} `))
 
 	const result_lint = await customSpawn(cmdLint)
 
 	return result_lint
 }
 
-async function lintRun() {
-	if (tools.includes('oxlint')) {
-		const result_lint = await lintRunOx()
-		if (typeof result_lint === 'object' && 'status' in result_lint && result_lint.status) {
-			return result_lint
-		}
-	}
-
-	if (tools.includes('eslint')) {
-		const cmdLint =
-			preToUse +
-			`eslint --no-warn-ignored` +
-			// format or not
-			`${format ? ' --fix' : ''}` +
-			// exec
-			` ${glob}`
-
-		spinner.text = 'linting ' + gray(`(${verbose ? cmdLint : 'eslint'}) `)
+async function runEslint() {
+	const cmd =
+		preToUse +
+		`eslint --no-warn-ignored` +
+		// format or not
+		`${format ? ' --fix' : ''}` +
+		// exec
+		` ${glob}`
 
-		const result_lint = await customSpawn(cmdLint)
+	spinner.setText(gray(`${verbose ? cmd : 'eslint'} `))
 
-		return result_lint
-	}
+	const result_lint = await customSpawn(cmd)
 
-	return ''
+	return result_lint
 }
 
-async function formatRun() {
+async function runPrettier() {
 	const cmdFormat =
 		preToUse +
 		`prettier` +
@@ -327,7 +313,7 @@ async function formatRun() {
 		// exec
 		` ${glob}`
 
-	spinner.text = 'formating ' + gray(`(${verbose ? cmdFormat : 'prettier'}) `)
+	spinner.setText(gray(`${verbose ? cmdFormat : 'prettier'} `))
 
 	const result_format = await customSpawn(cmdFormat)
 
@@ -348,7 +334,6 @@ const displayTook = () => `${gray('(')}${took.join(gray(', '))}${gray(')')}`
 
 // If changed-only flag is set, get the list of changed files
 if (diffOnly) {
-	spinner.text = 'Checking for changed files'
 	const changedFilesStart = performance.now()
 	const changedFiles = await getDiffFiles()
 	const changedFilesTook = performance.now() - changedFilesStart
@@ -361,33 +346,54 @@ if (diffOnly) {
 	}
 }
 
-if ((tools.includes('eslint') || tools.includes('oxlint')) && glob) {
-	const lintStart = performance.now()
-	const lintCode = await lintRun()
-	const lintTook = performance.now() - lintStart
-	took.push(display('lint', lintTook))
-	if (typeof lintCode === 'object' && 'status' in lintCode && lintCode.status) {
-		spinner.prefixText = bgRedBright(` kitql-lint `)
-		spinner.fail(red(`lint failed, check logs above. ${displayTook()}`))
-		process.exit(lintCode.status)
+// yes, when we have tsgolint, we need to run oxlint too...
+if ((tools.includes('oxlint') || tools.includes('tsgolint')) && glob) {
+	const start = performance.now()
+	const name = tools.includes('tsgolint') ? 'oxlint (+type)' : 'oxlint'
+	const code = await runOxc(name)
+	const stepTook = performance.now() - start
+	took.push(display(name, stepTook))
+	if (typeof code === 'object' && 'status' in code && code.status) {
+		spinner.fail({
+			symbolFormatter: (msg) => bgRedBright(` kitql-lint `) + ' ' + msg,
+			text: red(`lint failed, check logs above. ${displayTook()}`),
+		})
+		process.exit(code.status)
+	}
+}
+
+if (tools.includes('eslint') && glob) {
+	const start = performance.now()
+	const code = await runEslint()
+	const stepTook = performance.now() - start
+	took.push(display('eslint', stepTook))
+	if (typeof code === 'object' && 'status' in code && code.status) {
+		spinner.fail({
+			symbolFormatter: (msg) => bgRedBright(` kitql-lint `) + ' ' + msg,
+			text: red(`lint failed, check logs above. ${displayTook()}`),
+		})
+		process.exit(code.status)
 	}
 }
 
 if (tools.includes('prettier') && glob) {
-	const formatStart = performance.now()
-	const formatCode = await formatRun()
-	const formatTook = performance.now() - formatStart
-	took.push(display('format', formatTook))
-	if (typeof formatCode === 'object' && 'status' in formatCode && formatCode.status) {
-		spinner.prefixText = bgRedBright(` kitql-lint `)
-		spinner.fail(red(`format failed, check logs above. ${displayTook()}`))
-		process.exit(formatCode.status)
+	const start = performance.now()
+	const code = await runPrettier()
+	const stepTook = performance.now() - start
+	took.push(display('prettier', stepTook))
+	if (typeof code === 'object' && 'status' in code && code.status) {
+		spinner.fail({
+			symbolFormatter: (msg) => bgRedBright(` kitql-lint `) + ' ' + msg,
+			text: red(`format failed, check logs above. ${displayTook()}`),
+		})
+		process.exit(code.status)
 	}
 }
 
-spinner.prefixText = bgGreen(` kitql-lint `)
-spinner.succeed(
-	`All good, ` +
+spinner.succeed({
+	symbolFormatter: (msg) => bgGreen(` kitql-lint `) + ' ' + msg,
+	text:
+		`All good, ` +
 		`${
 			glob === ''
 				? 'nothing to do!'
@@ -396,6 +402,6 @@ spinner.succeed(
 					: 'your files looks great!'
 		} ` +
 		displayTook(),
-)
+})
 spinner.stop()
 process.exit(0)

package/eslint.config.js

@@ -1,3 +1,4 @@
+import e18e from '@e18e/eslint-plugin'
 import { includeIgnoreFile } from '@eslint/compat'
 import js from '@eslint/js'
 import prettier from 'eslint-config-prettier'
@@ -82,7 +83,10 @@ const rulePnpmCatalogs = (options = {}) => {
 	]
 }
 
-const othersRules = () => {
+/**
+ * @param {{svelteConfig?: import('@sveltejs/kit').Config}} options
+ */
+const othersRules = ({ svelteConfig } = {}) => {
 	return [
 		{
 			name: 'eslint/defaults/recommended',
@@ -92,6 +96,7 @@ const othersRules = () => {
 		...svelte.configs.recommended,
 		{ name: 'eslint/prettier', ...prettier },
 		...svelte.configs.prettier,
+		e18e?.configs?.recommended,
 		{
 			name: '@kitql:languages',
 			languageOptions: {
@@ -109,6 +114,7 @@ const othersRules = () => {
 					projectService: true,
 					extraFileExtensions: ['.svelte'],
 					parser: ts.parser,
+					svelteConfig,
 				},
 			},
 		},
@@ -182,6 +188,7 @@ const othersRules = () => {
  * @typedef {Object} KitqlOptions
  * @property {PnpmCatalogsConfig} [pnpmCatalogs] - Configuration object for pnpm catalogs
  * @property {OxlintConfig} [oxlint] - Configuration object for oxlint
+ * @property {import('@sveltejs/kit').Config} [svelteConfig] - Configuration object for svelte
  */
 
 /**
@@ -189,13 +196,14 @@ const othersRules = () => {
  * @returns {import('eslint').Linter.Config[]}
  */
 export const kitql = (options = {}) => {
+	const svelteConfig = options?.svelteConfig ?? {}
 	const pnpmCatalogsConfig = options?.pnpmCatalogs ?? { enable: false }
 	const pnpmCatalogsEnabled = pnpmCatalogsConfig.enable !== false
 
 	const arr = [
 		// default rules
 		rulePrettierIgnore({ pnpmCatalogsEnabled }),
-		...othersRules(),
+		...othersRules({ svelteConfig }),
 	]
 
 	if (pnpmCatalogsEnabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitql/eslint-config",
-  "version": "0.8.0-next.3",
+  "version": "0.8.0-next.5",
   "type": "module",
   "description": "opinionated linting and formatting for projects",
   "repository": {
@@ -32,38 +32,45 @@
     "format"
   ],
   "peerDependencies": {
-    "eslint": "9.37.0",
-    "oxlint": "1.23.0",
-    "oxlint-tsgolint": "0.2.0",
+    "eslint": "9.39.1",
+    "oxlint": "1.34.0",
+    "oxlint-tsgolint": "0.10.0",
     "prettier": "^3.6.1"
   },
   "peerDependenciesMeta": {
+    "eslint": {
+      "optional": true
+    },
     "oxlint": {
       "optional": true
     },
     "oxlint-tsgolint": {
       "optional": true
+    },
+    "prettier": {
+      "optional": true
     }
   },
   "dependencies": {
+    "@e18e/eslint-plugin": "^0.1.1",
     "@eslint/compat": "1.4.0",
-    "@eslint/js": "9.37.0",
+    "@eslint/js": "9.39.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
     "@types/eslint": "9.6.1",
-    "@typescript-eslint/parser": "8.46.1",
+    "@typescript-eslint/parser": "8.50.0",
     "commander": "14.0.0",
     "eslint-config-prettier": "10.1.5",
-    "eslint-plugin-oxlint": "1.23.0",
-    "eslint-plugin-pnpm": "1.2.0",
-    "eslint-plugin-svelte": "3.12.4",
-    "eslint-plugin-unused-imports": "4.2.0",
-    "globals": "16.4.0",
+    "eslint-plugin-oxlint": "1.34.0",
+    "eslint-plugin-pnpm": "1.4.3",
+    "eslint-plugin-svelte": "3.13.0",
+    "eslint-plugin-unused-imports": "4.3.0",
+    "globals": "16.5.0",
     "jsonc-eslint-parser": "2.4.0",
-    "ora": "9.0.0",
+    "picospinner": "3.0.0",
     "prettier-plugin-sh": "^0.18.0",
-    "prettier-plugin-svelte": "3.4.0",
-    "prettier-plugin-tailwindcss": "0.7.0",
-    "typescript-eslint": "8.46.1",
+    "prettier-plugin-svelte": "^3.4.0",
+    "prettier-plugin-tailwindcss": "^0.7.0",
+    "typescript-eslint": "8.50.0",
     "yaml-eslint-parser": "1.3.0",
     "@kitql/helpers": "0.8.13"
   },
@@ -72,7 +79,7 @@
   },
   "sideEffects": false,
   "scripts": {
-    "format": "node ./cmd.js -f -d --verbose",
+    "format": "node ./cmd.js -f -t eslint,prettier,oxlint",
     "format:example": "kitql-lint --format",
     "inspector": "npx @eslint/config-inspector",
     "lint": "node ./cmd.js --verbose -p none",