@terrafirmagreg-team/game 1.2.2 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrafirmagreg-team/game",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "type": "module",
   "description": "Game-data components and catalogs",
   "license": "LGPL-3.0-only",
@@ -27,7 +27,7 @@
   "dependencies": {
     "@terrafirmagreg-team/data": "1.2.1",
     "@terrafirmagreg-team/dump": "1.2.1",
-    "@terrafirmagreg-team/kit": "1.2.2",
+    "@terrafirmagreg-team/kit": "1.2.3",
     "@terrafirmagreg-team/search": "1.2.2",
     "@terrafirmagreg-team/sites": "1.2.1",
     "@terrafirmagreg-team/translate": "1.2.3",

package/src/components/entry/tooltip.tsx

@@ -2,6 +2,7 @@
 import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useState, type ReactElement, type ReactNode } from 'react';
+import type { ReferenceKind } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import { useModifierKeys } from '@terrafirmagreg-team/ui/hooks/use-modifier-keys';
 import { LazyTooltip } from '@terrafirmagreg-team/ui/components/blocks/tooltip/lazy';
 import { stackTooltip } from '@terrafirmagreg-team/game/lib/entry/tooltip';
@@ -50,7 +51,7 @@ export function EntryTooltip({
   dataset: DatasetRef;
   id: string;
   name: string;
-  kind?: 'item' | 'fluid' | 'entity';
+  kind?: ReferenceKind;
 
   lang?: string;
   langMap?: Record<string, string>;

package/src/lib/entry/entry.ts

@@ -1,6 +1,9 @@
 import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { entryHref } from '@terrafirmagreg-team/game/lib/entry/href';
-import { tagKindOf } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import {
+  isTagKind,
+  tagKindOf,
+} from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import type { ReferenceKind } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import type { EntryProps } from '@terrafirmagreg-team/game/types/entry';
 
@@ -20,7 +23,8 @@ export function usesStackTooltip(kind: ReferenceKind | undefined): boolean {
 
 export function tooltipLoadKind(
   kind: ReferenceKind | undefined,
-): 'item' | 'fluid' | 'entity' | undefined {
+): ReferenceKind | undefined {
+  if (isTagKind(kind)) return kind;
   const member = tagKindOf(kind) ?? kind;
   if (member === 'fluid') return 'fluid';
   if (member === 'entity') return 'entity';

package/src/lib/entry/tooltip.ts

@@ -1,14 +1,22 @@
 import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { displayOf } from '@terrafirmagreg-team/dump/lib/dump/data/registry/parse';
-import { parseStackId } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import {
+  parseStackId,
+  tagKindOf,
+  type ReferenceKind,
+} from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import { clientDumpLang } from '@terrafirmagreg-team/dump/lib/dump/client/dump';
 import {
   clientRegistryKindFor,
   loadClientRegistry,
 } from '@terrafirmagreg-team/dump/lib/dump/client/registry';
 import type { DumpDisplay } from '@terrafirmagreg-team/dump/lib/dump/contract/text';
-import { dumpTextLines } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
+import {
+  dumpTextLines,
+  stackDisplayName,
+} from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
 import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
+import { fetchTagMembers } from '@terrafirmagreg-team/game/lib/entry/icon-load';
 
 export const loadStackDisplay = createDatasetCache(
   async (
@@ -43,11 +51,28 @@ export async function stackTooltip(
   id: string,
   lang: string | undefined,
   langMap: Record<string, string> | undefined,
-  kind: 'item' | 'fluid' | 'entity' | undefined,
+  kind: ReferenceKind | undefined,
 ): Promise<StackTooltip> {
-  const display = await loadStackDisplay(dataset, id, kind);
   const map =
     langMap ?? (lang ? await clientDumpLang(dataset, lang) : undefined);
+  if (id.startsWith('#')) {
+    if (!map) return { lines: [], mods: {} };
+    const members = await fetchTagMembers(
+      dataset,
+      id.slice(1),
+      tagKindOf(kind) ?? 'item',
+    );
+    return {
+      lines: members.map((member) => stackDisplayName(map, member)),
+      mods: {},
+    };
+  }
+  const memberKind = tagKindOf(kind) ?? kind;
+  const loadKind =
+    memberKind === 'fluid' || memberKind === 'entity'
+      ? memberKind
+      : 'item';
+  const display = await loadStackDisplay(dataset, id, loadKind);
   if (!display || !map) return { lines: [], mods: {} };
   const mods: Record<string, string[]> = {};
   for (const [mod, raw] of Object.entries(display.tooltipMods ?? {})) {