fhirsmith 0.5.2 → 0.5.4

package/tx/vs/vs-vsac.js

@@ -4,7 +4,6 @@ const { AbstractValueSetProvider } = require('./vs-api');
 const { ValueSetDatabase } = require('./vs-database');
 const { VersionUtilities } = require('../../library/version-utilities');
 const folders = require('../../library/folder-setup');
-const ValueSet = require("../library/valueset");
 
 /**
  * VSAC (Value Set Authority Center) ValueSet provider
@@ -52,6 +51,10 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
     });
   }
 
+  sourcePackage() {
+    return "vsac";
+  }
+
   /**
    * Initialize the provider - setup database and start refresh cycle
    * @returns {Promise<void>}
@@ -314,8 +317,20 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
    * @private
    */
   async _reloadMap() {
-    const newMap = await this.database.loadAllValueSets("vsac");
-
+    const newMap = await this.database.loadAllValueSets(this.sourcePackage());
+    for (const vs of newMap.values()) {
+      if (vs.jsonObj.compose) {
+        for (const inc of vs.jsonObj.compose.include || []) {
+          if (inc.version) {
+            delete inc.version;
+          }
+        }for (const inc of vs.jsonObj.compose.exclude || []) {
+          if (inc.version) {
+            delete inc.version;
+          }
+        }
+      }
+    }
     // Atomic replacement of the map
     this.valueSetMap = newMap;
   }
@@ -460,17 +475,18 @@ class VSACValueSetProvider extends AbstractValueSetProvider {
   // are fetched, we check to see if we've got the compose, and if we
   // haven't, then we fetch it and store it
   async checkFullVS(vs) {
-    if (!vs) {
-      return null;
-    }
-    if (vs.jsonObj.compose) {
-      return vs;
-    }
-    console.log('get a full copy for the ValueSet '+vs.url+'|'+vs.version);
-    let vsNew = await this._fetchValueSet(vs.id);
-    await this.database.upsertValueSet(vsNew);
-    this.database.addToMap(this.valueSetMap, vsNew.id, vsNew.url, vsNew.version, vsNew);
-    return new ValueSet(vsNew);
+    // if (!vs) {
+    //   return null;
+    // }
+    // if (vs.jsonObj?.compose) {
+    //   return vs;
+    // }
+    // console.log('get a full copy for the ValueSet '+vs.url+'|'+vs.version);
+    // let vsNew = await this._fetchValueSet(vs.id);
+    // await this.database.upsertValueSet(vsNew);
+    // this.database.addToMap(this.valueSetMap, vsNew.id, vsNew.url, vsNew.version, vsNew);
+    // return new ValueSet(vsNew);
+    return vs;
   }
 
   async processContentAndHistory(q, tracking, length) {