@@ -32,7 +32,7 @@ module.exports = {
       { value: "chore", name: "chore:    Other changes that don't modify src or test files", emoji: ":hammer:" },
       { value: "revert", name: "revert:   Reverts a previous commit", emoji: ":rewind:" }
     ],
-    useEmoji: false,
+    useEmoji: true,
     scopes: [{ value: "cz-git", name: "cz-git:   core control" }, { name: "guide" } , 'config'],
     allowCustomScopes: true,
     allowBreakingChanges: ['feat', 'fix'],
 
@@ -45,9 +45,9 @@ A better customizable and git support commitizen adapter.
 
 ## Feature
 
-- Just to be a **lazy man** !!! Select if you can.
+- Just to be a **lazy man** !!! Search and Select if you can.
 - **Customize**, But follow conventional commit format like [Angular convention](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#-git-commit-guidelines).
-- Reduce errors and better support for issue.
+- Reduce errors | Better support for issue | ✅ Support emoji.
 
 ## Usage
 
 
@@ -98,6 +98,12 @@ export const getProcessSubject = (text: string) => {
   return text.replace(/(^[\s]+|[\s\.]+$)/g, "") ?? "";
 };
 
+const getEmojiStrLength = (options: CommitizenGitOptions, type?: string): number => {
+  const item = options.types?.find((i) => i.value === type);
+  // space
+  return item?.emoji ? item.emoji.length + 1 : 0;
+};
+
 export const getMaxSubjectLength = (
   type: Answers["type"],
   scope: Answers["scope"],
@@ -110,7 +116,7 @@ export const getMaxSubjectLength = (
     2 -
     // `()`
     (scope ? scope.length + 2 : 0) -
-    (options.useEmoji ? 2 : 0)
+    (options.useEmoji ? getEmojiStrLength(options, type) : 0)
   );
 };
 
@@ -129,23 +135,24 @@ export const handleScopes = (scopes: ScopesType): Option[] => {
   });
 };
 
-const addType = (type: string, options: CommitizenGitOptions, color?: boolean) => {
-  type = color ? `\u001B[33m${type}\u001B[0m` : type;
-  if (options.useEmoji) {
-    const item = options.types?.find((i) => i.value === type);
-    return item?.emoji ? `${item.emoji} ${type}` : type;
-  } else {
-    return type;
-  }
-};
+const addType = (type: string, color?: boolean) => (color ? `\u001B[33m${type}\u001B[0m` : type);
 
 const addScope = (scope?: string, color?: boolean) => {
-  const separator = ": ";
+  const separator = ":";
   if (!scope) return separator;
   scope = color ? `\u001B[35m${scope}\u001B[0m` : scope;
   return `(${scope.trim()})${separator}`;
 };
 
+const addEmoji = (type: string, options: CommitizenGitOptions): string => {
+  if (options.useEmoji && type !== "") {
+    const item = options.types?.find((i) => i.value === type);
+    return item?.emoji ? ` ${item.emoji} ` : " ";
+  } else {
+    return " ";
+  }
+};
+
 const addSubject = (subject?: string, color?: boolean) => {
   if (!subject) return "";
   subject = color ? `\u001B[36m${subject}\u001B[0m` : subject;
@@ -172,8 +179,9 @@ export const buildCommit = (answers: Answers, options: CommitizenGitOptions, col
     width: 100
   };
   const head =
-    addType(answers.type ?? "", options, color) +
+    addType(answers.type ?? "", color) +
     addScope(answers.scope, color) +
+    addEmoji(answers.type ?? "", options) +
     addSubject(answers.subject, color);
   const body = wrap(answers.body ?? "", wrapOptions);
   const breaking = wrap(answers.breaking ?? "", wrapOptions);
 
@@ -1,4 +1,4 @@
-import { buildCommit } from "../src/until";
+import { buildCommit } from "../lib/until";
 
 /**
  * @description: buildCommit Test
@@ -13,4 +13,20 @@ describe("buildCommit()", () => {
     const options = {};
     expect(buildCommit(answers, options)).toEqual("feat(app): add a new feature");
   });
+
+  test("subject with emoji options standard separator", () => {
+    const options = {
+      types: [{ value: "feat", name: "feat:     A new feature", emoji: ":sparkles:" }],
+      useEmoji: true
+    };
+    expect(buildCommit(answers, options)).toEqual("feat(app): :sparkles: add a new feature");
+  });
+
+  test("subject with emoji options and lost type standard separator", () => {
+    const options = {
+      types: [{ value: "feat", name: "feat:     A new feature" }],
+      useEmoji: true
+    };
+    expect(buildCommit(answers, options)).toEqual("feat(app): add a new feature");
+  });
 });
@@ -0,0 +1,25 @@
+import { getMaxLength } from "../lib/until";
+import { Rule } from "../lib/until";
+
+/**
+ * @description: getMaxLength Test
+ */
+describe("getMaxLength()", () => {
+  test("use commitlint rule get subject max length", () => {
+    const clConfig = {
+      rules: {
+        "subject-max-length": [2, "always", 80]
+      }
+    };
+    expect(getMaxLength(clConfig.rules["subject-max-length"] as unknown as Rule)).toEqual(80);
+  });
+
+  test("underfined commitlint subject rule", () => {
+    const clConfig = {
+      rules: {
+        "subject-max-length": undefined
+      }
+    };
+    expect(getMaxLength(clConfig.rules["subject-max-length"] as unknown as Rule)).toEqual(Infinity);
+  });
+});