@terrafirmagreg-team/game 1.2.4 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@terrafirmagreg-team/game",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "type": "module",
   "description": "Game-data components and catalogs",
   "license": "LGPL-3.0-only",
@@ -25,13 +25,13 @@
     "./styles.css": "./styles.css"
   },
   "dependencies": {
-    "@terrafirmagreg-team/data": "^1.2.1",
-    "@terrafirmagreg-team/dump": "^1.2.2",
-    "@terrafirmagreg-team/kit": "^1.2.5",
-    "@terrafirmagreg-team/search": "^1.2.3",
-    "@terrafirmagreg-team/sites": "^1.2.1",
-    "@terrafirmagreg-team/translate": "^1.2.4",
-    "@terrafirmagreg-team/ui": "^1.2.4",
+    "@terrafirmagreg-team/data": "^1.2.3",
+    "@terrafirmagreg-team/dump": "^1.2.6",
+    "@terrafirmagreg-team/kit": "^1.2.11",
+    "@terrafirmagreg-team/search": "^1.2.6",
+    "@terrafirmagreg-team/sites": "^1.2.2",
+    "@terrafirmagreg-team/translate": "^1.2.8",
+    "@terrafirmagreg-team/ui": "^1.2.8",
     "fumadocs-core": "16.17.10",
     "lucide-react": "^1.63.0",
     "server-only": "^0.0.1"

package/src/hooks/use-lang-map.ts

@@ -2,6 +2,8 @@
 import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import { useAsyncResult } from '@terrafirmagreg-team/ui/hooks/use-async-value';
+import { useDumpRetryNonce } from '@terrafirmagreg-team/kit/hooks/use-dump-status';
+import { useLastValue } from '@terrafirmagreg-team/ui/hooks/use-last-value';
 import { dumpReader } from '@terrafirmagreg-team/dump/lib/dump/reader';
 
 export function useLangMap(
@@ -9,12 +11,13 @@ export function useLangMap(
   lang: string | undefined,
   enabled = true,
 ): Record<string, string> | undefined {
+  const nonce = useDumpRetryNonce();
   const { value, pending } = useAsyncResult(
     enabled && dataset && lang
       ? () => dumpReader(dataset).then((reader) => reader.getLang(lang))
       : false,
-    [dataset, lang, enabled],
+    [dataset, lang, enabled, nonce],
   );
-  return pending ? undefined : value;
+  return useLastValue(pending ? undefined : value, dataset?.id ?? '');
 }
 

package/src/lib/entry/icon-load.ts

@@ -88,18 +88,20 @@ const fetchTagMembersList = createDatasetCache(
       return members;
     }
     const spriteKind = TAG_ICON_SPRITE_KIND[memberKind];
-    const out: string[] = [];
-    for (const member of members) {
-      const itemId =
-        memberKind === 'block'
-          ? await fetchBlockItem(dataset, member)
-          : member;
-      const ns = itemId.split(':', 1)[0];
-      const bundle = ns ? await fetchAtlases(dataset, ns) : null;
-      if (lookupSpriteInBundle(bundle, { id: itemId, kind: spriteKind })) {
-        out.push(member);
-      }
-    }
+    const found = await Promise.all(
+      members.map(async (member) => {
+        const itemId =
+          memberKind === 'block'
+            ? await fetchBlockItem(dataset, member)
+            : member;
+        const ns = itemId.split(':', 1)[0];
+        const bundle = ns ? await fetchAtlases(dataset, ns) : null;
+        return lookupSpriteInBundle(bundle, { id: itemId, kind: spriteKind })
+          ? member
+          : null;
+      }),
+    );
+    const out = found.filter((member): member is string => member !== null);
     return out.length ? out : [members[0]];
   },
 );