wuira 0.2.4 → 0.2.5

package/lib/icons/index.lua

@@ -0,0 +1,3 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+return ____exports

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export type { CommandCallback } from "./platform/SlashCommands";
 export { AddonSettings } from "./platform/AddonSettings";
 export { Encoding } from "./platform/Encoding";
 export { DruidSpells, GeneralSpells, HunterSpells, MageSpells, PaladinSpells, PetSpells, PriestSpells, ProfessionSpells, RacialSpells, RogueSpells, ShamanSpells, WarlockSpells, WarriorSpells, WorldSpells, BindingActions, } from "./spells/index";
+export { Icons } from "./icons/index";
 export { BlizzardUI } from "./platform/BlizzardUI";
 export { ActionBars } from "./platform/ActionBars";
 export type { ActionSlot, EmptyActionBarsOptions } from "./platform/ActionBars";

package/lib/store/index.lua

@@ -739,10 +739,12 @@ function StoreRegistry.prototype.____constructor(self, options)
     if string.match(options.variable, "^[%a_][%w_]*$") == nil then
         error("Invalid SavedVariables name", 0)
     end
-    local ____opt_1 = C_AddOns and C_AddOns.IsAddOnLoaded
-    if ____opt_1 and ____opt_1(options.addon) then
-        self:Load()
-        return
+    if (C_AddOns and C_AddOns.IsAddOnLoaded) ~= nil then
+        local ____, loaded = C_AddOns.IsAddOnLoaded(options.addon)
+        if loaded then
+            self:Load()
+            return
+        end
     end
     self.listener = CreateFrame("Frame", nil, UIParent)
     self.listener:RegisterEvent("ADDON_LOADED")
@@ -753,17 +755,17 @@ function StoreRegistry.prototype.____constructor(self, options)
                 return
             end
             self:Load()
+            local ____opt_3 = self.listener
+            if ____opt_3 ~= nil then
+                ____opt_3:UnregisterAllEvents()
+            end
             local ____opt_5 = self.listener
             if ____opt_5 ~= nil then
-                ____opt_5:UnregisterAllEvents()
+                ____opt_5:SetScript("OnEvent", nil)
             end
             local ____opt_7 = self.listener
             if ____opt_7 ~= nil then
-                ____opt_7:SetScript("OnEvent", nil)
-            end
-            local ____opt_9 = self.listener
-            if ____opt_9 ~= nil then
-                ____opt_9:Hide()
+                ____opt_7:Hide()
             end
             self.listener = nil
             local callbacks = self.readyCallbacks
@@ -784,8 +786,8 @@ function StoreRegistry.prototype.onReady(self, callback)
     if self.IsReady then
         callback(nil)
     else
-        local ____self_readyCallbacks_11 = self.readyCallbacks
-        ____self_readyCallbacks_11[#____self_readyCallbacks_11 + 1] = callback
+        local ____self_readyCallbacks_9 = self.readyCallbacks
+        ____self_readyCallbacks_9[#____self_readyCallbacks_9 + 1] = callback
     end
 end
 function StoreRegistry.prototype.Read(self, schema)
@@ -907,17 +909,17 @@ function StoreRegistry.prototype.subscribe(self, schema, observer)
     end
 end
 function StoreRegistry.prototype.Dispose(self)
+    local ____opt_10 = self.listener
+    if ____opt_10 ~= nil then
+        ____opt_10:UnregisterAllEvents()
+    end
     local ____opt_12 = self.listener
     if ____opt_12 ~= nil then
-        ____opt_12:UnregisterAllEvents()
+        ____opt_12:SetScript("OnEvent", nil)
     end
     local ____opt_14 = self.listener
     if ____opt_14 ~= nil then
-        ____opt_14:SetScript("OnEvent", nil)
-    end
-    local ____opt_16 = self.listener
-    if ____opt_16 ~= nil then
-        ____opt_16:Hide()
+        ____opt_14:Hide()
     end
     self.listener = nil
     self.observers:clear()

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "wuira",
-  "version": "0.2.4",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/KerimCETINBAS/wuira.git"
+  },
+  "version": "0.2.5",
   "author": {
     "name": "Kerim Cetinbas",
     "email": "a.cetinbas@icloud.com"
@@ -42,7 +46,11 @@
     },
     "./config/tsconfig.json": "./config/tsconfig.json",
     "./tools/wow-modules.mjs": "./tools/wow-modules.mjs",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./icons": {
+      "types": "./lib/icons/index.d.ts",
+      "default": "./lib/icons/index.lua"
+    }
   },
   "typesVersions": {
     "*": {
@@ -66,6 +74,9 @@
       ],
       "console-polyfill": [
         "lib/console-polyfill.d.ts"
+      ],
+      "icons": [
+        "lib/icons/index.d.ts"
       ]
     }
   },
