fix: arcanes, release dates, categories (#959)

Author: TobiTenno

build/build.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import minify from 'imagemin';
+import minify, { type Plugin } from 'imagemin';
 import minifyPng from 'imagemin-pngquant';
 import minifyJpeg from 'imagemin-jpegtran';
 import fetch from 'node-fetch';
@@ -264,7 +264,7 @@ class Build {
             minifyPng({
               quality: [0.2, 0.4],
             }),
-          ],
+          ] as Plugin[],
         });
 
         this.updateCache(item, cached, hash, isComponent);
@@ -374,7 +374,7 @@ class Build {
     const processedItems: Item[] = [];
     for (const imageName of Object.keys(itemsByImageName)) {
       // Items are grouped by imageName, there are non in this loop that will be undefined
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+       
       const group = itemsByImageName[imageName]!;
       if (group.length === 1) {
         processedItems.push(...group);
@@ -407,7 +407,7 @@ class Build {
         return (priorityMap[a.category] ?? Infinity) - (priorityMap[b.category] ?? Infinity);
       });
 
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+       
       const mainItem = group[0]!;
       processedItems.push(mainItem);
 
@@ -432,12 +432,12 @@ class Build {
     for (const item of [...processedItems, ...noImage]) {
       if (item.productCategory && allowedCustomCategories.includes(item.productCategory)) {
         // Since we're following the same logic as applying custom categories all keys should have an empty array and if they don't we should consider it an error
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+         
         data[item.productCategory]!.push(item);
         continue;
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+       
       data[item.category]!.push(item);
     }
   }

build/parser.ts

@@ -79,6 +79,8 @@ const warnings: Warnings = {
   missingType: [],
   failedImage: [],
   missingWikiThumb: [],
+  missingReleaseDates: [],
+  ambiguousWikiMatch: [],
 };
 
 const filterBps = (blueprint: Partial<ItemComplete>): boolean => !bpConflicts.includes(blueprint.uniqueName ?? '');
@@ -223,13 +225,20 @@ class Parser {
     this.addDucats(result, data.wikia.ducats);
     this.addDropRate(result, data.drops);
     this.addPatchlogs(result, data.patchlogs);
-    this.addAdditionalWikiaData(result, category, data.wikia);
+    this.addAdditionalWikiaData(result, data.wikia);
     this.addIsPrime(result);
     this.addVaultData(result, category, data.wikia);
     this.addResistanceData(result, category);
     this.addRelics(result, data.relics, data.drops);
     this.applyMasterable(result);
     this.applyOverrides(result);
+    if (!result.releaseDate) {
+      if (result.masterable) {
+        warnings.missingReleaseDates.push(result.name);
+      } else if (result.category === 'Arcanes' && result.wikiAvailable) {
+        warnings.missingReleaseDates.push(result.name);
+      }
+    }
     return result;
   }
 
@@ -517,7 +526,7 @@ class Parser {
     }
 
     if (item.productCategory && productCategoryTypeMap[item.productCategory]) {
-      item.type = productCategoryTypeMap[item.productCategory];
+      item.type = productCategoryTypeMap[item.productCategory]!;
     }
   }
 
@@ -880,14 +889,44 @@ class Parser {
     return;
   }
 
+  /**
+   * Map finalized output categories to wiki data buckets and merge handlers.
+   * @param itemCategory category assigned by addCategory
+   * @returns wiki bucket and handler key, if wiki merge applies
+   */
+  resolveWikiaConfig(itemCategory?: string): { wikiCategory: string; handler: 'warframe' | 'weapon' | 'mod' | 'arcane' } | undefined {
+    switch (itemCategory) {
+      case 'Arcanes':
+        return { wikiCategory: 'arcanes', handler: 'arcane' };
+      case 'Warframes':
+        return { wikiCategory: 'warframes', handler: 'warframe' };
+      case 'Archwing':
+        return { wikiCategory: 'archwings', handler: 'warframe' };
+      case 'Primary':
+      case 'Secondary':
+      case 'Melee':
+      case 'Arch-Gun':
+      case 'Arch-Melee':
+        return { wikiCategory: 'weapons', handler: 'weapon' };
+      case 'Mods':
+        return { wikiCategory: 'mods', handler: 'mod' };
+      case 'Sentinels':
+        return { wikiCategory: 'companions', handler: 'warframe' };
+      default:
+        return undefined;
+    }
+  }
+
   /**
    * Adds data scraped from the wiki to a particular item
    * @param item to have wikia data added to
-   * @param category of the data
    * @param wikiaData from wikia to apply
    */
-  addAdditionalWikiaData(item: ItemComplete, category: string, wikiaData: WikiaData): void {
-    if (!['weapons', 'warframes', 'mods', 'upgrades', 'sentinels'].includes(category.toLowerCase())) return;
+  addAdditionalWikiaData(item: ItemComplete, wikiaData: WikiaData): void {
+    const config = this.resolveWikiaConfig(item.category);
+    if (!config) return;
+
+    const { wikiCategory, handler } = config;
 
     const slots: string[][] = [
       ['Secondary'], // 0
@@ -907,35 +946,22 @@ class Parser {
       ['Railjack Turret'], // 14
     ];
 
-    let wikiCategory = category.toLowerCase();
-    if (category === 'Upgrades') wikiCategory = 'mods';
-    if (item.category === 'Archwing') wikiCategory = 'archwings';
-    if (category === 'Sentinels') wikiCategory = 'companions';
-
-    const wikiaItem = (wikiaData[wikiCategory as keyof WikiaData] as WikiaWeapon[]).find((i) => {
-      const uMatch = i.uniqueName === item.uniqueName;
-      let nMatch = true;
-      if (category.toLowerCase() === 'weapons' && typeof item.slot !== 'undefined') {
-        nMatch = slots[item.slot]?.includes(i.slot?.toString() ?? '') ?? false;
-      }
-      return uMatch && nMatch;
-    });
+    const wikiaItem = this.findWikiaItem(item, wikiCategory, wikiaData, slots);
     if (!wikiaItem) return;
     item.wikiAvailable = true;
 
-    switch (category.toLowerCase()) {
-      case 'sentinels':
-      case 'warframes':
-        this.addWarframeWikiaData(item, wikiaItem);
+    switch (handler) {
+      case 'warframe':
+        this.addWarframeWikiaData(item, wikiaItem as WikiaWarframe);
         break;
-      case 'weapons':
-        this.addWeaponWikiaData(item, wikiaItem);
+      case 'weapon':
+        this.addWeaponWikiaData(item, wikiaItem as WikiaWeapon);
         break;
-      case 'upgrades':
-        this.addModWikiaData(item, wikiaItem);
+      case 'mod':
+        this.addModWikiaData(item, wikiaItem as WikiaMod);
         break;
-      case 'arcanes':
-        this.addArcaneWikiaData(item, wikiaItem);
+      case 'arcane':
+        this.addArcaneWikiaData(item, wikiaItem as WikiaArcane);
         break;
       default:
         break;
@@ -947,6 +973,40 @@ class Parser {
     if (item.introduced) item.releaseDate = item.introduced.date;
   }
 
+  /**
+   * Find a wiki entry by uniqueName, falling back to an exact name match.
+   * @param item item to match against wiki data
+   * @param wikiCategory wiki data bucket key
+   * @param wikiaData scraped wiki data
+   * @param slots weapon slot compatibility map
+   * @returns matched wiki entry, if unambiguous
+   */
+  findWikiaItem(
+    item: ItemComplete,
+    wikiCategory: string,
+    wikiaData: WikiaData,
+    slots: string[][]
+  ): { uniqueName?: string; name: string; slot?: unknown; introduced?: string } | undefined {
+    const wikiItems = (wikiaData[wikiCategory as keyof WikiaData] as
+      | { uniqueName?: string; name: string; slot?: unknown; introduced?: string }[]
+      | undefined) ?? [];
+
+    const uniqueMatch = wikiItems.find((i) => {
+      const uMatch = i.uniqueName === item.uniqueName;
+      let nMatch = true;
+      if (wikiCategory === 'weapons' && typeof item.slot !== 'undefined') {
+        nMatch = slots[item.slot]?.includes(String(i.slot ?? '')) ?? false;
+      }
+      return uMatch && nMatch;
+    });
+    if (uniqueMatch) return uniqueMatch;
+
+    const nameMatches = wikiItems.filter((i) => i.name === item.name);
+    if (nameMatches.length === 1) return nameMatches[0];
+    if (nameMatches.length > 1) warnings.ambiguousWikiMatch.push(item.name);
+    return undefined;
+  }
+
   addWarframeWikiaData(item: ItemComplete, wikiaItem: WikiaWarframe): void {
     item.aura = wikiaItem.auraPolarity;
     item.conclave = wikiaItem.conclave;
@@ -1018,7 +1078,7 @@ class Parser {
     item.wikiaThumbnail = wikiaItem.thumbnail;
     item.wikiaUrl = wikiaItem.url;
     item.transmutable = wikiaItem.transmutable;
-    item.type = wikiaItem.type ?? item.type;
+    item.rarity = wikiaItem.rarity ?? item.rarity;
     if (!wikiaItem.thumbnail) warnings.missingWikiThumb.push(item.name);
   }
 
@@ -1077,8 +1137,8 @@ class Parser {
    * @param drops drop rate data for refinement-specific chances
    */
   addRelics(item: ItemComplete, relics: TitaniaRelic[], drops: RawDrop[]): void {
-    const hasRelicDrop = (item.components)?.some((c): boolean =>
-      c.drops?.some((d) => d.location.includes('Relic'))
+    const hasRelicDrop = item.components?.some((c) =>
+      c.drops?.some((d) => d.location.includes('Relic')) ?? false
     );
     if (item.type !== 'Relic' && !hasRelicDrop) return;
 

build/types/shared.ts

@@ -82,6 +82,8 @@ export interface Warnings {
   missingType: string[];
   failedImage: string[];
   missingWikiThumb: string[];
+  missingReleaseDates: string[];
+  ambiguousWikiMatch: string[];
 }
 
 export type Locales = Record<string, Record<string, unknown>>;
@@ -158,6 +160,7 @@ export interface WikiaArcane {
   transmutable?: boolean;
   introduced?: string;
   type?: string;
+  rarity?: string;
   thumbnail?: string;
   [key: string]: unknown;
 }

build/wikia/transformers/transformArcanes.ts

@@ -6,6 +6,7 @@ interface OldArcane {
   Transmutable?: boolean;
   Introduced?: string;
   Type?: string;
+  Rarity?: string;
   InternalName?: string;
   [key: string]: unknown;
 }
@@ -17,7 +18,7 @@ export default (oldArcane: OldArcane, imageUrls: Record<string, string>): WikiaA
   }
 
   try {
-    const { Image, Name, Transmutable, Introduced, Type, InternalName } = oldArcane;
+    const { Image, Name, Transmutable, Introduced, Type, Rarity, InternalName } = oldArcane;
 
     newArcane = {
       name: Name,
@@ -26,6 +27,7 @@ export default (oldArcane: OldArcane, imageUrls: Record<string, string>): WikiaA
       transmutable: Transmutable,
       introduced: Introduced,
       type: Type,
+      rarity: Rarity ? Rarity.charAt(0).toUpperCase() + Rarity.slice(1).toLowerCase() : undefined,
       thumbnail: imageUrls[Image ?? ''],
     };
   } catch (error) {

eslint.config.ts

@@ -34,6 +34,7 @@ export default defineConfig(
       ],
       '@typescript-eslint/no-base-to-string': 'off',
       '@typescript-eslint/no-unnecessary-condition': 'off',
+      '@typescript-eslint/no-non-null-assertion': 'off',
     },
   },
   // Disable type checking for all JS files

index.d.ts

@@ -249,14 +249,16 @@ declare module '@wfcd/items' {
     attacks?: Attack[];
     maxLevelCap?: number;
   }
-  interface Arcane extends Named, Buildable, Droppable {
+  interface Arcane extends Named, Buildable, Droppable, WikiaItem {
     category: 'Arcanes';
     excludeFromCodex?: true;
     imageName: string;
     levelStats?: LevelStat[];
     masterable: false;
     patchlogs?: PatchLog[];
+    releaseDate?: DateString;
     tradable: true;
+    transmutable?: boolean;
     type: 'Arcane' | `${ArcaneType} Arcane`;
   }
   interface StanceMod extends Omit<Mod, 'levelStats'> {