@glossarist/concept-browser 0.7.57 → 0.7.59

package/data/glossarist-vocab.json

@@ -0,0 +1,130 @@
+{
+  "_comment": "Single source of truth for the Glossarist vocabulary. Consumed by vocabulary-emitter.ts (view-time) and vocab-turtle.mjs (build-time). Sourced from glossarist-ruby config.yml — keep in sync when concept-model expands the enum.",
+  "schemes": [
+    {
+      "schemeIri": "gloss:status-scheme",
+      "label": "Concept status",
+      "terms": [
+        { "iri": "gloss:status/valid",      "label": "valid" },
+        { "iri": "gloss:status/superseded", "label": "superseded" },
+        { "iri": "gloss:status/withdrawn",  "label": "withdrawn" },
+        { "iri": "gloss:status/draft",      "label": "draft" }
+      ]
+    },
+    {
+      "schemeIri": "gloss:entstatus-scheme",
+      "label": "Entry status",
+      "terms": [
+        { "iri": "gloss:entstatus/valid",      "label": "valid" },
+        { "iri": "gloss:entstatus/superseded", "label": "superseded" },
+        { "iri": "gloss:entstatus/withdrawn",  "label": "withdrawn" },
+        { "iri": "gloss:entstatus/draft",      "label": "draft" }
+      ]
+    },
+    {
+      "schemeIri": "gloss:norm-scheme",
+      "label": "Normative status",
+      "terms": [
+        { "iri": "gloss:norm/preferred",  "label": "preferred" },
+        { "iri": "gloss:norm/admitted",   "label": "admitted" },
+        { "iri": "gloss:norm/deprecated", "label": "deprecated" },
+        { "iri": "gloss:norm/superseded", "label": "superseded" }
+      ]
+    },
+    {
+      "schemeIri": "gloss:srcstatus-scheme",
+      "label": "Source status",
+      "terms": [
+        { "iri": "gloss:srcstatus/identical",       "label": "identical" },
+        { "iri": "gloss:srcstatus/similar",         "label": "similar" },
+        { "iri": "gloss:srcstatus/modified",        "label": "modified" },
+        { "iri": "gloss:srcstatus/restyle",         "label": "restyle" },
+        { "iri": "gloss:srcstatus/context_added",   "label": "context_added" },
+        { "iri": "gloss:srcstatus/generalisation",  "label": "generalisation" },
+        { "iri": "gloss:srcstatus/specialisation",  "label": "specialisation" },
+        { "iri": "gloss:srcstatus/unspecified",     "label": "unspecified" },
+        { "iri": "gloss:srcstatus/related",         "label": "related" },
+        { "iri": "gloss:srcstatus/not_equal",       "label": "not_equal" },
+        { "iri": "gloss:srcstatus/restyled",        "label": "restyled" },
+        { "iri": "gloss:srcstatus/adapted",         "label": "adapted" }
+      ]
+    },
+    {
+      "schemeIri": "gloss:srctype-scheme",
+      "label": "Source type",
+      "terms": [
+        { "iri": "gloss:srctype/authoritative", "label": "authoritative" },
+        { "iri": "gloss:srctype/lineage",       "label": "lineage" }
+      ]
+    },
+    {
+      "schemeIri": "gloss:datetype-scheme",
+      "label": "Date type",
+      "terms": [
+        { "iri": "gloss:datetype/accepted",    "label": "accepted" },
+        { "iri": "gloss:datetype/amended",     "label": "amended" },
+        { "iri": "gloss:datetype/retired",     "label": "retired" },
+        { "iri": "gloss:datetype/deprecated",  "label": "deprecated" },
+        { "iri": "gloss:datetype/superseded",  "label": "superseded" }
+      ]
+    },
+    {
+      "schemeIri": "gloss:rel-scheme",
+      "label": "Relationship type",
+      "_source": "glossarist-ruby config.yml related_concept.type — 52 types",
+      "terms": [
+        { "iri": "gloss:rel/deprecates",                 "label": "deprecates",                 "group": "lifecycle" },
+        { "iri": "gloss:rel/deprecated_by",              "label": "deprecated_by",              "group": "lifecycle" },
+        { "iri": "gloss:rel/supersedes",                 "label": "supersedes",                 "group": "lifecycle" },
+        { "iri": "gloss:rel/superseded_by",              "label": "superseded_by",              "group": "lifecycle" },
+        { "iri": "gloss:rel/replaces",                   "label": "replaces",                   "group": "lifecycle" },
+        { "iri": "gloss:rel/replaced_by",                "label": "replaced_by",                "group": "lifecycle" },
+        { "iri": "gloss:rel/invalidates",                "label": "invalidates",                "group": "lifecycle" },
+        { "iri": "gloss:rel/invalidated_by",             "label": "invalidated_by",             "group": "lifecycle" },
+        { "iri": "gloss:rel/retires",                    "label": "retires",                    "group": "lifecycle" },
+        { "iri": "gloss:rel/retired_by",                 "label": "retired_by",                 "group": "lifecycle" },
+        { "iri": "gloss:rel/narrower",                   "label": "narrower",                   "group": "hierarchical" },
+        { "iri": "gloss:rel/broader",                    "label": "broader",                    "group": "hierarchical" },
+        { "iri": "gloss:rel/broader_generic",            "label": "broader_generic",            "group": "hierarchical" },
+        { "iri": "gloss:rel/narrower_generic",           "label": "narrower_generic",           "group": "hierarchical" },
+        { "iri": "gloss:rel/broader_partitive",          "label": "broader_partitive",          "group": "hierarchical" },
+        { "iri": "gloss:rel/narrower_partitive",         "label": "narrower_partitive",         "group": "hierarchical" },
+        { "iri": "gloss:rel/has_part",                   "label": "has_part",                   "group": "hierarchical" },
+        { "iri": "gloss:rel/is_part_of",                 "label": "is_part_of",                 "group": "hierarchical" },
+        { "iri": "gloss:rel/broader_instantial",         "label": "broader_instantial",         "group": "hierarchical" },
+        { "iri": "gloss:rel/narrower_instantial",        "label": "narrower_instantial",        "group": "hierarchical" },
+        { "iri": "gloss:rel/instance_of",                "label": "instance_of",                "group": "hierarchical" },
+        { "iri": "gloss:rel/has_instance",               "label": "has_instance",               "group": "hierarchical" },
+        { "iri": "gloss:rel/equivalent",                 "label": "equivalent",                 "group": "equivalence" },
+        { "iri": "gloss:rel/exact_match",                "label": "exact_match",                "group": "equivalence" },
+        { "iri": "gloss:rel/close_match",                "label": "close_match",                "group": "equivalence" },
+        { "iri": "gloss:rel/broad_match",                "label": "broad_match",                "group": "equivalence" },
+        { "iri": "gloss:rel/narrow_match",               "label": "narrow_match",               "group": "equivalence" },
+        { "iri": "gloss:rel/related_match",              "label": "related_match",              "group": "equivalence" },
+        { "iri": "gloss:rel/compare",                    "label": "compare",                    "group": "comparative" },
+        { "iri": "gloss:rel/contrast",                   "label": "contrast",                   "group": "comparative" },
+        { "iri": "gloss:rel/see",                        "label": "see",                        "group": "associative" },
+        { "iri": "gloss:rel/references",                 "label": "references",                 "group": "associative" },
+        { "iri": "gloss:rel/related_concept",            "label": "related_concept",            "group": "associative" },
+        { "iri": "gloss:rel/related_concept_broader",    "label": "related_concept_broader",    "group": "associative" },
+        { "iri": "gloss:rel/related_concept_narrower",   "label": "related_concept_narrower",   "group": "associative" },
+        { "iri": "gloss:rel/sequentially_related",       "label": "sequentially_related",       "group": "associative" },
+        { "iri": "gloss:rel/spatially_related",          "label": "spatially_related",          "group": "associative" },
+        { "iri": "gloss:rel/temporally_related",         "label": "temporally_related",         "group": "associative" },
+        { "iri": "gloss:rel/homograph",                  "label": "homograph",                  "group": "lexical" },
+        { "iri": "gloss:rel/false_friend",               "label": "false_friend",               "group": "lexical" },
+        { "iri": "gloss:rel/has_concept",                "label": "has_concept",                "group": "register" },
+        { "iri": "gloss:rel/is_concept_of",              "label": "is_concept_of",              "group": "register" },
+        { "iri": "gloss:rel/has_definition",             "label": "has_definition",             "group": "register" },
+        { "iri": "gloss:rel/definition_of",              "label": "definition_of",              "group": "register" },
+        { "iri": "gloss:rel/inherits",                   "label": "inherits",                   "group": "versioning" },
+        { "iri": "gloss:rel/inherited_by",               "label": "inherited_by",               "group": "versioning" },
+        { "iri": "gloss:rel/has_version",                "label": "has_version",                "group": "versioning" },
+        { "iri": "gloss:rel/version_of",                 "label": "version_of",                 "group": "versioning" },
+        { "iri": "gloss:rel/current_version",            "label": "current_version",            "group": "versioning" },
+        { "iri": "gloss:rel/current_version_of",         "label": "current_version_of",         "group": "versioning" },
+        { "iri": "gloss:rel/derived",                    "label": "derived",                    "group": "legacy" }
+      ]
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.57",
+  "version": "0.7.59",
   "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.8",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "pinia": "^2.3.1",
@@ -85,6 +85,7 @@
     "cli",
     "scripts",
     "src",
+    "data",
     "public/favicon.svg",
     "index.html",
     "vite.config.ts",

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,9 +1,18 @@
 // 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.
+// Sources PREFIXES (the canonical prefix→IRI map) from glossarist/rdf
+// so the runtime list stays in sync with the upstream concept-model
+// `prefixes.ttl` SSOT automatically. The per-prefix `description`
+// strings remain local because they are presentation metadata, not
+// part of the canonical bindings.
+//
+// glossarist-js's PREFIXES is generated from the JSON-LD context,
+// which omits some well-known prefixes that ARE in `prefixes.ttl`
+// and ARE used in instance data (dcat, foaf, sh). We supplement
+// locally until upstream glossarist-js regenerates from the full
+// prefixes.ttl.
+
+import { PREFIXES as GLOSSARIST_PREFIXES } from 'glossarist/rdf/prefixes';
 
 export interface PrefixEntry {
   prefix: string;
@@ -11,22 +20,53 @@ export interface PrefixEntry {
   description: string;
 }
 
-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: '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;
+// Prefixes declared in concept-model's canonical prefixes.ttl that
+// glossarist-js's PREFIXES does not yet export (because they are
+// absent from the JSON-LD context, even though they appear in
+// instance data — dcat:Dataset, foaf:Person, sh:NodeShape).
+const SUPPLEMENTAL_PREFIXES: Record<string, string> = {
+  dcat: 'http://www.w3.org/ns/dcat#',
+  foaf: 'http://xmlns.com/foaf/0.1/',
+  sh:   'http://www.w3.org/ns/shacl#',
+};
+
+const PREFIX_DESCRIPTIONS: Record<string, string> = {
+  gloss:     'Glossarist ontology',
+  skos:      'Simple Knowledge Organization System',
+  skosxl:    'SKOS eXtension for Labels',
+  'iso-thes': 'ISO 25964 SKOS thesaurus extensions',
+  rdf:       'RDF core vocabulary',
+  rdfs:      'RDF Schema',
+  owl:       'Web Ontology Language',
+  dcterms:   'Dublin Core terms',
+  prov:      'PROV-O provenance',
+  dcat:      'Data Catalog vocabulary',
+  foaf:      'Friend-of-a-Friend agents',
+  vann:      'Vocabulary annotations',
+  xsd:       'XML Schema datatypes',
+  sh:        'SHACL shapes vocabulary',
+};
+
+function descriptionFor(prefix: string): string {
+  return PREFIX_DESCRIPTIONS[prefix] ?? '';
+}
+
+// Merge glossarist-js's canonical PREFIXES with the supplemental
+// bindings. Order: glossarist PREFIXES first (canonical order), then
+// any supplemental prefixes not already present.
+const MERGED: Record<string, string> = {
+  ...GLOSSARIST_PREFIXES,
+  ...SUPPLEMENTAL_PREFIXES,
+};
+
+// Derive RDF_PREFIXES at module load.
+export const RDF_PREFIXES: readonly PrefixEntry[] = Object.freeze(
+  Object.entries(MERGED).map(([prefix, iri]) => ({
+    prefix,
+    iri,
+    description: descriptionFor(prefix),
+  })),
+);
 
 export function findPrefix(prefix: string): PrefixEntry | undefined {
   return RDF_PREFIXES.find(p => p.prefix === prefix);

package/src/utils/dataset-style.ts

@@ -1,6 +1,7 @@
 import { useVocabularyStore } from '../stores/vocabulary';
 import type { DatasetColorSpec } from '../config/types';
 import { createColorTheme } from './color-theme';
+import { resolveColor as resolveColorGlossarist } from 'glossarist/models';
 
 const PALETTE = [
   '#3366ff', '#0d9488', '#d97706', '#8b5cf6',
@@ -45,10 +46,17 @@ function normalizeSpec(spec: DatasetColorSpec | undefined, fallback: string): {
     return { light: fallback, dark };
   }
   if (typeof spec === 'string') {
+    // Single hex applies to both modes, but dark mode needs the
+    // alpha-blended fallback for contrast on dark surfaces.
     const dark = hexToRgba(spec, 0.85);
     return { light: spec, dark };
   }
-  return { light: spec.light, dark: spec.dark };
+  // Pair case: delegate to glossarist-js's resolveColor so the canonical
+  // "missing mode returns null" rule stays in one place. concept-browser
+  // then fills in any null with the other mode's value.
+  const light = resolveColorGlossarist(spec, 'light') ?? spec.dark ?? fallback;
+  const dark = resolveColorGlossarist(spec, 'dark') ?? spec.light ?? hexToRgba(light, 0.85);
+  return { light, dark };
 }
 
 export function paletteColor(index: number): string {