@jeremyckahn/farmhand 1.19.19 → 1.19.21

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

@@ -50,6 +50,7 @@ export default {
    * @param {number} [howMany=1]
    */
   handleItemPurchaseClick(item, howMany = 1) {
+    // @ts-expect-error
     this.purchaseItem(item, howMany)
   },
 
@@ -58,6 +59,7 @@ export default {
    * @param {number} [howMany=1]
    */
   handleMakeRecipeClick(recipe, howMany = 1) {
+    // @ts-expect-error
     this.makeRecipe(recipe, howMany)
   },
 
@@ -66,6 +68,7 @@ export default {
    * @param {number} [howMany=1]
    */
   handleMakeFermentationRecipeClick(fermentationRecipe, howMany = 1) {
+    // @ts-expect-error
     this.makeFermentationRecipe(fermentationRecipe, howMany)
   },
 
@@ -74,6 +77,7 @@ export default {
    * @param {number} [howMany=1]
    */
   handleMakeWineClick(grape, howMany = 1) {
+    // @ts-expect-error
     this.makeWine(grape, howMany)
   },
 
@@ -81,6 +85,7 @@ export default {
    * @param {keg} keg
    */
   handleSellKegClick(keg) {
+    // @ts-expect-error
     this.sellKeg(keg)
   },
 
@@ -88,6 +93,7 @@ export default {
    * @param {keg} keg
    */
   handleThrowAwayKegClick(keg) {
+    // @ts-expect-error
     this.removeKegFromCellar(keg.id)
   },
 
@@ -95,6 +101,7 @@ export default {
    * @param {farmhand.upgradesMetadatum} upgrade
    */
   handleUpgradeTool(upgrade) {
+    // @ts-expect-error
     this.upgradeTool(upgrade)
   },
 
@@ -102,6 +109,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowPurchaseClick(cow) {
+    // @ts-expect-error
     this.purchaseCow(cow)
   },
 
@@ -109,6 +117,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowSellClick(cow) {
+    // @ts-expect-error
     this.sellCow(cow)
   },
 
@@ -116,6 +125,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowTradeClick(cow) {
+    // @ts-expect-error
     this.tradeForPeerCow(cow)
   },
 
@@ -124,6 +134,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowAutomaticHugChange({ target: { checked } }, cow) {
+    // @ts-expect-error
     this.changeCowAutomaticHugState(cow, checked)
   },
 
@@ -133,6 +144,7 @@ export default {
    */
   handleCowBreedChange({ target }, cow) {
     const { checked } = target
+    // @ts-expect-error
     this.changeCowBreedingPenResident(cow, checked)
   },
 
@@ -140,6 +152,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowHugClick(cow) {
+    // @ts-expect-error
     this.hugCow(cow.id)
   },
 
@@ -147,6 +160,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowOfferClick(cow) {
+    // @ts-expect-error
     this.offerCow(cow.id)
   },
 
@@ -154,6 +168,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowWithdrawClick(cow) {
+    // @ts-expect-error
     this.withdrawCow(cow.id)
   },
 
@@ -163,6 +178,7 @@ export default {
    */
   handleCowNameInputChange({ target }, cow) {
     const { value } = target
+    // @ts-expect-error
     this.changeCowName(cow.id, value)
   },
 
@@ -171,6 +187,7 @@ export default {
    * @param {number} [howMany=1]
    */
   handleItemSellClick(item, howMany = 1) {
+    // @ts-expect-error
     this.sellItem(item, howMany)
   },
 
@@ -179,8 +196,9 @@ export default {
    */
   handleViewChange({ target }) {
     const { value } = target
+    // @ts-expect-error
     this.setState({
-      stageFocus: /** @type {farmhand.stageFocusType} */ (value),
+      stageFocus: /** @type {farmhand.stageFocusType} */ value,
     })
   },
 
@@ -188,21 +206,22 @@ export default {
    * @param {farmhand.stageFocusType} stageFocus
    */
   handleViewChangeButtonClick(stageFocus) {
+    // @ts-expect-error
     this.setState({ stageFocus })
   },
 
   /**
-   * @param {farmhand.fieldMode} fieldMode
+   * @param {farmhand.fieldMode} selectedFieldMode
    */
-  handleFieldModeSelect(fieldMode) {
+  handleFieldModeSelect(selectedFieldMode) {
+    // @ts-expect-error
     this.setState(({ selectedItemId }) => ({
       selectedItemId:
-        fieldMode !== PLANT ||
-        // @ts-expect-error
-        TOOLBELT_FIELD_MODES.has(fieldMode)
+        selectedFieldMode !== PLANT ||
+        TOOLBELT_FIELD_MODES.has(selectedFieldMode)
           ? ''
           : selectedItemId,
-      fieldMode,
+      fieldMode: selectedFieldMode,
     }))
   },
 
@@ -210,6 +229,7 @@ export default {
    * @param {item} item
    */
   handleItemSelectClick({ id, enablesFieldMode }) {
+    // @ts-expect-error
     this.setState({
       fieldMode: enablesFieldMode,
       selectedItemId: id,
@@ -222,26 +242,35 @@ export default {
    */
   handlePlotClick(x, y) {
     const {
-      fieldMode,
+      fieldMode: fieldModeValue,
       hoveredPlotRangeSize: rangeRadius,
       selectedItemId,
+      // @ts-expect-error
     } = this.state
 
-    if (fieldMode === PLANT) {
+    if (fieldModeValue === PLANT) {
+      // @ts-expect-error
       this.forRange(plantInPlot, rangeRadius, x, y, selectedItemId)
-    } else if (fieldMode === HARVEST) {
+    } else if (fieldModeValue === HARVEST) {
+      // @ts-expect-error
       this.forRange(harvestPlot, rangeRadius, x, y)
-    } else if (fieldMode === MINE) {
+    } else if (fieldModeValue === MINE) {
+      // @ts-expect-error
       this.forRange(minePlot, rangeRadius, x, y)
-    } else if (fieldMode === CLEANUP) {
+    } else if (fieldModeValue === CLEANUP) {
+      // @ts-expect-error
       this.forRange(clearPlot, rangeRadius, x, y)
-    } else if (fieldMode === WATER) {
+    } else if (fieldModeValue === WATER) {
+      // @ts-expect-error
       this.forRange(waterPlot, rangeRadius, x, y)
-    } else if (fieldMode === FERTILIZE) {
+    } else if (fieldModeValue === FERTILIZE) {
+      // @ts-expect-error
       this.forRange(fertilizePlot, rangeRadius, x, y)
-    } else if (fieldMode === SET_SPRINKLER) {
+    } else if (fieldModeValue === SET_SPRINKLER) {
+      // @ts-expect-error
       this.setSprinkler(x, y)
-    } else if (fieldMode === SET_SCARECROW) {
+    } else if (fieldModeValue === SET_SCARECROW) {
+      // @ts-expect-error
       this.setScarecrow(x, y)
     }
   },
@@ -250,15 +279,18 @@ 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)
+    const activeElement = /** @type {HTMLElement} */ document.activeElement
+    // @ts-expect-error
     activeElement.blur()
   },
 
@@ -266,14 +298,17 @@ 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)
   },
 
@@ -281,6 +316,7 @@ export default {
    * @param {number} fieldId
    */
   handleFieldPurchase(fieldId) {
+    // @ts-expect-error
     this.purchaseField(fieldId)
   },
 
@@ -288,6 +324,7 @@ export default {
    * @param {number} forestId
    */
   handleForestPurchase(forestId) {
+    // @ts-expect-error
     this.purchaseForest(forestId)
   },
 
@@ -295,6 +332,7 @@ export default {
    * @param {number} combineId
    */
   handleCombinePurchase(combineId) {
+    // @ts-expect-error
     this.purchaseCombine(combineId)
   },
 
@@ -302,6 +340,7 @@ export default {
    * @param {number} composterId
    */
   handleComposterPurchase(composterId) {
+    // @ts-expect-error
     this.purchaseComposter(composterId)
   },
 
@@ -309,6 +348,7 @@ export default {
    * @param {number} smelterId
    */
   handleSmelterPurchase(smelterId) {
+    // @ts-expect-error
     this.purchaseSmelter(smelterId)
   },
 
@@ -316,6 +356,7 @@ export default {
    * @param {number} cowPenId
    */
   handleCowPenPurchase(cowPenId) {
+    // @ts-expect-error
     this.purchaseCowPen(cowPenId)
   },
 
@@ -323,27 +364,32 @@ 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)) {
+  handleMenuToggle(setOpen = /** @type {boolean | undefined} */ undefined) {
+    // @ts-expect-error
     this.setState(({ isMenuOpen }) => ({
       isMenuOpen: setOpen == null ? !isMenuOpen : setOpen,
     }))
   },
 
   handleClickNextMenuButton() {
+    // @ts-expect-error
     this.focusNextView()
   },
 
   handleClickPreviousMenuButton() {
+    // @ts-expect-error
     this.focusPreviousView()
   },
 
@@ -351,6 +397,7 @@ export default {
    * @param {farmhand.cow} cow
    */
   handleCowSelect(cow) {
+    // @ts-expect-error
     this.selectCow(cow)
   },
 
@@ -358,28 +405,35 @@ 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: '' })
   },
 
   /**
-   * @param {farmhand.dialogView} dialogView
+   * @param {farmhand.dialogView} selectedDialogView
    */
-  handleClickDialogViewButton(dialogView) {
-    this.openDialogView(dialogView)
+  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 })
   },
 
@@ -387,6 +441,7 @@ export default {
    * @param {number} paydownAmount
    */
   handleClickLoanPaydownButton(paydownAmount) {
+    // @ts-expect-error
     this.adjustLoan(-paydownAmount)
   },
 
@@ -394,11 +449,13 @@ 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',
@@ -417,34 +474,40 @@ export default {
     const [, file] = data
     const fileReader = new FileReader()
 
-    fileReader.addEventListener('loadend', e => {
+    fileReader.addEventListener('loadend', eImport => {
       try {
-        const { result } = /** @type {FileReader} */ (e.target)
-        const json = String(result)
+        const target = /** @type {FileReader} */ eImport.target
+        // @ts-expect-error
+        const json = String(target.result)
         const parsedJson = JSON.parse(json)
         const transformedStateData = transformStateDataForImport(parsedJson)
         const state = reduceByPersistedKeys(transformedStateData)
 
         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)
-        this.showNotification(/** @type {Error} */ (e).message, 'error')
+        // @ts-expect-error
+        this.showNotification(/** @type {Error} */ e.message, 'error')
       }
     })
 
@@ -452,7 +515,9 @@ export default {
   },
 
   async handleSaveButtonClick() {
+    // @ts-expect-error
     await this.persistState()
+    // @ts-expect-error
     this.showNotification(PROGRESS_SAVED_MESSAGE, 'info')
   },
 
@@ -460,10 +525,12 @@ export default {
    * @param {string} farmName
    */
   handleFarmNameUpdate(farmName) {
+    // @ts-expect-error
     this.setState({ farmName })
   },
 
   handleCombineEnabledChange(_e, enableCombine) {
+    // @ts-expect-error
     this.setState({ isCombineEnabled: enableCombine })
   },
 
@@ -471,26 +538,33 @@ 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)
   },
 
@@ -499,9 +573,11 @@ export default {
    */
   handleOnlineToggleChange(goOnline) {
     if (!goOnline) {
+      // @ts-expect-error
       this.showNotification(DISCONNECTING_FROM_SERVER, 'info')
     }
 
+    // @ts-expect-error
     this.setState(({ room }) =>
       goOnline
         ? {
@@ -518,6 +594,7 @@ export default {
    * @param {string} room
    */
   handleRoomChange(room) {
+    // @ts-expect-error
     this.setState(() => ({
       room,
       redirect: `/online/${encodeURIComponent(room.trim() || DEFAULT_ROOM)}`,
@@ -525,6 +602,7 @@ export default {
   },
 
   handleActivePlayerButtonClick() {
+    // @ts-expect-error
     this.openDialogView(dialogView.ONLINE_PEERS)
   },
 
@@ -540,11 +618,13 @@ 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')
     }
 
@@ -559,6 +639,7 @@ export default {
    * @param {boolean} isChatOpen
    */
   handleChatRoomOpenStateChange(isChatOpen) {
+    // @ts-expect-error
     this.setState({ isChatOpen })
   },
 
@@ -566,6 +647,7 @@ export default {
    * @param {(reloadPage?: boolean) => Promise<void>} updateServiceWorker
    */
   handleGameUpdateAvailable(updateServiceWorker) {
+    // @ts-expect-error
     this.showNotification(UPDATE_AVAILABLE, 'success', () => {
       updateServiceWorker(true)
     })

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

@@ -10,7 +10,9 @@ 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.js → generate-crop-table.ts}

@@ -17,10 +17,8 @@ function getCropImage(seedItem, cropItem) {
   if (Array.isArray(seedItem.growsInto)) {
     return `![${
       cropItem.name
-    }](https://raw.githubusercontent.com/jeremyckahn/farmhand/main/src/img/items/${
-      // @ts-expect-error
-      cropItem.imageId || cropItem.id
-    }.png)`
+    }](https://raw.githubusercontent.com/jeremyckahn/farmhand/main/src/img/items/${cropItem.imageId ||
+      cropItem.id}.png)`
   } else {
     return `![${cropItem.name}](https://raw.githubusercontent.com/jeremyckahn/farmhand/main/src/img/items/${cropItem.id}.png)`
   }
@@ -71,14 +69,17 @@ 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.js → cellar.test.ts}

@@ -8,7 +8,6 @@ import { cellarService } from './cellar.js'
 const mockUuid = 'abc123'
 
 beforeEach(() => {
-  // @ts-expect-error
   vitest.spyOn(cellarService, '_uuid').mockReturnValue(mockUuid)
 })
 
@@ -18,6 +17,7 @@ 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.js → wine.ts}

@@ -45,6 +45,7 @@ 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.js → notifications.test.ts}

@@ -21,17 +21,19 @@ describe('notifications', () => {
 
     const carrotItem = await getItemByName('Carrot')
     const carrotInput = within(
-      /** @type {HTMLElement} */ (carrotItem)
+      // @ts-expect-error
+      /** @type {HTMLElement} */ carrotItem
     ).getByDisplayValue('1')
     await userEvent.type(carrotInput, '10')
     const carrotSellButton = within(
-      /** @type {HTMLElement} */ (carrotItem)
+      // @ts-expect-error
+      /** @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()
   })
 
@@ -56,23 +58,29 @@ describe('notifications', () => {
     const carrotItem = await getItemByName('Carrot')
 
     const cornInput = within(
-      /** @type {HTMLElement} */ (cornItem)
+      // @ts-expect-error
+      /** @type {HTMLElement} */ cornItem
     ).getByDisplayValue('1')
     const spinachInput = within(
-      /** @type {HTMLElement} */ (spinachItem)
+      // @ts-expect-error
+      /** @type {HTMLElement} */ spinachItem
     ).getByDisplayValue('1')
     const carrotInput = within(
-      /** @type {HTMLElement} */ (carrotItem)
+      // @ts-expect-error
+      /** @type {HTMLElement} */ carrotItem
     ).getByDisplayValue('1')
 
     const cornSellButton = within(
-      /** @type {HTMLElement} */ (cornItem)
+      // @ts-expect-error
+      /** @type {HTMLElement} */ cornItem
     ).getByText('Sell')
     const spinachSellButton = within(
-      /** @type {HTMLElement} */ (spinachItem)
+      // @ts-expect-error
+      /** @type {HTMLElement} */ spinachItem
     ).getByText('Sell')
     const carrotSellButton = within(
-      /** @type {HTMLElement} */ (carrotItem)
+      // @ts-expect-error
+      /** @type {HTMLElement} */ carrotItem
     ).getByText('Sell')
 
     await userEvent.type(cornInput, '6')
@@ -89,12 +97,10 @@ 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()
   })
 })