update brewable

_test/all.meta.json

@@ -1 +1 @@
-{"buildNum":"cdda-experimental-2023-07-27-0014","sha":"eb6f4a7d86c15cce1d23a1763ceb1395e52f34330dc93b2457a2ebff309ef893"}
+{"buildNum":"cdda-experimental-2023-08-11-0847","sha":"ef4c302badcfa2ce3a03ca1de4c6c9e61a74b17d2e8caf5a7410425bf6822b7d"}

src/data.ts

@@ -1256,9 +1256,16 @@ export class CddaData {
  return this.#grownFromIndex.lookup(item_id);
  }
 
- #brewedFromIndex = new ReverseIndex(this, "item", (x) =>
- x.id ? x.brewable?.results ?? [] : []
- );
+ #brewedFromIndex = new ReverseIndex(this, "item", (x) => {
+ function normalize(
+ results: undefined | string[] | Record<string, number>
+ ): string[] {
+ if (!results) return [];
+ if (Array.isArray(results)) return results;
+ return Object.keys(results);
+ }
+ return x.id ? normalize(x.brewable?.results) : [];
+ });
  brewedFrom(item_id: string) {
  return this.#brewedFromIndex.lookup(item_id);
  }

src/types.ts

@@ -647,7 +647,7 @@ export type ItemBasicInfo = {
  append?: boolean;
  }[];
  brewable?: {
- results: string[]; // item_id
+ results: string[] | Record<string, number>; // item_id
  time?: duration;
  };
  milling?: {

src/types/Item.svelte

@@ -463,11 +463,14 @@ function normalizeStackVolume(item: Item): (string | number) | undefined {
  {/if}
 
  {#if item.brewable}
+ {@const results = Array.isArray(item.brewable.results)
+ ? Object.fromEntries(item.brewable.results.map((r) => [r, 1]))
+ : item.brewable.results}
  <dt>{t("Ferments Into", { _context })}</dt>
  <dd>
  <ul class="comma-separated">
- {#each item.brewable.results as result_id}
- <li><ThingLink type="item" id={result_id} /></li>
+ {#each Object.entries(results) as [result_id, count]}
+ <li><ThingLink type="item" id={result_id} {count} /></li>
  {/each}
  </ul>
  ({item.brewable.time ?? "1 turn"})