fhirsmith 0.8.3 → 0.8.5

package/tx/workers/search.js

@@ -149,57 +149,8 @@ class SearchWorker extends TerminologyWorker {
     // If no search params, return all
     const hasSearchParams = Object.keys(searchParams).length > 0;
 
-    for (const [key, cs] of this.provider.codeSystems) {
-      this.deadCheck('searchCodeSystems');
-
-      if (key == cs.vurl) {
-        const json = cs.jsonObj;
-
-        if (!hasSearchParams) {
-          matches.push(json);
-          continue;
-        }
-
-        // Check each search parameter for partial match
-        let isMatch = true;
-        for (const [param, searchValue] of Object.entries(searchParams)) {
-
-          // Map content-mode to content property
-          const jsonProp = param === 'content-mode' ? 'content' : param;
-
-          if (param === 'jurisdiction') {
-            // Special handling for jurisdiction - array of CodeableConcept
-            if (!this.matchJurisdiction(json.jurisdiction, searchValue)) {
-              isMatch = false;
-              break;
-            }
-          } else if (param === 'text') {
-            const propValue = json.title + json.description;
-            if (!this.matchValue(propValue, searchValue)) {
-              isMatch = false;
-              break;
-            }
-          } else if (param === 'url' || param === 'system') { // exact match
-            const propValue = json.url;
-            if (propValue !== searchValue) {
-              isMatch = false;
-              break;
-            }
-          } else {
-            // Standard partial text match
-            const propValue = json[jsonProp];
-            if (!this.matchValue(propValue, searchValue)) {
-              isMatch = false;
-              break;
-            }
-          }
-        }
-
-        if (isMatch) {
-          matches.push(json);
-        }
-      }
-    }
+    this.searchCodeSystemResources(searchParams, hasSearchParams, matches);
+    this.searchCodeSystemProviders(searchParams, hasSearchParams, matches);
 
     return matches;
   }
@@ -473,6 +424,130 @@ class SearchWorker extends TerminologyWorker {
 
     return filtered;
   }
+
+  searchCodeSystemResources(searchParams, hasSearchParams, matches) {
+    for (const [key, cs] of this.provider.codeSystems) {
+      this.deadCheck('searchCodeSystems');
+
+      if (key == cs.vurl) {
+        const json = cs.jsonObj;
+
+        if (!hasSearchParams) {
+          matches.push(json);
+          continue;
+        }
+
+        // Check each search parameter for partial match
+        let isMatch = true;
+        for (const [param, searchValue] of Object.entries(searchParams)) {
+
+          // Map content-mode to content property
+          const jsonProp = param === 'content-mode' ? 'content' : param;
+
+          if (param === 'jurisdiction') {
+            // Special handling for jurisdiction - array of CodeableConcept
+            if (!this.matchJurisdiction(json.jurisdiction, searchValue)) {
+              isMatch = false;
+              break;
+            }
+          } else if (param === 'text') {
+            const propValue = json.title + json.description;
+            if (!this.matchValue(propValue, searchValue)) {
+              isMatch = false;
+              break;
+            }
+          } else if (param === 'url' || param === 'system') { // exact match
+            const propValue = json.url;
+            if (propValue !== searchValue) {
+              isMatch = false;
+              break;
+            }
+          } else {
+            // Standard partial text match
+            const propValue = json[jsonProp];
+            if (!this.matchValue(propValue, searchValue)) {
+              isMatch = false;
+              break;
+            }
+          }
+        }
+
+        if (isMatch) {
+          matches.push(json);
+        }
+      }
+    }
+  }
+
+  searchCodeSystemProviders(searchParams, hasSearchParams, matches) {
+    let seen = new Set();
+    for (const csp of this.provider.codeSystemFactories.values()) {
+      this.deadCheck('searchCodeSystems');
+
+      if (seen.has(csp.id())) {
+        continue;
+      }
+      seen.add(csp.id());
+
+      let json = {
+        resourceType: "CodeSystem",
+        id: "x-" + csp.id(),
+        url: csp.system(),
+        version: csp.version(),
+        name: csp.name(),
+        status: "active",
+        description: "This is a place holder for the code system which is fully supported through internal means (not by this code system)",
+        content: "not-present"
+      }
+      if (csp.webSource()) {
+        json.extension = [{ url: "http://hl7.org/fhir/StructureDefinition/web-source", valueUrl : csp.webSource()}];
+      }
+
+      if (!hasSearchParams) {
+        matches.push(json);
+        continue;
+      }
+
+      // Check each search parameter for partial match
+      let isMatch = true;
+      for (const [param, searchValue] of Object.entries(searchParams)) {
+
+        // Map content-mode to content property
+        const jsonProp = param === 'content-mode' ? 'content' : param;
+
+        if (param === 'jurisdiction') {
+          // Special handling for jurisdiction - array of CodeableConcept
+          if (!this.matchJurisdiction(json.jurisdiction, searchValue)) {
+            isMatch = false;
+            break;
+          }
+        } else if (param === 'text') {
+          const propValue = json.title + json.description;
+          if (!this.matchValue(propValue, searchValue)) {
+            isMatch = false;
+            break;
+          }
+        } else if (param === 'url' || param === 'system') { // exact match
+          const propValue = json.url;
+          if (propValue !== searchValue) {
+            isMatch = false;
+            break;
+          }
+        } else {
+          // Standard partial text match
+          const propValue = json[jsonProp];
+          if (!this.matchValue(propValue, searchValue)) {
+            isMatch = false;
+            break;
+          }
+        }
+      }
+
+      if (isMatch) {
+        matches.push(json);
+      }
+    }
+  }
 }
 
 module.exports = SearchWorker;

