fhirsmith 0.4.2 → 0.5.1

package/tx/library/namingsystem.js

@@ -1,4 +1,4 @@
-const {VersionUtilities} = require("../../library/version-utilities");
+const {namingSystemToR5, namingSystemFromR5} = require("../xversion/xv-namingsystem");
 
 /**
  * Represents a FHIR NamingSystem resource with version conversion support
@@ -40,7 +40,7 @@ class NamingSystem {
   constructor(jsonObj, version = 'R5') {
     this.version = version;
     // Convert to R5 format internally (modifies input for performance)
-    this.jsonObj = this._convertToR5(jsonObj, version);
+    this.jsonObj = namingSystemToR5(jsonObj, version);
     this.validate();
   }
 
@@ -50,96 +50,10 @@ class NamingSystem {
    * @returns {string} JSON string
    */
   toJSONString(version = 'R5') {
-    const outputObj = this._convertFromR5(this.jsonObj, version);
+    const outputObj = namingSystemFromR5(this.jsonObj, version);
     return JSON.stringify(outputObj);
   }
 
-  /**
-   * Converts input NamingSystem to R5 format (modifies input object for performance)
-   * @param {Object} jsonObj - The input NamingSystem 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: Remove replacedBy field (we ignore it completely)
-      if (jsonObj.replacedBy !== undefined) {
-        delete jsonObj.replacedBy;
-      }
-      return jsonObj;
-    }
-
-    if (version === 'R4') {
-      // R4 to R5: No structural conversion needed
-      // R5 is backward compatible for the structural elements we care about
-      return jsonObj;
-    }
-
-    throw new Error(`Unsupported FHIR version: ${version}`);
-  }
-
-  /**
-   * Converts R5 NamingSystem to target version format (clones object first)
-   * @param {Object} r5Obj - The R5 format NamingSystem 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 NamingSystem to R4 format
-   * @param {Object} r5Obj - Cloned R5 NamingSystem object
-   * @returns {Object} R4 format NamingSystem
-   * @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;
-    }
-
-    return r5Obj;
-  }
-
-  /**
-   * Converts R5 NamingSystem to R3 format
-   * @param {Object} r5Obj - Cloned R5 NamingSystem object
-   * @returns {Object} R3 format NamingSystem
-   * @private
-   */
-  _convertR5ToR3(r5Obj) {
-    // First apply R4 conversions
-    const r4Obj = this._convertR5ToR4(r5Obj);
-
-    // R3 doesn't have some R4/R5 fields, but we'll just let them through
-    // since most additions are backward compatible in JSON
-
-    return r4Obj;
-  }
 
   /**
    * Gets the FHIR version this NamingSystem was loaded from

package/tx/library/operation-outcome.js

@@ -28,9 +28,10 @@ class Issue extends Error {
       code: this.cause,
       details: {
         text: this.message
-      },
-      location: [ this.path ],
-      expression: [ this.path ]
+      }
+    }
+    if (this.path) {
+      res.expression = [this.path]
     }
     if (this.issueCode) {
       res.details.coding = [{ system: "http://hl7.org/fhir/tools/CodeSystem/tx-issue-type", code : this.issueCode }];
@@ -82,6 +83,10 @@ class OperationOutcome {
     this.jsonObj = jsonObj ? jsonObj : { "resourceType": "OperationOutcome" };
   }
 
+  addIssueIfNew(newIssue) {
+    return this.addIssue(newIssue, true);
+  }
+
   addIssue(newIssue, ifNotDuplicate = false) {
     validateParameter(newIssue, "newIssue", Object);
     if (ifNotDuplicate) {

package/tx/library/parameters.js

@@ -1,10 +1,11 @@
 const {getValuePrimitive, getValueDT} = require("../../library/utilities");
+const {parametersToR5} = require("../xversion/xv-parameters");
 
 class Parameters {
   jsonObj;
 
-  constructor (jsonObj = null) {
-    this.jsonObj = jsonObj ? jsonObj : { "resourceType": "Parameters" };
+  constructor (jsonObj = null, fhirVersion = 'R5') {
+    this.jsonObj = parametersToR5(jsonObj ? jsonObj : { "resourceType": "Parameters" }, fhirVersion);
   }
 
   addParamStr(name, value) {

package/tx/library/renderer.js

@@ -24,7 +24,7 @@ class Renderer {
       if (arg.systemUri !== undefined && arg.version !== undefined && arg.code !== undefined && arg.display !== undefined) {
         // It's a Coding
         return this.displayCodedCoding(arg);
-      } else if (arg.coding !== undefined) {
+      } else if (arg.coding !== undefined || arg.text) {
         // It's a CodeableConcept
         return this.displayCodedCodeableConcept(arg);
       } else if (arg.systemUri !== undefined && arg.version !== undefined) {
@@ -74,11 +74,15 @@ class Renderer {
 
   displayCodedCodeableConcept(code) {
     let result = '';
-    for (const c of code.coding) {
-      if (result) {
-        result = result + ', ';
+    if (code.text && !code.coding) {
+      result = '"'+code.text+'"';
+    } else {
+      for (const c of code.coding || []) {
+        if (result) {
+          result = result + ', ';
+        }
+        result = result + this.displayCodedCoding(c);
       }
-      result = result + this.displayCodedCoding(c);
     }
     return '[' + result + ']';
   }
@@ -1280,7 +1284,7 @@ class Renderer {
     return div_.toString();
   }
 
-  async renderCapabilityRest(x, rest, cs) {
+  async renderCapabilityRest(x, rest) {
     x.h3().tx(`REST ${rest.mode || 'server'} Definition`);
 
     if (rest.documentation) {

package/tx/library/terminologycapabilities.js

@@ -1,5 +1,5 @@
 const {CanonicalResource} = require("./canonical-resource");
-const {VersionUtilities} = require("../../library/version-utilities");
+const {terminologyCapabilitiesToR5, terminologyCapabilitiesFromR5} = require("../xversion/xv-terminologyCapabilities");
 
 /**
  * Represents a FHIR TerminologyCapabilities resource with version conversion support.
@@ -17,7 +17,7 @@ class TerminologyCapabilities 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 = terminologyCapabilitiesToR5(jsonObj, fhirVersion);
     this.validate();
     this.id = this.jsonObj.id;
   }
@@ -38,7 +38,7 @@ class TerminologyCapabilities extends CanonicalResource {
    * @returns {string} JSON string
    */
   toJSONString(version = 'R5') {
-    const outputObj = this._convertFromR5(this.jsonObj, version);
+    const outputObj = terminologyCapabilitiesFromR5(this.jsonObj, version);
     return JSON.stringify(outputObj);
   }
 
