@glossarist/concept-browser 0.7.105 → 0.7.107

package/src/components/ConceptDetail.vue

@@ -106,15 +106,15 @@ const engConcept = computed((): LocalizedConcept | null => {
 const primaryTerm = computed(() => getPreferredTerm(engConcept.value, conceptId.value));
 const renderedPrimaryTerm = computed(() => renderContent(primaryTerm.value));
 
-const managedStatus = computed(() => props.concept.status);
+const managedStatus = computed(() => props.concept?.status);
 
-const conceptRefDomains = computed(() => props.concept.domains);
+const conceptRefDomains = computed(() => props.concept?.domains ?? []);
 
-const conceptDates = computed(() => props.concept.dates);
+const conceptDates = computed(() => props.concept?.dates ?? []);
 
-const conceptSources = computed(() => props.concept.sources);
+const conceptSources = computed(() => props.concept?.sources ?? []);
 
-const conceptTags = computed(() => props.concept.tags ?? []);
+const conceptTags = computed(() => props.concept?.tags ?? []);
 
 const factory = getFactory();
 const { ensureBibLoaded, bibResolver, nonVerbalRefResolver } = useRenderOptions(() => props.registerId);
@@ -216,39 +216,46 @@ function goAdjacent(id: string) {
 
 const conceptDomains = computed(() => {
   const domainMap = new Map<string, { slug: string; label: string; langs: string[]; conceptId?: string }>();
-
-  for (const ref of conceptRefDomains.value) {
-    const id = ref.conceptId ?? '';
-    const label = id || ref.urn || '';
-    if (label) {
-      const slug = slugify(label);
-      domainMap.set(slug, { slug, label, langs: [], conceptId: id });
+  try {
+    for (const ref of conceptRefDomains.value) {
+      const id = ref.conceptId ?? '';
+      const label = id || ref.urn || '';
+      if (label) {
+        const slug = slugify(label);
+        domainMap.set(slug, { slug, label, langs: [], conceptId: id });
+      }
     }
-  }
 
-  for (const lang of props.concept.languages) {
-    const lc = props.concept.localization(lang);
-    const domain = lc?.domain;
-    if (domain) {
-      const slug = slugify(domain);
-      const existing = domainMap.get(slug);
-      if (existing) {
-        if (!existing.langs.includes(lang)) existing.langs.push(lang);
-      } else {
-        domainMap.set(slug, { slug, label: domain, langs: [lang] });
+    for (const lang of props.concept?.languages ?? []) {
+      const lc = props.concept?.localization(lang);
+      const domain = lc?.domain;
+      if (domain) {
+        const slug = slugify(domain);
+        const existing = domainMap.get(slug);
+        if (existing) {
+          if (!existing.langs.includes(lang)) existing.langs.push(lang);
+        } else {
+          domainMap.set(slug, { slug, label: domain, langs: [lang] });
+        }
       }
     }
+  } catch {
+    /* swallow — empty domains rather than crash at hydration */
   }
   return [...domainMap.values()].sort((a, b) => b.langs.length - a.langs.length);
 });
 
 const nonVerbalReps = computed(() => {
   const reps: typeof import('glossarist').NonVerbRep.prototype[] = [];
-  for (const lang of props.concept.languages) {
-    const lc = props.concept.localization(lang);
-    if (lc?.nonVerbalRep?.length) {
-      reps.push(...lc.nonVerbalRep);
+  try {
+    for (const lang of props.concept?.languages ?? []) {
+      const lc = props.concept?.localization(lang);
+      if (lc?.nonVerbalRep?.length) {
+        reps.push(...lc.nonVerbalRep);
+      }
     }
+  } catch {
+    /* swallow — empty reps rather than crash at hydration */
   }
   return reps;
 });
@@ -501,20 +508,20 @@ const nonVerbalReps = computed(() => {
           </div>
 
           <!-- Non-verbal reps (concept-level) -->
-          <NonVerbalRepDisplay v-if="nonVerbalReps.length" :reps="nonVerbalReps" :locale="languages[0] ?? 'eng'" :register-id="registerId" :dataset-locales="languages" />
+          <NonVerbalRepDisplay v-if="nonVerbalReps?.length" :reps="nonVerbalReps" :locale="languages[0] ?? 'eng'" :register-id="registerId" :dataset-locales="languages" />
 
           <!-- Structural entity refs (concept-level figures/tables/formulas) -->
-          <NonVerbalList v-if="structuralEntityRefs.length" :refs="structuralEntityRefs" />
+          <NonVerbalList v-if="structuralEntityRefs?.length" :refs="structuralEntityRefs" />
         </div>
 
         <!-- Right sidebar -->
         <div class="w-full lg:w-64 flex-shrink-0 space-y-4 mt-6 lg:mt-0">
           <!-- Relations -->
-          <div v-if="outgoingEdges.length || incomingEdges.length" class="card p-5">
+          <div v-if="outgoingEdges?.length || incomingEdges?.length" class="card p-5">
             <div class="section-label">{{ t('concept.relations') }}</div>
 
             <!-- Outgoing -->
-            <div v-if="outgoingEdges.length" class="mt-3">
+            <div v-if="outgoingEdges?.length" class="mt-3">
               <div class="text-xs text-ink-300 mb-1.5">{{ t('concept.outgoing') }} ({{ outgoingEdges.length }})</div>
               <div class="space-y-0.5 max-h-56 overflow-y-auto pr-1 -mr-1">
                 <button
@@ -537,7 +544,7 @@ const nonVerbalReps = computed(() => {
             </div>
 
             <!-- Incoming -->
-            <div v-if="incomingEdges.length" class="mt-3 pt-3 border-t border-ink-100/60">
+            <div v-if="incomingEdges?.length" class="mt-3 pt-3 border-t border-ink-100/60">
               <div class="text-xs text-ink-300 mb-1.5">{{ t('concept.incoming') }} ({{ incomingEdges.length }})</div>
               <div class="space-y-0.5 max-h-40 overflow-y-auto pr-1 -mr-1">
                 <button
@@ -573,7 +580,7 @@ const nonVerbalReps = computed(() => {
 
           <!-- Partitive relations — one-to-many decompositions (ISO 704) -->
           <PartitiveRelationList
-            v-if="conceptPartitiveRelations.length"
+            v-if="conceptPartitiveRelations?.length"
             :relations="conceptPartitiveRelations"
             :manifest="manifest"
             :register-id="registerId"
@@ -581,7 +588,7 @@ const nonVerbalReps = computed(() => {
 
           <!-- Generic relations — genus/species decompositions (ISO 704) -->
           <GenericRelationList
-            v-if="conceptGenericRelations.length"
+            v-if="conceptGenericRelations?.length"
             :relations="conceptGenericRelations"
             :manifest="manifest"
             :register-id="registerId"
@@ -608,7 +615,7 @@ const nonVerbalReps = computed(() => {
           />
 
           <!-- Domains -->
-          <div v-if="conceptDomains.length" class="card p-5">
+          <div v-if="conceptDomains?.length" class="card p-5">
             <div class="section-label">{{ t('concept.domains') }}</div>
             <div class="space-y-1 mt-3">
               <button
@@ -628,7 +635,7 @@ const nonVerbalReps = computed(() => {
           </div>
 
           <!-- Tags -->
-          <div v-if="conceptTags.length" class="card p-5">
+          <div v-if="conceptTags?.length" class="card p-5">
             <div class="section-label">{{ t('concept.tags') }}</div>
             <div class="flex flex-wrap gap-1.5 mt-3">
               <span v-for="tag in conceptTags" :key="tag" class="badge badge-gray text-[10px]">{{ tag }}</span>
@@ -636,7 +643,7 @@ const nonVerbalReps = computed(() => {
           </div>
 
           <!-- Managed concept dates -->
-          <div v-if="conceptDates.length" class="card p-5">
+          <div v-if="conceptDates?.length" class="card p-5">
             <div class="section-label">{{ t('concept.lifecycleDates') }}</div>
             <dl class="mt-3 space-y-1.5 text-xs">
               <div v-for="(d, i) in conceptDates" :key="i" class="flex gap-2">
@@ -647,7 +654,7 @@ const nonVerbalReps = computed(() => {
           </div>
 
           <!-- Managed concept sources -->
-          <div v-if="conceptSources.length" class="card p-5">
+          <div v-if="conceptSources?.length" class="card p-5">
             <div class="section-label">{{ t('concept.conceptSources') }}</div>
             <div class="space-y-2 mt-3">
               <div v-for="(src, i) in conceptSources" :key="i" class="text-xs">

package/src/composables/use-concept-edges.ts

@@ -138,33 +138,37 @@ export function useConceptEdges(
   // Concept-level related concepts (managed concept cross-references)
   const conceptRelated = computed(() => {
     if (!concept.value) return [];
-    const direct = concept.value.relatedConcepts?.filter((rc: any) => !INVERSE_RELATIONSHIPS[rc.type]) ?? [];
-    const derived = incomingEdges.value
-      .filter(e => INVERSE_RELATIONSHIPS[e.type])
-      .map(e => {
-        const parsed = factory.resolve(e.source, registerId.value);
-        const sourceUrn = parsed.type === 'internal'
-          ? store.manifests.get(parsed.registerId)?.datasetUri
-          : null;
-        const conceptId = e.source.match(/\/concept\/([^/]+)$/)?.[1];
-        return {
-          type: INVERSE_RELATIONSHIPS[e.type],
-          ref: sourceUrn && conceptId ? { source: sourceUrn, id: conceptId } : null,
-          content: '',
-        };
+    try {
+      const direct = concept.value.relatedConcepts?.filter((rc: any) => !INVERSE_RELATIONSHIPS[rc.type]) ?? [];
+      const derived = incomingEdges.value
+        .filter(e => INVERSE_RELATIONSHIPS[e.type])
+        .map(e => {
+          const parsed = factory.resolve(e.source, registerId.value);
+          const sourceUrn = parsed.type === 'internal'
+            ? store.manifests.get(parsed.registerId)?.datasetUri
+            : null;
+          const conceptId = e.source.match(/\/concept\/([^/]+)$/)?.[1];
+          return {
+            type: INVERSE_RELATIONSHIPS[e.type],
+            ref: sourceUrn && conceptId ? { source: sourceUrn, id: conceptId } : null,
+            content: '',
+          };
+        });
+      return [...direct, ...derived].filter(edge => {
+        if (edge.type === 'broader_partitive' || edge.type === 'narrower_partitive') {
+          const refUri = resolveRefUri(edge.ref as { source: string | null; id: string | null } | null);
+          if (!refUri) return true;
+          const rels = conceptPartitiveRelations.value;
+          return !rels.some(rel =>
+            rel.comprehensive === refUri
+            || rel.partitives.some(m => m.uri === refUri),
+          );
+        }
+        return true;
       });
-    return [...direct, ...derived].filter(edge => {
-      if (edge.type === 'broader_partitive' || edge.type === 'narrower_partitive') {
-        const refUri = resolveRefUri(edge.ref as { source: string | null; id: string | null } | null);
-        if (!refUri) return true;
-        const rels = conceptPartitiveRelations.value;
-        return !rels.some(rel =>
-          rel.comprehensive === refUri
-          || rel.partitives.some(m => m.uri === refUri),
-        );
-      }
-      return true;
-    });
+    } catch {
+      return [];
+    }
   });
 
   // Concept-level n-ary hyperedge relations (ISO 704 one-to-many
@@ -174,25 +178,29 @@ export function useConceptEdges(
   //
   // glossarist 0.4.33+ exposes a unified `.relations` array; type
   // discrimination is via instanceof.
+  //
+  // Defensive: wrap in try/catch so a malformed concept (missing
+  // .relations, bad .comprehensive, etc.) never crashes the detail
+  // view at hydration. Regression: issue #171.
   function projectHyperedge(rel: any): PartitiveRelationWire | GenericRelationWire | null {
     const source = conceptUriValue.value;
     if (!source) return null;
-    const comprehensive = resolveConceptRefUri(rel.comprehensive);
+    const comprehensive = resolveConceptRefUri(rel?.comprehensive);
     if (!comprehensive) return null;
     const isGeneric = rel instanceof GenericHyperedge;
-    const members: any[] = (rel.members ?? rel.partitives ?? [])
+    const members: any[] = (rel?.members ?? rel?.partitives ?? [])
       .map((m: any): any | null => {
-        const uri = resolveConceptRefUri(m.ref);
+        const uri = resolveConceptRefUri(m?.ref);
         if (!uri || uri === source) return null;
         const base: any = {
           uri,
-          presence: readPresence(m),
-          count: readCount(m),
+          presence: m?.presence,
+          count: m?.count,
         };
         if (isGeneric) {
-          base.delimitingCharacteristic = m.delimitingCharacteristic;
+          base.delimitingCharacteristic = m?.delimitingCharacteristic;
         } else {
-          base.isDelimiting = readIsDelimiting(m);
+          base.isDelimiting = m?.is_delimiting === true;
         }
         return base;
       })
@@ -203,26 +211,34 @@ export function useConceptEdges(
       comprehensive,
       members,
       partitives: members,
-      completeness: rel.completeness,
-      criterion: rel.criterion ?? undefined,
+      completeness: rel?.completeness,
+      criterion: rel?.criterion ?? undefined,
       register: registerId.value,
     };
   }
 
   const conceptPartitiveRelations = computed<PartitiveRelationWire[]>(() => {
     if (!concept.value) return [];
-    return ((concept.value.relations as any[]) ?? [])
-      .filter(r => r instanceof PartitiveHyperedge)
-      .map(projectHyperedge)
-      .filter((r): r is PartitiveRelationWire => r !== null);
+    try {
+      return ((concept.value.relations as any[]) ?? [])
+        .filter(r => r instanceof PartitiveHyperedge)
+        .map(projectHyperedge)
+        .filter((r): r is PartitiveRelationWire => r !== null);
+    } catch {
+      return [];
+    }
   });
 
   const conceptGenericRelations = computed<GenericRelationWire[]>(() => {
     if (!concept.value) return [];
-    return ((concept.value.relations as any[]) ?? [])
-      .filter(r => r instanceof GenericHyperedge)
-      .map(projectHyperedge)
-      .filter((r): r is GenericRelationWire => r !== null);
+    try {
+      return ((concept.value.relations as any[]) ?? [])
+        .filter(r => r instanceof GenericHyperedge)
+        .map(projectHyperedge)
+        .filter((r): r is GenericRelationWire => r !== null);
+    } catch {
+      return [];
+    }
   });
 
   function resolveConceptRefUri(ref: ConceptRef | null): string | null {

package/src/config/types.ts

@@ -18,6 +18,22 @@ export interface LogoConfig {
   localDark?: string;
 }
 
+export interface FaviconConfig {
+  /** Path prefix for all favicon URLs. Defaults to '/', set to a sub-path
+   *  when deploying under BASE_PATH != '/'. */
+  base_path?: string;
+  /** Skip emitting the default <link rel="icon"> and <link rel="apple-touch-icon">
+   *  tags. Use when the consumer provides their own RFG-compatible markup via
+   *  `links_html`. Default: false (emit default tags). */
+  skip_default_links?: boolean;
+  /** Raw HTML string (one or more <link> tags) to emit in <head> instead of
+   *  the default favicon block. RealFaviconGenerator output goes here. */
+  links_html?: string;
+  /** Consumer-side directory (relative to cwd) holding canonical favicon files.
+   *  The CLI's favicon step copies these into public/, overriding defaults. */
+  source_dir?: string;
+}
+
 export interface SiteBranding {
   primaryColor?: string;
   darkColor?: string;
@@ -27,7 +43,7 @@ export interface SiteBranding {
   };
   logo?: LogoConfig;
   footerLogo?: LogoConfig;
-  favicon?: string;
+  favicon?: string | FaviconConfig;
   ownerName?: string;
   ownerUrl?: string;
 }

package/src/layouts/Default.astro

@@ -36,28 +36,53 @@ const fontHeader = brandingFonts?.header?.family
 const fontBody = brandingFonts?.body?.family
   ? `'${brandingFonts.body.family}', system-ui, sans-serif`
   : `'DM Sans', system-ui, sans-serif`;
+
+// Favicon configuration (issue #173).
+//
+// Consumers provide their own favicon set in one of two ways:
+//
+//   1. Drop canonical files at `branding.favicon.source_dir` (relative
+//      to the consumer's cwd). The CLI's existing favicon step already
+//      copies these into public/ overriding the defaults — this layout
+//      just needs to emit the right <link> tags.
+//
+//   2. Set `branding.favicon.skip_default_links: true` and inject
+//      custom <link> tags via the `branding.favicon.links_html`
+//      string (e.g. RealFaviconGenerator output). The layout emits
+//      that verbatim and skips the default tag block.
+//
+// When neither is set, today's default behavior is preserved.
+const faviconCfg = siteConfig?.branding?.favicon ?? {};
+const skipDefaultFaviconLinks = faviconCfg.skip_default_links === true;
+const customFaviconLinks: string = faviconCfg.links_html ?? '';
+const faviconBase = faviconCfg.base_path ?? '/';
 ---
 
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="48x48" href="/favicon-48x48.png" />
-    <link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png" />
-    <link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png" />
-    <link rel="apple-touch-icon" sizes="167x167" href="/apple-touch-icon-167x167.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png" />
-    <link rel="apple-touch-icon" sizes="1024x1024" href="/apple-touch-icon-1024x1024.png" />
+    {!skipDefaultFaviconLinks && (
+      <>
+        <link rel="icon" type="image/x-icon" href={`${faviconBase}favicon.ico`} />
+        <link rel="icon" type="image/svg+xml" href={`${faviconBase}favicon.svg`} />
+        <link rel="icon" type="image/png" sizes="16x16" href={`${faviconBase}favicon-16x16.png`} />
+        <link rel="icon" type="image/png" sizes="32x32" href={`${faviconBase}favicon-32x32.png`} />
+        <link rel="icon" type="image/png" sizes="48x48" href={`${faviconBase}favicon-48x48.png`} />
+        <link rel="apple-touch-icon" sizes="57x57" href={`${faviconBase}apple-touch-icon-57x57.png`} />
+        <link rel="apple-touch-icon" sizes="60x60" href={`${faviconBase}apple-touch-icon-60x60.png`} />
+        <link rel="apple-touch-icon" sizes="72x72" href={`${faviconBase}apple-touch-icon-72x72.png`} />
+        <link rel="apple-touch-icon" sizes="76x76" href={`${faviconBase}apple-touch-icon-76x76.png`} />
+        <link rel="apple-touch-icon" sizes="114x114" href={`${faviconBase}apple-touch-icon-114x114.png`} />
+        <link rel="apple-touch-icon" sizes="120x120" href={`${faviconBase}apple-touch-icon-120x120.png`} />
+        <link rel="apple-touch-icon" sizes="144x144" href={`${faviconBase}apple-touch-icon-144x144.png`} />
+        <link rel="apple-touch-icon" sizes="152x152" href={`${faviconBase}apple-touch-icon-152x152.png`} />
+        <link rel="apple-touch-icon" sizes="167x167" href={`${faviconBase}apple-touch-icon-167x167.png`} />
+        <link rel="apple-touch-icon" sizes="180x180" href={`${faviconBase}apple-touch-icon-180x180.png`} />
+        <link rel="apple-touch-icon" sizes="1024x1024" href={`${faviconBase}apple-touch-icon-1024x1024.png`} />
+      </>
+    )}
+    {customFaviconLinks && <Fragment set:html={customFaviconLinks} />}
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <meta name="apple-mobile-web-app-title" content={siteConfig.title} />

package/src/pages/[...path].astro

@@ -11,6 +11,12 @@ export async function getStaticPaths() {
     { params: { path: 'about' } },
     { params: { path: 'contributors' } },
     { params: { path: 'news' } },
+    /* /learn and sub-routes — page-types.ts auto-synthesizes the nav entry.
+       Without these static paths the nav link 404s on prefetch (issue #174). */
+    { params: { path: 'learn' } },
+    { params: { path: 'learn/relationships' } },
+    { params: { path: 'learn/designations' } },
+    { params: { path: 'learn/statuses' } },
   ];
   for (const ds of datasets) {
     paths.push({ params: { path: `dataset/${ds.data.id}/about` } });