fhirsmith 0.8.5 → 0.9.0

package/root-template.html

@@ -90,8 +90,9 @@
 			<div class="inner-wrapper">
 				<p>
                     <a href="http://www.hl7.org/fhir" style="color: gold" title="Fast Healthcare Interoperability Resources - Home Page"><img border="0" src="/icon-fhir-16.png" style="vertical-align: text-bottom"/> <b>FHIR</b></a> &copy; HL7.org 2011+.  &nbsp;|&nbsp;
-                    <a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" style="color: gold"><img border="0" src="/FHIRsmith16.png" style="vertical-align: text-bottom"/> FHIRsmith</a>  [%ver%]  &copy; HealthIntersections.com.au 2023+ &nbsp;|&nbsp; ([%ms%] ms)
-                    &nbsp;
+                    <a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" style="color: gold"><img border="0" src="/FHIRsmith16.png" style="vertical-align: text-bottom"/> FHIRsmith</a>  [%ver%]  &copy; HealthIntersections.com.au 2023+ &nbsp;|
+                    &nbsp; ([%ms%] ms)
+                    [%sponsorMessage%]
         </p>
 			</div>  <!-- /inner-wrapper -->
 		</div>  <!-- /container -->

package/server.js

@@ -28,7 +28,7 @@ try {
 }
 
 const Logger = require('./library/logger');
-const serverLog = Logger.getInstance().child({ module: 'server' });
+const serverLog = Logger.getInstance(config.logging || {}).child({ module: 'server' });
 const packageJson = require('./package.json');
 
 // Startup banner
@@ -64,6 +64,7 @@ const FolderModule = require("./folder/folder");
 const ExtensionTrackerModule = require("./extension-tracker/extension-tracker");
 
 htmlServer.useLog(serverLog);
+htmlServer.setSponsorMessage(config.sponsorMessage ? config.sponsorMessage : '');
 
 const app = express();
 
