@jeremyckahn/farmhand 1.19.19 → 1.19.21

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

@@ -116,6 +116,7 @@ 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
@@ -130,6 +131,7 @@ export const computePlayerInventory = memoize(
     }))
 )
 
+// @ts-expect-error
 export const getFieldToolInventory = memoize(
   /**
    * @param {globalThis.farmhand.state['inventory']} inventory
@@ -147,6 +149,7 @@ export const getFieldToolInventory = memoize(
       .map(({ id, quantity }) => ({ ...itemsMap[id], quantity }))
 )
 
+// @ts-expect-error
 export const getPlantableCropInventory = memoize(
   /**
    * @param {globalThis.farmhand.state['inventory']} inventory
@@ -254,6 +257,7 @@ export default class Farmhand extends FarmhandReducers {
       viewList.unshift(HOME)
     }
 
+    // @ts-expect-error
     if (this.isForestUnlocked && features.FOREST) {
       viewList.push(FOREST)
     }
@@ -304,12 +308,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: {
@@ -328,7 +332,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,
@@ -351,6 +355,7 @@ export default class Farmhand extends FarmhandReducers {
       cellarItemsSold: {},
       isChatOpen: false,
       isDialogViewOpen: false,
+      // @ts-expect-error
       isOnline: this.props.match.path.startsWith('/online'),
       isWaitingForDayToCompleteIncrementing: false,
       learnedRecipes: {},
@@ -375,6 +380,7 @@ 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,
@@ -389,22 +395,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() {
@@ -414,6 +420,7 @@ export default class Farmhand extends FarmhandReducers {
       historicalValueAdjustments: [],
     }))
 
+    // @ts-expect-error
     this.showNotification(LOAN_INCREASED('', STANDARD_LOAN_AMOUNT), 'info')
   }
 
@@ -459,20 +466,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
           )
         }
       },
@@ -506,13 +513,14 @@ 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
 
@@ -520,9 +528,11 @@ 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)
           }
         })
@@ -557,6 +567,7 @@ export default class Farmhand extends FarmhandReducers {
     }
 
     const {
+      // @ts-expect-error
       match: {
         path,
         params: { room: newRoom = room },
@@ -592,6 +603,7 @@ export default class Farmhand extends FarmhandReducers {
     }
 
     if (isOnline === false && prevState.isOnline === true) {
+      // @ts-expect-error
       this.showNotification(DISCONNECTED_FROM_SERVER, 'info')
     }
 
@@ -618,6 +630,7 @@ export default class Farmhand extends FarmhandReducers {
     }
 
     if (money < prevState.money) {
+      // @ts-expect-error
       this.setState(({ todaysLosses }) => ({
         todaysLosses: moneyTotal(todaysLosses, money - prevState.money),
       }))
@@ -625,23 +638,32 @@ 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)
         })
 
-        const [sendPeerMetadata, getPeerMetadata] = peerRoom.makeAction(
+        // @ts-expect-error
+        const [sendPeerMetadata, getPeerMetadataFunc] = peerRoom.makeAction(
           'peerMetadata'
         )
 
-        getPeerMetadata((
+        getPeerMetadataFunc((
           /** @type {[object, string]} */
           ...args
-        ) => handlePeerMetadataRequest(this, ...args))
+        ) =>
+          // @ts-expect-error
+          handlePeerMetadataRequest(this, ...args)
+        )
 
+        // @ts-expect-error
         const [sendCowTradeRequest, getCowTradeRequest] = peerRoom.makeAction(
           'cowTrade'
         )
@@ -649,27 +671,38 @@ export default class Farmhand extends FarmhandReducers {
         getCowTradeRequest((
           /** @type {[object, string]} */
           ...args
-        ) => handleCowTradeRequest(this, ...args))
+        ) =>
+          // @ts-expect-error
+          handleCowTradeRequest(this, ...args)
+        )
 
+        // @ts-expect-error
         const [sendCowAccept, getCowAccept] = peerRoom.makeAction('cowAccept')
 
         getCowAccept((
           /** @type {[object, string]} */
           ...args
-        ) => handleCowTradeRequestAccept(this, ...args))
+        ) =>
+          // @ts-expect-error
+          handleCowTradeRequestAccept(this, ...args)
+        )
 
