@itcase/config 1.7.16 → 1.7.18

package/README.md

@@ -103,7 +103,7 @@ npm install --save-dev commitizen @commitlint/cz-commitlint
 
 ## Smart commit
 
-`smart-commit` — Cursor Agent (`ask`) планирует коммиты по `SCOPES`, печатает сообщения, спрашивает `[y/N]`. Перед коммитом ждёт и снимает устаревший `.git/index.lock`, если его никто не держит. Lockfile (`package-lock.json` и аналоги) всегда кладётся в тот же коммит, что и соседний `package.json`; при одном только bump deps агент не вызывается.
+`smart-commit` — Cursor Agent (`ask`) планирует коммиты по `SCOPES`, печатает сообщения, спрашивает `[y/N]`. Перед вызовом агента запускаются те же проверки, что у husky в lint-staged. Сначала eslint и stylelint по изменённым js/ts/css/mdx (с `--fix`, как в хуке): если линтер падает, агент не вызывается и ни один коммит не создаётся. Затем проверка типов: `tsc --noEmit --pretty`, либо `npm run typecheck`, если конфиг — `lintStagedMonorepo`. Typecheck идёт только когда среди изменений есть существующие `.ts`/`.tsx`. `--no-verify` пропускает и эти проверки, и хуки. Перед коммитом CLI ждёт и снимает устаревший `.git/index.lock`, если его никто не держит. Lockfile (`package-lock.json` и аналоги) всегда кладётся в тот же коммит, что и соседний `package.json`; при одном только bump deps агент не вызывается.
 
 ```text
 [random pixel animation]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.7.16",
+  "version": "1.7.18",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
@@ -67,20 +67,20 @@
     "chokidar-cli": "^3.0.0",
     "commitizen": "^4.3.2",
     "conventional-changelog-conventionalcommits": "9.3.1",
-    "conventional-changelog-writer": "9.2.1",
-    "cssnano": "^9.1.1",
-    "cssnano-preset-default": "^9.1.1",
-    "inquirer": "^14.2.2",
+    "conventional-changelog-writer": "9.3.0",
+    "cssnano": "^9.3.2",
+    "cssnano-preset-default": "^9.3.2",
+    "inquirer": "^14.2.3",
     "log-update": "^8.0.0",
-    "postcss": "^8.5.28",
+    "postcss": "^8.5.29",
     "postcss-aspect-ratio-polyfill": "^2.0.0",
     "postcss-clamp": "^4.1.0",
     "postcss-cli": "^12.0.0",
     "postcss-color-hsla-fallback": "^1.0.0",
-    "postcss-combine-duplicated-selectors": "^10.0.3",
+    "postcss-combine-duplicated-selectors": "^11.0.0",
     "postcss-convert-unit": "^0.1.3",
     "postcss-dark-theme-class": "^2.0.0",
-    "postcss-discard-duplicates": "^9.0.4",
+    "postcss-discard-duplicates": "^9.0.5",
     "postcss-each": "^1.1.0",
     "postcss-easings": "^4.0.0",
     "postcss-extend-rule": "^4.0.0",
@@ -96,7 +96,7 @@
     "postcss-nested-ancestors": "^3.0.0",
     "postcss-normalize": "^13.0.1",
     "postcss-prepend-imports": "^1.0.1",
-    "postcss-preset-env": "^11.5.4",
+    "postcss-preset-env": "^11.6.1",
     "postcss-pxtorem": "^6.1.0",
     "postcss-sort-media-queries": "^6.7.1",
     "postcss-unit": "^0.0.3",
@@ -117,11 +117,11 @@
     "@itcase/lint": "^1.1.126",
     "eslint": "9.39.2",
     "husky": "^9.1.7",
-    "inquirer": "^14.2.2",
+    "inquirer": "^14.2.3",
     "lint-staged": "^17.6.0",
     "prettier": "^3.9.9",
-    "storybook": "^10.6.0",
-    "stylelint": "^17.15.0",
+    "storybook": "^10.6.1",
+    "stylelint": "^17.16.0",
     "typescript": "^6.0.3"
   }
 }

package/smart-commit/cli.js

@@ -50,6 +50,29 @@ const UPYACHKA_FRAME_MS = 100
 const INDEX_LOCK_RETRIES = 8
 const INDEX_LOCK_WAIT_MS = 250
 const STALE_LOCK_MS = 1500
+const LINT_STAGED_CONFIGS = [
+  'lint-staged.config.mjs',
+  'lint-staged.config.js',
+  'lint-staged.config.cjs',
+  '.lintstagedrc.mjs',
+  '.lintstagedrc.js',
+  '.lintstagedrc.cjs',
+]
+const LINT_STAGED_TS_KEY = '*.{js,jsx,mjs,cjs,ts,tsx}'
+const LINT_STAGED_FILE_GROUPS = [
+  {
+    key: LINT_STAGED_TS_KEY,
+    test: /\.(?:js|jsx|mjs|cjs|ts|tsx)$/,
+  },
+  {
+    key: '*.css',
+    test: /\.css$/,
+  },
+  {
+    key: '*.mdx',
+    test: /\.mdx$/,
+  },
+]
 const AGENT_WAIT_STEPS = [
   'Asking Cursor Agent',
   'Still thinking',
@@ -67,6 +90,13 @@ Default model: ${DEFAULT_MODEL} (override with --model / SMART_COMMIT_MODEL).
 (husky pre-commit / lint-staged and commit-msg). Commit message
 is still checked by smart-commit before git runs.
 
+Before the agent, the same checks as husky lint-staged run.
+eslint and stylelint (--fix) run on changed js/ts/css/mdx, then
+typecheck when changes include .ts/.tsx (tsc --noEmit, or
+npm run typecheck from lint-staged config). A lint or type
+error exits before the agent is called and before any commit.
+--no-verify skips these checks and the hooks.
+
 Progress sprite is random (nyan cat, banana, or upyachka).
 Force with --cat, --banana, or --upyachka. Agent log is below.
 `
