Rework addon loading to properly load on ADDON_LOADED

insteaad of immediately

DeathReporter.lua

@@ -0,0 +1,8 @@
+
+local addonname, data = ...
+---@cast data HeimdallData
+---@cast addonname string
+
+data.DeathReporter = {}
+function data.DeathReporter.Init()
+end

DumpTable.lua

@@ -1,5 +1,6 @@
-local _, data = ...
+local addonname, data = ...
 ---@cast data HeimdallData
+---@cast addonname string
 
 if not data.dumpTable then
 	---@param table table

Heimdall.lua

@@ -1,9 +1,12 @@
-local _, data = ...
+local addonname, data = ...
 ---@cast data HeimdallData
+---@cast addonname string
 
+local function init()
     ---@class Heimdall_Data
     ---@field who { data: table<string, Player> }
     if not Heimdall_Data then Heimdall_Data = {} end
+    if not Heimdall_Data.config then Heimdall_Data.config = {} end
 
     -- We don't care about these persisting
     -- Actually we don't want some of them to persist
@@ -19,6 +22,11 @@ if not Heimdall_Data then Heimdall_Data = {} end
     ---@field dumpTable fun(table: any, depth?: number): nil
     ---@field utf8len fun(input: string): number
     ---@field padString fun(input: string, targetLength: number, left?: boolean): string
+    ---@field GetOrDefault fun(table: table<any, any>, keys: string[], default: any): any
+    ---@field Whoer { Init: fun() }
+    ---@field Messenger { Init: fun() }
+    ---@field Spotter { Init: fun() }
+    ---@field DeathReporter { Init: fun() }
 
     --- Config ---
     ---@class HeimdallConfig
@@ -58,6 +66,27 @@ if not Heimdall_Data then Heimdall_Data = {} end
     ---@field whoTicker number?
     ---@field ignored table<string, boolean>
 
+    data.GetOrDefault = function(table, keys, default)
+        local value = default
+        if not table then return value end
+        if not keys then return value end
+
+        local traverse = table
+        for i = 1, #keys do
+            local key = keys[i]
+            if traverse[key] then
+                traverse = traverse[key]
+            else
+                break
+            end
+
+            if i == #keys then
+                value = traverse
+            end
+        end
+        return value
+    end
+
     data.messenger = {
         queue = {}
     }
@@ -67,50 +96,55 @@ data.who = {
 
     data.config = {
         spotter = {
-        enabled = true,
-        everyone = false,
-        hostile = true,
-        alliance = false,
-        stinky = false,
-        notifyChannel = "Foobar",
-        zoneOverride = nil,
-        throttleTime = 1
+            enabled = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "enabled" }, true),
+            everyone = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "everyone" }, false),
+            hostile = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "hostile" }, true),
+            alliance = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "alliance" }, false),
+            stinky = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "stinky" }, false),
+            notifyChannel = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "notifyChannel" }, "Foobar"),
+            zoneOverride = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "zoneOverride" }, nil),
+            throttleTime = data.GetOrDefault(Heimdall_Data, { "config", "spotter", "throttleTime" }, 1)
         },
         who = {
-        enabled = true,
-        ignored = {},
-        notifyChannel = "Foobar",
-        ttl = 10,
-        doWhisper = true,
-        zoneNotifyFor = {
+            enabled = data.GetOrDefault(Heimdall_Data, { "config", "who", "enabled" }, true),
+            ignored = data.GetOrDefault(Heimdall_Data, { "config", "who", "ignored" }, {}),
+            notifyChannel = data.GetOrDefault(Heimdall_Data, { "config", "who", "notifyChannel" }, "Foobar"),
+            ttl = data.GetOrDefault(Heimdall_Data, { "config", "who", "ttl" }, 10),
+            doWhisper = data.GetOrDefault(Heimdall_Data, { "config", "who", "doWhisper" }, true),
+            zoneNotifyFor = data.GetOrDefault(Heimdall_Data, { "config", "who", "zoneNotifyFor" }, {
                 ["Orgrimmar"] = true,
                 ["Thunder Bluff"] = true,
                 ["Undercity"] = true,
                 ["Durotar"] = true,
                 ["Echo Isles"] = true,
                 ["Valley of Trials"] = true,
-        }
+            }),
         },
         messenger = {
-        enabled = true
+            enabled = data.GetOrDefault(Heimdall_Data, { "config", "messenger", "enabled" }, true),
         },
