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

package/cmd.js

@@ -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,16 @@ 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 = ora({
+	prefixText: bgBlueBright(` kitql-lint `),
+})
+
+function updateSpinnerText(/** @type {string} */ msg) {
+	spinner.text = msg
+	spinner.start()
+}
+updateSpinnerText('Action: ' + green(format ? 'formatting' : 'linting'))
+
 let preToUse = ''
 if (pre === 'npm') {
 	preToUse = 'npm exec '
@@ -92,9 +95,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'
+	updateSpinnerText(
+		verbose ? 'git diff ' + gray(`(getting changed files against ${baseBranch})`) : 'git diff',
+	)
 
 	// First, get the git repository root
 	let gitRootPath = ''
@@ -271,7 +274,7 @@ async function getDiffFiles() {
 	}
 }
 
-async function lintRunOx() {
+async function runOxc(/** @type {string} */ name) {
 	const cmdLint =
 		`oxlint` +
 		`${tools.includes('tsgolint') ? ' --type-aware' : ''}` +
@@ -279,41 +282,30 @@ async function lintRunOx() {
 		`${format ? ' --fix' : ''}` +
 		` ${glob}`
 
-	spinner.text = 'linting ' + gray(`(${verbose ? cmdLint : 'oxc'}) `)
+	updateSpinnerText(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)
+	updateSpinnerText(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 +319,7 @@ async function formatRun() {
 		// exec
 		` ${glob}`
 
-	spinner.text = 'formating ' + gray(`(${verbose ? cmdFormat : 'prettier'}) `)
+	updateSpinnerText(gray(`${verbose ? cmdFormat : 'prettier'} `))
 
 	const result_format = await customSpawn(cmdFormat)
 
@@ -348,7 +340,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,27 +352,41 @@ 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) {
+// 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.prefixText = bgRedBright(` kitql-lint `)
+		spinner.fail(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.prefixText = bgRedBright(` kitql-lint `)
 		spinner.fail(red(`lint failed, check logs above. ${displayTook()}`))
-		process.exit(lintCode.status)
+		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) {
+	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.prefixText = bgRedBright(` kitql-lint `)
 		spinner.fail(red(`format failed, check logs above. ${displayTook()}`))
-		process.exit(formatCode.status)
+		process.exit(code.status)
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitql/eslint-config",
-  "version": "0.8.0-next.3",
+  "version": "0.8.0-next.4",
   "type": "module",
   "description": "opinionated linting and formatting for projects",
   "repository": {
@@ -38,11 +38,17 @@
     "prettier": "^3.6.1"
   },
   "peerDependenciesMeta": {
+    "eslint": {
+      "optional": true
+    },
     "oxlint": {
       "optional": true
     },
     "oxlint-tsgolint": {
       "optional": true
+    },
+    "prettier": {
+      "optional": true
     }
   },
   "dependencies": {
@@ -61,8 +67,8 @@
     "jsonc-eslint-parser": "2.4.0",
     "ora": "9.0.0",
     "prettier-plugin-sh": "^0.18.0",
-    "prettier-plugin-svelte": "3.4.0",
-    "prettier-plugin-tailwindcss": "0.7.0",
+    "prettier-plugin-svelte": "^3.4.0",
+    "prettier-plugin-tailwindcss": "^0.7.0",
     "typescript-eslint": "8.46.1",
     "yaml-eslint-parser": "1.3.0",
     "@kitql/helpers": "0.8.13"
@@ -72,7 +78,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",