@@ -104,6 +134,13 @@ async function main(argv) {
     return
   }
 
+  // Husky lints and typechecks in pre-commit. By then the agent has spent
+  // tokens and earlier commits in the plan may already exist.
+  if (!option.noVerify) {
+    await runHuskyLint(cwd, changedFiles)
+    await runHuskyTypecheck(cwd, changedFiles)
+  }
+
   let plans = tryFastPlan(changedFiles, cwd, scopes, types)
   if (!plans) {
     plans = await planWithAgent({
@@ -371,6 +408,144 @@ function readReleaseBranches(cwd) {
   return match[1].split(/\s+/).filter(Boolean)
 }
 
+async function runHuskyLint(cwd, files) {
+  const commands = await lintCommandsForFiles(cwd, files)
+  if (!commands.length) return
+
+  for (const entry of commands) {
+    runShellCommand(
+      cwd,
+      'Lint',
+      lintDisplay(entry.command, entry.fileCount),
+      entry.command,
+      'Lint failed. Fix the errors above — the agent was not called.',
+    )
+  }
+  process.stdout.write('Lint passed.\n\n')
+}
+
+async function lintCommandsForFiles(cwd, files) {
+  const config = await loadLintStagedConfig(cwd)
+  if (!config) return []
+
+  const commands = []
+  for (const group of LINT_STAGED_FILE_GROUPS) {
+    const task = config[group.key]
+    if (typeof task !== 'function') continue
+
+    const matched = files.filter(
+      (file) => group.test.test(file) && fs.existsSync(path.resolve(cwd, file)),
+    )
+    if (!matched.length) continue
+
+    const absolute = matched.map((file) => path.resolve(cwd, file))
+    const result = await task(absolute)
+    const list = (Array.isArray(result) ? result : [result]).filter(
+      (command) => typeof command === 'string' && isLintCommand(command),
+    )
+    for (const command of list) {
+      commands.push({
+        command: command.trim(),
+        fileCount: matched.length,
+      })
+    }
+  }
+  return commands
+}
+
+function lintDisplay(command, fileCount) {
+  const tool = command.match(/"?(eslint|stylelint)\b/)?.[1] || 'lint'
+  const fix = /(?:^|\s)"?--fix"?(?:\s|$)/.test(command) ? ' --fix' : ''
+  const filesLabel = fileCount === 1 ? '1 file' : `${fileCount} files`
+  return `${tool}${fix} (${filesLabel})`
+}
+
+function isLintCommand(command) {
+  return /^\s*"?(?:eslint|stylelint)\b/.test(command)
+}
+
+async function runHuskyTypecheck(cwd, files) {
+  const command = await typecheckCommandForFiles(cwd, files)
+  if (!command) return
+
+  runShellCommand(
+    cwd,
+    'Typecheck',
+    command,
+    command,
+    'Typecheck failed. Fix the errors above — the agent was not called.',
+  )
+  process.stdout.write('Typecheck passed.\n\n')
+}
+
+function runShellCommand(cwd, label, displayCommand, command, failMessage) {
+  process.stdout.write(`${paint('1', label)} ${dim(displayCommand)}\n`)
+  const bin = path.join(cwd, 'node_modules', '.bin')
+  const result = spawnSync(command, {
+    cwd: cwd,
+    env: {
+      ...process.env,
+      PATH: `${bin}${path.delimiter}${process.env.PATH || ''}`,
+    },
+    shell: true,
+    stdio: 'inherit',
+  })
+  if (result.error) {
+    throw new Error(`${label} failed to start: ${result.error.message}`)
+  }
+  if (result.status !== 0) {
+    throw new Error(failMessage)
+  }
+}
+
+async function typecheckCommandForFiles(cwd, files) {
+  const tsFiles = files.filter(
+    (file) =>
+      /\.(ts|tsx)$/.test(file) && fs.existsSync(path.resolve(cwd, file)),
+  )
+  if (!tsFiles.length) return ''
+
+  const config = await loadLintStagedConfig(cwd)
+  const task = config?.[LINT_STAGED_TS_KEY]
+  if (typeof task !== 'function') return 'tsc --noEmit --pretty'
+
+  const absolute = tsFiles.map((file) => path.resolve(cwd, file))
+  const commands = await task(absolute)
+  return pickTypecheckCommand(commands)
+}
+
+function pickTypecheckCommand(commands) {
+  const list = (Array.isArray(commands) ? commands : [commands]).filter(
+    (command) => typeof command === 'string' && command.trim(),
+  )
+  const explicit = list.find((command) =>
+    /^(?:tsc|npm(?:\s+run)?\s+typecheck|pnpm(?:\s+run)?\s+typecheck|yarn(?:\s+run)?\s+typecheck)\b/.test(
+      command.trim(),
+    ),
+  )
+  if (explicit) return explicit.trim()
+
+  const other = list.find((command) => !isLintCommand(command))
+  return other ? other.trim() : ''
+}
+
+async function loadLintStagedConfig(cwd) {
+  const file = LINT_STAGED_CONFIGS.map((name) => path.join(cwd, name)).find(
+    (candidate) => fs.existsSync(candidate),
+  )
+  if (file) {
+    const loaded = await import(pathToFileURL(file).href)
+    return loaded.default ?? loaded
+  }
+
+  const packageJsonPath = path.join(cwd, 'package.json')
+  if (!fs.existsSync(packageJsonPath)) return null
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
+  const field = packageJson['lint-staged']
+  if (field && typeof field === 'object') return field
+  return null
+}
+
 function listFiles(cwd, option) {
   if (option.staged) {
     return lines(cwd, [