@glossarist/concept-browser 0.7.47 → 0.7.48

package/README.md

@@ -4,7 +4,7 @@ A statically deployable single-page application for browsing terminology dataset
 
 **Live sites:**
 - [GeoLexica](https://www.geolexica.org) — IEC Electropedia + ISO/TC 211 + more
-- [VIML](https://metanorma.github.io/oiml-viml/) — OIML International Vocabulary of Legal Metrology
+- [VIML](https://www.oimlsmart.org/vocab/) — OIML International Vocabulary of Legal Metrology
 - [OIML Terms](https://metanorma.github.io/oiml-terms/) — OIML G 18 terminology
 
 ---
@@ -346,6 +346,25 @@ The build produces static files in `dist/` with an SPA `404.html` fallback:
 - **Vercel:** Framework Vite, build command `npx concept-browser build`, output directory `dist`
 - **AWS S3 + CloudFront:** Upload `dist/`, error document `index.html`, configure CloudFront for SPA routing
 
+### Known deployments
+
+Sites currently powered by `@glossarist/concept-browser`. When cutting a release with breaking changes, bump `@glossarist/concept-browser` in each consumer repo and redeploy.
+
+| Repo | Site |
+|---|---|
+| [`geolexica/geolexica.github.io`](https://github.com/geolexica/geolexica.github.io) | https://www.geolexica.org |
+| [`geolexica/isotc204.geolexica.org`](https://github.com/geolexica/isotc204.geolexica.org) | https://isotc204.geolexica.org |
+| [`geolexica/isotc211.geolexica.org`](https://github.com/geolexica/isotc211.geolexica.org) | https://isotc211.geolexica.org |
+| [`geolexica/osgeo.geolexica.org`](https://github.com/geolexica/osgeo.geolexica.org) | https://osgeo.geolexica.org |
+| [`oimlsmart/vocab`](https://github.com/oimlsmart/vocab) | https://www.oimlsmart.org/vocab/ (VIML)¹ |
+| [`metanorma/oiml-terms`](https://github.com/metanorma/oiml-terms) | https://metanorma.github.io/oiml-terms/ |
+| [`metanorma/iala-vocab`](https://github.com/metanorma/iala-vocab) | https://metanorma.github.io/iala-vocab/ |
+| [`metanorma/iso-10303-2-vocab`](https://github.com/metanorma/iso-10303-2-vocab) | https://metanorma.github.io/iso-10303-2-vocab/ |
+
+To add a new deployment here, open a PR against this README.
+
+¹ The VIML deployment moved from `metanorma/oiml-viml` to [`oimlsmart/vocab`](https://github.com/oimlsmart/vocab) (GitHub redirects the old name automatically), and its live URL moved from `metanorma.github.io/oiml-viml/` to `www.oimlsmart.org/vocab/`. The old `metanorma.github.io/oiml-viml/` URL returns 404 (Pages doesn't follow repo renames across orgs).
+
 ---
 
 ## Architecture

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.47",
+  "version": "0.7.48",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
     "autoprefixer": "^10.4.21",
     "d3": "^7.9.0",
     "favicons": "^7.2.0",
-    "glossarist": "^0.4.0",
+    "glossarist": "^0.4.2",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "pinia": "^2.3.1",

package/src/__tests__/concept-detail-interaction.test.ts

@@ -181,6 +181,27 @@ describe('ConceptDetail interactions', () => {
     expect(wrapper.text()).toContain('an example');
   });
 
+  it('renders scoped examples nested inside a note', async () => {
+    const json = makeConceptJson() as Record<string, any>;
+    json['gl:localizedConcept'].eng['gl:notes'] = [
+      {
+        '@type': 'gl:DetailedDefinition',
+        'gl:content': 'resistance depends on dimensions and material',
+        'gl:examples': [
+          { '@type': 'gl:DetailedDefinition', 'gl:content': 'copper resistivity ≈ 1.68e-8 Ω·m at 20 °C' },
+          { '@type': 'gl:DetailedDefinition', 'gl:content': '1 m of 1 mm² copper wire ≈ 0.017 Ω' },
+        ],
+      },
+    ];
+    const wrapper = mountDetail(json);
+    await switchToDefinition(wrapper);
+    expect(wrapper.text()).toContain('resistance depends');
+    expect(wrapper.text()).toContain('Example 1');
+    expect(wrapper.text()).toContain('Example 2');
+    expect(wrapper.text()).toContain('copper resistivity');
+    expect(wrapper.text()).toContain('0.017 Ω');
+  });
+
   it('renders designation types as badges', async () => {
     const wrapper = mountDetail();
     await switchToDefinition(wrapper);

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

@@ -85,6 +85,50 @@ describe('DatasetAdapter', () => {
       expect(adapter.getIndexEntry('103-01-02')?.eng).toBe('functional');
       expect(adapter.getConceptCount()).toBe(3);
     });
+
+    it('preserves the full multilingual designations map (regression for #25)', async () => {
+      const index = {
+        registerId: 'test',
+        schemaVersion: '1.0.0',
+        conceptCount: 2,
+        chunkSize: 500,
+        chunks: [],
+        concepts: [
+          {
+            id: '102-01-01',
+            designations: { eng: 'equality', fra: 'égalité', deu: 'Gleichheit' },
+            eng: 'equality',
+            status: 'Standard',
+          },
+          {
+            id: '102-01-02',
+            designations: { eng: 'inequality', fra: 'inégalité' },
+            eng: 'inequality',
+            status: 'Standard',
+          },
+        ],
+      };
+      mockFetch.mockReturnValue(mockJsonResponse(index));
+
+      await adapter.loadIndex();
+
+      const equality = adapter.getIndexEntry('102-01-01');
+      expect(equality?.designations).toEqual({
+        eng: 'equality',
+        fra: 'égalité',
+        deu: 'Gleichheit',
+      });
+
+      const inequality = adapter.getIndexEntry('102-01-02');
+      expect(inequality?.designations).toEqual({
+        eng: 'inequality',
+        fra: 'inégalité',
+      });
+
+      expect(adapter.lookupByDesignation('égalité')).toBe('102-01-01');
+      expect(adapter.lookupByDesignation('Gleichheit')).toBe('102-01-01');
+      expect(adapter.lookupByDesignation('inégalité')).toBe('102-01-02');
+    });
   });
 
   describe('fetchConcept', () => {

package/src/adapters/model-bridge.ts

@@ -399,6 +399,14 @@ function mapLocalityFromJsonLd(rawLoc: JsonLdLocality | undefined): Record<strin
     ? locObj : null;
 }
 
+function mapDetailedDefinitionFromJsonLd(d: any): Record<string, unknown> {
+  const result: Record<string, unknown> = { content: d['gl:content'] ?? '' };
+  if (d['gl:examples']?.length) {
+    result.examples = d['gl:examples'].map(mapDetailedDefinitionFromJsonLd);
+  }
+  return result;
+}
+
 function mapSourceFromJsonLd(s: JsonLdSource): Record<string, unknown> {
   const result: Record<string, unknown> = {};
   if (s['gl:id']) result.id = s['gl:id'];
@@ -480,21 +488,19 @@ function mapLocalizedFromJsonLd(lc: JsonLdLocalizedConcept): Record<string, unkn
   }
 
   if (lc['gl:definition']?.length) {
-    data.definition = lc['gl:definition'].map(d => ({
-      content: d['gl:content'] ?? '',
-    }));
+    data.definition = lc['gl:definition'].map(mapDetailedDefinitionFromJsonLd);
   }
 
   if (lc['gl:notes']?.length) {
-    data.notes = lc['gl:notes'].map(n => ({ content: n['gl:content'] ?? '' }));
+    data.notes = lc['gl:notes'].map(mapDetailedDefinitionFromJsonLd);
   }
 
   if (lc['gl:annotations']?.length) {
-    data.annotations = lc['gl:annotations'].map(a => ({ content: a['gl:content'] ?? '' }));
+    data.annotations = lc['gl:annotations'].map(mapDetailedDefinitionFromJsonLd);
   }
 
   if (lc['gl:examples']?.length) {
-    data.examples = lc['gl:examples'].map(e => ({ content: e['gl:content'] ?? '' }));
+    data.examples = lc['gl:examples'].map(mapDetailedDefinitionFromJsonLd);
   }
 
   if (lc['gl:source']?.length) {

package/src/components/ConceptDetail.vue

@@ -161,6 +161,7 @@ const {
   toggleLang,
   toggleAll,
   plainTruncate,
+  totalExampleCount,
   orderedDesignations,
 } = useConceptContent(conceptComputed, manifestComputed, renderOpts);
 
@@ -380,8 +381,8 @@ const nonVerbalReps = computed(() => {
                 <template v-if="lc.annotations.length">{{ lc.annotations.length }} annotation{{ lc.annotations.length > 1 ? 's' : '' }}</template>
                 <template v-if="lc.annotations.length && lc.notes.length"> &middot; </template>
                 <template v-if="lc.notes.length">{{ lc.notes.length }} note{{ lc.notes.length > 1 ? 's' : '' }}</template>
-                <template v-if="(lc.annotations.length || lc.notes.length) && lc.examples.length"> &middot; </template>
-                <template v-if="lc.examples.length">{{ lc.examples.length }} example{{ lc.examples.length > 1 ? 's' : '' }}</template>
+                <template v-if="(lc.annotations.length || lc.notes.length) && totalExampleCount(lc)"> &middot; </template>
+                <template v-if="totalExampleCount(lc)">{{ totalExampleCount(lc) }} example{{ totalExampleCount(lc) > 1 ? 's' : '' }}</template>
               </p>
             </div>
 
@@ -411,17 +412,23 @@ const nonVerbalReps = computed(() => {
 
               <!-- Notes -->
               <div v-if="lc.notes.length" class="space-y-2">
-                <div v-for="(_, i) in lc.notes" :key="i" class="text-ink-600 text-sm leading-relaxed">
+                <div v-for="(note, i) in lc.notes" :key="i" class="text-ink-600 text-sm leading-relaxed">
                   <span class="font-medium text-ink-400 text-xs uppercase tracking-wide">{{ t('concept.note') }} {{ i + 1 }}</span>
-                  <div class="mt-1" v-html="lc.renderedNotes[i]"></div>
+                  <div class="mt-1" v-html="note.renderedContent"></div>
+                  <div v-if="note.examples.length" class="mt-2 ml-4 space-y-2 border-l-2 border-ink-200/70 pl-3">
+                    <div v-for="(ex, j) in note.examples" :key="j" class="text-ink-500 leading-relaxed">
+                      <span class="font-medium text-ink-400 text-xs uppercase tracking-wide">{{ t('concept.example') }} {{ j + 1 }}</span>
+                      <div class="mt-1" v-html="ex.renderedContent"></div>
+                    </div>
+                  </div>
                 </div>
               </div>
 
               <!-- Examples -->
               <div v-if="lc.examples.length" class="space-y-2">
-                <div v-for="(_, i) in lc.examples" :key="i" class="text-ink-600 text-sm leading-relaxed">
+                <div v-for="(ex, i) in lc.examples" :key="i" class="text-ink-600 text-sm leading-relaxed">
                   <span class="font-medium text-ink-400 text-xs uppercase tracking-wide">{{ t('concept.example') }} {{ i + 1 }}</span>
-                  <div class="mt-1" v-html="lc.renderedExamples[i]"></div>
+                  <div class="mt-1" v-html="ex.renderedContent"></div>
                 </div>
               </div>
 

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

@@ -1,5 +1,5 @@
 import { computed, ref, watch, type ComputedRef } from 'vue';
-import type { Concept, LocalizedConcept, ConceptSource, Designation } from 'glossarist';
+import type { Concept, LocalizedConcept, ConceptSource, Designation, DetailedDefinition } from 'glossarist';
 import type { Manifest } from '../adapters/types';
 import type { RenderOptions } from '../utils/content-renderer';
 import { renderContent, cleanContent } from '../utils/content-renderer';
@@ -9,6 +9,17 @@ import { sortLanguages } from '../utils/lang';
 import { useSiteConfig } from '../config/use-site-config';
 import { useI18n } from '../i18n';
 
+export interface ExampleEntry {
+  content: string;
+  renderedContent: string;
+}
+
+export interface NoteEntry {
+  content: string;
+  renderedContent: string;
+  examples: ExampleEntry[];
+}
+
 export interface LangContent {
   lang: string;
   lc: LocalizedConcept;
@@ -17,10 +28,8 @@ export interface LangContent {
   renderedDefinition: string;
   annotations: string[];
   renderedAnnotations: string[];
-  notes: string[];
-  renderedNotes: string[];
-  examples: string[];
-  renderedExamples: string[];
+  notes: NoteEntry[];
+  examples: ExampleEntry[];
   sources: ConceptSource[];
   designations: Designation[];
   renderedDesignations: Map<string, string>;
@@ -61,10 +70,27 @@ export function useConceptContent(
       const definition = lc.definitions
         .map(d => d.content).filter(Boolean).join('\n\n');
       const annotations = getAnnotations(lc).map(a => a.content).filter(Boolean);
-      const notes = lc.notes.map(n => n.content).filter(Boolean);
-      const examples = lc.examples.map(e => e.content).filter(Boolean);
       const opts = renderOpts.value;
 
+      const buildExample = (e: { content?: string } | undefined): ExampleEntry | null => {
+        const content = e?.content ?? '';
+        return content ? { content, renderedContent: renderContent(content, opts) } : null;
+      };
+      const notes: NoteEntry[] = lc.notes
+        .map(n => {
+          const content = n.content ?? '';
+          if (!content) return null;
+          const nested = n.examples ?? [];
+          const examples = nested
+            .map(buildExample)
+            .filter((e): e is ExampleEntry => e !== null);
+          return { content, renderedContent: renderContent(content, opts), examples };
+        })
+        .filter((n): n is NoteEntry => n !== null);
+      const examples: ExampleEntry[] = lc.examples
+        .map(buildExample)
+        .filter((e): e is ExampleEntry => e !== null);
+
       result.push({
         lang,
         lc,
@@ -74,9 +100,7 @@ export function useConceptContent(
         annotations,
         renderedAnnotations: annotations.map((a: string) => renderContent(a, opts)),
         notes,
-        renderedNotes: notes.map(n => renderContent(n, opts)),
         examples,
-        renderedExamples: examples.map(e => renderContent(e, opts)),
         sources: lc.sources,
         designations: lc.terms,
         renderedDesignations: new Map(lc.terms.map(d => [d.designation, renderContent(d.designation)])),
@@ -137,6 +161,11 @@ export function useConceptContent(
     return text.length <= max ? text : text.slice(0, max).trimEnd() + '…';
   }
 
+  function totalExampleCount(lc: LangContent): number {
+    const nested = lc.notes.reduce((sum, n) => sum + n.examples.length, 0);
+    return lc.examples.length + nested;
+  }
+
   function orderedDesignations(lang: string): Designation[] {
     const desigs = langContentMap.value.get(lang)?.designations ?? [];
     const preferred = desigs.filter(d => d.normativeStatus === 'preferred');
@@ -155,6 +184,7 @@ export function useConceptContent(
     toggleLang,
     toggleAll,
     plainTruncate,
+    totalExampleCount,
     orderedDesignations,
   };
 }