fhirsmith 0.10.0 → 0.10.1

package/CHANGELOG.md

@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [v0.10.1] - 2026-06-27
+
+### Fixed
+
+- Terminology: the version-less value set lookup now resolves to the latest version when several versions of the same value set are present (e.g. VSAC date versions), instead of an arbitrary one determined by database row order
+- Rendering: fixed value set links in `renderLinkComma` (read the resolver's `description`/`link` fields and fall back to the raw URI)
+
+### Tx Conformance Statement
+
+FHIRsmith passed all 2503 HL7 terminology service tests (modes tx.fhir.org+omop+general+snomed, tests v1.9.1, runner v6.9.11)
+
 ## [v0.10.0] - 2026-06-27
 
 ### Added
@@ -35,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Tx Conformance Statement
 
-FHIRsmith passed all 2503 HL7 terminology service tests (modes tx.fhir.org+omop+general+snomed, tests v1.9.1, runner v6.9.11
+FHIRsmith passed all 2503 HL7 terminology service tests (modes tx.fhir.org+omop+general+snomed, tests v1.9.1, runner v6.9.11)
 
 ## [v0.9.7] - 2026-06-12
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhirsmith",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "txVersion": "1.9.1",
   "description": "A Node.js server that provides a collection of tools to serve the FHIR ecosystem",
   "main": "server.js",

package/tx/library/renderer.js

@@ -340,12 +340,12 @@ class Renderer {
     }
   }
 
-  renderLinkComma(x, uri) {
-    let {desc, url} = (this.linkResolver ? this.linkResolver.resolveURL(this.opContext, uri) : null) || {};
-    if (url) {
-      x.commaItem(desc, url);
+  async renderLinkComma(x, uri) {
+    let {description, link} = await (this.linkResolver ? this.linkResolver.resolveURL(this.opContext, uri) : null) || {};
+    if (link) {
+      x.commaItem(description, link);
     } else {
-      x.commaItem(uri);
+      x.commaItem(link);
     }
   }
 
@@ -673,7 +673,7 @@ class Renderer {
       p.tx(" ");
       p.startCommaList("and");
       for (let ext of supplements) {
-        this.renderLinkComma(p, getValuePrimitive(ext));
+        await this.renderLinkComma(p, getValuePrimitive(ext));
       }
       p.stopCommaList();
       p.tx(".");
@@ -762,10 +762,10 @@ class Renderer {
         li.stopCommaList();
       }
     } else if (inc.valueSet && inc.valueSet.length > 0) {
-      li.tx(this.translatePlural(inc.valueSet.length, 'VALUE_SET_RULES_INC'));
+      li.tx(this.translatePlural(inc.valueSet.length, 'VALUE_SET_IMPORT')+" ");
       li.startCommaList("and");
       for (let vs of inc.valueSet) {
-        this.renderLinkComma(li, vs);
+        await this.renderLinkComma(li, vs);
       }
       li.stopCommaList();
     } else {

package/tx/provider.js

@@ -231,8 +231,8 @@ class Provider {
         return vs;
       }
     }
-    let vs = await this.findKnownValueSet(url, version);
-    return vs;
+    let vs1 = await this.findKnownValueSet(url, version);
+    return vs1;
   }
 
   async getConceptMapById(opContext, id) {
@@ -381,7 +381,7 @@ class Provider {
     if (vs) {
       return {
         link: this.path+"/ValueSet/"+vs.id,
-        description: (vs.title ? vs.title : vs.name)+(version ? " v"+version : "")
+        description: (vs.title ? vs.title : vs.name)+(version ? " v"+version : vs.version ?  " v"+vs.version : "")
       };
     }
     let cm = await this.findConceptMap(opContext, system, version);

package/tx/vs/vs-database.js

@@ -7,6 +7,30 @@ const ValueSet = require("../library/valueset");
 // Columns that can be returned directly without parsing JSON
 const INDEXED_COLUMNS = ['id', 'url', 'version', 'date', 'description', 'name', 'publisher', 'status', 'title'];
 
+/**
+ * Is `candidate` a newer version than `current`? Used to keep the version-less
+ * (bare-url) and url|major.minor map keys pointing at the latest version when several
+ * versions of the same value set are present. Handles both semver (IG/package value
+ * sets) and VSAC-style YYYYMMDD date versions (not semver, but fixed-width so they
+ * order correctly numerically).
+ * @param {string|null|undefined} candidate
+ * @param {string|null|undefined} current
+ * @returns {boolean}
+ */
+function isNewerVersion(candidate, current) {
+  if (current == null) return true;
+  if (candidate == null) return false;
+  if (candidate === current) return false;
+  if (VersionUtilities.isSemVer(candidate) && VersionUtilities.isSemVer(current)) {
+    return VersionUtilities.isThisOrLater(current, candidate); // candidate >= current (semver-aware)
+  }
+  if (/^\d+$/.test(candidate) && /^\d+$/.test(current)) {
+    // e.g. VSAC YYYYMMDD - compare numerically (handles differing widths too)
+    return Number(candidate) > Number(current);
+  }
+  return candidate > current; // best-effort lexical fallback
+}
+
 /**
  * Shared database layer for ValueSet providers
  * Handles SQLite operations for indexing and searching ValueSets
@@ -737,21 +761,22 @@ class ValueSetDatabase {
   }
 
   addToMap(valueSetMap, id, url, version, valueSet) {
-    valueSetMap.set(url, valueSet);
-    valueSetMap.set(id, valueSet);
+    // The bare-url key must resolve to the *latest* version, but rows arrive in no
+    // particular order (and several versions of the same url coexist - e.g. VSAC, where
+    // each date-version is its own row). So only overwrite it when this version is newer.
+    this._setIfNewer(valueSetMap, url, version, valueSet);
+    valueSetMap.set(id, valueSet); // id is unique per version
 
     if (version) {
-      // Store by url|version
-      const versionKey = `${url}|${version}`;
-      valueSetMap.set(versionKey, valueSet);
+      // Store by url|version (exact - unique per version, always set)
+      valueSetMap.set(`${url}|${version}`, valueSet);
 
-      // If version is semver, also store by url|major.minor
+      // If version is semver, also store by url|major.minor, keeping the latest patch
       try {
         if (VersionUtilities.isSemVer(version)) {
           const majorMinor = VersionUtilities.getMajMin(version);
           if (majorMinor) {
-            const majorMinorKey = `${url}|${majorMinor}`;
-            valueSetMap.set(majorMinorKey, valueSet);
+            this._setIfNewer(valueSetMap, `${url}|${majorMinor}`, version, valueSet);
           }
         }
       } catch (error) {
@@ -760,6 +785,14 @@ class ValueSetDatabase {
     }
   }
 
+  // Set map[key] = valueSet only if `version` is newer than the version already there.
+  _setIfNewer(valueSetMap, key, version, valueSet) {
+    const existing = valueSetMap.get(key);
+    if (!existing || isNewerVersion(version, existing.version)) {
+      valueSetMap.set(key, valueSet);
+    }
+  }
+
   /**
    * Search for ValueSets based on criteria
    * @param {Array<{name: string, value: string}>} searchParams - Search criteria

package/tx/vs/vs-package.js

@@ -26,6 +26,9 @@ class PackageValueSetProvider extends AbstractValueSetProvider {
     this.sourcePackageCode = packageLoader.id();
   }
 
+  code() {
+    return this.sourcePackageCode;
+  }
   sourcePackage() {
     return this.sourcePackageCode;
   }

package/tx/vs/vs-vsac.js

@@ -66,6 +66,10 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
     });
   }
 
+  code() {
+    return "vsac";
+  }
+
   sourcePackage() {
     return "vsac";
   }