@terrafirmagreg-team/recipe 0.1.0 → 1.2.0

package/src/lib/links.ts

@@ -1,7 +1,10 @@
 import { encodeQueryValue, withLang } from '@terrafirmagreg-team/translate/lib/url';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
-import { sectionUrl } from '@terrafirmagreg-team/kit/lib/location';
-import { dumpRelPublicUrl, splitDumpId, tagPseudoId } from '@terrafirmagreg-team/game/lib/dump/paths';
+import {
+  type DatasetRef,
+  sectionUrl,
+} from '@terrafirmagreg-team/sites/location';
+import { dumpRelPublicUrl, splitDumpId, tagPseudoId } from '@terrafirmagreg-team/dump/lib/dump/paths';
 import type { RecipeHrefOpts, RecipePlace } from '@terrafirmagreg-team/recipe/types';
 
 export type { RecipeHrefOpts, RecipePlace } from '@terrafirmagreg-team/recipe/types';
@@ -17,8 +20,8 @@ function recipeQuery(
   return parts.join('&');
 }
 
-export function recipeBasePath(dataset: string): string {
-  return sectionUrl('recipe', dataset);
+export function recipeBasePath(dataset: DatasetRef): string {
+  return sectionUrl('recipe', dataset.id);
 }
 
 export const RECIPE_ALL_TYPE = 'all';
@@ -44,7 +47,7 @@ export function recipePlaceOpts(
 }
 
 export function recipeHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang | undefined,
   opts?: RecipeHrefOpts,
 ): string {
@@ -64,6 +67,7 @@ export function recipeHref(
       'rpage',
       opts?.rpage && opts.rpage > 1 ? Math.floor(opts.rpage) : undefined,
     ],
+    ['version', dataset.version],
   ]);
   const base = recipeBasePath(dataset);
   const href = query ? `${base}?${query}` : base;
