fix: update preserve handling and introduce narrowed types, fixes #93

Author: colecrouter

StardewValleyDecompiled

@@ -0,0 +1 @@
+Subproject commit 5225ef409e42a6159a82cf81200bf6eb315c9961

codegen/helpers.ts

@@ -130,6 +130,18 @@ export const transformJSONItems = <
 		precision: "Precision" in obj ? obj.Precision : undefined,
 	}));
 
+export type PreserveLabel =
+	| "Wine"
+	| "Jelly"
+	| "Pickles"
+	| "Juice"
+	| "Roe"
+	| "Aged Roe"
+	| "Honey"
+	| "Bait"
+	| "Dried"
+	| "Smoked";
+
 interface ArtisanConfig {
 	filter: (obj: RegularObject) => boolean;
 	suffix?: string;
@@ -177,7 +189,7 @@ export const createArtisanGoods = (
 						.find((color) => color !== undefined)
 				: undefined,
 			unpreservedItemId: obj._key,
-			preservedItemName: artisanProduct.name,
+			preservedItemName: artisanProduct.name as PreserveLabel,
 		}));
 
 const textureFilter = ["TileSheets", "/", "\\"];

codegen/items.ts

@@ -1,3 +1,4 @@
+import type { PreserveLabel } from "./helpers.js";
 import type { TypeEnum } from "./save.js";
 
 export interface ItemBase {
@@ -26,7 +27,7 @@ export interface RegularObject extends ItemBase {
 	tags?: string[];
 	color?: string;
 	unpreservedItemId?: string;
-	preservedItemName?: string;
+	preservedItemName?: PreserveLabel;
 }
 
 export interface BigCraftable extends ItemBase {

codegen/save.ts

@@ -1361,7 +1361,7 @@ export interface Item {
 	synchronized?: boolean;
 	specialChestType?: SpecialChestType;
 	globalInventoryId?: StringContainer;
-	preserve?: string;
+	preserve?: Preserve;
 	preservedParentSheetIndex?: number;
 	color?: Color;
 	colorSameIndexAsParentSheetIndex?: boolean;
@@ -1547,3 +1547,17 @@ export interface SpecialOrderReward {
 	grantedMails?: StringContainer;
 	host?: BoolContainer;
 }
+
+export enum Preserve {
+	Wine = "Wine",
+	Jelly = "Jelly",
+	Pickle = "Pickle",
+	Juice = "Juice",
+	Roe = "Roe",
+	AgedRoe = "AgedRoe",
+	Honey = "Honey",
+	Bait = "Bait",
+	DriedFruit = "DriedFruit",
+	DriedMushroom = "DriedMushroom",
+	SmokedFish = "SmokedFish",
+}

src/lib/proxies/Item.svelte.ts

@@ -13,17 +13,64 @@ import {
 import type { ParentIndex } from "$lib/ItemParentIndex";
 import { Color } from "$lib/proxies/Color.svelte";
 import { Sprite } from "$lib/Sprite.svelte";
+import type { PreserveLabel } from "$types/helpers";
 import {
 	FurnitureType,
 	type ItemInformation,
 	ObjectCategory,
 	type ToolClass,
 } from "$types/items";
-import { ClothesType, type Item as ItemModel, TypeEnum } from "$types/save";
+import {
+	ClothesType,
+	type Item as ItemModel,
+	Preserve,
+	TypeEnum,
+} from "$types/save";
 import { type DataProxy, Raw } from ".";
 
 const nil = { "@_xsi:nil": "true" };
 
+/**
+ * Stardew serializes `Object.preserve` as an enum name (see `Object.PreserveType`).
+ * Our generated item metadata historically stored *display labels* like "Smoked" or
+ * "Pickles", which don't round-trip back into valid save XML.
+ */
+function normalizePreserveType(
+	label: PreserveLabel,
+	outputItemId: string,
+): Preserve {
+	// Common legacy-ish labels from our `generated/iteminfo.json`.
+	// The game's enum values are:
+	// Wine, Jelly, Pickle, Juice, Roe, AgedRoe, Honey, Bait, DriedFruit, DriedMushroom, SmokedFish
+	switch (label) {
+		case "Pickles":
+			return Preserve.Pickle;
+		case "Aged Roe":
+			return Preserve.AgedRoe;
+		case "Smoked":
+			return Preserve.SmokedFish;
+		case "Dried":
+			// The game differentiates fruit vs mushroom in the enum.
+			return outputItemId === "DriedMushrooms"
+				? Preserve.DriedMushroom
+				: Preserve.DriedFruit;
+		case "Wine":
+			return Preserve.Wine;
+		case "Jelly":
+			return Preserve.Jelly;
+		case "Juice":
+			return Preserve.Juice;
+		case "Roe":
+			return Preserve.Roe;
+		case "Honey":
+			return Preserve.Honey;
+		case "Bait":
+			return Preserve.Bait;
+		default:
+			throw new Error(`Unknown preserve type: ${label}`);
+	}
+}
+
 // Mapping of data types to item types
 const typeToItemTypeMap = new Map<ItemInformation["_type"], string>([
 	["Object", "Object"],
@@ -488,7 +535,7 @@ export class Item implements DataProxy<ItemModel> {
 				10,
 			);
 
-			item.preserve = data.preservedItemName;
+			item.preserve = normalizePreserveType(data.preservedItemName, data._key);
 		}
 
 		// Handle colored items (e.g. Wines, Juices)