fhirsmith 0.4.2 → 0.5.1

package/tx/library/capabilitystatement.js

@@ -1,5 +1,5 @@
 const {CanonicalResource} = require("./canonical-resource");
-const {VersionUtilities} = require("../../library/version-utilities");
+const {capabilityStatementFromR5, capabilityStatementToR5} = require("../xversion/xv-capabiliityStatement");
 
 /**
  * Represents a FHIR CapabilityStatement resource with version conversion support
@@ -15,7 +15,7 @@ class CapabilityStatement extends CanonicalResource {
   constructor(jsonObj, fhirVersion = 'R5') {
     super(jsonObj, fhirVersion);
     // Convert to R5 format internally (modifies input for performance)
-    this.jsonObj = this._convertToR5(jsonObj, fhirVersion);
+    this.jsonObj = capabilityStatementToR5(jsonObj, fhirVersion);
     this.validate();
     this.id = this.jsonObj.id;
   }
@@ -46,146 +46,7 @@ class CapabilityStatement extends CanonicalResource {
    * @returns {Object} JSON object
    */
   toJSON(version = 'R5') {
-    return this._convertFromR5(this.jsonObj, version);
-  }
-
-  /**
-   * Converts input CapabilityStatement to R5 format (modifies input object for performance)
-   * @param {Object} jsonObj - The input CapabilityStatement object
-   * @param {string} version - Source FHIR version
-   * @returns {Object} The same object, potentially modified to R5 format
-   * @private
-   */
-  _convertToR5(jsonObj, version) {
-    if (version === 'R5') {
-      return jsonObj; // Already R5, no conversion needed
-    }
-
-    if (version === 'R3') {
-      // R3: resourceType was "CapabilityStatement" (same as R4/R5)
-      // Convert identifier from single object to array if present
-      if (jsonObj.identifier && !Array.isArray(jsonObj.identifier)) {
-        jsonObj.identifier = [jsonObj.identifier];
-      }
-      return jsonObj;
-    }
-
-    if (version === 'R4') {
-      // R4 to R5: No major structural changes needed
-      return jsonObj;
-    }
-
-    throw new Error(`Unsupported FHIR version: ${version}`);
-  }
-
-  /**
-   * Converts R5 CapabilityStatement to target version format (clones object first)
-   * @param {Object} r5Obj - The R5 format CapabilityStatement object
-   * @param {string} targetVersion - Target FHIR version
-   * @returns {Object} New object in target version format
-   * @private
-   */
-  _convertFromR5(r5Obj, targetVersion) {
-    if (VersionUtilities.isR5Ver(targetVersion)) {
-      return r5Obj; // No conversion needed
-    }
-
-    // Clone the object to avoid modifying the original
-    const cloned = JSON.parse(JSON.stringify(r5Obj));
-
-    if (VersionUtilities.isR4Ver(targetVersion)) {
-      return this._convertR5ToR4(cloned);
-    } else if (VersionUtilities.isR3Ver(targetVersion)) {
-      return this._convertR5ToR3(cloned);
-    }
-
-    throw new Error(`Unsupported target FHIR version: ${targetVersion}`);
-  }
-
-  /**
-   * Converts R5 CapabilityStatement to R4 format
-   * @param {Object} r5Obj - Cloned R5 CapabilityStatement object
-   * @returns {Object} R4 format CapabilityStatement
-   * @private
-   */
-  _convertR5ToR4(r5Obj) {
-    // Remove R5-specific elements
-    if (r5Obj.versionAlgorithmString) {
-      delete r5Obj.versionAlgorithmString;
-    }
-    if (r5Obj.versionAlgorithmCoding) {
-      delete r5Obj.versionAlgorithmCoding;
-    }
-
-    return r5Obj;
-  }
-
-  /**
-   * Converts R5 CapabilityStatement to R3 format
-   * @param {Object} r5Obj - Cloned R5 CapabilityStatement object
-   * @returns {Object} R3 format CapabilityStatement
-   * @private
-   */
-  _convertR5ToR3(r5Obj) {
-    // First apply R4 conversions
-    const r4Obj = this._convertR5ToR4(r5Obj);
-
-    // Convert identifier array back to single object
-    if (r4Obj.identifier && Array.isArray(r4Obj.identifier)) {
-      if (r4Obj.identifier.length > 0) {
-        r4Obj.identifier = r4Obj.identifier[0];
-      } else {
-        delete r4Obj.identifier;
-      }
-    }
-
-    // Convert valueCanonical to valueUri throughout the object
-    this._convertCanonicalToUri(r5Obj);
-
-
-    // Convert rest.operation.definition from canonical string to Reference object
-    for (const rest of r4Obj.rest || []) {
-      for (const operation of rest.operation || []) {
-        if (typeof operation.definition === 'string') {
-          operation.definition = {reference: operation.definition};
-        }
-        for (const resource of rest.resource || []) {
-          delete resource.operation;
-        }
-      }
-    }
-
-    return r4Obj;
-  }
-
-  /**
-   * Recursively converts valueCanonical to valueUri in an object
-   * R3 doesn't have canonical type, so valueCanonical must become valueUri
-   * @param {Object} obj - Object to convert
-   * @private
-   */
-  _convertCanonicalToUri(obj) {
-    if (!obj || typeof obj !== 'object') {
-      return;
-    }
-
-    if (Array.isArray(obj)) {
-      obj.forEach(item => this._convertCanonicalToUri(item));
-      return;
-    }
-
-    // Convert valueCanonical to valueUri
-    if (obj.valueCanonical !== undefined) {
-      obj.valueUri = obj.valueCanonical;
-      delete obj.valueCanonical;
-    }
-
-    // Recurse into all properties
-    for (const key of Object.keys(obj)) {
-      if (typeof obj[key] === 'object') {
-        this._convertCanonicalToUri(obj[key]);
-      }
-    }
+    return capabilityStatementFromR5(this.jsonObj, version);
   }
 
   /**

package/tx/library/codesystem.js

@@ -1,6 +1,7 @@
 const { Language } = require("../../library/languages");
 const {CanonicalResource} = require("./canonical-resource");
-const {VersionUtilities} = require("../../library/version-utilities");
+const {codeSystemFromR5, codeSystemToR5} = require("../xversion/xv-codesystem");
+const {getValuePrimitive} = require("../../library/utilities");
 
 const CodeSystemContentMode = Object.freeze({
   Complete: 'complete',
@@ -27,12 +28,14 @@ class CodeSystem extends CanonicalResource {
    * @param {string} jsonObj.status - Publication status (draft|active|retired|unknown)
    * @param {Object[]} [jsonObj.concept] - Array of concept definitions
    */
