@glossarist/concept-browser 0.7.14 → 0.7.15

package/package.json

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

package/scripts/build-edges.js

@@ -43,7 +43,8 @@ function extractReferences(concept, registerId) {
   return edges;
 }
 
-function extractDomains(concept, registerId) {
+function extractDomains(concept, registerId, uriBase) {
+  const base = uriBase || 'https://glossarist.org';
   const edges = [];
   const sourceUri = concept['@id'];
   const lcs = concept['gl:localizedConcept'] || {};
@@ -55,7 +56,7 @@ function extractDomains(concept, registerId) {
       seen.add(domain);
       edges.push({
         source: sourceUri,
-        target: `https://glossarist.org/${registerId}/domain/${slugify(domain)}`,
+        target: `${base}/${registerId}/domain/${slugify(domain)}`,
         type: 'domain',
         label: domain,
         register: registerId,
@@ -65,15 +66,38 @@ function extractDomains(concept, registerId) {
   return edges;
 }
 
-const EXTRACTORS = [extractReferences, extractDomains];
+function extractRelated(concept, registerId, uriBase, urnMap) {
+  const edges = [];
+  const sourceUri = concept['@id'];
+  for (const r of concept['gl:related'] || []) {
+    const ref = r['gl:ref'];
+    if (!ref) continue;
+    const source = ref['gl:source'] || ref['source'];
+    const id = ref['gl:id'] || ref['id'];
+    if (!source || !id) continue;
+    const reg = urnMap.get(source) || source;
+    const target = `${uriBase}/${reg}/concept/${id}`;
+    if (target === sourceUri) continue;
+    edges.push({
+      source: sourceUri,
+      target,
+      type: r['gl:relationshipType'] || 'references',
+      label: r['gl:term'] || undefined,
+      register: reg,
+    });
+  }
+  return edges;
+}
+
+const EXTRACTORS = [extractReferences, extractRelated, extractDomains];
 
-function extractAllEdges(concept, registerId) {
-  return EXTRACTORS.flatMap(fn => fn(concept, registerId));
+function extractAllEdges(concept, registerId, uriBase, urnMap) {
+  return EXTRACTORS.flatMap(fn => fn(concept, registerId, uriBase, urnMap));
 }
 
 // --- Build ---
 
-function buildEdgesForDataset(datasetDir, registerId) {
+function buildEdgesForDataset(datasetDir, registerId, uriBase, urnMap) {
   const conceptsDir = join(datasetDir, 'concepts');
   if (!existsSync(conceptsDir)) {
     console.log(`  Skipping ${registerId}: no concepts directory`);
@@ -90,7 +114,7 @@ function buildEdgesForDataset(datasetDir, registerId) {
   for (const file of files) {
     try {
       const data = JSON.parse(readFileSync(join(conceptsDir, file), 'utf-8'));
-      const edges = extractAllEdges(data, registerId);
+      const edges = extractAllEdges(data, registerId, uriBase, urnMap);
       allEdges.push(...edges);
 
       for (const edge of edges) {
@@ -170,12 +194,30 @@ const datasets = readdirSync(DATA_DIR).filter(f => {
   }
 });
 
+// Build URN→datasetId map from all manifests
+const urnMap = new Map();
+const manifestCache = new Map();
 for (const ds of datasets) {
   const manifestPath = join(DATA_DIR, ds, 'manifest.json');
   try {
     const manifest = JSON.parse(readFileSync(manifestPath, 'utf-8'));
+    manifestCache.set(ds, manifest);
+    if (manifest.datasetUri) urnMap.set(manifest.datasetUri, ds);
+    for (const alias of manifest.uriAliases ?? []) {
+      const base = alias.endsWith('*') ? alias.slice(0, -1) : alias;
+      if (base.startsWith('urn:')) urnMap.set(base, ds);
+    }
+  } catch {}
+}
+console.log(`URN resolution map: ${[...urnMap.entries()].map(([k,v]) => `${k}→${v}`).join(', ')}\n`);
+
+for (const ds of datasets) {
+  const manifest = manifestCache.get(ds);
+  if (!manifest) continue;
+  try {
     console.log(`${manifest.title} (${ds}):`);
-    buildEdgesForDataset(join(DATA_DIR, ds), ds);
+    const uriBase = manifest.uriBase || 'https://glossarist.org';
+    buildEdgesForDataset(join(DATA_DIR, ds), ds, uriBase, urnMap);
   } catch (e) {
     console.error(`Error reading manifest for ${ds}: ${e.message}`);
   }

package/scripts/generate-data.mjs

@@ -851,6 +851,18 @@ for (let i = 0; i < config.datasets.length; i++) {
 }
 writeJson(path.join(PUBLIC, 'datasets.json'), registry);
 
+// Clean stale dataset directories not referenced in config
+const configuredIds = new Set(config.datasets.map(d => d.id));
+if (fs.existsSync(DATA)) {
+  for (const entry of fs.readdirSync(DATA)) {
+    if (!configuredIds.has(entry)) {
+      const stalePath = path.join(DATA, entry);
+      fs.rmSync(stalePath, { recursive: true, force: true });
+      console.log(`  Removed stale data directory: ${entry}`);
+    }
+  }
+}
+
 // Generate routing.json from site config
 writeJson(path.join(PUBLIC, 'routing.json'), config.routing || []);
 console.log('Generated routing.json');

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

@@ -386,6 +386,37 @@ describe('DatasetAdapter', () => {
       expect(edges[0].target).toBe('https://glossarist.org/isotc204/concept/3.1.1.6');
       expect(edges[0].label).toBe('entity');
     });
+
+    it('resolves URN-based ref.source to dataset ID via urnMap', () => {
+      const urnMap = new Map([
+        ['urn:oiml:pub:v:1:2000', 'viml-2000'],
+      ]);
+      adapter.setUrnMap(urnMap);
+
+      const concept = conceptFromJson({
+        '@id': 'https://metanorma.github.io/oiml-viml/viml-2022/concept/2.23',
+        '@type': 'gl:Concept',
+        'gl:localizedConcept': {
+          eng: {
+            'gl:languageCode': 'eng',
+            'gl:designation': [{ '@type': 'gl:Expression', 'gl:term': 'measurement' }],
+          },
+        },
+        'gl:related': [
+          {
+            'gl:relationshipType': 'supersedes',
+            'gl:ref': { 'gl:source': 'urn:oiml:pub:v:1:2000', 'gl:id': '2.23' },
+            'gl:term': 'measurement',
+          },
+        ],
+      });
+
+      adapter.manifest = { uriBase: 'https://metanorma.github.io/oiml-viml' } as any;
+      const edges = adapter.extractEdges(concept);
+      expect(edges.length).toBe(1);
+      expect(edges[0].target).toBe('https://metanorma.github.io/oiml-viml/viml-2000/concept/2.23');
+      expect(edges[0].type).toBe('supersedes');
+    });
   });
 
   describe('extractDomainEdges', () => {

package/src/adapters/DatasetAdapter.ts

@@ -15,11 +15,14 @@ function slugify(text: string): string {
   return text.toLowerCase().replace(/[^\w\s-]/g, '').replace(/[\s/]+/g, '-');
 }
 
-function resolveRefTarget(rc: any, uriBase: string, registerId: string): string {
+function resolveRefTarget(rc: any, uriBase: string, registerId: string, urnMap?: ReadonlyMap<string, string>): string {
   if (!rc.ref) return '';
   const ref = rc.ref;
   if (ref.id) {
-    const reg = (ref.source && !ref.source.startsWith('http')) ? ref.source : registerId;
+    let reg = registerId;
+    if (ref.source && !ref.source.startsWith('http')) {
+      reg = urnMap?.get(ref.source) ?? ref.source;
+    }
     return `${uriBase}/${reg}/concept/${ref.id}`;
   }
   if (ref.source && ref.source.startsWith('http')) return ref.source;
@@ -28,6 +31,7 @@ function resolveRefTarget(rc: any, uriBase: string, registerId: string): string
 
 export class DatasetAdapter {
   private positionIndex = new Map<string, number>();
+  private _urnMap: ReadonlyMap<string, string> = new Map();
   readonly registerId: string;
   private baseUrl: string;
   manifest: Manifest | null = null;
@@ -294,6 +298,10 @@ export class DatasetAdapter {
     return scored;
   }
 
+  setUrnMap(map: ReadonlyMap<string, string>): void {
+    this._urnMap = map;
+  }
+
   extractEdges(concept: Concept): GraphEdge[] {
     const edges: GraphEdge[] = [];
     const uriBase = this.manifest?.uriBase || 'https://glossarist.org';
@@ -301,7 +309,7 @@ export class DatasetAdapter {
 
     // Managed concept level relationships
     for (const rc of concept.relatedConcepts) {
-      const target = resolveRefTarget(rc, uriBase, this.registerId);
+      const target = resolveRefTarget(rc, uriBase, this.registerId, this._urnMap);
       if (target && target !== sourceUri) {
         const parsed = UriRouter.parseUri(target);
         edges.push({
@@ -319,7 +327,7 @@ export class DatasetAdapter {
       const lc = concept.localization(lang);
       if (!lc) continue;
       for (const rc of lc.related) {
-        const target = resolveRefTarget(rc, uriBase, this.registerId);
+        const target = resolveRefTarget(rc, uriBase, this.registerId, this._urnMap);
         if (target && target !== sourceUri) {
           const parsed = UriRouter.parseUri(target);
           edges.push({

package/src/adapters/factory.ts

@@ -6,6 +6,7 @@ import { ReferenceResolver } from './ReferenceResolver';
 
 export class AdapterFactory {
   private adapters = new Map<string, DatasetAdapter>();
+  private urnMap = new Map<string, string>();
   readonly router = new UriRouter();
   readonly resolver: ReferenceResolver;
 
@@ -62,6 +63,18 @@ export class AdapterFactory {
       this.resolver.registerSourceRef(alias, registerId, manifest.datasetUri);
     }
 
+    // Build URN→datasetId map from manifest
+    if (manifest.datasetUri) this.urnMap.set(manifest.datasetUri, registerId);
+    for (const alias of manifest.uriAliases ?? []) {
+      const base = alias.endsWith('*') ? alias.slice(0, -1) : alias;
+      if (base.startsWith('urn:')) this.urnMap.set(base, registerId);
+    }
+
+    // Distribute the updated URN map to all loaded adapters
+    for (const adapter of this.adapters.values()) {
+      adapter.setUrnMap(this.urnMap);
+    }
+
     return adapter;
   }
 

package/src/adapters/model-bridge.ts

@@ -156,8 +156,22 @@ function mapSourceFromJsonLd(s: any): Record<string, unknown> {
 
 function mapRelatedFromJsonLd(r: any): Record<string, unknown> {
   const result: Record<string, unknown> = { type: 'references' };
-  if (r['@id']) {
-    // Extract concept ID from URI: ".../concept/3.1.1.6" → source=register, id=3.1.1.6
+
+  if (r['gl:relationshipType']) {
+    result.type = r['gl:relationshipType'];
+  }
+
+  if (r['gl:ref']) {
+    const ref = r['gl:ref'];
+    const refObj: Record<string, unknown> = {};
+    if (ref['gl:source']) refObj.source = ref['gl:source'];
+    if (ref['gl:id']) refObj.id = ref['gl:id'];
+    if (ref['source']) refObj.source = ref['source'];
+    if (ref['id']) refObj.id = ref['id'];
+    if (Object.keys(refObj).length > 0) result.ref = refObj;
+  }
+
+  if (!result.ref && r['@id']) {
     const uri = r['@id'] as string;
     const idMatch = uri.match(/\/concept\/([^/]+)$/);
     result.ref = idMatch
@@ -237,7 +251,7 @@ function conceptFromJsonLd(doc: Record<string, any>): Concept {
     }
   }
 
-  const related = (doc['gl:references'] ?? []).map(mapRelatedFromJsonLd);
+  const related = (doc['gl:related'] ?? []).map(mapRelatedFromJsonLd);
   const tags = Array.isArray(doc['gl:tags']) ? [...doc['gl:tags']] : [];
 
   return Concept.fromJSON({