@terrafirmagreg-team/guide 0.1.0 → 1.2.0

package/src/components/views/kind/table.tsx

@@ -1,6 +1,6 @@
 import { GuideText } from '@terrafirmagreg-team/guide/components/views/text';
 import { Card } from '@terrafirmagreg-team/ui/components/ui/card';
-import { ItemEntry } from '@terrafirmagreg-team/game/components/entry/entry';
+import { Entry } from '@terrafirmagreg-team/game/components/entry/entry';
 import {
   Table,
   TableBody,
@@ -91,7 +91,8 @@ export function TablePage(props: PageRendererProps) {
                   >
                     <span className="inline-flex flex-wrap items-center gap-1">
                       {items.map((id) => (
-                        <ItemEntry
+                        <Entry
+                          kind="item"
                           key={id}
                           id={id}
                           name={id}
@@ -136,3 +137,4 @@ export function TablePage(props: PageRendererProps) {
     </>
   );
 }
+

package/src/components/views/kind/unknown.tsx

@@ -21,3 +21,4 @@ export function UnknownPage({
     </Alert>
   );
 }
+

package/src/components/views/page/category-body.tsx

@@ -1,3 +1,4 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { Entry } from '@terrafirmagreg-team/game/components/entry/entry';
 import { ItemRow } from '@terrafirmagreg-team/ui/components/blocks/list/row';
 import { guideBookHref } from '@terrafirmagreg-team/guide/lib/paths';
@@ -5,7 +6,7 @@ import { guideMessage } from '@terrafirmagreg-team/guide/lib/messages';
 import type { GuideIndex, GuideMessages } from '@terrafirmagreg-team/guide/types';
 
 type GuideCategoryBodyProps = {
-  dataset: string;
+  dataset: DatasetRef;
   lang: string;
   modId?: string;
   bookPath?: string;
@@ -54,3 +55,4 @@ export function GuideCategoryBody({
     </div>
   );
 }
+

package/src/components/views/page/entry-body.tsx

@@ -1,3 +1,4 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { EmptyState } from '@terrafirmagreg-team/ui/components/blocks/page/empty-state';
 import { EntryView } from '@terrafirmagreg-team/guide/components/views/entry/view';
 import { guideMessage } from '@terrafirmagreg-team/guide/lib/messages';
@@ -11,7 +12,7 @@ import type {
 } from '@terrafirmagreg-team/guide/types';
 
 type GuideEntryBodyProps = {
-  dataset: string;
+  dataset: DatasetRef;
   lang: Lang;
   bookPath?: string;
   overview: GuideIndex;
@@ -77,3 +78,4 @@ export function GuideEntryBody({
     />
   );
 }
+

package/src/components/views/page/overview-body.tsx

@@ -6,15 +6,16 @@ import {
   guideCategoryHref,
   isRootCategory,
 } from '@terrafirmagreg-team/guide/lib/paths';
-import { texturePublicUrl } from '@terrafirmagreg-team/game/lib/dump/assets/urls';
+import { texturePublicUrl } from '@terrafirmagreg-team/dump/lib/dump/assets/urls';
 import { useDumpLocation } from '@terrafirmagreg-team/game/hooks/use-dump-location';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { guideMessage } from '@terrafirmagreg-team/guide/lib/messages';
 import type { PagePreviewData } from '@terrafirmagreg-team/ui/types/preview';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 import type { GuideIndex, GuideMessages } from '@terrafirmagreg-team/guide/types';
 
 type GuideOverviewBodyProps = {
-  dataset: string;
+  dataset: DatasetRef;
   lang: Lang;
   modId?: string;
   bookPath?: string;
@@ -95,3 +96,4 @@ export function GuideOverviewBody({
     </div>
   );
 }
+

package/src/components/views/page/text.tsx

@@ -55,3 +55,4 @@ export function PageText({
     </>
   );
 }
+

package/src/components/views/page/view.tsx

@@ -9,7 +9,6 @@ import {
 import { guideConfig } from '@terrafirmagreg-team/guide/lib/config';
 import { GithubInfo } from '@terrafirmagreg-team/ui/components/blocks/git/github-info';
 import { sectionConfig } from '@terrafirmagreg-team/kit/lib/config';
-import { parseDatasetRef } from '@terrafirmagreg-team/kit/lib/location';
 import { categoryMap, guideBreadcrumbItems } from '@terrafirmagreg-team/guide/lib/breadcrumb';
 import { guideToc } from '@terrafirmagreg-team/guide/lib/toc';
 import { GuideText } from '@terrafirmagreg-team/guide/components/views/text';
@@ -17,7 +16,7 @@ import { GuideOverviewBody } from '@terrafirmagreg-team/guide/components/views/p
 import { GuideCategoryBody } from '@terrafirmagreg-team/guide/components/views/page/category-body';
 import { GuideEntryBody } from '@terrafirmagreg-team/guide/components/views/page/entry-body';
 import { guideMessage } from '@terrafirmagreg-team/guide/lib/messages';
-import { Comments } from '@terrafirmagreg-team/comments';
+import { CommentsSlot } from '@terrafirmagreg-team/discussions/components/comments';
 import {
   guideBookHref,
   guideCategoryHref,
@@ -184,7 +183,7 @@ export function GuidePageView({
   });
 
   const datasetConf =
-    sectionConfig().datasetConfig[parseDatasetRef(dataset).id];
+    sectionConfig().datasetConfig[dataset.id];
   const repoSlug = datasetConf?.repo?.split('/');
   const mdQuery = new URLSearchParams();
   if (payload.modId && payload.bookPath) {
@@ -196,7 +195,7 @@ export function GuidePageView({
     mdQuery.set('cat', payload.categoryId);
   }
   mdQuery.set('lang', lang);
-  const mdUrl = `/guide/${dataset}.md?${mdQuery}`;
+  const mdUrl = `/guide/${dataset.id}.md?${mdQuery}`;
 
   const nav = guideNavItems(payload, overview);
   const {
@@ -270,10 +269,11 @@ export function GuidePageView({
             {body}
           </div>
         </WorkspaceBody>
-        <Comments
-          page={`guide:${dataset}:${payload.modId}:${payload.bookPath}:${payload.entry?.id ?? payload.categoryId ?? 'book'}#${lang}`}
+        <CommentsSlot
+          page={`guide:${dataset.id}:${payload.modId}:${payload.bookPath}:${payload.entry?.id ?? payload.categoryId ?? 'book'}#${lang}`}
         />
       </Workspace>
     </EntryProvider>
   );
 }
+

package/src/components/views/text.tsx

@@ -1,3 +1,4 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { Fragment, type ReactNode } from 'react';
 import { LinkPreview } from '@terrafirmagreg-team/ui/components/blocks/link/link-preview';
 import { guideLink } from '@terrafirmagreg-team/guide/lib/reference';
@@ -29,7 +30,7 @@ export function GuideText({
   previews,
 }: {
   text: string;
-  dataset?: string;
+  dataset?: DatasetRef;
   lang?: Lang;
   modId?: string;
   bookPath?: string;
@@ -89,7 +90,7 @@ export function GuideText({
     }
     if (node.type === 'text' && node.link) {
       const { href, external } = guideLink(node, {
-        dataset: dataset ?? '',
+        dataset: dataset ?? { id: '' },
         lang: lang ?? 'en_us',
         modId: modId ?? '',
         bookPath: bookPath ?? '',
@@ -128,3 +129,4 @@ export function GuideText({
   }
   return <>{children}</>;
 }
+

package/src/hooks/use-left-sidebar-tree.ts

@@ -1,19 +1,28 @@
 'use client';
 import { usePathname } from 'next/navigation';
+import { useMemo } from 'react';
 import type * as PageTree from 'fumadocs-core/page-tree';
-import { useLocationSearch } from '@terrafirmagreg-team/ui/hooks/page/use-location-search';
+import { useLocationSearchParams } from '@terrafirmagreg-team/ui/hooks/page/use-location-search';
 import { useResolvedLang } from '@terrafirmagreg-team/translate/hooks/use-resolved-lang';
 import { useLastValue } from '@terrafirmagreg-team/ui/hooks/use-last-value';
 import { useGuideTree } from '@terrafirmagreg-team/guide/hooks/use-tree';
 import { guideQueryFromParams } from '@terrafirmagreg-team/guide/lib/query';
-import { parseSectionLocation } from '@terrafirmagreg-team/kit/lib/location';
+import { parseSectionLocation } from '@terrafirmagreg-team/sites/location';
 
 export function useGuideLeftSidebarTree(tree: PageTree.Root): PageTree.Root {
-  const { dataset } = parseSectionLocation(usePathname());
+  const { dataset: datasetId } = parseSectionLocation(usePathname());
   const lang = useResolvedLang();
-  const { bookId } = guideQueryFromParams(
-    new URLSearchParams(useLocationSearch()),
+  const params = useLocationSearchParams();
+  const { bookId } = guideQueryFromParams(params);
+  const version = params.get('version') ?? undefined;
+  const dataset = useMemo(
+    () => (datasetId ? { id: datasetId, version } : undefined),
+    [datasetId, version],
+  );
+  const runtime = useLastValue(
+    useGuideTree(dataset, lang, bookId),
+    dataset?.id ?? '',
   );
-  const runtime = useLastValue(useGuideTree(dataset, lang, bookId), dataset);
   return runtime ?? tree;
 }
+

package/src/hooks/use-tree.ts

@@ -1,14 +1,15 @@
 'use client';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 
 import type * as PageTree from 'fumadocs-core/page-tree';
 import { useAsyncValue } from '@terrafirmagreg-team/ui/hooks/use-async-value';
 import { loadClientGuideBook } from '@terrafirmagreg-team/guide/lib/client/guides';
 import { listGuideBooks } from '@terrafirmagreg-team/guide/lib/books';
-import { guideTreeChildren } from '@terrafirmagreg-team/guide/lib/tree/children';
+import { guideTreeChildren } from '@terrafirmagreg-team/guide/components/tree/children';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 
 export function useGuideTree(
-  dataset: string | undefined,
+  dataset: DatasetRef | undefined,
   lang: Lang,
   bookId: string | undefined,
 ): PageTree.Root | undefined {
@@ -24,10 +25,11 @@ export function useGuideTree(
           return {
             name: 'guide',
             children: index ? guideTreeChildren(dataset, index) : [],
-            $id: `guide/${dataset}/${resolvedId ?? 'none'}/${lang}`,
+            $id: `guide/${dataset.id}/${dataset.version ?? ''}/${resolvedId ?? 'none'}/${lang}`,
           } satisfies PageTree.Root;
         }
       : undefined,
     [dataset, lang, bookId],
   );
 }
+

package/src/lib/book/convert.ts

@@ -1,4 +1,4 @@
-import { dumpTextLines } from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
+import { dumpTextLines } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
 import type {
   GuideBookJson,
   GuideBookRef,
@@ -72,3 +72,4 @@ export function bookSlug(
   if (explicit) return urlSafeSlug(explicit);
   return urlSafeSlug(ref.bookPath);
 }
+

package/src/lib/book/index-rows.ts

@@ -1,3 +1,4 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { parseGuideIcon } from '@terrafirmagreg-team/guide/lib/data/parse';
 import type {
   GuideBookJson,
@@ -99,7 +100,7 @@ export type BookRows = {
 
 export function indexBookRows(
   rows: BookRows,
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
   langMap: Record<string, string>,
   rawLang?: Record<string, string>,
@@ -132,3 +133,4 @@ export function indexBookRows(
     isFallback: rows.isFallback,
   };
 }
+

package/src/lib/book/index.ts

@@ -1,2 +1,3 @@
 export { bookSlug, toBook } from './convert';
 export { type BookRows, indexBookRows } from './index-rows';
+

package/src/lib/book/localize.ts

@@ -1,5 +1,5 @@
-import { langString } from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
-import type { DumpText } from '@terrafirmagreg-team/game/lib/dump/contract/text';
+import { langString } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
+import type { DumpText } from '@terrafirmagreg-team/dump/lib/dump/contract/text';
 
 export type FallbackTracker = {
   mark(key: string | undefined): void;
@@ -74,3 +74,4 @@ export function localizeGuideValue(
   }
   return value;
 }
+

package/src/lib/book/raw.ts

@@ -1,7 +1,7 @@
-import { asTaggedReference } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import { asDumpTextList } from '@terrafirmagreg-team/game/lib/dump/contract/text';
-import type { DumpText } from '@terrafirmagreg-team/game/lib/dump/contract/text';
-import type { TaggedReference } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import { asTaggedReference } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import { asDumpTextList } from '@terrafirmagreg-team/dump/lib/dump/contract/text';
+import type { DumpText } from '@terrafirmagreg-team/dump/lib/dump/contract/text';
+import type { TaggedReference } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import { bareId } from '@terrafirmagreg-team/guide/lib/paths';
 
 export type RawRecord = Record<string, unknown>;
@@ -78,3 +78,4 @@ export function categoryMatches(
   if (!entryCategory) return false;
   return bareId(entryCategory) === bareId(categoryId);
 }
+

package/src/lib/books.ts

@@ -1,3 +1,4 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { sectionConfig } from '@terrafirmagreg-team/kit/lib/config';
 import { listClientGuideBookSummaries } from '@terrafirmagreg-team/guide/lib/client/guides';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
@@ -20,10 +21,11 @@ function orderGuideBooks<T extends { bookId: string }>(
 }
 
 export function listGuideBooks(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
 ): Promise<GuideBookSummary[]> {
   return listClientGuideBookSummaries(dataset, lang).then((books) =>
-    orderGuideBooks(books, sectionConfig().datasetConfig[dataset]?.guide?.bookOrder),
+    orderGuideBooks(books, sectionConfig().datasetConfig[dataset.id]?.guide?.bookOrder),
   );
 }
+

package/src/lib/breadcrumb.ts

@@ -1,3 +1,4 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { guideBookHref, guideCategoryHref } from '@terrafirmagreg-team/guide/lib/paths';
 import type { GuideCategory, GuideIndex, GuidePageKind } from '@terrafirmagreg-team/guide/types';
 
@@ -24,7 +25,7 @@ export function guideBreadcrumbItems({
 }: {
   kind: GuidePageKind;
   title: string;
-  dataset: string;
+  dataset: DatasetRef;
   modId?: string;
   bookPath?: string;
   overview: GuideIndex | undefined;
@@ -52,3 +53,4 @@ export function guideBreadcrumbItems({
   items.push({ name: title });
   return items;
 }
+

package/src/lib/client/guides.ts

@@ -1,5 +1,9 @@
-import { asRecord } from '@terrafirmagreg-team/game/lib/dump/contract/read';
-import { joinDumpRel } from '@terrafirmagreg-team/game/lib/dump/paths';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { asRecord, asString } from '@terrafirmagreg-team/dump/lib/dump/contract/read';
+import { joinDumpRel } from '@terrafirmagreg-team/dump/lib/dump/paths';
+import { bareId } from '@terrafirmagreg-team/guide/lib/paths';
+import type { GuideEntry } from '@terrafirmagreg-team/guide/types';
+import type { GuideMultiblock } from '@terrafirmagreg-team/guide/lib/data/dto';
 import type {
   GuideBookJson,
   GuideBookRef,
@@ -16,9 +20,9 @@ import {
   clientDumpJson,
   clientDumpLang,
   clientDumpLangRaw,
-  loadClientDump,
-} from '@terrafirmagreg-team/game/lib/dump/client/dump';
-import { createAsyncCache } from '@terrafirmagreg-team/ui/lib/utils/async-cache';
+} from '@terrafirmagreg-team/dump/lib/dump/client/dump';
+import { loadDatasetDump } from '@terrafirmagreg-team/dump/lib/dump/mods/load';
+import { createDatasetCache } from '@terrafirmagreg-team/dump/lib/dump/reader';
 
 type BookRow = {
   ref: GuideBookRef;
@@ -26,9 +30,9 @@ type BookRow = {
   raw?: GuideBookJson;
 };
 
-const listedBookRows = createAsyncCache(
-  async (dataset: string): Promise<BookRow[]> => {
-    const dump = await loadClientDump(dataset);
+const listedBookRows = createDatasetCache(
+  async (dataset: DatasetRef): Promise<BookRow[]> => {
+    const dump = await loadDatasetDump(dataset);
     if (!dump) return [];
     const raws = await Promise.all(
       dump.mods.flatMap((mod) =>
@@ -78,7 +82,7 @@ function listedBodies(
 }
 
 async function bookRows(
-  dataset: string,
+  dataset: DatasetRef,
   row: BookRow,
   lang: Lang,
 ): Promise<BookRows | null> {
@@ -138,9 +142,9 @@ async function bookRows(
   };
 }
 
-export const loadClientGuideBook = createAsyncCache(
+export const loadClientGuideBook = createDatasetCache(
   async (
-    dataset: string,
+    dataset: DatasetRef,
     lang: Lang,
     bookSlugValue: string,
   ): Promise<GuideIndex | null> => {
@@ -157,11 +161,79 @@ export const loadClientGuideBook = createAsyncCache(
     if (!rows) return null;
     return indexBookRows(rows, dataset, lang, langMap, rawLang);
   },
-  (dataset, lang, bookSlugValue) => `${dataset}${lang}${bookSlugValue}`,
+  (dataset, lang, bookSlugValue) => `${dataset.id}/${dataset.version ?? ''}${lang}${bookSlugValue}`,
+);
+
+export type ClientGuideEntryHit = {
+  entry: GuideEntry;
+  modId?: string;
+  bookPath?: string;
+};
+
+export async function findClientGuideEntry(
+  dataset: DatasetRef,
+  lang: Lang,
+  entryId: string,
+): Promise<ClientGuideEntryHit | undefined> {
+  const needle = bareId(entryId);
+  const nameNeedle = entryId.trim().toLowerCase();
+  for (const row of await listedBookRows(dataset)) {
+    const entries = (row.raw as Record<string, unknown> | undefined)?.entries;
+    const overview = await loadClientGuideBook(dataset, lang, row.slug);
+    const match =
+      entries && typeof entries === 'object'
+        ? Object.keys(entries).find(
+            (key) => bareId(key) === needle || key === entryId,
+          )
+        : undefined;
+    const entry = overview?.entries.find(
+      (item) =>
+        item.id === match ||
+        bareId(item.id) === needle ||
+        item.name?.trim().toLowerCase() === nameNeedle,
+    );
+    if (entry) {
+      return {
+        entry,
+        modId: overview?.modId,
+        bookPath: overview?.bookPath,
+      };
+    }
+  }
+  return undefined;
+}
+
+export const loadMultiblockNameIndex = createDatasetCache(
+  async (
+    dataset: DatasetRef,
+    lang: Lang,
+  ): Promise<Record<string, GuideMultiblock>> => {
+    const index: Record<string, GuideMultiblock> = {};
+    const put = (key: string | undefined, spec: GuideMultiblock) => {
+      const normalized = key?.trim().toLowerCase();
+      if (normalized) index[normalized] ??= spec;
+    };
+    for (const row of await listedBookRows(dataset)) {
+      const overview = await loadClientGuideBook(dataset, lang, row.slug);
+      for (const entry of overview?.entries ?? []) {
+        for (const page of entry.pages ?? []) {
+          const spec = page?.multiblock;
+          if (!spec) continue;
+          const display = asRecord(
+            (page as Record<string, unknown>).display,
+          );
+          put(asString(display?.name) ?? page.name ?? page.title, spec);
+          put(entry.id, spec);
+          put(entry.name, spec);
+        }
+      }
+    }
+    return index;
+  },
 );
 
 export async function listClientGuideBookSummaries(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
 ): Promise<
   Array<{
@@ -187,3 +259,4 @@ export async function listClientGuideBookSummaries(
     })
     .sort((a, b) => a.bookId.localeCompare(b.bookId));
 }
+

package/src/lib/client-payload/extras.ts

@@ -1,9 +1,10 @@
-import { stackDisplayName } from '@terrafirmagreg-team/game/lib/dump/assets/lang/names';
-import { loadClientModAtlases } from '@terrafirmagreg-team/game/lib/dump/client/atlases';
-import { loadClientKeybinds } from '@terrafirmagreg-team/game/lib/dump/client/keybinds';
-import { loadClientRecipe } from '@terrafirmagreg-team/recipe/lib/client/recipe';
-import { loadClientRegistry } from '@terrafirmagreg-team/game/lib/dump/client/registry';
-import { parseStackId } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
+import { stackDisplayName } from '@terrafirmagreg-team/dump/lib/dump/assets/lang/names';
+import { loadClientModAtlases } from '@terrafirmagreg-team/dump/lib/dump/client/atlases';
+import { loadClientKeybinds } from '@terrafirmagreg-team/dump/lib/dump/client/keybinds';
+import { guideEmbeds } from '@terrafirmagreg-team/guide/lib/embeds';
+import { loadClientRegistry } from '@terrafirmagreg-team/dump/lib/dump/client/registry';
+import { parseStackId } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
 import { spriteIdsFromEntry } from '@terrafirmagreg-team/guide/lib/sprites';
 import { recipeIds } from '@terrafirmagreg-team/guide/lib/recipe';
 import { asMultiblock } from '@terrafirmagreg-team/guide/lib/meta';
@@ -14,7 +15,7 @@ import type { GuideEntry, GuideEntryExtras } from '@terrafirmagreg-team/guide/ty
 import { type QuestLinks, collectPageLinks } from './links';
 
 export async function entryExtras(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
   langMap: Record<string, string>,
   bookModId: string,
@@ -35,7 +36,7 @@ export async function entryExtras(
     pages.map(async (page) => {
       await Promise.all(
         recipeIds(page).map(async (id) => {
-          const recipe = await loadClientRecipe(dataset, id);
+          const recipe = await guideEmbeds().recipe?.load(dataset, id);
           if (recipe) recipes[id] = recipe;
         }),
       );
@@ -99,3 +100,4 @@ export async function entryExtras(
     glbs,
   };
 }
+

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

@@ -1,8 +1,9 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import { loadClientGuideBook } from '@terrafirmagreg-team/guide/lib/client/guides';
 import { uiConfig } from '@terrafirmagreg-team/ui/lib/config';
 import { categoryMap } from '@terrafirmagreg-team/guide/lib/breadcrumb';
 import { bareId, guideBookHref } from '@terrafirmagreg-team/guide/lib/paths';
-import { questHref } from '@terrafirmagreg-team/quest/lib/links';
+import { guideEmbeds } from '@terrafirmagreg-team/guide/lib/embeds';
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 import type {
   GuideMessages,
@@ -12,7 +13,7 @@ import { entryExtras } from './extras';
 import { type QuestLinks, collectTextLinks } from './links';
 
 export async function loadClientGuidePayload(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
   bookId: string | undefined,
   entryId: string | undefined,
@@ -75,12 +76,11 @@ export async function loadClientGuidePayload(
       )
     : undefined;
   for (const hit of Object.values(questLinks)) {
-    hrefs.add(
-      questHref(dataset, undefined, {
-        category: hit.filename,
-        id: hit.questId,
-      }),
-    );
+    const url = guideEmbeds().quest?.href(dataset, undefined, {
+      category: hit.filename,
+      id: hit.questId,
+    });
+    if (url) hrefs.add(url);
   }
 
   const previews = await uiConfig().loadPagePreviews?.(lang, langMap, hrefs) ?? {};
@@ -110,3 +110,4 @@ export async function loadClientGuidePayload(
     messages,
   };
 }
+

package/src/lib/client-payload/links.ts

@@ -1,7 +1,8 @@
+import type { DatasetRef } from '@terrafirmagreg-team/sites/location';
 import {
-  findClientQuestLocation,
-  type ClientQuestLocation,
-} from '@terrafirmagreg-team/quest/lib/client/quest';
+  guideEmbeds,
+  type EmbedQuestLocation,
+} from '@terrafirmagreg-team/guide/lib/embeds';
 import { classify, pageTexts } from '@terrafirmagreg-team/guide/lib/page-kind';
 import { formatGuide } from '@terrafirmagreg-team/guide/lib/format';
 import {
@@ -11,10 +12,10 @@ import {
 import type { Lang } from '@terrafirmagreg-team/translate/types/locale';
 import type { GuidePage } from '@terrafirmagreg-team/guide/types';
 
-export type QuestLinks = Record<string, ClientQuestLocation>;
+export type QuestLinks = Record<string, EmbedQuestLocation>;
 
 async function collectQuestLink(
-  dataset: string,
+  dataset: DatasetRef,
   questLinks: QuestLinks,
   target: string | undefined,
   force = false,
@@ -23,12 +24,12 @@ async function collectQuestLink(
   const ref = parseGuideReference(target);
   if (!force && ref.kind !== 'quest') return;
   if (questLinks[ref.id]) return;
-  const hit = await findClientQuestLocation(dataset, ref.id);
+  const hit = await guideEmbeds().quest?.findLocation(dataset, ref.id);
   if (hit) questLinks[ref.id] = hit;
 }
 
 export async function collectTextLinks(
-  dataset: string,
+  dataset: DatasetRef,
   questLinks: QuestLinks,
   hrefs: Set<string>,
   ctx: {
@@ -58,7 +59,7 @@ export async function collectTextLinks(
 }
 
 export async function collectPageLinks(
-  dataset: string,
+  dataset: DatasetRef,
   lang: Lang,
   bookModId: string,
   bookPath: string,
@@ -99,3 +100,4 @@ export async function collectPageLinks(
     if (resolved.href) hrefs.add(resolved.href);
   }
 }
+

package/src/lib/config.ts

@@ -44,3 +44,4 @@ const { register: registerGuideConfig, get: guideConfig } = createConfigRegistry
 }));
 
 export { registerGuideConfig, guideConfig };
+

package/src/lib/data/dto.ts

@@ -1,7 +1,7 @@
-import type { TaggedReference } from '@terrafirmagreg-team/game/lib/dump/contract/ref';
-import type { DumpText } from '@terrafirmagreg-team/game/lib/dump/contract/text';
-import type { GuideBookRef } from '@terrafirmagreg-team/game/lib/dump/mods/dto';
-import type { DataGuidesBook } from '@terrafirmagreg-team/game/lib/dump/gen';
+import type { TaggedReference } from '@terrafirmagreg-team/dump/lib/dump/contract/ref';
+import type { DumpText } from '@terrafirmagreg-team/dump/lib/dump/contract/text';
+import type { GuideBookRef } from '@terrafirmagreg-team/dump/lib/dump/mods/dto';
+import type { DataGuidesBook } from '@terrafirmagreg-team/dump/lib/dump/gen';
 
 export type { GuideBookRef };
 
@@ -75,3 +75,4 @@ export type GuidePage = {
   rotate?: boolean;
   [key: string]: unknown;
 };
+