@jeremyckahn/farmhand 1.19.19 → 1.19.21

package/src/game-logic/reducers/{purchaseForest.js → purchaseForest.ts}

@@ -39,9 +39,10 @@ export const purchaseForest = (state, forestId) => {
   return {
     ...state,
     purchasedForest: forestId,
-    forest: nullArray(rows).map((_, row) =>
+    forest: nullArray(rows).map((_, rowIndex) =>
       nullArray(columns).map(
-        (_, column) => (forest[row] && forest[row][column]) || null
+        (__, columnIdx) =>
+          (forest[rowIndex] && forest[rowIndex][columnIdx]) || null
       )
     ),
     money: moneyTotal(money, -price),

package/src/game-logic/reducers/{rotateNotificationLogs.js → rotateNotificationLogs.ts}

@@ -17,7 +17,7 @@ export const rotateNotificationLogs = state => {
   }
 
   newDayNotifications.forEach(({ message, severity }) =>
-    notifications[/** @type {string} */ (severity)].push(message)
+    notifications[/** @type {string} */ severity].push(message)
   )
 
   if (newDayNotifications.length) {

package/src/game-logic/reducers/{sellCow.test.js → sellCow.test.ts}

@@ -64,19 +64,19 @@ describe('sellCow', () => {
 
   describe('cow has hugging machine', () => {
     test('returns hugging machine to inventory', () => {
-      const cow = generateCow({
+      const cowWithHuggingMachine = generateCow({
         isUsingHuggingMachine: true,
       })
       const { inventory } = sellCow(
         testState({
           cowBreedingPen: { cowId1: null, cowId2: null, daysUntilBirth: -1 },
-          cowInventory: [cow],
+          cowInventory: [cowWithHuggingMachine],
           cowsSold: {},
           inventory: [],
           inventoryLimit: INFINITE_STORAGE_LIMIT,
           money: 0,
         }),
-        cow
+        cowWithHuggingMachine
       )
 
       expect(inventory).toEqual([{ id: huggingMachine.id, quantity: 1 }])

package/src/game-logic/reducers/{sellItem.test.js → sellItem.test.ts}

@@ -246,7 +246,6 @@ describe('sellItem', () => {
       const state = sellItem(
         testState({
           experience: 0,
-          // @ts-expect-error
           inventory: [{ id: itemObj.id, quantity: 1 }],
           itemsSold: {},
           loanBalance: 0,
@@ -255,10 +254,8 @@ describe('sellItem', () => {
           todaysNotifications: [],
           revenue: 0,
           todaysRevenue: 0,
-          // @ts-expect-error
           valueAdjustments: { [itemObj.id]: 1 },
         }),
-        // @ts-expect-error
         itemObj,
         1
       )

package/src/game-logic/reducers/{sellKeg.js → sellKeg.ts}

@@ -76,7 +76,6 @@ export const sellKeg = (state, keg) => {
   // NOTE: This notification will need to be revisited to support Wine sales.
   state = prependPendingPeerMessage(
     state,
-    // @ts-expect-error
     SOLD_FERMENTED_ITEM_PEER_NOTIFICATION`${item}`,
     'warning'
   )

package/src/game-logic/reducers/{spawnWeeds.js → spawnWeeds.ts}

@@ -14,6 +14,7 @@ export function spawnWeeds(plotContents) {
   let contents = null
 
   if (randomNumberService.isRandomNumberLessThan(WEEDS_SPAWN_CHANCE)) {
+    // @ts-expect-error
     contents = getPlotContentFromItemId(weed.id)
   }
 

package/src/game-logic/reducers/{updateAchievements.js → updateAchievements.ts}

@@ -9,21 +9,22 @@ import { showNotification } from './showNotification.js'
  * @returns {farmhand.state}
  */
 export const updateAchievements = (state, prevState) =>
-  achievements.reduce((state, achievement) => {
+  achievements.reduce((reducerState, achievement) => {
     if (
-      !state.completedAchievements[achievement.id] &&
-      achievement.condition(state, prevState)
+      !reducerState.completedAchievements[achievement.id] &&
+      // @ts-expect-error
+      achievement.condition(reducerState, prevState)
     ) {
-      state = {
-        ...achievement.reward(state),
+      reducerState = {
+        ...achievement.reward(reducerState),
         completedAchievements: {
-          ...state.completedAchievements,
+          ...reducerState.completedAchievements,
           [achievement.id]: true,
         },
       }
 
-      state = showNotification(
-        state,
+      reducerState = showNotification(
+        reducerState,
         ACHIEVEMENT_COMPLETED('', {
           name: achievement.name,
           rewardDescription: achievement.rewardDescription,
@@ -32,5 +33,5 @@ export const updateAchievements = (state, prevState) =>
       )
     }
 
-    return state
+    return reducerState
   }, state)

package/src/game-logic/reducers/{updatePeer.test.js → updatePeer.test.ts}

@@ -16,7 +16,6 @@ describe('updatePeer', () => {
         latestPeerMessages: [],
         peers: { abc123: stubPeerMetadata },
       }),
-      // @ts-expect-error
       Farmhand,
       { foo: false },
       'abc123'
@@ -32,7 +31,6 @@ describe('updatePeer', () => {
         latestPeerMessages: new Array(50).fill('message'),
         peers: { abc123: stubPeerMetadata },
       }),
-      // @ts-expect-error
       Farmhand,
       { foo: false },
       'abc123'
@@ -50,7 +48,6 @@ describe('updatePeer', () => {
           abc123: stubPeerMetadata,
         },
       }),
-      // @ts-expect-error
       Farmhand,
       { ...stubPeerMetadata, cowOfferedForTrade: getCowStub() },
       'abc123'
@@ -72,7 +69,6 @@ describe('updatePeer', () => {
           abc123: { ...stubPeerMetadata, cowOfferedForTrade: getCowStub() },
         },
       }),
-      // @ts-expect-error
       Farmhand,
       stubPeerMetadata,
       'abc123'

package/src/game-logic/reducers/{updatePeer.js → updatePeer.ts}

@@ -33,6 +33,7 @@ export const updatePeer = (state, farmhand, peerMetadata, peerId) => {
       state,
       NEW_COW_OFFERED_FOR_TRADE`${peerMetadata}`,
       'info',
+      // @ts-expect-error
       () => {
         farmhand.openDialogView(dialogView.ONLINE_PEERS)
       }

package/src/game-logic/reducers/{updatePlotShoveledState.test.js → updatePlotShoveledState.test.ts}

@@ -31,7 +31,6 @@ describe('updatePlotShoveledState', () => {
   })
 
   test('will return the plot contents if it is anything else', () => {
-    // @ts-expect-error - Testing with string type to verify non-shoveled plot handling
     const plotContents = updatePlotShoveledState('sprinkler')
 
     expect(plotContents).toEqual('sprinkler')

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

@@ -90,6 +90,7 @@ export const handleCowTradeRequest = async (
 
       const [, peerMetadata] =
         Object.entries(peers).find(
+          // @ts-expect-error
           ([, peer]) => peer?.playerId === updatedCowOffered.ownerId
         ) ?? []
 
@@ -135,6 +136,7 @@ export const handleCowTradeRequest = async (
             ...peerMetadata,
             cowOfferedForTrade: {
               ...cowToTradeAway,
+              // @ts-expect-error
               ownerId: peerMetadata.playerId,
             },
           },
@@ -195,9 +197,11 @@ export const handleCowTradeRequestAccept = (farmhand, cowReceived, peerId) => {
         }
       }
 
-      const peerEntry = Object.entries(peers).find(
-        ([, { playerId }]) => playerId === cowReceived.ownerId
-      )
+      const peerEntry = Object.entries(peers).find(([, peer]) => {
+        // @ts-expect-error
+        const { playerId: peerPlayerId } = peer
+        return peerPlayerId === cowReceived.ownerId
+      })
       const [, peerMetadata] = peerEntry || []
 
       const didOriginallyOwnReceivedCow =
@@ -248,9 +252,11 @@ export const handleCowTradeRequestAccept = (farmhand, cowReceived, peerId) => {
         peers: {
           ...peers,
           [peerId]: {
+            // @ts-expect-error
             ...peerMetadata,
             cowOfferedForTrade: {
               ...cowTradedAway,
+              // @ts-expect-error
               ownerId: peerMetadata.playerId,
             },
           },

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

@@ -156,6 +156,7 @@ describe('UI Event Handlers', () => {
         enablesFieldMode: fieldMode.PLANT,
       })
 
+      // @ts-expect-error
       handler(mockItem)
 
       expect(mockContext.setState).toHaveBeenCalledWith({
@@ -183,6 +184,7 @@ 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]