@jeremyckahn/farmhand 1.19.21 → 1.19.22

package/src/components/Farmhand/{Farmhand.tsx → Farmhand.js}

@@ -116,7 +116,6 @@ const { CLEANUP, HARVEST, MINE, OBSERVE, WATER, PLANT } = fieldMode
 // Utility object for reuse in no-ops to save on memory
 const emptyObject = Object.freeze({})
 
-// @ts-expect-error
 export const computePlayerInventory = memoize(
   /**
    * @param {{ id: globalThis.farmhand.item['id'], quantity: number }[]} inventory
@@ -131,7 +130,6 @@ export const computePlayerInventory = memoize(
     }))
 )
 
-// @ts-expect-error
 export const getFieldToolInventory = memoize(
   /**
    * @param {globalThis.farmhand.state['inventory']} inventory
@@ -149,7 +147,6 @@ export const getFieldToolInventory = memoize(
       .map(({ id, quantity }) => ({ ...itemsMap[id], quantity }))
 )
 
-// @ts-expect-error
 export const getPlantableCropInventory = memoize(
   /**
    * @param {globalThis.farmhand.state['inventory']} inventory
@@ -257,7 +254,6 @@ export default class Farmhand extends FarmhandReducers {
       viewList.unshift(HOME)
     }
 
-    // @ts-expect-error
     if (this.isForestUnlocked && features.FOREST) {
       viewList.push(FOREST)
     }
@@ -308,12 +304,12 @@ export default class Farmhand extends FarmhandReducers {
    * @returns {farmhand.state}
    */
   createInitialState() {
-    return /** @type {farmhand.state} */ {
+    return /** @type {farmhand.state} */ ({
       activePlayers: null,
       allowCustomPeerCowNames: false,
       cellarInventory: [],
       currentDialogView:
-        /** @type {globalThis.farmhand.dialogView} */ dialogView.NONE,
+        /** @type {globalThis.farmhand.dialogView} */ (dialogView.NONE),
       completedAchievements: {},
       cowForSale: generateCow(),
       cowBreedingPen: {
@@ -332,7 +328,7 @@ export default class Farmhand extends FarmhandReducers {
       experience: 0,
       farmName: 'Unnamed',
       field: createNewField(),
-      fieldMode: /** @type {globalThis.farmhand.fieldMode} */ OBSERVE,
+      fieldMode: /** @type {globalThis.farmhand.fieldMode} */ (OBSERVE),
       forest: createNewForest(),
       getCowAccept: noop,
       getCowReject: noop,
@@ -355,7 +351,6 @@ export default class Farmhand extends FarmhandReducers {
       cellarItemsSold: {},
       isChatOpen: false,
       isDialogViewOpen: false,
-      // @ts-expect-error
       isOnline: this.props.match.path.startsWith('/online'),
       isWaitingForDayToCompleteIncrementing: false,
       learnedRecipes: {},
@@ -380,7 +375,6 @@ export default class Farmhand extends FarmhandReducers {
       recordSingleDayProfit: 0,
       revenue: 0,
       redirect: '',
-      // @ts-expect-error
       room: decodeURIComponent(this.props.match.params.room || DEFAULT_ROOM),
       sendCowAccept: noop,
       sendCowReject: noop,
@@ -395,22 +389,22 @@ export default class Farmhand extends FarmhandReducers {
       showHomeScreen: true,
       showNotifications: true,
       stageFocus:
-        /** @type {globalThis.farmhand.stageFocusType} */ stageFocusType.HOME,
+        /** @type {globalThis.farmhand.stageFocusType} */ (stageFocusType.HOME),
       todaysNotifications: [],
       todaysLosses: 0,
       todaysPurchases: {},
       todaysRevenue: 0,
       todaysStartingInventory: {},
-      toolLevels: /** @type {Record<import('../../enums.js').toolType, import('../../enums.js').toolLevel>} */ {
+      toolLevels: /** @type {Record<import('../../enums.js').toolType, import('../../enums.js').toolLevel>} */ ({
         [toolType.HOE]: toolLevel.DEFAULT,
         [toolType.SCYTHE]: toolLevel.DEFAULT,
         [toolType.SHOVEL]: toolLevel.UNAVAILABLE,
         [toolType.WATERING_CAN]: toolLevel.DEFAULT,
-      },
+      }),
       useAlternateEndDayButtonPosition: false,
       valueAdjustments: {},
       version: import.meta.env?.VITE_FARMHAND_PACKAGE_VERSION ?? '',
-    }
+    })
   }
 
   async initializeNewGame() {
@@ -420,7 +414,6 @@ export default class Farmhand extends FarmhandReducers {
       historicalValueAdjustments: [],
     }))
 
-    // @ts-expect-error
     this.showNotification(LOAN_INCREASED('', STANDARD_LOAN_AMOUNT), 'info')
   }
 
@@ -466,20 +459,20 @@ export default class Farmhand extends FarmhandReducers {
       previousView: this.focusPreviousView.bind(this),
       selectHoe: () =>
         this.handlers.handleFieldModeSelect(
-          /** @type {globalThis.farmhand.fieldMode} */ CLEANUP
+          /** @type {globalThis.farmhand.fieldMode} */ (CLEANUP)
         ),
       selectScythe: () =>
         this.handlers.handleFieldModeSelect(
-          /** @type {globalThis.farmhand.fieldMode} */ HARVEST
+          /** @type {globalThis.farmhand.fieldMode} */ (HARVEST)
         ),
       selectWateringCan: () =>
         this.handlers.handleFieldModeSelect(
-          /** @type {globalThis.farmhand.fieldMode} */ WATER
+          /** @type {globalThis.farmhand.fieldMode} */ (WATER)
         ),
       selectShovel: () => {
         if (this.state.toolLevels[toolType.SHOVEL] !== toolLevel.UNAVAILABLE) {
           this.handlers.handleFieldModeSelect(
-            /** @type {globalThis.farmhand.fieldMode} */ MINE
+            /** @type {globalThis.farmhand.fieldMode} */ (MINE)
           )
         }
       },
@@ -513,14 +506,13 @@ export default class Farmhand extends FarmhandReducers {
   }
 
   async componentDidMount() {
-    // @ts-expect-error
     const state = await this.props.localforage.getItem('state')
 
     if (state) {
       const sanitizedState = transformStateDataForImport({
         ...this.createInitialState(),
         // eslint-disable-next-line
-        .../** @type {Partial<farmhand.state>} */ state,
+        .../** @type {Partial<farmhand.state>} */ (state),
       })
       const { isCombineEnabled, newDayNotifications } = sanitizedState
 
@@ -528,11 +520,9 @@ export default class Farmhand extends FarmhandReducers {
         newDayNotifications.forEach(({ message, severity }) => {
           // Defer these notifications so that notistack doesn't swallow all
           // but the last one.
-          // @ts-expect-error
           setTimeout(() => this.showNotification(message, severity), 0)
 
           if (isCombineEnabled) {
-            // @ts-expect-error
             this.forRange(reducers.harvestPlot, Infinity, 0, 0)
           }
         })
@@ -567,7 +557,6 @@ export default class Farmhand extends FarmhandReducers {
     }
 
     const {
-      // @ts-expect-error
       match: {
         path,
         params: { room: newRoom = room },
@@ -603,7 +592,6 @@ export default class Farmhand extends FarmhandReducers {
     }
 
     if (isOnline === false && prevState.isOnline === true) {
-      // @ts-expect-error
       this.showNotification(DISCONNECTED_FROM_SERVER, 'info')
     }
 
@@ -630,7 +618,6 @@ export default class Farmhand extends FarmhandReducers {
     }
 
     if (money < prevState.money) {
-      // @ts-expect-error
       this.setState(({ todaysLosses }) => ({
         todaysLosses: moneyTotal(todaysLosses, money - prevState.money),
       }))
@@ -638,19 +625,14 @@ export default class Farmhand extends FarmhandReducers {
 
     if (peerRoom !== prevState.peerRoom) {
       if (peerRoom) {
-        // @ts-expect-error
         peerRoom.onPeerJoin(id => {
-          // @ts-expect-error
           this.addPeer(id)
         })
 
-        // @ts-expect-error
         peerRoom.onPeerLeave(id => {
-          // @ts-expect-error
           this.removePeer(id)
         })
 
-        // @ts-expect-error
         const [sendPeerMetadata, getPeerMetadataFunc] = peerRoom.makeAction(
           'peerMetadata'
         )
@@ -658,12 +640,8 @@ export default class Farmhand extends FarmhandReducers {
         getPeerMetadataFunc((
           /** @type {[object, string]} */
           ...args
-        ) =>
-          // @ts-expect-error
-          handlePeerMetadataRequest(this, ...args)
-        )
+        ) => handlePeerMetadataRequest(this, ...args))
 
-        // @ts-expect-error
         const [sendCowTradeRequest, getCowTradeRequest] = peerRoom.makeAction(
           'cowTrade'
         )
@@ -671,32 +649,21 @@ export default class Farmhand extends FarmhandReducers {
         getCowTradeRequest((
           /** @type {[object, string]} */
           ...args
-        ) =>
-          // @ts-expect-error
-          handleCowTradeRequest(this, ...args)
-        )
+        ) => handleCowTradeRequest(this, ...args))
 
-        // @ts-expect-error
         const [sendCowAccept, getCowAccept] = peerRoom.makeAction('cowAccept')
 
         getCowAccept((
           /** @type {[object, string]} */
           ...args
-        ) =>
-          // @ts-expect-error
-          handleCowTradeRequestAccept(this, ...args)
-        )
+        ) => handleCowTradeRequestAccept(this, ...args))
 
-        // @ts-expect-error
         const [sendCowReject, getCowReject] = peerRoom.makeAction('cowReject')
 
         getCowReject((
           /** @type {[object]} */
           ...args
-        ) =>
-          // @ts-expect-error
-          handleCowTradeRequestReject(this, ...args)
-        )
+        ) => handleCowTradeRequestReject(this, ...args))
 
         this.setState({
           getCowAccept,
@@ -723,7 +690,6 @@ export default class Farmhand extends FarmhandReducers {
       'showRecipeLearnedNotifications',
     ].forEach(fn => this[fn](prevState))
 
-    // @ts-expect-error
     this.state.sendPeerMetadata?.(this.peerMetadata)
   }
 
@@ -754,13 +720,9 @@ export default class Farmhand extends FarmhandReducers {
   tradeForPeerCow(peerPlayerCow) {
     this.setState(state => {
       const {
-        // @ts-expect-error
         cowIdOfferedForTrade,
-        // @ts-expect-error
         cowInventory,
-        // @ts-expect-error
         peers,
-        // @ts-expect-error
         sendCowTradeRequest,
       } = state
 
@@ -769,7 +731,6 @@ export default class Farmhand extends FarmhandReducers {
       const { ownerId } = peerPlayerCow
 
       const [peerId] =
-        // @ts-expect-error
         Object.entries(peers).find(([, peer]) => peer?.playerId === ownerId) ??
         []
 
@@ -817,7 +778,6 @@ export default class Farmhand extends FarmhandReducers {
 
   handleCowTradeTimeout = () => {
     if (typeof this.state.cowTradeTimeoutId === 'number') {
-      // @ts-expect-error
       this.showNotification(REQUESTED_COW_TRADE_UNAVAILABLE, 'error')
       this.setState({
         cowTradeTimeoutId: null,
@@ -829,10 +789,8 @@ export default class Farmhand extends FarmhandReducers {
   }
 
   async clearPersistedData() {
-    // @ts-expect-error
     await this.props.localforage.clear()
 
-    // @ts-expect-error
     this.showNotification(DATA_DELETED)
   }
 
@@ -843,7 +801,6 @@ export default class Farmhand extends FarmhandReducers {
       return
     }
 
-    // @ts-expect-error
     this.showNotification(CONNECTING_TO_SERVER, 'info')
 
     try {
@@ -852,7 +809,6 @@ export default class Farmhand extends FarmhandReducers {
         peers: {},
       })
 
-      // @ts-expect-error
       this.state.peerRoom?.leave()
 
       const { valueAdjustments } = await getData(endpoints.getMarketData, {
@@ -882,14 +838,12 @@ export default class Farmhand extends FarmhandReducers {
         ),
       })
 
-      // @ts-expect-error
       this.showNotification(CONNECTED_TO_ROOM('', room), 'success')
     } catch (e) {
       // TODO: Add some reasonable fallback behavior in case the server request
       // fails. Possibility: Regenerate valueAdjustments and notify the user
       // they are offline.
 
-      // @ts-expect-error
       this.showNotification(SERVER_ERROR, 'error')
 
       console.error(e)
@@ -915,7 +869,6 @@ export default class Farmhand extends FarmhandReducers {
 
     this.setState(() => ({
       heartbeatTimeoutId: setTimeout(async () => {
-        // @ts-expect-error
         this.setState(({ money, activePlayers }) => ({
           activePlayers,
           money: moneyTotal(money, activePlayers),
@@ -934,7 +887,6 @@ export default class Farmhand extends FarmhandReducers {
       inventorySpaceRemaining(prevState) > 0 &&
       inventorySpaceRemaining(this.state) <= 0
     ) {
-      // @ts-expect-error
       this.showNotification(INVENTORY_FULL_NOTIFICATION, 'warning')
     }
   }
@@ -947,16 +899,13 @@ export default class Farmhand extends FarmhandReducers {
 
     Object.keys(this.state.learnedRecipes).forEach(recipeId => {
       if (!previousLearnedRecipes.hasOwnProperty(recipeId)) {
-        // @ts-expect-error
         learnedRecipes.push(recipesMap[recipeId])
       }
     })
 
     if (learnedRecipes.length > 1) {
-      // @ts-expect-error
       this.showNotification(RECIPES_LEARNED('', learnedRecipes))
     } else if (learnedRecipes.length === 1) {
-      // @ts-expect-error
       this.showNotification(RECIPE_LEARNED('', learnedRecipes[0]))
     }
   }
@@ -966,7 +915,6 @@ export default class Farmhand extends FarmhandReducers {
    * @return {Promise}
    */
   persistState(overrides = {}) {
-    // @ts-expect-error
     return this.props.localforage.setItem(
       'state',
       reduceByPersistedKeys({
@@ -1015,13 +963,11 @@ export default class Farmhand extends FarmhandReducers {
         ).valueAdjustments
 
         if (Object.keys(positions).length) {
-          // @ts-expect-error
           serverMessages.push({
             message: POSITIONS_POSTED_NOTIFICATION('', 'You', positions),
             severity: 'info',
           })
 
-          // @ts-expect-error
           broadcastedPositionMessage = POSITIONS_POSTED_NOTIFICATION(
             '',
             '',
@@ -1030,7 +976,6 @@ export default class Farmhand extends FarmhandReducers {
         }
       } catch (e) {
         // NOTE: This will get reached when there's an issue posting data to the server.
-        // @ts-expect-error
         serverMessages.push({
           message: SERVER_ERROR,
           severity: 'error',
@@ -1075,7 +1020,6 @@ export default class Farmhand extends FarmhandReducers {
       prev => {
         const nextDayState = reducers.computeStateForNextDay(prev, isFirstDay)
 
-        // @ts-expect-error
         pendingNotifications = [
           ...serverMessages,
           ...nextDayState.newDayNotifications,
@@ -1108,13 +1052,11 @@ export default class Farmhand extends FarmhandReducers {
 
           notifications
             .concat(
-              // @ts-expect-error
               isFirstDay
                 ? []
                 : [{ message: PROGRESS_SAVED_MESSAGE, severity: 'info' }]
             )
             .forEach(({ message, severity }) =>
-              // @ts-expect-error
               this.showNotification(message, severity)
             )
 
@@ -1124,13 +1066,11 @@ export default class Farmhand extends FarmhandReducers {
               await sleep(1000)
             }
 
-            // @ts-expect-error
             this.forRange(reducers.harvestPlot, Infinity, 0, 0)
           }
         } catch (e) {
           console.error(e)
 
-          // @ts-expect-error
           this.showNotification(JSON.stringify(e), 'error')
         } finally {
           this.setState(() => ({
@@ -1138,7 +1078,6 @@ export default class Farmhand extends FarmhandReducers {
           }))
 
           if (broadcastedPositionMessage) {
-            // @ts-expect-error
             this.messagePeers(broadcastedPositionMessage)
           }
         }
@@ -1162,7 +1101,6 @@ export default class Farmhand extends FarmhandReducers {
 
     const { viewList } = this
 
-    // @ts-expect-error
     this.setState(({ stageFocus }) => {
       const currentViewIndex = viewList.indexOf(stageFocus)
 
@@ -1175,7 +1113,6 @@ export default class Farmhand extends FarmhandReducers {
 
     const { viewList } = this
 
-    // @ts-expect-error
     this.setState(({ stageFocus }) => {
       const currentViewIndex = viewList.indexOf(stageFocus)
 
@@ -1195,13 +1132,11 @@ export default class Farmhand extends FarmhandReducers {
    * @param {string?} [severity]
    */
   messagePeers(message, severity) {
-    // @ts-expect-error
     this.prependPendingPeerMessage(message, severity)
   }
 
   render() {
     const {
-      // @ts-expect-error
       props: { features: propsFeatures },
       state: { redirect },
       fieldToolInventory,
@@ -1259,7 +1194,6 @@ export default class Farmhand extends FarmhandReducers {
               {redirect && <Redirect {...{ to: redirect }} />}
               <FarmhandContext.Provider
                 value={{
-                  // @ts-expect-error
                   gameState,
                   handlers,
                 }}
@@ -1385,7 +1319,6 @@ export default class Farmhand extends FarmhandReducers {
   }
 }
 
-// @ts-expect-error
 Farmhand.propTypes = {
   features: object,
   history: object,

package/src/components/FermentationRecipeList/{FermentationRecipe.tsx → FermentationRecipe.js}

@@ -38,6 +38,7 @@ export const FermentationRecipe = ({ item }) => {
   const [quantity, setQuantity] = useState(1)
 
   const inventoryQuantityMap = getInventoryQuantityMap(inventory)
+  // @ts-expect-error
   const fermentationRecipeName = FERMENTED_CROP_NAME`${item}`
   const { space: cellarSize } = PURCHASEABLE_CELLARS.get(purchasedCellar) ?? {
     space: 0,
@@ -99,12 +100,10 @@ export const FermentationRecipe = ({ item }) => {
               {integerString(inventoryQuantityMap[item.id] ?? 0)}
             </p>
             <p>
-              Units of {(itemsMap as any).salt.name} required:{' '}
-              {getSaltRequirementsForFermentationRecipe(item as any)}{' '}
-              (available:{' '}
+              Units of {itemsMap.salt.name} required:{' '}
+              {getSaltRequirementsForFermentationRecipe(item)} (available:{' '}
               <AnimatedNumber
                 {...{
-                  // @ts-expect-error
                   number: inventoryQuantityMap[itemsMap.salt.id] ?? 0,
                   formatter: integerString,
                 }}

package/src/components/FermentationRecipeList/{FermentationRecipeList.tsx → FermentationRecipeList.js}

@@ -27,12 +27,10 @@ export const FermentationRecipeList = () => {
     .filter(term => term.length > 0)
 
   const filteredCrops = cropsAvailableToFerment.filter(item => {
-    // @ts-expect-error
     const fermentationRecipeName = `${FERMENTED_CROP_NAME}${item.name}`.toLowerCase()
     return searchTerms.every(
       term =>
         fermentationRecipeName.includes(term) ||
-        // @ts-expect-error
         item.name.toLowerCase().includes(term)
     )
   })
@@ -54,7 +52,6 @@ export const FermentationRecipeList = () => {
       {filteredCrops.length > 0 && (
         <ul className="card-list">
           {filteredCrops.map(item => (
-            // @ts-expect-error
             <li key={item.id}>
               <FermentationRecipe item={item} />
             </li>

package/src/components/FermentationRecipeList/{FermentationRecipeList.test.tsx → FermentationRecipeList.test.js}

@@ -82,17 +82,14 @@ describe('FermentationRecipeList', () => {
     await userEvent.type(searchBar, 'apple')
 
     const filteredCrops = cropsAvailableToFerment.filter(item => {
-      // @ts-expect-error
       const fermentationRecipeName = `Fermented ${item.name}`.toLowerCase()
       return (
         fermentationRecipeName.includes('apple') ||
-        // @ts-expect-error
         item.name.toLowerCase().includes('apple')
       )
     })
 
     filteredCrops.forEach(crop => {
-      // @ts-expect-error
       expect(screen.getByText(crop.name)).toBeInTheDocument()
     })
 
@@ -101,7 +98,6 @@ describe('FermentationRecipeList', () => {
     )
 
     nonMatchingCrops.forEach(crop => {
-      // @ts-expect-error
       const nonMatchingElements = screen.queryAllByText(crop.name)
       expect(nonMatchingElements).toHaveLength(1)
     })
@@ -123,7 +119,6 @@ describe('FermentationRecipeList', () => {
     await userEvent.clear(searchBar)
 
     cropsAvailableToFerment.forEach(crop => {
-      // @ts-expect-error
       expect(screen.getByText(crop.name)).toBeInTheDocument()
     })
   })

package/src/components/Field/{Field.tsx → Field.js}

@@ -49,7 +49,6 @@ const fieldKeyMap = {
 }
 
 if (tools.shovel) {
-  // @ts-expect-error
   fieldKeyMap.selectShovel = tools.shovel.fieldKey
 }
 
@@ -112,14 +111,12 @@ export const MemoPlot = memo(
    * @param {number} props.y
    */
   props => {
-    // @ts-expect-error
     const { hoveredPlot, plotContent, setHoveredPlot, x, y } = props
 
     return (
       <Plot
         {...{
           hoveredPlot,
-          // @ts-expect-error
           isInHoverRange: isInHoverRange(props),
           plotContent,
           setHoveredPlot,
@@ -130,15 +127,12 @@ export const MemoPlot = memo(
     )
   },
   (prev, next) => {
-    // @ts-expect-error
     if (isInHoverRange(prev) !== isInHoverRange(next)) {
       return false
     }
 
     return (
-      // @ts-expect-error
       prev.plotContent === next.plotContent &&
-      // @ts-expect-error
       prev.hoveredPlotRangeSize === next.hoveredPlotRangeSize
     )
   }
@@ -367,6 +361,7 @@ export const Field = props => {
             'fertilize-mode': propsFieldMode === FERTILIZE,
             'harvest-mode': propsFieldMode === HARVEST,
             'mine-mode': propsFieldMode === MINE,
+            // @ts-expect-error - Unnecessary properties are omitted out of convenience
             'is-inventory-full': !doesInventorySpaceRemain({
               inventory,
               inventoryLimit,

package/src/components/Field/{Field.test.tsx → Field.test.js}

@@ -203,6 +203,7 @@ describe('MemoPlot', () => {
   beforeEach(async () => {
     const PlotModule = await import('../Plot/index.js')
     MockedPlot = PlotModule.default
+    // @ts-expect-error - MockedPlot is a vitest mock function
     MockedPlot.mockClear()
   })
 

package/src/components/Home/{Home.tsx → Home.js}

@@ -32,7 +32,6 @@ const onboardingAchievements = [
   achievementsMap['purchase-cow-pen'],
 ]
 
-// @ts-expect-error
 const getRemainingOnboardingAchievements = memoize(completedAchievements =>
   onboardingAchievements.filter(
     achievement => achievement && !completedAchievements[achievement.id]

package/src/components/Home/{SnowBackground.tsx → SnowBackground.js}

@@ -11,9 +11,7 @@ const randomInt = (min, max) => {
 // Taken from:
 // https://github.com/alampros/react-confetti/blob/484bad0a0aaddbcfcc2fb4c1a4a7eeceaa6d4879/stories/snow.story.jsx#L7-L24
 const drawSnowflake = function(ctx) {
-  // @ts-expect-error
   const numPoints = this.numPoints || randomInt(3, 4) * 2
-  // @ts-expect-error
   this.numPoints = numPoints
   // @ts-expect-error
   const innerRadius = this.radius * 0.2

package/src/components/Inventory/{Inventory.tsx → Inventory.js}

@@ -87,12 +87,10 @@ const Inventory = ({
 }) => {
   const [searchQuery, setSearchQuery] = useState('')
   const [selectedCategories, setSelectedCategories] = useState(
-    /** @type {string[]} */ []
+    /** @type {string[]} */ ([])
   )
   const toggleCategory = category => {
-    // @ts-expect-error
     setSelectedCategories(prev =>
-      // @ts-expect-error
       prev.includes(category)
         ? prev.filter(c => c !== category)
         : [...prev, category]
@@ -100,7 +98,6 @@ const Inventory = ({
   }
 
   const filteredCategories = Array.from(itemCategories.entries()).reduce(
-    // @ts-expect-error
     (filtered, [category, categoryItems]) => {
       const matchingItems = categoryItems.filter(item => {
         const mappedItem = itemsMap[item.id]
@@ -113,10 +110,8 @@ const Inventory = ({
 
       if (
         matchingItems.length &&
-        // @ts-expect-error
         (!selectedCategories.length || selectedCategories.includes(category))
       ) {
-        // @ts-expect-error
         filtered.set(category, matchingItems)
       }
       return filtered
@@ -147,7 +142,6 @@ const Inventory = ({
                   control={
                     <Checkbox
                       disabled={isPurchaseView}
-                      // @ts-expect-error
                       checked={selectedCategories.includes(key)}
                       onChange={() => toggleCategory(key)}
                     />
@@ -159,8 +153,7 @@ const Inventory = ({
           </AccordionDetails>
         </Accordion>
       )}
-      {Array.from((filteredCategories as any).entries()).map(
-        // @ts-expect-error
+      {Array.from(filteredCategories.entries()).map(
         ([category, categoryItems]) =>
           categoryItems.length ? (
             <Fragment key={category}>

package/src/components/Item/{Item.tsx → Item.js}

@@ -289,8 +289,7 @@ export const Item = ({
                 </p>
               )}
               {isPurchaseView &&
-                // @ts-expect-error
-                /** @type {globalThis.farmhand.item} */ item.growsInto && (
+                /** @type {globalThis.farmhand.item} */ (item).growsInto && (
                   <p>
                     Days to mature:{' '}
                     {getCropLifecycleDuration(