@glossarist/concept-browser 0.7.56 → 0.7.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.56",
+  "version": "0.7.58",
   "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.2",
+    "glossarist": "^0.4.5",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "pinia": "^2.3.1",

package/scripts/generate-data.mjs

@@ -12,6 +12,7 @@ import { buildVocabularyTurtle } from './lib/vocab-turtle.mjs';
 import { buildAgentsTurtle } from './lib/agents-turtle.mjs';
 import { buildVersionHistoryTurtle } from './lib/version-turtle.mjs';
 import { buildBibliographyTurtle } from './lib/bibliography-turtle.mjs';
+import { ttlLit } from './lib/turtle-escape.mjs';
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
 const ROOT = process.cwd();
 const PUBLIC = path.join(ROOT, 'public');
@@ -672,7 +673,7 @@ function getPrimaryDesignation(conceptYaml) {
 }
 
 function escapeTurtle(s) {
-  return s.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
+  return ttlLit(s).slice(1, -1);
 }
 
 function conceptJsonToTurtle(concept) {

package/scripts/sync-concept-model.mjs

@@ -66,6 +66,7 @@ function fetchAny(ref, candidates) {
 const targets = {
   'glossarist.context.jsonld': ['ontologies/glossarist.context.jsonld', 'glossarist.context.jsonld'],
   'glossarist.ttl': ['ontologies/glossarist.ttl', 'glossarist.ttl'],
+  'prefixes.ttl': ['ontologies/prefixes.ttl'],
   'shapes/glossarist.shacl.ttl': ['ontologies/shapes/glossarist.shacl.ttl', 'shapes/glossarist.shacl.ttl'],
 };
 

package/scripts/validate-shacl.mjs

@@ -15,29 +15,23 @@
 // `data/concept-model/shapes/glossarist.shacl.ttl` (synced from
 // glossarist/concept-model via `npm run sync:model`). Pass --shapes <path>
 // or set SHAPES_PATH to override.
+//
+// Delegates the actual validation to glossarist-js's validateShacl
+// wrapper, which handles factory aggregation and shapes caching. The
+// directory walk + CLI parsing stay here because they're build-pipeline
+// specific.
 
 import { readFileSync, readdirSync, statSync } from 'node:fs';
 import { join, extname, dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { Parser as N3Parser, DataFactory } from 'n3';
+import { Parser as N3Parser } from 'n3';
 import rdfDataset from '@rdfjs/dataset';
-import ShaclValidator from 'rdf-validate-shacl';
+import { validateShacl, quadsToDataset } from 'glossarist/rdf';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const VENDORED_SHAPES = resolve(__dirname, '..', 'data', 'concept-model', 'shapes', 'glossarist.shacl.ttl');
 
-const COMBINED_FACTORY = {
-  namedNode: DataFactory.namedNode,
-  blankNode: DataFactory.blankNode,
-  literal: DataFactory.literal,
-  defaultGraph: DataFactory.defaultGraph,
-  quad: DataFactory.quad,
-  fromTerm: DataFactory.fromTerm,
-  fromQuad: DataFactory.fromQuad,
-  dataset: rdfDataset.dataset.bind(rdfDataset),
-};
-const createDataset = COMBINED_FACTORY.dataset;
-const ShaclValidatorCtor = ShaclValidator.default ?? ShaclValidator;
+const createDataset = rdfDataset.dataset.bind(rdfDataset);
 
 function parseArgs(argv) {
   const out = { dataRoot: 'public/data', shapesPath: null };
@@ -119,6 +113,10 @@ async function main() {
   const args = parseArgs(process.argv);
   const shapesPath = resolveShapesPath(args.shapesPath);
 
+  // Pre-parse the shapes file once so we can pass it explicitly via the
+  // { shapes } option. glossarist-js caches by path internally, but
+  // passing the dataset directly avoids a re-read of the file when the
+  // same path is reused for every validation call.
   let shapesDataset;
   try {
     const shapesText = readFileSync(shapesPath, 'utf8');
@@ -128,8 +126,6 @@ async function main() {
     process.exit(2);
   }
 
-  const validator = new ShaclValidatorCtor(shapesDataset, { factory: COMBINED_FACTORY });
-
   let statDir;
   try {
     statDir = statSync(args.dataRoot);
@@ -158,7 +154,7 @@ async function main() {
       violations.push({ path, parseError: e.message });
       continue;
     }
-    const report = validator.validate(graph);
+    const report = await validateShacl(graph, { shapes: shapesDataset });
     if (!report.conforms) {
       for (const v of report.results) {
         violations.push({ path, result: v });

package/src/components/concept-rdf/rdf-prefixes.ts

@@ -1,3 +1,10 @@
+// Prefix bindings for concept-browser's RDF emission.
+//
+// The canonical SSOT for prefix bindings is `data/concept-model/prefixes.ttl`
+// (vendored from glossarist/concept-model). This list is the runtime subset
+// actually emitted by concept-browser. Keep it aligned with prefixes.ttl
+// whenever the upstream file changes.
+
 export interface PrefixEntry {
   prefix: string;
   iri: string;
@@ -5,17 +12,20 @@ export interface PrefixEntry {
 }
 
 export const RDF_PREFIXES: readonly PrefixEntry[] = [
-  { prefix: 'gloss',    iri: 'https://www.glossarist.org/ontologies/',                description: 'Glossarist ontology' },
-  { prefix: 'skos',     iri: 'http://www.w3.org/2004/02/skos/core#',                  description: 'Simple Knowledge Organization System' },
-  { prefix: 'skosxl',   iri: 'http://www.w3.org/2008/05/skos-xl#',                    description: 'SKOS eXtension for Labels' },
-  { prefix: 'rdf',      iri: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',           description: 'RDF core vocabulary' },
-  { prefix: 'rdfs',     iri: 'http://www.w3.org/2000/01/rdf-schema#',                 description: 'RDF Schema' },
-  { prefix: 'owl',      iri: 'http://www.w3.org/2002/07/owl#',                        description: 'Web Ontology Language' },
-  { prefix: 'dcterms',  iri: 'http://purl.org/dc/terms/',                             description: 'Dublin Core terms' },
-  { prefix: 'prov',     iri: 'http://www.w3.org/ns/prov#',                            description: 'PROV-O provenance' },
-  { prefix: 'dcat',     iri: 'http://www.w3.org/ns/dcat#',                            description: 'Data Catalog vocabulary' },
-  { prefix: 'foaf',     iri: 'http://xmlns.com/foaf/0.1/',                            description: 'Friend-of-a-Friend agents' },
-  { prefix: 'xsd',      iri: 'http://www.w3.org/2001/XMLSchema#',                     description: 'XML Schema datatypes' },
+  { prefix: 'gloss',     iri: 'https://www.glossarist.org/ontologies/',                description: 'Glossarist ontology' },
+  { prefix: 'skos',      iri: 'http://www.w3.org/2004/02/skos/core#',                  description: 'Simple Knowledge Organization System' },
+  { prefix: 'skosxl',    iri: 'http://www.w3.org/2008/05/skos-xl#',                    description: 'SKOS eXtension for Labels' },
+  { prefix: 'iso-thes',  iri: 'http://purl.org/iso25964/skos-thes#',                   description: 'ISO 25964 SKOS thesaurus extensions' },
+  { prefix: 'rdf',       iri: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',           description: 'RDF core vocabulary' },
+  { prefix: 'rdfs',      iri: 'http://www.w3.org/2000/01/rdf-schema#',                 description: 'RDF Schema' },
+  { prefix: 'owl',       iri: 'http://www.w3.org/2002/07/owl#',                        description: 'Web Ontology Language' },
+  { prefix: 'dcterms',   iri: 'http://purl.org/dc/terms/',                             description: 'Dublin Core terms' },
+  { prefix: 'prov',      iri: 'http://www.w3.org/ns/prov#',                            description: 'PROV-O provenance' },
+  { prefix: 'dcat',      iri: 'http://www.w3.org/ns/dcat#',                            description: 'Data Catalog vocabulary' },
+  { prefix: 'foaf',      iri: 'http://xmlns.com/foaf/0.1/',                            description: 'Friend-of-a-Friend agents' },
+  { prefix: 'vann',      iri: 'http://purl.org/vocab/vann/',                           description: 'Vocabulary annotations' },
+  { prefix: 'xsd',       iri: 'http://www.w3.org/2001/XMLSchema#',                     description: 'XML Schema datatypes' },
+  { prefix: 'sh',        iri: 'http://www.w3.org/ns/shacl#',                           description: 'SHACL shapes vocabulary' },
 ] as const;
 
 export function findPrefix(prefix: string): PrefixEntry | undefined {