@glossarist/concept-browser 0.7.138 → 0.7.140

package/src/stores/vocabulary.ts

@@ -8,6 +8,8 @@ import { conceptUri } from '../adapters/model-bridge';
 import { GraphEngine } from '../graph';
 import { UriRouter } from '../adapters/UriRouter';
 import { deduplicateSearchHits } from '../utils/search';
+import { useSiteConfig } from '../config/use-site-config';
+import { DEFAULT_LANG } from '../utils/lang';
 import { UnknownDatasetError } from '../errors';
 
 export const useVocabularyStore = defineStore('vocabulary', () => {
@@ -19,6 +21,7 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
   const currentConceptId = ref<string>('');
   const loading = ref(false);
   const error = ref<string | null>(null);
+  const searchWarning = ref<string | null>(null);
   const graph = shallowRef(new GraphEngine());
   const conceptEdges = ref<GraphEdge[]>([]);
   const initialized = ref(false);
@@ -32,6 +35,14 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
 
   const factory = getFactory();
 
+  const { config } = useSiteConfig();
+  const searchPriorityLanguages = computed(() => {
+    const defaults = config.value?.defaults;
+    return defaults?.languageOrder?.length
+      ? defaults.languageOrder
+      : [defaults?.language ?? DEFAULT_LANG];
+  });
+
   // Computed
   const currentManifest = computed(() =>
     manifests.value.get(currentRegisterId.value)
@@ -263,46 +274,29 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
       await discoverDatasets();
     }
 
-    const MIN_RESULTS = 20;
-
-    // Pass 1: search loaded data only
-    const loadedHits: SearchHit[] = [];
-    const unloadedAdapters: DatasetAdapter[] = [];
-
+    const allHits: SearchHit[] = [];
+    let incomplete = false;
     for (const adapter of datasets.value.values()) {
       if (!adapter.manifest) continue;
-      if (!adapter.index) {
-        try {
+      try {
+        if (!adapter.index) {
           await adapter.loadIndex();
+        }
+        try {
+          await adapter.ensureAllChunksLoaded();
         } catch {
-          continue;
+          // Preserve loaded hits, but make the incomplete result set visible.
+          incomplete = true;
         }
-      }
-      const hits = adapter.search(query);
-      if (hits.length > 0) {
-        loadedHits.push(...hits);
-      } else {
-        unloadedAdapters.push(adapter);
-      }
-    }
-
-    const pass1 = deduplicateSearchHits(loadedHits);
-    if (pass1.length >= MIN_RESULTS) return pass1;
-
-    // Pass 2: load chunks lazily for datasets that found nothing in index
-    let allHits = [...loadedHits];
-    for (const adapter of unloadedAdapters) {
-      if (deduplicateSearchHits(allHits).length >= MIN_RESULTS) break;
-      try {
-        await adapter.ensureAllChunksLoaded();
-        const hits = adapter.search(query);
-        allHits.push(...hits);
+        allHits.push(...adapter.search(query));
       } catch {
-        // Skip datasets that fail to load
+        // Other datasets may still provide useful results.
+        incomplete = true;
       }
     }
 
-    return deduplicateSearchHits(allHits);
+    searchWarning.value = incomplete ? 'search.incomplete' : null;
+    return deduplicateSearchHits(allHits, searchPriorityLanguages.value);
   }
 
   async function getRandomConcept(): Promise<{ registerId: string; conceptId: string } | null> {
@@ -324,6 +318,7 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
     currentConceptId,
     loading,
     error,
+    searchWarning,
     graph,
     graphVersion,
     conceptEdges,
@@ -338,6 +333,7 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
     viewConcept,
     navigateToUri,
     searchAcrossDatasets,
+    searchPriorityLanguages,
     loadAllGraphData,
     getRandomConcept,
   };

package/src/utils/search.ts

@@ -1,6 +1,14 @@
 import type { SearchHit } from '../adapters/types';
 
-export function deduplicateSearchHits(hits: SearchHit[]): SearchHit[] {
+export function orderSearchHits(hits: SearchHit[], priorityLangs: string[]): SearchHit[] {
+  const index = new Map(priorityLangs.map((language, i) => [language, i]));
+  const tier = (hit: SearchHit) => hit.language === '' ? -1 : (index.get(hit.language) ?? priorityLangs.length);
+  // Stable sorting preserves the adapter's score/alphabetical order within each tier.
+  return [...hits].sort((a, b) => tier(a) - tier(b));
+}
+
+export function deduplicateSearchHits(hits: SearchHit[], priorityLangs: string[] = []): SearchHit[] {
+  const index = new Map(priorityLangs.map((language, i) => [language, i]));
   const best = new Map<string, SearchHit>();
   for (const hit of hits) {
     const key = `${hit.registerId}:${hit.conceptId}`;
@@ -9,6 +17,11 @@ export function deduplicateSearchHits(hits: SearchHit[]): SearchHit[] {
       best.set(key, hit);
     } else if (hit.matchField === 'designation' && existing.matchField === 'id') {
       best.set(key, hit);
+    } else if (
+      hit.matchField === 'designation' && existing.matchField === 'designation' &&
+      (index.get(hit.language) ?? priorityLangs.length) < (index.get(existing.language) ?? priorityLangs.length)
+    ) {
+      best.set(key, hit);
     }
   }
   return [...best.values()];

package/src/utils/slugify.ts

@@ -1,3 +1,27 @@
+// Slug for a domain label. Keeps letters and digits of every script so that
+// non-Latin and accented labels stay distinct and readable. Pure-ASCII input
+// that contains a letter or digit yields exactly what the earlier ASCII-only
+// implementation did, so already-published URLs do not move.
+
+const KEEP = /[^\p{L}\p{N}\p{M}_\s-]/gu;
+const HAS_WORD = /[\p{L}\p{N}]/u;
+
+// FNV-1a, 32 bit, over UTF-16 code units. Sync and dependency-free so it runs
+// in the browser and in the Node build scripts alike.
+function shortHash(text: string): string {
+  let h = 0x811c9dc5;
+  for (let i = 0; i < text.length; i++) {
+    h ^= text.charCodeAt(i);
+    h = Math.imul(h, 0x01000193) >>> 0;
+  }
+  return h.toString(16).padStart(8, '0');
+}
+
 export function slugify(text: string): string {
-  return text.toLowerCase().replace(/[^\w\s-]/g, '').replace(/[\s/]+/g, '-');
+  if (text === '') return '';
+  const folded = text.normalize('NFKC').toLowerCase();
+  const slug = folded.replace(KEEP, '').replace(/[\s/]+/g, '-');
+  // No letter or digit left (e.g. "()", "---"): a hash keeps such labels
+  // from collapsing into one empty node.
+  return HAS_WORD.test(slug) ? slug : `x-${shortHash(folded.trim())}`;
 }

package/src/utils/source-standard.ts

@@ -0,0 +1,34 @@
+import type { Concept } from 'glossarist';
+
+interface StandardRef {
+  readonly source?: string | null;
+  readonly id?: string | null;
+}
+
+/** Combine source and id, retaining edition years and ignoring clause/locality fields. */
+export function standardLabel(ref: StandardRef | null | undefined): string | null {
+  const parts = [ref?.source, ref?.id]
+    .map(part => part?.trim().replace(/\s+/g, ' ') ?? '')
+    .filter(Boolean);
+  return parts.join(' ') || null;
+}
+
+/** Case-insensitive, whitespace-normalized identity shared by build and browser. */
+export function standardKey(ref: StandardRef | null | undefined): string | null {
+  return standardLabel(ref)?.toLowerCase() ?? null;
+}
+
+/** Unique authoritative standards, in concept-then-localization encounter order. */
+export function collectStandardKeys(concept: Pick<Concept, 'sources' | 'languages' | 'localization'>): string[] {
+  const sources = [
+    ...concept.sources,
+    ...concept.languages.flatMap(lang => concept.localization(lang)?.sources ?? []),
+  ];
+  const keys = new Set<string>();
+  for (const source of sources) {
+    if (source.type !== 'authoritative') continue;
+    const key = standardKey(source.origin?.ref);
+    if (key !== null) keys.add(key);
+  }
+  return [...keys];
+}

package/src/views/ConceptView.vue

@@ -3,9 +3,11 @@ import { computed, watch, ref, onMounted, onUnmounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useVocabularyStore } from '../stores/vocabulary';
 import ConceptDetail from '../components/ConceptDetail.vue';
+import SameStandardPane from '../components/SameStandardPane.vue';
 import RelationSphere from '../components/RelationSphere.vue';
 import ShortcutsModal from '../components/ShortcutsModal.vue';
 import { useConceptEdges } from '../composables/use-concept-edges';
+import { useSameStandardTerms } from '../composables/use-same-standard-terms';
 import { useI18n } from '../i18n';
 
 const { t } = useI18n();
@@ -16,6 +18,8 @@ const props = defineProps<{
 }>();
 
 const store = useVocabularyStore();
+const sameStandardGroups = useSameStandardTerms();
+const hasSameStandardTerms = computed(() => sameStandardGroups.value.some(group => group.terms.length > 0));
 const router = useRouter();
 const conceptLoading = ref(false);
 const localError = ref<string | null>(null);
@@ -86,11 +90,16 @@ async function copyPermalink() {
 async function loadAdjacent() {
   const adapter = store.datasets.get(props.registerId);
   if (!adapter?.index) return;
-  const idx = adapter.getConceptPosition(props.conceptId);
-  if (idx >= 0) {
-    await adapter.ensureChunksForRange(Math.max(0, idx - 1), 3);
+  try {
+    const idx = adapter.getConceptPosition(props.conceptId);
+    if (idx >= 0) {
+      await adapter.ensureChunksForRange(Math.max(0, idx - 1), 3);
+    }
+    adjacent.value = adapter.getAdjacentConcepts(props.conceptId);
+  } catch (e) {
+    adjacent.value = { prev: null, next: null };
+    console.error('Failed to load adjacent concepts:', e);
   }
-  adjacent.value = adapter.getAdjacentConcepts(props.conceptId);
 }
 
 function goAdjacent(id: string) {
@@ -293,14 +302,23 @@ onUnmounted(() => window.removeEventListener('keydown', onKeydown));
           @navigate="onSphereNavigate"
         />
         <!-- Detail mode -->
-        <ConceptDetail
-          v-else
-          :concept="concept as any"
-          :manifest="manifest"
-          :edges="edges"
-          :adjacent="adjacent"
-          :register-id="registerId"
-        />
+        <div v-else class="detail-layout" :class="{ 'has-standard-pane': hasSameStandardTerms }">
+          <div class="detail-main">
+            <ConceptDetail
+              :concept="concept as any"
+              :manifest="manifest"
+              :edges="edges"
+              :adjacent="adjacent"
+              :register-id="registerId"
+            />
+          </div>
+          <SameStandardPane
+            v-if="hasSameStandardTerms"
+            :groups="sameStandardGroups"
+            :register-id="activeRegisterId"
+            :concept-id="concept.id"
+          />
+        </div>
       </div>
     </template>
 
@@ -333,6 +351,19 @@ onUnmounted(() => window.removeEventListener('keydown', onKeydown));
   display: flex;
   flex-direction: column;
 }
+.detail-layout {
+  display: grid;
+  gap: 1.5rem;
+  align-items: start;
+}
+.detail-main {
+  min-width: 0;
+}
+@media (min-width: 1024px) {
+  .detail-layout.has-standard-pane {
+    grid-template-columns: minmax(0, 1fr) 18rem;
+  }
+}
 .fade-enter-active, .fade-leave-active { transition: opacity 0.2s; }
 .fade-enter-from, .fade-leave-to { opacity: 0; }
 </style>

package/src/views/DatasetView.vue

@@ -156,6 +156,8 @@ async function ensureAllChunksForFilter(needsLoad: boolean) {
   try {
     await a.ensureAllChunksLoaded();
     allChunksLoaded.value = true;
+  } catch (e) {
+    localError.value = e instanceof Error ? e.message : String(e);
   } finally {
     chunkLoading.value = false;
   }
@@ -271,15 +273,33 @@ const totalPages = computed(() => {
 });
 
 // Load chunks needed for current page
-watch(page, async () => {
+async function loadPageChunks() {
   if (!adapter.value || isFiltering.value) return;
   const start = (page.value - 1) * perPage;
   if (!adapter.value.isRangeLoaded(start, perPage)) {
     chunkLoading.value = true;
-    await adapter.value.ensureChunksForRange(start, perPage);
-    chunkLoading.value = false;
+    try {
+      await adapter.value.ensureChunksForRange(start, perPage);
+    } catch (e) {
+      localError.value = e instanceof Error ? e.message : String(e);
+    } finally {
+      chunkLoading.value = false;
+    }
   }
-}, { immediate: true });
+}
+
+watch(page, loadPageChunks, { immediate: true });
+
+async function retryLoad() {
+  localError.value = null;
+  if (!adapter.value?.index) {
+    await ensureLoaded();
+  } else if (isFiltering.value) {
+    await ensureAllChunksForFilter(true);
+  } else {
+    await loadPageChunks();
+  }
+}
 
 // Visible page numbers for pagination (avoids iterating 445+ pages)
 const visiblePages = computed(() => {
@@ -383,7 +403,7 @@ function clearSection() {
         <p class="text-red-700 font-medium mb-1">{{ t('dataset.failedToLoad') }}</p>
         <p class="text-sm text-red-600/80 mb-4">{{ localError }}</p>
         <div class="flex gap-2 justify-center">
-          <button @click="ensureLoaded" class="btn-primary">{{ t('dataset.retry') }}</button>
+          <button @click="retryLoad" class="btn-primary">{{ t('dataset.retry') }}</button>
           <router-link :to="{ name: 'home' }" class="btn-secondary">{{ t('dataset.backToHome') }}</router-link>
         </div>
       </div>

package/src/views/SearchView.vue

@@ -1,25 +1,22 @@
 <script setup lang="ts">
-import { ref, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { onBeforeUnmount, watch } from 'vue';
+import { useRoute } from 'vue-router';
 import SearchBar from '../components/SearchBar.vue';
 import { useUiStore } from '../stores/ui';
 import { useI18n } from '../i18n';
 
 const route = useRoute();
-const router = useRouter();
 const ui = useUiStore();
 const { t } = useI18n();
 
-onMounted(() => {
-  if (route.query.q && typeof route.query.q === 'string') {
-    ui.searchQuery = route.query.q;
-  }
-});
+watch(() => [route.name, route.query.q], () => {
+  ui.searchQuery = route.name === 'search' && typeof route.query.q === 'string'
+    ? route.query.q.trim()
+    : '';
+}, { immediate: true });
 
-watch(() => route.query.q, (q) => {
-  if (typeof q === 'string' && q) {
-    ui.searchQuery = q;
-  }
+onBeforeUnmount(() => {
+  ui.searchQuery = '';
 });
 </script>