@glossarist/concept-browser 0.7.137 → 0.7.138

package/package.json

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

package/scripts/__tests__/concept-uri.test.ts

@@ -0,0 +1,45 @@
+import { describe, it, expect } from 'vitest';
+import {
+  buildConceptUri,
+  buildConceptUriPrefix,
+  buildDatasetUriPrefix,
+  buildSiteOrigin,
+} from '../lib/concept-uri';
+
+describe('buildSiteOrigin — deployment hosting coordinate', () => {
+  it('prepends https:// to a scheme-less domain that carries a custom path', () => {
+    expect(buildSiteOrigin('oimlsmart.github.io/vocab', 'https://identity.example/viml'))
+      .toBe('https://oimlsmart.github.io/vocab');
+  });
+
+  it('keeps the configured path segment (/iala-vocab)', () => {
+    expect(buildSiteOrigin('www.glossarist.org/iala-vocab', 'https://identity.example/iala'))
+      .toBe('https://www.glossarist.org/iala-vocab');
+  });
+
+  it('handles an apex domain with no path', () => {
+    expect(buildSiteOrigin('isotc204.geolexica.org', 'https://isotc204.geolexica.org'))
+      .toBe('https://isotc204.geolexica.org');
+  });
+
+  it('normalizes a domain that already declares a scheme and trailing slash', () => {
+    expect(buildSiteOrigin('https://www.example.org/site/', 'https://identity.example'))
+      .toBe('https://www.example.org/site');
+  });
+
+  it('falls back to uriBase only when no domain is declared', () => {
+    expect(buildSiteOrigin(undefined, 'https://identity.example/reg')).toBe('https://identity.example/reg');
+    expect(buildSiteOrigin(null, 'https://identity.example/reg')).toBe('https://identity.example/reg');
+  });
+
+  it('keeps identity (uriBase) and hosting (domain) independent — /dataset/ routes build on either', () => {
+    const sitePrefix = buildConceptUriPrefix(buildSiteOrigin('oimlsmart.github.io/vocab', 'https://identity.example/viml'), 'viml-2013');
+    expect(sitePrefix).toBe('https://oimlsmart.github.io/vocab/dataset/viml-2013/concept/');
+    const identityPrefix = buildConceptUriPrefix('https://identity.example/viml', 'viml-2013');
+    expect(identityPrefix).toBe('https://identity.example/viml/dataset/viml-2013/concept/');
+    expect(buildConceptUri('https://identity.example/viml', 'viml-2013', '0.01'))
+      .toBe('https://identity.example/viml/dataset/viml-2013/concept/0.01');
+    expect(buildDatasetUriPrefix('https://identity.example/viml', 'viml-2013'))
+      .toBe('https://identity.example/viml/dataset/viml-2013/');
+  });
+});

package/scripts/generate-data.js

