fhirsmith 0.14.2 → 0.15.0

package/tx/vs/vs-package.js

@@ -6,6 +6,7 @@ const { ValueSetDatabase } = require('./vs-database');
 const { checkContained } = require('../library/canonical-resource');
 const { VersionUtilities } = require('../../library/version-utilities');
 const {validateParameter} = require("../../library/utilities");
+const { applyIdPrefix, stripIdPrefix } = require('../library/resource-ids');
 
 /**
  * Package-based ValueSet provider using shared database layer
@@ -78,6 +79,8 @@ class PackageValueSetProvider extends AbstractValueSetProvider {
         Object.defineProperty(vs, 'isCached', { value: true, enumerable: false, configurable: true, writable: true });
       }
     }
+    // nothing, unless the spaceId was assigned before the provider was initialized
+    this.#applyIdPrefix();
     this.initialized = true;
   }
 
@@ -212,7 +215,9 @@ class PackageValueSetProvider extends AbstractValueSetProvider {
     this._validateSearchParams(searchParams);
 
     if (this.USE_DATABASE_SEARCH) {
-      return await this.database.search(this.spaceId, this.valueSetMap, searchParams, elements);
+      const results = await this.database.search(this.spaceId, this.valueSetMap, searchParams, elements);
+      return this.#excludedIds.size === 0 ? results
+        : results.filter(r => !this.#excludedIds.has(stripIdPrefix((r.jsonObj || r).id, this.spaceId)));
     } else {
       const matches = [];
       const seen = new Set(); // Track by URL to avoid duplicates from versioned keys
@@ -398,38 +403,19 @@ class PackageValueSetProvider extends AbstractValueSetProvider {
   }
 
   async fetchValueSetById(id) {
-    return this.valueSetMap.get(id);
+    // the map is keyed by the value set's own id (and its url); the value set itself
+    // carries the prefixed id, which is how a url key that happens to match is excluded
+    const vs = this.valueSetMap.get(stripIdPrefix(id, this.spaceId));
+    return vs && vs.id === id ? vs : null;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  assignIds(ids) {
-    if (!this.spaceId) {
-      return;
-    }
-
-    const prefix = this.spaceId + '-';
-    const alreadyPrefixed = new Set();
-
-    // Get all current entries - we'll iterate and modify
-    const entries = Array.from(this.valueSetMap.entries());
-
-    // eslint-disable-next-line no-unused-vars
-    for (const [key, vs] of entries) {
-      // Skip if we've already processed this ValueSet instance
-      if (alreadyPrefixed.has(vs)) {
-        continue;
-      }
-
-      // Update the id on the ValueSet itself
-      if (vs.id && !vs.id.startsWith(prefix)) {
-        const oldId = vs.id;
-        vs.id = prefix + oldId;
-
-        // Add to map under the new id as well
-        this.valueSetMap.set(vs.id, vs);
-      }
+  prefixIds() {
+    this.#applyIdPrefix();
+  }
 
-      alreadyPrefixed.add(vs);
+  #applyIdPrefix() {
+    for (const vs of new Set(this.valueSetMap.values())) {
+      applyIdPrefix(vs, this.spaceId);
     }
   }
 
@@ -438,7 +424,38 @@ class PackageValueSetProvider extends AbstractValueSetProvider {
   }
 
   async listAllValueSets() {
-    return await this.database.listAllValueSets();
+    const urls = await this.database.listAllValueSets();
+    return this.#excludedUrls.size === 0 ? urls : urls.filter(url => !this.#excludedUrls.has(url));
+  }
+
+  // the value sets left out by excludeUrls - by url, and by their own (unprefixed) id
+  #excludedUrls = new Set();
+  #excludedIds = new Set();
+
+  /**
+   * Leave out the value sets with any of these urls: they can't be fetched, and they aren't
+   * found by search. The FHIR core package's value sets are left out where hl7.terminology
+   * provides the same url (see Provider.applyTHOPrecedence). Must be called once the
+   * provider is initialized - the database is shared, so it isn't changed.
+   *
+   * @param {Set<string>} urls
+   */
+  excludeUrls(urls) {
+    const excluded = new Set();
+    for (const vs of this.valueSetMap.values()) {
+      if (vs && urls.has(vs.url)) {
+        excluded.add(vs);
+      }
+    }
+    for (const [key, vs] of [...this.valueSetMap]) {
+      if (excluded.has(vs)) {
+        this.valueSetMap.delete(key);
+      }
+    }
+    for (const vs of excluded) {
+      this.#excludedUrls.add(vs.url);
+      this.#excludedIds.add(stripIdPrefix(vs.id, this.spaceId) ?? vs.id);
+    }
   }
 }
 

package/tx/vs/vs-vsac.js

@@ -6,6 +6,7 @@ const { ValueSetDatabase } = require('./vs-database');
 const { VersionUtilities } = require('../../library/version-utilities');
 const folders = require('../../library/folder-setup');
 const {debugLog} = require("../operation-context");
