@jeremyckahn/farmhand 1.19.21 → 1.19.22

package/src/handlers/{ui-events.tsx → ui-events.js}

@@ -50,7 +50,6 @@ export default {
    * @param {number} [howMany=1]
    */
   handleItemPurchaseClick(item, howMany = 1) {
-    // @ts-expect-error
     this.purchaseItem(item, howMany)
   },
 
@@ -59,7 +58,6 @@ export default {
    * @param {number} [howMany=1]
    */
   handleMakeRecipeClick(recipe, howMany = 1) {
-    // @ts-expect-error
     this.makeRecipe(recipe, howMany)
   },
 
@@ -68,7 +66,6 @@ export default {
    * @param {number} [howMany=1]
    */
   handleMakeFermentationRecipeClick(fermentationRecipe, howMany = 1) {
-    // @ts-expect-error
     this.makeFermentationRecipe(fermentationRecipe, howMany)
   },
 
@@ -77,7 +74,6 @@ export default {
    * @param {number} [howMany=1]
    */
   handleMakeWineClick(grape, howMany = 1) {
-    // @ts-expect-error
     this.makeWine(grape, howMany)
   },
 
@@ -85,7 +81,6 @@ export default {
    * @param {keg} keg
    */
   handleSellKegClick(keg) {
-    // @ts-expect-error
     this.sellKeg(keg)
   },
 
@@ -93,7 +88,6 @@ export default {
    * @param {keg} keg
    */
   handleThrowAwayKegClick(keg) {
-    // @ts-expect-error
     this.removeKegFromCellar(keg.id)
   },
 
@@ -101,7 +95,6 @@ export default {
    * @param {farmhand.upgradesMetadatum} upgrade
    */
   handleUpgradeTool(upgrade) {
-    // @ts-expect-error
     this.upgradeTool(upgrade)
   },
 
@@ -109,7 +102,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowPurchaseClick(cow) {
-    // @ts-expect-error
     this.purchaseCow(cow)
   },
 
@@ -117,7 +109,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowSellClick(cow) {
-    // @ts-expect-error
     this.sellCow(cow)
   },
 
@@ -125,7 +116,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowTradeClick(cow) {
-    // @ts-expect-error
     this.tradeForPeerCow(cow)
   },
 
@@ -134,7 +124,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowAutomaticHugChange({ target: { checked } }, cow) {
-    // @ts-expect-error
     this.changeCowAutomaticHugState(cow, checked)
   },
 
@@ -144,7 +133,6 @@ export default {
    */
   handleCowBreedChange({ target }, cow) {
     const { checked } = target
-    // @ts-expect-error
     this.changeCowBreedingPenResident(cow, checked)
   },
 
@@ -152,7 +140,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowHugClick(cow) {
-    // @ts-expect-error
     this.hugCow(cow.id)
   },
 
@@ -160,7 +147,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowOfferClick(cow) {
-    // @ts-expect-error
     this.offerCow(cow.id)
   },
 
@@ -168,7 +154,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowWithdrawClick(cow) {
-    // @ts-expect-error
     this.withdrawCow(cow.id)
   },
 
@@ -178,7 +163,6 @@ export default {
    */
   handleCowNameInputChange({ target }, cow) {
     const { value } = target
-    // @ts-expect-error
     this.changeCowName(cow.id, value)
   },
 
@@ -187,7 +171,6 @@ export default {
    * @param {number} [howMany=1]
    */
   handleItemSellClick(item, howMany = 1) {
-    // @ts-expect-error
     this.sellItem(item, howMany)
   },
 
@@ -196,9 +179,8 @@ export default {
    */
   handleViewChange({ target }) {
     const { value } = target
-    // @ts-expect-error
     this.setState({
-      stageFocus: /** @type {farmhand.stageFocusType} */ value,
+      stageFocus: /** @type {farmhand.stageFocusType} */ (value),
     })
   },
 
@@ -206,7 +188,6 @@ export default {
    * @param {farmhand.stageFocusType} stageFocus
    */
   handleViewChangeButtonClick(stageFocus) {
-    // @ts-expect-error
     this.setState({ stageFocus })
   },
 
@@ -214,10 +195,10 @@ export default {
    * @param {farmhand.fieldMode} selectedFieldMode
    */
   handleFieldModeSelect(selectedFieldMode) {
-    // @ts-expect-error
     this.setState(({ selectedItemId }) => ({
       selectedItemId:
         selectedFieldMode !== PLANT ||
+        // @ts-expect-error
         TOOLBELT_FIELD_MODES.has(selectedFieldMode)
           ? ''
           : selectedItemId,
@@ -229,7 +210,6 @@ export default {
    * @param {item} item
    */
   handleItemSelectClick({ id, enablesFieldMode }) {
-    // @ts-expect-error
     this.setState({
       fieldMode: enablesFieldMode,
       selectedItemId: id,
@@ -245,32 +225,23 @@ export default {
       fieldMode: fieldModeValue,
       hoveredPlotRangeSize: rangeRadius,
       selectedItemId,
-      // @ts-expect-error
     } = this.state
 
     if (fieldModeValue === PLANT) {
-      // @ts-expect-error
       this.forRange(plantInPlot, rangeRadius, x, y, selectedItemId)
     } else if (fieldModeValue === HARVEST) {
-      // @ts-expect-error
       this.forRange(harvestPlot, rangeRadius, x, y)
     } else if (fieldModeValue === MINE) {
-      // @ts-expect-error
       this.forRange(minePlot, rangeRadius, x, y)
     } else if (fieldModeValue === CLEANUP) {
-      // @ts-expect-error
       this.forRange(clearPlot, rangeRadius, x, y)
     } else if (fieldModeValue === WATER) {
-      // @ts-expect-error
       this.forRange(waterPlot, rangeRadius, x, y)
     } else if (fieldModeValue === FERTILIZE) {
-      // @ts-expect-error
       this.forRange(fertilizePlot, rangeRadius, x, y)
     } else if (fieldModeValue === SET_SPRINKLER) {
-      // @ts-expect-error
       this.setSprinkler(x, y)
     } else if (fieldModeValue === SET_SCARECROW) {
-      // @ts-expect-error
       this.setScarecrow(x, y)
     }
   },
@@ -279,18 +250,15 @@ export default {
    * @param {number} range
    */
   handleFieldActionRangeChange(range) {
-    // @ts-expect-error
     this.setState(() => ({ hoveredPlotRangeSize: range }))
   },
 
   handleClickEndDayButton() {
-    // @ts-expect-error
     this.incrementDay()
 
     // Prevent the player from spamming the End Day button
     // https://www.reddit.com/r/incremental_games/comments/jusn9i/farmhand_updates_for_November_2020/gcmi6x6/?context=3
-    const activeElement = /** @type {HTMLElement} */ document.activeElement
-    // @ts-expect-error
+    const activeElement = /** @type {HTMLElement} */ (document.activeElement)
     activeElement.blur()
   },
 
@@ -298,17 +266,14 @@ export default {
    * @param {number} amount
    */
   handleAddMoneyClick(amount) {
-    // @ts-expect-error
     this.setState(({ money }) => ({ money: moneyTotal(money, amount) }))
   },
 
   handleClearPersistedDataClick() {
-    // @ts-expect-error
     this.clearPersistedData()
   },
 
   handleWaterAllPlotsClick() {
-    // @ts-expect-error
     this.waterAllPlots(this.state)
   },
 
@@ -316,7 +281,6 @@ export default {
    * @param {number} fieldId
    */
   handleFieldPurchase(fieldId) {
-    // @ts-expect-error
     this.purchaseField(fieldId)
   },
 
@@ -324,7 +288,6 @@ export default {
    * @param {number} forestId
    */
   handleForestPurchase(forestId) {
-    // @ts-expect-error
     this.purchaseForest(forestId)
   },
 
@@ -332,7 +295,6 @@ export default {
    * @param {number} combineId
    */
   handleCombinePurchase(combineId) {
-    // @ts-expect-error
     this.purchaseCombine(combineId)
   },
 
@@ -340,7 +302,6 @@ export default {
    * @param {number} composterId
    */
   handleComposterPurchase(composterId) {
-    // @ts-expect-error
     this.purchaseComposter(composterId)
   },
 
@@ -348,7 +309,6 @@ export default {
    * @param {number} smelterId
    */
   handleSmelterPurchase(smelterId) {
-    // @ts-expect-error
     this.purchaseSmelter(smelterId)
   },
 
@@ -356,7 +316,6 @@ export default {
    * @param {number} cowPenId
    */
   handleCowPenPurchase(cowPenId) {
-    // @ts-expect-error
     this.purchaseCowPen(cowPenId)
   },
 
@@ -364,32 +323,27 @@ export default {
    * @param {number} cellarId
    */
   handleCellarPurchase(cellarId) {
-    // @ts-expect-error
     this.purchaseCellar(cellarId)
   },
 
   handleStorageExpansionPurchase() {
-    // @ts-expect-error
     this.purchaseStorageExpansion()
   },
 
   /**
    * @param {boolean} [setOpen]
    */
-  handleMenuToggle(setOpen = /** @type {boolean | undefined} */ undefined) {
-    // @ts-expect-error
+  handleMenuToggle(setOpen = /** @type {boolean | undefined} */ (undefined)) {
     this.setState(({ isMenuOpen }) => ({
       isMenuOpen: setOpen == null ? !isMenuOpen : setOpen,
     }))
   },
 
   handleClickNextMenuButton() {
-    // @ts-expect-error
     this.focusNextView()
   },
 
   handleClickPreviousMenuButton() {
-    // @ts-expect-error
     this.focusPreviousView()
   },
 
@@ -397,7 +351,6 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowSelect(cow) {
-    // @ts-expect-error
     this.selectCow(cow)
   },
 
@@ -405,14 +358,11 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowClick(cow) {
-    // @ts-expect-error
     this.selectCow(cow)
-    // @ts-expect-error
     this.hugCow(cow.id)
   },
 
   handleCowPenUnmount() {
-    // @ts-expect-error
     this.setState({ selectedCowId: '' })
   },
 
@@ -420,20 +370,16 @@ export default {
    * @param {farmhand.dialogView} selectedDialogView
    */
   handleClickDialogViewButton(selectedDialogView) {
-    // @ts-expect-error
     this.openDialogView(selectedDialogView)
   },
 
   handleCloseDialogView() {
-    // @ts-expect-error
     if (this.state.isAwaitingCowTradeRequest) return
 
-    // @ts-expect-error
     this.closeDialogView()
   },
 
   handleDialogViewExited() {
-    // @ts-expect-error
     this.setState({ currentDialogView: dialogView.NONE })
   },
 
@@ -441,7 +387,6 @@ export default {
    * @param {number} paydownAmount
    */
   handleClickLoanPaydownButton(paydownAmount) {
-    // @ts-expect-error
     this.adjustLoan(-paydownAmount)
   },
 
@@ -449,13 +394,11 @@ export default {
    * @param {number} loanAmount
    */
   handleClickTakeOutLoanButton(loanAmount) {
-    // @ts-expect-error
     this.adjustLoan(loanAmount)
   },
 
   handleExportDataClick() {
     const blob = new Blob(
-      // @ts-expect-error
       [JSON.stringify(reduceByPersistedKeys(this.state), null, 2)],
       {
         type: 'application/json;charset=utf-8',
@@ -476,8 +419,7 @@ export default {
 
     fileReader.addEventListener('loadend', eImport => {
       try {
-        const target = /** @type {FileReader} */ eImport.target
-        // @ts-expect-error
+        const target = /** @type {FileReader} */ (eImport.target)
         const json = String(target.result)
         const parsedJson = JSON.parse(json)
         const transformedStateData = transformStateDataForImport(parsedJson)
@@ -485,29 +427,24 @@ export default {
 
         if (
           Object.keys(state).some(
-            // @ts-expect-error
             key => typeof this.state[key] !== typeof state[key]
           )
         ) {
           throw new Error(INVALID_DATA_PROVIDED)
         }
 
-        // @ts-expect-error
         this.setState({
           ...transformStateDataForImport({
-            // @ts-expect-error
             ...this.createInitialState(),
             ...state,
           }),
           hasBooted: true,
         })
 
-        // @ts-expect-error
         this.showNotification('Data loaded!', 'success')
       } catch (e) {
         console.error(e)
-        // @ts-expect-error
-        this.showNotification(/** @type {Error} */ e.message, 'error')
+        this.showNotification(/** @type {Error} */ (e).message, 'error')
       }
     })
 
@@ -515,9 +452,7 @@ export default {
   },
 
   async handleSaveButtonClick() {
-    // @ts-expect-error
     await this.persistState()
-    // @ts-expect-error
     this.showNotification(PROGRESS_SAVED_MESSAGE, 'info')
   },
 
@@ -525,12 +460,10 @@ export default {
    * @param {string} farmName
    */
   handleFarmNameUpdate(farmName) {
-    // @ts-expect-error
     this.setState({ farmName })
   },
 
   handleCombineEnabledChange(_e, enableCombine) {
-    // @ts-expect-error
     this.setState({ isCombineEnabled: enableCombine })
   },
 
@@ -538,33 +471,26 @@ export default {
     _e,
     useAlternateEndDayButtonPosition
   ) {
-    // @ts-expect-error
     this.setState({ useAlternateEndDayButtonPosition })
   },
 
   handleAllowCustomPeerCowNamesChange(_e, allowCustomPeerCowNames) {
-    // @ts-expect-error
     this.setState({ allowCustomPeerCowNames })
   },
 
   handleShowHomeScreenChange(_e, showHomeScreen) {
-    // @ts-expect-error
     if (this.state.stageFocus === stageFocusType.HOME && !showHomeScreen) {
-      // @ts-expect-error
       this.focusNextView()
     }
 
-    // @ts-expect-error
     this.setState({ showHomeScreen })
   },
 
   handleShowNotificationsChange({ target: { checked } }) {
-    // @ts-expect-error
     this.setState({ showNotifications: checked })
   },
 
   handleClickNotificationIndicator() {
-    // @ts-expect-error
     this.openDialogView(dialogView.FARMERS_LOG)
   },
 
@@ -573,11 +499,9 @@ export default {
    */
   handleOnlineToggleChange(goOnline) {
     if (!goOnline) {
-      // @ts-expect-error
       this.showNotification(DISCONNECTING_FROM_SERVER, 'info')
     }
 
-    // @ts-expect-error
     this.setState(({ room }) =>
       goOnline
         ? {
@@ -594,7 +518,6 @@ export default {
    * @param {string} room
    */
   handleRoomChange(room) {
-    // @ts-expect-error
     this.setState(() => ({
       room,
       redirect: `/online/${encodeURIComponent(room.trim() || DEFAULT_ROOM)}`,
@@ -602,7 +525,6 @@ export default {
   },
 
   handleActivePlayerButtonClick() {
-    // @ts-expect-error
     this.openDialogView(dialogView.ONLINE_PEERS)
   },
 
@@ -618,13 +540,11 @@ export default {
       randomNumberService.unseedRandomNumber()
       queryParams.delete('seed')
 
-      // @ts-expect-error
       this.showNotification('Random seed reset', 'info')
     } else {
       randomNumberService.seedRandomNumber(trimmedSeed)
       queryParams.set('seed', trimmedSeed)
 
-      // @ts-expect-error
       this.showNotification(`Random seed set to "${trimmedSeed}"`, 'success')
     }
 
@@ -639,7 +559,6 @@ export default {
    * @param {boolean} isChatOpen
    */
   handleChatRoomOpenStateChange(isChatOpen) {
-    // @ts-expect-error
     this.setState({ isChatOpen })
   },
 
@@ -647,7 +566,6 @@ export default {
    * @param {(reloadPage?: boolean) => Promise<void>} updateServiceWorker
    */
   handleGameUpdateAvailable(updateServiceWorker) {
-    // @ts-expect-error
     this.showNotification(UPDATE_AVAILABLE, 'success', () => {
       updateServiceWorker(true)
     })

package/src/handlers/{ui-events.test.ts → ui-events.test.js}

@@ -156,7 +156,6 @@ describe('UI Event Handlers', () => {
         enablesFieldMode: fieldMode.PLANT,
       })
 
-      // @ts-expect-error
       handler(mockItem)
 
       expect(mockContext.setState).toHaveBeenCalledWith({
@@ -184,7 +183,6 @@ describe('UI Event Handlers', () => {
     test('opens menu when explicitly requested', () => {
       const handler = uiEventHandlers.handleMenuToggle.bind(mockContext)
 
-      // @ts-expect-error
       handler(true)
 
       const stateUpdater = mockContext.setState.mock.calls[0][0]

package/src/{index.tsx → index.js}

@@ -10,9 +10,7 @@ import { HashRouter as Router, Route } from 'react-router-dom'
 import './index.sass'
 import Farmhand from './components/Farmhand/index.js'
 import { features } from './config.js'
-// @ts-expect-error
 import '@fontsource/francois-one'
-// @ts-expect-error
 import '@fontsource/public-sans'
 
 // eslint-disable-next-line no-unused-vars

package/src/scripts/{generate-crop-table.ts → generate-crop-table.js}

@@ -17,8 +17,10 @@ function getCropImage(seedItem, cropItem) {
   if (Array.isArray(seedItem.growsInto)) {
     return `![${
       cropItem.name
-    }](https://raw.githubusercontent.com/jeremyckahn/farmhand/main/src/img/items/${cropItem.imageId ||
-      cropItem.id}.png)`
+    }](https://raw.githubusercontent.com/jeremyckahn/farmhand/main/src/img/items/${
+      // @ts-expect-error
+      cropItem.imageId || cropItem.id
+    }.png)`
   } else {
     return `![${cropItem.name}](https://raw.githubusercontent.com/jeremyckahn/farmhand/main/src/img/items/${cropItem.id}.png)`
   }
@@ -69,17 +71,14 @@ for (const level of levels) {
     if (growsInto) {
       const seedItem = item
       if (Array.isArray(growsInto)) {
-        // @ts-expect-error
         for (const cropItemId of growsInto) {
           const cropItem = itemsMap[cropItemId]
 
-          // @ts-expect-error
           rows.push(getCropRow(id, seedItem, cropItem))
         }
       } else {
         const cropItem = itemsMap[growsInto]
 
-        // @ts-expect-error
         rows.push(getCropRow(id, seedItem, cropItem))
       }
     }

package/src/services/{cellar.test.ts → cellar.test.js}

@@ -8,6 +8,7 @@ import { cellarService } from './cellar.js'
 const mockUuid = 'abc123'
 
 beforeEach(() => {
+  // @ts-expect-error
   vitest.spyOn(cellarService, '_uuid').mockReturnValue(mockUuid)
 })
 
@@ -17,7 +18,6 @@ describe('CellarService', () => {
       const keg = cellarService.generateKeg(pumpkin)
 
       expect(keg).toEqual({
-        // @ts-expect-error
         daysUntilMature: pumpkin.daysToFerment,
         itemId: pumpkin.id,
         id: mockUuid,

package/src/services/{wine.ts → wine.js}

@@ -45,7 +45,6 @@ export class WineService {
   getMaxWineYield = ({ grape, inventory, cellarInventory, cellarSize }) => {
     const {
       [grape.id]: grapeQuantityInInventory = 0,
-      // @ts-expect-error
       [itemsMap.yeast.id]: yeastQuantityInInventory = 0,
     } = getInventoryQuantityMap(inventory)
 

package/src/shell/{notifications.test.ts → notifications.test.js}

@@ -21,19 +21,17 @@ describe('notifications', () => {
 
     const carrotItem = await getItemByName('Carrot')
     const carrotInput = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ carrotItem
+      /** @type {HTMLElement} */ (carrotItem)
     ).getByDisplayValue('1')
     await userEvent.type(carrotInput, '10')
     const carrotSellButton = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ carrotItem
+      /** @type {HTMLElement} */ (carrotItem)
     ).getByText('Sell')
     await userEvent.click(carrotSellButton)
     const notification = await screen.findByRole('alert')
 
     expect(
-      within(/** @type {HTMLElement} */ notification).getByText('Carrot Soup')
+      within(/** @type {HTMLElement} */ (notification)).getByText('Carrot Soup')
     ).toBeInTheDocument()
   })
 
@@ -58,29 +56,23 @@ describe('notifications', () => {
     const carrotItem = await getItemByName('Carrot')
 
     const cornInput = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ cornItem
+      /** @type {HTMLElement} */ (cornItem)
     ).getByDisplayValue('1')
     const spinachInput = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ spinachItem
+      /** @type {HTMLElement} */ (spinachItem)
     ).getByDisplayValue('1')
     const carrotInput = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ carrotItem
+      /** @type {HTMLElement} */ (carrotItem)
     ).getByDisplayValue('1')
 
     const cornSellButton = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ cornItem
+      /** @type {HTMLElement} */ (cornItem)
     ).getByText('Sell')
     const spinachSellButton = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ spinachItem
+      /** @type {HTMLElement} */ (spinachItem)
     ).getByText('Sell')
     const carrotSellButton = within(
-      // @ts-expect-error
-      /** @type {HTMLElement} */ carrotItem
+      /** @type {HTMLElement} */ (carrotItem)
     ).getByText('Sell')
 
     await userEvent.type(cornInput, '6')
@@ -97,10 +89,12 @@ describe('notifications', () => {
 
     const notification = await screen.findByRole('alert')
     expect(
-      within(/** @type {HTMLElement} */ notification).getByText('Carrot Soup')
+      within(/** @type {HTMLElement} */ (notification)).getByText('Carrot Soup')
     ).toBeInTheDocument()
     expect(
-      within(/** @type {HTMLElement} */ notification).getByText('Summer Salad')
+      within(/** @type {HTMLElement} */ (notification)).getByText(
+        'Summer Salad'
+      )
     ).toBeInTheDocument()
   })
 })