@@ -386,22 +387,44 @@ async function buildRootPageContent() {
 
   // Memory usage
   const memUsage = process.memoryUsage();
-  const heapUsedMB = (memUsage.heapUsed / 1024 / 1024).toFixed(2);
-  const heapAvailableMB = ((memUsage.heapTotal - memUsage.heapUsed) / 1024 / 1024).toFixed(2);
-  const rssMB = (memUsage.rss / 1024 / 1024).toFixed(2);
-  const freeMemMB = (os.freemem() / 1024 / 1024).toFixed(0);
+  const heapStats = v8.getHeapStatistics();
+
+  // V8 heap: used vs limit
+  const v8UsedMB = (memUsage.heapUsed / 1024 / 1024).toFixed(0);
+  const v8LimitMB = (heapStats.heap_size_limit / 1024 / 1024).toFixed(0);
+  const v8PCT = (memUsage.heapUsed * 100) / heapStats.heap_size_limit;
+
+  // Process RSS vs cgroup limit (or system total)
+  const rssMB = (memUsage.rss / 1024 / 1024).toFixed(0);
+  let memLimit;
+  try {
+    const raw = fs.readFileSync('/sys/fs/cgroup/memory.max', 'utf8').trim();
+    memLimit = raw === 'max' ? os.totalmem() : parseInt(raw);
+  } catch {
+    memLimit = os.totalmem();
+  }
+  const memLimitMB = (memLimit / 1024 / 1024).toFixed(0);
+  const processPCT = (memUsage.rss * 100) / memLimit;
+
+  // System memory
   const totalMemMB = (os.totalmem() / 1024 / 1024).toFixed(0);
+  const usedMemMB = ((os.totalmem() - os.freemem()) / 1024 / 1024).toFixed(0);
+  const sysMemPCT = ((os.totalmem() - os.freemem()) * 100) / os.totalmem();
+
+  // Average requests per minute
+  const uptimeMinutesTotal = uptimeMs / 60000;
+  const avgReqPerMin = uptimeMinutesTotal > 0 ? (stats.requestCount / uptimeMinutesTotal).toFixed(1) : '0.0';
 
   content += '<table class="grid">';
   content += '<tr>';
   content += `<td><strong>Uptime:</strong> ${escape(uptimeStr)}</td>`;
   content += `<td><strong>Request Count:</strong> ${stats.requestCount} (static: ${stats.staticRequestCount})</td>`;
-  content += `<td><strong>Free Memory:</strong> ${freeMemMB} MB of ${totalMemMB} MB</td>`;
+  content += `<td><strong>Avg Requests/min:</strong> ${avgReqPerMin}</td>`;
   content += '</tr>';
   content += '<tr>';
-  content += `<td><strong>Heap Used:</strong> ${heapUsedMB} MB</td>`;
-  content += `<td><strong>Heap Available:</strong> ${heapAvailableMB} MB</td>`;
-  content += `<td><strong>Process Memory:</strong> ${rssMB} MB</td>`;
+  content += `<td style="background-color:${pctColor(v8PCT)}"><strong>V8 Memory:</strong> ${v8UsedMB} MB of ${v8LimitMB} MB (${v8PCT.toFixed(0)}%)</td>`;
+  content += `<td style="background-color:${pctColor(processPCT)}"><strong>Process Memory:</strong> ${rssMB} MB of ${memLimitMB} MB (${processPCT.toFixed(0)}%)</td>`;
+  content += `<td style="background-color:${pctColor(sysMemPCT)}"><strong>System Memory:</strong> ${usedMemMB} MB of ${totalMemMB} MB (${sysMemPCT.toFixed(0)}%)</td>`;
   content += '</tr>';
   content += getLogStats();
   content += '</table>';
@@ -543,10 +566,24 @@ app.get('/dashboard', async (req, res) => {
     // Memory usage
     const memUsage = process.memoryUsage();
     const heapStats = v8.getHeapStatistics();
-    const nodeMemPCT = (memUsage.heapUsed * 100) / heapStats.heap_size_limit;  // % of Node.js memory limit used
+    const v8PCT = (memUsage.heapUsed * 100) / heapStats.heap_size_limit;  // % of V8 heap limit used
+
+    // Process RSS as % of cgroup memory limit (or system total as fallback)
+    let memLimit;
+    try {
+      const raw = fs.readFileSync('/sys/fs/cgroup/memory.max', 'utf8').trim();
+      memLimit = raw === 'max' ? os.totalmem() : parseInt(raw);
+    } catch {
+      memLimit = os.totalmem();
+    }
+    const processPCT = (memUsage.rss * 100) / memLimit;
+
     const totalMemBytes = os.totalmem();
     const freeMemBytes = os.freemem();
     const sysMemPCT = ((totalMemBytes - freeMemBytes) * 100) / totalMemBytes;  // % of system memory used
+
+    const memMaxPCT = Math.max(v8PCT, processPCT, sysMemPCT);
+
     const fstats = fs.statfsSync(folders.logsDir());
     const diskPCT = 100 - ((fstats.bavail * 100) / fstats.blocks);  // % of disk used
 
@@ -555,8 +592,7 @@ app.get('/dashboard', async (req, res) => {
     content += '<tr>';
     content += `<td><strong>Uptime:</strong> ${escape(uptimeStr)}</td>`;
     content += `<td><strong>Request Count:</strong> ${stats.requestCount} (static: ${stats.staticRequestCount})</td>`;
-    content += `<td style="background-color:${pctColor(nodeMemPCT)}"><strong>Node Memory:</strong> ${nodeMemPCT.toFixed(0)}%</td>`;
-    content += `<td style="background-color:${pctColor(sysMemPCT)}"><strong>System Memory:</strong> ${sysMemPCT.toFixed(0)}%</td>`;
+    content += `<td style="background-color:${pctColor(memMaxPCT)}"><strong>Memory:</strong> ${v8PCT.toFixed(0)}% V8, ${processPCT.toFixed(0)}% Process, ${sysMemPCT.toFixed(0)}% System</td>`;
     content += `<td style="background-color:${pctColor(diskPCT)}"><strong>Disk:</strong> ${diskPCT.toFixed(0)}%</td>`;
     content += '</tr>';
     content += '</table>';

package/translations/Messages.properties

@@ -1274,7 +1274,7 @@ VALUESET_SHAREABLE_MISSING = Published value sets SHOULD conform to the Shareabl
 VALUESET_SHAREABLE_MISSING_HL7 = Value sets published by HL7 SHALL conform to the ShareableValueSet profile, which says that the element ValueSet.{0} is mandatory, but it is not present
 VALUESET_SUPPLEMENT_MISSING_one = Required supplement not found: {1}
 VALUESET_SUPPLEMENT_MISSING_other = Required supplements not found: {1}
-VALUESET_TOO_COSTLY = The value set ''{0}'' expansion has too many codes to display ({1})
+VALUESET_TOO_COSTLY = The value set ''{0}'' expansion has too many codes to produce ({1})
 VALUESET_TOO_COSTLY_COUNT = The value set ''{0}'' expansion has {2} codes, which is too many to display ({1})
 VALUESET_TOO_COSTLY_TIME = The value set ''{0}'' {2} took too long to process (>{1}sec)
 VALUESET_UNC_SYSTEM_WARNING = Unknown System ''{0}'' specified, so Concepts and Filters can''t be checked (Details: {1})
@@ -1511,3 +1511,4 @@ CONFORMANCE_STATEMENT_WORD = The html source contains the word ''{0}'' but it is
 VALUESET_CODE_CONCEPT_HINT = {3}. Note that the display in the ValueSet does not have to match; this check exists to help check that it''s not accidentally the wrong code
 VALUESET_CODE_CONCEPT_HINT_VER ={3}. Note that the display in the ValueSet does not have to match; this check exists to help check that it''s not accidentally the wrong code
 TERMINOLOGY_TX_SYSTEM_UNSUPPORTED = The code cannot be checked because codeSystem ''{0}'' version ''{1}'' is not supported ({2})
+INVALID_REGEX = The regex ''{0}'' is not valid: {1}

package/translations/rendering-phrases.properties

@@ -1214,4 +1214,6 @@ CONSENT_HT_RESOURCE_TYPE = Resource Type
 CONSENT_HT_DOC_TYPE = Document Type
 CONSENT_HT_CODE = Code
 WEB_SOURCE = Web Source
-GENERAL_COPY = Click to Copy
+GENERAL_COPY = Click to Copy
+CODESYSTEM_LVL = Level
+FEATURE = Feature

package/tx/cs/cs-api.js

@@ -719,7 +719,11 @@ class CodeSystemProvider {
     return false;
   }
 
+  hasMultiHierarchy() {
+    return false;
+  }
   /**
+   *
    * @returns {string} valueset for the code system
    */
   valueSet() {

package/tx/cs/cs-country.js

@@ -2,6 +2,7 @@ const { CodeSystemProvider, FilterExecutionContext } = require('../../tx/cs/cs-a
 const assert = require('assert');
 const { CodeSystem } = require("../library/codesystem");
 const {CodeSystemFactoryProvider} = require("./cs-api");
+const regexUtilities = require("../../library/regex-utilities");
 
 class CountryCodeConcept {
   constructor(userDefined, code, display, french) {
@@ -199,7 +200,7 @@ class CountryCodeServices extends CodeSystemProvider {
 
       try {
         // Create regex with anchors to match the Pascal implementation (^value$)
-        const regex = new RegExp('^' + value + '$');
+        const regex = regexUtilities.compile('^' + value + '$');
 
         for (const concept of this.codes) {
           if (regex.test(concept.code)) {

package/tx/cs/cs-cs.js

@@ -6,6 +6,7 @@ const { validateOptionalParameter, getValuePrimitive, validateArrayParameter} =
 const {Issue} = require("../library/operation-outcome");
 const {Extensions} = require("../library/extensions");
 const {BaseCSServices} = require("./cs-base");
+const regexUtilities = require("../../library/regex-utilities");
 
 /**
  * Context class for FHIR CodeSystem provider concepts
@@ -1309,7 +1310,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
     else if (op === 'regex') {
       // Regular expression match
       try {
-        const regex = new RegExp('^' + value + '$');
+        const regex = regexUtilities.compile('^' + value + '$');
         const allCodes = this.codeSystem.getAllCodes();
         for (const code of allCodes) {
           if (regex.test(code)) {
@@ -1320,7 +1321,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
           }
         }
       } catch (error) {
-        throw new Error(`Invalid regex pattern: ${value}`);
+        throw new Issue('error', 'exception', null, 'INVALID_REGEX', this.opContext.i18n.translate('INVALID_REGEX', this.opContext.langs, [value, error.message]), 'vs-invalid', 422);
       }
     }
 
@@ -1428,7 +1429,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
     }
     else if (op === 'regex') {
       try {
-        const regex = new RegExp('^' + value + '$');
+        const regex = regexUtilities.compile('^' + value + '$');
         return properties.some(p => regex.test(this._getPropertyValue(p)));
       } catch (error) {
         return false;
@@ -1521,7 +1522,11 @@ class FhirCodeSystemProvider extends BaseCSServices {
   }
 
   versionNeeded() {
-    return this.codeSystem.jsonObj.versionNeeded;
+    return this.codeSystem.jsonObj.versionNeeded ? true : false;
+  }
+
+  hasMultiHierarchy() {
+    return this.codeSystem.hasMultiHierarchy;
   }
 
 }

package/tx/cs/cs-loinc.js

@@ -6,6 +6,7 @@ const { CodeSystemFactoryProvider} = require('./cs-api');
 const { validateOptionalParameter, validateArrayParameter} = require("../../library/utilities");
 const {BaseCSServices} = require("./cs-base");
 const {sqlEscapeString} = require("../../xig/xig");
+const regexUtilities = require('../../library/regex-utilities');
 
 // Context kinds matching Pascal enum
 const LoincProviderContextKind = {
@@ -938,7 +939,7 @@ class LoincServices extends BaseCSServices {
 // Helper method for regex matching
   async #findRegexMatches(sql, pattern, valueColumn, keyColumn = 'Key') {
     return new Promise((resolve, reject) => {
-      const regex = new RegExp(pattern);
+      const regex = regexUtilities.compile(pattern);
       const matchingKeys = [];
 
       this.db.all(sql, (err, rows) => {

package/tx/cs/cs-snomed.js

@@ -1348,6 +1348,10 @@ class SnomedProvider extends BaseCSServices {
     return result;
   }
 
+  hasMultiHierarchy() {
+    return true;
+  }
+
 }
 
 /**
@@ -1618,7 +1622,7 @@ class SnomedServicesFactory extends CodeSystemFactoryProvider {
         internalSource : this,
         relationship: relationship,
         id : id,
-        url: `${this.system}?fhir_cm=${id}`,
+        url: `${this.system()}?fhir_cm=${id}`,
         version: this.version(),
         name: `SNOMED CT ${name} Concept Map`,
         description: `The concept map implicitly defined by the ${name} Association Reference Set`,

package/tx/data/OperationDefinition-ValueSet-related.json

@@ -0,0 +1,133 @@
+{
+  "resourceType": "OperationDefinition",
+  "id": "ValueSet-related",
+  "url": "http://hl7.org/fhir/OperationDefinition/ValueSet-related",
+  "version": "5.0.0",
+  "name": "ValueSetRelated",
+  "title": "Value Set Related Determination",
+  "status": "active",
+  "kind": "operation",
+  "experimental": false,
+  "date": "2023-03-26T15:21:02+11:00",
+  "publisher": "FHIRsmith",
+  "description": "Determine the relationship between two value sets. Different versions of code systems are considered compatible unless versionNeeded = true for the code system",
+  "jurisdiction": [
+    {
+      "coding": [
+        {
+          "system": "http://unstats.un.org/unsd/methods/m49/m49.htm",
+          "code": "001",
+          "display": "World"
+        }
+      ]
+    }
+  ],
+  "affectsState": false,
+  "code": "related",
+  "comment": "An $expand will be performed internally if needed.",
+  "resource": [
+    "ValueSet"
+  ],
+  "system": false,
+  "type": true,
+  "instance": false,
+  "parameter": [
+    {
+      "name": "thisUrl",
+      "use": "in",
+      "scope": [
+        "type"
+      ],
+      "min": 0,
+      "max": "1",
+      "documentation": "Value set Canonical URL for the first value set of the pair (the base). The server must know the value set (e.g. it is provided as an attached resource, it is defined explicitly in the server's value sets, or it is defined implicitly by some code system known to the server",
+      "type": "uri"
+    },
+    {
+      "name": "otherUrl",
+      "use": "in",
+      "scope": [
+        "type"
+      ],
+      "min": 0,
+      "max": "1",
+      "documentation": "Value set Canonical URL for the second value set of the pair (the one being compared to base). The server must know the value set (e.g. it is provided as an attached resource, it is defined explicitly in the server's value sets, or it is defined implicitly by some code system known to the server",
+      "type": "uri"
+    },
+    {
+      "name": "thisValueSet",
+      "use": "in",
+      "scope": [
+        "type"
+      ],
+      "min": 0,
+      "max": "1",
+      "documentation": "The first value set is provided directly as part of the request. Servers may choose not to accept value sets in this fashion. This parameter is used when the client wants the server to expand a value set that is not stored on the server",
+      "type": "ValueSet"
+    },
+    {
+      "name": "otherValueSet",
+      "use": "in",
+      "scope": [
+        "type"
+      ],
+      "min": 0,
+      "max": "1",
+      "documentation": "The other value set is provided directly as part of the request. Servers may choose not to accept value sets in this fashion. This parameter is used when the client wants the server to expand a value set that is not stored on the server",
+      "type": "ValueSet"
+    },
+    {
+      "name": "thisVersion",
+      "use": "in",
+      "scope": [
+        "type"
+      ],
+      "min": 0,
+      "max": "1",
+      "documentation": "The identifier that is used to identify a specific version of the value set to be used when validating the code. This is an arbitrary value managed by the value set author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available.",
+      "type": "string"
+    },
+    {
+      "name": "otherVersion",
+      "use": "in",
+      "scope": [
+        "type"
+      ],
+      "min": 0,
+      "max": "1",
+      "documentation": "The identifier that is used to identify a specific version of the value set to be used when validating the code. This is an arbitrary value managed by the value set author and is not expected to be globally unique. For example, it might be a timestamp (e.g. yyyymmdd) if a managed version is not available.",
+      "type": "string"
+    },
+    {
+      "name": "useSupplement",
+      "use": "in",
+      "min": 0,
+      "max": "*",
+      "documentation": "The supplement must be used when validating the code. Use of this parameter should result in $validate-code behaving the same way as if the supplements were included in the value set definition using the [http://hl7.org/fhir/StructureDefinition/valueset-supplement](http://hl7.org/fhir/extensions/StructureDefinition-valueset-supplement.html)",
+      "type": "canonical"
+    },
+    {
+      "name": "diagnostics",
+      "use": "in",
+      "min": 0,
+      "max": "1",
+      "documentation": "Whether to return information about the reasoning process"
+    },
+    {
+      "name": "result",
+      "use": "out",
+      "min": 1,
+      "max": "1",
+      "documentation": "The relationship between the ValueSets. One of: same, superset, subset, overlapping, dsjoint, empty, and indeterminate",
+      "type": "boolean"
+    },
+    {
+      "name": "message",
+      "use": "out",
+      "min": 0,
+      "max": "1",
+      "documentation": "Explanation of the code, with reason if appropriate",
+      "type": "string"
+    }
+  ]
+}

package/tx/html/tx-template.html

@@ -117,9 +117,10 @@
 		<div class="container">
 			<div class="inner-wrapper">
 				<p>
-                    <a href="http://www.hl7.org/fhir" style="color: gold" title="Fast Healthcare Interoperability Resources - Home Page"><img border="0" src="/icon-fhir-16.png" style="vertical-align: text-bottom"/> <b>FHIR</b></a> &copy; HL7.org 2011+.  &nbsp;|&nbsp;
+                    <a href="http://www.hl7.org/fhir" style="color: gold" title="Fast Healthcare Interoperability Resources - Home Page"><img border="0" src="/icon-fhir-16.png" style="vertical-align: text-bottom"/> <b>FHIR</b></a> v[%fhir-version%] &copy; HL7.org 2011+.  &nbsp;|&nbsp;
                     <a href="https://github.com/HealthIntersections/FHIRsmith/blob/main/README.md" style="color: gold"><img border="0" src="/FHIRsmith16.png" style="vertical-align: text-bottom"/> FHIRsmith</a>  [%ver%]  &copy; HealthIntersections.com.au 2023+ &nbsp;|&nbsp;
-         FHIR Version [%fhir-version%] &nbsp;|&nbsp; ([%ms%] ms)
+                    &nbsp; ([%ms%] ms)
+                    [%sponsorMessage%]
         </p>
 			</div>
 		</div>

package/tx/importers/atc-to-fhir.js

@@ -6,7 +6,7 @@ const ATC_FILE = process.argv[2] || '2025_ATC.xml';
 const DDD_FILE = process.argv[3] || '2025_ATC_ddd.xml';
 const OUTPUT_FILE = process.argv[4] || 'atc-codesystem.json';
 
-const PROPERTY_GROUP_EXT_URL = 'http://hl7.org/fhir/property.group';
+const PROPERTY_GROUP_EXT_URL = 'http://hl7.org/fhir/StructureDefinition/Codesystem-property-group';
 
 // Parse XML files
 function parseXML(filePath) {
@@ -277,32 +277,7 @@ try {
     console.log(`Writing to ${OUTPUT_FILE}...`);
     fs.writeFileSync(OUTPUT_FILE, JSON.stringify(codeSystem, null, 2));
     console.log('Done!');
-    
-    // Print some stats
-    function countConcepts(concepts) {
-        let count = 0;
-        for (const c of concepts) {
-            count++;
-            if (c.concept) {
-                count += countConcepts(c.concept);
-            }
-        }
-        return count;
-    }
-    
-    function countWithDDD(concepts) {
-        let count = 0;
-        for (const c of concepts) {
-            if (c.property?.some(p => p.code === 'dddValue')) {
-                count++;
-            }
-            if (c.concept) {
-                count += countWithDDD(c.concept);
-            }
-        }
-        return count;
-    }
-    
+
     const totalConcepts = countConcepts(codeSystem.concept);
     const withDDD = countWithDDD(codeSystem.concept);
     console.log(`\nStatistics:`);
@@ -314,3 +289,28 @@ try {
     console.error('Error:', error.message);
     process.exit(1);
 }
+
+// Print some stats
+function countConcepts(concepts) {
+    let count = 0;
+    for (const c of concepts) {
+        count++;
+        if (c.concept) {
+            count += countConcepts(c.concept);
+        }
+    }
+    return count;
+}
+
+function countWithDDD(concepts) {
+    let count = 0;
+    for (const c of concepts) {
+        if (c.property?.some(p => p.code === 'dddValue')) {
+            count++;
+        }
+        if (c.concept) {
+            count += countWithDDD(c.concept);
+        }
+    }
+    return count;
+}

package/tx/library/codesystem.js

@@ -74,6 +74,8 @@ class CodeSystem extends CanonicalResource {
    */
   childToParentsMap = new Map();
 
+  hasMultiHierarchy = false;
+
   /**
    * Static factory method for convenience
    * @param {string} jsonString - JSON string representation of CodeSystem
@@ -326,6 +328,8 @@ class CodeSystem extends CanonicalResource {
 
     // Third pass: handle nested concept structures
     this._buildNestedHierarchy(this.jsonObj.concept);
+
+    this.hasMultiHierarchy = Array.from(this.childToParentsMap.values()).some(parents => parents.length > 1);
   }
 
   /**

package/tx/library/renderer.js

@@ -133,7 +133,7 @@ class Renderer {
     return result;
   }
 
-  async renderMetadataTable(res, tbl) {
+  async renderMetadataTable(res, tbl, sourcePackage) {
     this.renderMetadataVersion(res, tbl);
     await this.renderMetadataProfiles(res, tbl);
     this.renderMetadataTags(res, tbl);
@@ -154,6 +154,11 @@ class Renderer {
     this.renderProperty(tbl, 'EXT_FMM_LEVEL', Extensions.readString(res, 'http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm'));
     this.renderProperty(tbl, 'PAT_PERIOD', res.effectivePeriod);
     this.renderPropertyLink(tbl, 'WEB_SOURCE', Extensions.readString(res, 'http://hl7.org/fhir/StructureDefinition/web-source'));
+    this.renderProperty(tbl, 'GENERAL_SOURCE', sourcePackage);
+    for (let ext of Extensions.list(res, 'http://hl7.org/fhir/uv/application-feature/StructureDefinition/feature')) {
+      this.renderProperty(tbl, 'FEATURE', this.featureSummary(ext));
+    }
+
 
     // capability statement things
     this.renderProperty(tbl, 'Kind', res.kind);
@@ -165,7 +170,6 @@ class Renderer {
       }
     }
     this.renderProperty(tbl, 'GENERAL_URL', res.implementation?.url);
-    this.renderProperty(tbl, 'Kind', res.kind);
     this.renderProperty(tbl, 'EX_SCEN_FVER', res.fhirVersion);
 
     if (res.content === 'supplement' && res.supplements) {
@@ -364,7 +368,7 @@ class Renderer {
     return div_.toString();
   }
 
-  async renderCodeSystem(cs) {
+  async renderCodeSystem(cs, sourcePackage) {
     if (cs.json) {
       cs = cs.json;
     }
@@ -373,7 +377,7 @@ class Renderer {
 
     // Metadata table
     div_.h3().tx("Properties");
-    await this.renderMetadataTable(cs, div_.table("grid"));
+    await this.renderMetadataTable(cs, div_.table("grid"), sourcePackage);
 
     // Code system properties
     const hasProps = this.generateProperties(div_, cs);
@@ -2227,6 +2231,18 @@ class Renderer {
     }
   }
 
+  featureSummary(ext) {
+    let defn = Extensions.readString(ext, 'definition');
+    let value = Extensions.readString(ext, 'value');
+    switch (defn) {
+      case 'http://hl7.org/fhir/uv/tx-tests/FeatureDefinition/test-version':
+        return 'Tx Test version = ' + value;
+      case 'http://hl7.org/fhir/uv/tx-ecosystem/FeatureDefinition/CodeSystemAsParameter':
+        return 'CodeSystems as parameters = ' + value;
+      default:
+        return defn+' = ' + value;
+    }
+  }
 }
 
 module.exports = { Renderer };

package/tx/library/ucum-parsers.js

@@ -10,6 +10,7 @@ const {
   BaseUnit, DefinedUnit, Prefix, Value, Term, Symbol, Factor, Canonical, CanonicalUnit,
   Registry
 } = require('./ucum-types.js');
+const regexUtilities = require("../../library/regex-utilities");
 
 // Lexer for tokenizing UCUM expressions (port of Lexer.java)
 class Lexer {
@@ -763,7 +764,7 @@ class Search {
 
     if (isRegex) {
       try {
-        const regex = new RegExp(text);
+        const regex = regexUtilities.compile(text);
         return regex.test(value);
       } catch (e) {
         this.log.error(e);