@itcase/config 1.6.47 → 1.6.49

package/commitlint/commitizenAdapter.js

@@ -1,22 +1,25 @@
-/**
- * Custom Commitizen adapter: type → scope → subScope (optional) → subject.
- * Settings from commitlintProject.js; SCOPES from project commitlint.config.mjs.
- */
-
+import fs from 'fs'
 import path from 'path'
 import { pathToFileURL } from 'url'
 
+const COMMITLINT_CONFIG_FILES = [
+  'commitlint.config.mjs',
+  'commitlint.config.js',
+  'commitlint.config.cjs',
+]
+
 const SUB_SCOPE_MESSAGE = 'Select sub-scope (optional):'
 const SUBJECT_REQUIRED = 'Subject is required'
 
-function buildScope(scope, subScope) {
-  if (!scope) return ''
-  if (!subScope) return scope
-  return `${scope} / ${subScope}`
-}
-
-function toChoices(values) {
-  return values.map((value) => ({ name: value, value }))
+function findCommitlintConfig() {
+  const cwd = process.cwd()
+  for (const name of COMMITLINT_CONFIG_FILES) {
+    const filePath = path.resolve(cwd, name)
+    if (fs.existsSync(filePath)) return filePath
+  }
+  throw new Error(
+    `Commitlint config not found. Tried: ${COMMITLINT_CONFIG_FILES.join(', ')}`,
+  )
 }
 
 function buildTypeChoices(types, typeEnum) {
@@ -30,94 +33,96 @@ function buildTypeChoices(types, typeEnum) {
 }
 
 async function loadConfig() {
-  const [{ default: load }, { commitlintProject }] = await Promise.all([
-    import('@commitlint/load'),
-    import('./commitlintProject.js'),
-  ])
-
+  const { default: load } = await import('@commitlint/load')
   const { prompt: promptOverrides, rules } = await load()
 
-  const configPath = path.resolve(process.cwd(), 'commitlint.config.mjs')
+  const configPath = findCommitlintConfig()
   const configModule = await import(pathToFileURL(configPath).href)
-  const SCOPES = configModule.default?.SCOPES || {}
+  const SCOPES = configModule.default?.SCOPES ?? {}
 
-  return { commitlintProject, promptOverrides, rules, SCOPES }
+  return { promptOverrides, rules, SCOPES }
 }
 
-function prompter(inquirer, commit) {
-  ;(async () => {
-    try {
-      const { commitlintProject, promptOverrides, rules, SCOPES } =
-        await loadConfig()
-
-      const q = commitlintProject.prompt.questions
-      const over = promptOverrides?.questions
-
-      const scopeEnum = rules['scope-enum']?.[2]
-      const types =
-        rules['type-enum']?.[2] ?? commitlintProject.rules['type-enum'][2]
-      const typeEnum = over?.type?.enum ?? q.type.enum
-      const typeChoices = buildTypeChoices(types, typeEnum)
-
-      const baseScopes = Array.isArray(scopeEnum)
-        ? scopeEnum.filter((s) => !s.includes(' / '))
-        : Object.keys(SCOPES)
-      const scopeList = baseScopes.length > 0 ? baseScopes : Object.keys(SCOPES)
-
-      const messages = {
-        type: over?.type?.description ?? q.type.description,
-        scope: over?.scope?.description ?? q.scope.description,
-        subject: over?.subject?.description ?? q.subject.description,
-      }
+async function prompter(inquirer, commit) {
+  try {
+    const { promptOverrides, rules, SCOPES } = await loadConfig()
+
+    const questions = promptOverrides?.questions ?? {}
+    const scopeEnum = rules['scope-enum']?.[2]
+    const types = rules['type-enum']?.[2]
+    if (!types?.length) {
+      throw new Error(
+        'Commitlint config must set rules["type-enum"][2] (list of types)',
+      )
+    }
+    const typeEnum = questions.type?.enum ?? {}
+    const typeChoices = buildTypeChoices(types, typeEnum)
+
+    const isScopesArray = Array.isArray(SCOPES)
+    const scopesFromConfig = isScopesArray ? SCOPES : Object.keys(SCOPES)
+    const baseScopes = Array.isArray(scopeEnum)
+      ? scopeEnum.filter((s) => !s.includes(' / '))
+      : scopesFromConfig
+    const scopeList = baseScopes.length > 0 ? baseScopes : scopesFromConfig
+
+    const messages = {
+      type: questions.type?.description ?? 'Select the type of change',
+      scope: questions.scope?.description ?? 'What is the scope of this change',
+      subject: questions.subject?.description ?? 'Write a short description',
+    }
 
-      const answers = await inquirer.prompt([
-        {
-          type: 'list',
-          name: 'type',
-          message: messages.type,
-          choices: typeChoices,
-        },
-        {
-          type: 'list',
-          name: 'scope',
-          message: messages.scope,
-          choices: toChoices(scopeList),
+    const answers = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'type',
+        message: messages.type,
+        choices: typeChoices,
+      },
+      {
+        type: 'list',
+        name: 'scope',
+        message: messages.scope,
+        choices: scopeList.map((value) => ({ name: value, value: value })),
+      },
+      {
+        type: 'list',
+        name: 'subScope',
+        message: SUB_SCOPE_MESSAGE,
+        choices: function (answers) {
+          const subs = isScopesArray ? [] : SCOPES[answers.scope] || []
+          return [
+            ...subs.map((value) => ({ name: value, value: value })),
+            new inquirer.Separator(),
+            { name: 'none', value: '' },
+          ]
         },
-        {
-          type: 'list',
-          name: 'subScope',
-          message: SUB_SCOPE_MESSAGE,
-          choices: function (answers) {
-            const subs = SCOPES[answers.scope] || []
-            return [
-              ...toChoices(subs),
-              new inquirer.Separator(),
-              { name: 'None', value: '' },
-            ]
-          },
-          when: function (answers) {
-            const subs = SCOPES[answers.scope]
-            return answers.scope && subs?.length > 0
-          },
+        when: function (answers) {
+          if (isScopesArray) return false
+          const subs = SCOPES[answers.scope]
+          return answers.scope && subs?.length > 0
         },
-        {
-          type: 'input',
-          name: 'subject',
-          message: messages.subject,
-          validate: (input) => (input?.trim() ? true : SUBJECT_REQUIRED),
-        },
-      ])
-
-      const scope = buildScope(answers.scope, answers.subScope)
-      const header = scope
-        ? `${answers.type}(${scope}): ${answers.subject.trim()}`
-        : `${answers.type}: ${answers.subject.trim()}`
-      commit(header)
-    } catch (err) {
-      console.error(err)
-      process.exit(1)
-    }
-  })()
+      },
+      {
+        type: 'input',
+        name: 'subject',
+        message: messages.subject,
+        validate: (input) => (input?.trim() ? true : SUBJECT_REQUIRED),
+      },
+    ])
+
+    const scope = answers.scope
+      ? answers.subScope
+        ? `${answers.scope} / ${answers.subScope}`
+        : answers.scope
+      : ''
+    const header = scope
+      ? `${answers.type}(${scope}): ${answers.subject.trim()}`
+      : `${answers.type}: ${answers.subject.trim()}`
+    commit(header)
+  } catch (err) {
+    console.error(err)
+    process.exit(1)
+  }
 }
 
 export { prompter }

package/commitlint/commitlintCommon.js

@@ -19,11 +19,16 @@ export const promptSubjectDescription =
   'Write a short, imperative tense description of the change'
 
 /**
- * Builds flat scope-enum list from SCOPES: base scopes + "scope / subScope".
- * @param {Record<string, string[]>} scopeSubscopes
+ * Builds flat scope-enum list from SCOPES.
+ * - If SCOPES is string[]: returns it as-is (no sub-scopes).
+ * - If SCOPES is Record<string, string[]>: base scopes + "scope / subScope".
+ * @param {string[] | Record<string, string[]>} scopeSubscopes
  * @returns {string[]}
  */
 export function buildScopeEnum(scopeSubscopes) {
+  if (Array.isArray(scopeSubscopes)) {
+    return [...scopeSubscopes]
+  }
   const base = Object.keys(scopeSubscopes)
   return [
     ...base,

package/commitlint/commitlintCreateConfig.js

@@ -8,7 +8,7 @@ import { commitlintRelease } from './commitlintRelease.js'
 
 /**
  * @param {object} baseConfig
- * @param {Record<string, string[]>} scopes
+ * @param {string[] | Record<string, string[]>} scopes
  * @returns {object}
  */
 function createConfig(baseConfig, scopes) {
@@ -24,7 +24,7 @@ function createConfig(baseConfig, scopes) {
 }
 
 /**
- * @param {Record<string, string[]>} scopes
+ * @param {string[] | Record<string, string[]>} scopes
  * @returns {object}
  */
 export function createCommitlintProjectConfig(scopes) {
@@ -32,7 +32,7 @@ export function createCommitlintProjectConfig(scopes) {
 }
 
 /**
- * @param {Record<string, string[]>} scopes
+ * @param {string[] | Record<string, string[]>} scopes
  * @returns {object}
  */
 export function createCommitlintReleaseConfig(scopes) {

package/commitlint/commitlintProject.js

@@ -8,7 +8,7 @@ import {
 } from './commitlintCommon.js'
 
 const commitlintProject = {
-  parserPreset,
+  parserPreset: parserPreset,
   ignores: [
     (commit) => /^Merge branch/.test(commit),
     (commit) => /^Merge pull request/.test(commit),
@@ -33,7 +33,7 @@ const commitlintProject = {
     ],
     'scope-enum': [2, 'always', ['PLEASE', 'SET', 'SCOPE-ENUM']],
   },
-  defaultIgnores,
+  defaultIgnores: defaultIgnores,
   prompt: {
     settings: {
       enableMultipleScopes: true,

package/commitlint/commitlintRelease.js

@@ -8,14 +8,14 @@ import {
 } from './commitlintCommon.js'
 
 const commitlintRelease = {
-  parserPreset,
+  parserPreset: parserPreset,
   extends: ['@commitlint/config-conventional'],
   rules: {
     ...commonRules,
     'type-case': [0],
     'type-enum': [2, 'always', ['patch', 'minor', 'major']],
   },
-  defaultIgnores,
+  defaultIgnores: defaultIgnores,
   prompt: {
     settings: {},
     questions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itcase/config",
-  "version": "1.6.47",
+  "version": "1.6.49",
   "author": "ITCase",
   "description": "ITCase Config",
   "engines": {
@@ -31,11 +31,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@lerna-lite/cli": "^4.11.0",
-    "@lerna-lite/exec": "^4.11.1",
-    "@lerna-lite/list": "^4.11.0",
-    "@lerna-lite/run": "^4.11.1",
-    "@lerna-lite/watch": "^4.11.0",
+    "@lerna-lite/cli": "^4.11.2",
+    "@lerna-lite/exec": "^4.11.2",
+    "@lerna-lite/list": "^4.11.2",
+    "@lerna-lite/run": "^4.11.2",
+    "@lerna-lite/watch": "^4.11.2",
     "semantic-release-lerna": "^2.17.0",
     "chokidar-cli": "^3.0.0",
     "@commitlint/cli": "^20.4.1",
@@ -95,12 +95,12 @@
     "rollup-plugin-dts": "^6.3.0",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-preserve-directives": "^1.1.3",
-    "semantic-release": "^25.0.2",
+    "semantic-release": "^25.0.3",
     "postcss-urlrewrite": "^0.3.0"
   },
   "devDependencies": {
-    "@itcase/lint": "^1.1.95",
-    "eslint": "^9.39.2",
+    "@itcase/lint": "^1.1.96",
+    "eslint": "^10.0.0",
     "husky": "^9.1.7",
     "inquirer": "^13.2.2",
     "lint-staged": "^16.2.7",