@itcase/config 1.7.23 → 1.7.24

package/package.json

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

package/smart-commit/cli.js

@@ -202,28 +202,39 @@ async function main(argv) {
       continue
     }
 
+    const ignoredFiles = gitIgnoredFiles(cwd, planFiles)
+    const filesToStage = planFiles.filter(
+      (file) => !ignoredFiles.includes(file),
+    )
+    process.stdout.write(`\n${paint('1;36', step)} ${plan.message}\n`)
+    if (ignoredFiles.length) {
+      process.stdout.write(
+        `${dim(`      skipped (gitignore): ${ignoredFiles.join(', ')}`)}\n`,
+      )
+    }
+    if (!filesToStage.length) continue
+
     const startedAt = Date.now()
     const fileLabel =
-      planFiles.length === 1 ? '1 file' : `${planFiles.length} files`
-    process.stdout.write(`\n${paint('1;36', step)} ${plan.message}\n`)
+      filesToStage.length === 1 ? '1 file' : `${filesToStage.length} files`
     process.stdout.write(`${dim(`      staging ${fileLabel}…`)}\n`)
 
     // Drop leftover index entries so only this plan's files are committed.
     git(cwd, ['reset', '-q', 'HEAD'])
-    stageFiles(cwd, planFiles)
+    stageFiles(cwd, filesToStage)
     const staged = lines(cwd, ['diff', '--cached', '--name-only'])
-    const stagedForPlan = planFiles.filter((file) => staged.includes(file))
+    const stagedForPlan = filesToStage.filter((file) => staged.includes(file))
     if (!stagedForPlan.length) {
       throw new Error(
         `Nothing staged for commit: ${plan.message}\n` +
-          `Files: ${planFiles.join(', ')}`,
+          `Files: ${filesToStage.join(', ')}`,
       )
     }
 
     const commitLabel = option.noVerify
       ? 'git commit --no-verify'
       : 'git commit'
-    const hookLocks = siblingLocksForFiles(planFiles)
+    const hookLocks = siblingLocksForFiles(filesToStage)
     const dirtyLocksBefore = new Set(
       hookLocks.filter((file) => fileHasChanges(cwd, file)),
     )
@@ -233,7 +244,7 @@ async function main(argv) {
       // equivalent flag — the hook simply does not run.
       if (option.noVerify) commitArgs.push('--no-verify')
       await gitCommitWithProgress(cwd, commitArgs, commitLabel)
-      const included = includeHookLockfiles(cwd, planFiles, dirtyLocksBefore)
+      const included = includeHookLockfiles(cwd, filesToStage, dirtyLocksBefore)
       if (included.length) {
         process.stdout.write(
           `${dim(`      hook updated ${included.join(', ')}, added to commit`)}\n`,
@@ -1534,6 +1545,26 @@ function isOnDisk(cwd, file) {
   return fs.existsSync(path.join(cwd, file))
 }
 
+function gitIgnoredFiles(cwd, files) {
+  if (!files.length) return []
+
+  const result = spawnSync('git', ['check-ignore', '-z', '--stdin'], {
+    cwd: cwd,
+    encoding: 'utf8',
+    input: `${files.join('\0')}\0`,
+    stdio: ['pipe', 'pipe', 'pipe'],
+  })
+  // 0 — at least one path is ignored, 1 — none.
+  if (result.status !== 0) return []
+
+  const ignored = new Set(
+    String(result.stdout || '')
+      .split('\0')
+      .filter(Boolean),
+  )
+  return files.filter((file) => ignored.has(file))
+}
+
 function isTracked(cwd, file) {
   return gitOk(cwd, ['ls-files', '--error-unmatch', '--', file])
 }
@@ -1602,9 +1633,16 @@ function includeHookLockfiles(cwd, planFiles, dirtyBefore) {
 function stageFiles(cwd, files) {
   if (!files.length) return
 
+  // `git add -- ignored/path` exits 1 and abandons the rest of the batch.
+  // Tracked files that also match gitignore still stage; check-ignore
+  // omits them unless --no-index is passed.
+  const ignored = new Set(gitIgnoredFiles(cwd, files))
+  const stageableFiles = files.filter((file) => !ignored.has(file))
+  if (!stageableFiles.length) return
+
   const existing = []
   const removed = []
-  for (const file of files) {
+  for (const file of stageableFiles) {
     if (isOnDisk(cwd, file)) existing.push(file)
     else removed.push(file)
   }