@@ -558,6 +558,13 @@ function buildConceptUri(uriBase, registerId, conceptId) {
 function buildConceptUriPrefix(uriBase, registerId) {
   return `${uriBase}/dataset/${registerId}/concept/`;
 }
+function buildSiteOrigin(domain, uriBase) {
+  if (domain) {
+    const trimmed = String(domain).trim().replace(/\/+$/, "");
+    return /^https?:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`;
+  }
+  return uriBase.replace(/\/+$/, "");
+}
 
 // scripts/lib/harmonize-concept.ts
 import fs from "fs";
@@ -931,7 +938,8 @@ function buildRefMaps(config2, registerCache2) {
   if (xref.refPrefixMap) Object.assign(refPrefixMap, xref.refPrefixMap);
   const uriBase = config2.uriBase;
   if (!uriBase) throw new Error("site-config.yml: uriBase is required");
-  return { patternIndex, refPrefixMap, uriBase, register: null };
+  const siteOrigin = buildSiteOrigin(config2.domain, uriBase);
+  return { patternIndex, refPrefixMap, uriBase, siteOrigin, register: null };
 }
 function resolveIevRef(display, term, refPrefixMap, uriBase) {
   if (!display.startsWith("IEV:")) return null;
@@ -1374,7 +1382,8 @@ async function processDataset(dir, register, opts) {
   const aggregate = await emitOutputSet(conceptInstances, {
     registerId: register,
     uriBase: refMaps.uriBase,
-    languageOrder: opts.languageOrder || opts.languages
+    languageOrder: opts.languageOrder || opts.languages,
+    conceptUriPrefix: buildConceptUriPrefix(refMaps.siteOrigin, register)
   });
   fs2.writeFileSync(path3.join(DATA, register, `${register}.csv`), aggregate.csv);
   fs2.writeFileSync(path3.join(DATA, register, `${register}.jsonld`), aggregate.jsonld);

package/scripts/generate-data.ts

@@ -35,7 +35,7 @@ import type {
   YamlNewsFrontmatter,
   YamlContentPage,
 } from './lib/yaml-types';
-import { buildConceptUri, buildConceptUriPrefix } from './lib/concept-uri';
+import { buildConceptUri, buildConceptUriPrefix, buildSiteOrigin } from './lib/concept-uri';
 import {
   loadConceptFile,
   readYaml,
@@ -246,7 +246,11 @@ function buildRefMaps(config, registerCache) {
 
   const uriBase = config.uriBase;
   if (!uriBase) throw new Error('site-config.yml: uriBase is required');
-  return { patternIndex, refPrefixMap, uriBase, register: null };
+  // Public hosting coordinate from the deployment's own configuration —
+  // `domain` carries any custom path (/vocab/, /iala-vocab). Used for
+  // human-facing links (CSV uri column); uriBase stays the RDF identity.
+  const siteOrigin = buildSiteOrigin(config.domain, uriBase);
+  return { patternIndex, refPrefixMap, uriBase, siteOrigin, register: null };
 }
 
 
@@ -857,10 +861,14 @@ async function processDataset(dir, register, opts) {
 
   // Aggregate distributions: single-file exports of the whole register,
   // emitted by glossarist's output-set API from the canonical model walk.
+  // The CSV uri column is a link a human opens — it carries the SPA route
+  // shape on the deployment's configured host (siteOrigin), not the
+  // RDF-canonical IRI.
   const aggregate = await emitOutputSet(conceptInstances, {
     registerId: register,
     uriBase: refMaps.uriBase,
     languageOrder: opts.languageOrder || opts.languages,
+    conceptUriPrefix: buildConceptUriPrefix(refMaps.siteOrigin, register),
   });
   fs.writeFileSync(path.join(DATA, register, `${register}.csv`), aggregate.csv!);
   fs.writeFileSync(path.join(DATA, register, `${register}.jsonld`), aggregate.jsonld!);

package/scripts/lib/concept-uri.ts

@@ -26,3 +26,21 @@ export function buildConceptUriPrefix(uriBase: string, registerId: string): stri
 export function buildDatasetUriPrefix(uriBase: string, registerId: string): string {
   return `${uriBase}/dataset/${registerId}/`;
 }
+
+/**
+ * Public site origin from the deployment's own configuration.
+ *
+ * site-config `domain` is the hosting coordinate and carries any custom
+ * path (e.g. "oimlsmart.github.io/vocab", "www.glossarist.org/iala-vocab",
+ * "isotc204.geolexica.org"). Links a human opens (CSV `uri` column) must
+ * use this — NOT uriBase, which is the RDF identity root and may differ
+ * from the deployed host. Falls back to uriBase only when a deployment
+ * declares no domain.
+ */
+export function buildSiteOrigin(domain: string | undefined | null, uriBase: string): string {
+  if (domain) {
+    const trimmed = String(domain).trim().replace(/\/+$/, '');
+    return /^https?:\/\//i.test(trimmed) ? trimmed : `https://${trimmed}`;
+  }
+  return uriBase.replace(/\/+$/, '');
+}

package/src/__tests__/scripts/concept-csv.test.ts

@@ -103,4 +103,19 @@ describe('conceptsToCsv (glossarist output API)', () => {
     expect(rows[1]![0]).toBe('222-02-02');
     expect(rows[1]![4]).toBe('');
   });
+
+  // generate-data passes conceptUriPrefix = buildConceptUriPrefix(uriBase,
+  // register) so the uri column carries the SPA route shape
+  // (/dataset/<register>/concept/<id>) and opens in a browser — the
+  // RDF-canonical fallback would 404.
+  it('uri column carries the SPA route shape via conceptUriPrefix', () => {
+    const bare = new Concept({ id: '1-1-010', termid: '1-1-010', status: 'valid' });
+    const csv = conceptsToCsv([bare], {
+      uriBase: 'https://www.glossarist.org/iala-vocab',
+      registerId: 'iala-2023',
+      conceptUriPrefix: 'https://www.glossarist.org/iala-vocab/dataset/iala-2023/concept/',
+    });
+    const rows = parseCsv(csv);
+    expect(rows[1]![1]).toBe('https://www.glossarist.org/iala-vocab/dataset/iala-2023/concept/1-1-010');
+  });
 });