fhirsmith 0.7.4 → 0.7.5

package/tx/library.js

@@ -101,6 +101,7 @@ class Library {
     this.conceptMapProviders = [];
     this.oclProviderSets = new Map();
     this.oclConfig = {};
+    this.ignored = new Set();
 
     // Create package manager for FHIR packages
     const packageServers = ['https://packages2.fhir.org/packages'];
@@ -161,6 +162,7 @@ class Library {
     const config = yaml.parse(yamlContent);
     this.baseUrl = config.base.url;
     this.oclConfig = config.ocl && typeof config.ocl === 'object' ? config.ocl : {};
+    this.ignored = new Set(Array.isArray(config.ignored) ? config.ignored : []);
 
     this.log.info('Fetching Data from '+this.baseUrl);
 
@@ -288,7 +290,7 @@ class Library {
       case 'ocl':
         await this.loadOcl(details, isDefault, mode);
         break;
-        
+
       default:
         throw new Error(`Unknown source type: ${type}`);
     }
@@ -567,6 +569,17 @@ class Library {
     this.registerProvider(omopFN, omop, isDefault);
   }
 
+  /**
+   * Returns true if the given url/version should be excluded from npm/url package loading.
+   * Matches against the ignored list using either plain url or url#version.
+   */
+  #isIgnored(url, version) {
+    if (this.ignored.size === 0) return false;
+    if (this.ignored.has(url)) return true;
+    if (version && this.ignored.has(`${url}#${version}`)) return true;
+    return false;
+  }
+
   async loadNpm(packageManager, details, isDefault, mode, csOnly) {
     // Parse packageId and version from details (e.g., "hl7.terminology.r4#6.0.2")
     let packageId = details;
@@ -591,6 +604,10 @@ class Library {
     let csc = 0;
     for (const resource of resources) {
       const cs = new CodeSystem(await contentLoader.loadFile(resource, contentLoader.fhirVersion()));
+      if (this.#isIgnored(cs.url, cs.version)) {
+        this.log.info(`Ignoring CodeSystem ${cs.url}${cs.version ? '#' + cs.version : ''} (excluded by config)`);
+        continue;
+      }
       cs.sourcePackage = contentLoader.pid();
       cp.codeSystems.push(cs);
       csc++;
@@ -625,6 +642,10 @@ class Library {
     let csc = 0;
     for (const resource of resources) {
       const cs = new CodeSystem(await contentLoader.loadFile(resource, contentLoader.fhirVersion()));
+      if (this.#isIgnored(cs.url, cs.version)) {
+        this.log.info(`Ignoring CodeSystem ${cs.url}${cs.version ? '#' + cs.version : ''} (excluded by config)`);
+        continue;
+      }
       cs.sourcePackage = contentLoader.pid();
       cp.codeSystems.set(cs.url, cs);
       cp.codeSystems.set(cs.vurl, cs);
@@ -905,4 +926,4 @@ class Library {
 
 }
 
-module.exports = { Library };
+module.exports = { Library };

package/tx/tx.fhir.org.yml

@@ -40,3 +40,6 @@ sources:
   - npm:us.cdc.phinvads
   - npm:hl7.fhir.uv.sdc
   - internal:vsac
+
+ignored:
+  - urn:iso:std:iso:3166#20210120

package/tx/workers/validate.js

@@ -1389,17 +1389,22 @@ class ValueSetChecker {
     let hd = list.hasDisplay(this.params.workingLanguages(), null, c.display, false, DisplayCheckingStyle.CASE_INSENSITIVE)
     if (!hd.found) {
       let baseMsg;
-      if (hd.difference === DisplayDifference.Normalized) {
+      let severity = this.dispWarning();
+      if (list.userDefined) {
+        baseMsg = 'Display_Name_Not_Fixed_use_Supplement';
+        severity = 'information';
+      } else if (hd.difference === DisplayDifference.Normalized) {
         baseMsg = 'Display_Name_WS_for__should_be_one_of__instead_of';
       } else {
         baseMsg = 'Display_Name_for__should_be_one_of__instead_of';
       }
-      let mid = baseMsg;
       let dc = list.displayCount(this.params.workingLanguages(), null, true);
-      let severity = this.dispWarning();
-      if (dc === 0) {
-        severity = 'warning';
-        dc = list.displayCount(this.params.workingLanguages(), null, false);
+      let mid = baseMsg;
+      if (severity !== 'information') {
+        if (dc === 0) {
+          severity = 'warning';
+          dc = list.displayCount(this.params.workingLanguages(), null, false);
+        }
       }
 
       let m, ds;

package/tx/workers/worker.js

@@ -276,12 +276,9 @@ class TerminologyWorker {
         if (this.hasSupplement(cs, supplements)) {
           continue;
         }
-        // Handle exact URL match (no version specified in supplements)
+        // Handle exact URL match (no version specified in supplements field)
         if (supplementsUrl === url) {
-          // If we're looking for a specific version, only include if no version in supplements URL
-          if (!version) {
-            supplements.push(cs);
-          }
+          supplements.push(cs);
           continue;
         }