+        // @ts-expect-error
         const [sendCowReject, getCowReject] = peerRoom.makeAction('cowReject')
 
         getCowReject((
           /** @type {[object]} */
           ...args
-        ) => handleCowTradeRequestReject(this, ...args))
+        ) =>
+          // @ts-expect-error
+          handleCowTradeRequestReject(this, ...args)
+        )
 
         this.setState({
           getCowAccept,
           getCowReject,
           getCowTradeRequest,
-          getPeerMetadata,
+          getPeerMetadata: getPeerMetadataFunc,
           pendingPeerMessages: [],
           sendCowAccept,
           sendCowReject,
@@ -690,6 +723,7 @@ export default class Farmhand extends FarmhandReducers {
       'showRecipeLearnedNotifications',
     ].forEach(fn => this[fn](prevState))
 
+    // @ts-expect-error
     this.state.sendPeerMetadata?.(this.peerMetadata)
   }
 
@@ -720,9 +754,13 @@ 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
 
@@ -731,6 +769,7 @@ export default class Farmhand extends FarmhandReducers {
       const { ownerId } = peerPlayerCow
 
       const [peerId] =
+        // @ts-expect-error
         Object.entries(peers).find(([, peer]) => peer?.playerId === ownerId) ??
         []
 
@@ -778,6 +817,7 @@ 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,
@@ -789,8 +829,10 @@ export default class Farmhand extends FarmhandReducers {
   }
 
   async clearPersistedData() {
+    // @ts-expect-error
     await this.props.localforage.clear()
 
+    // @ts-expect-error
     this.showNotification(DATA_DELETED)
   }
 
@@ -801,6 +843,7 @@ export default class Farmhand extends FarmhandReducers {
       return
     }
 
+    // @ts-expect-error
     this.showNotification(CONNECTING_TO_SERVER, 'info')
 
     try {
@@ -809,6 +852,7 @@ export default class Farmhand extends FarmhandReducers {
         peers: {},
       })
 
+      // @ts-expect-error
       this.state.peerRoom?.leave()
 
       const { valueAdjustments } = await getData(endpoints.getMarketData, {
@@ -838,12 +882,14 @@ 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)
@@ -869,6 +915,7 @@ export default class Farmhand extends FarmhandReducers {
 
     this.setState(() => ({
       heartbeatTimeoutId: setTimeout(async () => {
+        // @ts-expect-error
         this.setState(({ money, activePlayers }) => ({
           activePlayers,
           money: moneyTotal(money, activePlayers),
@@ -887,6 +934,7 @@ export default class Farmhand extends FarmhandReducers {
       inventorySpaceRemaining(prevState) > 0 &&
       inventorySpaceRemaining(this.state) <= 0
     ) {
+      // @ts-expect-error
       this.showNotification(INVENTORY_FULL_NOTIFICATION, 'warning')
     }
   }
@@ -899,13 +947,16 @@ 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]))
     }
   }
@@ -915,6 +966,7 @@ export default class Farmhand extends FarmhandReducers {
    * @return {Promise}
    */
   persistState(overrides = {}) {
+    // @ts-expect-error
     return this.props.localforage.setItem(
       'state',
       reduceByPersistedKeys({
@@ -963,11 +1015,13 @@ 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(
             '',
             '',
@@ -976,6 +1030,7 @@ 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',
@@ -1020,6 +1075,7 @@ export default class Farmhand extends FarmhandReducers {
       prev => {
         const nextDayState = reducers.computeStateForNextDay(prev, isFirstDay)
 
+        // @ts-expect-error
         pendingNotifications = [
           ...serverMessages,
           ...nextDayState.newDayNotifications,
@@ -1052,11 +1108,13 @@ 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)
             )
 
@@ -1066,11 +1124,13 @@ 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(() => ({
@@ -1078,6 +1138,7 @@ export default class Farmhand extends FarmhandReducers {
           }))
 
           if (broadcastedPositionMessage) {
+            // @ts-expect-error
             this.messagePeers(broadcastedPositionMessage)
           }
         }
@@ -1086,10 +1147,10 @@ export default class Farmhand extends FarmhandReducers {
   }
 
   /*!
-   * @param {farmhand.module:enums.dialogView} dialogView
+   * @param {farmhand.module:enums.dialogView} dialogViewName
    */
-  openDialogView(dialogView) {
-    this.setState({ currentDialogView: dialogView, isDialogViewOpen: true })
+  openDialogView(dialogViewName) {
+    this.setState({ currentDialogView: dialogViewName, isDialogViewOpen: true })
   }
 
   closeDialogView() {
@@ -1101,6 +1162,7 @@ export default class Farmhand extends FarmhandReducers {
 
     const { viewList } = this
 
+    // @ts-expect-error
     this.setState(({ stageFocus }) => {
       const currentViewIndex = viewList.indexOf(stageFocus)
 
@@ -1113,6 +1175,7 @@ export default class Farmhand extends FarmhandReducers {
 
     const { viewList } = this
 
+    // @ts-expect-error
     this.setState(({ stageFocus }) => {
       const currentViewIndex = viewList.indexOf(stageFocus)
 
@@ -1132,12 +1195,14 @@ export default class Farmhand extends FarmhandReducers {
    * @param {string?} [severity]
    */
   messagePeers(message, severity) {
+    // @ts-expect-error
     this.prependPendingPeerMessage(message, severity)
   }
 
   render() {
     const {
-      props: { features },
+      // @ts-expect-error
+      props: { features: propsFeatures },
       state: { redirect },
       fieldToolInventory,
       handlers,
@@ -1159,7 +1224,7 @@ export default class Farmhand extends FarmhandReducers {
     const gameState = {
       ...this.state,
       blockInput,
-      features,
+      features: propsFeatures,
       fieldToolInventory,
       isChatAvailable,
       levelEntitlements,
@@ -1194,6 +1259,7 @@ export default class Farmhand extends FarmhandReducers {
               {redirect && <Redirect {...{ to: redirect }} />}
               <FarmhandContext.Provider
                 value={{
+                  // @ts-expect-error
                   gameState,
                   handlers,
                 }}
@@ -1319,6 +1385,7 @@ export default class Farmhand extends FarmhandReducers {
   }
 }
 
+// @ts-expect-error
 Farmhand.propTypes = {
   features: object,
   history: object,

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

@@ -38,7 +38,6 @@ 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,
@@ -100,10 +99,12 @@ export const FermentationRecipe = ({ item }) => {
               {integerString(inventoryQuantityMap[item.id] ?? 0)}
             </p>
             <p>
-              Units of {itemsMap.salt.name} required:{' '}
-              {getSaltRequirementsForFermentationRecipe(item)} (available:{' '}
+              Units of {(itemsMap as any).salt.name} required:{' '}
+              {getSaltRequirementsForFermentationRecipe(item as any)}{' '}
+              (available:{' '}
               <AnimatedNumber
                 {...{
+                  // @ts-expect-error
                   number: inventoryQuantityMap[itemsMap.salt.id] ?? 0,
                   formatter: integerString,
                 }}

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

@@ -82,14 +82,17 @@ 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()
     })
 
@@ -98,6 +101,7 @@ describe('FermentationRecipeList', () => {
     )
 
     nonMatchingCrops.forEach(crop => {
+      // @ts-expect-error
       const nonMatchingElements = screen.queryAllByText(crop.name)
       expect(nonMatchingElements).toHaveLength(1)
     })
@@ -119,6 +123,7 @@ describe('FermentationRecipeList', () => {
     await userEvent.clear(searchBar)
 
     cropsAvailableToFerment.forEach(crop => {
+      // @ts-expect-error
       expect(screen.getByText(crop.name)).toBeInTheDocument()
     })
   })

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

@@ -27,10 +27,12 @@ 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)
     )
   })
@@ -52,6 +54,7 @@ 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/Field/{Field.test.js → Field.test.tsx}

@@ -10,12 +10,12 @@ import { Field, FieldContent, isInHoverRange, MemoPlot } from './Field.js'
 
 // Mock Plot component to test MemoPlot memoization behavior
 vitest.mock('../Plot/index.js', () => {
-  const mockPlot = vitest.fn(({ x, y, isInHoverRange }) => (
+  const mockPlot = vitest.fn(({ x, y, isInHoverRange: isInRange }) => (
     <div
       className="Plot"
       data-x={x}
       data-y={y}
-      data-in-hover-range={isInHoverRange}
+      data-in-hover-range={isInRange}
     />
   ))
   return { default: mockPlot }
@@ -203,7 +203,6 @@ 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()
   })