From d21bf2277bbc087d58143aa47c077f07705aad29 Mon Sep 17 00:00:00 2001 From: danocmx Date: Sat, 12 Oct 2024 21:35:53 +0200 Subject: [PATCH] chore: run prettier --- package-lock.json | 23 +++++++++++++++++++ package.json | 1 + src/index.ts | 5 +--- src/parseEconItem/ParsedEcon.ts | 6 ++--- src/parseEconItem/ParsedEcon/ItemName.ts | 6 +++-- .../ParsedEcon/getCrateNumber.ts | 12 +++++----- .../ParsedEcon/getDescriptions/item-number.ts | 15 +++++++----- .../ParsedEcon/getNameAttributes.ts | 11 +++++---- src/parseEconItem/ParsedEcon/getUses.ts | 8 +++---- src/parseString.ts | 23 +++++++++++-------- src/parseString/Attributes/getEffect.ts | 2 +- src/parseString/Attributes/getItemNumber.ts | 2 +- .../Attributes/getQuality/isVintage.ts | 5 +--- src/parseString/Attributes/getUsableItem.ts | 12 ++++++---- src/parseString/Attributes/isFestivized.ts | 4 +++- src/shared/getTexture.ts | 8 ++----- src/stringify.ts | 7 ++++-- src/toSKU/guards.ts | 12 +++------- src/types/econ.ts | 6 ++--- src/types/index.ts | 2 +- src/types/schema.ts | 7 +++++- 21 files changed, 105 insertions(+), 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5adb9a0..2f8b9c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "eslint-plugin-import": "^2.27.5", "mocha": "^10.0.0", "nyc": "^17.0.0", + "prettier": "^3.3.3", "semantic-release": "^24.0.0", "typescript": "^5.0.3" }, @@ -8816,6 +8817,22 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-ms": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz", @@ -17020,6 +17037,12 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, + "prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "dev": true + }, "pretty-ms": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz", diff --git a/package.json b/package.json index 4f68fcd..010bbc7 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "eslint-plugin-import": "^2.27.5", "mocha": "^10.0.0", "nyc": "^17.0.0", + "prettier": "^3.3.3", "semantic-release": "^24.0.0", "typescript": "^5.0.3" }, diff --git a/src/index.ts b/src/index.ts index f1128ac..cbdf4a9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -123,10 +123,7 @@ export class Format { attributes: StrigifySKUAttributes | ItemAttributes, options?: StringifyOptions ): string; - stringify( - sku: string, - options?: StringifyOptions - ): string; + stringify(sku: string, options?: StringifyOptions): string; stringify( attributesOrSku: StrigifySKUAttributes | ItemAttributes | string, options: StringifyOptions = {} diff --git a/src/parseEconItem/ParsedEcon.ts b/src/parseEconItem/ParsedEcon.ts index e9a2e13..41584a3 100644 --- a/src/parseEconItem/ParsedEcon.ts +++ b/src/parseEconItem/ParsedEcon.ts @@ -179,7 +179,7 @@ export default class ParsedEcon { target: this.nameAttrs.target as string, output: this.nameAttrs.output, outputQuality: this.nameAttrs.outputQuality, - } + } : undefined ); @@ -284,9 +284,9 @@ export default class ParsedEcon { paintDefindex: this.schema.getDefindex( this.descriptions.paint ), - } + } : {}), - } + } : {}), parts: this.descriptions.parts, diff --git a/src/parseEconItem/ParsedEcon/ItemName.ts b/src/parseEconItem/ParsedEcon/ItemName.ts index bb4a68b..8e085f6 100644 --- a/src/parseEconItem/ParsedEcon/ItemName.ts +++ b/src/parseEconItem/ParsedEcon/ItemName.ts @@ -62,7 +62,7 @@ export default class ItemName { target, outputQuality: outputQuality as string, }, - } + } : {}), }); } @@ -113,7 +113,9 @@ export default class ItemName { return name; } - private shouldAddItemNumber(itemNumber?: ItemNumber): itemNumber is ItemNumber { + private shouldAddItemNumber( + itemNumber?: ItemNumber + ): itemNumber is ItemNumber { return !!itemNumber && !this.origin.endsWith(` #${itemNumber.value}`); } } diff --git a/src/parseEconItem/ParsedEcon/getCrateNumber.ts b/src/parseEconItem/ParsedEcon/getCrateNumber.ts index 90cd575..f2f474e 100644 --- a/src/parseEconItem/ParsedEcon/getCrateNumber.ts +++ b/src/parseEconItem/ParsedEcon/getCrateNumber.ts @@ -1,10 +1,10 @@ -import ParsedEcon from "../ParsedEcon"; +import ParsedEcon from '../ParsedEcon'; export default function getCrateNumber(econ: ParsedEcon): number { - if (!econ.options.retrieveCrateNumber) return 0; - if (econ.nameAttrs.itemNumber || econ.descriptions.itemNumber) return 0; - - const search = econ.options.useTrueDefindex ? econ.trueDefindex : econ.name; + if (!econ.options.retrieveCrateNumber) return 0; + if (econ.nameAttrs.itemNumber || econ.descriptions.itemNumber) return 0; - return econ.schema.getCrateNumber(search); + const search = econ.options.useTrueDefindex ? econ.trueDefindex : econ.name; + + return econ.schema.getCrateNumber(search); } diff --git a/src/parseEconItem/ParsedEcon/getDescriptions/item-number.ts b/src/parseEconItem/ParsedEcon/getDescriptions/item-number.ts index 248fbec..9f599ad 100644 --- a/src/parseEconItem/ParsedEcon/getDescriptions/item-number.ts +++ b/src/parseEconItem/ParsedEcon/getDescriptions/item-number.ts @@ -1,17 +1,20 @@ -import { EconDescription } from "../../../types"; +import { EconDescription } from '../../../types'; export function isMedal(description: EconDescription): boolean { - return description.value.startsWith('Medal no. '); + return description.value.startsWith('Medal no. '); } export function isCrate(description: EconDescription): boolean { - return description.value.startsWith('Crate Series ') && description.color === '7ea9d1'; + return ( + description.value.startsWith('Crate Series ') && + description.color === '7ea9d1' + ); } export function getMedal(description: EconDescription): number { - return parseInt(description.value.replace('Medal no. ', '')); + return parseInt(description.value.replace('Medal no. ', '')); } export function getCrate(description: EconDescription): number { - return parseInt(description.value.replace('Crate Series #', '')); -} \ No newline at end of file + return parseInt(description.value.replace('Crate Series #', '')); +} diff --git a/src/parseEconItem/ParsedEcon/getNameAttributes.ts b/src/parseEconItem/ParsedEcon/getNameAttributes.ts index 385d360..8822022 100644 --- a/src/parseEconItem/ParsedEcon/getNameAttributes.ts +++ b/src/parseEconItem/ParsedEcon/getNameAttributes.ts @@ -40,7 +40,9 @@ export default function (econ: ParsedEcon): NameAttributes { } const usableItem = getUsableItem( - attributes.itemNumber ? removeItemNumber(name, attributes.itemNumber) : name + attributes.itemNumber + ? removeItemNumber(name, attributes.itemNumber) + : name ); if (usableItem) { Object.assign(attributes, usableItem); @@ -51,7 +53,7 @@ export default function (econ: ParsedEcon): NameAttributes { /** * Returns a string that can be used for retrieving item number. - * @param econ + * @param econ * @returns name */ function getNameForItemNumber(econ: ParsedEcon) { @@ -62,7 +64,8 @@ function getNameForItemNumber(econ: ParsedEcon) { return econ.item.name; } - if (!econ.options.itemNumberFromFraudWarning) return econ.itemName.getOrigin(); + if (!econ.options.itemNumberFromFraudWarning) + return econ.itemName.getOrigin(); const warning = econ.item.fraudwarnings?.find((f) => f.startsWith('This item has been renamed.') ); @@ -74,7 +77,7 @@ function getNameForItemNumber(econ: ParsedEcon) { /** * Checks if item has been renamed based on fraudwarnings and symbols. - * @param econ + * @param econ * @returns if it has been renamed */ function hasBeenRenamed(econ: ParsedEcon) { diff --git a/src/parseEconItem/ParsedEcon/getUses.ts b/src/parseEconItem/ParsedEcon/getUses.ts index e474d00..2d2a9b0 100644 --- a/src/parseEconItem/ParsedEcon/getUses.ts +++ b/src/parseEconItem/ParsedEcon/getUses.ts @@ -1,10 +1,10 @@ import ParsedEcon from '../ParsedEcon'; export default function getUses(econ: ParsedEcon): number { - if (!econ.item?.app_data?.quantity) { - return 0; - } + if (!econ.item?.app_data?.quantity) { + return 0; + } const uses = parseInt(econ.item?.app_data?.quantity); - return isNaN(uses) ? 0 : uses; + return isNaN(uses) ? 0 : uses; } diff --git a/src/parseString.ts b/src/parseString.ts index ed628e7..24165f1 100644 --- a/src/parseString.ts +++ b/src/parseString.ts @@ -61,15 +61,20 @@ function parseString( }; if (inNumbers) { - const convertedAttributes = getConvertedIntAttributes(schema, itemName, { - killstreak: attributes.killstreak, - wear: attributes.wear, - effect: attributes.effect, - quality: attributes.quality.value, - outputQuality: - attributes.usableItem && attributes.usableItem.outputQuality, - texture: attributes.texture, - }); + const convertedAttributes = getConvertedIntAttributes( + schema, + itemName, + { + killstreak: attributes.killstreak, + wear: attributes.wear, + effect: attributes.effect, + quality: attributes.quality.value, + outputQuality: + attributes.usableItem && + attributes.usableItem.outputQuality, + texture: attributes.texture, + } + ); if (!convertedAttributes.killstreak) delete convertedAttributes.killstreak; diff --git a/src/parseString/Attributes/getEffect.ts b/src/parseString/Attributes/getEffect.ts index a7d4284..cefaa22 100644 --- a/src/parseString/Attributes/getEffect.ts +++ b/src/parseString/Attributes/getEffect.ts @@ -69,7 +69,7 @@ const HAT_NAME_EXCEPTIONS: [string, string][] = [ ['Accursed Apparition', 'Accursed'], ['Taunt: The Hot Wheeler', 'Hot'], ['Frostbite Bonnet', 'Frostbite'], - ['Cool Warm Sweater', 'Cool'] + ['Cool Warm Sweater', 'Cool'], ]; function isException(name: string, effect: string): boolean { diff --git a/src/parseString/Attributes/getItemNumber.ts b/src/parseString/Attributes/getItemNumber.ts index 76d5468..a8bc4ce 100644 --- a/src/parseString/Attributes/getItemNumber.ts +++ b/src/parseString/Attributes/getItemNumber.ts @@ -26,7 +26,7 @@ export default function (name: string): ItemNumber | null { function getType(name: string): ItemNumber['type'] { const [_, type] = (name.match(/\b(Medal|Crate|Case|Munition)\b/) || []) as [ any, - 'Medal' | 'Crate' | 'Case' | 'Munition' + 'Medal' | 'Crate' | 'Case' | 'Munition', ]; // Same thing, different name. diff --git a/src/parseString/Attributes/getQuality/isVintage.ts b/src/parseString/Attributes/getQuality/isVintage.ts index 34c1109..4672ed2 100644 --- a/src/parseString/Attributes/getQuality/isVintage.ts +++ b/src/parseString/Attributes/getQuality/isVintage.ts @@ -6,10 +6,7 @@ export default function (name: string): boolean { ); } -const VINTAGE_EXCEPTIONS = [ - 'Vintage Merryweather', - 'Vintage Tyrolean', -]; +const VINTAGE_EXCEPTIONS = ['Vintage Merryweather', 'Vintage Tyrolean']; function isVintageException(name: string): boolean { return VINTAGE_EXCEPTIONS.some((exception) => name.includes(exception)); diff --git a/src/parseString/Attributes/getUsableItem.ts b/src/parseString/Attributes/getUsableItem.ts index 82ebbf2..a9ea125 100644 --- a/src/parseString/Attributes/getUsableItem.ts +++ b/src/parseString/Attributes/getUsableItem.ts @@ -53,9 +53,9 @@ function isStrangifierChemistrySet(name: string): boolean { const KIT_EXCEPTIONS = [ "Killer's Kit", - "Coffin Kit", - "Summer Starter Kit", - "Chiromancer's Kit" + 'Coffin Kit', + 'Summer Starter Kit', + "Chiromancer's Kit", ]; function getItemIfTarget(name: string): string | void { @@ -68,9 +68,11 @@ function getItemIfTarget(name: string): string | void { return; } - return KIT_EXCEPTIONS.some((exception) => name.includes(exception)) ? undefined : 'Kit'; + return KIT_EXCEPTIONS.some((exception) => name.includes(exception)) + ? undefined + : 'Kit'; } function isChemistrySet(name: string): boolean { - return name.includes(' Chemistry Set') ; + return name.includes(' Chemistry Set'); } diff --git a/src/parseString/Attributes/isFestivized.ts b/src/parseString/Attributes/isFestivized.ts index 33004c3..f535419 100644 --- a/src/parseString/Attributes/isFestivized.ts +++ b/src/parseString/Attributes/isFestivized.ts @@ -1,3 +1,5 @@ export default function (name: string): boolean { - return name.includes('Festivized ') && !name.includes('Festivized Formation'); + return ( + name.includes('Festivized ') && !name.includes('Festivized Formation') + ); } diff --git a/src/shared/getTexture.ts b/src/shared/getTexture.ts index d65cedf..3ebe76c 100644 --- a/src/shared/getTexture.ts +++ b/src/shared/getTexture.ts @@ -2,13 +2,9 @@ import isNumber from '../util/isNumber'; import { ISchema } from '../types/schema'; -const TEXTURE_EXCEPTIONS = [ - ['Health and Hell', 'Health and Hell (Green)'], -]; +const TEXTURE_EXCEPTIONS = [['Health and Hell', 'Health and Hell (Green)']]; -const TEXTURE_TO_EFFECT_EXCEPTIONS = [ - ['Rainbow', 'Rainbow Reverie'], -] +const TEXTURE_TO_EFFECT_EXCEPTIONS = [['Rainbow', 'Rainbow Reverie']]; /** * Iterates over effects object to get matching effect. diff --git a/src/stringify.ts b/src/stringify.ts index 631171b..6309e75 100644 --- a/src/stringify.ts +++ b/src/stringify.ts @@ -128,7 +128,7 @@ export default function ( ? getOutput( schema.getName(output), schema.getQualityName(outputQuality as number) - ) + ) : schema.getName(target as string) } `; } @@ -189,7 +189,10 @@ function canAddKillstreak( } function isKillstreakKitOrFabricator(name: string, target?: string): boolean { - return !!(target && (name.includes(' Kit') || name.includes(' Fabricator'))); // This checks for fabricator too. + return !!( + target && + (name.includes(' Kit') || name.includes(' Fabricator')) + ); // This checks for fabricator too. } function isUniqueHat( diff --git a/src/toSKU/guards.ts b/src/toSKU/guards.ts index c5f5bcd..b6f7c78 100644 --- a/src/toSKU/guards.ts +++ b/src/toSKU/guards.ts @@ -1,8 +1,6 @@ import { SKUAttributes } from '../types'; -export function hasTargetDefindex( - attributes: SKUAttributes -): attributes is { +export function hasTargetDefindex(attributes: SKUAttributes): attributes is { targetDefindex: number; defindex: number; quality: number; @@ -11,9 +9,7 @@ export function hasTargetDefindex( return Object.prototype.hasOwnProperty.call(attributes, 'targetDefindex'); } -export function hasOutputDefindex( - attributes: SKUAttributes -): attributes is { +export function hasOutputDefindex(attributes: SKUAttributes): attributes is { outputDefindex: number; outputQuality: number; defindex: number; @@ -23,9 +19,7 @@ export function hasOutputDefindex( return Object.prototype.hasOwnProperty.call(attributes, 'outputDefindex'); } -export function hasOutputQuality( - attributes: SKUAttributes -): attributes is { +export function hasOutputQuality(attributes: SKUAttributes): attributes is { outputQuality: number; defindex: number; quality: number; diff --git a/src/types/econ.ts b/src/types/econ.ts index 3b946a4..a6b3c59 100644 --- a/src/types/econ.ts +++ b/src/types/econ.ts @@ -1,19 +1,19 @@ export type EconOptions = { /** * Uses defined from wiki link econ item has. - * + * * Defaults to false. */ useTrueDefindex?: boolean; /** * Retrieves item number from fraudwarning if item has been renamed. - * + * * Defaults to false. */ itemNumberFromFraudWarning?: boolean; /** * Retrieves crate number for crates. - * + * * Defaults to false. */ retrieveCrateNumber?: boolean; diff --git a/src/types/index.ts b/src/types/index.ts index 197649e..1055d24 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -138,7 +138,7 @@ export type EconItem = { market_name: string; market_hash_name: string; tags: EconTag[]; - app_data?: { def_index: number, quality: number, quantity?: string }; + app_data?: { def_index: number; quality: number; quantity?: string }; type: string; tradable: number | boolean; diff --git a/src/types/schema.ts b/src/types/schema.ts index 1870f91..c08cc2b 100644 --- a/src/types/schema.ts +++ b/src/types/schema.ts @@ -1,7 +1,12 @@ export type NameToDefindex = { [name: string]: number }; export type DefindexToName = { [defindex: number]: string }; export type SchemaEnum = NameToDefindex & DefindexToName; -export type ItemsGame = { items: Record } +export type ItemsGame = { + items: Record< + string, + { static_attrs?: { 'set supply crate series'?: string } } + >; +}; /** * Injectable schema interface.