@glossarist/concept-browser 0.7.64 → 0.7.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.64",
+  "version": "0.7.66",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
     "autoprefixer": "^10.4.21",
     "d3": "^7.9.0",
     "favicons": "^7.2.0",
-    "glossarist": "^0.4.10",
+    "glossarist": "^0.4.12",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "pinia": "^2.3.1",

package/scripts/generate-data.mjs

@@ -140,7 +140,7 @@ async function writeDatasetRdf(register, manifest, concepts, refMaps, opts) {
   fs.writeFileSync(path.join(DATA, register, `${register}.ttl`), ttl);
 }
 
-async function writeBuildActivity(conceptCount, datasetRegisters) {
+async function writeBuildActivity(conceptCount, datasetRegisters, baseUri) {
   const runId = process.env.GITHUB_RUN_ID
     ? `${process.env.GITHUB_RUN_ID}-${process.env.GITHUB_RUN_ATTEMPT ?? '1'}`
     : `local-${new Date().toISOString().replace(/[:.]/g, '-')}`;
@@ -162,6 +162,7 @@ async function writeBuildActivity(conceptCount, datasetRegisters) {
     datasetRegisters,
     conceptCount,
     associatedAgentIri: agentIri,
+    baseUri,
   });
   const activityDir = path.join(DATA, 'activity');
   fs.mkdirSync(activityDir, { recursive: true });
@@ -1612,14 +1613,14 @@ for (const [id, count] of Object.entries(counts)) {
   console.log(`  ${id}: ${count} concepts`);
 }
 
-await writeBuildActivity(total, registry.map(r => r.id));
+await writeBuildActivity(total, registry.map(r => r.id), refMaps.uriBase);
 
 fs.writeFileSync(path.join(DATA, '_vocab.ttl'), await buildVocabularyTurtle());
 console.log('Emitted vocabulary graph: data/_vocab.ttl');
 
 const contributors = config.contributors ?? [];
 if (contributors.length > 0) {
-  fs.writeFileSync(path.join(DATA, 'agents.ttl'), await buildAgentsTurtle(contributors, refMaps.uriBase + '/agent'));
+  fs.writeFileSync(path.join(DATA, 'agents.ttl'), await buildAgentsTurtle(contributors, refMaps.uriBase + '/agent', refMaps.uriBase + '/org'));
   console.log(`Emitted agents graph: data/agents.ttl (${contributors.length} contributors)`);
 }
 

package/scripts/lib/agents-turtle.mjs

@@ -19,9 +19,15 @@ function writerPrefixes() {
   };
 }
 