@@ -81,7 +92,10 @@
     "tsconfig.lib.json",
     "README.md",
     "CHANGELOG.md",
-    "LICENSE"
+    "LICENSE",
+    "data/icons/forever.json",
+    "docs/icons.md",
+    "docs/source-converters.md"
   ],
   "engines": {
     "node": ">=22.13"
@@ -97,7 +111,9 @@
     "check": "tsc -p tsconfig.json --noEmit",
     "spells:update": "node tools/update-spells.mjs",
     "spells:generate": "node tools/generate-spells.mjs",
-    "test": "node --test tests/*.test.cjs"
+    "test": "node --test tests/*.test.cjs",
+    "icons:update": "node tools/update-icons.mjs",
+    "icons:generate": "node tools/generate-icons.mjs"
   },
   "devDependencies": {
     "fengari-node-cli": "0.1.0"

package/tools/build-library.mjs

@@ -12,7 +12,7 @@ const result = spawnSync(process.execPath, [require.resolve("typescript-to-lua/d
 if (result.status !== 0) process.exit(result.status || 1);
 fs.mkdirSync(path.join(root, "lib/platform"), { recursive: true });
 fs.copyFileSync(path.join(root, "src/platform/forever.d.ts"), path.join(root, "lib/platform/forever.d.ts"));
-for (const file of ["index.d.ts", "ui/index.d.ts", "datasources/index.d.ts", "store/index.d.ts", "skins/index.d.ts", "spells/index.d.ts"]) {
+for (const file of ["index.d.ts", "ui/index.d.ts", "datasources/index.d.ts", "store/index.d.ts", "skins/index.d.ts", "spells/index.d.ts", "icons/index.d.ts"]) {
   const target = path.join(root, "lib", file);
   const reference = file === "index.d.ts" ? "./platform/forever.d.ts" : "../platform/forever.d.ts";
   fs.writeFileSync(target, `/// <reference path="${reference}" />\n` + fs.readFileSync(target, "utf8"));

package/tools/generate-icons.mjs

@@ -0,0 +1,10 @@
+import fs from "node:fs";
+import path from "node:path";
+import { iconEnumSource } from "./icon-data.mjs";
+const root = path.resolve(import.meta.dirname, "..");
+const catalog = JSON.parse(fs.readFileSync(path.join(root,"data/icons/forever.json"),"utf8"));
+const spells = JSON.parse(fs.readFileSync(path.join(root, "data/spells/forever.json"), "utf8"));
+if (catalog.build !== spells.build || catalog.product !== spells.product) throw new Error("Icon and spell builds must match");
+const output=path.join(root,"src/icons");fs.mkdirSync(output,{recursive:true});
+fs.writeFileSync(path.join(output, "index.ts"), iconEnumSource(catalog));
+console.log("Generated " + catalog.icons.length + " native icon IDs");

package/tools/icon-data.mjs

@@ -0,0 +1,59 @@
+/** Build-time catalog data. Nothing in this module runs inside the game. */
+export function collectIcons(spells, tables) {
+    const spellNames = new Map(spells.spells.map(row => [row[0], row]));
+    const itemNames = new Map(tables.ItemSparse.map(row => [Number(row.ID), row.Display_lang]));
+    if (!tables.SpellMisc.length || !tables.SpellMisc.every(row => "SpellIconFileDataID" in row && "ActiveIconFileDataID" in row && "SpellID" in row)
+        || !tables.Item.length || !tables.Item.every(row => "IconFileDataID" in row)
+        || !tables.ItemSparse.length || !tables.ItemSparse.every(row => "Display_lang" in row)) throw new Error("Unexpected client icon schema");
+    const icons = new Map();
+    const add = (value, name, kind, priority) => {
+        const id = Number(value);
+        if (!Number.isSafeInteger(id) || id < 0) throw new Error("Invalid icon FileDataID");
+        if (id === 0) return;
+        const icon = icons.get(id) ?? { id, names: new Map(), kinds: new Set() };
+        const label = name.trim();
+        icon.names.set(label, Math.min(icon.names.get(label) ?? Infinity, priority));
+        icon.kinds.add(kind); icons.set(id, icon);
+    };
+    for (const row of tables.SpellMisc) {
+        const spell = spellNames.get(Number(row.SpellID));
+        const name = spell?.[1]?.trim() || "Spell " + row.SpellID;
+        const priority = spell?.[4] ? 0 : spell ? 2 : 4;
+        add(row.SpellIconFileDataID, name, "spell", priority);
+        add(row.ActiveIconFileDataID, name + " (active)", "spell", priority + 1);
+    }
+    for (const row of tables.Item) {
+        const name = itemNames.get(Number(row.ID))?.trim();
+        add(row.IconFileDataID, name || "Item " + row.ID, "item", name ? 1 : 4);
+    }
+    return [...icons.values()].sort((a, b) => a.id - b.id).map(icon => {
+        const names = [...icon.names].sort(([a, pa], [b, pb]) => pa - pb || (a < b ? -1 : a > b ? 1 : 0)).map(([name]) => name);
+        return [icon.id, names[0], names, [...icon.kinds].sort()];
+    });
+}
+
+export function iconEnumSource(catalog) {
+    if (catalog.version !== 1 || catalog.product !== "wow_classic_beta" || !/^1\.60\./.test(catalog.build)) throw new Error("Unsupported icon catalog");
+    const identifier = name => {
+        const value = name.normalize("NFKD").replace(/[\u0300-\u036f]/g, "").replace(/['’]/g, "")
+            .split(/[^A-Za-z0-9]+/).filter(Boolean).map(word => word[0].toUpperCase() + word.slice(1)).join("");
+        return /^[A-Za-z]/.test(value) ? value : "Icon" + value;
+    };
+    const ids = new Set(), aliases = new Map(), occupied = new Set(), lines = [];
+    for (const [id, name, names] of catalog.icons) {
+        if (!Number.isSafeInteger(id) || id < 1 || ids.has(id) || !name || !Array.isArray(names) || !names.includes(name)) throw new Error("Invalid icon record: " + id);
+        ids.add(id);
+        const key = identifier(name) + "_" + id;
+        occupied.add(key); lines.push("    " + key + " = " + id + ",");
+        for (const alias of names) {
+            const key = identifier(alias);
+            if (!aliases.has(key)) aliases.set(key, new Set());
+            aliases.get(key).add(id);
+        }
+    }
+    for (const [name, values] of [...aliases].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) if (values.size === 1 && !occupied.has(name)) {
+        occupied.add(name); lines.push("    " + name + " = " + [...values][0] + ",");
+    }
+    return "// Auto generated. Do not edit.\n// Source: Forever " + catalog.build + "; run npm run icons:generate.\n"
+        + "/** Native texture FileDataIDs, independent of spell and action IDs. */\nexport const enum Icons {\n" + lines.join("\n") + "\n}\n";
+}

package/tools/update-icons.mjs

@@ -0,0 +1,36 @@
+import fs from "node:fs";
+import path from "node:path";
+import { createHash } from "node:crypto";
+import { parseCSV } from "./spell-data.mjs";
+import { collectIcons } from "./icon-data.mjs";
+const root = path.resolve(import.meta.dirname, "..");
+const argument = name => process.argv[process.argv.indexOf(name) + 1];
+const build = process.argv.includes("--build") ? argument("--build") : undefined;
+const spells = JSON.parse(fs.readFileSync(path.join(root, "data/spells/forever.json"), "utf8"));
+if (!build || !build.startsWith("1.60.") || build !== spells.build || spells.product !== "wow_classic_beta") throw new Error("Use the same verified Forever build as the spell catalog");
+const cached = process.argv.includes("--cached"), directory = path.join(root, "data/icons/.cache", build);
+fs.mkdirSync(directory, { recursive: true });
+const hash = value => createHash("sha256").update(value).digest("hex"), sources = [];
+async function table(name) {
+    const url = "https://wago.tools/db2/" + name + "/csv?build=" + build, file = path.join(directory, name + ".csv");
+    let text;
+    if (cached) text = fs.readFileSync(file, "utf8");
+    else {
+        const response = await fetch(url, { signal: AbortSignal.timeout(60000) });
+        if (!response.ok || !response.headers.get("content-type")?.includes("text/csv")) throw new Error("Icon data download failed: " + name + " (" + response.status + ")");
+        text = await response.text(); fs.writeFileSync(file, text);
+    }
+    const rows = parseCSV(text); sources.push({ table: name, url, sha256: hash(text), rows: rows.length }); return [name, rows];
+}
+const results = await Promise.allSettled(["SpellMisc", "Item", "ItemSparse"].map(table));
+const failures = results.filter(result => result.status === "rejected");
+if (failures.length) throw new AggregateError(failures.map(result => result.reason), "Icon data download failed");
+const tables = Object.fromEntries(results.map(result => result.value));
+const rows = collectIcons(spells, tables);
+if (rows.length < 500) throw new Error("Icon catalog is unexpectedly small");
+const catalog = { version: 1, product: spells.product, build, locale: spells.locale,
+    sources: sources.sort((a,b) => a.table.localeCompare(b.table)), spellCatalogSHA256: hash(JSON.stringify(spells)),
+    columns: ["fileDataId","name","aliases","kinds"], icons: rows };
+fs.mkdirSync(path.join(root,"data/icons"),{recursive:true});
+fs.writeFileSync(path.join(root,"data/icons/forever.json"),JSON.stringify(catalog,null,2)+"\n");
+console.log("Saved "+rows.length+" spell/item icons for Forever "+build);