@glossarist/concept-browser 0.7.125 → 0.7.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glossarist/concept-browser",
-  "version": "0.7.125",
+  "version": "0.7.127",
   "description": "Vue SPA for browsing Glossarist terminology datasets with cross-reference resolution, graph visualization, and multi-language support",
   "type": "module",
   "bin": {

package/scripts/generate-data.js

@@ -1179,9 +1179,10 @@ function extractInlineRefs(localizedData, refMaps2, conceptSources = []) {
       if (seg.kind === "concept" || seg.kind === "cite") {
         const target = seg.target;
         if (target.type === "dataset_qualified" && target.dataset && target.id) {
-          const dsId = refMaps2.refPrefixMap[target.dataset] || target.dataset;
-          const ref = { id: buildConceptUri(refMaps2.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` };
-          refs.push(ref);
+          const dsId = refMaps2.refPrefixMap[target.dataset];
+          if (dsId) {
+            refs.push({ id: buildConceptUri(refMaps2.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` });
+          }
         } else if (target.type === "urn" && target.urn) {
           const pattern = refMaps2.patternIndex.resolve(target.urn);
           if (pattern) {

package/scripts/generate-data.ts

@@ -409,9 +409,15 @@ function extractInlineRefs(localizedData, refMaps, conceptSources = []) {
       if (seg.kind === 'concept' || seg.kind === 'cite') {
         const target = seg.target;
         if (target.type === 'dataset_qualified' && target.dataset && target.id) {
-          const dsId = refMaps.refPrefixMap[target.dataset] || target.dataset;
-          const ref = { id: buildConceptUri(refMaps.uriBase, dsId, target.id), term: seg.label ?? `${target.dataset}:${target.id}` };
-          refs.push(ref);
+          // 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.
+          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) {
           const pattern = refMaps.patternIndex.resolve(target.urn);
           if (pattern) {

package/scripts/validate-links.js

@@ -27,7 +27,7 @@ function checkFile(file, dataDir) {
   const json = JSON.parse(raw);
   const broken = [];
   function check(target, field) {
-    if (!target) return;
+    if (!target || typeof target !== "string") return;
     if (!target.startsWith("http")) return;
     const { exists, expected } = localPathForUri(target, dataDir);
     if (!exists) {
@@ -71,8 +71,22 @@ function checkFile(file, dataDir) {
     }
   }
   const sourceIds = /* @__PURE__ */ new Set();
-  for (const s of json["gl:sources"] ?? []) {
+  const sourceRefKeys = /* @__PURE__ */ new Set();
+  const allSourceArrays = [
+    ...json["gl:sources"] ?? []
+  ];
+  for (const lc of Object.values(json["gl:localizedConcept"] ?? {})) {
+    const lcSources = lc["gl:source"] ?? lc["gl:sources"];
+    if (Array.isArray(lcSources)) allSourceArrays.push(...lcSources);
+  }
+  for (const s of allSourceArrays) {
     if (s["gl:id"]) sourceIds.add(s["gl:id"]);
+    const origin = s["gl:origin"] ?? {};
+    const ref = origin["gl:ref"] ?? {};
+    if (ref["gl:source"] && ref["gl:id"]) {
+      sourceRefKeys.add(`${ref["gl:source"]}:${ref["gl:id"]}`);
+      sourceIds.add(ref["gl:id"]);
+    }
   }
   const textChunks = [];
   for (const lc of Object.values(json["gl:localizedConcept"] ?? {})) {
@@ -149,9 +163,11 @@ function checkFile(file, dataDir) {
     if (citeMatch) {
       const rest = citeMatch[1];
       const commaIdx = rest.indexOf(",");
-      const id = commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim();
-      if (!sourceIds.has(id)) {
-        broken.push({ file: relFile, line: 0, field: "{{cite:...}}", target: id, reason: `source "${id}" not found in this concept's sources[]` });
+      const rawId = commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim();
+      const lastColon = rawId.lastIndexOf(":");
+      const idPart = lastColon > 0 ? rawId.slice(lastColon + 1) : rawId;
+      if (!sourceIds.has(rawId) && !sourceIds.has(idPart) && !sourceRefKeys.has(rawId)) {
+        broken.push({ file: relFile, line: 0, field: "{{cite:...}}", target: rawId, reason: `source "${rawId}" not found in this concept's sources[]` });
       }
       continue;
     }

package/scripts/validate-links.ts

@@ -56,7 +56,7 @@ function checkFile(file: string, dataDir: string): BrokenLink[] {
   const broken: BrokenLink[] = [];
 
   function check(target: string | undefined, field: string) {
-    if (!target) return;
+    if (!target || typeof target !== 'string') return;
     if (!target.startsWith('http')) return; // External links checked separately
     const { exists, expected } = localPathForUri(target, dataDir);
     if (!exists) {
@@ -112,8 +112,23 @@ function checkFile(file: string, dataDir: string): BrokenLink[] {
   }
 
   const sourceIds = new Set<string>();
-  for (const s of json['gl:sources'] ?? []) {
+  const sourceRefKeys = new Set<string>();
+  // Collect from concept-level sources AND localization-level sources
+  const allSourceArrays = [
+    ...(json['gl:sources'] ?? []),
+  ];
+  for (const lc of Object.values(json['gl:localizedConcept'] ?? {})) {
+    const lcSources = (lc as any)['gl:source'] ?? (lc as any)['gl:sources'];
+    if (Array.isArray(lcSources)) allSourceArrays.push(...lcSources);
+  }
+  for (const s of allSourceArrays) {
     if (s['gl:id']) sourceIds.add(s['gl:id']);
+    const origin = s['gl:origin'] ?? {};
+    const ref = origin['gl:ref'] ?? {};
+    if (ref['gl:source'] && ref['gl:id']) {
+      sourceRefKeys.add(`${ref['gl:source']}:${ref['gl:id']}`);
+      sourceIds.add(ref['gl:id']);
+    }
   }
 
   const textChunks: string[] = [];
@@ -190,14 +205,20 @@ function checkFile(file: string, dataDir: string): BrokenLink[] {
       continue;
     }
 
-    // cite:id — source must exist in this concept's sources[]
+    // cite:id — source must exist in this concept's sources[].
+    // Handles DATASET:ID format: {{cite:IEV:702-02-07}} matches a source
+    // with id "702-02-07" or origin.ref { source: "IEV", id: "702-02-07" }.
     const citeMatch = body.match(/^cite:(.+)$/i);
     if (citeMatch) {
       const rest = citeMatch[1];
       const commaIdx = rest.indexOf(',');
-      const id = (commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim());
-      if (!sourceIds.has(id)) {
-        broken.push({ file: relFile, line: 0, field: '{{cite:...}}', target: id, reason: `source "${id}" not found in this concept's sources[]` });
+      const rawId = (commaIdx > 0 ? rest.slice(0, commaIdx).trim() : rest.trim());
+
+      // Check: rawId (e.g. "IEV:702-02-07"), or just the ID part ("702-02-07")
+      const lastColon = rawId.lastIndexOf(':');
+      const idPart = lastColon > 0 ? rawId.slice(lastColon + 1) : rawId;
+      if (!sourceIds.has(rawId) && !sourceIds.has(idPart) && !sourceRefKeys.has(rawId)) {
+        broken.push({ file: relFile, line: 0, field: '{{cite:...}}', target: rawId, reason: `source "${rawId}" not found in this concept's sources[]` });
       }
       continue;
     }