-export async function buildAgentsTurtle(contributors, agentBase) {
+/**
+ * @param {Array} contributors
+ * @param {string} agentBase
+ * @param {string} orgBase
+ */
+export async function buildAgentsTurtle(contributors, agentBase, orgBase) {
   if (!agentBase) throw new Error('buildAgentsTurtle requires agentBase');
+  if (!orgBase) throw new Error('buildAgentsTurtle requires orgBase');
   const agents = agentsFromContributors(contributors ?? [], agentBase);
-  const quads = collectQuads(agentsToQuads(agents));
+  const quads = collectQuads(agentsToQuads(agents, { orgBase }));
   return writeTurtle(quads, { prefixes: writerPrefixes() });
 }

package/src/__tests__/scripts/agents-turtle.test.ts

@@ -1,6 +1,8 @@
 import { describe, it, expect } from 'vitest';
 import { Parser, Store } from 'n3';
-import { buildAgentsTurtle } from '../../../scripts/lib/agents-turtle.mjs';
+import { buildAgentsTurtle as _buildAgentsTurtle } from '../../../scripts/lib/agents-turtle.mjs';
+
+const buildAgentsTurtle = _buildAgentsTurtle as unknown as (...args: any[]) => Promise<string>;
 
 function parse(turtle: string): Store {
   const parser = new Parser({ format: 'Turtle' });
@@ -16,13 +18,13 @@ const RDF_TYPE = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
 
 describe('buildAgentsTurtle (mjs)', () => {
   it('parses without errors', async () => {
-    const ttl = await buildAgentsTurtle([{ name: 'Ada Lovelace' }], 'https://glossarist.org/agent');
+    const ttl = await buildAgentsTurtle([{ name: 'Ada Lovelace' }], 'https://glossarist.org/agent', 'https://glossarist.org/org');
     const store = parse(ttl);
     expect(store.size).toBeGreaterThan(0);
   });
 
   it('types each person as foaf:Person, prov:Person, prov:Agent', async () => {
-    const ttl = await buildAgentsTurtle([{ name: 'Ada Lovelace' }], 'https://glossarist.org/agent');
+    const ttl = await buildAgentsTurtle([{ name: 'Ada Lovelace' }], 'https://glossarist.org/agent', 'https://glossarist.org/org');
     const store = parse(ttl);
     const types = store.getObjects('https://glossarist.org/agent/ada-lovelace', RDF_TYPE, null).map(q => q.value);
     expect(types).toContain(`${FOAF}Person`);
@@ -33,7 +35,7 @@ describe('buildAgentsTurtle (mjs)', () => {
   it('records name, mailto mbox, role, and seeAlso', async () => {
     const ttl = await buildAgentsTurtle([
       { name: 'Ada Lovelace', email: 'ada@example.org', role: 'Editor', url: 'https://example.org/ada' },
-    ], 'https://glossarist.org/agent');
+    ], 'https://glossarist.org/agent', 'https://glossarist.org/org');
     const store = parse(ttl);
     const iri = 'https://glossarist.org/agent/ada-lovelace';
     expect(store.getObjects(iri, `${FOAF}name`, null).map(q => q.value)).toContain('Ada Lovelace');
@@ -46,7 +48,7 @@ describe('buildAgentsTurtle (mjs)', () => {
     const ttl = await buildAgentsTurtle([
       { name: 'Alice', organization: 'ISO' },
       { name: 'Bob',   organization: 'ISO' },
-    ], 'https://glossarist.org/agent');
+    ], 'https://glossarist.org/agent', 'https://glossarist.org/org');
     const store = parse(ttl);
     const types = store.getObjects('https://glossarist.org/org/iso', RDF_TYPE, null).map(q => q.value);
     expect(types).toContain(`${FOAF}Organization`);
@@ -54,8 +56,18 @@ describe('buildAgentsTurtle (mjs)', () => {
   });
 
   it('emits only prefix declarations for an empty input', async () => {
-    const ttl = await buildAgentsTurtle([], 'https://glossarist.org/agent');
+    const ttl = await buildAgentsTurtle([], 'https://glossarist.org/agent', 'https://glossarist.org/org');
     expect(ttl).toContain('@prefix foaf:');
     expect(ttl).not.toContain('<https://glossarist.org/agent/');
   });
+
+  it('throws when agentBase is missing (no hardcoded default)', async () => {
+    await expect(buildAgentsTurtle([{ name: 'X' }])).rejects.toThrow('agentBase');
+  });
+
+  it('throws when orgBase is missing (no hardcoded default)', async () => {
+    await expect(
+      buildAgentsTurtle([{ name: 'X' }], 'https://example.org/agent'),
+    ).rejects.toThrow('orgBase');
+  });
 });

package/src/__tests__/scripts/build-activity-turtle.test.ts

@@ -14,6 +14,7 @@ function makeInput(overrides: any = {}): any {
     datasetRegisters: ['iso-geodetic'],
     conceptCount: 1234,
     associatedAgentIri: 'https://glossarist.org/agent/ci-bot',
+    baseUri: 'https://glossarist.org',
     ...overrides,
   };
 }
@@ -72,4 +73,9 @@ describe('buildActivityTurtle (mjs)', () => {
     const agents = store.getObjects(ACTIVITY_IRI(input.runId), expand('prov:wasAssociatedWith'), null).map(q => q.value);
     expect(agents).toContain(input.associatedAgentIri);
   });
+
+  it('throws when baseUri is missing (no hardcoded default)', async () => {
+    const { baseUri, ...inputWithoutBaseUri } = makeInput();
+    await expect(buildActivityTurtle(inputWithoutBaseUri)).rejects.toThrow('baseUri');
+  });
 });

package/src/__tests__/scripts/build-integration.test.ts

@@ -46,6 +46,7 @@ describe('WS F Layer 8 — build pipeline integration', () => {
     const out = runInline(`
       import { buildActivityTurtle } from './scripts/lib/build-activity-turtle.mjs';
       console.log(await buildActivityTurtle({
+        baseUri: 'https://glossarist.org',
         runId: 'test', startedAt: '2026-01-01T00:00:00Z', endedAt: '2026-01-01T00:05:00Z',
         toolId: 'cb', toolVersion: '0.7.52', datasetRegisters: [], conceptCount: 0,
       }));
@@ -61,7 +62,7 @@ describe('WS F Layer 8 — build pipeline integration', () => {
   it('agents-turtle.mjs produces parseable foaf:Person', () => {
     const out = runInline(`
       import { buildAgentsTurtle } from './scripts/lib/agents-turtle.mjs';
-      console.log(await buildAgentsTurtle([{ name: 'Ada Lovelace', role: 'Editor', organization: 'Royal Society' }], 'https://glossarist.org/agent'));
+      console.log(await buildAgentsTurtle([{ name: 'Ada Lovelace', role: 'Editor', organization: 'Royal Society' }], 'https://glossarist.org/agent', 'https://glossarist.org/org'));
     `);
     const store = parseTurtle(out);
     const persons = [...store].filter(q =>
@@ -121,8 +122,8 @@ describe('WS F Layer 8 — build pipeline integration', () => {
       const parts = [
         await buildVocabularyTurtle(),
         await buildDatasetTurtle({ datasetIri: 'https://glossarist.org/test/', registerId: 'test', title: 't', modified: '2026-01-01', languages: ['eng'], distributions: [], topConceptUris: [], sections: [] }),
-        await buildActivityTurtle({ runId: 'r', startedAt: '2026-01-01T00:00:00Z', endedAt: '2026-01-01T00:05:00Z', toolId: 'cb', toolVersion: '0', datasetRegisters: [], conceptCount: 0 }),
-        await buildAgentsTurtle([{ name: 'Ada' }], 'https://glossarist.org/agent'),
+        await buildActivityTurtle({ baseUri: 'https://glossarist.org', runId: 'r', startedAt: '2026-01-01T00:00:00Z', endedAt: '2026-01-01T00:05:00Z', toolId: 'cb', toolVersion: '0', datasetRegisters: [], conceptCount: 0 }),
+        await buildAgentsTurtle([{ name: 'Ada' }], 'https://glossarist.org/agent', 'https://glossarist.org/org'),
         await buildBibliographyTurtle('test', { x: { reference: 'X' } }, 'https://glossarist.org'),
         await buildVersionHistoryTurtle({ registerId: 't', datasetIri: 'https://glossarist.org/t/', versions: [{ version: '1', generatedAt: '2026-01-01' }] }),
       ];