@glossarist/concept-browser 0.7.126 → 0.7.128

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.126",
+  "version": "0.7.128",
   "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.js

@@ -1179,9 +1179,10 @@ function extractInlineRefs(localizedData, refMaps2, conceptSources = []) {
       if (seg.kind === "concept" || seg.kind === "cite") {
         const target = seg.target;
         if (target.type === "dataset_qualified" && target.dataset && target.id) {
-          const dsId = refMaps2.refPrefixMap[target.dataset] || target.dataset;
-          const ref = { id: buildConceptUri(refMaps2.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` };
-          refs.push(ref);
+          const dsId = refMaps2.refPrefixMap[target.dataset];
+          if (dsId) {
+            refs.push({ id: buildConceptUri(refMaps2.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` });
+          }
         } else if (target.type === "urn" && target.urn) {
           const pattern = refMaps2.patternIndex.resolve(target.urn);
           if (pattern) {

package/scripts/generate-data.ts

@@ -409,9 +409,15 @@ function extractInlineRefs(localizedData, refMaps, conceptSources = []) {
       if (seg.kind === 'concept' || seg.kind === 'cite') {
         const target = seg.target;
         if (target.type === 'dataset_qualified' && target.dataset && target.id) {
-          const dsId = refMaps.refPrefixMap[target.dataset] || target.dataset;
-          const ref = { id: buildConceptUri(refMaps.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` };
-          refs.push(ref);
+          // Only create a concept URI if the dataset is CO-DEPLOYED.
+          // If the dataset doesn't exist in this deployment's refPrefixMap,
+          // skip — the runtime resolver will handle it (unresolved text or
+          // external link via routing). Creating a URI for a non-existent
+          // dataset produces a 404.
+          const dsId = refMaps.refPrefixMap[target.dataset];
+          if (dsId) {
+            refs.push({ id: buildConceptUri(refMaps.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` });
+          }
         } else if (target.type === 'urn' && target.urn) {
           const pattern = refMaps.patternIndex.resolve(target.urn);
           if (pattern) {

package/scripts/validate-links.js

@@ -71,8 +71,22 @@ function checkFile(file, dataDir) {
     }
   }
   const sourceIds = /* @__PURE__ */ new Set();
-  for (const s of json["gl:sources"] ?? []) {
+  const sourceRefKeys = /* @__PURE__ */ new Set();
+  const allSourceArrays = [
+    ...json["gl:sources"] ?? []
+  ];
+  for (const lc of Object.values(json["gl:localizedConcept"] ?? {})) {
+    const lcSources = lc["gl:source"] ?? lc["gl:sources"];
+    if (Array.isArray(lcSources)) allSourceArrays.push(...lcSources);
+  }
+  for (const s of allSourceArrays) {
     if (s["gl:id"]) sourceIds.add(s["gl:id"]);
+    const origin = s["gl:origin"] ?? {};
+    const ref = origin["gl:ref"] ?? {};
+    if (ref["gl:source"] && ref["gl:id"]) {
+      sourceRefKeys.add(`${ref["gl:source"]}:${ref["gl:id"]}`);
+      sourceIds.add(ref["gl:id"]);
+    }
   }
   const textChunks = [];
   for (const lc of Object.values(json["gl:localizedConcept"] ?? {})) {
@@ -149,9 +163,11 @@ function checkFile(file, dataDir) {
     if (citeMatch) {
       const rest = citeMatch[1];
       const commaIdx = rest.indexOf(",");
-      const id = commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim();
-      if (!sourceIds.has(id)) {
-        broken.push({ file: relFile, line: 0, field: "{{cite:...}}", target: id, reason: `source "${id}" not found in this concept's sources[]` });
+      const rawId = commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim();
+      const lastColon = rawId.lastIndexOf(":");
+      const idPart = lastColon > 0 ? rawId.slice(lastColon + 1) : rawId;
+      if (!sourceIds.has(rawId) && !sourceIds.has(idPart) && !sourceRefKeys.has(rawId)) {
+        broken.push({ file: relFile, line: 0, field: "{{cite:...}}", target: rawId, reason: `source "${rawId}" not found in this concept's sources[]` });
       }
       continue;
     }

package/scripts/validate-links.ts

@@ -112,8 +112,23 @@ function checkFile(file: string, dataDir: string): BrokenLink[] {
   }
 
   const sourceIds = new Set<string>();
-  for (const s of json['gl:sources'] ?? []) {
+  const sourceRefKeys = new Set<string>();
+  // Collect from concept-level sources AND localization-level sources
+  const allSourceArrays = [
+    ...(json['gl:sources'] ?? []),
+  ];
+  for (const lc of Object.values(json['gl:localizedConcept'] ?? {})) {
+    const lcSources = (lc as any)['gl:source'] ?? (lc as any)['gl:sources'];
+    if (Array.isArray(lcSources)) allSourceArrays.push(...lcSources);
+  }
+  for (const s of allSourceArrays) {
     if (s['gl:id']) sourceIds.add(s['gl:id']);
+    const origin = s['gl:origin'] ?? {};
+    const ref = origin['gl:ref'] ?? {};
+    if (ref['gl:source'] && ref['gl:id']) {
+      sourceRefKeys.add(`${ref['gl:source']}:${ref['gl:id']}`);
+      sourceIds.add(ref['gl:id']);
+    }
   }
 
   const textChunks: string[] = [];
@@ -190,14 +205,20 @@ function checkFile(file: string, dataDir: string): BrokenLink[] {
       continue;
     }
 
-    // cite:id — source must exist in this concept's sources[]
+    // cite:id — source must exist in this concept's sources[].
+    // Handles DATASET:ID format: {{cite:IEV:702-02-07}} matches a source
+    // with id "702-02-07" or origin.ref { source: "IEV", id: "702-02-07" }.
     const citeMatch = body.match(/^cite:(.+)$/i);
     if (citeMatch) {
       const rest = citeMatch[1];
       const commaIdx = rest.indexOf(',');
-      const id = (commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim());
-      if (!sourceIds.has(id)) {
-        broken.push({ file: relFile, line: 0, field: '{{cite:...}}', target: id, reason: `source "${id}" not found in this concept's sources[]` });
+      const rawId = (commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim());
+
+      // Check: rawId (e.g. "IEV:702-02-07"), or just the ID part ("702-02-07")
+      const lastColon = rawId.lastIndexOf(':');
+      const idPart = lastColon > 0 ? rawId.slice(lastColon + 1) : rawId;
+      if (!sourceIds.has(rawId) && !sourceIds.has(idPart) && !sourceRefKeys.has(rawId)) {
+        broken.push({ file: relFile, line: 0, field: '{{cite:...}}', target: rawId, reason: `source "${rawId}" not found in this concept's sources[]` });
       }
       continue;
     }

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/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>(() => {