@glossarist/concept-browser 0.7.127 → 0.7.129

package/package.json

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

package/src/__tests__/components/localization-sources.test.ts

@@ -0,0 +1,80 @@
+import { describe, it, expect } from 'vitest';
+import { conceptFromJson } from '../../adapters/model-bridge';
+
+/**
+ * Regression test: sources stored at the localization level
+ * (gl:localizedConcept.eng.gl:source) must be accessible via
+ * concept.localization(lang).sources so the citeResolver can find them.
+ *
+ * Without this, {{cite:sourceId}} mentions render as plain text
+ * instead of links — the exact bug reported on cie-eilv concept 17-21-001.
+ */
+
+function makeConceptWithLocalizationSources() {
+  return {
+    '@type': 'skos:Concept',
+    '@id': 'https://example.com/dataset/cie-2020/concept/17-21-001',
+    'gl:identifier': '17-21-001',
+    'gl:localizedConcept': {
+      eng: {
+        'gl:languageCode': 'eng',
+        'gl:designation': [{ '@type': 'gl:Expression', 'gl:term': 'quantity', 'gl:normativeStatus': 'preferred' }],
+        'gl:definition': [{ 'gl:content': 'property of a phenomenon' }],
+        'gl:source': [
+          {
+            '@type': 'gl:ConceptSource',
+            'gl:id': '845-01-01',
+            'gl:sourceType': 'authoritative',
+            'gl:origin': {
+              '@type': 'gl:Citation',
+              'gl:ref': { '@type': 'gl:Ref', 'gl:source': 'IEV', 'gl:id': '845-01-01' },
+              'gl:link': 'https://www.electropedia.org/iev/iev.nsf/display?openform&ievref=845-01-01',
+            },
+          },
+          {
+            '@type': 'gl:ConceptSource',
+            'gl:sourceType': 'authoritative',
+            'gl:origin': {
+              '@type': 'gl:Citation',
+              'gl:ref': { '@type': 'gl:Ref', 'gl:source': 'CIE S 017:2011', 'gl:id': '17-370' },
+            },
+          },
+        ],
+      },
+    },
+  };
+}
+
+describe('localization-level sources accessible for citeResolver', () => {
+  it('concept.localization("eng").sources has the localization sources', () => {
+    const concept = conceptFromJson(makeConceptWithLocalizationSources() as any);
+    const lc = concept.localization('eng');
+    expect(lc).toBeTruthy();
+    expect(lc!.sources).toBeDefined();
+    expect(lc!.sources!.length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('source with gl:id is findable by id', () => {
+    const concept = conceptFromJson(makeConceptWithLocalizationSources() as any);
+    const lc = concept.localization('eng');
+    const source = lc!.sources!.find(s => s.id === '845-01-01');
+    expect(source).toBeDefined();
+  });
+
+  it('source origin link is preserved', () => {
+    const concept = conceptFromJson(makeConceptWithLocalizationSources() as any);
+    const lc = concept.localization('eng');
+    const source = lc!.sources!.find(s => s.id === '845-01-01');
+    expect(source).toBeDefined();
+    expect(source!.origin?.link).toBeTruthy();
+  });
+
+  it('merging concept + localization sources gives complete set', () => {
+    const concept = conceptFromJson(makeConceptWithLocalizationSources() as any);
+    const conceptSources = concept.sources ?? [];
+    const lcSources = concept.localization('eng')?.sources ?? [];
+    const merged = [...conceptSources, ...lcSources];
+    expect(merged.length).toBeGreaterThanOrEqual(2);
+    expect(merged.find(s => s.id === '845-01-01')).toBeDefined();
+  });
+});

package/src/__tests__/composables/cite-resolver-dataset-id.test.ts

@@ -0,0 +1,74 @@
+import { describe, it, expect } from 'vitest';
+
+/**
+ * Tests for citeResolver DATASET:ID matching logic.
+ *
+ * The citeResolver must parse {{cite:IEV:702-02-07}} and match it
+ * against sources that have:
+ *   - id: "702-02-07" (the ID part)
+ *   - origin.ref: { source: "IEV", id: "702-02-07" }
+ *
+ * Previously, it only matched s.id === key, so "IEV:702-02-07"
+ * never matched source.id "702-02-07".
+ */
+
+interface SourceLike {
+  id: string | null;
+  origin?: {
+    ref?: { source?: string; id?: string } | null;
+    link?: string | null;
+  } | null;
+}
+
+function findSource(key: string, sources: SourceLike[]): SourceLike | undefined {
+  const lastColon = key.lastIndexOf(':');
+  const idPart = lastColon > 0 ? key.slice(lastColon + 1) : key;
+  const datasetPart = lastColon > 0 ? key.slice(0, lastColon) : '';
+
+  return sources.find(s => {
+    if (s.id === key || s.id === idPart) return true;
+    const ref = s.origin?.ref;
+    if (ref) {
+      if (datasetPart && ref.source === datasetPart && ref.id === idPart) return true;
+      if (ref.id === key || ref.id === idPart) return true;
+    }
+    return false;
+  });
+}
+
+describe('citeResolver DATASET:ID matching', () => {
+  const sources: SourceLike[] = [
+    { id: null, origin: { ref: { source: 'IEV', id: '845-01-01' }, link: 'https://electropedia.org/...' } },
+    { id: '845-01-01', origin: { ref: { source: 'IEV', id: '845-01-01' }, link: 'https://electropedia.org/...' } },
+    { id: '702-02-07', origin: { ref: { source: 'IEV', id: '702-02-07' }, link: 'https://electropedia.org/...' } },
+    { id: null, origin: { ref: { source: 'CIE S 017:2011', id: '17-370' } } },
+  ];
+
+  it('matches cite:IEV:845-01-01 via origin.ref', () => {
+    const s = findSource('IEV:845-01-01', sources);
+    expect(s).toBeDefined();
+    expect(s!.origin!.ref!.id).toBe('845-01-01');
+  });
+
+  it('matches cite:IEV:702-02-07 via source id', () => {
+    const s = findSource('IEV:702-02-07', sources);
+    expect(s).toBeDefined();
+    expect(s!.id).toBe('702-02-07');
+  });
+
+  it('matches cite:845-01-01 (bare ID without dataset prefix)', () => {
+    const s = findSource('845-01-01', sources);
+    expect(s).toBeDefined();
+  });
+
+  it('matches cite with CIE dataset prefix', () => {
+    const s = findSource('CIE S 017:2011:17-370', sources);
+    expect(s).toBeDefined();
+    expect(s!.origin!.ref!.id).toBe('17-370');
+  });
+
+  it('returns undefined for unknown source', () => {
+    const s = findSource('UNKNOWN:999', sources);
+    expect(s).toBeUndefined();
+  });
+});

package/src/components/ConceptDetail.vue

@@ -119,7 +119,17 @@ const conceptTags = computed(() => props.concept?.tags ?? []);
 const factory = getFactory();
 const { ready: bibReady, ensureBibLoaded, bibResolver, citeResolver, nonVerbalRefResolver } = useRenderOptions(
   () => props.registerId,
-  () => props.concept?.sources,
+  () => {
+    // Collect sources from ALL localizations (shown separately per language,
+    // but the citeResolver needs access to all of them since content from
+    // every language is rendered on the same page).
+    const sources: any[] = [];
+    for (const lang of props.concept?.languages ?? []) {
+      const lc = props.concept?.localization(lang);
+      if (lc?.sources) sources.push(...lc.sources);
+    }
+    return sources;
+  },
 );
 
 const renderOpts = computed<RenderOptions>(() => {

package/src/composables/use-render-options.ts

@@ -65,7 +65,24 @@ export function useRenderOptions(
       return `<span class="cite-ref">${escapeHtml(label ?? key)}</span>`;
     }
 
-    const source = sources.find(s => s.id === key);
+    // Parse DATASET:ID format. {{cite:IEV:702-02-07}} → dataset="IEV", idPart="702-02-07"
+    // Match against: raw id, id part, or origin.ref { source: dataset, id: idPart }
+    const lastColon = key.lastIndexOf(':');
+    const idPart = lastColon > 0 ? key.slice(lastColon + 1) : key;
+    const datasetPart = lastColon > 0 ? key.slice(0, lastColon) : '';
+
+    const source = sources.find(s => {
+      // Match by source id (raw or id part)
+      if (s.id === key || s.id === idPart) return true;
+      // Match by origin.ref
+      const ref = s.origin?.ref;
+      if (ref) {
+        if (datasetPart && ref.source === datasetPart && ref.id === idPart) return true;
+        if (ref.id === key || ref.id === idPart) return true;
+      }
+      return false;
+    });
+
     if (!source?.origin) {
       return `<span class="cite-unresolved">${escapeHtml(label ?? key)}</span>`;
     }