fhirsmith 0.14.0 → 0.14.1

package/tx/sct/editions.js

@@ -0,0 +1,70 @@
+/**
+ * The SNOMED CT editions FHIRsmith knows by name - the one table, used for the provider's
+ * description and name (cs-snomed.js) and for the edition named in unknown-code messages
+ * (SCTVersion in workers/worker.js). Keyed by the edition's module id, as it appears in a
+ * version URI: http://snomed.info/sct/[module]/version/[date]
+ *
+ * name - human readable edition name
+ * code - short code used in the provider name ("SCT US")
+ *
+ * (The importer and the registry keep their own tables: those carry import settings and
+ * registry codes, not display names.)
+ */
+const EDITIONS = {
+  '900000000000207008': { name: 'International Edition', code: 'Intl' },
+  // The terminology-ecosystem test distribution, published under xsct - see the
+  // tx-ecosystem IG, which requires a server claiming the snomed mode to load it.
+  '31000003106': { name: 'Test Edition', code: 'Test' },
+  '449081005': { name: 'International Spanish Edition', code: 'es' },
+  '11000221109': { name: 'Argentinian Edition', code: 'AR-es' },
+  '32506021000036107': { name: 'Australian Edition (with drug extension)', code: 'AU+' },
+  '11000234105': { name: 'Austrian Edition', code: 'AT' },
+  '11000172109': { name: 'Belgian Edition', code: 'BE' },
+  '20621000087109': { name: 'Canadian English Edition', code: 'CA-en' },
+  '20611000087101': { name: 'Canadian Canadian French Edition', code: 'CA-fr' },
+  '554471000005108': { name: 'Danish Edition', code: 'DK' },
+  '11000279109': { name: 'Czech Edition', code: 'CZ' },
+  '11000181102': { name: 'Estonian Edition', code: 'ET' },
+  '11000229106': { name: 'Finnish Edition', code: 'FI' },
+  '11000274103': { name: 'German Edition', code: 'DE' },
+  '1121000189102': { name: 'Indian Edition', code: 'IN' },
+  '827022005': { name: 'IPS Terminology', code: 'IPS' },
+  '11000220105': { name: 'Irish Edition', code: 'IE' },
+  '11000146104': { name: 'Netherlands Edition', code: 'NL' },
+  '21000210109': { name: 'New Zealand Edition', code: 'NZ' },
+  '51000202101': { name: 'Norwegian Edition', code: 'NO' },
+  '11000267109': { name: 'Republic of Korea Edition (South Korea)', code: 'KR' },
+  '900000001000122104': { name: 'Spanish National Edition', code: 'ES-es' },
+  '45991000052106': { name: 'Swedish Edition', code: 'SE' },
+  '2011000195101': { name: 'Swiss Edition', code: 'CH' },
+  '83821000000107': { name: 'UK Edition', code: 'UK' },
+  '999000021000000109': { name: 'UK Clinical Edition', code: 'UK-Clinical' },
+  '5631000179106': { name: 'Uruguay Edition', code: 'UY' },
+  '731000124108': { name: 'US Edition', code: 'US' },
+  '21000325107': { name: 'Chilean Edition', code: 'CL' },
+  '5991000124107': { name: 'US Edition (with ICD-10-CM maps)', code: 'US+' }
+};
+
+/**
+ * @param {string} edition - edition module id
+ * @returns {string|null} the edition's name, or null if it isn't a known edition
+ */
+function editionName(edition) {
+  const e = EDITIONS[edition];
+  return e ? e.name : null;
+}
+
+/**
+ * @param {string} edition - edition module id
+ * @returns {string|null} the edition's short code, or null if it isn't a known edition
+ */
+function editionCode(edition) {
+  const e = EDITIONS[edition];
+  return e ? e.code : null;
+}
+
+module.exports = {
+  EDITIONS,
+  editionName,
+  editionCode
+};

package/tx/workers/expand.js

