fhirsmith 0.14.2 → 0.15.1

package/tx/ocl/vs-ocl.cjs

@@ -114,6 +114,7 @@ class OCLValueSetProvider extends AbstractValueSetProvider {
             id: cached.canonicalUrl
           }, 'R5');
           this.#applyCachedCompose(valueSetObj, paramsKey);
+          this.#prefixId(valueSetObj);
           // Indexa o ValueSet restaurado para torná-lo disponível via fetchValueSet
           this.valueSetMap.set(valueSetObj.url, valueSetObj);
           if (valueSetObj.version) {
@@ -224,7 +225,7 @@ class OCLValueSetProvider extends AbstractValueSetProvider {
     }
   }
 
-  assignIds(ids) {
+  prefixIds() {
     if (!this.spaceId) {
       return;
     }
@@ -233,13 +234,18 @@ class OCLValueSetProvider extends AbstractValueSetProvider {
     this._idMap.clear();
 
     for (const vs of unique) {
-      if (!vs.id.startsWith(`${this.spaceId}-`)) {
-        const nextId = `${this.spaceId}-${vs.id}`;
-        vs.id = nextId;
-        vs.jsonObj.id = nextId;
-      }
+      this.#prefixId(vs);
       this._idMap.set(vs.id, vs);
-      ids.add(`ValueSet/${vs.id}`);
+    }
+  }
+
+  // value sets are served in this provider's id space - including the ones that arrive
+  // after the spaceId is assigned
+  #prefixId(vs) {
+    if (this.spaceId && vs.id && !vs.id.startsWith(`${this.spaceId}-`)) {
+      const nextId = `${this.spaceId}-${vs.id}`;
+      vs.id = nextId;
+      vs.jsonObj.id = nextId;
     }
   }
 
@@ -345,16 +351,9 @@ class OCLValueSetProvider extends AbstractValueSetProvider {
   }
 
   #getLocalValueSetById(id) {
-    if (this._idMap.has(id)) {
-      return this._idMap.get(id);
-    }
-
-    if (this.spaceId && id.startsWith(`${this.spaceId}-`)) {
-      const unprefixed = id.substring(this.spaceId.length + 1);
-      return this._idMap.get(id) || this._idMap.get(unprefixed) || this.valueSetMap.get(unprefixed) || null;
-    }
-
-    return this._idMap.get(id) || this.valueSetMap.get(id) || null;
+    // _idMap is keyed by the ids the value sets are served with - prefixed, once the
+    // spaceId is assigned
+    return this._idMap.get(id) || null;
   }
 
   // eslint-disable-next-line no-unused-vars
@@ -391,6 +390,7 @@ class OCLValueSetProvider extends AbstractValueSetProvider {
   }
 
   #indexValueSet(vs) {
+    this.#prefixId(vs);
     const existing = this.valueSetMap.get(vs.url) || null;
 
     // When fresh discovery metadata replaces a cold-cached entry, carry over

package/tx/provider.js

@@ -9,6 +9,7 @@ const {PackageContentLoader} = require("../library/package-manager");
 const {PackageValueSetProvider} = require("./vs/vs-package");
 const ValueSet = require("./library/valueset");
 const {PackageConceptMapProvider} = require("./cm/cm-package");
