@glossarist/concept-browser 0.7.57 → 0.7.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.57",
+  "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/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 });