@terrafirmagreg-team/recipe 0.1.0 → 1.2.1

package/src/hooks/use-add-to-calc.ts

@@ -14,34 +14,38 @@ export function useAddToCalc(session: RecipeSession) {
   return useCallback(
     (item: string, kind: 'item' | 'fluid') => {
       const state = decodeCalcState(tree ?? '') ?? {
-        target: null,
-        selections: {},
+        cards: [],
+        wires: [],
         tagSelections: {},
       };
-      const same =
-        state.target?.id === item && state.target.kind === kind;
-      const target = same
-        ? { ...state.target!, amount: state.target!.amount + 1 }
-        : { id: item, kind, amount: 1 };
+      const existing = state.cards.find(
+        (card) => card.materialId === item && card.kind === kind,
+      );
+      const cards = existing
+        ? state.cards.map((card) =>
+            card === existing
+              ? { ...card, crafts: card.crafts + 1 }
+              : card,
+          )
+        : [
+            ...state.cards,
+            {
+              id: `c${Date.now().toString(36)}${Math.random().toString(36).slice(2, 5)}`,
+              materialId: item,
+              kind,
+              recipeId: null,
+              crafts: 1,
+            },
+          ];
       replaceUrlState(
         recipeCalcHref(
           dataset,
           lang,
-          encodeCalcState({
-            target,
-            ...(state.inventory ? { inventory: state.inventory } : {}),
-            selections: same
-              ? state.selections
-              : Object.fromEntries(
-                  Object.entries(state.selections).filter(
-                    ([path]) => !/^g\d/.test(path),
-                  ),
-                ),
-            tagSelections: state.tagSelections,
-          }),
+          encodeCalcState({ ...state, cards }),
         ),
       );
     },
     [tree, dataset, lang],
   );
 }
+

package/src/hooks/use-categories-by-id.ts

@@ -0,0 +1,18 @@
+import { useMemo } from 'react';
+import type {
+  RecipeCategory,
+  RecipeCompactIndex,
+} from '@terrafirmagreg-team/recipe/types';
+
+export function useCategoriesById(
+  index: RecipeCompactIndex | null | undefined,
+): Map<string, RecipeCategory> {
+  return useMemo(
+    () =>
+      new Map<string, RecipeCategory>(
+        (index?.categories ?? []).map((row) => [row.id, row]),
+      ),
+    [index],
+  );
+}
+

package/src/hooks/use-favorite-hotkey.ts

@@ -36,3 +36,4 @@ export function useFavoriteHotkey() {
     return () => window.removeEventListener('keydown', onKey);
   }, [toggleItem, toggleRecipe]);
 }
+

package/src/hooks/use-favorites.ts

@@ -132,3 +132,4 @@ export function useFavorites() {
     isRecipeFavorite,
   };
 }
+

package/src/hooks/use-group-outlines.ts

@@ -62,3 +62,4 @@ export function useGroupOutlines(
 
   return { gridRef, outlines };
 }
+

package/src/hooks/use-hide-unused.ts

@@ -2,10 +2,11 @@ import { boolCodec, createStoredValue } from '@terrafirmagreg-team/ui/lib/utils/
 
 const useStoredHideUnused = createStoredValue(
   'wiki.recipe.hideUnused',
-  boolCodec(true),
+  boolCodec(false),
 );
 
 export function useHideUnused() {
   const [hideUnused, setHideUnused] = useStoredHideUnused();
   return { hideUnused, setHideUnused };
 }
+

package/src/hooks/use-index.ts

@@ -1,4 +1,5 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { startTransition, useMemo, useState } from 'react';
 import { useLang } from '@terrafirmagreg-team/translate/provider';
@@ -23,7 +24,7 @@ function idle(): Promise<void> {
   });
 }
 
