@itcase/config 1.6.72 → 1.6.73

package/commitlint/commitlintCommon.js

@@ -16,7 +16,44 @@ export const commonRules = {
 }
 
 export const promptSubjectDescription =
-  'Write a short, imperative tense description of the change'
+  'Short imperative description in lower-case (no camelCase: use "public dir" not "publicDir")'
+
+export const promptSubjectRules = [
+  'lower-case only (commitlint subject-case)',
+  'no camelCase: write "public dir", not "publicDir"',
+  'imperative mood, no trailing period',
+  'single line — no body or footer',
+]
+
+/**
+ * Splits camelCase/PascalCase words so subject-case lower-case can pass.
+ * @param {string} subject
+ * @returns {string}
+ */
+export function normalizeSubjectCase(subject) {
+  return String(subject || '')
+    .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+    .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
+    .toLowerCase()
+    .replace(/\s+/g, ' ')
+    .trim()
+}
+
+/**
+ * Normalizes full conventional commit header for commitlint subject-case.
+ * @param {string} message
+ * @returns {string}
+ */
+export function normalizeCommitSubject(message) {
+  const header = String(message || '')
+    .split('\n')[0]
+    .trim()
+  const match = header.match(/^(\w+)\(([^)]+)\):\s*(.+)$/)
+  if (!match) return header
+
+  const [, type, scope, subject] = match
+  return `${type}(${scope}): ${normalizeSubjectCase(subject)}`
+}
 
 /**
  * Builds flat scope-enum list from SCOPES.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.6.72",
+  "version": "1.6.73",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {

package/smart-commit/cli.js

@@ -6,9 +6,15 @@ import { stdin as input, stdout as output } from 'node:process'
 import readline from 'node:readline/promises'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 
+import lint from '@commitlint/lint'
+import load from '@commitlint/load'
 import { logUpdateStderr } from 'log-update'
 
-import { buildScopeEnum } from '../commitlint/commitlintCommon.js'
+import {
+  buildScopeEnum,
+  normalizeCommitSubject,
+  promptSubjectRules,
+} from '../commitlint/commitlintCommon.js'
 import { getBananaFrame } from './dancing-banana.js'
 
 const PACKAGE_NAME = '@itcase/config'
@@ -76,6 +82,7 @@ async function main(argv) {
       ),
   )
   const plans = parsePlan(raw, files)
+  await validateAndNormalizePlans(cwd, plans)
 
   process.stdout.write('\nCommits:\n')
   for (const plan of plans) process.stdout.write(`  • ${plan.message}\n`)
@@ -90,16 +97,45 @@ async function main(argv) {
     return
   }
 
-  for (const plan of plans) {
+  const activePlans = plans
+    .map((plan) => ({
+      ...plan,
+      files: plan.files.filter((file) => fileHasChanges(cwd, file)),
+    }))
+    .filter((plan) => plan.files.length)
+
+  if (!activePlans.length) {
+    process.stdout.write('No changes left to commit (already committed?).\n')
+    return
+  }
+
+  if (activePlans.length !== plans.length) {
+    process.stdout.write(
+      `Skipping ${plans.length - activePlans.length} empty commit(s).\n`,
+    )
+  }
+
+  let created = 0
+  for (const plan of activePlans) {
     git(cwd, ['add', '--', ...plan.files])
+    const staged = lines(cwd, ['diff', '--cached', '--name-only'])
+    const stagedForPlan = plan.files.filter((file) => staged.includes(file))
+    if (!stagedForPlan.length) {
+      throw new Error(
+        `Nothing staged for commit: ${plan.message}\n` +
+          `Files: ${plan.files.join(', ')}`,
+      )
+    }
+
     const commit = spawnSync('git', ['commit', '-m', plan.message], {
       cwd: cwd,
       encoding: 'utf8',
       stdio: ['ignore', 'inherit', 'inherit'],
     })
     if (commit.status) throw new Error(`git commit failed: ${plan.message}`)
+    created++
   }
-  process.stdout.write(`Created ${plans.length} commit(s).\n`)
+  process.stdout.write(`Created ${created} commit(s).\n`)
 }
 
 function parseArgs(argv) {
@@ -267,7 +303,9 @@ function buildPrompt(scopes, types, files, cwd, type) {
 Return ONLY JSON: {"commits":[{"message":"type(scope): subject","files":["a.ts"]}]}
 Types: ${types.join(', ')}
 Scopes (exact): ${buildScopeEnum(scopes).join(', ')}
-Subject: short, imperative, lower-case. Single line only — no body, footer, or Co-authored-by.
+Subject rules:
+${promptSubjectRules.map((rule) => `- ${rule}`).join('\n')}
+Prefer one commit when changes belong to the same feature.
 Split by scope. Each listed file in exactly one commit.
 Do not add Co-authored-by or Made-with trailers.
 ${type ? `Prefer type "${type}".\n` : ''}SCOPES: ${JSON.stringify(scopes)}
@@ -491,7 +529,49 @@ function normalizeCommitMessage(message) {
     .filter((line) => !/^Made-with:/i.test(line))
 
   const subject = (lines[0] || '').replace(/\s+Co-authored-by:.*$/i, '').trim()
-  return subject
+  return normalizeCommitSubject(subject)
+}
+
+async function validateAndNormalizePlans(cwd, plans) {
+  const loaded = await load({}, cwd)
+  const lintOptions = {
+    defaultIgnores: loaded.defaultIgnores,
+    ignores: loaded.ignores,
+    parserPreset: loaded.parserPreset,
+  }
+
+  for (const plan of plans) {
+    plan.message = normalizeCommitSubject(plan.message)
+    const report = await lint(plan.message, loaded.rules, lintOptions)
+    if (report.valid) continue
+
+    const errors =
+      report.errors?.map((error) => error.message).join('; ') || 'invalid'
+    throw new Error(
+      `Commit message failed commitlint:\n  ${plan.message}\n  ${errors}\n` +
+        'Use lower-case subject without camelCase (e.g. "public dir" not "publicDir").',
+    )
+  }
+}
+
+function fileHasChanges(cwd, file) {
+  const filePath = path.join(cwd, file)
+  if (!fs.existsSync(filePath)) return false
+
+  const tracked =
+    spawnSync('git', ['ls-files', '--error-unmatch', '--', file], {
+      cwd: cwd,
+      encoding: 'utf8',
+    }).status === 0
+
+  if (!tracked) return true
+
+  return (
+    spawnSync('git', ['diff', '--quiet', 'HEAD', '--', file], {
+      cwd: cwd,
+      encoding: 'utf8',
+    }).status === 1
+  )
 }
 
 async function confirm(count) {