fhirsmith 0.9.6 → 0.10.0

package/tx/workers/validate.js

@@ -124,7 +124,7 @@ class ValueSetChecker {
         }
       }
     } catch (error) {
-      this.log.error(error);
+      this.worker.log.error(error);
       debugLog(error);
       throw new Error('Exception expanding value set in order to infer system: ' + error.message);
     }
@@ -467,7 +467,7 @@ class ValueSetChecker {
         return false;
       }
       let cs = await this.worker.findCodeSystem(system, version, this.params, ['complete', 'fragment'], op,true, false, false, this.worker.requiredSupplements);
-      this.seeSourceProvider(cs, system);
+      this.worker.seeSourceProvider(cs, system);
       if (cs === null) {
         this.worker.opContext.addNote(this.valueSet, 'Didn\'t find CodeSystem "' + this.worker.renderer.displayCoded(system, version) + '"', this.indentCount);
         result = null;
@@ -563,7 +563,7 @@ class ValueSetChecker {
             }
             let msg = await cs.incompleteValidationMessage(ctxt.context, this.params.HTTPLanguages);
             if (msg) {
-              op.addIssueNoId('information', 'informational', addToPath(path, 'code'), msg, 'process-note');
+              op.addIssue(new Issue('information', 'informational', addToPath(path, 'code'), null, msg, 'process-note'));
             }
             inactive.value = await cs.isInactive(ctxt.context);
             inactive.path = path;
@@ -824,7 +824,7 @@ class ValueSetChecker {
           } else {
             let msg = 'The code system "' + ccc.system + '" version "' + ccc.version + '" in the ValueSet expansion is different to the one in the value ("' + version + '")';
             messages.push(msg);
-            op.addIssueNoId('error', 'not-found', addToPath(path, 'version'), msg, 'vs-invalid');
+            op.addIssue(new Issue('error', 'not-found', addToPath(path, 'version'), null, msg, 'vs-invalid'));
             return false;
           }
           let cs = await this.worker.findCodeSystem(system, v, this.params, ['complete', 'fragment'], op, true, true, false, this.worker.requiredSupplements);
@@ -1122,7 +1122,7 @@ class ValueSetChecker {
         if ((cause.value === 'not-found' && contentMode.value !== 'complete') || contentMode.value === 'example') {
           let m = 'The system ' + c.system + ' was found but did not contain enough information to properly validate the code "' + c.code + '" ("' + c.display + '") (mode = ' + contentMode.value + ')';
           msg(m);
-          op.addIssueNoId('warning', 'not-found', path, m, 'vs-invalid');
+          op.addIssue(new Issue('warning', 'not-found', path, null, m, 'vs-invalid'));
         } else if (c.display && list.designations.length > 0) {
           await this.checkDisplays(list, defLang, c, msg, op, path);
         }
@@ -1350,14 +1350,18 @@ class ValueSetChecker {
       if (vstatus.value && vstatus.value !== 'inactive') {
         result.addParamCode('status', vstatus.value);
       }
+      let mpath = inactive.path;
+      if (!mpath) {
+        mpath = 'code';
+      }
       if (!['inactive', 'DISCOURAGED'].includes(vstatus.value)) {
         let m = this.worker.i18n.translate('INACTIVE_CONCEPT_FOUND', this.params.HTTPLanguages, ['inactive', tcode]);
         msg(m);
-        op.addIssue(new Issue('warning', 'business-rule', inactive.path, 'INACTIVE_CONCEPT_FOUND', m, 'code-comment'));
+        op.addIssue(new Issue('warning', 'business-rule', mpath, 'INACTIVE_CONCEPT_FOUND', m, 'code-comment'));
       }
       let m = this.worker.i18n.translate('INACTIVE_CONCEPT_FOUND', this.params.HTTPLanguages, [vstatus.value, tcode]);
       msg(m);
-      op.addIssue(new Issue('warning', 'business-rule', inactive.path, 'INACTIVE_CONCEPT_FOUND', m, 'code-comment'));
+      op.addIssue(new Issue('warning', 'business-rule', mpath, 'INACTIVE_CONCEPT_FOUND', m, 'code-comment'));
     } else if (vstatus.value && vstatus.value.toLowerCase() === 'deprecated') {
       result.addParamCode('status', 'deprecated');
       let m = this.worker.i18n.translate('DEPRECATED_CONCEPT_FOUND', this.params.HTTPLanguages, [vstatus.value, tcode]);
@@ -1414,7 +1418,11 @@ class ValueSetChecker {
           m = this.worker.i18n.translate('NO_VALID_DISPLAY_AT_ALL', this.params.HTTPLanguages, [c.display, c.system, c.code]);
           mid = 'NO_VALID_DISPLAY_AT_ALL';
         } else {
-          if (ds === c.display) {
+          // no displays in the requested language(s): fall back to checking against the
+          // displays + designations in the code system's default language, not just the
+          // single preferred display (see tests validation-simple-*-good-language-none)
+          let hdDef = list.hasDisplay(this.params.workingLanguages(), defLang.value, c.display, false, DisplayCheckingStyle.CASE_INSENSITIVE);
+          if (hdDef.found) {
             m = this.worker.i18n.translate('NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_OK', this.params.HTTPLanguages, [c.display, c.system, c.code, this.params.langSummary(), ds]);
             mid = 'NO_VALID_DISPLAY_FOUND_NONE_FOR_LANG_OK';
             severity = 'information';
@@ -1518,14 +1526,14 @@ class ValueSetChecker {
     } else if (ok === null) {
       result.AddParamBool('result', false);
       result.addParamStr('message', 'The system "' + system + '" is unknown so the /"' + code + '" cannot be confirmed to be in the value set ' + this.valueSet.name);
-      op.addIssueNoId('error', cause.value, 'code', 'The system "' + system + '" is unknown so the /"' + code + '" cannot be confirmed to be in the value set ' + this.valueSet.name, 'not-found');
+      op.addIssue(new Issue('error', cause.value, 'code', null, 'The system "' + system + '" is unknown so the /"' + code + '" cannot be confirmed to be in the value set ' + this.valueSet.name, 'not-found'));
       for (let us of unknownSystems) {
         result.addParamCanonical('x-caused-by-unknown-system', us);
       }
     } else {
       result.AddParamBool('result', false);
       result.addParamStr('message', 'The system/code "' + system + '"/"' + code + '" is not in the value set ' + this.valueSet.name);
-      op.addIssueNoId('error', cause.value, 'code', 'The system/code "' + system + '"/"' + code + '" is not in the value set ' + this.valueSet.name, 'not-in-vs');
+      op.addIssue(new Issue('error', cause.value, 'code', null, 'The system/code "' + system + '"/"' + code + '" is not in the value set ' + this.valueSet.name, 'not-in-vs'));
       if (cause.value) {
         result.AddParamCode('cause', cause.value);
       }

package/tx/workers/worker.js

@@ -1,4 +1,4 @@
-const { TerminologyError} = require('../operation-context');
+const { TerminologyError} = require('../library/errors');
 const { CodeSystem } = require('../library/codesystem');
 const ValueSet = require('../library/valueset');
 const {VersionUtilities} = require("../../library/version-utilities");
@@ -8,6 +8,12 @@ const {Languages} = require("../../library/languages");
 const {ConceptMap} = require("../library/conceptmap");
 const {Renderer} = require("../library/renderer");
 
+// The cache-id travels as an HTTP header (not an operation parameter) so proxies /
+// load-balancers can act on it and the server can reject it before parsing the body.
+// Defined here (the base worker) so both the worker and cache-control share one
+// source of truth without a circular require. Express lower-cases header names.
+const CACHE_ID_HEADER = 'x-cache-id';
+
 /**
  * Custom error for terminology setup issues
  */
@@ -121,7 +127,11 @@ class TerminologyWorker {
           latest = i;
         }
       }
-      return matches[latest];
+      const found = matches[latest];
+      if (this.additionalResourcesCacheId && this.log) {
+        this.log.info(`cache-id '${this.additionalResourcesCacheId}': using cached ${found.resourceType} ${found.url}${found.version ? '|' + found.version : ''} for lookup of ${url}${version ? '|' + version : ''}`);
+      }
+      return found;
     }
   }
 
@@ -487,50 +497,75 @@ class TerminologyWorker {
    * @returns {Object} Parameters resource
    */
   buildParameters(req) {
+    let params;
+
     // If POST with Parameters resource, use directly
     if (req.method === 'POST' && req.body && req.body.resourceType === 'Parameters') {
-      return req.body;
-    }
-    if (req.method === 'POST' && req.body && req.body.resourceType) {
+      params = req.body;
+    } else if (req.method === 'POST' && req.body && req.body.resourceType) {
       let langs = this.languages.parse(req.headers['accept-language']);
       throw new Issue('error', 'invalid', null, 'Wrong_type_for_resource_expected', this.i18n.translate('Wrong_type_for_resource_expected', langs, ["Parameters", req.body.resourceType])).handleAsOO(400);
-    }
-
-    // Convert query params or form body to Parameters
-    const source = req.method === 'POST' ? {...req.query, ...req.body} : req.query;
-    const params = {
-      resourceType: 'Parameters',
-      parameter: []
-    };
+    } else {
+      // Convert query params or form body to Parameters
+      const source = req.method === 'POST' ? {...req.query, ...req.body} : req.query;
+      params = {
+        resourceType: 'Parameters',
+        parameter: []
+      };
 
-    for (const [name, value] of Object.entries(source)) {
-      if (value === undefined || value === null) continue;
+      for (const [name, value] of Object.entries(source)) {
+        if (value === undefined || value === null) continue;
 
-      if (Array.isArray(value)) {
-        // Repeating parameter
-        for (const v of value) {
-          params.parameter.push({name, valueString: String(v)});
-        }
-      } else if (typeof value === 'object') {
-        // Could be a resource or complex type - check resourceType
-        if (value.resourceType) {
-          params.parameter.push({name, resource: value});
+        if (Array.isArray(value)) {
+          // Repeating parameter
+          for (const v of value) {
+            params.parameter.push({name, valueString: String(v)});
+          }
+        } else if (typeof value === 'object') {
+          // Could be a resource or complex type - check resourceType
+          if (value.resourceType) {
+            params.parameter.push({name, resource: value});
+          } else {
+            // Assume it's a complex type like Coding or CodeableConcept
+            params.parameter.push(this.buildComplexParameter(name, value));
+          }
+        } else if (value == 'true') {
+          params.parameter.push({name, valueBoolean: true});
+        } else if (value == 'false') {
+          params.parameter.push({name, valueBoolean: false});
         } else {
-          // Assume it's a complex type like Coding or CodeableConcept
-          params.parameter.push(this.buildComplexParameter(name, value));
+          params.parameter.push({name, valueString: String(value)});
         }
-      } else if (value == 'true') {
-        params.parameter.push({name, valueBoolean: true});
-      } else if (value == 'false') {
-        params.parameter.push({name, valueBoolean: false});
-      } else {
-        params.parameter.push({name, valueString: String(value)});
       }
     }
 
+    this.applyCacheIdHeader(req, params);
     return params;
   }
 
+  /**
+   * Normalise the cache-id from the `${CACHE_ID_HEADER}` header into a `cache-id`
+   * parameter, so all downstream code can read the cache-id the same way whether
+   * the client sent it as a header (the going-forward mechanism) or, for now, still
+   * as a parameter. If a cache-id parameter is already present it is left as-is, so
+   * an explicit parameter wins and there's no surprising override.
+   * @param {express.Request} req
+   * @param {Object} params - Parameters resource (mutated in place)
+   */
+  applyCacheIdHeader(req, params) {
+    const headerVal = req && req.headers ? req.headers[CACHE_ID_HEADER] : null;
+    if (!headerVal) {
+      return;
+    }
+    if (!params.parameter) {
+      params.parameter = [];
+    }
+    if (params.parameter.some(p => p.name === 'cache-id')) {
+      return;
+    }
+    params.parameter.push({ name: 'cache-id', valueId: String(headerVal) });
+  }
+
   /**
    * Build a parameter for complex types
    */
@@ -559,36 +594,87 @@ class TerminologyWorker {
   // ========== Additional Resources Handling ==========
 
   /**
-   * Set up additional resources from tx-resource parameters and cache
+   * Collect the resources supplied inline in a Parameters resource: the
+   * `tx-resource` parameters, and the primary `valueSet`/`codeSystem` parameters.
+   *
+   * The primary resource is collected separately because the cache-id protocol
+   * needs it retained too: fhir-core sends the main ValueSet as `valueSet` (not
+   * `tx-resource`), so if it isn't cached, a later by-reference call can't resolve
+   * it ("value set ... could not be found"). A primary resource is only usable by
+   * reference if it has a url to key on, so url-less ones are skipped.
+   *
    * @param {Object} params - Parameters resource
+   * @returns {{txResources: Array, primaryResources: Array}} wrapped resources
    */
-  setupAdditionalResources(params) {
-    if (!params || !params.parameter) return;
-
-    // Collect tx-resource parameters (resources provided inline)
+  collectSuppliedResources(params) {
     const txResources = [];
+    const primaryResources = [];
+    if (!params || !params.parameter) {
+      return { txResources, primaryResources };
+    }
     for (const param of params.parameter) {
-      this.deadCheck('setupAdditionalResources');
+      this.deadCheck('collectSuppliedResources');
       if (param.name === 'tx-resource' && param.resource) {
-        let res = this.wrapRawResource(param.resource);
+        const res = this.wrapRawResource(param.resource);
         if (res) {
           txResources.push(res);
         }
+      } else if ((param.name === 'valueSet' || param.name === 'codeSystem') && param.resource && param.resource.url) {
+        const res = this.wrapRawResource(param.resource);
+        if (res) {
+          primaryResources.push(res);
+        }
       }
     }
+    return { txResources, primaryResources };
+  }
 
-    // Check for cache-id
+  /**
+   * Set up additional resources from tx-resource parameters and cache
+   * @param {Object} params - Parameters resource
+   */
+  setupAdditionalResources(params) {
+    if (!params || !params.parameter) return;
+
+    // Collect the resources supplied inline on this request (tx-resource plus the
+    // primary valueSet/codeSystem). See collectSuppliedResources for why the
+    // primary resource is included.
+    const { txResources, primaryResources } = this.collectSuppliedResources(params);
+
+    // Check for cache-id. An explicit cache-id *parameter* wins; otherwise fall
+    // back to the cache-id the middleware lifted off the X-Cache-Id header onto
+    // the operation context. This fallback is what makes the header work on the
+    // op paths that don't route their Parameters through buildParameters
+    // (expand, related, batch-validate) or that hand setupAdditionalResources a
+    // raw req.body (lookup) - previously those silently ignored a front-loaded
+    // cache and failed to resolve by-reference resources.
     const cacheIdParam = this.findParameter(params, 'cache-id');
-    const cacheId = cacheIdParam ? this.getParameterValue(cacheIdParam) : null;
+    const cacheId = (cacheIdParam ? this.getParameterValue(cacheIdParam) : null)
+      || (this.opContext ? this.opContext.cacheId : null)
+      || null;
 
     if (cacheId && this.opContext.resourceCache) {
-      // Merge tx-resources with cached resources
-      if (txResources.length > 0) {
-        this.opContext.resourceCache.add(cacheId, txResources);
+      // The cache must already exist: caches are created explicitly via
+      // $cache-control?mode=start, which is the only thing that mints a cache-id.
+      // A cache-id the server doesn't know is an unambiguous, server-authoritative
+      // error condition (never created, or expired / released) - report it with a
+      // specific coded issue rather than silently auto-creating a fresh cache and
+      // then failing obscurely later when a by-reference resource can't be found.
+      if (!this.opContext.resourceCache.has(cacheId)) {
+        throw new Issue('error', 'not-found', null, 'CACHE_ID_UNKNOWN',
+          this.i18n.translate('CACHE_ID_UNKNOWN', this.opContext.langs, [cacheId]),
+          'cache-id-unknown', 404);
+      }
+
+      // The cache exists: merge any resources supplied on this request into it
+      // (incremental population is allowed), then expose the full cache contents.
+      const toCache = txResources.concat(primaryResources);
+      if (toCache.length > 0) {
+        this.opContext.resourceCache.add(cacheId, toCache);
       }
 
-      // Set additional resources to all resources for this cache-id
       this.additionalResources = this.opContext.resourceCache.get(cacheId);
+      this.additionalResourcesCacheId = cacheId;
     } else {
       // No cache-id, just use the tx-resources directly
       this.additionalResources = txResources;
@@ -708,7 +794,7 @@ class TerminologyWorker {
     // Check for various value types
     const valueTypes = [
       'valueString', 'valueCode', 'valueUri', 'valueCanonical', 'valueUrl',
-      'valueBoolean', 'valueInteger', 'valueDecimal',
+      'valueBoolean', 'valueInteger', 'valueDecimal', 'valueId',
       'valueDateTime', 'valueDate', 'valueTime',
       'valueCoding', 'valueCodeableConcept',
       'valueIdentifier', 'valueQuantity'
@@ -934,5 +1020,6 @@ class TerminologyWorker {
 
 module.exports = {
   TerminologyWorker,
-  TerminologySetupError
+  TerminologySetupError,
+  CACHE_ID_HEADER
 };

package/tx/xversion/xv-bundle.js

@@ -18,8 +18,7 @@ function bundleToR5(jsonObj, sourceVersion) {
   for (let be of jsonObj.entry || []) {
     convertResourceToR5(be.resource, sourceVersion);
   }
-
-  throw new Error(`Unsupported FHIR version: ${sourceVersion}`);
+  return jsonObj;
 }
 
 /**

package/tx/xversion/xv-codesystem.js

@@ -139,9 +139,12 @@ function codeSystemR5ToR3(r5Obj) {
  * @private
  */
 function isR5OnlyFilterOperator(operator) {
+  // Operators added in R5 that are not valid in R4 or earlier.
+  // NOTE: 'generalizes' is NOT R5-only — it is a valid R4 operator
+  // (filter-operator value set, 4.0.1), so it must not be stripped here.
   const r5OnlyOperators = [
-    'generalizes',  // Added in R5
-    // Add other R5-only operators as they're identified
+    'child-of',        // Added in R5
+    'descendent-leaf', // Added in R5
   ];
   return r5OnlyOperators.includes(operator);
 }

package/tx/xversion/xv-parameters.js

@@ -18,7 +18,7 @@ function parametersToR5(jsonObj, sourceVersion) {
   }
 
   const {convertResourceToR5} = require("./xv-resource");
-  for (let p of jsonObj.parameter) {
+  for (let p of jsonObj.parameter || []) {
     if (p.resource) {
       p.resource = convertResourceToR5(p.resource, sourceVersion);
     }
@@ -59,7 +59,7 @@ function parametersFromR5(r5Obj, targetVersion) {
 function parametersR5ToR4(r5Obj) {
   const {convertResourceFromR5} = require("./xv-resource");
 
-  for (let p of r5Obj.parameter) {
+  for (let p of r5Obj.parameter || []) {
     if (p.resource) {
       p.resource = convertResourceFromR5(p.resource, "R4");
     }
@@ -71,7 +71,7 @@ function parametersR5ToR4(r5Obj) {
 }
 
 function convertResourceWithinR5(r5Obj) {
-  for (let p of r5Obj.parameter) {
+  for (let p of r5Obj.parameter || []) {
     if (p.name == 'match') {
       fixMatchParameterfor5(p);
     }
@@ -135,7 +135,7 @@ function convertParameterR5ToR3(p) {
 function parametersR5ToR3(r5Obj) {
   const {convertResourceFromR5} = require("./xv-resource");
 
-  for (let p of r5Obj.parameter) {
+  for (let p of r5Obj.parameter || []) {
     if (p.resource) {
       p.resource = convertResourceFromR5(p.resource, "R3");
     }

package/tx/xversion/xv-resource.js

@@ -9,7 +9,7 @@ const {bundleFromR5, bundleToR5} = require("./xv-bundle");
 
 
 function convertResourceToR5(data, sourceVersion) {
-  if (sourceVersion == "5.0" || !data.resourceType) {
+  if (!data || sourceVersion == "5.0" || !data.resourceType) {
     return data;
   }
   switch (data.resourceType) {
@@ -26,7 +26,7 @@ function convertResourceToR5(data, sourceVersion) {
 }
 
 function convertResourceFromR5(data, targetVersion) {
-  if (targetVersion == "5.0" || !data.resourceType) {
+  if (!data || targetVersion == "5.0" || !data.resourceType) {
     return data;
   }
   switch (data.resourceType) {

package/tx/xversion/xv-terminologyCapabilities.js

@@ -15,17 +15,22 @@ function terminologyCapabilitiesToR5(jsonObj, sourceVersion) {
   }
 
   if (VersionUtilities.isR4Ver(sourceVersion)) {
+    const contentExtUrl = "http://hl7.org/fhir/5.0/StructureDefinition/extension-TerminologyCapabilities.codeSystem.content";
     for (const cs of jsonObj.codeSystem || []) {
-      if (cs.content) {
-        let cnt = Extensions.readString(cs, "http://hl7.org/fhir/5.0/StructureDefinition/extension-TerminologyCapabilities.codeSystem.content");
-        if (cnt) {
-          delete cs.extensions;
-          cs.content = cnt;
+      // In R4 the content is carried only by the content extension (there is no
+      // native codeSystem.content), so read it from the extension directly.
+      const cnt = Extensions.readString(cs, contentExtUrl);
+      if (cnt) {
+        cs.content = cnt;
+        // Remove the now-redundant source extension (the field is `extension`,
+        // singular). Filter so any unrelated extensions are preserved.
+        cs.extension = (cs.extension || []).filter(e => e.url !== contentExtUrl);
+        if (cs.extension.length === 0) {
+          delete cs.extension;
         }
       }
     }
 
-
     return jsonObj;
   }
 

package/tx/xversion/xv-valueset.js

@@ -14,10 +14,10 @@ function valueSetToR5(jsonObj, sourceVersion) {
   if (VersionUtilities.isR5Ver(sourceVersion)) {
     return jsonObj; // No conversion needed
   }
-  for (const inc of jsonObj.compose.include || []) {
+  for (const inc of jsonObj.compose?.include || []) {
     valueSetIncludeToR5(inc);
   }
-  for (const inc of jsonObj.compose.exclude || []) {
+  for (const inc of jsonObj.compose?.exclude || []) {
     valueSetIncludeToR5(inc);
   }
   if (VersionUtilities.isR4Ver(sourceVersion)) {
@@ -90,7 +90,7 @@ function valueSetR5ToR4(r5Obj) {
       if (include.filter && Array.isArray(include.filter)) {
         include.filter = include.filter.map(filter => {
           if (filter.op && isR5OnlyFilterOperator(filter.op)) {
-            filter._op = { "extension": "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}
+            filter._op = { "extension": [{ url: "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}]};
             delete filter.op;
           }
           return filter;
@@ -105,7 +105,7 @@ function valueSetR5ToR4(r5Obj) {
       if (exclude.filter && Array.isArray(exclude.filter)) {
         exclude.filter = exclude.filter.map(filter => {
           if (filter.op && isR5OnlyFilterOperator(filter.op)) {
-            filter._op = { "extension": "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}
+            filter._op = { "extension": [{ url: "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}]};
             delete filter.op;
           }
           return filter;
@@ -155,7 +155,7 @@ function valueSetR5ToR3(r5Obj) {
       if (include.filter && Array.isArray(include.filter)) {
         include.filter = include.filter.map(filter => {
           if (filter.op && !isR3CompatibleFilterOperator(filter.op)) {
-            filter._op = { "extension": "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}
+            filter._op = { "extension": [{ url: "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}]};
             delete filter.op;
           }
           return filter;
@@ -170,7 +170,7 @@ function valueSetR5ToR3(r5Obj) {
       if (exclude.filter && Array.isArray(exclude.filter)) {
         exclude.filter = exclude.filter.map(filter => {
           if (filter.op && !isR3CompatibleFilterOperator(filter.op)) {
-            filter._op = { "extension": "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}
+            filter._op = { "extension": [{ url: "http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op", "valueCode": filter.op}]};
             delete filter.op;
           }
           return filter;
@@ -223,7 +223,7 @@ function convertContainsPropertyR5ToR4(containsList) {
  */
 function isR5OnlyFilterOperator(operator) {
   const r5OnlyOperators = [
-    'child-of', ' descendent-leaf' // Added in R5
+    'child-of', 'descendent-leaf' // Added in R5
   ];
   return r5OnlyOperators.includes(operator);
 }