+const { applyIdPrefix, stripIdPrefix } = require("../library/resource-ids");
 
 // Persisted watermark for the phase-1b _lastUpdated scan.
 const VSAC_LAST_UPDATED_KEY = 'vsac_last_updated_date';
@@ -422,6 +423,10 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
         }
       }
     }
+    // the value sets are served in this provider's id space
+    for (const vs of new Set(newMap.values())) {
+      applyIdPrefix(vs, this.spaceId);
+    }
     // Atomic replacement of the map
     this.valueSetMap = newMap;
   }
@@ -466,7 +471,10 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
   }
 
   async fetchValueSetById(id) {
-    return await this.checkFullVS(this.valueSetMap.get(id));
+    // the map is keyed by the value set's own id (and its url); the value set itself
+    // carries the prefixed id, which is how a url key that happens to match is excluded
+    const vs = this.valueSetMap.get(stripIdPrefix(id, this.spaceId));
+    return vs && vs.id === id ? await this.checkFullVS(vs) : null;
   }
   /**
    * Searches for value sets based on criteria
@@ -556,9 +564,16 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
     await this.database.close();
   }
 
-  // eslint-disable-next-line no-unused-vars
-  assignIds(ids) {
-    // nothing?
+  prefixIds() {
+    this.#applyIdPrefix();
+  }
+
+  // the map is replaced every time it's reloaded from the database (see _reloadMap), and that
+  // can happen before or after the spaceId is assigned - so both prefix whatever is there
+  #applyIdPrefix() {
+    for (const vs of new Set(this.valueSetMap.values())) {
+      applyIdPrefix(vs, this.spaceId);
+    }
   }
 
   // when we get a valueset from vsac via search, the compose is not
@@ -898,7 +913,7 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
         html += `<tr>`;
         html += `<td>${escape(timeOnly(row.ts))}</td>`;
         html += `<td><span style="color:${colour}">${label}</span></td>`;
-        html += `<td>${escape(this.urlTail(row.url) || '')} v <a href="../ValueSet/${escape(this.urlTail(row.url) || '')}-${escape(row.version || '')}">${escape(row.version || '')}</a></td>`;
+        html += `<td>${escape(this.urlTail(row.url) || '')} v <a href="../ValueSet/${escape(this.spaceId ? this.spaceId + '-' : '')}${escape(this.urlTail(row.url) || '')}-${escape(row.version || '')}">${escape(row.version || '')}</a></td>`;
         html += `</tr>`;
       }
     }

package/tx/workers/metadata.js

@@ -202,7 +202,8 @@ class MetadataHandler {
       software: {
         name: this.config.softwareName || 'FHIR Terminology Server',
         version: serverVersion,
-        releaseDate: this.config.releaseDate || now
+        // only when it's known - this used to fall back to the time of the request
+        ...(this.config.releaseDate ? { releaseDate: this.config.releaseDate } : {})
       },
       implementation: {
         description: `FHIR Server running at ${baseUrl}`,

package/tx/workers/read.js

@@ -61,21 +61,6 @@ class ReadWorker extends TerminologyWorker {
     }
   }
 
-  /**
-   * The resource as served at [type]/[id] must carry that id. Providers that
-   * share the server with others prefix their ids with a space id ("1-foo") but
-   * may keep the resource itself under its original id ("foo") - package
-   * ConceptMaps do - and then the HTML tabs, which link to [type]/[resource.id],
-   * point at a resource that doesn't exist (issue #256). Copy rather than
-   * mutate: the provider's object is shared and keyed on its original id.
-   */
-  withId(json, id) {
-    if (!json || json.id === id) {
-      return json;
-    }
-    return { ...json, id: id };
-  }
-
   /**
    * Handle CodeSystem read
    */
@@ -83,7 +68,7 @@ class ReadWorker extends TerminologyWorker {
     let cs = this.provider.getCodeSystemById(this.opContext, id);
     if (cs != null) {
       req.sourcePackage = cs.sourcePackage;
-      return res.json(this.withId(cs.jsonObj, id));
+      return res.json(cs.jsonObj);
     }
 
     if (id.startsWith("x-")) {
@@ -142,7 +127,7 @@ class ReadWorker extends TerminologyWorker {
       const vs = await vsp.fetchValueSetById(id);
       if (vs) {
         req.sourcePackage = vs.sourcePackage;
-        return res.json(this.withId(vs.jsonObj, id));
+        return res.json(vs.jsonObj);
       }
     }
 
@@ -158,7 +143,7 @@ class ReadWorker extends TerminologyWorker {
       const cm = await cmsp.fetchConceptMapById(id);
       if (cm) {
         req.sourcePackage = cm.sourcePackage;
-        return res.json(this.withId(cm.jsonObj, id));
+        return res.json(cm.jsonObj);
       }
     }