@@ -1385,9 +1385,9 @@ class ValueSetExpander {
     }
 
     if (this.params.DisplayLanguages) {
-      this.addParamCode(exp, 'displayLanguage', this.params.DisplayLanguages.asString(true));
+      this.addParamCode(exp, 'displayLanguage', this.params.DisplayLanguages.asParameter());
     } else if (this.params.HTTPLanguages) {
-      this.addParamCode(exp, 'displayLanguage', this.params.HTTPLanguages.asString(true));
+      this.addParamCode(exp, 'displayLanguage', this.params.HTTPLanguages.asParameter());
     }
     if (this.params.designations) {
       for (const s of this.params.designations) {

package/tx/workers/translate.js

@@ -1085,9 +1085,14 @@ class TranslateWorker extends TerminologyWorker {
           added = await this.translateUsingGroupsForwards(cm, coding, targetScope, targetSystem, params, result) || added;
         }
       }
+      // A map can say, explicitly, that a concept is NOT related to a target (not-related-to,
+      // or R4's unmatched/disjoint). That is still reported as a match - it is what the map
+      // says - but it is not a translation: "The value can only be true if at least one
+      // returned match has a relationship other than 'not-related-to'" (tx-ecosystem translate-2b)
+      const translated = added && result.some(p => p.name === 'match' && this.isPositiveMatch(p));
       result.push({
         name: 'result',
-        valueBoolean: added
+        valueBoolean: translated
       });
       if (!added) {
         result.push({
@@ -1120,6 +1125,25 @@ class TranslateWorker extends TerminologyWorker {
     };
   }
 
+  /**
+   * Whether a match counts towards result=true. A noMap match says there is no mapping, and
+   * an explicit negative relationship says the target is not related, so neither is a
+   * translation. A match with no relationship otherwise (an unmapped fallback without one,
+   * a code system supplied translation) still counts.
+   */
+  isPositiveMatch(match) {
+    const part = (name) => (match.part || []).find(p => p.name === name);
+    if (part('noMap')?.valueBoolean === true) {
+      return false;
+    }
+    const rel = part('relationship')?.valueCode;
+    const eq = part('equivalence')?.valueCode;
+    if (eq === 'unmatched' || eq === 'disjoint') {
+      return false;
+    }
+    return rel !== 'not-related-to';
+  }
+
   // eslint-disable-next-line no-unused-vars
   isOkTarget(cm, vs) {
     // if cm.target != null then

package/tx/workers/validate.js

@@ -1088,7 +1088,11 @@ class ValueSetChecker {
           mt.push(m);
           op.addIssue(new Issue('error', 'invalid', p, 'Terminology_TX_System_Relative', m, 'invalid-data'));
         }
-        let prov = await this.worker.findCodeSystem(ws, c.version, this.params, ['complete', 'fragment'],  op,true, true, false, this.worker.requiredSupplements);
+        // the code isn't in the value set, but it's still looked up in the code system to report on
+        // it - and that has to be the version the value set selects when the coding doesn't say,
+        // not the server default (tx-ecosystem sct validate-code-pc-none)
+        let lookupVersion = c.version || vsImpliedVersion;
+        let prov = await this.worker.findCodeSystem(ws, lookupVersion, this.params, ['complete', 'fragment'],  op,true, true, false, this.worker.requiredSupplements);
         if (prov === null) {
           let vss = await this.worker.findValueSet(ws, '', null);
           if (vss !== null) {
@@ -1098,7 +1102,7 @@ class ValueSetChecker {
             op.addIssue(new Issue('error', 'invalid', addToPath(path, 'system'), 'Terminology_TX_System_ValueSet2', m, 'invalid-data'));
             cause.value = 'invalid';
           } else {
-            let provS = await this.worker.findCodeSystem(ws, c.version, this.params, ['supplement'], op,true, true, false, this.worker.requiredSupplements);
+            let provS = await this.worker.findCodeSystem(ws, lookupVersion, this.params, ['supplement'], op,true, true, false, this.worker.requiredSupplements);
             if (provS !== null) {
               vss = null;
               let m = this.worker.i18n.translate('CODESYSTEM_CS_NO_SUPPLEMENT', this.params.HTTPLanguages, [provS.vurl()]);
@@ -1109,7 +1113,7 @@ class ValueSetChecker {
               let prov2 = await this.worker.findCodeSystem(ws, '', this.params, ['complete', 'fragment'], op,true, true, false, this.worker.requiredSupplements);
               let bAdd = true;
               let m, mid, vn;
-              if (prov2 === null && !c.version) {
+              if (prov2 === null && !lookupVersion) {
                 mid = 'UNKNOWN_CODESYSTEM';
                 m = this.worker.i18n.translate('UNKNOWN_CODESYSTEM', this.params.HTTPLanguages, [ws]);
                 bAdd = !unknownSystems.has(ws);
@@ -1123,9 +1127,9 @@ class ValueSetChecker {
                   vn = ws;
                 } else {
                   mid = 'UNKNOWN_CODESYSTEM_VERSION';
-                  vn = ws + '|' + c.version;
+                  vn = ws + '|' + lookupVersion;
                 }
-                m = this.worker.i18n.translate(mid, this.params.HTTPLanguages, [ws, c.version,  this.worker.presentVersionList(vl)]);
+                m = this.worker.i18n.translate(mid, this.params.HTTPLanguages, [ws, lookupVersion,  this.worker.presentVersionList(vl)]);
                 bAdd = !unknownSystems.has(vn);
                 if (bAdd) {
                   unknownSystems.add(vn);

package/tx/workers/worker.js

@@ -7,6 +7,7 @@ const {Issue} = require("../library/operation-outcome");
 const {Languages} = require("../../library/languages");
 const {ConceptMap} = require("../library/conceptmap");
 const {Renderer} = require("../library/renderer");
+const {editionName} = require("../sct/editions");
 
 // 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.
@@ -1100,42 +1101,9 @@ function Unknown_Code_in_VersionSCT(url, version) {
 function SCTVersion(url, ver) {
   if (url !== 'http://snomed.info/sct' || !ver) {
     return '';
-  } else {
-    let result = 'unknown';
-    let s = ver.split('/');
-    if (s.length >= 5) {
-      if (s[4] === '900000000000207008') result = 'International Edition';
-      else if (s[4] === '449081005') result = 'International Spanish Edition';
-      else if (s[4] === '11000221109') result = 'Argentinian Edition';
-      else if (s[4] === '32506021000036107') result = 'Australian Edition (with drug extension)';
-      else if (s[4] === '11000234105') result = 'Austrian Edition';
-      else if (s[4] === '11000172109') result = 'Belgian Edition';
-      else if (s[4] === '20621000087109') result = 'Canadian English Edition';
-      else if (s[4] === '20611000087101') result = 'Canadian Canadian French Edition';
-      else if (s[4] === '11000279109') result = 'Czech Edition';
-      else if (s[4] === '554471000005108') result = 'Danish Edition';
-      else if (s[4] === '11000181102') result = 'Estonian Edition';
-      else if (s[4] === '11000229106') result = 'Finnish Edition';
-      else if (s[4] === '11000274103') result = 'German Edition';
-      else if (s[4] === '1121000189102') result = 'Indian Edition';
-      else if (s[4] === '827022005') result = 'IPS Terminology';
-      else if (s[4] === '11000220105') result = 'Irish Edition';
-      else if (s[4] === '11000146104') result = 'Netherlands Edition';
-      else if (s[4] === '21000210109') result = 'New Zealand Edition';
-      else if (s[4] === '51000202101') result = 'Norwegian Edition';
-      else if (s[4] === '11000267109') result = 'Republic of Korea Edition (South Korea)';
-      else if (s[4] === '900000001000122104') result = 'Spanish National Edition';
-      else if (s[4] === '45991000052106') result = 'Swedish Edition';
-      else if (s[4] === '2011000195101') result = 'Swiss Edition';
-      else if (s[4] === '83821000000107') result = 'UK Edition';
-      else if (s[4] === '999000021000000109') result = 'UK Clinical Edition';
-      else if (s[4] === '5631000179106') result = 'Uruguay Edition';
-      else if (s[4] === '21000325107') result = 'Chilean Edition';
-      else if (s[4] === '731000124108') result = 'US Edition';
-      else if (s[4] === '5991000124107') result = 'US Edition (with ICD-10-CM maps)';
-    }
-    return result;
   }
+  const s = ver.split('/');
+  return (s.length >= 5 && editionName(s[4])) || 'unknown';
 }
 
 module.exports = {

package/utilities/submit-test-report.js

@@ -22,7 +22,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const DEFAULT_SERVER = 'https://testing.fhir.org/testing';
+const DEFAULT_SERVER = 'https://npm.fhir.org/testing';
 const DEFAULT_FILE = path.join(__dirname, '..', 'test-cases-report.json');
 
 function usage(msg) {