@glossarist/concept-browser 0.7.118 → 0.7.120

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.118",
+  "version": "0.7.120",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {
@@ -42,7 +42,7 @@
     "astro": "^7.0.7",
     "d3": "^7.9.0",
     "favicons": "^7.2.0",
-    "glossarist": "^0.4.52",
+    "glossarist": "^0.4.54",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "n3": "^1.26.0",

package/scripts/build-edges.js

@@ -157,6 +157,16 @@ function extractRelated(concept, registerId, uriBase, urnMap) {
   const edges = [];
   const sourceUri = concept["@id"];
   for (const r of concept["gl:related"] || []) {
+    if (r["gl:target"]) {
+      edges.push({
+        source: sourceUri,
+        target: r["gl:target"],
+        type: r["gl:relationshipType"] || "references",
+        label: r["gl:term"] || void 0,
+        register: r["gl:target"].match(/\/([^/]+)\/concept\//)?.[1] || registerId
+      });
+      continue;
+    }
     const ref = r["gl:ref"];
     if (!ref) continue;
     const source = ref["gl:source"] || ref["source"];
@@ -382,6 +392,9 @@ function main() {
         const base = alias.endsWith("*") ? alias.slice(0, -1) : alias;
         if (base) urnMap.set(base, ds);
       }
+      if (manifest.ref) {
+        urnMap.set(manifest.ref, ds);
+      }
     } catch {
     }
   }

package/scripts/build-edges.ts

@@ -173,6 +173,19 @@ function extractRelated(concept, registerId, uriBase, urnMap) {
   const edges = [];
   const sourceUri = concept['@id'];
   for (const r of concept['gl:related'] || []) {
+    // Prefer gl:target — already resolved at generate-data build time
+    // via refPrefixMap (maps dataset ref labels to dataset IDs).
+    if (r['gl:target']) {
+      edges.push({
+        source: sourceUri,
+        target: r['gl:target'],
+        type: r['gl:relationshipType'] || 'references',
+        label: r['gl:term'] || undefined,
+        register: r['gl:target'].match(/\/([^/]+)\/concept\//)?.[1] || registerId,
+      });
+      continue;
+    }
+    // Fallback: resolve from gl:ref using urnMap
     const ref = r['gl:ref'];
     if (!ref) continue;
     const source = ref['gl:source'] || ref['source'];
@@ -458,6 +471,12 @@ for (const ds of datasets) {
       const base = alias.endsWith('*') ? alias.slice(0, -1) : alias;
       if (base) urnMap.set(base, ds);
     }
+    // Map the dataset's ref label (e.g. "CIE S 017:2020") to its dataset ID.
+    // This enables cross-dataset resolution for gl:ref entries that use
+    // source labels instead of URIs.
+    if (manifest.ref) {
+      urnMap.set(manifest.ref, ds);
+    }
   } catch {}
 }
 console.log(`URI resolution map: ${[...urnMap.entries()].map(([k,v]) => `${k}→${v}`).join(', ')}\n`);

package/src/__tests__/adapters/cross-dataset-related.test.ts

@@ -0,0 +1,45 @@
+import { describe, it, expect } from 'vitest';
+import { conceptFromJson } from '../../adapters/model-bridge';
+
+function makeJsonLdWithRelated(target: string | null) {
+  const related = target
+    ? {
+        'gl:relationshipType': 'superseded_by',
+        'gl:target': target,
+        'gl:ref': { 'gl:source': 'CIE S 017:2020', 'gl:id': '17-21-097' },
+      }
+    : {
+        'gl:relationshipType': 'superseded_by',
+        'gl:ref': { 'gl:source': 'CIE S 017:2020', 'gl:id': '17-21-097' },
+      };
+  return {
+    '@type': 'skos:Concept',
+    '@id': 'https://example.com/cie-2011/concept/17-50',
+    'gl:identifier': '17-50',
+    'gl:localizedConcept': {
+      eng: {
+        'gl:languageCode': 'eng',
+        'gl:designation': [{ '@type': 'gl:Expression', 'gl:term': 'test term', 'gl:normativeStatus': 'preferred' }],
+        'gl:definition': [{ 'gl:content': 'test definition' }],
+      },
+    },
+    'gl:related': [related],
+  };
+}
+
+describe('cross-dataset related concept resolution — gl:target flows through model-bridge natively', () => {
+  it('concept.relatedConcepts entries with gl:target have native target field', () => {
+    const json = makeJsonLdWithRelated('https://example.com/cie-2020/concept/17-21-097');
+    const concept = conceptFromJson(json as any);
+    expect(concept.relatedConcepts).toHaveLength(1);
+    expect(concept.relatedConcepts[0].type).toBe('superseded_by');
+    expect(concept.relatedConcepts[0].target).toBe('https://example.com/cie-2020/concept/17-21-097');
+  });
+
+  it('concept.relatedConcepts entries without gl:target have null target', () => {
+    const json = makeJsonLdWithRelated(null);
+    const concept = conceptFromJson(json as any);
+    expect(concept.relatedConcepts).toHaveLength(1);
+    expect(concept.relatedConcepts[0].target).toBeNull();
+  });
+});

package/src/__tests__/adapters/graph-source-target.test.ts

@@ -0,0 +1,31 @@
+import { describe, it, expect } from 'vitest';
+import { RelatedConcept } from 'glossarist';
+import { resolveRefTarget } from '../../adapters/GraphDataSource';
+
+describe('GraphDataSource.resolveRefTarget — prefers native target field', () => {
+  it('returns rc.target when set (cross-dataset resolved URI)', () => {
+    const rc = new RelatedConcept({
+      type: 'superseded_by',
+      target: 'https://example.com/cie-2020/concept/17-21-097',
+      ref: { source: 'CIE S 017:2020', id: '17-21-097' },
+    });
+    const target = resolveRefTarget(rc, 'https://example.com/cie-eilv', 'cie-2011', undefined);
+    expect(target).toBe('https://example.com/cie-2020/concept/17-21-097');
+  });
+
+  it('falls back to ref resolution when target is null', () => {
+    const rc = new RelatedConcept({
+      type: 'supersedes',
+      ref: { source: 'cie-2020', id: '42' },
+    });
+    const urnMap = new Map([['cie-2020', 'cie-2020']]);
+    const target = resolveRefTarget(rc, 'https://example.com', 'cie-2011', urnMap);
+    expect(target).toBe('https://example.com/cie-2020/concept/42');
+  });
+
+  it('returns empty string when neither target nor ref is set', () => {
+    const rc = new RelatedConcept({ type: 'see' });
+    const target = resolveRefTarget(rc, 'https://example.com', 'cie-2011', undefined);
+    expect(target).toBe('');
+  });
+});

package/src/adapters/GraphDataSource.ts

@@ -16,7 +16,13 @@ interface DomainNodeJson {
   children?: DomainNodeJson[];
 }
 
-function resolveRefTarget(rc: RelatedConcept, uriBase: string, registerId: string, urnMap?: ReadonlyMap<string, string>): string {
+export function resolveRefTarget(rc: RelatedConcept, uriBase: string, registerId: string, urnMap?: ReadonlyMap<string, string>): string {
+  // Prefer the native target field — already resolved at build time
+  // via refPrefixMap in generate-data.ts. This is the author-provided
+  // canonical URL for cross-dataset relations.
+  if (rc.target) return rc.target;
+
+  // Fallback: resolve from ref (for data generated before gl:target existed)
   if (!rc.ref) return '';
   const ref = rc.ref;
   if (ref.id) {

package/src/adapters/model-bridge.ts

@@ -170,7 +170,8 @@ function attachBridges(concept: Concept, localizations: Record<string, unknown>)
 /**
  * Attach bridged fields (ref text, sourceId, citation) to RelatedConcept instances
  * from the raw deserialized data. Called after Concept.fromJSON creates the model
- * instances, since RelatedConcept.fromJSON only reads type/content/ref.
+ * instances, since RelatedConcept.fromJSON does not read sourceId/citation/text.
+ * (It does read type/content/ref/target natively.)
  */
 function attachRelatedBridges(
   modelRelated: ReadonlyArray<{ type?: string | null; content?: Record<string, string> | string | null; ref?: any; related?: ReadonlyArray<any> }>,
@@ -367,6 +368,13 @@ function mapRelatedFromJsonLd(r: JsonLdRelated): Record<string, unknown> {
     result.type = r[GL.RELATIONSHIP_TYPE];
   }
 
+  // gl:target is the resolved concept URI for cross-dataset relations
+  // (e.g., superseded_by → cie-2020 concept). Without this, the UI
+  // renders related concepts as plain text with no clickable link.
+  if (r[GL.TARGET]) {
+    result.target = r[GL.TARGET];
+  }
+
   if (r[GL.REF]) {
     const ref = mapRefFromJsonLd(r[GL.REF]);
     if (ref) result.ref = ref;