@terrafirmagreg-team/recipe 0.1.0 → 1.2.0

package/src/lib/client/recipe-categories.ts

@@ -1,96 +1,14 @@
-import { asRecord } from '@terrafirmagreg-team/game/lib/dump/contract/read';
-import { asCategory } from '@terrafirmagreg-team/recipe/lib/data/category/parse';
-import type {
-  DumpRecipeCategory,
-  DumpRecipeLayout,
-} from '@terrafirmagreg-team/recipe/lib/data/category/dto';
-import type { RecipeTypeRow } from '@terrafirmagreg-team/game/lib/dump/gen';
-import {
-  clientDumpJson,
-  loadClientManifest,
-} from '@terrafirmagreg-team/game/lib/dump/client/dump';
-import { createAsyncCache } from '@terrafirmagreg-team/ui/lib/utils/async-cache';
-
-const clientCategoryFile = createAsyncCache(
-  async (dataset: string, ns: string) => {
-    const manifest = await loadClientManifest(dataset);
-    const listed = manifest?.namespaces[ns];
-    if (!listed || !listed.registry.includes('recipe_categories')) {
-      return undefined;
-    }
-    return asRecord(
-      await clientDumpJson(
-        dataset,
-        'registry/recipe_categories.json',
-        'high',
-      ),
-    );
-  },
-);
-
-function categoryFromRaw(
-  catalogKey: string,
-  raw: unknown,
-): DumpRecipeCategory | undefined {
-  return asCategory(
-    raw && typeof raw === 'object' && !Array.isArray(raw) && !('id' in raw)
-      ? { ...raw, id: catalogKey }
-      : raw,
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { loadDatasetRecipeCategories } from '@terrafirmagreg-team/recipe/lib/data/category/load';
+import type { DumpRecipeLayout } from '@terrafirmagreg-team/recipe/lib/data/category/dto';
+
+export function clientRecipeLayout(
+  dataset: DatasetRef,
+  categoryId: string,
+): Promise<DumpRecipeLayout | undefined> {
+  return loadDatasetRecipeCategories(dataset).then(
+    (categories) =>
+      categories.find((cat) => cat.id === categoryId)?.layout,
   );
 }
 
-export const clientRecipeLayout = createAsyncCache(
-  async (
-    dataset: string,
-    categoryId: string,
-  ): Promise<DumpRecipeLayout | undefined> => {
-    const ns = categoryId.split(':', 1)[0];
-    if (!ns) return undefined;
-    const entries = await clientCategoryFile(dataset, ns);
-    return categoryFromRaw(categoryId, entries?.[categoryId])?.layout;
-  },
-);
-
-function recipeNamespaces(types: RecipeTypeRow[] | undefined): string[] {
-  const out = new Set<string>();
-  for (const row of types ?? []) {
-    const ns = row.id.split(':', 1)[0];
-    if (ns) out.add(ns);
-    for (const fileNs of Object.keys(row.files ?? {})) {
-      if (fileNs) out.add(fileNs);
-    }
-  }
-  return [...out];
-}
-
-export const loadClientRecipeCategories = createAsyncCache(
-  async (dataset: string): Promise<DumpRecipeCategory[]> => {
-    const merged = asRecord(
-      await clientDumpJson(dataset, 'registry/recipe_categories.json'),
-    );
-    if (merged) {
-      const out: DumpRecipeCategory[] = [];
-      for (const [catalogKey, raw] of Object.entries(merged)) {
-        const cat = categoryFromRaw(catalogKey, raw);
-        if (cat) out.push(cat);
-      }
-      out.sort((a, b) => a.order - b.order || a.id.localeCompare(b.id));
-      return out;
-    }
-    const manifest = await loadClientManifest(dataset);
-    const namespaces = recipeNamespaces(manifest?.indexes.recipes.types);
-    const out: DumpRecipeCategory[] = [];
-    await Promise.all(
-      namespaces.map(async (ns) => {
-        const entries = await clientCategoryFile(dataset, ns);
-        if (!entries) return;
-        for (const [catalogKey, raw] of Object.entries(entries)) {
-          const cat = categoryFromRaw(catalogKey, raw);
-          if (cat) out.push(cat);
-        }
-      }),
-    );
-    out.sort((a, b) => a.order - b.order || a.id.localeCompare(b.id));
-    return out;
-  },
-);

package/src/lib/client/recipe.ts

@@ -1,15 +1,16 @@
-import { asRecord, asString } from '@terrafirmagreg-team/game/lib/dump/contract/read';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { asRecord, asString } from '@terrafirmagreg-team/dump/lib/dump/contract/read';
 import { parseRecipe } from '@terrafirmagreg-team/recipe/lib/data/parse';
 import type { Recipe } from '@terrafirmagreg-team/recipe/lib/data/dto';
-import { dumpRelPublicUrl } from '@terrafirmagreg-team/game/lib/dump/paths';
+import { dumpRelPublicUrl } from '@terrafirmagreg-team/dump/lib/dump/paths';
 import {
   clientDumpJson,
   loadClientManifest,
-} from '@terrafirmagreg-team/game/lib/dump/client/dump';
+} from '@terrafirmagreg-team/dump/lib/dump/client/dump';
 import { clientRecipeLayout } from '@terrafirmagreg-team/recipe/lib/client/recipe-categories';
-import { createAsyncCache } from '@terrafirmagreg-team/ui/lib/utils/async-cache';
+import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
 
-const recipeIndex = createAsyncCache(async (dataset: string, ns: string) => {
+const recipeIndex = createDatasetCache(async (dataset: DatasetRef, ns: string) => {
   const manifest = await loadClientManifest(dataset);
   const listed = manifest?.namespaces[ns];
   if (!listed || !listed.registry.includes('recipes')) return undefined;
@@ -19,7 +20,7 @@ const recipeIndex = createAsyncCache(async (dataset: string, ns: string) => {
 });
 
 export async function clientRecipeFileRels(
-  dataset: string,
+  dataset: DatasetRef,
   recipeId: string,
 ): Promise<string[]> {
   const ns = recipeId.split(':', 1)[0];
@@ -46,19 +47,19 @@ export async function clientRecipeFileRels(
 }
 
 async function clientRecipeFileRel(
-  dataset: string,
+  dataset: DatasetRef,
   recipeId: string,
 ): Promise<string | undefined> {
   return (await clientRecipeFileRels(dataset, recipeId))[0];
 }
 
 export const loadClientRecipe: (
-  dataset: string,
+  dataset: DatasetRef,
   id: string,
   bucket?: string,
-) => Promise<Recipe | undefined> = createAsyncCache(
+) => Promise<Recipe | undefined> = createDatasetCache(
   async (
-    dataset: string,
+    dataset: DatasetRef,
     id: string,
     bucket?: string,
   ): Promise<Recipe | undefined> => {
@@ -74,10 +75,11 @@ export const loadClientRecipe: (
       : undefined;
     return parseRecipe(raw, {
       modId: ns,
-      bodyUrl: dumpRelPublicUrl(dataset, rel) ?? `/${dataset}`,
+      bodyUrl: dumpRelPublicUrl(dataset, rel) ?? `/${dataset.id}`,
       id,
       ...(layout ? { layout } : {}),
     });
   },
   (dataset, id, bucket) => JSON.stringify([dataset, id, bucket ?? '']),
 );
+

package/src/lib/client-index/catalog.ts

@@ -1,12 +1,10 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import type { RecipeChrome, RecipeCompactIndex } from '@terrafirmagreg-team/recipe/types';
-import { loadClientRecipeCategories } from '@terrafirmagreg-team/recipe/lib/client/recipe-categories';
+import { loadDatasetRecipeCategories } from '@terrafirmagreg-team/recipe/lib/data/category/load';
 import { stackDisplayName } from '@terrafirmagreg-team/game/lib/entry/display';
-import { memoPending } from './cache';
+import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
 import { recipeTypeRows } from './rows';
 
-const indexCache = new Map<string, RecipeCompactIndex>();
-const skeletonCache = new Map<string, Promise<RecipeCompactIndex>>();
-
 const emptyRecipeIndex = (): RecipeCompactIndex => ({
   types: [],
   items: [],
@@ -14,7 +12,7 @@ const emptyRecipeIndex = (): RecipeCompactIndex => ({
 });
 
 async function loadRecipeStructureFromDump(
-  dataset: string,
+  dataset: DatasetRef,
   chrome: RecipeChrome,
 ): Promise<RecipeCompactIndex> {
   const rows = await recipeTypeRows(dataset);
@@ -37,33 +35,40 @@ async function loadRecipeStructureFromDump(
   };
 }
 
-export async function loadRecipeCompactIndex(
-  dataset: string,
+const indexCache = createDatasetCache(
+  async (
+    dataset: DatasetRef,
+    chrome?: RecipeChrome,
+  ): Promise<RecipeCompactIndex> => {
+    if (!chrome) return emptyRecipeIndex();
+    return loadRecipeStructureFromDump(dataset, chrome);
+  },
+  (dataset, chrome) =>
+    `${dataset.id}/${dataset.version ?? ''} ${chrome ? (Object.keys(chrome.names)[0] ?? '') : ''}`,
+);
+
+const skeletonCache = createDatasetCache(
+  async (dataset: DatasetRef): Promise<RecipeCompactIndex> =>
+    loadDatasetRecipeCategories(dataset).then((categories) =>
+      loadRecipeStructureFromDump(dataset, {
+        items: [],
+        names: {},
+        ...(categories.length ? { categories } : {}),
+      }),
+    ),
+);
+
+export function loadRecipeCompactIndex(
+  dataset: DatasetRef,
   chrome?: RecipeChrome,
 ): Promise<RecipeCompactIndex> {
-  const lang = chrome ? (Object.keys(chrome.names)[0] ?? '') : '';
-  const cacheKey = `${dataset} ${lang}`;
-  const cached = indexCache.get(cacheKey);
-  if (cached) return cached;
-  if (!chrome) return emptyRecipeIndex();
-  const index = await loadRecipeStructureFromDump(dataset, chrome);
-  indexCache.set(cacheKey, index);
-  return index;
+  return indexCache(dataset, chrome);
 }
 
 export function loadRecipeSkeletonIndex(
-  dataset: string,
+  dataset: DatasetRef,
 ): Promise<RecipeCompactIndex> {
-  const cached = skeletonCache.get(dataset);
-  if (cached) return cached;
-  const pending = loadClientRecipeCategories(dataset).then((categories) =>
-    loadRecipeStructureFromDump(dataset, {
-      items: [],
-      names: {},
-      ...(categories.length ? { categories } : {}),
-    }),
-  );
-  return memoPending(skeletonCache, dataset, pending);
+  return skeletonCache(dataset);
 }
 
 export function nonEmptyCategoryIds(
@@ -83,3 +88,4 @@ export function recipeItemName(
 ): string {
   return stackDisplayName(names[lang] ?? names.en_us, id);
 }
+

package/src/lib/client-index/chrome.ts

@@ -1,34 +1,33 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import type {
   RecipeCategory,
   RecipeChrome,
   RecipeStackGroup,
 } from '@terrafirmagreg-team/recipe/types';
-import { clientDumpLang, loadClientManifest } from '@terrafirmagreg-team/game/lib/dump/client/dump';
+import { clientDumpLang, loadClientManifest } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
 import {
   creativeTabName,
   dumpTextString,
-} from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
+} from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
 import { stackDisplayName } from '@terrafirmagreg-team/game/lib/entry/display';
 import {
   loadClientRegistry,
   loadClientRegistryOrder,
   resolveClientStackDisplay,
-} from '@terrafirmagreg-team/game/lib/dump/client/registry';
-import { loadClientTagMembers } from '@terrafirmagreg-team/game/lib/dump/client/tags';
-import { loadClientTabs } from '@terrafirmagreg-team/game/lib/dump/client/tabs';
-import { loadClientRecipeCategories } from '@terrafirmagreg-team/recipe/lib/client/recipe-categories';
-import { loadClientRegistryGroups } from '@terrafirmagreg-team/game/lib/dump/client/groups';
-import { loadClientModNames } from '@terrafirmagreg-team/game/lib/dump/client/mods';
-import { loadClientModAtlases } from '@terrafirmagreg-team/game/lib/dump/client/atlases';
-import { lookupSpriteInBundle } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/lookup';
-import { stackIdBase, stackIdFromRef } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import type { AtlasBundle } from '@terrafirmagreg-team/game/lib/dump/assets/atlas/dto';
-import { memoPending } from './cache';
-
-const chromeCache = new Map<string, Promise<RecipeChrome>>();
+} from '@terrafirmagreg-team/dump/lib/dump/client/registry';
+import { loadClientTagMembers } from '@terrafirmagreg-team/dump/lib/dump/client/tags';
+import { loadClientTabs } from '@terrafirmagreg-team/dump/lib/dump/client/tabs';
+import { loadDatasetRecipeCategories } from '@terrafirmagreg-team/recipe/lib/data/category/load';
+import { loadClientRegistryGroups } from '@terrafirmagreg-team/dump/lib/dump/client/groups';
+import { loadClientModNames } from '@terrafirmagreg-team/dump/lib/dump/client/mods';
+import { loadClientModAtlases } from '@terrafirmagreg-team/dump/lib/dump/client/atlases';
+import { lookupSpriteInBundle } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/lookup';
+import { stackIdBase, stackIdFromRef } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import type { AtlasBundle } from '@terrafirmagreg-team/dump/lib/dump/assets/atlas/dto';
+import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
 
 async function clientEntityNames(
-  dataset: string,
+  dataset: DatasetRef,
   lang: string,
   ids: Iterable<string>,
 ): Promise<Record<string, string>> {
@@ -78,7 +77,7 @@ async function clientEntityNames(
 }
 
 async function clientNamedCategories(
-  dataset: string,
+  dataset: DatasetRef,
   lang: string,
   types: string[],
   categories: RecipeCategory[],
@@ -92,13 +91,13 @@ async function clientNamedCategories(
   return names;
 }
 
-async function clientUsedIds(dataset: string): Promise<string[]> {
+async function clientUsedIds(dataset: DatasetRef): Promise<string[]> {
   const manifest = await loadClientManifest(dataset);
   return manifest?.indexes.used ?? [];
 }
 
 async function clientRecipeGroups(
-  dataset: string,
+  dataset: DatasetRef,
   lang: string,
 ): Promise<RecipeStackGroup[]> {
   const rows = await loadClientRegistryGroups(dataset);
@@ -111,20 +110,14 @@ async function clientRecipeGroups(
   }));
 }
 
-export function loadRecipeChromeClient(
-  dataset: string,
-  lang: string,
-): Promise<RecipeChrome> {
-  const key = `${dataset} ${lang}`;
-  const cached = chromeCache.get(key);
-  if (cached) return cached;
-  const pending = (async (): Promise<RecipeChrome> => {
+const loadChrome = createDatasetCache(
+  async (dataset: DatasetRef, lang: string): Promise<RecipeChrome> => {
     const [items, fluids, creative, categories, usedIds, itemTags, blockTags] =
       await Promise.all([
         loadClientRegistryOrder(dataset, 'item'),
         loadClientRegistryOrder(dataset, 'fluid'),
         loadClientTabs(dataset),
-        loadClientRecipeCategories(dataset),
+        loadDatasetRecipeCategories(dataset),
         clientUsedIds(dataset),
         loadClientTagMembers(dataset, 'item'),
         loadClientTagMembers(dataset, 'block'),
@@ -175,6 +168,13 @@ export function loadRecipeChromeClient(
         [lang]: { ...tabNames, ...categoryNames, ...entityNames },
       },
     };
-  })();
-  return memoPending(chromeCache, key, pending);
+  },
+);
+
+export function loadRecipeChromeClient(
+  dataset: DatasetRef,
+  lang: string,
+): Promise<RecipeChrome> {
+  return loadChrome(dataset, lang);
 }
+

package/src/lib/client-index/index.ts

@@ -17,3 +17,4 @@ export {
   nonEmptyCategoryIds,
   recipeItemName,
 } from './catalog';
+

package/src/lib/client-index/registry.ts

@@ -1,19 +1,13 @@
-import { clientDumpJson } from '@terrafirmagreg-team/game/lib/dump/client/dump';
-import { loadClientTagMembers } from '@terrafirmagreg-team/game/lib/dump/client/tags';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { clientDumpJson } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
+import { loadClientTagMembers } from '@terrafirmagreg-team/dump/lib/dump/client/tags';
 import {
   asRecord,
   asStringList,
   resolveEdgeRows,
-} from '@terrafirmagreg-team/game/lib/dump/contract/read';
-import { stackIdBase } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import { memoPending } from './cache';
-
-const registrySliceCache = new Map<
-  string,
-  Promise<Record<string, Record<string, unknown>>>
->();
-const tagSliceCache = new Map<string, Promise<Record<string, string[]>>>();
-const tagMembersCache = new Map<string, Promise<Record<string, string[]>>>();
+} from '@terrafirmagreg-team/dump/lib/dump/contract/read';
+import { stackIdBase } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
 
 const REGISTRY_FIELD: Record<
   string,
@@ -29,24 +23,28 @@ function registryField(kind: string) {
   return REGISTRY_FIELD[kind] ?? 'items';
 }
 
+const registrySliceCache = createDatasetCache(
+  async (
+    dataset: DatasetRef,
+    kind: string,
+  ): Promise<Record<string, Record<string, unknown>>> => {
+    const field = registryField(kind);
+    const raw = await clientDumpJson(dataset, `registry/${field}.json`);
+    const map = asRecord(raw);
+    return map ? resolveEdgeRows(map) : {};
+  },
+  (dataset, kind) => `${dataset.id}/${dataset.version ?? ''} ${registryField(kind)}`,
+);
+
 function loadRegistryFile(
-  dataset: string,
+  dataset: DatasetRef,
   kind: string,
 ): Promise<Record<string, Record<string, unknown>>> {
-  const field = registryField(kind);
-  const key = `${dataset} ${field}`;
-  const cached = registrySliceCache.get(key);
-  if (cached) return cached;
-  const pending = clientDumpJson(dataset, `registry/${field}.json`)
-    .then((raw) => {
-      const map = asRecord(raw);
-      return map ? resolveEdgeRows(map) : {};
-    });
-  return memoPending(registrySliceCache, key, pending);
+  return registrySliceCache(dataset, kind);
 }
 
 export async function loadRegistryEntrySlice(
-  dataset: string,
+  dataset: DatasetRef,
   kind: string,
   id: string,
 ): Promise<Record<string, unknown> | undefined> {
@@ -55,16 +53,14 @@ export async function loadRegistryEntrySlice(
   return map[id] ?? map[base];
 }
 
-export function loadTagSlice(
-  dataset: string,
-  kind: string,
-  ns: string,
-): Promise<Record<string, string[]>> {
-  const key = `${dataset} ${kind} ${ns}`;
-  const cached = tagSliceCache.get(key);
-  if (cached) return cached;
-  const prefix = `${ns}:`;
-  const pending = loadRegistryFile(dataset, kind).then((map) => {
+const tagSliceCache = createDatasetCache(
+  async (
+    dataset: DatasetRef,
+    kind: string,
+    ns: string,
+  ): Promise<Record<string, string[]>> => {
+    const prefix = `${ns}:`;
+    const map = await loadRegistryFile(dataset, kind);
     const out: Record<string, string[]> = {};
     for (const [id, entry] of Object.entries(map)) {
       if (!id.startsWith(prefix)) continue;
@@ -72,39 +68,54 @@ export function loadTagSlice(
       if (tags.length) out[id] = tags;
     }
     return out;
-  });
-  return memoPending(tagSliceCache, key, pending);
-}
+  },
+);
 
-function loadTagMembersByKind(
-  dataset: string,
+export function loadTagSlice(
+  dataset: DatasetRef,
   kind: string,
+  ns: string,
 ): Promise<Record<string, string[]>> {
-  const memberKind = registryField(kind) === 'blocks' ? 'block' : 'item';
-  const key = `${dataset} ${memberKind}`;
-  const cached = tagMembersCache.get(key);
-  if (cached) return cached;
-  const pending = loadClientTagMembers(dataset, memberKind).then(
-    (raw) => raw ?? {},
-  );
-  return memoPending(tagMembersCache, key, pending);
+  return tagSliceCache(dataset, kind, ns);
 }
 
-export function loadAllTagMembers(
-  dataset: string,
-): Promise<Record<string, string[]>> {
-  const key = `${dataset} all`;
-  const cached = tagMembersCache.get(key);
-  if (cached) return cached;
-  const pending = Promise.all([
-    loadTagMembersByKind(dataset, 'item'),
-    loadTagMembersByKind(dataset, 'block'),
-  ]).then(([items, blocks]) => {
+const tagMembersByKindCache = createDatasetCache(
+  async (
+    dataset: DatasetRef,
+    kind: string,
+  ): Promise<Record<string, string[]>> => {
+    const memberKind = registryField(kind) === 'blocks' ? 'block' : 'item';
+    return (await loadClientTagMembers(dataset, memberKind)) ?? {};
+  },
+  (dataset, kind) =>
+    `${dataset.id}/${dataset.version ?? ''} ${registryField(kind) === 'blocks' ? 'block' : 'item'}`,
+);
+
+const allTagMembersCache = createDatasetCache(
+  async (dataset: DatasetRef): Promise<Record<string, string[]>> => {
+    const [items, blocks] = await Promise.all([
+      loadTagMembersByKind(dataset, 'item'),
+      loadTagMembersByKind(dataset, 'block'),
+    ]);
     const merged: Record<string, string[]> = { ...items };
     for (const [tag, ids] of Object.entries(blocks)) {
       merged[tag] = merged[tag] ? [...merged[tag], ...ids] : ids;
     }
     return merged;
-  });
-  return memoPending(tagMembersCache, key, pending);
+  },
+  (dataset) => `${dataset.id}/${dataset.version ?? ''} all`,
+);
+
+function loadTagMembersByKind(
+  dataset: DatasetRef,
+  kind: string,
+): Promise<Record<string, string[]>> {
+  return tagMembersByKindCache(dataset, kind);
 }
+
+export function loadAllTagMembers(
+  dataset: DatasetRef,
+): Promise<Record<string, string[]>> {
+  return allTagMembersCache(dataset);
+}
+