+const { applyIdPrefix, CORE_PREFIX } = require("./library/resource-ids");
 
 /**
  * This class holds what information is in context
@@ -153,6 +154,12 @@ class Provider {
   }
 
 
+  /**
+   * Load the FHIR core package for this endpoint. Its resources are served in the 'core' id
+   * space (CodeSystem/core-v3-MaritalStatus): the core packages for different FHIR versions
+   * share ids, and so does other content (hl7.terminology), so no endpoint can serve them on
+   * their own ids (see tx/library/resource-ids.js)
+   */
   async loadNpm(packageManager, cacheFolder,  details, isDefault, mode) {
     // Parse packageId and version from details (e.g., "hl7.terminology.r4#6.0.2")
     let packageId = details;
@@ -171,6 +178,9 @@ class Provider {
     await contentLoader.initialize();
 
     const resources = await contentLoader.getResourcesByType("CodeSystem");
+    let i = 0;
+    // the index has the urls as they are in the package; the version is taken out of the url
+    // when the code system is loaded (see normalizeVersionedCanonicals in package-manager.js)
     for (const resource of resources) {
       let cs;
       try {
@@ -183,13 +193,24 @@ class Provider {
         continue;
       }
       cs.sourcePackage = contentLoader.pid();
+      if (typeof resource.url === 'string' && resource.url.includes('|')) {
+        cs.urlHadVersion = true; // see addCodeSystem
+      }
+      // these objects belong to this endpoint, so they can be given ids here
+      i++;
+      if (!cs.id) {
+        cs.id = String(i);
+      }
+      applyIdPrefix(cs, CORE_PREFIX);
       this.addCodeSystem(cs);
     }
     const vs = new PackageValueSetProvider(contentLoader);
     await vs.initialize();
+    vs.assignIds(CORE_PREFIX);
     this.valueSetProviders.push(vs);
     const cm = new PackageConceptMapProvider(contentLoader);
     await cm.initialize();
+    cm.assignIds(CORE_PREFIX);
     this.conceptMapProviders.push(cm);
   }
 
@@ -582,27 +603,38 @@ class Provider {
     return pid != null && pid.startsWith("hl7.terminology");
   }
 
+  /**
+   * Add a code system to the ones this endpoint knows, by url and by url|version.
+   *
+   * THO precedence, as in CanonicalResourceManager.see() in the Java core: content that
+   * moved from the FHIR core packages to terminology.hl7.org has been QA'd there since, and
+   * its versions went backwards (coverage-selfpay is 4.0.1 in hl7.fhir.r4.core but 1.0.1 in
+   * hl7.terminology), so version precedence can't decide between them. Instead, a code system
+   * from an hl7.terminology package replaces every code system with the same url from a FHIR
+   * core package - none of the core versions stay available.
+   *
+   * Except: hl7.fhir.r4.core has the v2 tables 0006, 0360 and 0391 in two versions each,
+   * with the version in the url (http://terminology.hl7.org/CodeSystem/v2-0006|2.1 - see
+   * urlHadVersion in loadNpm). hl7.terminology doesn't publish those versions, so they stay
+   * available by url|version; THO's code system is the default for the url.
+   */
   addCodeSystem(cs) {
-    // Special case, mirroring CanonicalResourceManager.see() in the Java core:
-    // when content moved from the FHIR core packages to terminology.hl7.org,
-    // the versions went backwards (e.g. coverage-selfpay is 4.0.1 in
-    // hl7.fhir.r4.core (2019) but 1.0.1 in hl7.terminology (2024)), so plain
-    // version precedence would leave the stale core copy as the default. A
-    // resource from an hl7.terminology package displaces any same-URL
-    // resource that came from a FHIR core package, regardless of version.
     if (Provider.#isTHOPackage(cs.sourcePackage)) {
       for (const [key, t] of [...this.codeSystems]) {
-        // only the bare-url (default) entry is displaced; explicitly versioned
-        // entries (key = url|version) stay addressable, because the core packages
-        // carry historical versions (e.g. the normalized R4 v2 tables 0006/0360/0391
-        // at 2.1/2.3.1/2.4/2.6/2.7) that hl7.terminology does not publish at all
-        if (key === t.url && t.url === cs.url && VersionUtilities.isCorePackage(t.sourcePackage)) {
+        if (t.url === cs.url && VersionUtilities.isCorePackage(t.sourcePackage)
+          && (key === t.url || !t.urlHadVersion)) {
           this.codeSystems.delete(key);
         }
       }
+    } else if (VersionUtilities.isCorePackage(cs.sourcePackage) && !cs.urlHadVersion) {
+      // THO's code system is always the default for its url
+      const t = this.codeSystems.get(cs.url);
+      if (t && Provider.#isTHOPackage(t.sourcePackage)) {
+        return;
+      }
     }
     const existing = this.codeSystems.get(cs.url);
-    // the reverse guard: a core-package resource never displaces a THO one
+    // a core-package resource never displaces a THO one as the default
     const yieldsToTHO = existing && Provider.#isTHOPackage(existing.sourcePackage)
       && VersionUtilities.isCorePackage(cs.sourcePackage);
     if (!existing || (!yieldsToTHO && cs.isMoreRecent(existing))) {
@@ -619,6 +651,41 @@ class Provider {
     }
   }
 
+  /**
+   * THO precedence for value sets and concept maps, as for code systems (see addCodeSystem):
+   * once the library's providers have been added after this endpoint's core package, the core
+   * package's value sets and concept maps whose urls an hl7.terminology package also provides
+   * are left out. (No core value set or concept map has the version in its url.)
+   */
+  applyTHOPrecedence() {
+    const thoValueSets = new Set();
+    for (const vp of this.valueSetProviders) {
+      if (vp instanceof PackageValueSetProvider && Provider.#isTHOPackage(vp.sourcePackage())) {
+        for (const vs of vp.valueSetMap.values()) {
+          thoValueSets.add(vs.url);
+        }
+      }
+    }
+    const thoConceptMaps = new Set();
+    for (const cmp of this.conceptMapProviders) {
+      if (cmp instanceof PackageConceptMapProvider && Provider.#isTHOPackage(cmp.sourcePackage())) {
+        for (const cm of cmp.conceptMapMap.values()) {
+          thoConceptMaps.add(cm.url);
+        }
+      }
+    }
+    for (const vp of this.valueSetProviders) {
+      if (vp instanceof PackageValueSetProvider && VersionUtilities.isCorePackage(vp.sourcePackage())) {
+        vp.excludeUrls(thoValueSets);
+      }
+    }
+    for (const cmp of this.conceptMapProviders) {
+      if (cmp instanceof PackageConceptMapProvider && VersionUtilities.isCorePackage(cmp.sourcePackage())) {
+        cmp.excludeUrls(thoConceptMaps);
+      }
+    }
+  }
+
   deleteCodeSystem(cs) {
     this.codeSystems.delete(cs.vurl);
     this.codeSystems.delete(cs.url);

package/tx/tx.fhir.org.yml

@@ -1,6 +1,14 @@
 base:
   url: https://storage.googleapis.com/tx-fhir-org
 
+# Each source is type[!]:details[=prefix] - see tx/README.md.
+#
+# The prefix (after the last '=') is the id space for the resources the source provides:
+# with npm:hl7.terminology=tho, THO's v3-ActCode is CodeSystem/tho-v3-ActCode. Every
+# resource is served with a prefixed id - never the id it has in its source, which other
+# sources may share - and each endpoint's own FHIR core package uses 'core'. A source with
+# no prefix gets a number, which changes when sources are added, removed or reordered, so
+# any source whose resources people link to by id should have one.
 sources:
   - internal:lang
   - internal:country
@@ -29,15 +37,15 @@ sources:
   - snomed:sct_test_20250909b.cache
   - cpt:CodeSystem-cpt.db|cpt-2023-fragment-0.1.db
   - omop:omop_v20250227.db
-  - npm:hl7.terminology
-  - npm:fhir.tx.support
-  - npm:ihe.formatcode.fhir
-  - npm:fhir.dicom
-  - npm:hl7.fhir.us.core
-  - npm:us.cdc.phinvads
-  - npm:hl7.fhir.uv.sdc
-  - internal:vsac
-  - icd11:icd11-2026-01.db
+  - npm:hl7.terminology=tho
+  - npm:fhir.tx.support=tx
+  - npm:ihe.formatcode.fhir=ihe
+  - npm:fhir.dicom=dicom
+  - npm:hl7.fhir.us.core=us
+  - npm:us.cdc.phinvads=cdc
+  - npm:hl7.fhir.uv.sdc=sdc
+  - internal:vsac=vsac
+  - icd11:icd11-2026-01-b.db
 
 ignored:
   - urn:iso:std:iso:3166#20210120

package/tx/tx.js

@@ -5,6 +5,10 @@
 // with support for multiple endpoints at different FHIR versions.
 //
 
+const { reportedReleaseDate } = require('../library/changelog');
+
+// when this server process started (the release date of a snapshot build)
+const SERVER_STARTED = new Date(Date.now() - process.uptime() * 1000);
 const express = require('express');
 const path = require('path');
 const fs = require('fs');
@@ -223,7 +227,9 @@ class TXModule {
       description: config.description || 'FHIR Terminology Server',
       contactUrl: config.contactUrl,
       contact: config.contact,
-      releaseDate: config.releaseDate,
+      // when this version was released, from its CHANGELOG.md heading - or, for a snapshot,
+      // when the server started
+      releaseDate: config.releaseDate || reportedReleaseDate(packageJson.version, SERVER_STARTED),
       host: config.host ? config.host : "localhost"
     });
 

package/tx/vs/vs-api.js

@@ -1,10 +1,14 @@
+const { assignIdSpace } = require('../library/resource-ids');
+
 /**
  * Abstract base class for value set providers
  * Defines the interface that all value set providers must implement
  */
 class AbstractValueSetProvider {
   /**
-   * {int} Unique number assigned to this provider
+   * {string} The prefix of this provider's id space (set by assignIds) - given for its source in the library
+   * YAML, autonumbered, or 'core' for an endpoint's core package. Every value set this
+   * provider provides has an id that starts with spaceId + '-' (see tx/library/resource-ids.js)
    */
   spaceId;
 
@@ -12,14 +16,25 @@ class AbstractValueSetProvider {
     throw new Error('code must be implemented by AbstractValueSetProvider subclass');
   }
   /**
-   * ensure that the ids on the value sets are unique, if they are
-   * in the global namespace
+   * Put this provider in an id space: set spaceId, and prefix the ids of the value sets it
+   * provides with spaceId + '-'. A provider is put in one id space, once - asking for a
+   * different one later is an error (see assignIdSpace)
    *
-   * @param {Set<String>} ids
+   * @param {string} spaceId
    */
-  // eslint-disable-next-line no-unused-vars
-  assignIds(ids) {
-    throw new Error('assignIds must be implemented by AbstractValueSetProvider subclass');
+  assignIds(spaceId) {
+    if (assignIdSpace(this, spaceId)) {
+      this.prefixIds();
+    }
+  }
+
+  /**
+   * Prefix the ids of the value sets this provider provides with spaceId + '-', once spaceId
+   * is set (by assignIds). Value sets the provider loads later must be given ids
+   * in the same space.
+   */
+  prefixIds() {
+    throw new Error('prefixIds must be implemented by AbstractValueSetProvider subclass');
   }
 
   /**
@@ -35,11 +50,11 @@ class AbstractValueSetProvider {
   }
 
   /**
-   * Fetches a specific value set by id. ValueSet providers must enforce that value set ids are unique
-   * either globally (as enforced by assignIds) or in their space
+   * Fetches a specific value set by id. The id is in this provider's space (spaceId + '-' + the
+   * value set's own id); an id that isn't - including an unprefixed one - finds nothing
    *
    * @param {string} id - The id of the value set
-   * @returns {Promise<ValueSet>} The requested value set
+   * @returns {Promise<ValueSet>} The requested value set, or null
    * @throws {Error} Must be implemented by subclasses
    */
   // eslint-disable-next-line no-unused-vars

package/tx/vs/vs-database.js

@@ -1114,10 +1114,6 @@ class ValueSetDatabase {
     return { query, params };
   }
 
-  // eslint-disable-next-line no-unused-vars
-  assignIds(ids) {
-    // nothing - we don't do any assigning.
-  }
 
   /**
    * Get a list of all ValueSet URLs in the database

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/lookup.js

@@ -7,7 +7,7 @@
 // POST /CodeSystem/{id}/$lookup
 //
 
-const { TerminologyWorker } = require('./worker');
+const { TerminologyWorker, Unknown_Code_in_VersionSCT, SCTVersion } = require('./worker');
 const { FhirCodeSystemProvider } = require('../cs/cs-cs');
 const { Designations} = require("../library/designations");
 const {TxParameters} = require("../params");
@@ -251,13 +251,16 @@ class LookupWorker extends TerminologyWorker {
     const locateResult = await csProvider.locate(code);
 
     if (!locateResult || !locateResult.context) {
-      let message = `Unable to find code '${code}' in ${csProvider.system()} version ${csProvider.version() || 'unknown'}`
+      const system = csProvider.system();
+      const version = csProvider.version();
+      const msgId = Unknown_Code_in_VersionSCT(system, version);
+      let message = this.i18n.translate(msgId, params.HTTPLanguages, [code, system, version, SCTVersion(system, version)]);
       if (locateResult?.message) {
         message += ' ('+locateResult.message+')';
       }
       // invalid-code, not not-found: the code system was found, the code in it was not.
       // not-found is for a code system or value set that could not be resolved at all.
-      throw new Issue('error', 'not-found', null, null, message, 'invalid-code', 404);
+      throw new Issue('error', 'not-found', null, msgId, message, 'invalid-code', 404);
     }
 
     const ctxt = locateResult.context;
@@ -268,7 +271,7 @@ class LookupWorker extends TerminologyWorker {
     // name (required)
     responseParams.push({
       name: 'name',
-      valueString: csProvider.name()
+      valueString: csProvider.name(params.workingLanguages())
     });
     responseParams.push({
       name: 'code',

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);
       }
     }