Merge pull request #113 from iamando/develop

bugfix: check if ticket is enabled avoid show to ticket input if not enabled

Author: Ando

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "commitizen-cli",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Command-line interface tool that helps enforce standardized commit message formats in Git repositories.",
   "type": "module",
   "license": "MIT",
@@ -50,6 +50,7 @@
   },
   "devDependencies": {
     "@types/dedent": "^0.7.0",
+    "@types/lodash": "^4.14.196",
     "@types/node": "^20.2.5",
     "@typescript-eslint/eslint-plugin": "^5.59.8",
     "@typescript-eslint/parser": "^5.59.8",
@@ -66,6 +67,7 @@
     "@clack/prompts": "^0.6.3",
     "cleye": "^1.3.2",
     "dedent": "^0.7.0",
-    "kolorist": "^1.8.0"
+    "kolorist": "^1.8.0",
+    "lodash": "^4.17.21"
   }
 }

package.json

@@ -1,9 +1,10 @@
+import _ from 'lodash'
 import { cancel, intro, group, confirm, outro } from '@clack/prompts'
 import { bgYellow, black } from 'kolorist'
 import dedent from 'dedent'
 
 import { CANCELED_OP_MSG } from './constants'
-import { type, message, hasTicket, ticket } from './prompts'
+import { type, message, ticket } from './prompts'
 import { handleCliError, CliError } from './cli-errror'
 import { log } from './log'
 import { formatCommitWithEmojiByType } from './emojis'
@@ -14,11 +15,10 @@ export const commiter = async () => {
 
   await isTreeClean()
 
-  const values = await group(
+  const values: any = await group(
     {
       type: () => type(),
       message: () => message(),
-      hasTicket: () => hasTicket(),
       ticket: () => ticket(),
     },
     {
@@ -41,11 +41,10 @@ export const commiter = async () => {
       commit = formatCommitWithEmojiByType({
         type: values.type,
         message: values.message,
-        hasTicket: values.hasTicket,
         ticket: values.ticket,
       })
     } else {
-      if (values.hasTicket) {
+      if (!_.isEmpty(values.ticket)) {
         commit = `${values.type}(${values.ticket}): ${values.message}`
       } else {
         commit = `${values.type}: ${values.message}`

src/utils/commiter.ts

@@ -1,12 +1,12 @@
+import _ from 'lodash'
+
 export const formatCommitWithEmojiByType = ({
   type,
   message,
-  hasTicket,
   ticket,
 }: {
   type: string
   message: string
-  hasTicket?: boolean
   ticket?: string
 }): string => {
   const emojiByType: Record<string, any> = {
@@ -22,7 +22,7 @@ export const formatCommitWithEmojiByType = ({
 
   let commit: string
 
-  if (hasTicket) {
+  if (!_.isEmpty(ticket)) {
     commit = `${emojiByType[type]} ${type}(${ticket}): ${message}`
   } else {
     commit = `${emojiByType[type]} ${type}: ${message}`

src/utils/emojis.ts

@@ -23,16 +23,18 @@ export const message = () =>
     },
   }) as Promise<string>
 
-export const hasTicket = () =>
-  confirm({
+export const ticket = async () => {
+  const hasTicket = await confirm({
     message: 'Has Ticket ?',
     initialValue: false,
-  }) as Promise<boolean>
+  })
+
+  if (!hasTicket) return
 
-export const ticket = () =>
   text({
     message: 'Insert your Ticket name',
     validate: value => {
       if (value.length === 0) return 'Ticket name required'
     },
   }) as Promise<string>
+}