@glossarist/concept-browser 0.7.116 → 0.7.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.116",
+  "version": "0.7.118",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {
@@ -36,6 +36,7 @@
     "@astrojs/sitemap": "^3.7.3",
     "@astrojs/vue": "^7.0.1",
     "@plurimath/plurimath": "^0.2.2",
+    "@rdfjs/dataset": "^2.0.2",
     "@tailwindcss/vite": "^4.3.2",
     "@vitejs/plugin-vue": "^6.0.7",
     "astro": "^7.0.7",
@@ -44,7 +45,9 @@
     "glossarist": "^0.4.52",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
+    "n3": "^1.26.0",
     "pinia": "^2.3.1",
+    "rdf-validate-shacl": "^0.4.5",
     "sharp": "^0.34.5",
     "tailwindcss": "^4.3.2",
     "tsx": "^4.23.4",
@@ -54,19 +57,16 @@
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.9",
-    "@rdfjs/dataset": "^2.0.2",
     "@stryker-mutator/core": "^9.6.1",
     "@stryker-mutator/vitest-runner": "^9.6.1",
     "@types/d3": "^7.4.3",
     "@types/n3": "^1.26.1",
-    "esbuild": "^0.28.1",
-    "glob": "^10.5.0",
     "@vue/test-utils": "^2.4.8",
+    "esbuild": "^0.28.1",
     "fast-check": "^4.8.0",
+    "glob": "^10.5.0",
     "happy-dom": "^20.9.0",
-    "n3": "^1.26.0",
     "playwright": "^1.62.1",
-    "rdf-validate-shacl": "^0.4.5",
     "typescript": "~5.7.3",
     "vitest": "^4.1.5",
     "vue-tsc": "^2.2.8"

package/scripts/build-scripts.mjs

@@ -1,8 +1,17 @@
 import { build } from 'esbuild';
 import { globSync } from 'glob';
-import { dirname, relative } from 'path';
+import { relative } from 'path';
 
-const files = globSync('scripts/*.ts').filter(f => !f.includes('__tests__'));
+// Exclude scripts that are dev/CI-only and depend on devDependencies.
+// These are not consumer-facing CLI commands and would pull in heavy deps
+// (e.g. playwright for smoke) that consumers shouldn't need.
+const DEV_ONLY = new Set([
+  'scripts/smoke.ts',       // needs playwright (devDep, heavy)
+]);
+
+const files = globSync('scripts/*.ts').filter(f =>
+  !f.includes('__tests__') && !DEV_ONLY.has(f),
+);
 
 await Promise.all(files.map(async (file) => {
   const outfile = file.replace(/\.ts$/, '.js');

package/scripts/generate-data.js

@@ -420,7 +420,7 @@ async function buildActivityTurtle(input) {
 }
 
 // scripts/lib/vocab-turtle.ts
-import { readFileSync as readFileSync2 } from "node:fs";
+import { readFileSync as readFileSync2, existsSync as existsSync2 } from "node:fs";
 import { join, dirname as dirname2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import {
@@ -430,9 +430,21 @@ import {
   PREFIXES as PREFIXES2
 } from "glossarist/rdf";
 var __dirname2 = dirname2(fileURLToPath2(import.meta.url));
-var VOCAB_PATH = join(__dirname2, "..", "..", "data", "glossarist-vocab.json");
-function loadVocab(path4 = VOCAB_PATH) {
-  return JSON.parse(readFileSync2(path4, "utf8"));
+function findVocabPath() {
+  const candidates = [
+    join(__dirname2, "..", "..", "data", "glossarist-vocab.json"),
+    join(__dirname2, "..", "data", "glossarist-vocab.json")
+  ];
+  for (const p of candidates) {
+    if (existsSync2(p)) return p;
+  }
+  throw new Error(
+    `glossarist-vocab.json not found. Tried:
+${candidates.map((p) => "  " + p).join("\n")}`
+  );
+}
+function loadVocab() {
+  return JSON.parse(readFileSync2(findVocabPath(), "utf8"));
 }
 function writerPrefixes3() {
   const out = {};
@@ -1090,6 +1102,9 @@ function buildPatternIndex(datasets, registerCache2) {
 function buildRefMaps(config2, registerCache2) {
   const refPrefixMap = {};
   const patternIndex = buildPatternIndex(config2.datasets, registerCache2);
+  for (const ds of config2.datasets) {
+    if (ds.ref) refPrefixMap[ds.ref] = ds.id;
+  }
   for (const route of config2.routing || []) {
     if (route.uri && route.uri.includes("iec") && route.uri.includes("60050")) {
       const mapped = route.targetDataset;
@@ -1316,6 +1331,13 @@ function yamlToJsonLd(conceptYaml, register, refMaps2) {
         if (r.ref.id) ref["gl:id"] = r.ref.id;
         if (r.ref.text) ref["gl:text"] = r.ref.text;
         rel["gl:ref"] = ref;
+        if (r.ref.source && r.ref.id && refMaps2?.refPrefixMap?.[r.ref.source]) {
+          const datasetId = refMaps2.refPrefixMap[r.ref.source];
+          rel["gl:target"] = buildConceptUri(refMaps2.uriBase, datasetId, r.ref.id);
+        }
+      }
+      if (r.target) {
+        rel["gl:target"] = r.target;
       }
       return rel;
     });

package/scripts/generate-data.ts

@@ -221,6 +221,14 @@ function buildRefMaps(config, registerCache) {
   const refPrefixMap = {};
   const patternIndex = buildPatternIndex(config.datasets, registerCache);
 
+  // Auto-map each dataset's `ref` field to its dataset ID.
+  // This enables cross-dataset link resolution: a concept in cie-2020
+  // with ref: { source: "CIE S 017:2011", id: "17-245" } resolves to
+  // cie-2011/concept/17-245 because cie-2011 has ref: "CIE S 017:2011".
+  for (const ds of config.datasets) {
+    if (ds.ref) refPrefixMap[ds.ref] = ds.id;
+  }
+
   for (const route of config.routing || []) {
     if (route.uri && route.uri.includes('iec') && route.uri.includes('60050')) {
       const mapped = route.targetDataset;
@@ -508,6 +516,18 @@ function yamlToJsonLd(conceptYaml, register, refMaps) {
         if (r.ref.id) ref['gl:id'] = r.ref.id;
         if (r.ref.text) ref['gl:text'] = r.ref.text;
         rel['gl:ref'] = ref;
+
+        // Resolve cross-dataset refs to gl:target URIs.
+        // refPrefixMap maps source labels (e.g. "CIE S 017:2011") to
+        // dataset IDs (e.g. "cie-2011"). When the source matches a
+        // co-deployed dataset, we can build a navigable concept URI.
+        if (r.ref.source && r.ref.id && refMaps?.refPrefixMap?.[r.ref.source]) {
+          const datasetId = refMaps.refPrefixMap[r.ref.source];
+          rel['gl:target'] = buildConceptUri(refMaps.uriBase, datasetId, r.ref.id);
+        }
+      }
+      if (r.target) {
+        rel['gl:target'] = r.target;
       }
       return rel;
     });

package/scripts/lib/vocab-turtle.ts

@@ -7,7 +7,7 @@
 // to absolute IRIs, then re-rendered via glossarist-js's n3 writer with
 // the canonical prefix map ).
 
-import { readFileSync } from 'node:fs';
+import { readFileSync, existsSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import {
@@ -18,10 +18,25 @@ import {
 } from 'glossarist/rdf';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const VOCAB_PATH = join(__dirname, '..', '..', 'data', 'glossarist-vocab.json');
 
-function loadVocab(path = VOCAB_PATH) {
-  return JSON.parse(readFileSync(path, 'utf8'));
+// When running from source (tsx), this file is at scripts/lib/ and
+// the data dir is two levels up. When bundled by esbuild into
+// scripts/*.js, __dirname is scripts/ and the data dir is one level up.
+function findVocabPath(): string {
+  const candidates = [
+    join(__dirname, '..', '..', 'data', 'glossarist-vocab.json'),
+    join(__dirname, '..', 'data', 'glossarist-vocab.json'),
+  ];
+  for (const p of candidates) {
+    if (existsSync(p)) return p;
+  }
+  throw new Error(
+    `glossarist-vocab.json not found. Tried:\n${candidates.map(p => '  ' + p).join('\n')}`,
+  );
+}
+
+function loadVocab() {
+  return JSON.parse(readFileSync(findVocabPath(), 'utf8'));
 }
 
 // n3's writer prefixes must omit the trailing # or / — those go in

package/src/__tests__/consumer-e2e-simulation.test.ts

@@ -0,0 +1,98 @@
+/**
+ * End-to-end consumer simulation test.
+ *
+ * Simulates what a real consumer experiences: creates a temp "consumer
+ * project" with the compiled package in node_modules, then runs scripts
+ * with plain node. Catches packaging bugs that dev-mode tests miss.
+ */
+
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { spawnSync } from 'node:child_process';
+import {
+  mkdirSync, writeFileSync, cpSync, rmSync, existsSync, readFileSync, readdirSync,
+} from 'node:fs';
+import { resolve, join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const ROOT = resolve(__dirname, '..', '..');
+const SCRIPTS_DIR = join(ROOT, 'scripts');
+const CONSUMER_DIR = join(ROOT, '.tmp-consumer-test');
+
+describe('end-to-end consumer simulation — compiled package works under plain node', () => {
+  beforeAll(() => {
+    const build = spawnSync('node', [join(ROOT, 'scripts', 'build-scripts.mjs')], {
+      encoding: 'utf8', cwd: ROOT,
+    });
+    expect(build.status).toBe(0);
+
+    rmSync(CONSUMER_DIR, { recursive: true, force: true });
+    const pkgDest = join(CONSUMER_DIR, 'node_modules', '@glossarist', 'concept-browser');
+    mkdirSync(pkgDest, { recursive: true });
+    cpSync(join(ROOT, 'scripts'), join(pkgDest, 'scripts'), { recursive: true });
+    cpSync(join(ROOT, 'data'), join(pkgDest, 'data'), { recursive: true });
+    cpSync(join(ROOT, 'cli'), join(pkgDest, 'cli'), { recursive: true });
+    writeFileSync(join(pkgDest, 'package.json'), JSON.stringify({
+      name: '@glossarist/concept-browser', version: '0.0.0-test', type: 'module',
+      bin: { 'concept-browser': './cli/index.mjs' },
+    }));
+  }, 60000);
+
+  afterAll(() => {
+    rmSync(CONSUMER_DIR, { recursive: true, force: true });
+  });
+
+  it('compiled scripts can find package data files from node_modules location', () => {
+    const scriptDir = join(CONSUMER_DIR, 'node_modules', '@glossarist', 'concept-browser', 'scripts');
+    const pathFromBundled = join(scriptDir, '..', 'data', 'glossarist-vocab.json');
+    expect(existsSync(pathFromBundled)).toBe(true);
+  });
+
+  it('compiled scripts list matches source scripts (no missing outputs)', () => {
+    const sourceTs = readdirSync(SCRIPTS_DIR)
+      .filter(f => f.endsWith('.ts') && !f.includes('__tests__') && f !== 'smoke.ts')
+      .map(f => f.replace(/\.ts$/, ''));
+    const compiledJs = readdirSync(SCRIPTS_DIR)
+      .filter(f => f.endsWith('.js'))
+      .map(f => f.replace(/\.js$/, ''));
+    for (const name of sourceTs) {
+      expect(compiledJs).toContain(name);
+    }
+  });
+
+  it('validate-yaml.js validates against the shipped schema from node_modules', () => {
+    const consumerPkg = join(CONSUMER_DIR, 'node_modules', '@glossarist', 'concept-browser');
+    const scriptPath = join(consumerPkg, 'scripts', 'validate-yaml.js');
+    const schemaPath = join(consumerPkg, 'data', 'concept-model', 'shapes', 'glossarist.concept.yaml.schema.json');
+    const code = [
+      'import { validateYaml } from ' + JSON.stringify(scriptPath) + ';',
+      'import { readFileSync } from "fs";',
+      'const schema = JSON.parse(readFileSync(' + JSON.stringify(schemaPath) + ', "utf8"));',
+      'const r = validateYaml("termid: test", schema);',
+      'console.log("valid=" + r.valid);',
+    ].join('\n');
+    const result = spawnSync('node', ['--input-type=module', '-e', code], {
+      encoding: 'utf8', cwd: ROOT,
+    });
+    expect(result.status).toBe(0);
+    expect(result.stdout).toContain('valid=true');
+  });
+
+  it('no compiled script references a devDependency-only package', () => {
+    const pkg = JSON.parse(readFileSync(join(ROOT, 'package.json'), 'utf8'));
+    const deps = new Set(Object.keys(pkg.dependencies || {}));
+    const devDeps = new Set(Object.keys(pkg.devDependencies || {}));
+    const violations: string[] = [];
+    for (const file of readdirSync(SCRIPTS_DIR).filter(f => f.endsWith('.js'))) {
+      const src = readFileSync(join(SCRIPTS_DIR, file), 'utf8');
+      const importRe = new RegExp('(?:from\\s+|import\\s*\\(\\s*)["\']([^"\'./@][^"\']*)["\']', 'g');
+      let m;
+      while ((m = importRe.exec(src)) !== null) {
+        const name = m[1].startsWith('@') ? m[1].split('/').slice(0, 2).join('/') : m[1].split('/')[0];
+        if (name.startsWith('node:') || name === 'node') continue;
+        if (devDeps.has(name) && !deps.has(name)) violations.push(file + ' -> ' + name);
+      }
+    }
+    expect(violations).toEqual([]);
+  });
+});

package/src/__tests__/published-package-contract.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { resolve, join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -21,7 +21,6 @@ const PIPELINE_SCRIPTS = [
   'generate-data',
   'build-edges',
   'process-about-pages',
-  'smoke',
   'generate-ontology-data',
   'generate-ontology-schema',
   'doctor',
@@ -81,4 +80,31 @@ describe('published-package contract — compiled .js scripts load under plain n
     expect(result.status).toBe(0);
     expect(result.stdout).toContain('valid=true');
   });
+
+  it('compiled scripts do not import devDependencies (runtime packaging regression)', () => {
+    const pkg = JSON.parse(readFileSync(join(ROOT, 'package.json'), 'utf8'));
+    const deps = new Set(Object.keys(pkg.dependencies || {}));
+    const devDeps = new Set(Object.keys(pkg.devDependencies || {}));
+    for (const name of LIBRARY_SCRIPTS) {
+      const jsPath = join(SCRIPTS_DIR, `${name}.js`);
+      if (!existsSync(jsPath)) continue;
+      const src = readFileSync(jsPath, 'utf8');
+      for (const devDep of devDeps) {
+        if (deps.has(devDep)) continue;
+        expect(src).not.toContain(`from "${devDep}"`);
+        expect(src).not.toContain(`from '${devDep}'`);
+        expect(src).not.toMatch(new RegExp(`import\\s*\\(\\s*["']${devDep}["']`));
+      }
+    }
+  });
+
+  it('compiled scripts can find package data files (glossarist-vocab.json path regression)', () => {
+    // When esbuild bundles scripts/lib/vocab-turtle.ts into scripts/generate-data.js,
+    // __dirname changes from scripts/lib/ to scripts/. The path to data/ must
+    // resolve correctly in both modes. This test verifies the fallback logic.
+    const dataDir = join(ROOT, 'data');
+    expect(existsSync(join(dataDir, 'glossarist-vocab.json'))).toBe(true);
+    expect(existsSync(join(dataDir, 'colors.json'))).toBe(true);
+    expect(existsSync(join(dataDir, 'concept-model', 'shapes', 'glossarist.shacl.ttl'))).toBe(true);
+  });
 });

package/scripts/smoke.js

@@ -1,211 +0,0 @@
-#!/usr/bin/env node
-
-// scripts/smoke.ts
-import { chromium } from "playwright";
-import { createServer } from "http";
-import { statSync, createReadStream } from "fs";
-import { extname, join, normalize, resolve as pathResolve } from "path";
-import { fileURLToPath } from "url";
-var __dirname = fileURLToPath(new URL(".", import.meta.url));
-var DIST = pathResolve(__dirname, "..", "dist");
-var MIME = {
-  ".html": "text/html; charset=utf-8",
-  ".js": "application/javascript; charset=utf-8",
-  "": "application/javascript; charset=utf-8",
-  ".css": "text/css; charset=utf-8",
-  ".json": "application/json; charset=utf-8",
-  ".svg": "image/svg+xml",
-  ".png": "image/png",
-  ".jpg": "image/jpeg",
-  ".ico": "image/x-icon",
-  ".webp": "image/webp",
-  ".woff": "font/woff",
-  ".woff2": "font/woff2",
-  ".ttf": "font/ttf",
-  ".map": "application/json; charset=utf-8",
-  ".xml": "application/xml; charset=utf-8",
-  ".txt": "text/plain; charset=utf-8",
-  ".webmanifest": "application/manifest+json; charset=utf-8"
-};
-function serveDist(root) {
-  return new Promise((resolve) => {
-    const server = createServer((req, res) => {
-      try {
-        const urlPath = decodeURIComponent((req.url ?? "/").split("?")[0]);
-        let filePath = join(root, urlPath);
-        if (!extname(filePath)) {
-          if (statSafe(filePath)?.isFile()) {
-            return sendFile(res, filePath);
-          }
-          const candidates = [
-            filePath + ".html",
-            join(filePath, "index.html"),
-            join(root, "200.html"),
-            join(root, "index.html")
-          ];
-          for (const c of candidates) {
-            if (statSafe(c)?.isFile()) {
-              return sendFile(res, c);
-            }
-          }
-          res.writeHead(404);
-          return res.end("Not found");
-        }
-        if (statSafe(filePath)?.isFile()) {
-          return sendFile(res, filePath);
-        }
-        res.writeHead(404);
-        return res.end("Not found");
-      } catch (e) {
-        res.writeHead(500);
-        res.end(String(e ?? "server error"));
-      }
-    });
-    server.listen(0, "127.0.0.1", () => {
-      const addr = server.address();
-      const port = typeof addr === "object" && addr ? addr.port : 0;
-      resolve({ server, origin: `http://127.0.0.1:${port}` });
-    });
-  });
-}
-function statSafe(p) {
-  try {
-    return statSync(p);
-  } catch {
-    return null;
-  }
-}
-function sendFile(res, filePath) {
-  const safe = normalize(filePath);
-  const ct = MIME[extname(safe)] ?? "application/octet-stream";
-  res.writeHead(200, { "Content-Type": ct });
-  createReadStream(safe).pipe(res);
-}
-var PAGE_PATHS = [
-  "/",
-  "/learn/",
-  "/learn/relationships/",
-  "/learn/designations/",
-  "/learn/statuses/"
-];
-var CONSUMER_DATA_FILES = [
-  "/datasets.json",
-  "/site-config.json",
-  "/data/cross-ref-index.json"
-];
-function isConsumerDataFile(url) {
-  try {
-    const u = new URL(url);
-    return CONSUMER_DATA_FILES.some((f) => u.pathname === f || u.pathname.startsWith("/data/"));
-  } catch {
-    return false;
-  }
-}
-async function probePage(browser, origin, path) {
-  const url = new URL(path, origin).toString();
-  const page = await browser.newPage();
-  const errors = [];
-  const failedRequests = [];
-  page.on("pageerror", (e) => {
-    errors.push({ kind: "pageerror", message: e.message, stack: e.stack ?? "" });
-  });
-  page.on("console", (msg) => {
-    if (msg.type() !== "error") return;
-    const text = msg.text();
-    if (/Failed to load resource/i.test(text)) return;
-    if (/fonts\.g(oogle|static)\.com/.test(text)) return;
-    errors.push({ kind: "console.error", message: text });
-  });
-  page.on("requestfailed", (req) => {
-    const u = req.url();
-    if (u.startsWith(origin) && !isConsumerDataFile(u)) {
-      failedRequests.push({ url: u, failure: req.failure()?.errorText ?? "failed" });
-    }
-  });
-  page.on("response", (resp) => {
-    const u = resp.url();
-    if (u.startsWith(origin) && resp.status() >= 400 && !isConsumerDataFile(u)) {
-      failedRequests.push({ url: u, status: resp.status() });
-    }
-  });
-  try {
-    const resp = await page.goto(url, { waitUntil: "networkidle", timeout: 15e3 });
-    if (resp && resp.status() >= 400) {
-      return { path, url, status: resp.status(), bodyLen: 0, errors, failedRequests, skipped: path !== "/" };
-    }
-    await page.waitForTimeout(500);
-    const bodyLen = await page.evaluate(() => document.body?.innerText?.length ?? 0);
-    return { path, url, status: resp?.status() ?? 0, bodyLen, errors, failedRequests, skipped: false };
-  } catch (e) {
-    errors.push({ kind: "navigation", message: String(e) });
-    return { path, url, status: 0, bodyLen: 0, errors, failedRequests, skipped: false };
-  } finally {
-    await page.close();
-  }
-}
-function formatFindings(results) {
-  const lines = [];
-  for (const r of results) {
-    if (r.skipped) {
-      lines.push(`
-  ${r.path}  (HTTP ${r.status} \u2014 skipped, not in this build)`);
-      continue;
-    }
-    if (r.errors.length === 0 && r.failedRequests.length === 0 && r.bodyLen > 0) continue;
-    lines.push(`
-  ${r.path}  (HTTP ${r.status}, body ${r.bodyLen} chars)`);
-    for (const e of r.errors) {
-      lines.push(`    [${e.kind}] ${e.message}`);
-    }
-    for (const f of r.failedRequests) {
-      lines.push(`    [request] ${f.status ?? f.failure}  ${f.url}`);
-    }
-  }
-  return lines.join("\n");
-}
-async function ensureDist() {
-  if (!statSafe(DIST)?.isDirectory()) {
-    console.error(`smoke: dist/ not found at ${DIST}`);
-    console.error(`       run \`npm run build\` first, or use \`npm run build:full\`.`);
-    process.exit(2);
-  }
-  if (!statSafe(join(DIST, "index.html"))?.isFile()) {
-    console.error(`smoke: dist/index.html missing \u2014 build did not complete.`);
-    process.exit(2);
-  }
-}
-async function main() {
-  await ensureDist();
-  const { server, origin } = await serveDist(DIST);
-  let exitCode = 0;
-  const browser = await chromium.launch({ headless: true });
-  try {
-    const results = [];
-    for (const path of PAGE_PATHS) {
-      const r = await probePage(browser, origin, path);
-      results.push(r);
-    }
-    const anyFail = results.some(
-      (r) => !r.skipped && (r.errors.length > 0 || r.failedRequests.length > 0 || r.bodyLen === 0)
-    );
-    const findings = formatFindings(results);
-    if (anyFail) {
-      exitCode = 1;
-      console.error(`
-  FAIL  smoke test found problems:${findings}
-`);
-    } else {
-      const skipped = results.filter((r) => r.skipped).length;
-      console.log(`
-  OK    smoke test passed (${results.length - skipped} pages, ${skipped} skipped, 0 errors).`);
-    }
-  } finally {
-    await browser.close();
-    server.close();
-  }
-  process.exit(exitCode);
-}
-main().catch((e) => {
-  console.error("smoke: fatal error", e);
-  process.exit(1);
-});