From 49b70766f7028f8f3d9d82d82e4126ee6816d2f2 Mon Sep 17 00:00:00 2001
From: Hau Nguyen <hauvipapro@gmail.com>
Date: Thu, 10 Aug 2023 17:57:13 +0700
Subject: [PATCH] feat(qmkasciigen): re-order draw transform

---
 cmd/qmkasciigen/draw.go | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/cmd/qmkasciigen/draw.go b/cmd/qmkasciigen/draw.go
index 92f44a0..33ef8d7 100644
--- a/cmd/qmkasciigen/draw.go
+++ b/cmd/qmkasciigen/draw.go
@@ -17,6 +17,22 @@ var mapRawBinding = []map[string]string{
 		"CTL_T(KC_ESC)":    "ESC CTRL",
 		"TD(TD_SAFE_BOOT)": "BOOT",
 	},
+}
+
+var mapTransform = []map[string]string{
+	{
+		// My custom
+		"LAYER_QWERTY":   "0",
+		"LAYER_COMMON":   "1",
+		"LAYER_RARELY":   "2",
+		"LAYER_RECOVERY": "3",
+	},
+	{
+		"MO(0)": "L0",
+		"MO(1)": "L1",
+		"MO(2)": "L2",
+		"MO(3)": "L3",
+	},
 	{
 		// Basic
 		// Prefer OPT > ALT
@@ -63,31 +79,15 @@ var mapRawBinding = []map[string]string{
 		// Quantum
 		"EE_CLR": "EECLR",
 	},
-}
-
-var mapTransform = []map[string]string{
-	{
-		// Layer enum
-		"LAYER_QWERTY":   "0",
-		"LAYER_COMMON":   "1",
-		"LAYER_RARELY":   "2",
-		"LAYER_RECOVERY": "3",
-	},
 	{
 		// Prefix
 		"KC_": "",
 		"QK_": "",
 	},
-	{
-		"MO(0)": "L0",
-		"MO(1)": "L1",
-		"MO(2)": "L2",
-		"MO(3)": "L3",
-	},
 }
 
 // Only use this as last resort
-var mapBindingTiny = []map[string]string{
+var mapTransformTiny = []map[string]string{
 	{
 		"BACKSPACE": "BACK",
 	},
@@ -207,10 +207,9 @@ func Draw(
 
 				if len(keyStr)+2*padding > key.NewW {
 					// Make it smaller
-					for _, m := range mapBindingTiny {
-						if _, ok := m[keyStr]; ok {
-							keyStr = m[keyStr]
-							break
+					for _, m := range mapTransformTiny {
+						for from, to := range m {
+							keyStr = strings.ReplaceAll(keyStr, from, to)
 						}
 					}