@glossarist/concept-browser 0.7.128 → 0.7.130

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.128",
+  "version": "0.7.130",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {
@@ -43,7 +43,7 @@
     "astro": "^7.0.7",
     "d3": "^7.9.0",
     "favicons": "^7.2.0",
-    "glossarist": "^0.4.55",
+    "glossarist": "^0.4.56",
     "js-yaml": "^4.1.0",
     "jszip": "^3.10.1",
     "n3": "^1.26.0",

package/scripts/generate-data.js

@@ -1163,6 +1163,7 @@ function extractInlineRefs(localizedData, refMaps2, conceptSources = []) {
   }
   for (const m of fullText.matchAll(/\{\{([^{}]+?)\}\}/g)) {
     const body = m[1];
+    if (/^(bib|link|image):/i.test(body)) continue;
     let segments;
     try {
       segments = parseMentions(`{{${body}}}`);
@@ -1188,6 +1189,8 @@ function extractInlineRefs(localizedData, refMaps2, conceptSources = []) {
           if (pattern) {
             refs.push({ id: buildConceptUri(refMaps2.uriBase, pattern.datasetId, pattern.conceptId), term: seg.label ?? target.urn });
           }
+        } else if (target.type === "entity_id" && target.id) {
+          refs.push({ id: buildConceptUri(refMaps2.uriBase, refMaps2.register, target.id), term: seg.label ?? target.id });
         }
       }
     }

package/scripts/generate-data.ts

@@ -375,54 +375,46 @@ function extractInlineRefs(localizedData, refMaps, conceptSources = []) {
     if (pattern) { refs.push(pattern); }
   }
 
-  // Double-brace mentions: use the STRICT parser from glossarist@0.4.55.
-  // Per concept-model spec: invalid mentions produce errors, they are
-  // NEVER silently passed through. The build FAILS on any invalid syntax.
+  // Double-brace mentions: use the strict parser from glossarist@0.4.56.
+  // Bare numeric IDs and designations are implicit same-dataset concept refs.
   for (const m of fullText.matchAll(/\{\{([^{}]+?)\}\}/g)) {
     const body = m[1];
 
-    // Strict parse — throws InvalidMentionError on invalid syntax.
-    // This catches: missing kind prefix, wrong target type for kind,
-    // bib: used for concept IDs, link: without http/https, etc.
+    // Skip deployment-specific kinds (not concept cross-references)
+    if (/^(bib|link|image):/i.test(body)) continue;
+
     let segments;
     try {
       segments = parseMentions(`{{${body}}}`);
     } catch (e) {
       if (e instanceof InvalidMentionError) {
-        // Report the error but don't crash — collect for batch reporting.
         console.warn(`  Invalid mention: {{${body}}} — ${e.reason}`);
         continue;
       }
       throw e;
     }
 
-    // Extract mention segments (skip text segments).
     for (const seg of segments) {
       if (seg.kind === 'text') continue;
-
-      // bib:/link:/image: are deployment-specific renderings — NOT concept
-      // cross-references. They must NOT appear in gl:references.
       if (seg.kind === 'bib' || seg.kind === 'link' || seg.kind === 'image') continue;
 
-      // For concept/cite/fig/table/formula — resolve to URIs.
-      // fig/table/formula resolve to entity refs (handled separately).
       if (seg.kind === 'concept' || seg.kind === 'cite') {
         const target = seg.target;
         if (target.type === 'dataset_qualified' && target.dataset && target.id) {
-          // Only create a concept URI if the dataset is CO-DEPLOYED.
-          // If the dataset doesn't exist in this deployment's refPrefixMap,
-          // skip — the runtime resolver will handle it (unresolved text or
-          // external link via routing). Creating a URI for a non-existent
-          // dataset produces a 404.
+          // Cross-dataset: only if co-deployed
           const dsId = refMaps.refPrefixMap[target.dataset];
           if (dsId) {
             refs.push({ id: buildConceptUri(refMaps.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` });
           }
         } else if (target.type === 'urn' && target.urn) {
+          // URN: resolve via pattern index
           const pattern = refMaps.patternIndex.resolve(target.urn);
           if (pattern) {
             refs.push({ id: buildConceptUri(refMaps.uriBase, pattern.datasetId, pattern.conceptId), term: seg.label ?? target.urn });
           }
+        } else if (target.type === 'entity_id' && target.id) {
+          // Same-dataset concept reference (bare numeric ID or designation)
+          refs.push({ id: buildConceptUri(refMaps.uriBase, refMaps.register, target.id), term: seg.label ?? target.id });
         }
       }
     }

package/src/__tests__/composables/cite-resolver-dataset-id.test.ts

@@ -0,0 +1,74 @@
+import { describe, it, expect } from 'vitest';
+
+/**
+ * Tests for citeResolver DATASET:ID matching logic.
+ *
+ * The citeResolver must parse {{cite:IEV:702-02-07}} and match it
+ * against sources that have:
+ *   - id: "702-02-07" (the ID part)
+ *   - origin.ref: { source: "IEV", id: "702-02-07" }
+ *
+ * Previously, it only matched s.id === key, so "IEV:702-02-07"
+ * never matched source.id "702-02-07".
+ */
+
+interface SourceLike {
+  id: string | null;
+  origin?: {
+    ref?: { source?: string; id?: string } | null;
+    link?: string | null;
+  } | null;
+}
+
+function findSource(key: string, sources: SourceLike[]): SourceLike | undefined {
+  const lastColon = key.lastIndexOf(':');
+  const idPart = lastColon > 0 ? key.slice(lastColon + 1) : key;
+  const datasetPart = lastColon > 0 ? key.slice(0, lastColon) : '';
+
+  return sources.find(s => {
+    if (s.id === key || s.id === idPart) return true;
+    const ref = s.origin?.ref;
+    if (ref) {
+      if (datasetPart && ref.source === datasetPart && ref.id === idPart) return true;
+      if (ref.id === key || ref.id === idPart) return true;
+    }
+    return false;
+  });
+}
+
+describe('citeResolver DATASET:ID matching', () => {
+  const sources: SourceLike[] = [
+    { id: null, origin: { ref: { source: 'IEV', id: '845-01-01' }, link: 'https://electropedia.org/...' } },
+    { id: '845-01-01', origin: { ref: { source: 'IEV', id: '845-01-01' }, link: 'https://electropedia.org/...' } },
+    { id: '702-02-07', origin: { ref: { source: 'IEV', id: '702-02-07' }, link: 'https://electropedia.org/...' } },
+    { id: null, origin: { ref: { source: 'CIE S 017:2011', id: '17-370' } } },
+  ];
+
+  it('matches cite:IEV:845-01-01 via origin.ref', () => {
+    const s = findSource('IEV:845-01-01', sources);
+    expect(s).toBeDefined();
+    expect(s!.origin!.ref!.id).toBe('845-01-01');
+  });
+
+  it('matches cite:IEV:702-02-07 via source id', () => {
+    const s = findSource('IEV:702-02-07', sources);
+    expect(s).toBeDefined();
+    expect(s!.id).toBe('702-02-07');
+  });
+
+  it('matches cite:845-01-01 (bare ID without dataset prefix)', () => {
+    const s = findSource('845-01-01', sources);
+    expect(s).toBeDefined();
+  });
+
+  it('matches cite with CIE dataset prefix', () => {
+    const s = findSource('CIE S 017:2011:17-370', sources);
+    expect(s).toBeDefined();
+    expect(s!.origin!.ref!.id).toBe('17-370');
+  });
+
+  it('returns undefined for unknown source', () => {
+    const s = findSource('UNKNOWN:999', sources);
+    expect(s).toBeUndefined();
+  });
+});

package/src/composables/use-render-options.ts

@@ -65,7 +65,24 @@ export function useRenderOptions(
       return `<span class="cite-ref">${escapeHtml(label ?? key)}</span>`;
     }
 
-    const source = sources.find(s => s.id === key);
+    // Parse DATASET:ID format. {{cite:IEV:702-02-07}} → dataset="IEV", idPart="702-02-07"
+    // Match against: raw id, id part, or origin.ref { source: dataset, id: idPart }
+    const lastColon = key.lastIndexOf(':');
+    const idPart = lastColon > 0 ? key.slice(lastColon + 1) : key;
+    const datasetPart = lastColon > 0 ? key.slice(0, lastColon) : '';
+
+    const source = sources.find(s => {
+      // Match by source id (raw or id part)
+      if (s.id === key || s.id === idPart) return true;
+      // Match by origin.ref
+      const ref = s.origin?.ref;
+      if (ref) {
+        if (datasetPart && ref.source === datasetPart && ref.id === idPart) return true;
+        if (ref.id === key || ref.id === idPart) return true;
+      }
+      return false;
+    });
+
     if (!source?.origin) {
       return `<span class="cite-unresolved">${escapeHtml(label ?? key)}</span>`;
     }