@@ -71,20 +75,21 @@ export function recipeHref(
 }
 
 export function recipeCalcHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang | undefined,
   tree?: string,
 ): string {
   const query = recipeQuery([
     ['tool', 'calc'],
     ['tree', tree],
+    ['version', dataset.version],
   ]);
   const href = `${recipeBasePath(dataset)}?${query}`;
   return lang ? withLang(href, lang) : href;
 }
 
 export function recipeStackHref(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
   id: string,
   opts?: Pick<RecipeHrefOpts, 'tab' | 'search'> & {
@@ -110,10 +115,10 @@ export function recipeStackHref(
     : recipeHref(dataset, lang, { item: id, ...kept });
 }
 
-export { recipeImageUrl } from '@terrafirmagreg-team/game/lib/dump/assets/urls';
+export { recipeImageUrl } from '@terrafirmagreg-team/dump/lib/dump/assets/urls';
 
 export function recipeCardImageUrl(
-  dataset: string,
+  dataset: DatasetRef,
   recipeId: string | undefined,
 ): string | undefined {
   const parts = recipeId ? splitDumpId(recipeId) : undefined;
@@ -123,3 +128,4 @@ export function recipeCardImageUrl(
     `assets/${parts.ns}/textures/recipe/${parts.path}.webp`,
   );
 }
+

package/src/lib/lookup.ts

@@ -1,17 +1,18 @@
-import { asStringList } from '@terrafirmagreg-team/game/lib/dump/contract/read';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { asStringList } from '@terrafirmagreg-team/dump/lib/dump/contract/read';
 import type { RecipeCompactIndex, RecipeCompactRow } from '@terrafirmagreg-team/recipe/types';
-import { registryId, splitDumpId } from '@terrafirmagreg-team/game/lib/dump/paths';
-import { resolveClientTag } from '@terrafirmagreg-team/game/lib/dump/client/tags';
+import { registryId, splitDumpId } from '@terrafirmagreg-team/dump/lib/dump/paths';
+import { resolveClientTag } from '@terrafirmagreg-team/dump/lib/dump/client/tags';
 import {
   loadRegistryEntrySlice,
   loadTagSlice,
   loadTypeRows,
   resolveRecipeRows,
 } from '@terrafirmagreg-team/recipe/lib/client-index';
-import { stackIdFromRef } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import { stackIdFromRef } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import { loadFluidIoIndex } from '@terrafirmagreg-team/recipe/lib/fluid-outputs';
 
-export { registryId, tagPseudoId } from '@terrafirmagreg-team/game/lib/dump/paths';
+export { registryId, tagPseudoId } from '@terrafirmagreg-team/dump/lib/dump/paths';
 
 function uniqueRows(rows: RecipeCompactRow[]): RecipeCompactRow[] {
   const seen = new Set<string>();
@@ -25,7 +26,7 @@ function uniqueRows(rows: RecipeCompactRow[]): RecipeCompactRow[] {
 const ALL_KINDS = ['item', 'block', 'fluid', 'entity'];
 
 async function entryEdges(
-  dataset: string,
+  dataset: DatasetRef,
   kinds: string[],
   id: string,
   field: 'usedBy' | 'producedBy',
@@ -41,7 +42,7 @@ async function entryEdges(
 }
 
 export async function recipesForOutput(
-  dataset: string,
+  dataset: DatasetRef,
   index: RecipeCompactIndex,
   item: string,
   opts?: { includeTagRows?: boolean },
@@ -59,7 +60,7 @@ export async function recipesForOutput(
 }
 
 export async function usesForInput(
-  dataset: string,
+  dataset: DatasetRef,
   index: RecipeCompactIndex,
   item: string,
   kind: string = 'item',
@@ -115,3 +116,4 @@ export async function usesForInput(
     ...stationRows.flat(),
   ]);
 }
+

package/src/lib/panel-outline.ts

@@ -83,3 +83,4 @@ export function groupOutlines(
   }
   return out;
 }
+

package/src/lib/panel.ts

@@ -1,8 +1,8 @@
 import {
   stackIdFromRef,
   type TaggedReference,
-} from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import { registryId } from '@terrafirmagreg-team/game/lib/dump/paths';
+} from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import { registryId } from '@terrafirmagreg-team/dump/lib/dump/paths';
 import { recipeItemName } from '@terrafirmagreg-team/recipe/lib/client-index';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 import type {
@@ -102,3 +102,4 @@ export function panelTabRows(
   }
   return rows;
 }
+

package/src/lib/preview.ts

@@ -1,9 +1,9 @@
-import { registerPreviewResolver } from '@terrafirmagreg-team/kit/lib/preview';
-import { clientDumpLang } from '@terrafirmagreg-team/game/lib/dump/client/dump';
-import { loadClientRecipeCategories } from '@terrafirmagreg-team/recipe/lib/client/recipe-categories';
-import { langString } from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
+import { registerPreviewResolver } from '@terrafirmagreg-team/preview/lib';
+import { clientDumpLang } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
+import { loadDatasetRecipeCategories } from '@terrafirmagreg-team/recipe/lib/data/category/load';
+import { langString } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
 import { entryPreviewIcon } from '@terrafirmagreg-team/game/lib/preview';
-import type { PreviewResolverCtx } from '@terrafirmagreg-team/kit/lib/preview';
+import type { PreviewResolverCtx } from '@terrafirmagreg-team/preview/lib';
 import type { PagePreviewData } from '@terrafirmagreg-team/ui/types/preview';
 
 export async function recipeLinkPreview({
@@ -11,11 +11,14 @@ export async function recipeLinkPreview({
   query,
   langMap,
 }: PreviewResolverCtx): Promise<PagePreviewData | undefined> {
-  const dataset = parts[1];
-  if (!dataset) return undefined;
+  const dataset = {
+    id: parts[1] ?? '',
+    version: query.get('version') ?? undefined,
+  };
+  if (!dataset.id) return undefined;
   const type = query.get('type');
   if (!type) return { title: 'Recipes' };
-  const categories = await loadClientRecipeCategories(dataset);
+  const categories = await loadDatasetRecipeCategories(dataset);
   const row = categories.find((category) => category.id === type);
   if (!row) return { title: type };
   return {
@@ -26,3 +29,4 @@ export async function recipeLinkPreview({
 }
 
 registerPreviewResolver('recipe', recipeLinkPreview, { langMap: clientDumpLang });
+

package/src/lib/recipe-slots.ts

@@ -5,3 +5,4 @@ export function recipeSlots(recipe: Recipe): RecipeSlotWidget[] {
     (widget): widget is RecipeSlotWidget => widget.type === 'slot',
   );
 }
+

package/src/lib/search.ts

@@ -136,3 +136,4 @@ export function filterCatalogItemIds(
   if (!groups.length) return ids;
   return ids.filter((id) => matchesGameItemSearch(id, ctx, groups));
 }
+

package/src/lib/sidebar.ts

@@ -44,3 +44,4 @@ export function groupRecipeSidebarByMod(
     $id: `${tree.$id}:mod`,
   };
 }
+

package/src/lib/used-items.ts

@@ -22,3 +22,4 @@ export function filterUsedIds(ids: string[], used: UsedItems): string[] {
 export function hasRecipeUsage(used: UsedItems): boolean {
   return used.ids.size > 0;
 }
+