-    whisperNotify = {
-        "Extazyk",
-        "Smokefire",
-        "Smokemantra",
-        "Хихихантер",
-        "Муркот",
-        "Растафаркрай",
-        "Frosstmorn",
-        "Pulsjkee",
-        "Paskoo",
+        whisperNotify = data.GetOrDefault(Heimdall_Data, { "config", "whisperNotify" }, {
+            --        "Extazyk",
+            --        "Smokefire",
+            --        "Smokemantra",
+            --        "Хихихантер",
+            --        "Муркот",
+            --        "Растафаркрай",
+            --        "Frosstmorn",
+            --        "Pulsjkee",
+            --        "Paskoo",
             "Totleta",
             "Healleta",
             "Deathleta",
             "Shootleta",
             "Stableta"
+        }),
     }
-}
+    --/run Heimdall_Data = {config = {who = {enabled = false}}}
+    --/dump Heimdall_Data
+    print("138 " .. tostring(Heimdall_Data.config.who.enabled))
+    print("139 " .. tostring(data.GetOrDefault(Heimdall_Data, { "config", "who", "enabled" }, true)))
+    print("140 " .. tostring(data.config.who.enabled))
 
     data.raceMap = {
         ["Orc"] = "Horde",
@@ -136,7 +170,6 @@ data.raceMap = {
         ["Mag'har Orc"] = "Horde"
     }
 
----@type table<string, string>
     data.classColors = {
         ["Warrior"] = "C69B6D",
         ["Paladin"] = "F48CBA",
@@ -196,3 +229,17 @@ data.padString = function(input, targetLength, left)
         end
         return input
     end
+
+    data.Whoer.Init()
+    data.Messenger.Init()
+    data.Spotter.Init()
+    data.DeathReporter.Init()
+end
+
+local loadedFrame = CreateFrame("Frame")
+loadedFrame:RegisterEvent("ADDON_LOADED")
+loadedFrame:SetScript("OnEvent", function(self, event, addonName)
+    if addonName == addonname then
+        init()
+    end
+end)

Heimdall.toc

@@ -5,9 +5,9 @@
 ## SavedVariables: Heimdall_Data
 
 #core
-Heimdall.lua
 CLEUParser.lua
+DumpTable.lua
 Spotter.lua
 Whoer.lua
 Messenger.lua
-DumpTable.lua
+Heimdall.lua

Messenger.lua

@@ -1,6 +1,9 @@
-local _, data = ...
+local addonname, data = ...
 ---@cast data HeimdallData
+---@cast addonname string
 
+data.Messenger = {}
+function data.Messenger.Init()
 	if not data.config.messenger.enabled then return end
 
 	---@class Message
@@ -89,3 +92,4 @@ end
 	--		message = "TEST"
 	--	})
 	--end)
+end

Spotter.lua

@@ -1,8 +1,10 @@
-local _, data = ...
+local addonname, data = ...
 ---@cast data HeimdallData
+---@cast addonname string
 
+data.Spotter = {}
+function data.Spotter.Init()
 	if not data.config.spotter.enabled then return end
-
 	local function FormatHP(hp)
 		if hp > 1e9 then
 			return string.format("%.1fB", hp / 1e9)
@@ -103,3 +105,4 @@ frame:SetScript("OnEvent", function(self, event, unit)
 			print(string.format("Error notifying %s: %s", tostring(unit), tostring(err)))
 		end
 	end)
+end

Whoer.lua

@@ -1,12 +1,12 @@
-local _, data = ...
+local addonname, data = ...
 ---@cast data HeimdallData
+---@cast addonname string
 
+data.Whoer = {}
+function data.Whoer.Init()
 	if not data.config.who.enabled then return end
 	if not Heimdall_Data.who then Heimdall_Data.who = {} end
 	if not Heimdall_Data.who.data then Heimdall_Data.who.data = {} end
-print(Heimdall_Data)
-print(Heimdall_Data.who)
-print(Heimdall_Data.who.data)
 
 	---@type table<string, Player>
 	local players = {}
@@ -56,7 +56,8 @@ Player = {
 		end,
 		---@return string
 		NotifyMessage = function(self)
-		local text = string.format("%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d",
+			local text = string.format(
+				"%s of class %s and guild %s in %s, first seen: %s, last seen: %s, times seen: %d",
 				self.name,
 				self.class,
 				self.guild,
@@ -400,3 +401,4 @@ whoQueryChannelFrame:SetScript("OnEvent", function(self, event, msg, sender, ...
 			end
 		end
 	end)
+end