package/tx/workers/translate.js

@@ -387,7 +387,7 @@ class TranslateWorker extends TerminologyWorker {
               }
               if (!explicit) {
                 matchParts.push({
-                  name: 'sourceMap',
+                  name: 'originMap',
                   valueCanonical: cm.vurl
                 });
               }
@@ -476,7 +476,7 @@ class TranslateWorker extends TerminologyWorker {
             }
             if (!explicit) {
               matchParts.push({
-                name: 'sourceMap',
+                name: 'originMap',
                 valueCanonical: cm.vurl
               });
             }
@@ -538,7 +538,7 @@ class TranslateWorker extends TerminologyWorker {
         }
         if (!explicit) {
           matchParts.push({
-            name: 'sourceMap',
+            name: 'originMap',
             valueCanonical: cm.vurl
           });
         }

package/tx/workers/worker.js

@@ -252,6 +252,7 @@ class TerminologyWorker {
   loadSupplements(url, version = '', statedSupplements) {
     const supplements = [];
 
+    supplements.push(...this.provider.loadSupplements(url, version, statedSupplements));
     // todo: look in provider for supplements
 
     if (!this.additionalResources) {
@@ -306,7 +307,7 @@ class TerminologyWorker {
    * @param {CodeSystemProvider} cs - Code system provider
    * @param {Object} src - Source element (for extensions)
    */
-  checkSupplements(cs, src, requiredSupplements, usedSupplements = null) {
+  checkSupplements(cs, src, requiredSupplements, usedSupplements = null, reportedSupplements = null) {
     // Check for required supplements in extensions
     if (src && src.extension) {
       const supplementExtensions = src.extension.filter(x => x.url == 'http://hl7.org/fhir/StructureDefinition/valueset-supplement');
@@ -318,7 +319,12 @@ class TerminologyWorker {
       }
     }
 
-    // Note required supplements that are satisfied
+    if (reportedSupplements) {
+      for (let s of cs.listSupplements(true)) {
+        reportedSupplements.add(s);
+      }
+    }
+    // Note required supplements that are satisfied - and might be version independent
     if (usedSupplements) {
       for (const s of requiredSupplements) {
         if (cs.hasSupplement(s)) {

package/tx/xversion/xv-codesystem.js

@@ -9,11 +9,11 @@ const {VersionUtilities} = require("../../library/version-utilities");
  */
 
 function codeSystemToR5(jsonObj, version) {
-  if (version === 'R5') {
+  if (VersionUtilities.isR5Ver(version)) {
     return jsonObj; // Already R5, no conversion needed
   }
 
-  if (version === 'R3') {
+  if (VersionUtilities.isR3Ver(version)) {
     // R3 to R5: Convert identifier from single object to array
     if (jsonObj.identifier && !Array.isArray(jsonObj.identifier)) {
       jsonObj.identifier = [jsonObj.identifier];
@@ -21,7 +21,7 @@ function codeSystemToR5(jsonObj, version) {
     return jsonObj;
   }
 
-  if (version === 'R4') {
+  if (VersionUtilities.isR4Ver(version)) {
     // R4 to R5: identifier is already an array, no conversion needed
     return jsonObj;
   }

package/tx/xversion/xv-parameters.js

@@ -17,10 +17,10 @@ function parametersToR5(jsonObj, sourceVersion) {
     }
   }
 
-  const {convertResourceFromR5} = require("./xv-resource");
+  const {convertResourceToR5} = require("./xv-resource");
   for (let p of jsonObj.parameter) {
     if (p.resource) {
-      p.resource = convertResourceFromR5(p.resource, sourceVersion);
+      p.resource = convertResourceToR5(p.resource, sourceVersion);
     }
   }
   return jsonObj;

package/tx/xversion/xv-valueset.js

@@ -203,8 +203,7 @@ function convertContainsPropertyR5ToR4(containsList) {
  */
 function isR5OnlyFilterOperator(operator) {
   const r5OnlyOperators = [
-    'generalizes',  // Added in R5
-    // Add other R5-only operators as they're identified
+    'child-of', ' descendent-leaf' // Added in R5
   ];
   return r5OnlyOperators.includes(operator);
 }