@glossarist/concept-browser 0.7.7 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {

package/scripts/generate-data.mjs

@@ -679,10 +679,11 @@ function processDataset(dir, register, opts) {
   }));
 
   const graphNodeEntries = concepts.map(c => {
-    let term = '', lang = '';
-    if (c.designations.eng) { term = c.designations.eng; lang = 'eng'; }
-    else { for (const [l, t] of Object.entries(c.designations)) { if (t) { term = t; lang = l; break; } } }
-    return [c.id, term.replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim(), lang, c.status];
+    const cleanDesignations = {};
+    for (const [l, t] of Object.entries(c.designations)) {
+      if (t) cleanDesignations[l] = t.replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim();
+    }
+    return [c.id, cleanDesignations, c.status];
   });
   fs.mkdirSync(path.join(DATA, register), { recursive: true });
   fs.writeFileSync(

package/src/__tests__/dataset-adapter.test.ts

@@ -61,9 +61,9 @@ describe('DatasetAdapter', () => {
         chunkSize: 500,
         chunks: [],
         concepts: [
-          { id: '102-01-01', eng: 'equality', status: 'Standard' },
-          { id: '102-01-02', eng: 'inequality', status: 'Standard' },
-          { id: '103-01-02', eng: 'functional', status: 'Standard' },
+          { id: '102-01-01', designations: { eng: 'equality' }, eng: 'equality', status: 'Standard' },
+          { id: '102-01-02', designations: { eng: 'inequality' }, eng: 'inequality', status: 'Standard' },
+          { id: '103-01-02', designations: { eng: 'functional' }, eng: 'functional', status: 'Standard' },
         ],
       };
       mockFetch.mockReturnValue(mockJsonResponse(index));
@@ -128,9 +128,9 @@ describe('DatasetAdapter', () => {
         chunkSize: 500,
         chunks: [],
         concepts: [
-          { id: '102-01-01', eng: 'equality', status: 'Standard' },
-          { id: '102-01-02', eng: 'inequality', status: 'Standard' },
-          { id: '103-01-02', eng: 'functional', status: 'Standard' },
+          { id: '102-01-01', designations: { eng: 'equality' }, eng: 'equality', status: 'Standard' },
+          { id: '102-01-02', designations: { eng: 'inequality' }, eng: 'inequality', status: 'Standard' },
+          { id: '103-01-02', designations: { eng: 'functional' }, eng: 'functional', status: 'Standard' },
         ],
       };
       mockFetch.mockReturnValue(mockJsonResponse(index));
@@ -150,7 +150,7 @@ describe('DatasetAdapter', () => {
         chunkSize: 500,
         chunks: [],
         concepts: [
-          { id: '103-01-02', eng: 'functional', status: 'Standard' },
+          { id: '103-01-02', designations: { eng: 'functional' }, eng: 'functional', status: 'Standard' },
         ],
       };
       mockFetch.mockReturnValue(mockJsonResponse(index));
@@ -169,7 +169,7 @@ describe('DatasetAdapter', () => {
         chunkSize: 500,
         chunks: [],
         concepts: [
-          { id: '102-01-01', eng: 'Equality', status: 'Standard' },
+          { id: '102-01-01', designations: { eng: 'Equality' }, eng: 'Equality', status: 'Standard' },
         ],
       };
       mockFetch.mockReturnValue(mockJsonResponse(index));
@@ -187,7 +187,7 @@ describe('DatasetAdapter', () => {
         chunkSize: 500,
         chunks: [],
         concepts: [
-          { id: '102-01-01', eng: 'equality', status: 'Standard' },
+          { id: '102-01-01', designations: { eng: 'equality' }, eng: 'equality', status: 'Standard' },
         ],
       };
       mockFetch.mockReturnValue(mockJsonResponse(index));

package/src/__tests__/graph-view.test.ts

@@ -26,6 +26,9 @@ describe('GraphView', () => {
     pinia = createPinia();
     setActivePinia(pinia);
     router = await createTestRouter();
+    // Mark store as initialized so loadAllGraphData skips discoverDatasets
+    const store = useVocabularyStore();
+    store.initialized = true;
   });
 
   function mountGraph() {

package/src/adapters/DatasetAdapter.ts

@@ -69,23 +69,12 @@ export class DatasetAdapter {
   }
 
   private normalizeIndex(data: any): ConceptIndex {
-    const concepts: ConceptSummary[] = (data.concepts || []).map((c: any) => {
-      if (c.designations && typeof c.designations === 'object') {
-        return {
-          id: c.id,
-          designations: c.designations,
-          eng: c.eng || c.designations.eng || Object.values(c.designations)[0] || '',
-          status: c.status,
-        };
-      }
-      // Legacy format: c.eng is a string, no designations map
-      return {
-        id: c.id,
-        designations: c.eng ? { eng: c.eng } : {},
-        eng: c.eng || '',
-        status: c.status,
-      };
-    });
+    const concepts: ConceptSummary[] = (data.concepts || []).map((c: any) => ({
+      id: c.id,
+      designations: c.designations || {},
+      eng: c.eng || c.designations?.eng || Object.values(c.designations || {})[0] || '',
+      status: c.status,
+    }));
 
     return {
       registerId: data.registerId,
@@ -391,7 +380,7 @@ export class DatasetAdapter {
     return data.edges ?? [];
   }
 
-  async loadGraphNodes(): Promise<{ uriPrefix: string; nodes: [string, string, string, string][] }> {
+  async loadGraphNodes(): Promise<{ uriPrefix: string; nodes: [string, Record<string, string>, string][] }> {
     const resp = await fetch(`${this.baseUrl}/graph-nodes.json`);
     if (!resp.ok) return { uriPrefix: '', nodes: [] };
     return await resp.json();

package/src/components/SearchBar.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { useUiStore } from '../stores/ui';
 import { useVocabularyStore } from '../stores/vocabulary';
 import { ref, watch, onMounted, computed, nextTick } from 'vue';
@@ -9,6 +9,7 @@ import { useDsStyle } from '../utils/dataset-style';
 import { useI18n } from '../i18n';
 
 const router = useRouter();
+const route = useRoute();
 const ui = useUiStore();
 const store = useVocabularyStore();
 const { getStyle } = useDsStyle();
@@ -37,7 +38,9 @@ async function doSearch() {
   }
   searched.value = true;
   selectedIdx.value = -1;
-  router.replace({ query: { q } });
+  if (route.query.q !== q) {
+    router.replace({ query: { q } });
+  }
 }
 
 function onInput() {

package/src/stores/vocabulary.ts

@@ -140,6 +140,10 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
   }
 
   async function loadAllGraphData() {
+    if (!initialized.value) {
+      await discoverDatasets();
+    }
+
     const engine = toRaw(graph.value);
     const adapters = factory.getAdapters();
 
@@ -155,13 +159,13 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
 
         if (nodeResult.status === 'fulfilled') {
           const { uriPrefix, nodes } = nodeResult.value;
-          for (const [id, term, lang, status] of nodes) {
+          for (const [id, designations, status] of nodes) {
             engine.addNode({
               uri: uriPrefix + id,
               register: adapter.registerId,
               conceptId: id,
-              designations: term ? { [lang || 'eng']: term } : {},
-              status,
+              designations: designations || {},
+              status: status || 'unknown',
               loaded: false,
             });
           }
@@ -296,9 +300,16 @@ export const useVocabularyStore = defineStore('vocabulary', () => {
   }
 
   async function searchAcrossDatasets(query: string): Promise<SearchHit[]> {
+    if (!initialized.value) {
+      await discoverDatasets();
+    }
+
     const allHits: SearchHit[] = [];
     for (const adapter of datasets.value.values()) {
-      if (adapter.index || adapter.manifest) {
+      if (adapter.manifest) {
+        if (!adapter.index) {
+          await adapter.loadIndex();
+        }
         await adapter.ensureAllChunksLoaded();
         allHits.push(...adapter.search(query));
       }