@@ -51,246 +51,6 @@ class TerminologyCapabilities extends CanonicalResource {
     return this._convertFromR5(this.jsonObj, version);
   }
 
-  /**
-   * Converts input TerminologyCapabilities to R5 format (modifies input object for performance)
-   * @param {Object} jsonObj - The input TerminologyCapabilities 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 === 'R4') {
-      // R4 to R5: No major structural changes needed for TerminologyCapabilities
-      return jsonObj;
-    }
-
-    if (VersionUtilities.isR3Ver(version)) {
-      // R3: TerminologyCapabilities doesn't exist - it's a Parameters resource
-      // Convert from Parameters format to TerminologyCapabilities
-      return this._convertParametersToR5(jsonObj);
-    }
-
-    throw new Error(`Unsupported FHIR version: ${version}`);
-  }
-
-  /**
-   * Converts R3 Parameters format to R5 TerminologyCapabilities
-   * @param {Object} params - The Parameters resource
-   * @returns {Object} TerminologyCapabilities in R5 format
-   * @private
-   */
-  _convertParametersToR5(params) {
-    if (params.resourceType !== 'Parameters') {
-      throw new Error('R3 TerminologyCapabilities must be a Parameters resource');
-    }
-
-    const result = {
-      resourceType: 'TerminologyCapabilities',
-      id: params.id,
-      status: 'active', // Default, as Parameters doesn't carry this
-      kind: 'instance', // Default for terminology server capabilities
-      codeSystem: []
-    };
-
-    const parameters = params.parameter || [];
-    let currentSystem = null;
-
-    for (const param of parameters) {
-      switch (param.name) {
-        case 'url':
-          result.url = param.valueUri;
-          break;
-        case 'version':
-          if (currentSystem) {
-            // This is a code system version
-            if (param.valueCode) {
-              currentSystem.version = currentSystem.version || [];
-              currentSystem.version.push({ code: param.valueCode });
-            }
-            // Empty version parameter means no specific version
-          } else {
-            // This is the TerminologyCapabilities version
-            result.version = param.valueCode || param.valueString;
-          }
-          break;
-        case 'date':
-          result.date = param.valueDateTime;
-          break;
-        case 'system':
-          // Start a new code system
-          currentSystem = { uri: param.valueUri };
-          result.codeSystem.push(currentSystem);
-          break;
-        case 'expansion.parameter':
-          result.expansion = result.expansion || { parameter: [] };
-          result.expansion.parameter.push({ name: param.valueCode });
-          break;
-      }
-    }
-
-    return result;
-  }
-
-  /**
-   * Converts R5 TerminologyCapabilities to target version format (clones object first)
-   * @param {Object} r5Obj - The R5 format TerminologyCapabilities 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 TerminologyCapabilities to R4 format
-   * @param {Object} r5Obj - Cloned R5 TerminologyCapabilities object
-   * @returns {Object} R4 format TerminologyCapabilities
-   * @private
-   */
-  _convertR5ToR4(r5Obj) {
-    // Remove R5-specific elements
-    if (r5Obj.versionAlgorithmString) {
-      delete r5Obj.versionAlgorithmString;
-    }
-    if (r5Obj.versionAlgorithmCoding) {
-      delete r5Obj.versionAlgorithmCoding;
-    }
-
-    // Convert valueCanonical to valueUri throughout the object
-    this._convertCanonicalToUri(r5Obj);
-
-    return r5Obj;
-  }
-
-  /**
-   * Converts R5 TerminologyCapabilities to R3 format (Parameters resource)
-   * In R3, TerminologyCapabilities didn't exist - we represent it as a Parameters resource
-   * @param {Object} r5Obj - Cloned R5 TerminologyCapabilities object
-   * @returns {Object} R3 format Parameters resource
-   * @private
-   */
-  _convertR5ToR3(r5Obj) {
-    const params = {
-      resourceType: 'Parameters',
-      id: r5Obj.id,
-      parameter: []
-    };
-
-    // Add url parameter
-    if (r5Obj.url) {
-      params.parameter.push({
-        name: 'url',
-        valueUri: r5Obj.url
-      });
-    }
-
-    // Add version parameter
-    if (r5Obj.version) {
-      params.parameter.push({
-        name: 'version',
-        valueCode: r5Obj.version
-      });
-    }
-
-    // Add date parameter
-    if (r5Obj.date) {
-      params.parameter.push({
-        name: 'date',
-        valueDateTime: r5Obj.date
-      });
-    }
-
-    // Add code systems with their versions
-    for (const codeSystem of r5Obj.codeSystem || []) {
-      // Add system parameter
-      params.parameter.push({
-        name: 'system',
-        valueUri: codeSystem.uri
-      });
-
-      // Add version parameter(s) for this code system
-      if (codeSystem.version && codeSystem.version.length > 0) {
-        for (const ver of codeSystem.version) {
-          if (ver.code) {
-            params.parameter.push({
-              name: 'version',
-              valueCode: ver.code
-            });
-          } else {
-            // Empty version parameter when no specific version
-            params.parameter.push({
-              name: 'version'
-            });
-          }
-        }
-      } else {
-        // No version specified for this code system
-        params.parameter.push({
-          name: 'version'
-        });
-      }
-    }
-
-    // Add expansion parameters
-    if (r5Obj.expansion && r5Obj.expansion.parameter) {
-      for (const expParam of r5Obj.expansion.parameter) {
-        params.parameter.push({
-          name: 'expansion.parameter',
-          valueCode: expParam.name
-        });
-      }
-    }
-
-    return params;
-  }
-
-  /**
-   * Recursively converts valueCanonical to valueUri in an object
-   * R3/R4 doesn't have canonical type in the same way, 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]);
-      }
-    }
-  }
 
   /**
    * Validates that this is a proper TerminologyCapabilities resource