@jeremyckahn/farmhand 1.19.21 → 1.19.22

package/src/data/crops/{onion.ts → onion.js}

@@ -18,9 +18,7 @@ export const onionSeed = crop({
  * @property farmhand.module:items.onion
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const onion = crop({
-  // @ts-expect-error
   ...fromSeed(onionSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{pea.ts → pea.js}

@@ -18,9 +18,7 @@ export const peaSeed = crop({
  * @property farmhand.module:items.pea
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const pea = crop({
-  // @ts-expect-error
   ...fromSeed(peaSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{potato.ts → potato.js}

@@ -18,9 +18,7 @@ export const potatoSeed = crop({
  * @property farmhand.module:items.potato
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const potato = crop({
-  // @ts-expect-error
   ...fromSeed(potatoSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{pumpkin.ts → pumpkin.js}

@@ -18,9 +18,7 @@ export const pumpkinSeed = crop({
  * @property farmhand.module:items.pumpkin
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const pumpkin = crop({
-  // @ts-expect-error
   ...fromSeed(pumpkinSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{soybean.ts → soybean.js}

@@ -18,9 +18,7 @@ export const soybeanSeed = crop({
  * @property farmhand.module:items.soybean
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const soybean = crop({
-  // @ts-expect-error
   ...fromSeed(soybeanSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{spinach.ts → spinach.js}

@@ -18,9 +18,7 @@ export const spinachSeed = crop({
  * @property farmhand.module:items.spinach
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const spinach = crop({
-  // @ts-expect-error
   ...fromSeed(spinachSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{strawberry.ts → strawberry.js}

@@ -18,9 +18,7 @@ export const strawberrySeed = crop({
  * @property farmhand.module:items.strawberry
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const strawberry = crop({
-  // @ts-expect-error
   ...fromSeed(strawberrySeed),
   name: 'Strawberry',
 })

package/src/data/crops/{sunflower.ts → sunflower.js}

@@ -18,9 +18,7 @@ export const sunflowerSeed = crop({
  * @property farmhand.module:items.sunflower
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const sunflower = crop({
-  // @ts-expect-error
   ...fromSeed(sunflowerSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{sweet-potato.ts → sweet-potato.js}

@@ -18,9 +18,7 @@ export const sweetPotatoSeed = crop({
  * @property farmhand.module:items.sweetPotato
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const sweetPotato = crop({
-  // @ts-expect-error
   ...fromSeed(sweetPotatoSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{tomato.ts → tomato.js}

@@ -18,9 +18,7 @@ export const tomatoSeed = crop({
  * @property farmhand.module:items.tomato
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const tomato = crop({
-  // @ts-expect-error
   ...fromSeed(tomatoSeed, {
     canBeFermented: true,
   }),

package/src/data/crops/{watermelon.ts → watermelon.js}

@@ -18,9 +18,7 @@ export const watermelonSeed = crop({
  * @property farmhand.module:items.watermelon
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const watermelon = crop({
-  // @ts-expect-error
   ...fromSeed(watermelonSeed),
   name: 'Watermelon',
 })

package/src/data/crops/{wheat.ts → wheat.js}

@@ -18,9 +18,7 @@ export const wheatSeed = crop({
  * @property farmhand.module:items.wheat
  * @type {farmhand.item}
  */
-// @ts-expect-error
 export const wheat = crop({
-  // @ts-expect-error
   ...fromSeed(wheatSeed),
   name: 'Wheat',
 })

package/src/data/{items.ts → items.js}

@@ -108,7 +108,7 @@ export const rainbowFertilizer = freeze({
   enablesFieldMode: fieldMode.FERTILIZE,
   id: 'rainbow-fertilizer',
   name: 'Rainbow Fertilizer',
-  type: /** @type {farmhand.itemType} */ FERTILIZER,
+  type: /** @type {farmhand.itemType} */ (FERTILIZER),
   // Rainbow Fertilizer is worth less than regular Fertilizer because it is not
   // sold in the shop. Items that are sold in the shop have automatically
   // reduced resale value, but since that would not apply to Rainbow
@@ -129,7 +129,7 @@ export const sprinkler = freeze({
   id: 'sprinkler',
   isReplantable: true,
   name: 'Sprinkler',
-  type: /** @type {farmhand.itemType} */ SPRINKLER,
+  type: /** @type {farmhand.itemType} */ (SPRINKLER),
   value: 120,
 })
 
@@ -148,7 +148,7 @@ export const scarecrow = freeze({
   id: 'scarecrow',
   isReplantable: true,
   name: 'Scarecrow',
-  type: /** @type {farmhand.itemType} */ SCARECROW,
+  type: /** @type {farmhand.itemType} */ (SCARECROW),
   value: 160,
 })
 
@@ -167,7 +167,7 @@ export const cowFeed = freeze({
   description:
     'Each cow automatically consumes one unit of Cow Feed per day. Fed cows gain and maintain weight.',
   name: 'Cow Feed',
-  type: /** @type {farmhand.itemType} */ COW_FEED,
+  type: /** @type {farmhand.itemType} */ (COW_FEED),
   value: 5,
 })
 
@@ -179,7 +179,7 @@ export const huggingMachine = freeze({
   id: HUGGING_MACHINE_ITEM_ID,
   description: 'Automatically hugs one cow three times every day.',
   name: 'Hugging Machine',
-  type: /** @type {farmhand.itemType} */ HUGGING_MACHINE,
+  type: /** @type {farmhand.itemType} */ (HUGGING_MACHINE),
   value: 500,
 })
 
@@ -190,7 +190,7 @@ export const huggingMachine = freeze({
 export const milk1 = freeze({
   id: 'milk-1',
   name: 'Grade C Milk',
-  type: /** @type {farmhand.itemType} */ MILK,
+  type: /** @type {farmhand.itemType} */ (MILK),
   value: 40,
 })
 
@@ -201,7 +201,7 @@ export const milk1 = freeze({
 export const milk2 = freeze({
   id: 'milk-2',
   name: 'Grade B Milk',
-  type: /** @type {farmhand.itemType} */ MILK,
+  type: /** @type {farmhand.itemType} */ (MILK),
   value: 80,
 })
 
@@ -212,7 +212,7 @@ export const milk2 = freeze({
 export const milk3 = freeze({
   id: 'milk-3',
   name: 'Grade A Milk',
-  type: /** @type {farmhand.itemType} */ MILK,
+  type: /** @type {farmhand.itemType} */ (MILK),
   value: 120,
 })
 
@@ -223,7 +223,7 @@ export const milk3 = freeze({
 export const rainbowMilk1 = freeze({
   id: 'rainbow-milk-1',
   name: 'Grade C Rainbow Milk',
-  type: /** @type {farmhand.itemType} */ MILK,
+  type: /** @type {farmhand.itemType} */ (MILK),
   value: 60,
 })
 
@@ -234,7 +234,7 @@ export const rainbowMilk1 = freeze({
 export const rainbowMilk2 = freeze({
   id: 'rainbow-milk-2',
   name: 'Grade B Rainbow Milk',
-  type: /** @type {farmhand.itemType} */ MILK,
+  type: /** @type {farmhand.itemType} */ (MILK),
   value: 120,
 })
 
@@ -245,7 +245,7 @@ export const rainbowMilk2 = freeze({
 export const rainbowMilk3 = freeze({
   id: 'rainbow-milk-3',
   name: 'Grade A Rainbow Milk',
-  type: /** @type {farmhand.itemType} */ MILK,
+  type: /** @type {farmhand.itemType} */ (MILK),
   value: 180,
 })
 
@@ -256,6 +256,6 @@ export const rainbowMilk3 = freeze({
 export const chocolateMilk = freeze({
   id: 'chocolate-milk',
   name: 'Chocolate Milk',
-  type: /** @type {farmhand.itemType} */ MILK,
+  type: /** @type {farmhand.itemType} */ (MILK),
   value: 80,
 })

package/src/data/{levels.ts → levels.js}

@@ -6,136 +6,109 @@ import * as recipes from './recipes.js'
 
 export const levels = []
 
-// @ts-expect-error
 levels[1] = {
   unlocksShopItem: items.carrotSeed.id,
 }
 
-// @ts-expect-error
 levels[2] = {
   unlocksShopItem: items.spinachSeed.id,
 }
 
-// @ts-expect-error
 levels[3] = {
   unlocksShopItem: recipes.fertilizer.id,
 }
 
-// @ts-expect-error
 levels[4] = {
   unlocksShopItem: items.pumpkinSeed.id,
 }
 
-// @ts-expect-error
 levels[5] = {
   unlocksShopItem: items.sprinkler.id,
 }
 
-// @ts-expect-error
 levels[6] = {
   unlocksTool: toolType.SHOVEL,
 }
 
-// @ts-expect-error
 levels[8] = {
   increasesSprinklerRange: true,
 }
 
-// @ts-expect-error
 levels[10] = {
   unlocksShopItem: items.cornSeed.id,
 }
 
-// @ts-expect-error
 levels[12] = {
   increasesSprinklerRange: true,
 }
 
-// @ts-expect-error
 levels[14] = {
   unlocksShopItem: items.potatoSeed.id,
 }
 
-// @ts-expect-error
 if (features.FOREST) {
-  // @ts-expect-error
   levels[15] = {
     unlocksStageFocusType: stageFocusType.FOREST,
   }
 }
 
-// @ts-expect-error
 levels[16] = {
   unlocksShopItem: items.onionSeed.id,
 }
 
-// @ts-expect-error
 levels[18] = {
   unlocksShopItem: items.soybeanSeed.id,
 }
 
-// @ts-expect-error
 levels[20] = {
   unlocksShopItem: items.wheatSeed.id,
 }
 
-// @ts-expect-error
 levels[22] = {
   unlocksShopItem: items.tomatoSeed.id,
 }
 
-// @ts-expect-error
 levels[24] = {
   unlocksShopItem: items.asparagusSeed.id,
 }
 
-// @ts-expect-error
 levels[26] = {
   unlocksShopItem: items.jalapenoSeed.id,
 }
 
-// @ts-expect-error
 levels[28] = {
   unlocksShopItem: items.watermelonSeed.id,
 }
 
-// @ts-expect-error
 levels[30] = {
   unlocksShopItem: items.peaSeed.id,
 }
 
-// @ts-expect-error
 levels[32] = {
   unlocksShopItem: items.strawberrySeed.id,
 }
 
-// @ts-expect-error
 levels[34] = {
   unlocksShopItem: items.garlicSeed.id,
 }
 
-// @ts-expect-error
 levels[36] = {
   unlocksShopItem: items.sweetPotatoSeed.id,
 }
 
-// @ts-expect-error
 levels[38] = {
   unlocksShopItem: items.oliveSeed.id,
 }
 
-// @ts-expect-error
 levels[40] = {
   unlocksShopItem: items.sunflowerSeed.id,
 }
 
-// @ts-expect-error
 levels[42] = {
   unlocksShopItem: items.grapeSeed.id,
 }
 
 for (let i = 0; i < levels.length; i++) {
-  // @ts-expect-error
   levels[i] = { id: i, ...levels[i] }
 }
 
@@ -151,7 +124,6 @@ export const unlockableItems = levels.reduce((acc, { id, unlocksShopItem }) => {
 
 export const itemUnlockLevels = Object.entries(unlockableItems).reduce(
   (acc, [itemId, level]) => {
-    // @ts-expect-error
     acc[level] = itemId
     return acc
   },

package/src/data/{maps.ts → maps.js}

@@ -79,7 +79,6 @@ export const fermentableItemsMap = Object.fromEntries(
  */
 export const cropItemIdToSeedItemMap = Object.entries(baseItemsMap).reduce(
   (acc, [itemId, item]) => {
-    // @ts-expect-error
     const { growsInto } = item
     if (growsInto) {
       const variants = Array.isArray(growsInto) ? growsInto : [growsInto]
@@ -102,7 +101,7 @@ export const cropTypeToIdMap = {
   [CARROT]: 'carrot',
   [CORN]: 'corn',
   [GARLIC]: 'garlic',
-  [GRAPE /** @type {string | string[]} */]: grapeSeed.growsInto,
+  [GRAPE]: /** @type {string | string[]} */ (grapeSeed.growsInto),
   [JALAPENO]: 'jalapeno',
   [OLIVE]: 'olive',
   [ONION]: 'onion',

package/src/data/ores/{bronzeOre.ts → bronzeOre.js}

@@ -12,7 +12,7 @@ export const bronzeOre = freeze({
   doesPriceFluctuate: true,
   id: 'bronze-ore',
   name: 'Bronze Ore',
-  type: /** @type {farmhand.itemType} */ itemType.ORE,
+  type: /** @type {farmhand.itemType} */ (itemType.ORE),
   value: 25,
   spawnChance: BRONZE_SPAWN_CHANCE,
 })

package/src/data/ores/{coal.ts → coal.js}

@@ -12,7 +12,7 @@ export const coal = freeze({
   doesPriceFluctuate: false,
   id: 'coal',
   name: 'Coal',
-  type: /** @type {farmhand.itemType} */ itemType.FUEL,
+  type: /** @type {farmhand.itemType} */ (itemType.FUEL),
   spawnChance: COAL_SPAWN_CHANCE,
   value: 2,
 })

package/src/data/ores/{goldOre.ts → goldOre.js}

@@ -12,7 +12,7 @@ export const goldOre = freeze({
   doesPriceFluctuate: true,
   id: 'gold-ore',
   name: 'Gold Ore',
-  type: /** @type {farmhand.itemType} */ itemType.ORE,
+  type: /** @type {farmhand.itemType} */ (itemType.ORE),
   value: 500,
   spawnChance: GOLD_SPAWN_CHANCE,
 })

package/src/data/ores/{ironOre.ts → ironOre.js}

@@ -12,7 +12,7 @@ export const ironOre = freeze({
   doesPriceFluctuate: true,
   id: 'iron-ore',
   name: 'Iron Ore',
-  type: /** @type {farmhand.itemType} */ itemType.ORE,
+  type: /** @type {farmhand.itemType} */ (itemType.ORE),
   value: 40,
   spawnChance: IRON_SPAWN_CHANCE,
 })

package/src/data/ores/{saltRock.ts → saltRock.js}

@@ -13,6 +13,6 @@ export const saltRock = freeze({
   id: 'salt-rock',
   name: 'Salt Rock',
   spawnChance: SALT_ROCK_SPAWN_CHANCE,
-  type: /** @type {farmhand.itemType} */ itemType.STONE,
+  type: /** @type {farmhand.itemType} */ (itemType.STONE),
   value: 10,
 })

package/src/data/ores/{silverOre.ts → silverOre.js}

@@ -12,7 +12,7 @@ export const silverOre = freeze({
   doesPriceFluctuate: true,
   id: 'silver-ore',
   name: 'Silver Ore',
-  type: /** @type {farmhand.itemType} */ itemType.ORE,
+  type: /** @type {farmhand.itemType} */ (itemType.ORE),
   value: 100,
   spawnChance: SILVER_SPAWN_CHANCE,
 })

package/src/data/ores/{stone.ts → stone.js}

@@ -13,6 +13,6 @@ export const stone = freeze({
   id: 'stone',
   name: 'Stone',
   spawnChance: STONE_SPAWN_CHANCE,
-  type: /** @type {farmhand.itemType} */ itemType.STONE,
+  type: /** @type {farmhand.itemType} */ (itemType.STONE),
   value: 10,
 })