fhirsmith 0.9.5 → 0.9.7

package/tx/workers/expand.js

@@ -647,11 +647,11 @@ class ValueSetExpander {
           } else if (cs.contentMode() === 'supplement') {
             throw new Issue('error', 'business-rule', null, null, 'The code system definition for ' + cset.system + ' defines a supplement, so this expansion cannot be performed', 'invalid');
           } else if (cs.contentMode() === 'fragment') {
-            this.addParamUri(exp, 'used-fragment', cs.system() + '|' + cs.version());
+            this.addParamUri(exp, 'used-fragment', cs.system()+ (cs.version() ?  '|' + cs.version(): ""));
             Extensions.addBoolean(exp, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed", true);
             Extensions.addString(exp, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed-reason","This extension is based on a fragment of the code system " + cset.system);
           } else {
-            this.addParamUri(exp, cs.contentMode(), cs.system() + '|' + cs.version());
+            this.addParamUri(exp, cs.contentMode(), cs.system() + cs.system()+ (cs.version() ?  '|' + cs.version(): ""));
             Extensions.addBoolean(exp, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed", true);
             Extensions.addString(exp, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed-reason","This extension is based on a fragment of the code system " + cset.system);
           }
@@ -948,7 +948,7 @@ 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) {
+          if (!vs.isContained && ivs.valueSet.vurl) {
             this.addParamUri(expansion, 'used-valueset', ivs.valueSet.vurl);
           }
           valueSets.push(ivs);
@@ -961,124 +961,128 @@ class ValueSetExpander {
       const cs = await this.worker.findCodeSystem(cset.system, cset.version, this.params, ['complete', 'fragment'], false,
         true, true, null, this.requiredSupplements);
 
-      this.worker.checkSupplements(cs, cset, this.requiredSupplements, this.usedSupplements);
-      this.checkResourceCanonicalStatus(expansion, cs, this.valueSet);
-      const sv = this.canonical(await cs.system(), await cs.version());
-      this.addParamUri(expansion, 'used-codesystem', sv);
+      if (cs == null) {
+        // nothing?
+      } else {
+        this.worker.checkSupplements(cs, cset, this.requiredSupplements, this.usedSupplements);
+        this.checkResourceCanonicalStatus(expansion, cs, this.valueSet);
+        const sv = this.canonical(await cs.system(), await cs.version());
+        this.addParamUri(expansion, 'used-codesystem', sv);
 
-      for (const u of cset.valueSet || []) {
-        this.worker.deadCheck('processCodes#3');
-        const s = this.worker.pinValueSet(u);
-        this.worker.opContext.log('import value set ' + s);
-        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) {
-          this.addParamUri(expansion, 'used-valueset', this.worker.makeVurl(ivs.valueSet));
+        for (const u of cset.valueSet || []) {
+          this.worker.deadCheck('processCodes#3');
+          const s = this.worker.pinValueSet(u);
+          this.worker.opContext.log('import value set ' + s);
+          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) {
+            this.addParamUri(expansion, 'used-valueset', this.worker.makeVurl(ivs.valueSet));
+          }
+          valueSets.push(ivs);
         }
-        valueSets.push(ivs);
-      }
 
-      if (!cset.concept && !cset.filter) {
-        this.worker.opContext.log('handle system');
-        if (!cset.valueSet) {
-          if (!this.excludeSpecialCase) {
-            // excluding a whole system - we don't list the codes in this case
-            this.excludedSystems.add(cset.system + (this.doingVersion && cset.version ? '|' + cset.version : ''));
+        if (!cset.concept && !cset.filter) {
+          this.worker.opContext.log('handle system');
+          if (!cset.valueSet) {
+            if (!this.excludeSpecialCase) {
+              // excluding a whole system - we don't list the codes in this case
+              this.excludedSystems.add(cset.system + (this.doingVersion && cset.version ? '|' + cset.version : ''));
+            } else {
+              const iter = await cs.iteratorAll();
+              if (iter) {
+                let c = await cs.nextContext(iter);
+                while (c) {
+                  this.worker.deadCheck('processCodes#3aa');
+                  this.excludeCode(cs, cs.system(), cs.version(), await cs.code(c), expansion, valueSets, vsSrc.url);
+                  c = await cs.nextContext(iter);
+                }
+              }
+            }
           } else {
+            if (cs.isNotClosed(filter)) {
+              if (cs.specialEnumeration()) {
+                Extensions.addBoolean(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed", true);
+                Extensions.addString(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed-reason", 'The code System "' + cs.system() + " has a grammar and so has infinite members. This extension is based on " + cs.specialEnumeration());
+              } else {
+                throw new Issue("error", "too-costly", null, null, 'The code System "' + cs.system() + '" has a grammar, and cannot be enumerated directly', null, 422).withDiagnostics(this.worker.opContext.diagnostics());
+              }
+            }
+
             const iter = await cs.iteratorAll();
             if (iter) {
               let c = await cs.nextContext(iter);
               while (c) {
-                this.worker.deadCheck('processCodes#3aa');
-                this.excludeCode(cs, cs.system(), cs.version(), await cs.code(c), expansion, valueSets, vsSrc.url);
+                this.worker.deadCheck('processCodes#3a');
+                if (await this.passesFilters(cs, c, prep, filters, 0)) {
+                  this.excludeCode(cs, cs.system(), cs.version(), await cs.code(c), expansion, valueSets, vsSrc.url);
+                }
                 c = await cs.nextContext(iter);
               }
             }
           }
-        } else {
-          if (cs.isNotClosed(filter)) {
-            if (cs.specialEnumeration()) {
-              Extensions.addBoolean(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed", true);
-              Extensions.addString(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed-reason", 'The code System "' + cs.system() + " has a grammar and so has infinite members. This extension is based on " + cs.specialEnumeration());
-            } else {
-              throw new Issue("error", "too-costly", null, null, 'The code System "' + cs.system() + '" has a grammar, and cannot be enumerated directly', null, 422).withDiagnostics(this.worker.opContext.diagnostics());
-            }
-          }
-
-          const iter = await cs.iteratorAll();
-          if (iter) {
-            let c = await cs.nextContext(iter);
-            while (c) {
-              this.worker.deadCheck('processCodes#3a');
-              if (await this.passesFilters(cs, c, prep, filters, 0)) {
-                this.excludeCode(cs, cs.system(), cs.version(), await cs.code(c), expansion, valueSets, vsSrc.url);
-              }
-              c = await cs.nextContext(iter);
-            }
-          }
         }
-      }
 
-      if (cset.concept) {
-        this.worker.opContext.log('iterate concepts');
-        const cds = new Designations(this.worker.i18n.languageDefinitions);
-        for (const cc of cset.concept) {
-          this.worker.deadCheck('processCodes#3');
-          cds.clear();
-          Extensions.checkNoModifiers(cc, 'ValueSetExpander.processCodes', 'set concept reference', vsSrc.vurl);
-          const cctxt = await cs.locate(cc.code, this.allAltCodes);
-          if (cctxt && cctxt.context && (!this.params.activeOnly || !await cs.isInactive(cctxt.context)) && await this.passesFilters(cs, cctxt.context, prep, filters, 0)) {
-            if (filter.passesDesignations(cds) || filter.passes(cc.code)) {
-              let ov = Extensions.readString(cc, 'http://hl7.org/fhir/StructureDefinition/itemWeight');
-              if (!ov) {
-                ov = await cs.itemWeight(cctxt.context);
+        if (cset.concept) {
+          this.worker.opContext.log('iterate concepts');
+          const cds = new Designations(this.worker.i18n.languageDefinitions);
+          for (const cc of cset.concept) {
+            this.worker.deadCheck('processCodes#3');
+            cds.clear();
+            Extensions.checkNoModifiers(cc, 'ValueSetExpander.processCodes', 'set concept reference', vsSrc.vurl);
+            const cctxt = await cs.locate(cc.code, this.allAltCodes);
+            if (cctxt && cctxt.context && (!this.params.activeOnly || !await cs.isInactive(cctxt.context)) && await this.passesFilters(cs, cctxt.context, prep, filters, 0)) {
+              if (filter.passesDesignations(cds) || filter.passes(cc.code)) {
+                let ov = Extensions.readString(cc, 'http://hl7.org/fhir/StructureDefinition/itemWeight');
+                if (!ov) {
+                  ov = await cs.itemWeight(cctxt.context);
+                }
+                this.excludeCode(cs, await cs.system(), await cs.version(), cc.code, expansion, valueSets, vsSrc.url);
               }
-              this.excludeCode(cs, await cs.system(), await cs.version(), cc.code, expansion, valueSets, vsSrc.url);
             }
           }
         }
-      }
 
-      if (cset.filter) {
-        this.worker.opContext.log('prep filters');
-        const prep = await cs.getPrepContext(true);
-        if (!filter.isNull) {
-          await cs.searchFilter(filter, prep, true);
-        }
+        if (cset.filter) {
+          this.worker.opContext.log('prep filters');
+          const prep = await cs.getPrepContext(true);
+          if (!filter.isNull) {
+            await cs.searchFilter(filter, prep, true);
+          }
 
-        if (cs.specialEnumeration()) {
-          await cs.specialFilter(prep, true);
-          Extensions.addBoolean(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed", true);
-          Extensions.addString(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed-reason", 'The code System "' + cs.system() + " has a grammar and so has infinite members. This extension is based on " + cs.specialEnumeration());
-        }
+          if (cs.specialEnumeration()) {
+            await cs.specialFilter(prep, true);
+            Extensions.addBoolean(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed", true);
+            Extensions.addString(expansion, "http://hl7.org/fhir/StructureDefinition/valueset-unclosed-reason", 'The code System "' + cs.system() + " has a grammar and so has infinite members. This extension is based on " + cs.specialEnumeration());
+          }
 
-        let first = true;
-        for (let fc of cset.filter) {
-          this.worker.deadCheck('processCodes#4a');
-          Extensions.checkNoModifiers(fc, 'ValueSetExpander.processCodes', 'filter', vsSrc.vurl);
-          await cs.filter(prep, first, fc.property, fc.op, fc.value);
-          first = false;
-        }
+          let first = true;
+          for (let fc of cset.filter) {
+            this.worker.deadCheck('processCodes#4a');
+            Extensions.checkNoModifiers(fc, 'ValueSetExpander.processCodes', 'filter', vsSrc.vurl);
+            await cs.filter(prep, first, fc.property, fc.op, fc.value);
+            first = false;
+          }
 
-        this.worker.opContext.log('iterate filters');
-        const fset = await cs.executeFilters(prep);
-        if (await cs.filtersNotClosed(prep)) {
-          notClosed.value = true;
-        }
-        //let count = 0;
-        while (await cs.filterMore(prep, fset[0])) {
-          this.worker.deadCheck('processCodes#5');
-          const c = await cs.filterConcept(prep, fset[0]);
-          const ok = (!this.params.activeOnly || !await cs.isInactive(c)) && (await this.passesFilters(cs, c, prep, fset, 1));
-          if (ok) {
-            //count++;
-            if (this.passesImports(valueSets, await cs.system(), await cs.code(c), 0)) {
-              this.excludeCode(cs, await cs.system(), await cs.version(), await cs.code(c), expansion, null, vsSrc.url);
+          this.worker.opContext.log('iterate filters');
+          const fset = await cs.executeFilters(prep);
+          if (await cs.filtersNotClosed(prep)) {
+            notClosed.value = true;
+          }
+          //let count = 0;
+          while (await cs.filterMore(prep, fset[0])) {
+            this.worker.deadCheck('processCodes#5');
+            const c = await cs.filterConcept(prep, fset[0]);
+            const ok = (!this.params.activeOnly || !await cs.isInactive(c)) && (await this.passesFilters(cs, c, prep, fset, 1));
+            if (ok) {
+              //count++;
+              if (this.passesImports(valueSets, await cs.system(), await cs.code(c), 0)) {
+                this.excludeCode(cs, await cs.system(), await cs.version(), await cs.code(c), expansion, null, vsSrc.url);
+              }
             }
           }
+          this.worker.opContext.log('iterate filters finished');
         }
-        this.worker.opContext.log('iterate filters finished');
       }
     }
   }

package/tx/workers/lookup.js

@@ -374,6 +374,12 @@ class LookupWorker extends TerminologyWorker {
             });
           }
 
+          if (designation.status && designation.status !== 'active') {
+            designationParts.push({
+              name: 'status',
+              valueCode: designation.status
+            });
+          }
           designationParts.push({
             name: 'value',
             valueString: designation.value

package/tx/workers/read.js

@@ -179,7 +179,7 @@ class ReadWorker extends TerminologyWorker {
       issue: [{
         severity: 'error',
         code: 'not-found',
-        diagnostics: `ValueSet/${id} not found`
+        diagnostics: `ConceptMap/${id} not found`
       }]
     });
   }

package/tx/workers/translate.js

@@ -205,10 +205,8 @@ class TranslateWorker extends TerminologyWorker {
         targetSystem = params.get('targetSystem');
       }
     }
-    let explicit = true;
     // If no explicit concept map, we need to find one based on source/target
     if (conceptMaps.length == 0) {
-      explicit = false;
       if (reverse) {
         await this.findConceptMapsInAdditionalResources(conceptMaps,targetSystem, targetScope, sourceScope, coding.system);
         await this.provider.findConceptMapForTranslation(this.opContext, conceptMaps, targetSystem, targetScope, sourceScope, coding.system, coding.code);
@@ -222,7 +220,7 @@ class TranslateWorker extends TerminologyWorker {
     }
 
     // Perform the translation
-    const result = await this.doTranslate(conceptMaps, coding, targetScope, targetSystem, txp, reverse, explicit);
+    const result = await this.doTranslate(conceptMaps, coding, targetScope, targetSystem, txp, reverse);
     return res.status(200).json(result);
   }
 
@@ -322,7 +320,7 @@ class TranslateWorker extends TerminologyWorker {
     return result;
   }
 
-  translateUsingGroupsForwards(cm, coding, targetScope, targetSystem, params, output, explicit) {
+  translateUsingGroupsForwards(cm, coding, targetScope, targetSystem, params, output) {
     let result = false;
     const matches = cm.listTranslations(coding, targetScope, targetSystem);
     if (matches.length > 0) {
@@ -385,12 +383,10 @@ class TranslateWorker extends TerminologyWorker {
                   part: productParts
                 });
               }
-              if (!explicit) {
-                matchParts.push({
-                  name: 'originMap',
-                  valueCanonical: cm.vurl
-                });
-              }
+              matchParts.push({
+                name: 'originMap',
+                valueCanonical: cm.vurl
+              });
               output.push({
                 name: 'match',
                 part: matchParts
@@ -403,7 +399,7 @@ class TranslateWorker extends TerminologyWorker {
     return result;
   }
 
-  translateUsingGroupsReverse(cm, coding, targetScope, targetSystem, params, output, explicit) {
+  translateUsingGroupsReverse(cm, coding, targetScope, targetSystem, params, output) {
     let result = false;
     const matches = cm.listTranslationsReverse(coding, targetScope, targetSystem);
     if (matches.length > 0) {
@@ -474,12 +470,10 @@ class TranslateWorker extends TerminologyWorker {
                 part: productParts
               });
             }
-            if (!explicit) {
-              matchParts.push({
-                name: 'originMap',
-                valueCanonical: cm.vurl
-              });
-            }
+            matchParts.push({
+              name: 'originMap',
+              valueCanonical: cm.vurl
+            });
             output.push({
               name: 'match',
               part: matchParts
@@ -491,10 +485,11 @@ class TranslateWorker extends TerminologyWorker {
     return result;
   }
 
-  async translateUsingCodeSystem(cm, coding, target, params, output, reverse, explicit) {
+  async translateUsingCodeSystem(cm, coding, target, params, output, reverse) {
     let result = false;
     const factory = cm.jsonObj.internalSource;
     let prov = await factory.build(this.opContext, []);
+    this.opContext.registerProvider(prov);
 
     output.push({
       name: 'used-system',
@@ -536,12 +531,10 @@ class TranslateWorker extends TerminologyWorker {
             valueString: t.message
           });
         }
-        if (!explicit) {
-          matchParts.push({
-            name: 'originMap',
-            valueCanonical: cm.vurl
-          });
-        }
+        matchParts.push({
+          name: 'originMap',
+          valueCanonical: cm.vurl
+        });
         output.push({
           name: 'match',
           part: matchParts
@@ -559,10 +552,9 @@ class TranslateWorker extends TerminologyWorker {
    * @param {string} targetSystem - Target code system (optional)
    * @param {Parameters} params - Full parameters object
    * @param {boolean} reverse - Full parameters object*
-   * @param {boolean} explicit - If the concept map was named explicitly
    * @returns {Object} Parameters resource with translate result
    */
-  async doTranslate(conceptMaps, coding, targetScope, targetSystem, params, reverse, explicit) {
+  async doTranslate(conceptMaps, coding, targetScope, targetSystem, params, reverse) {
     this.deadCheck('doTranslate');
 
     const result = [];
@@ -571,11 +563,11 @@ class TranslateWorker extends TerminologyWorker {
       let added = false;
       for (const cm of conceptMaps) {
         if (cm.jsonObj.internalSource) {
-          added = await this.translateUsingCodeSystem(cm, coding, targetSystem, params, result, reverse, explicit) || added;
+          added = await this.translateUsingCodeSystem(cm, coding, targetSystem, params, result, reverse) || added;
         } else if (reverse) {
-          added = this.translateUsingGroupsReverse(cm, coding, targetScope, targetSystem, params, result, reverse, explicit) || added;
+          added = this.translateUsingGroupsReverse(cm, coding, targetScope, targetSystem, params, result) || added;
         } else{
-          added = this.translateUsingGroupsForwards(cm, coding, targetScope, targetSystem, params, result, reverse, explicit) || added;
+          added = this.translateUsingGroupsForwards(cm, coding, targetScope, targetSystem, params, result) || added;
         }
       }
       result.push({

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");
@@ -184,6 +184,10 @@ class TerminologyWorker {
       if (checkVer) {
         this.checkVersion(url, provider.version(), params, provider.versionAlgorithm(), op);
       }
+      // Track for lifecycle cleanup at end of request. Providers built from
+      // a factory open a fresh sqlite connection that needs releasing;
+      // resource-built providers and others without close() are no-ops.
+      this.opContext.registerProvider(provider);
     }
 
     return provider;

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