fix item tag groups linting errors and confusion

Jameskmonger · Nov 23, 2022 · eca6ea7 · eca6ea7
1 parent 9ba6abd
commit eca6ea7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/src/engine/config/config-handler.ts b/src/engine/config/config-handler.ts
@@ -73,24 +73,14 @@ export async function loadGameConfigurations(): Promise<void> {
 
 /**
  * find all items in all select groups
- * @param groupKey string or array of string of which to find items connected with
+ * @param groupKeys array of string of which to find items connected with
  * @return itemsKeys array of itemkeys in all select groups
  */
-export const findItemTagsInGroup = (groupKey: string | string[]): string[] => {
-    if(!groupKey) {
-        return [];
-    }
-
-    if(Array.isArray(groupKey)) {
-        const collection: Record<string, boolean> = {}
-        groupKey.forEach((currentGroup) => {
-            const items = findItemTagsInGroup(currentGroup);
-            items.forEach((item) => collection[item] = true)
-        })
-        return Object.keys(collection)
-    }
-
-    return Object.keys(itemGroupMap[groupKey] || {})
+export const findItemTagsInGroups = (groupKeys: string[]): string[] => {
+    return Object.keys(groupKeys.reduce<Record<string, boolean>>((all, groupKey)=> {
+        const items = itemGroupMap[groupKey] || {};
+        return { ...all, ...items };
+    }, {}));
 }
 
 
@@ -103,7 +93,7 @@ export const findItemTagsInGroupFilter = (groupKeys: string[]): string[] => {
     if(!groupKeys || groupKeys.length === 0) {
         return [];
     }
-    let collection: Record<string, boolean> | undefined = undefined
+    let collection: Record<string, boolean> | undefined = undefined;
     groupKeys.forEach((groupKey) => {
         if(!collection) {
             collection = { ...(itemGroupMap[groupKey] || {}) };
@@ -115,10 +105,10 @@ export const findItemTagsInGroupFilter = (groupKeys: string[]): string[] => {
             if(!(existingItemKey in current)) {
                 delete collection[existingItemKey];
             }
-        })
-    })
+        });
+    });
 
-    return Object.keys(collection)
+    return Object.keys(collection);
 }
 
 

diff --git a/src/plugins/commands/groups-debug.plugin.ts b/src/plugins/commands/groups-debug.plugin.ts
@@ -1,5 +1,5 @@
 import { commandActionHandler } from '@engine/action';
-import { findItemTagsInGroup, findItemTagsInGroupFilter } from '@engine/config/config-handler';
+import { findItemTagsInGroups, findItemTagsInGroupFilter } from '@engine/config/config-handler';
 
 const selectGroups: commandActionHandler = ({ player, args, isConsole }) => {
     const groups: string | number = args.groupkeys;
@@ -8,7 +8,7 @@ const selectGroups: commandActionHandler = ({ player, args, isConsole }) => {
         return;
     }
     player.sendLogMessage('results:', isConsole);
-    findItemTagsInGroup(groups.split(',')).forEach((itemName) => {
+    findItemTagsInGroups(groups.split(',')).forEach((itemName) => {
         player.sendLogMessage(itemName, isConsole);
     });
     return;