@terrafirmagreg-team/recipe 1.2.1 → 1.2.3

package/src/hooks/use-query.ts

@@ -3,6 +3,7 @@ import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useEffect, useState } from 'react';
 import { useLocationSearchParams } from '@terrafirmagreg-team/ui/hooks/page/use-location-search';
+import { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { replaceUrlState } from '@terrafirmagreg-team/ui/lib/utils/history';
 import {
   recipeCalcHref,
@@ -10,7 +11,6 @@ import {
   recipePlaceFromParams,
 } from '@terrafirmagreg-team/recipe/lib/links';
 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: URLSearchParams, key: string) {
@@ -25,8 +25,9 @@ function urlRelation(
   return value === 'uses' || value === 'tags' ? value : undefined;
 }
 
-export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
+export function useRecipeQuery(dataset: DatasetRef) {
   const params = useLocationSearchParams();
+  const resolved = useResolvedLang();
 
   const place = recipePlaceFromParams(params);
   const isCalc = place.kind === 'calc';
@@ -79,8 +80,8 @@ export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
     if (!stray) return;
     replaceUrlState(
       isCalc
-        ? recipeCalcHref(dataset, lang, tree || undefined)
-        : recipeHref(dataset, lang, {
+        ? recipeCalcHref(dataset, resolved, tree || undefined)
+        : recipeHref(dataset, resolved, {
             tool: place.kind,
             id: recipeId,
             unit: alloyUnit,
@@ -92,7 +93,7 @@ export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
     isTool,
     isCalc,
     place.kind,
-    lang,
+    resolved,
     dataset,
     params,
     tree,
@@ -107,7 +108,7 @@ export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
     if (isTool) return;
     if (rawItem && rawFluid) {
       replaceUrlState(
-        recipeHref(dataset, lang, {
+        recipeHref(dataset, resolved, {
           type: params.get('type') ?? undefined,
           item: rawItem,
           id: recipeId,
@@ -121,7 +122,7 @@ export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
     }
   }, [
     isTool,
-    lang,
+    resolved,
     dataset,
     params,
     rawItem,
@@ -140,7 +141,7 @@ export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
     const canonFluid = rawFluid ? canonicalStackId(rawFluid) : undefined;
     if (canonItem === rawItem && canonFluid === rawFluid) return;
     replaceUrlState(
-      recipeHref(dataset, lang, {
+      recipeHref(dataset, resolved, {
         type: params.get('type') ?? undefined,
         item: canonItem,
         fluid: canonFluid,
@@ -154,7 +155,7 @@ export function useRecipeQuery(dataset: DatasetRef, lang: Lang) {
     );
   }, [
     isTool,
-    lang,
+    resolved,
     dataset,
     params,
     rawItem,

package/src/hooks/use-session.ts

@@ -5,6 +5,7 @@ import { useVersionedDataset } from '@terrafirmagreg-team/kit/hooks/use-versione
 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 { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { clientDumpLang } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
 import { useRecipeIndexNames } from '@terrafirmagreg-team/recipe/lib/index-store';
 import {
@@ -24,7 +25,7 @@ export function useRecipeSession(page: RecipePageData): RecipeSession {
   const { dataset: id, lang } = page;
   const dataset =
     useVersionedDataset(id.id, { versions: page.versions }) ?? id;
-  const query = useRecipeQuery(dataset, lang);
+  const query = useRecipeQuery(dataset);
   const { index, indexLoading } = useRecipeIndex(dataset, lang);
   const placeOpts = recipePlaceOpts(query.place);
 
@@ -65,11 +66,14 @@ export function useRecipeSession(page: RecipePageData): RecipeSession {
     query.place.id === RECIPE_ALL_TYPE &&
     !query.item &&
     !query.fluid;
+  const resolved = useResolvedLang();
   useEffect(() => {
     if (!bareIndex || !firstType) return;
-    replaceUrlState(recipeHref(dataset, lang, { ...nav, type: firstType }));
+    replaceUrlState(
+      recipeHref(dataset, resolved, { ...nav, type: firstType }),
+    );
     // eslint-disable-next-line react-hooks/exhaustive-deps -- nav rebuilds per render
-  }, [bareIndex, firstType, dataset, lang]);
+  }, [bareIndex, firstType, dataset, resolved]);
 
   return {
     page,

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

@@ -4,6 +4,7 @@ import { useEffect, useMemo } from 'react';
 import { groupByCategory } from '@terrafirmagreg-team/recipe/lib/group';
 import { TAG_RECIPE_TYPE } from '@terrafirmagreg-team/recipe/lib/client-index';
 import { RECIPE_ALL_TYPE, recipeHref } from '@terrafirmagreg-team/recipe/lib/links';
+import { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { replaceUrlState } from '@terrafirmagreg-team/ui/lib/utils/history';
 import type {
   RecipeCompactRow,
@@ -14,7 +15,6 @@ export function useTypeFilter(
   session: Pick<
     RecipeSession,
     | 'dataset'
-    | 'lang'
     | 'index'
     | 'nav'
     | 'place'
@@ -24,7 +24,8 @@ export function useTypeFilter(
   >,
   rows: RecipeCompactRow[],
 ) {
-  const { dataset, lang, index, nav, place, recipeId } = session;
+  const { dataset, index, nav, place, recipeId } = session;
+  const resolved = useResolvedLang();
   const groups = useMemo(
     () => groupByCategory(rows, index?.types ?? [], index?.categories),
     [rows, index],
@@ -51,15 +52,15 @@ export function useTypeFilter(
   useEffect(() => {
     if (!primary || valid) return;
     replaceUrlState(
-      recipeHref(dataset, lang, { ...nav, type: primary, rpage: undefined }),
+      recipeHref(dataset, resolved, { ...nav, type: primary, rpage: undefined }),
     );
     // eslint-disable-next-line react-hooks/exhaustive-deps -- nav rebuilds per render
-  }, [primary, valid, dataset, lang]);
+  }, [primary, valid, dataset, resolved]);
 
   const setActive = (next: string) => {
     if (next === active || next === urlType) return;
     replaceUrlState(
-      recipeHref(dataset, lang, { ...nav, type: next, rpage: undefined }),
+      recipeHref(dataset, resolved, { ...nav, type: next, rpage: undefined }),
     );
   };
 

package/src/lib/source.ts

@@ -0,0 +1,13 @@
+import * as clientIndex from '@terrafirmagreg-team/recipe/lib/client-index';
+import { loadDatasetRecipeCategories } from '@terrafirmagreg-team/recipe/lib/data/category/load';
+import { loadClientManifest } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
+
+export function getRecipeSource() {
+  return {
+    ...clientIndex,
+    categories: loadDatasetRecipeCategories,
+    manifest: loadClientManifest,
+  };
+}
+
+export type RecipeSource = ReturnType<typeof getRecipeSource>;