fhirsmith 0.6.0 → 0.7.1

package/tx/README.md

@@ -33,22 +33,22 @@ Add the `tx` section to your `config.json`:
       "endpoints": [
         {
           "path": "/tx/r5",
-          "fhirVersion": 5,
+          "fhirVersion": "5.0",
           "context": null
         },
         {
           "path": "/tx/r4",
-          "fhirVersion": 4,
+          "fhirVersion": "4.0",
           "context": null
         },
         {
           "path": "/tx/r3",
-          "fhirVersion": 3,
+          "fhirVersion": "3.0",
           "context": null
         },
         {
           "path": "/tx/r4/demo",
-          "fhirVersion": 4,
+          "fhirVersion": "4.0",
           "context": "demo"
         }
       ]

package/tx/cs/cs-loinc.js

@@ -203,9 +203,12 @@ class LoincServices extends BaseCSServices {
     // Use language-aware display logic
     if (this.opContext.langs && !this.opContext.langs.isEnglishOrNothing()) {
       const displays = await this.#getDisplaysForContext(ctxt, this.opContext.langs);
+      const requestedLanguages = Array.isArray(this.opContext.langs.languages)
+        ? this.opContext.langs.languages
+        : (Array.isArray(this.opContext.langs.langs) ? this.opContext.langs.langs : []);
 
       // Try to find exact language match
-      for (const lang of this.opContext.langs.langs) {
+      for (const lang of requestedLanguages) {
         for (const display of displays) {
           if (lang.matches(display.language, true)) {
             return display.value;
@@ -214,7 +217,7 @@ class LoincServices extends BaseCSServices {
       }
 
       // Try partial language match
-      for (const lang of this.opContext.langs.langs) {
+      for (const lang of requestedLanguages) {
         for (const display of displays) {
           if (lang.matches(display.language, false)) {
             return display.value;

package/tx/cs/cs-provider-api.js

@@ -20,7 +20,13 @@ class AbstractCodeSystemProvider {
   }
 
   /**
-  * Returns the list of CodeSystems this provider provides
+   * Returns the list of CodeSystems this provider provides. This is called once at start up.
+   * The code systems should be fully loaded; lazy loading code systems is not considered good
+   * for engineering.
+   *
+   *
+   * Note that unlike value sets, which are accessed from the provider on the fly, code systems
+   * are all preloaded into the kernel (e.g. provider) at start up
    *
   * @param {string} fhirVersion - The FHIRVersion in scope - if relevant (there's always a stated version, though R5 is always used)
   * @param {string} context - The client's stated context - if provided.
@@ -32,6 +38,24 @@ class AbstractCodeSystemProvider {
     throw new Error('listCodeSystems must be implemented by AbstractCodeSystemProvider subclass');
   }
 
+  /**
+   * This is called once a minute to update the code system list that the provider maintains.
+   *
+   * return an object that has three Map<String, CodeSystem>: {added, changed, deleted}
+   *
+   * these use the same key as the
+   *
+   * code systems are identified by url and version
+   *
+   * @param fhirVersion
+   * @param context
+   * @returns {Promise<null>}
+   */
+  // eslint-disable-next-line no-unused-vars
+  async getCodeSystemChanges(fhirVersion, context){
+    return null;
+  }
+
   async close() {
 
   }

package/tx/cs/cs-provider-list.js

@@ -7,7 +7,7 @@ class ListCodeSystemProvider extends AbstractCodeSystemProvider {
   /**
    * {Map<String, CodeSystem>} A list of code system factories that contains all the preloaded native code systems
    */
-  codeSystems = new Map();
+  codeSystems = [];
 
   /**
    * ensure that the ids on the code systems are unique, if they are
@@ -17,7 +17,7 @@ class ListCodeSystemProvider extends AbstractCodeSystemProvider {
    */
   // eslint-disable-next-line no-unused-vars
   assignIds(ids) {
-    for (const cs of this.codeSystems.values()) {
+    for (const cs of this.codeSystems) {
       if (!cs.id || ids.has("CodeSystem/"+cs.id)) {
         cs.id = ""+ids.size;
       }

package/tx/html/conceptmap-operations.liquid

@@ -0,0 +1,19 @@
+
+<div class="operation-form" style="margin-bottom: 15px;">
+  <strong>Translate</strong>
+  <form method="get" action="$translate" style="margin-left: 10px; margin-top: 5px;">
+    <input type="hidden" name="url" value="{{ url }}"/>
+    <table class="grid" cellpadding="0" cellspacing="0">
+      <tr>
+        <td>System:</td><td><select name="sourceSystem">{{ sources }}</select></td>
+      </tr>
+      <tr>
+        <td>Code:</td><td><select name="sourceCode">{{ codes }}</select></td>
+      </tr>
+      <tr>
+        <td>Target:</td><td><select name="targetSystem">{{ targets }}</select></td>
+      </tr>
+    </table>
+    <button type="submit" class="btn btn-sm btn-primary">Translate</button>
+  </form>
+</div>

package/tx/library/canonical-resource.js

@@ -111,7 +111,12 @@ class CanonicalResource {
       const fmt = this.versionAlgorithm() || other.versionAlgorithm() || this.guessVersionAlgorithmFromVersion(this.version);
       switch (fmt) {
         case 'semver':
-          return VersionUtilities.isThisOrLater(other.version, this.version, VersionPrecision.PATCH);
+          try {
+            return VersionUtilities.isThisOrLater(other.version, this.version, VersionPrecision.PATCH);
+          } catch (error) {
+            // other is not semver. Not much we can do
+            return false;
+          }
         case 'date':
           return this.dateIsMoreRecent(this.version, other.version);
         case 'integer':