@glossarist/concept-browser 0.7.62 → 0.7.63

package/package.json

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

package/src/__tests__/relation-sphere-uri.test.ts

@@ -0,0 +1,45 @@
+import { describe, it, expect } from 'vitest';
+import { UriRouter } from '../adapters/UriRouter';
+
+describe('UriRouter.parseUri — deployment-agnostic concept URI parsing', () => {
+  // The old parseNeighborUri in RelationSphere.vue hardcoded specific
+  // hostnames. UriRouter.parseUri must work for ANY deployment.
+  const cases: Array<[string, string, string]> = [
+    // [input URI, expected registerId, expected conceptId]
+    ['https://www.glossarist.org/iala-vocab/iala-2022/concept/1-1-000',     'iala-2022', '1-1-000'],
+    ['https://glossarist.org/iala-2022/concept/1-1-000',                    'iala-2022', '1-1-000'],
+    ['https://glossarist.org/iso/concept/3.1.1',                            'iso',       '3.1.1'],
+    ['https://oimlsmart.github.io/vocab/viml-2022/concept/1.1',             'viml-2022', '1.1'],
+    ['https://www.oimlsmart.org/vocab/viml-2022/concept/1.1',               'viml-2022', '1.1'],
+    ['https://metanorma.github.io/iala-vocab/iala-2023/concept/2-1-245',    'iala-2023', '2-1-245'],
+    ['https://isotc204.geolexica.org/isotc204-2022/concept/3.5.8.8',       'isotc204-2022', '3.5.8.8'],
+    ['https://vocab.example.org/dataset-x/concept/foo',                      'dataset-x', 'foo'],
+    ['https://custom.host/path/to/register/concept/abc-123',                'register',  'abc-123'],
+  ];
+
+  for (const [uri, expectedReg, expectedId] of cases) {
+    it(`parses ${uri}`, () => {
+      const parsed = UriRouter.parseUri(uri);
+      expect(parsed).toEqual({ registerId: expectedReg, conceptId: expectedId });
+    });
+  }
+
+  it('returns null for URIs without /concept/', () => {
+    expect(UriRouter.parseUri('https://example.org/foo/bar')).toBeNull();
+    expect(UriRouter.parseUri('urn:iso:std:iso:14812:2025:3.5.8.8')).toBeNull();
+    expect(UriRouter.parseUri('')).toBeNull();
+  });
+
+  it('does NOT hardcode any specific hostname', () => {
+    // Every deployment domain should work. If the regex hardcodes
+    // a specific host, this test would fail for others.
+    const diverse = [
+      'https://a.io/r/concept/1',
+      'https://b.com/x/y/z/concept/2',
+      'https://1.2.3.4/reg/concept/3',
+    ];
+    for (const uri of diverse) {
+      expect(UriRouter.parseUri(uri)).not.toBeNull();
+    }
+  });
+});

package/src/components/RelationSphere.vue

@@ -18,6 +18,7 @@ import { useDsStyle } from '../utils/dataset-style';
 import { getFactory } from '../adapters/factory';
 import { SPHERE_RELATION_CATEGORIES as RELATION_CATEGORIES, sphereCategoryForType as categoryForType, categorizeRelationForSphere as categorizeRelation, colorForTypeInMode as colorForTypeRaw, relationLabel as relationTypeLabel } from '../utils/relation-sphere-styling';
 import { easeInOutCubic, slerp, fibonacciSpherePosition, project, cardEdge, type Vec3 } from '../composables/useSphereProjection';
+import { UriRouter } from '../adapters/UriRouter';
 import { getPreferredTerm } from '../utils/concept-helpers';
 import { renderContent } from '../utils/content-renderer';
 import { useI18n } from '../i18n';
@@ -226,14 +227,6 @@ function updateNodeTerm(n: SNode) {
 }
 
 /* ── Build internal graph from concept + edges (BFS) ────── */
-function parseNeighborUri(uri: string, fallbackReg: string): { register: string; conceptId: string } | null {
-  const m = uri.match(/(?:glossarist\.org|oimlsmart\.github\.io\/vocab)\/([^/]+)\/concept\/([^/?#]+)/);
-  if (m) return { register: m[1], conceptId: m[2] };
-  /* URN or other shape — use fallback register, last path segment as id */
-  const parts = uri.split('/').filter(Boolean);
-  if (parts.length === 0) return null;
-  return { register: fallbackReg, conceptId: parts[parts.length - 1] };
-}
 
 function hashSeed(s: string): number {
   let h = 0;
@@ -280,12 +273,12 @@ function buildGraph() {
 
   /* First pass: collect depth-1 neighbors (deduped) so we know N for even
      ring placement. */
-  const depth1List: Array<{ uri: string; parsed: { register: string; conceptId: string }; isOutgoing: boolean; edge: GraphEdge }> = [];
+  const depth1List: Array<{ uri: string; parsed: { registerId: string; conceptId: string }; isOutgoing: boolean; edge: GraphEdge }> = [];
   for (const edge of props.edges) {
     const isOutgoing = edge.source === focusUri || edge.source === focusId;
     const otherUri = isOutgoing ? edge.target : edge.source;
     if (!otherUri || visited.has(otherUri)) continue;
-    const parsed = parseNeighborUri(otherUri, edge.register || props.registerId);
+    const parsed = UriRouter.parseUri(otherUri);
     if (!parsed || parsed.conceptId === focusId) continue;
     visited.set(otherUri, 1);
     depth1List.push({ uri: otherUri, parsed, isOutgoing, edge });
@@ -298,8 +291,8 @@ function buildGraph() {
     nodeMap.set(parsed.conceptId, {
       id: parsed.conceptId,
       term: edge.label || parsed.conceptId,
-      ref: parsed.register,
-      register: parsed.register,
+      ref: parsed.registerId,
+      register: parsed.registerId,
       conceptId: parsed.conceptId,
       depth: 1,
       x: pos.x, y: pos.y, z: pos.z,
@@ -331,13 +324,13 @@ function buildGraph() {
     const inEdges = store.graph.getIncomingEdges(uri);
     /* Collect this node's children first so we can place them as an even
        sub-ring around their parent. */
-    const children: Array<{ uri: string; parsed: { register: string; conceptId: string }; isOutgoing: boolean; edge: GraphEdge }> = [];
+    const children: Array<{ uri: string; parsed: { registerId: string; conceptId: string }; isOutgoing: boolean; edge: GraphEdge }> = [];
     for (const edge of [...outEdges, ...inEdges]) {
       if (nodeMap.size + children.length >= MAX_NODES) break;
       const isOutgoing = edge.source === uri;
       const otherUri = isOutgoing ? edge.target : edge.source;
       if (!otherUri || visited.has(otherUri)) continue;
-      const parsed = parseNeighborUri(otherUri, edge.register || props.registerId);
+      const parsed = UriRouter.parseUri(otherUri);
       if (!parsed || parsed.conceptId === focusId || nodeMap.has(parsed.conceptId)) continue;
       visited.set(otherUri, depth + 1);
       children.push({ uri: otherUri, parsed, isOutgoing, edge });
@@ -347,8 +340,8 @@ function buildGraph() {
       nodeMap.set(parsed.conceptId, {
         id: parsed.conceptId,
         term: parsed.conceptId,
-        ref: parsed.register,
-        register: parsed.register,
+        ref: parsed.registerId,
+        register: parsed.registerId,
         conceptId: parsed.conceptId,
         depth: depth + 1,
         x: pos.x, y: pos.y, z: pos.z,