fhirsmith 0.14.1 → 0.15.0

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,14 +37,14 @@ 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
+  - 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.db
 
 ignored:

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');
@@ -54,6 +58,7 @@ const {BundleXML} = require("./xml/bundle-xml");
 const ConceptUsageTracker = require("./usage-tracker");
 const ProblemFinder = require("./problems");
 const { buildOperationOutcome, outcomeFromError } = require('./library/operation-outcome');
+const txOpenApi = require('./openapi');
 // const {writeFileSync} = require("fs");
 
 class TXModule {
@@ -222,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"
     });
 
@@ -521,6 +528,11 @@ class TXModule {
 
     app.use(express.urlencoded({ extended: true }));
 
+    // The OpenAPI description, on the endpoints it describes (R5)
+    if (txOpenApi.describes(fhirVersion)) {
+      this.setupOpenApi(router, endpointInfo);
+    }
+
     // Set up routes
     this.setupRoutes(router, endpointInfo.path);
 
@@ -540,6 +552,55 @@ class TXModule {
     this.log.info(`Endpoint ${endpointPath} registered`);
   }
 
+  /**
+   * The OpenAPI description of an endpoint: /openapi.json, /openapi.yaml, and /openapi (an
+   * HTML reference for browsers, the JSON otherwise), and an RFC 8631 Link header on every
+   * response that points to them. These are sent directly, not through the res.json the
+   * endpoint wraps for FHIR resources.
+   *
+   * @param {express.Router} router
+   * @param {Object} endpointInfo
+   */
+  setupOpenApi(router, endpointInfo) {
+    const doc = txOpenApi.forEndpoint(endpointInfo.path);
+    const sendJson = (res) => res.type('application/json').send(doc.getJson());
+    router.use((req, res, next) => {
+      res.setHeader('Link', `<${req.baseUrl}/openapi.json>; rel="service-desc", <${req.baseUrl}/openapi>; rel="service-doc"`);
+      next();
+    });
+    const count = (start) => this.countRequest(endpointInfo.path, 'openapi', Date.now() - start);
+    router.get('/openapi.json', (req, res) => {
+      const start = Date.now();
+      try {
+        sendJson(res);
+      } finally {
+        count(start);
+      }
+    });
+    router.get('/openapi.yaml', (req, res) => {
+      const start = Date.now();
+      try {
+        res.type('application/yaml').send(doc.getYaml());
+      } finally {
+        count(start);
+      }
+    });
+    router.get('/openapi', async (req, res) => {
+      const start = Date.now();
+      try {
+        if (!txHtml.acceptsHtml(req)) {
+          return sendJson(res);
+        }
+        const txhtml = new TxHtmlRenderer(new Renderer(req.txOpContext, req.txProvider), this.liquid, this.languages, this.i18n, endpointInfo.path);
+        const html = await txhtml.renderPage('API', doc.renderHtml(), endpointInfo, req.txStartTime);
+        res.setHeader('Content-Type', 'text/html');
+        res.send(html);
+      } finally {
+        count(start);
+      }
+    });
+  }
+
   /**
    * Set up routes for an endpoint
    * @param {express.Router} router - Express router

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

@@ -743,7 +743,17 @@ class ValueSetDatabase {
           const valueSetMap = new Map();
 
           for (const row of rows) {
-            const valueSet = new ValueSet(JSON.parse(row.content));
+            let valueSet;
+            try {
+              valueSet = new ValueSet(JSON.parse(row.content));
+            } catch (e) {
+              // one unacceptable value set (e.g. one containing a CodeSystem, which the
+              // server doesn't support) must not take the whole package's value sets with it
+              require('../../library/logger').getInstance().child({ module: 'tx' })
+                .warn(`${source || 'ValueSet database'}: skipping ValueSet ${row.url || row.id}${row.version ? '|' + row.version : ''}: ${e.message}`);
+              this.vsCount--;
+              continue;
+            }
             valueSet.sourcePackage = source;
             // Attach the stored content hash so callers can detect changes
             // without recomputing over the full JSON.
@@ -839,10 +849,9 @@ class ValueSetDatabase {
             });
           } else {
             // Fall back to parsing JSON
-            results = rows.map(row => {
-              const vs = map.get(row.id);
-              return vs;
-            });
+            // a value set the map doesn't have was rejected when the map was loaded
+            // (see loadAllValueSets), so it isn't a result
+            results = rows.map(row => map.get(row.id)).filter(vs => vs);
           }
 
           resolve(results);
@@ -1105,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

@@ -3,8 +3,10 @@ const fs = require('fs').promises;
 const { AbstractValueSetProvider } = require('./vs-api');
 const { PackageContentLoader } = require('../../library/package-manager');
 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
@@ -77,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;
   }
 
@@ -126,6 +130,15 @@ class PackageValueSetProvider extends AbstractValueSetProvider {
     for (const entry of valueSetEntries) {
       const valueSet = await this.packageLoader.loadFile(entry);
       if (valueSet.url) {
+        try {
+          // don't store a value set the server can't use (e.g. one that contains a
+          // CodeSystem): it would be listed by search, and fail when read
+          checkContained(valueSet);
+        } catch (e) {
+          require('../../library/logger').getInstance().child({ module: 'tx' })
+            .warn(`Package ${this.packageLoader.pid ? this.packageLoader.pid() : ''}: skipping ValueSet ${valueSet.url}: ${e.message}`);
+          continue;
+        }
         valueSets.push(valueSet);
       }
     }
@@ -202,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
@@ -388,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);
     }
   }
 
@@ -428,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/expand.js

@@ -620,19 +620,23 @@ class ValueSetExpander {
     return count;
   }
 
+  /**
+   * Exclude the codes of an (expanded) value set. Excludes are processed before includes,
+   * so the codes are recorded as excluded - as excludeCode does - and the includes then
+   * skip them. (This used to remove them from what had been included so far, which at
+   * that point is nothing, so excluding a value set excluded nothing.)
+   */
   excludeValueSet(vs, expansion, imports, offset) {
-    for (const c of vs.expansion.contains) {
-      this.worker.deadCheck('excludeValueSet');
-      const s = this.keyC(c);
-      if (this.passesImports(imports, c.system, c.code, offset) && this.map.has(s)) {
-        const idx = this.fullList.indexOf(this.map.get(s));
-        if (idx >= 0) {
-          this.fullList.splice(idx, 1);
+    const walk = (list) => {
+      for (const c of list || []) {
+        this.worker.deadCheck('excludeValueSet');
+        if (c.code && this.passesImports(imports, c.system, c.code, offset)) {
+          this.excluded.add((this.doingVersion && !this.params.versionsMatch ? c.system + '|' + c.version : c.system) + '#' + c.code);
         }
-        this.map.delete(s);
-        this.decTotal();
+        walk(c.contains);
       }
-    }
+    };
+    walk(vs.expansion.contains);
   }
 
   async checkSource(cset, exp, filter, srcURL, ts, vsInfo , source) {
@@ -1012,8 +1016,10 @@ class ValueSetExpander {
           let vs = await this.worker.findValueSet(s, '', vsSrc);
           const ivs = new ImportedValueSet(await this.expandValueSet(s, '',  vs, filter, notClosed));
           this.checkResourceCanonicalStatus(expansion, ivs.valueSet, this.valueSet);
-          if (!vs.isContained && ivs.valueSet.vurl) {
-            this.addParamUri(expansion, 'used-valueset', ivs.valueSet.vurl);
+          // ivs.valueSet is the expansion (plain JSON), so it has no vurl - as for the
+          // includes, build it
+          if (!vs.isContained && this.worker.makeVurl(ivs.valueSet)) {
+            this.addParamUri(expansion, 'used-valueset', this.worker.makeVurl(ivs.valueSet));
           }
           valueSets.push(ivs);
         }
@@ -1314,13 +1320,22 @@ class ValueSetExpander {
   }
 
   async expand(source, filter, noCacheThisOne) {
-    this.noCacheThisOne = noCacheThisOne;
-    this.totalStatus = 'uninitialised';
-    this.total = 0;
-
     Extensions.checkNoImplicitRules(source,'ValueSetExpander.Expand', 'ValueSet', source.vurl);
     Extensions.checkNoModifiers(source,'ValueSetExpander.Expand', 'ValueSet', source.vurl);
+    // circular reference detection: this value set is in the chain being processed until
+    // its expansion is done
     this.worker.seeValueSet(source, this.params);
+    try {
+      return await this.expandSeen(source, filter, noCacheThisOne);
+    } finally {
+      this.worker.unseeValueSet(source);
+    }
+  }
+
+  async expandSeen(source, filter, noCacheThisOne) {
+    this.noCacheThisOne = noCacheThisOne;
+    this.totalStatus = 'uninitialised';
+    this.total = 0;
     this.valueSet = source;
 
     const result = structuredClone(source.jsonObj);
@@ -1348,6 +1363,10 @@ class ValueSetExpander {
     if (result.expansion) {
       return result; // just return the expansion
     }
+    if (!source.jsonObj.compose) {
+      throw new Issue('error', 'invalid', null, 'VALUESET_NO_COMPOSE',
+        this.worker.i18n.translate('VALUESET_NO_COMPOSE', this.params.httpLanguages, [source.contextKey || source.vurlOrMsg]), 'vs-invalid', 422);
+    }
 
     if (this.params.generateNarrative && !this.noDetails) {
       div_ = div();

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}`,
@@ -437,7 +438,6 @@ class MetadataHandler {
         // Parameters the $expand handler reads - see handleTypeLevelExpand in
         // tx/workers/expand.js and TxParameters.seeParameter in tx/params.js.
         // Keep this list in step with those when adding a parameter.
-        { name: '_incomplete' },
         { name: 'abstract' },
         { name: 'activeOnly' },
         { name: 'check-system-version' },
@@ -453,20 +453,12 @@ class MetadataHandler {
         { name: 'filter' },
         { name: 'force-system-version' },
         { name: 'force-valueset-version' },
-        { name: 'inactive' },
-        { name: 'includeAlternateCodes' },
         { name: 'includeDefinition' },
         { name: 'includeDesignations' },
-        { name: 'incomplete-ok' },
         {
           name: 'limit',
           documentation: 'Upper bound on the size of the expansion; the operation fails as too-costly beyond it'
         },
-        { name: 'limitedExpansion' },
-        {
-          name: 'mode',
-          documentation: '=lenient-display-validation'
-        },
         { name: 'no-cache' },
         { name: 'offset' },
         { name: 'profile' },
@@ -479,10 +471,6 @@ class MetadataHandler {
         { name: 'url' },
         { name: 'useSupplement' },
         { name: 'valueSet' },
-        {
-          name: 'valueSetMode',
-          documentation: '= CHECK_MEMBERSHIP_ONLY | NO_MEMBERSHIP_CHECK'
-        },
         { name: 'valueSetVersion' }
       ]
     };

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