@itcase/config 1.7.12 → 1.7.13

package/package.json

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

package/smart-commit/cli.js

@@ -420,6 +420,7 @@ function buildPrompt(scopes, types, files, cwd, type) {
 
   return `Plan git commits. Do not edit files or run git commit.
 Return ONLY JSON: {"commits":[{"message":"type(scope): subject","files":["a.ts"]}]}
+Every message must be type(scope): subject. Put a scope from the list in parentheses, including when the type is "other".
 Types: ${types.join(', ')}
 Scopes (exact): ${buildScopeEnum(scopes).join(', ')}
 Subject rules:
@@ -1319,16 +1320,18 @@ async function validateAndNormalizePlans(cwd, plans, scopes, types) {
       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").',
+        'Use type(scope): subject. Scope in parentheses is required. Subject is lower-case without camelCase (e.g. "public dir" not "publicDir").',
     )
   }
 }
 
 function repairCommitHeader(message, scopes, types) {
-  const match = String(message || '').match(/^(\w+)\(([^)]+)\):\s*(.+)$/)
+  const match = String(message || '')
+    .trim()
+    .match(/^(\w+)(?:\(([^)]*)\))?:\s*(.+)$/)
   if (!match) return message
 
-  let [, type, scope, subject] = match
+  let [, type, rawScope, subject] = match
   const scopeEnum = buildScopeEnum(scopes)
   if (types.length && !types.includes(type)) {
     if (types.includes('chore')) type = 'chore'
@@ -1336,9 +1339,8 @@ function repairCommitHeader(message, scopes, types) {
     else type = types[0]
   }
 
-  const matchedScope = matchScope(scope, scopeEnum)
-  if (matchedScope) scope = matchedScope
-  else scope = pickScope(scopes, ['other'])
+  const matchedScope = matchScope((rawScope || '').trim(), scopeEnum)
+  const scope = matchedScope || pickScope(scopes, ['other'])
 
   return normalizeCommitSubject(`${type}(${scope}): ${subject}`)
 }