-export function useRecipeIndex(dataset: string, lang: string) {
+export function useRecipeIndex(dataset: DatasetRef | undefined, lang: string) {
   const [loaded, setLoaded] = useState<LoadedIndex | null>(null);
   const [complete, setComplete] = useState<string | null>(null);
   const [lastFull, setLastFull] = useState<RecipeCompactIndex | null>(null);
@@ -32,9 +33,10 @@ export function useRecipeIndex(dataset: string, lang: string) {
     () => items?.map((item) => item.locale) ?? [lang],
     [items, lang],
   );
-  const key = `${dataset} ${lang}`;
+  const key = `${dataset ? `${dataset.id}/${dataset.version ?? ''}` : ''} ${lang}`;
 
   useAsyncEffect(async (isCancelled) => {
+    if (!dataset) return;
     const skeleton = await loadRecipeSkeletonIndex(dataset);
     if (isCancelled()) return;
     setLoaded({ key, index: skeleton });
@@ -51,6 +53,7 @@ export function useRecipeIndex(dataset: string, lang: string) {
   }, [dataset, lang]);
 
   useAsyncEffect(async (isCancelled) => {
+    if (!dataset) return;
     const others = locales.filter((entry) => entry !== lang);
     for (const entry of others) {
       if (isCancelled()) return;
@@ -66,3 +69,4 @@ export function useRecipeIndex(dataset: string, lang: string) {
   const index = active?.items.length ? active : (lastFull ?? active);
   return { index, indexLoading: complete !== key };
 }
+

package/src/hooks/use-item-feeds.ts

@@ -1,4 +1,5 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useAsyncResult } from '@terrafirmagreg-team/ui/hooks/use-async-value';
 import {
@@ -16,7 +17,7 @@ export function useItemFeeds({
   item,
   kind,
 }: {
-  dataset: string;
+  dataset: DatasetRef;
   index: RecipeCompactIndex | null;
   indexLoading: boolean;
   item: string;
@@ -42,3 +43,4 @@ export function useItemFeeds({
     pending: indexLoading || !index || recipesRes.pending || usesRes.pending,
   };
 }
+

package/src/hooks/use-item-pane.ts

@@ -1,4 +1,5 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { createElement, useMemo } from 'react';
 import { ArrowDownToLine, ArrowUpFromLine, Tag } from 'lucide-react';
@@ -31,7 +32,7 @@ export function useItemPane({
   tagCount,
   feedsPending,
 }: {
-  dataset: string;
+  dataset: DatasetRef;
   lang: Lang;
   nav: RecipeHrefOpts;
   relation?: RecipeRelation;
@@ -78,21 +79,21 @@ export function useItemPane({
     () => [
       {
         id: 'recipes',
-        label: t('recipe.pane_recipes'),
+        label: t('Recipes', { note: 'recipe.pane_recipes' }),
         icon: createElement(ArrowDownToLine, { className: 'size-3.5' }),
         help: 'R',
         disabled: !available.recipes,
       },
       {
         id: 'uses',
-        label: t('recipe.pane_uses'),
+        label: t('Uses', { note: 'recipe.pane_uses' }),
         icon: createElement(ArrowUpFromLine, { className: 'size-3.5' }),
         help: 'U',
         disabled: !available.uses,
       },
       {
         id: 'tags',
-        label: t('recipe.pane_tags'),
+        label: t('Tags', { note: 'recipe.pane_tags' }),
         icon: createElement(Tag, { className: 'size-3.5' }),
         help: 'T',
         disabled: !available.tags,
@@ -102,3 +103,4 @@ export function useItemPane({
   );
   return { pane, select, options };
 }
+

package/src/hooks/use-item-press.ts

@@ -1,4 +1,5 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { startTransition, useCallback, useEffect, useRef } from 'react';
 import {
@@ -18,7 +19,7 @@ export function useItemPress({
   nav,
   isCalc,
 }: {
-  dataset: string;
+  dataset: DatasetRef;
   lang: Lang;
   nav: RecipeHrefOpts;
   isCalc: boolean;
@@ -30,35 +31,37 @@ export function useItemPress({
     pressRef.current = (id: string, ref?: 'item' | 'fluid') => {
       startTransition(() => {
         if (isCalc) {
-
           const key = calcStorageKey('recipe', dataset);
           const parsed = readCalcStorage(key) ?? {
-            target: null,
-            selections: {},
+            cards: [],
+            wires: [],
             tagSelections: {},
           };
           const kind = ref === 'fluid' ? ('fluid' as const) : ('item' as const);
-          const same =
-            parsed.target?.id === id && parsed.target.kind === kind;
-
-          const keepTree = same;
+          const same = parsed.cards.findIndex(
+            (row) => row.materialId === id && row.kind === kind,
+          );
+          const cards =
+            same >= 0
+              ? parsed.cards.map((row, index) =>
+                  index === same ? { ...row, crafts: row.crafts + 1 } : row,
+                )
+              : [
+                  ...parsed.cards,
+                  {
+                    id: `c${Date.now().toString(36)}${Math.random()
+                      .toString(36)
+                      .slice(2, 4)}`,
+                    materialId: id,
+                    kind,
+                    recipeId: null,
+                    crafts: 1,
+                  },
+                ];
           writeCalcStorage(key, {
-            target: same
-              ? { ...parsed.target!, amount: parsed.target!.amount + 1 }
-              : { id, kind, amount: 1 },
-            ...(parsed.inventory ? { inventory: parsed.inventory } : {}),
-            selections: keepTree
-              ? parsed.selections
-              : Object.fromEntries(
-                  Object.entries(parsed.selections).filter(
-                    ([path]) => !/^g\d/.test(path),
-                  ),
-                ),
+            cards,
+            wires: parsed.wires,
             tagSelections: parsed.tagSelections,
-            ...(keepTree && parsed.collapsed
-              ? { collapsed: parsed.collapsed }
-              : {}),
-            ...(keepTree && parsed.auto ? { auto: parsed.auto } : {}),
           });
           requestCalcFocus(id);
           return;
@@ -83,3 +86,4 @@ export function useItemPress({
     [],
   );
 }
+

package/src/hooks/use-item-tag-groups.ts

@@ -1,10 +1,11 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useMemo } from 'react';
 import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
 import { loadTagSlice } from '@terrafirmagreg-team/recipe/lib/client-index';
 import { registryId } from '@terrafirmagreg-team/recipe/lib/lookup';
-import { splitDumpId } from '@terrafirmagreg-team/game/lib/dump/paths';
+import { splitDumpId } from '@terrafirmagreg-team/dump/lib/dump/paths';
 import type { RecipeCompactIndex } from '@terrafirmagreg-team/recipe/types';
 
 const EMPTY_TAGS: { id: string; kind: string }[] = [];
@@ -15,7 +16,7 @@ export function useItemTagGroups({
   item,
   kind,
 }: {
-  dataset: string;
+  dataset: DatasetRef;
   index: RecipeCompactIndex | null;
   item: string;
   kind: 'item' | 'fluid';
@@ -50,3 +51,4 @@ export function useItemTagGroups({
   }, [ids]);
   return { ids, groups };
 }
+

package/src/hooks/use-item-tooltips.ts

@@ -1,11 +1,12 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
 import { loadItemTooltips } from '@terrafirmagreg-team/recipe/lib/client-index';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 
 export function useItemTooltips(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
   enabled: boolean,
 ): Record<string, string[]> | undefined {
@@ -14,3 +15,4 @@ export function useItemTooltips(
     [dataset, lang, enabled],
   );
 }
+

package/src/hooks/use-left-sidebar-tree.ts

@@ -1,18 +1,25 @@
 'use client';
 import { usePathname } from 'next/navigation';
+import { useMemo } from 'react';
 import type * as PageTree from 'fumadocs-core/page-tree';
+import { useLocationSearchParams } from '@terrafirmagreg-team/ui/hooks/page/use-location-search';
 import { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { useLastValue } from '@terrafirmagreg-team/ui/hooks/use-last-value';
 import { useRecipeModNames } from '@terrafirmagreg-team/recipe/hooks/use-mod-names';
 import { useSidebarGroup } from '@terrafirmagreg-team/recipe/hooks/use-sidebar-group';
 import { groupRecipeSidebarByMod } from '@terrafirmagreg-team/recipe/lib/sidebar';
-import { parseSectionLocation } from '@terrafirmagreg-team/kit/lib/location';
+import { parseSectionLocation } from '@terrafirmagreg-team/sites/location';
 
 export function useRecipeLeftSidebarTree(tree: PageTree.Root): PageTree.Root {
-  const { dataset } = parseSectionLocation(usePathname());
+  const { dataset: datasetId } = parseSectionLocation(usePathname());
   const lang = useResolvedLang();
   const { sidebarGroup } = useSidebarGroup();
-  const scopeKey = dataset ?? '';
+  const scopeKey = datasetId ?? '';
+  const version = useLocationSearchParams().get('version') ?? undefined;
+  const dataset = useMemo(
+    () => (datasetId ? { id: datasetId, version } : undefined),
+    [datasetId, version],
+  );
   const modNames = useLastValue(
     useRecipeModNames(
       sidebarGroup === 'mod' ? dataset : undefined,
@@ -24,3 +31,4 @@ export function useRecipeLeftSidebarTree(tree: PageTree.Root): PageTree.Root {
     ? groupRecipeSidebarByMod(tree, modNames)
     : tree;
 }
+

package/src/hooks/use-mod-names.ts

@@ -1,11 +1,12 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
-import { loadClientModNames } from '@terrafirmagreg-team/game/lib/dump/client/mods';
+import { loadClientModNames } from '@terrafirmagreg-team/dump/lib/dump/client/mods';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 
 export function useRecipeModNames(
-  dataset: string | undefined,
+  dataset: DatasetRef | undefined,
   lang: Lang,
 ): Record<string, string> | undefined {
   return useAsyncValue(
@@ -13,3 +14,4 @@ export function useRecipeModNames(
     [dataset, lang],
   );
 }
+

package/src/hooks/use-mount-limit.ts

@@ -19,3 +19,4 @@ export function useMountLimit(length: number, resetKey: unknown): number {
   }, [length, limit]);
   return limit;
 }
+

package/src/hooks/use-panel-cells.ts

@@ -1,4 +1,5 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useDeferredValue, useMemo } from 'react';
 import { useItemTooltips } from '@terrafirmagreg-team/recipe/hooks/use-item-tooltips';
@@ -33,7 +34,7 @@ export function usePanelCells({
   favorites,
   expandedGroups,
 }: {
-  dataset: string;
+  dataset: DatasetRef;
   index: RecipeCompactIndex | null;
   names: Record<string, Record<string, string>>;
   lang: Lang;
@@ -113,3 +114,4 @@ export function usePanelCells({
 
   return { cells, filtered: deferredFiltered, favoriteIds, dIndex, dNames, dLang };
 }
+

package/src/hooks/use-panel-page.ts

@@ -1,4 +1,5 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useCallback } from 'react';
 import {
@@ -32,20 +33,22 @@ const useStoredPanelPages = createStoredValue(
   codec,
 );
 
-export function usePanelPage(dataset: string) {
+export function usePanelPage(dataset: DatasetRef) {
   const [pages, setPages] = useStoredPanelPages();
+  const refKey = `${dataset.id}/${dataset.version ?? ''}`;
   const setPage = useCallback(
     (page: number) => {
       setPages((prev) => {
         const next = page > 0 ? page : 0;
-        if ((prev[dataset] ?? 0) === next) return prev;
+        if ((prev[refKey] ?? 0) === next) return prev;
         const copy = { ...prev };
-        if (next > 0) copy[dataset] = next;
-        else delete copy[dataset];
+        if (next > 0) copy[refKey] = next;
+        else delete copy[refKey];
         return copy;
       });
     },
-    [dataset, setPages],
+    [refKey, setPages],
   );
-  return { page: pages[dataset] ?? 0, setPage };
+  return { page: pages[refKey] ?? 0, setPage };
 }
+

package/src/hooks/use-panel-tabs.ts

@@ -23,7 +23,7 @@ export function usePanelTabs(
           size: 'lg',
           href: false,
         }),
-        help: t('recipe.all_items'),
+        help: t('All items', { note: 'recipe.all_items' }),
       },
       ...panelTabRows(index, names, lang).map((row) => ({
         id: row.id,
@@ -40,3 +40,4 @@ export function usePanelTabs(
     [index, lang, names, t],
   );
 }
+

package/src/hooks/use-query.ts

@@ -1,31 +1,32 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useEffect, useState } from 'react';
-import { useSearchParams } from 'next/navigation';
+import { useLocationSearchParams } from '@terrafirmagreg-team/ui/hooks/page/use-location-search';
 import { replaceUrlState } from '@terrafirmagreg-team/ui/lib/utils/history';
 import {
   recipeCalcHref,
   recipeHref,
   recipePlaceFromParams,
 } from '@terrafirmagreg-team/recipe/lib/links';
-import { canonicalStackId } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import { canonicalStackId } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 import type { RecipeRelation } from '@terrafirmagreg-team/recipe/types';
 
-function urlPage(params: ReturnType<typeof useSearchParams>, key: string) {
+function urlPage(params: URLSearchParams, key: string) {
   const raw = Number.parseInt(params.get(key) || '1', 10);
   return Number.isFinite(raw) && raw > 0 ? raw - 1 : 0;
 }
 
 function urlRelation(
-  params: ReturnType<typeof useSearchParams>,
+  params: URLSearchParams,
 ): RecipeRelation | undefined {
   const value = params.get('relation');
   return value === 'uses' || value === 'tags' ? value : undefined;
 }
 
-export function useRecipeQuery(dataset: string, lang: Lang) {
-  const params = useSearchParams();
+export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
+  const params = useLocationSearchParams();
 
   const place = recipePlaceFromParams(params);
   const isCalc = place.kind === 'calc';
@@ -182,3 +183,4 @@ export function useRecipeQuery(dataset: string, lang: Lang) {
     rpage: rpageValue,
   };
 }
+

package/src/hooks/use-session.ts

@@ -1,10 +1,11 @@
 'use client';
 
 import { useEffect, useMemo } from 'react';
+import { useVersionedDataset } from '@terrafirmagreg-team/kit/hooks/use-versioned-dataset';
 import { useRecipeIndex } from '@terrafirmagreg-team/recipe/hooks/use-index';
 import { useRecipeQuery } from '@terrafirmagreg-team/recipe/hooks/use-query';
 import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
-import { clientDumpLang } from '@terrafirmagreg-team/game/lib/dump/client/dump';
+import { clientDumpLang } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
 import { useRecipeIndexNames } from '@terrafirmagreg-team/recipe/lib/index-store';
 import {
   RECIPE_ALL_TYPE,
@@ -20,7 +21,9 @@ import type {
 } from '@terrafirmagreg-team/recipe/types';
 
 export function useRecipeSession(page: RecipePageData): RecipeSession {
-  const { dataset, lang } = page;
+  const { dataset: id, lang } = page;
+  const dataset =
+    useVersionedDataset(id.id, { versions: page.versions }) ?? id;
   const query = useRecipeQuery(dataset, lang);
   const { index, indexLoading } = useRecipeIndex(dataset, lang);
   const placeOpts = recipePlaceOpts(query.place);
@@ -82,3 +85,4 @@ export function useRecipeSession(page: RecipePageData): RecipeSession {
     used,
   };
 }
+

package/src/hooks/use-sidebar-group.ts

@@ -1,20 +1,16 @@
 import {
   createStoredValue,
-  type StoredCodec,
+  literalCodec,
 } from '@terrafirmagreg-team/ui/lib/utils/stored-value';
 import type { RecipeSidebarGroup } from '@terrafirmagreg-team/recipe/types';
 
-const codec: StoredCodec<RecipeSidebarGroup> = {
-  read: (raw) => (raw === 'mod' ? 'mod' : 'flat'),
-  write: (value) => value,
-};
-
 const useStoredSidebarGroup = createStoredValue(
   'wiki.recipe.sidebarGroup',
-  codec,
+  literalCodec<RecipeSidebarGroup>(['flat', 'mod'], 'mod'),
 );
 
 export function useSidebarGroup() {
   const [sidebarGroup, setSidebarGroup] = useStoredSidebarGroup();
   return { sidebarGroup, setSidebarGroup };
 }
+

package/src/hooks/use-tag-members.ts

@@ -1,10 +1,11 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
 import { loadAllTagMembers } from '@terrafirmagreg-team/recipe/lib/client-index';
 
 export function useTagMembers(
-  dataset: string,
+  dataset: DatasetRef,
   enabled: boolean,
 ): Record<string, string[]> | undefined {
   return useAsyncValue(
@@ -12,3 +13,4 @@ export function useTagMembers(
     [dataset, enabled],
   );
 }
+

package/src/hooks/use-tool-recipes.ts

@@ -23,3 +23,4 @@ export function useToolRecipes<T>(
     [dataset, index, category, parse],
   );
 }
+

package/src/hooks/use-type-filter.ts

@@ -70,3 +70,4 @@ export function useTypeFilter(
     rows: activeRows,
   };
 }
+

package/src/lib/alloy/mix.ts

@@ -207,3 +207,4 @@ export function minimalAdditions(
   }
   return null;
 }
+

package/src/lib/alloy/parse.ts

@@ -34,3 +34,4 @@ export function toAlloyRecipe(recipe: Recipe): AlloyRecipe {
   }));
   return { recipe, components };
 }
+

package/src/lib/calc/defaults.ts

@@ -1,9 +1,10 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 const KEY_PREFIX = 'calc:recipe-defaults:';
 
-export function readRecipeDefaults(dataset: string): Record<string, string> {
+export function readRecipeDefaults(dataset: DatasetRef): Record<string, string> {
   if (typeof window === 'undefined') return {};
   try {
-    const raw = window.localStorage.getItem(`${KEY_PREFIX}${dataset}`);
+    const raw = window.localStorage.getItem(`${KEY_PREFIX}${dataset.id}/${dataset.version ?? ''}`);
     if (!raw) return {};
     const parsed = JSON.parse(raw);
     if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed))
@@ -28,7 +29,7 @@ export function subscribeRecipeDefaults(listener: () => void): () => void {
 }
 
 export function writeRecipeDefault(
-  dataset: string,
+  dataset: DatasetRef,
   materialId: string,
   recipeId: string | null,
 ): Record<string, string> {
@@ -36,10 +37,11 @@ export function writeRecipeDefault(
   if (recipeId === null) delete next[materialId];
   else next[materialId] = recipeId;
   try {
-    window.localStorage.setItem(`${KEY_PREFIX}${dataset}`, JSON.stringify(next));
+    window.localStorage.setItem(`${KEY_PREFIX}${dataset.id}/${dataset.version ?? ''}`, JSON.stringify(next));
   } catch {
 
   }
   window.dispatchEvent(new Event(EVENT));
   return next;
 }
+