✨ feat: support nesting and scopes

.vscode/settings.json

@@ -15,4 +15,4 @@
       "url": "https://rettend.github.io/eemoji/eemoji-config-schema.json"
     }
   ]
-}
+}

README.md

@@ -8,9 +8,9 @@ v0.2.0:
 
 - [ ] Add tests with `vitest`
 - [x] Support JSON config files (host json schema on github)
-- [ ] Support nesting (conventional commits scopes)
+- [x] Support nesting (conventional commits scopes)
   - fix: typo ✏️, bug 🐛
   - chore: release 🔖, cleanup 🧹, license 📜
-  - breaking change!: 💥
+  x breaking change!: 💥
 - [x] Add many more emojis
 - [ ] Write nice README

eemoji.config.ts

@@ -4,8 +4,12 @@ export default defineConfig({
   format: '{emoji} {type}: {subject}',
   emojis: {
     fix: '🐛',
-    chore: '🧹',
+    chore: {
+      '.': '🧹',
+      'release': '🔖',
+    },
     cleanup: '🤢',
     docs: '✏️',
+    breaking: '🚨',
   },
 })

eemojirc.json

@@ -0,0 +1,3 @@
+{
+
+}

json/eemoji-config-schema.json

@@ -8,8 +8,18 @@
     "emojis": {
       "type": "object",
       "additionalProperties": {
-        "type": "string"
+        "oneOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        ]
       }
     }
   }
-}
+}

src/config.ts

@@ -4,7 +4,7 @@ import emojis from './emojis.json' assert { type: 'json' }
 export interface Config {
   format: string
   emojis: {
-    [key: string]: string
+    [key: string]: string | Record<string, string>
   }
 }
 

src/emojis.json

@@ -1,10 +1,20 @@
 {
-  "fix": "🔧",
+  "fix": {
+    ".": "🔧",
+    "typo": "✏️",
+    "bug": "🐛"
+  },
+  "chore": {
+    ".": "🗑️",
+    "release": "🔖",
+    "cleanup": "🧹",
+    "license": "📜",
+    "deps": "📦"
+  },
   "feat": "✨",
   "docs": "📝",
   "test": "🧪",
   "refactor": "♻️",
-  "chore": "🗑️",
   "init": "🎉",
   "deps": "📦",
   "config": "⚙️",
@@ -14,6 +24,7 @@
   "ui": "🪟",
   "perf": "⚡",
   "text": "💬",
+  "breaking": "💥",
   "revert": "⏪",
   "cleanup": "🧹",
   "ci": "🦾",
@@ -23,4 +34,4 @@
   "remove": "➖",
   "up": "⬆️",
   "down": "⬇️"
-}
+}

src/main.ts

@@ -32,6 +32,9 @@ export const main = defineCommand({
       const result = await explorer.search()
       let config: Config
 
+      consola.log(`file: ${result?.filepath}`)
+      consola.log(`config: ${JSON.stringify(result?.config, null, 2)}`)
+
       if (result)
         config = result.config
       else
@@ -53,12 +56,26 @@ export const main = defineCommand({
       type = type?.trim()
       subject = subject?.trim()
 
+      consola.log(`type: ${type}`)
+      consola.log(`subject: ${subject}`)
+
       if (!type || !subject) {
         consola.warn(`Invalid commit message: ${firstLine}`)
         throw new Error('Invalid commit message.')
       }
 
-      const emoji = config.emojis[type.toLowerCase()]
+      let emoji: string | Record<string, string> | undefined
+
+      // if there is an exclamatory mark, then it's a breaking change
+      if (firstLine.includes('!') && config.emojis.breaking)
+        emoji = config.emojis.breaking
+      else
+        emoji = config.emojis[type.toLowerCase().replace(/\(.*\)/, '')]
+
+      // if the emoji is an object, then it's a nested emoji
+      if (typeof emoji === 'object')
+        emoji = getNestedEmoji(firstLine, emoji)
+
       if (!emoji)
         throw new Error(`Emoji for type "${type}" not found.`)
 
@@ -75,7 +92,31 @@ export const main = defineCommand({
   },
 })
 
-runMain(main)
+// get the first nested emoji that is found in the commit message
+// example of a config with nested emojis:
+// "fix": {
+//   ".": "🔧",
+//   "typo": "✏️",
+//   "bug": "🐛"
+// },
+// "feat": "✨",
+// "docs": "📝",
+// "test": "🧪",
+// "refactor": "♻️",
+// 1. we iterate over the entries of the object and check if the commit message contains any of the keys (without the dot)
+// 2. if it does, then we return the value of that key
+// 3. if it doesn't, we return the dot key
+
+function getNestedEmoji(text: string, emoji: Record<string, string>) {
+  const entries = Object.entries(emoji).filter(([key]) => key !== '.')
+
+  for (const [key, value] of entries) {
+    if (text.includes(key))
+      return value
+  }
+
+  return emoji['.']
+}
 
 function checkGitHook() {
   const hookContent = '#!/bin/sh\n'
@@ -125,3 +166,5 @@ function checkJsonSchema() {
     else consola.error(err)
   }
 }
+
+runMain(main)