-  constructor(jsonObj, fhirVersion = 'R5') {
+  constructor(jsonObj, fhirVersion = 'R5', noMaps = false) {
     super(jsonObj, fhirVersion);
     // Convert to R5 format internally (modifies input for performance)
-    this.jsonObj = this._convertToR5(this.jsonObj, fhirVersion);
-    this.validate();
-    this.buildMaps();
+    this.jsonObj = codeSystemToR5(this.jsonObj, fhirVersion);
+    if (!noMaps) {
+      this.validate();
+      this.buildMaps();
+    }
   }
 
   /**
@@ -81,175 +84,10 @@ class CodeSystem extends CanonicalResource {
    * @returns {string} JSON string
    */
   toJSONString(version = 'R5') {
-    const outputObj = this._convertFromR5(this.jsonObj, version);
+    const outputObj = codeSystemFromR5(this.jsonObj, version);
     return JSON.stringify(outputObj);
   }
 
-  /**
-   * Converts input CodeSystem to R5 format (modifies input object for performance)
-   * @param {Object} jsonObj - The input CodeSystem object
-   * @param {string} version - Source FHIR version
-   * @returns {Object} The same object, potentially modified to R5 format
-   * @private
-   */
-  _convertToR5(jsonObj, version) {
-    if (version === 'R5') {
-      return jsonObj; // Already R5, no conversion needed
-    }
-
-    if (version === 'R3') {
-      // R3 to R5: Convert identifier from single object to array
-      if (jsonObj.identifier && !Array.isArray(jsonObj.identifier)) {
-        jsonObj.identifier = [jsonObj.identifier];
-      }
-      return jsonObj;
-    }
-
-    if (version === 'R4') {
-      // R4 to R5: identifier is already an array, no conversion needed
-      return jsonObj;
-    }
-
-    throw new Error(`Unsupported FHIR version: ${version}`);
-  }
-
-  /**
-   * Converts R5 CodeSystem to target version format (clones object first)
-   * @param {Object} r5Obj - The R5 format CodeSystem object
-   * @param {string} targetVersion - Target FHIR version
-   * @returns {Object} New object in target version format
-   * @private
-   */
-  _convertFromR5(r5Obj, targetVersion) {
-    if (VersionUtilities.isR5Ver(targetVersion)) {
-      return r5Obj; // No conversion needed
-    }
-
-    // Clone the object to avoid modifying the original
-    const cloned = JSON.parse(JSON.stringify(r5Obj));
-
-    if (VersionUtilities.isR4Ver(targetVersion)) {
-      return this._convertR5ToR4(cloned);
-    } else if (VersionUtilities.isR3Ver(targetVersion)) {
-      return this._convertR5ToR3(cloned);
-    }
-
-    throw new Error(`Unsupported target FHIR version: ${targetVersion}`);
-  }
-
-  /**
-   * Converts R5 CodeSystem to R4 format
-   * @param {Object} r5Obj - Cloned R5 CodeSystem object
-   * @returns {Object} R4 format CodeSystem
-   * @private
-   */
-  _convertR5ToR4(r5Obj) {
-    // Remove R5-specific elements that don't exist in R4
-    if (r5Obj.versionAlgorithmString) {
-      delete r5Obj.versionAlgorithmString;
-    }
-    if (r5Obj.versionAlgorithmCoding) {
-      delete r5Obj.versionAlgorithmCoding;
-    }
-
-    // Filter out R5-only filter operators
-    if (r5Obj.filter && Array.isArray(r5Obj.filter)) {
-      r5Obj.filter = r5Obj.filter.map(filter => {
-        if (filter.operator && Array.isArray(filter.operator)) {
-          // Remove R5-only operators like 'generalizes'
-          filter.operator = filter.operator.filter(op =>
-            !this._isR5OnlyFilterOperator(op)
-          );
-        }
-        return filter;
-      }).filter(filter =>
-        // Remove filters that have no valid operators left
-        !filter.operator || filter.operator.length > 0
-      );
-    }
-
-    return r5Obj;
-  }
-
-  /**
-   * Converts R5 CodeSystem to R3 format
-   * @param {Object} r5Obj - Cloned R5 CodeSystem object
-   * @returns {Object} R3 format CodeSystem
-   * @private
-   */
-  _convertR5ToR3(r5Obj) {
-    // First apply R4 conversions
-    const r4Obj = this._convertR5ToR4(r5Obj);
-
-    // R5/R4 to R3: Convert identifier from array back to single object
-    if (r4Obj.identifier && Array.isArray(r4Obj.identifier)) {
-      if (r4Obj.identifier.length > 0) {
-        // Take the first identifier if multiple exist
-        r4Obj.identifier = r4Obj.identifier[0];
-      } else {
-        // Remove empty array
-        delete r4Obj.identifier;
-      }
-    }
-
-    // Remove additional R4-specific elements that don't exist in R3
-    if (r4Obj.supplements) {
-      delete r4Obj.supplements;
-    }
-
-    // R3 has more limited filter operator support
-    if (r4Obj.filter && Array.isArray(r4Obj.filter)) {
-      r4Obj.filter = r4Obj.filter.map(filter => {
-        if (filter.operator && Array.isArray(filter.operator)) {
-          // Keep only R3-compatible operators
-          filter.operator = filter.operator.filter(op =>
-            this._isR3CompatibleFilterOperator(op)
-          );
-        }
-        return filter;
-      }).filter(filter =>
-        // Remove filters that have no valid operators left
-        !filter.operator || filter.operator.length > 0
-      );
-    }
-
-    return r4Obj;
-  }
-
-  /**
-   * Checks if a filter operator is R5-only
-   * @param {string} operator - Filter operator code
-   * @returns {boolean} True if operator is R5-only
-   * @private
-   */
-  _isR5OnlyFilterOperator(operator) {
-    const r5OnlyOperators = [
-      'generalizes',  // Added in R5
-      // Add other R5-only operators as they're identified
-    ];
-    return r5OnlyOperators.includes(operator);
-  }
-
-  /**
-   * Checks if a filter operator is compatible with R3
-   * @param {string} operator - Filter operator code
-   * @returns {boolean} True if operator is R3-compatible
-   * @private
-   */
-  _isR3CompatibleFilterOperator(operator) {
-    const r3CompatibleOperators = [
-      '=',           // Equal
-      'is-a',        // Is-A relationship
-      'descendent-of', // Descendant of (note: R3 spelling)
-      'is-not-a',    // Is-Not-A relationship
-      'regex',       // Regular expression
-      'in',          // In set
-      'not-in',      // Not in set
-      'exists',      // Property exists
-    ];
-    return r3CompatibleOperators.includes(operator);
-  }
-
   /**
    * Validates that this is a proper CodeSystem resource
    * @throws {Error} If validation fails
@@ -510,11 +348,11 @@ class CodeSystem extends CanonicalResource {
     }
 
     concept.property.forEach(property => {
-      if (property.code === 'parent' && property.valueCode) {
+      if ((property.code === 'parent' || this.isPropUri(property.code, 'http://hl7.org/fhir/concept-properties#parent')) && property.valueCode) {
         // This concept has a parent
         this._addToChildToParentsMap(concept.code, property.valueCode);
         this._addToParentToChildrenMap(property.valueCode, concept.code);
-      } else if (property.code === 'child' && property.valueCode) {
+      } else if ((property.code === 'child' || this.isPropUri(property.code, 'http://hl7.org/fhir/concept-properties#child')) && property.valueCode) {
         // This concept has a child
         this._addToParentToChildrenMap(concept.code, property.valueCode);
         this._addToChildToParentsMap(property.valueCode, concept.code);
@@ -769,6 +607,14 @@ class CodeSystem extends CanonicalResource {
   set id(value) {
     this.jsonObj.id = value;
   }
+
+  isLangPack() {
+    return (this.jsonObj.extension || []).find(x => x.url == 'http://hl7.org/fhir/StructureDefinition/codesystem-supplement-type' && getValuePrimitive(x) == 'lang-pack');
+  }
+
+  isPropUri(code, uri) {
+    return (this.jsonObj.property || []).find(x => x.code == code && x.uri == uri);
+  }
 }
 
 module.exports = { CodeSystem, CodeSystemContentMode };

package/tx/library/conceptmap.js

@@ -1,5 +1,6 @@
 const {CanonicalResource} = require("./canonical-resource");
 const {VersionUtilities} = require("../../library/version-utilities");
+const {conceptMapToR5, conceptMapFromR5} = require("../xversion/xv-conceptmap");
 
 /**
  * Represents a FHIR ConceptMap resource with version conversion support
@@ -16,7 +17,7 @@ class ConceptMap extends CanonicalResource {
   constructor(jsonObj, fhirVersion = 'R5') {
     super(jsonObj, fhirVersion);
     // Convert to R5 format internally (modifies input for performance)
-    this.jsonObj = this._convertToR5(jsonObj, fhirVersion);
+    this.jsonObj = conceptMapToR5(jsonObj, fhirVersion);
     this.validate();
     this.id = this.jsonObj.id;
   }
@@ -37,226 +38,11 @@ class ConceptMap extends CanonicalResource {
    * @returns {string} JSON string
    */
   toJSONString(version = 'R5') {
-    const outputObj = this._convertFromR5(this.jsonObj, version);
+    const outputObj = conceptMapFromR5(this.jsonObj, version);
     return JSON.stringify(outputObj);
   }
 
-  /**
-   * Converts input ConceptMap to R5 format (modifies input object for performance)
-   * @param {Object} jsonObj - The input ConceptMap object
-   * @param {string} version - Source FHIR version
-   * @returns {Object} The same object, potentially modified to R5 format
-   * @private
-   */
-  _convertToR5(jsonObj, version) {
-    if (VersionUtilities.isR5Ver(version)) {
-      return jsonObj; // Already R5, no conversion needed
-    }
-
-    if (VersionUtilities.isR3Ver(version) || VersionUtilities.isR4Ver(version)) {
-      // Convert identifier from single object to array
-      if (jsonObj.identifier && !Array.isArray(jsonObj.identifier)) {
-        jsonObj.identifier = [jsonObj.identifier];
-      }
-
-      // Convert source/target to sourceScope/targetScope
-      if (jsonObj.source !== undefined) {
-        // Combine source + sourceVersion if both exist
-        if (jsonObj.sourceVersion) {
-          jsonObj.sourceScope = `${jsonObj.source}|${jsonObj.sourceVersion}`;
-          delete jsonObj.sourceVersion;
-        } else {
-          jsonObj.sourceScope = jsonObj.source;
-        }
-        delete jsonObj.source;
-      }
-
-      if (jsonObj.target !== undefined) {
-        // Combine target + targetVersion if both exist
-        if (jsonObj.targetVersion) {
-          jsonObj.targetScope = `${jsonObj.target}|${jsonObj.targetVersion}`;
-          delete jsonObj.targetVersion;
-        } else {
-          jsonObj.targetScope = jsonObj.target;
-        }
-        delete jsonObj.target;
-      }
-
-      // Convert equivalence to relationship in group.element.target
-      if (jsonObj.group && Array.isArray(jsonObj.group)) {
-        jsonObj.group.forEach(group => {
-          if (group.element && Array.isArray(group.element)) {
-            group.element.forEach(element => {
-              if (element.target && Array.isArray(element.target)) {
-                element.target.forEach(target => {
-                  if (target.equivalence && !target.relationship) {
-                    // Convert equivalence to relationship and keep both
-                    target.relationship = this._convertEquivalenceToRelationship(target.equivalence);
-                    // Keep equivalence for backward compatibility
-                  }
-                });
-              }
-            });
-          }
-        });
-      }
-
-      return jsonObj;
-    }
-
-    throw new Error(`Unsupported FHIR version: ${version}`);
-  }
-
-  /**
-   * Converts R5 ConceptMap to target version format (clones object first)
-   * @param {Object} r5Obj - The R5 format ConceptMap object
-   * @param {string} targetVersion - Target FHIR version
-   * @returns {Object} New object in target version format
-   * @private
-   */
-  _convertFromR5(r5Obj, targetVersion) {
-    if (VersionUtilities.isR5Ver(targetVersion)) {
-      return r5Obj; // No conversion needed
-    }
-
-    // Clone the object to avoid modifying the original
-    const cloned = JSON.parse(JSON.stringify(r5Obj));
-
-    if (VersionUtilities.isR4Ver(targetVersion)) {
-      return this._convertR5ToR4(cloned);
-    } else if (VersionUtilities.isR3Ver(targetVersion)) {
-      return this._convertR5ToR3(cloned);
-    }
-
-    throw new Error(`Unsupported target FHIR version: ${targetVersion}`);
-  }
-
-  /**
-   * Converts R5 ConceptMap to R4 format
-   * @param {Object} r5Obj - Cloned R5 ConceptMap object
-   * @returns {Object} R4 format ConceptMap
-   * @private
-   */
-  _convertR5ToR4(r5Obj) {
-    // Remove R5-specific elements
-    if (r5Obj.versionAlgorithmString) {
-      delete r5Obj.versionAlgorithmString;
-    }
-    if (r5Obj.versionAlgorithmCoding) {
-      delete r5Obj.versionAlgorithmCoding;
-    }
-    if (r5Obj.property) {
-      delete r5Obj.property;
-    }
-    if (r5Obj.additionalAttribute) {
-      delete r5Obj.additionalAttribute;
-    }
-
-    // Convert identifier array back to single object
-    if (r5Obj.identifier && Array.isArray(r5Obj.identifier)) {
-      if (r5Obj.identifier.length > 0) {
-        r5Obj.identifier = r5Obj.identifier[0]; // Take first identifier
-      } else {
-        delete r5Obj.identifier;
-      }
-    }
-
-    // Convert sourceScope/targetScope back to source/target + version
-    if (r5Obj.sourceScope) {
-      const parts = r5Obj.sourceScope.split('|');
-      r5Obj.source = parts[0];
-      if (parts.length > 1) {
-        r5Obj.sourceVersion = parts[1];
-      }
-      delete r5Obj.sourceScope;
-    }
-
-    if (r5Obj.targetScope) {
-      const parts = r5Obj.targetScope.split('|');
-      r5Obj.target = parts[0];
-      if (parts.length > 1) {
-        r5Obj.targetVersion = parts[1];
-      }
-      delete r5Obj.targetScope;
-    }
-
-    // Convert relationship back to equivalence in group.element.target
-    if (r5Obj.group && Array.isArray(r5Obj.group)) {
-      r5Obj.group.forEach(group => {
-        if (group.element && Array.isArray(group.element)) {
-          group.element.forEach(element => {
-            if (element.target && Array.isArray(element.target)) {
-              element.target.forEach(target => {
-                // If we have both equivalence and relationship, prefer equivalence for R4
-                if (target.relationship && !target.equivalence) {
-                  target.equivalence = this._convertRelationshipToEquivalence(target.relationship);
-                }
-                // Remove R5-only relationship field
-                delete target.relationship;
-              });
-            }
-          });
-        }
-      });
-    }
-
-    return r5Obj;
-  }
-
-  /**
-   * Converts R5 ConceptMap to R3 format
-   * @param {Object} r5Obj - Cloned R5 ConceptMap object
-   * @returns {Object} R3 format ConceptMap
-   * @private
-   */
-  _convertR5ToR3(r5Obj) {
-    // First apply R4 conversions
-    const r4Obj = this._convertR5ToR4(r5Obj);
-
-    // R3 has the same structure as R4 for the elements we care about
-    return r4Obj;
-  }
-
-  /**
-   * Converts R3/R4 equivalence to R5 relationship
-   * @param {string} equivalence - R3/R4 equivalence value
-   * @returns {string} R5 relationship value
-   * @private
-   */
-  _convertEquivalenceToRelationship(equivalence) {
-    const equivalenceToRelationship = {
-      'relatedto': 'related-to',
-      'equivalent': 'equivalent',
-      'equal': 'equivalent',
-      'wider': 'source-is-broader-than-target',
-      'subsumes': 'source-is-broader-than-target',
-      'narrower': 'source-is-narrower-than-target',
-      'specializes': 'source-is-narrower-than-target',
-      'inexact': 'not-related-to',
-      'unmatched': 'not-related-to',
-      'disjoint': 'not-related-to'
-    };
-    return equivalenceToRelationship[equivalence] || 'related-to';
-  }
-
-  /**
-   * Converts R5 relationship back to R3/R4 equivalence
-   * @param {string} relationship - R5 relationship value
-   * @returns {string} R3/R4 equivalence value
-   * @private
-   */
-  _convertRelationshipToEquivalence(relationship) {
-    const relationshipToEquivalence = {
-      'related-to': 'relatedto',
-      'equivalent': 'equivalent',
-      'source-is-broader-than-target': 'wider',
-      'source-is-narrower-than-target': 'narrower',
-      'not-related-to': 'unmatched'
-    };
-    return relationshipToEquivalence[relationship] || 'relatedto';
-  }
-
-  /**
+    /**
    * Gets the FHIR version this ConceptMap was loaded from
    * @returns {string} FHIR version ('R3', 'R4', or 'R5')
    */

package/tx/library/designations.js

@@ -562,6 +562,16 @@ class Designations {
 
     if (!langList || langList.length == 0) {
       // No language list, prefer base designations
+      for (const cd of this.designations) {
+        if (this._isPreferred(cd) && cd.isActive()) {
+          return cd;
+        }
+      }
+      for (const cd of this.designations) {
+        if (this.isDisplay(cd) && cd.isActive()) {
+          return cd;
+        }
+      }
       for (const cd of this.designations) {
         if (this.isDisplay(cd)) {
           return cd;
@@ -717,7 +727,10 @@ class Designations {
       (cd.use.system === DesignationUse.DISPLAY.system &&
         cd.use.code === DesignationUse.DISPLAY.code) ||
       (cd.use.system === DesignationUse.PREFERRED.system &&
-        cd.use.code === DesignationUse.PREFERRED.code);
+        cd.use.code === DesignationUse.PREFERRED.code) ||
+      // snomed
+      (cd.use.system === 'http://snomed.info/sct' &&
+        cd.use.code === '900000000000013009');
   }
 
   /**

package/tx/library/extensions.js

@@ -111,6 +111,13 @@ const Extensions = {
       exp.extension = [];
     }
     exp.extension.push({ url : url, valueBoolean : b });
+  },
+
+  addString(exp, url, s) {
+    if (!exp.extension) {
+      exp.extension = [];
+    }
+    exp.extension.push({ url : url, valueString : s });
   }
 }