Rework fade function structure

Author: GODrums

src/lib/components/market/sort_listings.ts

@@ -6,7 +6,7 @@ import {state} from 'lit/decorators.js';
 import {gFloatFetcher} from '../../services/float_fetcher';
 import {getMarketInspectLink} from './helpers';
 import {ItemInfo} from '../../bridge/handlers/fetch_inspect_info';
-import {getFadeCalculatorAndSupportedWeapon, getFadePercentage} from '../../utils/skin';
+import {getFadeParams, getFadePercentage} from '../../utils/skin';
 import {AppId, ContextId} from '../../types/steam_constants';
 
 enum SortType {
@@ -39,7 +39,7 @@ export class SortListings extends FloatElement {
 
         const asset = g_rgAssets[AppId.CSGO][ContextId.PRIMARY][listingInfo.asset.id];
 
-        return getFadeCalculatorAndSupportedWeapon(asset) !== undefined;
+        return getFadeParams(asset) !== undefined;
     }
 
     computeButtonText(sortType: SortType): string {

src/lib/utils/skin.ts

@@ -163,9 +163,15 @@ export function isBlueSkin(itemInfo: ItemInfo): boolean {
     );
 }
 
-export function getFadeCalculatorAndSupportedWeapon(
+export function getFadeParams(
     asset: rgAsset
-): [typeof FadeCalculator | typeof AcidFadeCalculator | typeof AmberFadeCalculator, string, string] | undefined {
+):
+    | {
+          calculator: typeof FadeCalculator | typeof AcidFadeCalculator | typeof AmberFadeCalculator;
+          weaponName: string;
+          className: string;
+      }
+    | undefined {
     const FADE_TYPE_TO_CALCULATOR = {
         Fade: FadeCalculator,
         'Acid Fade': AcidFadeCalculator,
@@ -175,7 +181,11 @@ export function getFadeCalculatorAndSupportedWeapon(
     for (const [fadeType, calculator] of Object.entries(FADE_TYPE_TO_CALCULATOR)) {
         for (const supportedWeapon of calculator.getSupportedWeapons()) {
             if (asset.market_hash_name.includes(`${supportedWeapon} | ${fadeType}`)) {
-                return [calculator, supportedWeapon.toString(), fadeType.replace(' ', '-').toLowerCase()];
+                return {
+                    calculator,
+                    weaponName: supportedWeapon.toString(),
+                    className: fadeType.replace(' ', '-').toLowerCase(),
+                };
             }
         }
     }
@@ -185,14 +195,14 @@ export function getFadePercentage(
     asset: rgAsset,
     itemInfo: ItemInfo
 ): {percentage: number; fadeType: string} | undefined {
-    const fadeCalculatorAndSupportedWeapon = getFadeCalculatorAndSupportedWeapon(asset);
+    const fadeInfo = getFadeParams(asset);
 
-    if (fadeCalculatorAndSupportedWeapon !== undefined) {
-        const [calculator, supportedWeapon, fadeType] = fadeCalculatorAndSupportedWeapon;
+    if (fadeInfo !== undefined) {
+        const {calculator, weaponName, className} = fadeInfo;
 
         return {
-            percentage: calculator.getFadePercentage(supportedWeapon, itemInfo.paintseed).percentage,
-            fadeType,
+            percentage: calculator.getFadePercentage(weaponName, itemInfo.paintseed).percentage,
+            fadeType: className,
         };
     }
 }