From 79cf33b9f1643d8dca5809ae8ca208d234a8e071 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 9 Sep 2023 17:48:36 -0500
Subject: [PATCH] refactor: enumparser create implementation file

---
 include/util/enum.hpp | 29 +++++-----------------------
 meson.build           |  1 +
 src/util/enum.cpp     | 45 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 24 deletions(-)
 create mode 100644 src/util/enum.cpp

diff --git a/include/util/enum.hpp b/include/util/enum.hpp
index 951cace3..681385fd 100644
--- a/include/util/enum.hpp
+++ b/include/util/enum.hpp
@@ -1,38 +1,19 @@
 #pragma once
 
-#include <cctype>
-#include <iostream>
 #include <map>
 #include <stdexcept>
 #include <string>
 
-#include "util/string.hpp"
-
 namespace waybar::util {
 
 template <typename EnumType>
 struct EnumParser {
-  EnumParser() {}
+ public:
+  EnumParser();
+  ~EnumParser();
 
   EnumType parseStringToEnum(const std::string& str,
-                             const std::map<std::string, EnumType>& enumMap) {
-    // Convert the input string to uppercase
-    std::string uppercaseStr = capitalize(str);
-
-    // Capitalize the map keys before searching
-    std::map<std::string, EnumType> capitalizedEnumMap;
-    std::transform(
-        enumMap.begin(), enumMap.end(), std::inserter(capitalizedEnumMap, capitalizedEnumMap.end()),
-        [this](const auto& pair) { return std::make_pair(capitalize(pair.first), pair.second); });
-
-    // Return enum match of string
-    auto it = enumMap.find(uppercaseStr);
-    if (it != enumMap.end()) return it->second;
-
-    // Throw error if it doesnt return
-    throw std::invalid_argument("Invalid string representation for enum");
-  }
-
-  ~EnumParser() = default;
+                             const std::map<std::string, EnumType>& enumMap);
 };
+
 }  // namespace waybar::util
diff --git a/meson.build b/meson.build
index e71807ec..b27bc05b 100644
--- a/meson.build
+++ b/meson.build
@@ -171,6 +171,7 @@ src_files = files(
     'src/client.cpp',
     'src/config.cpp',
     'src/group.cpp',
+    'src/util/enum.cpp',
     'src/util/prepare_for_sleep.cpp',
     'src/util/ustring_clen.cpp',
     'src/util/sanitize_str.cpp',
diff --git a/src/util/enum.cpp b/src/util/enum.cpp
new file mode 100644
index 00000000..a29304c5
--- /dev/null
+++ b/src/util/enum.cpp
@@ -0,0 +1,45 @@
+#include "util/enum.hpp"
+
+#include <algorithm>  // for std::transform
+#include <cctype>     // for std::toupper
+#include <iostream>
+#include <map>
+#include <stdexcept>
+#include <string>
+
+#include "modules/hyprland/workspaces.hpp"
+#include "util/string.hpp"
+
+namespace waybar::util {
+
+template <typename EnumType>
+EnumParser<EnumType>::EnumParser() = default;
+
+template <typename EnumType>
+EnumParser<EnumType>::~EnumParser() = default;
+
+template <typename EnumType>
+EnumType EnumParser<EnumType>::parseStringToEnum(const std::string& str,
+                                                 const std::map<std::string, EnumType>& enumMap) {
+  // Convert the input string to uppercase
+  std::string uppercaseStr = capitalize(str);
+
+  // Capitalize the map keys before searching
+  std::map<std::string, EnumType> capitalizedEnumMap;
+  std::transform(
+      enumMap.begin(), enumMap.end(), std::inserter(capitalizedEnumMap, capitalizedEnumMap.end()),
+      [this](const auto& pair) { return std::make_pair(capitalize(pair.first), pair.second); });
+
+  // Return enum match of string
+  auto it = capitalizedEnumMap.find(uppercaseStr);
+  if (it != capitalizedEnumMap.end()) return it->second;
+
+  // Throw error if it doesn't return
+  throw std::invalid_argument("Invalid string representation for enum");
+}
+
+// Explicit instantiations for specific EnumType types you intend to use
+// Add explicit instantiations for all relevant EnumType types
+template struct EnumParser<modules::hyprland::Workspaces::SORT_METHOD>;
+
+}  // namespace waybar::util