@jeremyckahn/farmhand 1.19.21 → 1.19.22

package/src/{templates.ts → templates.js}

@@ -200,7 +200,6 @@ export const LEVEL_GAINED_NOTIFICATION = (_, newLevel, randomCropSeed) => {
         itemsMap[itemUnlockLevels[newLevel]].name
       }**.`
     )
-    // @ts-expect-error
   } else if (levelObject && levelObject.increasesSprinklerRange) {
     chunks.push(`Sprinkler range has increased.`)
   } else if (randomCropSeed) {
@@ -209,15 +208,11 @@ export const LEVEL_GAINED_NOTIFICATION = (_, newLevel, randomCropSeed) => {
         randomCropSeed.name
       }** as a reward!`
     )
-    // @ts-expect-error
   } else if (levelObject && levelObject.unlocksTool) {
-    // @ts-expect-error
     if (levelObject.unlocksTool === toolType.SHOVEL) {
       chunks.push(SHOVEL_UNLOCKED)
     }
-    // @ts-expect-error
   } else if (levelObject && levelObject.unlocksStageFocusType) {
-    // @ts-expect-error
     if (levelObject.unlocksStageFocusType === stageFocusType.FOREST) {
       chunks.push(FOREST_AVAILABLE_NOTIFICATION)
     }
@@ -245,7 +240,6 @@ export const POSITIONS_POSTED_NOTIFICATION = (_, who, positions) => {
   const positionKeys = Object.keys(positions)
 
   positionKeys.forEach(itemId =>
-    // @ts-expect-error
     (positions[itemId] > 0 ? positivePositions : negativePositions).push(itemId)
   )
 
@@ -254,7 +248,6 @@ export const POSITIONS_POSTED_NOTIFICATION = (_, who, positions) => {
   if (positivePositions.length) {
     chunks.push('Values raised:')
     positivePositions.forEach(itemId =>
-      // @ts-expect-error
       chunks.push(`  - ${itemsMap[itemId].name}`)
     )
   }
@@ -266,7 +259,6 @@ export const POSITIONS_POSTED_NOTIFICATION = (_, who, positions) => {
 
     chunks.push('Values lowered:')
     negativePositions.forEach(itemId =>
-      // @ts-expect-error
       chunks.push(`  - ${itemsMap[itemId].name}`)
     )
   }

package/src/test-utils/{index.ts → index.js}

@@ -40,7 +40,7 @@ export const testShoveledPlot = plotProps => ({
 export const testItem = (item = {}) => ({
   id: '',
   name: '',
-  type: /** @type {farmhand.itemType} */ 'CRAFTED_ITEM',
+  type: /** @type {farmhand.itemType} */ ('CRAFTED_ITEM'),
   value: 0,
   description: '',
   doesPriceFluctuate: false,
@@ -62,8 +62,8 @@ export const testRecipe = (overrides = {}) => ({
     'sample-item-1': 1,
   },
   condition: () => true,
-  recipeType: /** @type {farmhand.recipeType} */ 'KITCHEN',
-  type: /** @type {farmhand.itemType} */ 'CRAFTED_ITEM',
+  recipeType: /** @type {farmhand.recipeType} */ ('KITCHEN'),
+  type: /** @type {farmhand.itemType} */ ('CRAFTED_ITEM'),
   value: 100,
   ...overrides,
 })

package/src/test-utils/stubs/{getKegStub.ts → getKegStub.js}

@@ -12,7 +12,6 @@ export const getKegStub = (overrides = {}) => {
   return {
     id: uuid(),
     itemId: carrot.id,
-    // @ts-expect-error
     daysUntilMature: carrot.daysToFerment ?? 0,
     ...overrides,
   }

package/src/utils/{farmProductsSold.tsx → farmProductsSold.js}

@@ -3,7 +3,6 @@ import { itemsMap } from '../data/maps.js'
 import { memoize } from './memoize.js'
 import { isItemAFarmProduct } from './isItemAFarmProduct.js'
 
-// @ts-expect-error
 export const farmProductsSold = memoize(
   /**
    * @param {Partial<Record<string, number>>} itemsSold
@@ -12,7 +11,6 @@ export const farmProductsSold = memoize(
   itemsSold =>
     Object.entries(itemsSold).reduce(
       (sum, [itemId, numberSold]) =>
-        // @ts-expect-error
         sum + (isItemAFarmProduct(itemsMap[itemId]) ? numberSold || 0 : 0),
       0
     )

package/src/utils/{getCropLifecycleDuration.ts → getCropLifecycleDuration.js}

@@ -4,7 +4,6 @@ import { memoize } from './memoize.js'
  * @param {{ cropTimeline: number[] }} crop
  * @returns {number}
  */
-// @ts-expect-error
 export const getCropLifecycleDuration = memoize(({ cropTimeline }) => {
   return cropTimeline.reduce((acc, value) => {
     return acc + value

package/src/utils/{getCropsAvailableToFerment.ts → getCropsAvailableToFerment.js}

@@ -25,7 +25,6 @@ export function getCropsAvailableToFerment(levelEntitlements) {
         finalCropItemFromSeedItem &&
         Number.isFinite(finalCropItemFromSeedItem.daysToFerment)
       ) {
-        // @ts-expect-error
         acc.push(finalCropItemFromSeedItem)
       }
 

package/src/utils/{getInventoryQuantityMap.ts → getInventoryQuantityMap.js}

@@ -3,7 +3,6 @@
  */
 import { memoize } from './memoize.js'
 
-// @ts-expect-error
 export const getInventoryQuantityMap = memoize(
   /**
    * @param {{ id: item['id'], quantity: number }[]} inventory

package/src/utils/{getLevelEntitlements.ts → getLevelEntitlements.js}

@@ -9,7 +9,6 @@ import { memoize } from './memoize.js'
  * @returns {levelEntitlements} Contains `sprinklerRange` and keys that correspond to
  * unlocked items.
  */
-// @ts-expect-error
 export const getLevelEntitlements = memoize(
   /**
    * @param {number} levelNumber
@@ -38,17 +37,14 @@ export const getLevelEntitlements = memoize(
         }
 
         if (unlocksShopItem) {
-          // @ts-expect-error
           acc.items[unlocksShopItem] = true
         }
 
         if (unlocksTool) {
-          // @ts-expect-error
           acc.tools[unlocksTool] = true
         }
 
         if (unlocksStageFocusType) {
-          // @ts-expect-error
           acc.stageFocusType[unlocksStageFocusType] = true
         }
 

package/src/utils/{getMaxYieldOfFermentationRecipe.ts → getMaxYieldOfFermentationRecipe.js}

@@ -22,7 +22,6 @@ export const getMaxYieldOfFermentationRecipe = (
 ) => {
   const {
     [fermentationRecipe.id]: itemQuantityInInventory = 0,
-    // @ts-expect-error
     [itemsMap.salt.id]: saltQuantityInInventory = 0,
   } = getInventoryQuantityMap(inventory)
 

package/src/utils/{getWineVarietiesAvailableToMake.ts → getWineVarietiesAvailableToMake.js}

@@ -18,9 +18,7 @@ const getGrapesSold = itemsSold => {
   ) => {
     const item = itemsMap[itemId]
 
-    // @ts-expect-error
     if ((quantity || 0) > 0 && isGrape(item)) {
-      // @ts-expect-error
       acc.push(item)
     }
 

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

@@ -289,7 +289,6 @@ export const getPlotContentType = ({ itemId }) =>
 export const doesPlotContainCrop = plot =>
   plot !== null && getPlotContentType(plot) === itemType.CROP
 
-// @ts-expect-error
 export const getLifeStageRange = memoize((
   /** @type {number[]} */ cropTimeline
 ) => {
@@ -331,9 +330,7 @@ export const getGrowingPhase = memoize(
   },
   {
     cacheSize:
-      // @ts-expect-error
       LARGEST_PURCHASABLE_FIELD_SIZE.columns *
-      // @ts-expect-error
       LARGEST_PURCHASABLE_FIELD_SIZE.rows,
   }
 )
@@ -389,7 +386,7 @@ export const getPlotImage = (plotContents, x, y) => {
     }
 
     // Handle other plot content (non-crop, non-weed)
-    return itemImages[/** @type {farmhand.plotContent} */ plotContents.itemId]
+    return itemImages[/** @type {farmhand.plotContent} */ (plotContents).itemId]
   }
 
   if (isShoveledPlot(plotContents)) {
@@ -451,14 +448,12 @@ export const getFinalCropItemIdFromSeedItemId = (
 
 export const getSeedItemIdFromFinalStageCropItemId = memoize(
   /** @type {string} */ cropItemId => {
-    // @ts-expect-error
     const seedItemId = Object.values(itemsMap).find(({ growsInto }) => {
       if (Array.isArray(growsInto)) {
         return growsInto.includes(cropItemId)
       } else {
         return growsInto === cropItemId
       }
-      // @ts-expect-error
     })?.id
 
     if (!seedItemId)
@@ -498,11 +493,8 @@ export const getCowDisplayName = (cow, playerId, allowCustomPeerCowNames) => {
  * @returns {farmhand.cow}
  */
 export const generateCow = (options = {}) => {
-  // @ts-expect-error
   const gender = options.gender || chooseRandom(Object.values(genders))
-  // @ts-expect-error
   const color = options.color || chooseRandom(Object.values(standardCowColors))
-  // @ts-expect-error
   const id = options.id || uuid()
 
   const baseWeight = Math.round(
@@ -567,7 +559,7 @@ export const generateOffspringCow = (cow1, cow2, ownerId, customProps = {}) => {
   }
 
   delete colorsInBloodline[
-    /** @type {keyof typeof colorsInBloodline} */ cowColors.RAINBOW
+    /** @type {keyof typeof colorsInBloodline} */ (cowColors.RAINBOW)
   ]
 
   const isRainbowCow =
@@ -682,7 +674,6 @@ export const getCowSellValue = cow => getCowValue(cow, true)
  * @param {{id: string, quantity: number}[]} inventory
  * @returns {number}
  */
-// @ts-expect-error
 export const maxYieldOfRecipe = memoize(({ ingredients }, inventory) => {
   const inventoryQuantityMap = getInventoryQuantityMap(inventory)
 
@@ -750,7 +741,6 @@ export const doesMenuObstructStage = () => window.innerWidth < BREAKPOINTS.MD
 /** @type {Set<farmhand.itemType>} */
 const itemTypesToShowInReverse = new Set([itemType.MILK])
 
-// @ts-expect-error
 const sortItemIdsByTypeAndValue = memoize(itemIds =>
   sortBy(itemIds, [
     id => Number(itemsMap[id].type !== itemType.CROP),
@@ -772,7 +762,6 @@ export const sortItems = items => {
   return sortItemIdsByTypeAndValue(items.map(({ id }) => id)).map(id => map[id])
 }
 
-// @ts-expect-error
 export const inventorySpaceConsumed = memoize(
   /**
    * @param {farmhand.state['inventory']} inventory
@@ -797,7 +786,6 @@ export const inventorySpaceRemaining = ({ inventory, inventoryLimit }) =>
 export const doesInventorySpaceRemain = state =>
   inventorySpaceRemaining(state) > 0
 
-// @ts-expect-error
 export const areHuggingMachinesInInventory = memoize(
   /**
    * @param {farmhand.state['inventory']} inventory
@@ -817,7 +805,6 @@ export const nullArray = memoize(
   }
 )
 
-// @ts-expect-error
 export const findCowById = memoize(
   /**
    * @param {Array.<farmhand.cow>} cowInventory
@@ -834,7 +821,6 @@ export const findCowById = memoize(
 export const experienceNeededForLevel = targetLevel =>
   ((targetLevel - 1) * 10) ** 2
 
-// @ts-expect-error
 export const getAvailableShopInventory = memoize((
   /** @type {farmhand.levelEntitlements} */ levelEntitlements
 ) =>
@@ -879,7 +865,7 @@ export const getPeerMetadata = state => {
 
       return acc
     },
-    /** @type {Partial<farmhand.peerMetadata>} */ {}
+    /** @type {Partial<farmhand.peerMetadata>} */ ({})
   )
 
   Object.assign(reducedState, {
@@ -888,7 +874,7 @@ export const getPeerMetadata = state => {
     ),
   })
 
-  return /** @type {farmhand.peerMetadata} */ reducedState
+  return /** @type {farmhand.peerMetadata} */ (reducedState)
 }
 
 /**
@@ -897,7 +883,7 @@ export const getPeerMetadata = state => {
  * farmhand.state data that should be persisted.
  */
 export const reduceByPersistedKeys = state =>
-  /** @type {farmhand.state} */ PERSISTED_STATE_KEYS.reduce((
+  /** @type {farmhand.state} */ (PERSISTED_STATE_KEYS.reduce((
     /** @type {Partial<farmhand.state>} */ acc,
     key
   ) => {
@@ -908,7 +894,7 @@ export const reduceByPersistedKeys = state =>
     }
 
     return acc
-  }, {})
+  }, {}))
 
 /**
  * @param {Array.<number>} historicalData Must be no longer than 7 numbers long.
@@ -1006,7 +992,8 @@ export const transformStateDataForImport = /** @type {(state: any) => farmhand.s
   ) {
     sanitizedState = {
       ...sanitizedState,
-      stageFocus: /** @type {farmhand.stageFocusType} */ STANDARD_VIEW_LIST[0],
+      stageFocus:
+        /** @type {farmhand.stageFocusType} */ (STANDARD_VIEW_LIST[0]),
     }
   }
 
@@ -1048,15 +1035,17 @@ export const transformStateDataForImport = /** @type {(state: any) => farmhand.s
   }
 
   // NOTE: Legacy data trasformation for https://github.com/jeremyckahn/farmhand/issues/387
+  // @ts-expect-error
   if (sanitizedState.id) {
+    // @ts-expect-error
     sanitizedState.playerId = sanitizedState.id
+    // @ts-expect-error
     delete sanitizedState.id
   }
 
   return sanitizedState
 }
 
-// @ts-expect-error
 export const getPlayerName = memoize(
   /**
    * @param {string} playerId
@@ -1124,11 +1113,9 @@ export function randomChoice(weightedOptions) {
 
   for (let option of weightedOptions) {
     totalWeight += option.weight
-    // @ts-expect-error
     sortedOptions.push(option)
   }
 
-  // @ts-expect-error
   sortedOptions.sort(o => o.weight)
 
   let diceRoll = random() * totalWeight
@@ -1159,7 +1146,6 @@ const colorizeCowTemplate = (() => {
   const cachedCowImages = {}
 
   // https://stackoverflow.com/a/5624139
-  // @ts-expect-error
   const hexToRgb = memoize(hex => {
     const [, r, g, b] = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(
       hex

package/src/utils/{index.test.ts → index.test.js}

@@ -729,6 +729,7 @@ describe('canMakeRecipe', () => {
     test('evaluates inventory correctly', () => {
       expect(
         canMakeRecipe(
+          // @ts-expect-error
           { ingredients: { 'sample-item-1': 2 } },
           [{ id: 'sample-item-1', quantity: 1 }],
           1
@@ -741,6 +742,7 @@ describe('canMakeRecipe', () => {
     test('evaluates inventory correctly', () => {
       expect(
         canMakeRecipe(
+          // @ts-expect-error
           { ingredients: { 'sample-item-1': 2 } },
           [{ id: 'sample-item-1', quantity: 2 }],
           1

package/src/utils/{isItemAFarmProduct.ts → isItemAFarmProduct.js}

@@ -17,5 +17,5 @@ const FARM_PRODUCT_TYPES = [
 export const isItemAFarmProduct = item =>
   Boolean(
     isItemAGrownCrop(item) ||
-      FARM_PRODUCT_TYPES.includes(/** @type {any} */ item.type)
+      FARM_PRODUCT_TYPES.includes(/** @type {any} */ (item.type))
   )

package/src/utils/{memoize.ts → memoize.js}

@@ -21,7 +21,6 @@ export class MemoizeCache {
    * @see https://github.com/caiogondim/fast-memoize.js
    */
   constructor({ cacheSize = MEMOIZE_CACHE_CLEAR_THRESHOLD } = {}) {
-    // @ts-expect-error
     this.cacheSize = cacheSize
   }
 
@@ -34,7 +33,6 @@ export class MemoizeCache {
   }
 
   set(key, value) {
-    // @ts-expect-error
     if (Object.keys(this.cache).length > this.cacheSize) {
       this.cache = {}
     }

package/src/utils/{totalIngredientsInRecipe.ts → totalIngredientsInRecipe.js}

@@ -1,9 +1,7 @@
 export function totalIngredientsInRecipe(recipe, amount = 1) {
   return (
     amount *
-    // @ts-expect-error
     Object.values(recipe.ingredients).reduce(
-      // @ts-expect-error
       (acc, quantity) => acc + quantity,
       0
     )