fhirsmith 0.8.6 → 0.9.1

package/CHANGELOG.md

@@ -5,6 +5,53 @@ All notable changes to the Health Intersections Node Server will be documented i
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v0.9.1] - 2026-04-10
+
+### Added
+
+- TX: Add support for child-of filters
+
+### Changed
+
+- TX: increase vsac timeout
+
+### Fixed
+
+- Tidy up dashboard
+- TX: fix bug listing versions when validating
+- Fix support for child-of in R4/R3
+
+### Tx Conformance Statement
+
+FHIRsmith passed all 1578 HL7 terminology service tests (modes tx.fhir.org+omop+general+snomed, tests v1.9.1, runner v6.9.5)
+
+## [v0.9.0] - 2026-04-09
+
+### Added
+
+- TX: VSAC upgrade to pick up more changes
+- TX: add definition of $related operation to CapabilityStatement
+
+### Changed
+
+- TX: Deal with regex Denial of Service Issue
+- TX: improve fragment handling in extensions per TI decision 
+- TX: Reduce snomed loaded versions - have already moved to affiliate managed servers
+- TX: fix bug handling excluded concepts using a filter
+- improve dashboard template
+ 
+### Fixed
+
+- Update dependencies for security fixes
+- TX: fix error in SNOMED translate for implicit concept maps
+- TX: Fix OCL cache invalidation and case-insensitive concept lookups
+- Publisher: fix handling of web templates folder
+- Publisher: fix webtemplates table headings
+
+### Tx Conformance Statement
+
+FHIRsmith passed all 1578 HL7 terminology service tests (modes tx.fhir.org+omop+general+snomed, tests v1.9.1, runner v6.9.5)
+
 ## [v0.8.6] - 2026-04-06
 
 ### Added

package/library/regex-utilities.js

@@ -0,0 +1,13 @@
+const { RE2 } = require('re2-wasm');
+
+class RegExUtilities {
+
+  compile(pattern, flags) {
+    // RE2 requires the unicode flag; add it if not already present
+    const re2Flags = flags && flags.includes('u') ? flags : (flags || '') + 'u';
+    return new RE2(pattern, re2Flags);
+  }
+
+}
+
+module.exports = new RegExUtilities();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhirsmith",
-  "version": "0.8.6",
+  "version": "0.9.1",
   "txVersion": "1.9.1",
   "description": "A Node.js server that provides a collection of tools to serve the FHIR ecosystem",
   "main": "server.js",
@@ -51,7 +51,7 @@
     "fs-extra": "^11.3.3",
     "ini": "^6.0.0",
     "inquirer": "^8.2.5",
-    "liquidjs": "^10.24.0",
+    "liquidjs": "^10.25.5",
     "lusca": "^1.7.0",
     "natural": "^6.12.0",
     "node-cron": "^3.0.3",
@@ -61,6 +61,7 @@
     "passport-github2": "^0.1.12",
     "passport-google-oauth20": "^2.0.0",
     "properties-file": "^3.6.4",
+    "re2-wasm": "^1.0.2",
     "rimraf": "^5.0.10",
     "sqlite3": "^5.1.7",
     "tar": "^7.5.7",

package/publisher/publisher.js

@@ -714,17 +714,38 @@ class PublisherModule {
 
     // Step 1: Clone supporting repositories into the task directory
     const registryDir = path.join(taskDir, 'ig-registry');
-    const historyDir = path.join(taskDir, 'fhir-ig-history-template');
-    const templatesDir = path.join(taskDir, 'fhir-web-templates');
 
     await this.runCommand('git', ['clone', 'git@github.com:FHIR/ig-registry.git', registryDir],
         {}, task.id, 'Cloning ig-registry');
 
-    await this.runCommand('git', ['clone', 'https://github.com/HL7/fhir-ig-history-template.git', historyDir],
-        {}, task.id, 'Cloning fhir-ig-history-template');
+    // Use website-configured history templates path if provided, otherwise clone the default repo
+    let historyDir;
+    if (website.history_templates) {
+      historyDir = website.history_templates;
+      await this.logTaskMessage(task.id, 'info', 'Using configured history templates: ' + historyDir);
+      if (!fs.existsSync(historyDir)) {
+        throw new Error('Configured history_templates path does not exist: ' + historyDir);
+      }
+    } else {
+      historyDir = path.join(taskDir, 'fhir-ig-history-template');
+      await this.runCommand('git', ['clone', 'https://github.com/HL7/fhir-ig-history-template.git', historyDir],
+          {}, task.id, 'Cloning fhir-ig-history-template');
+    }
 
-    await this.runCommand('git', ['clone', 'https://github.com/HL7/fhir-web-templates.git', templatesDir],
-        {}, task.id, 'Cloning fhir-web-templates');
+    // Use website-configured web templates path if provided, otherwise clone the default repo.
+    // This allows pointing to a subdirectory of the templates repo for different target websites.
+    let templatesDir;
+    if (website.web_templates) {
+      templatesDir = website.web_templates;
+      await this.logTaskMessage(task.id, 'info', 'Using configured web templates: ' + templatesDir);
+      if (!fs.existsSync(templatesDir)) {
+        throw new Error('Configured web_templates path does not exist: ' + templatesDir);
+      }
+    } else {
+      templatesDir = path.join(taskDir, 'fhir-web-templates');
+      await this.runCommand('git', ['clone', 'https://github.com/HL7/fhir-web-templates.git', templatesDir],
+          {}, task.id, 'Cloning fhir-web-templates');
+    }
 
     // Step 2: Reuse the publisher.jar from the draft build
     const publisherJar = path.join(taskDir, 'publisher.jar');
@@ -1853,7 +1874,7 @@ class PublisherModule {
         } else {
           content += '<div class="table-responsive">';
           content += '<table class="table table-striped">';
-          content += '<thead><tr><th>Name</th><th>Local Folder</th><th>Git Root</th><th>Update Script</th><th>Active</th><th>Created</th><th>Actions</th></tr></thead>';
+          content += '<thead><tr><th>Name</th><th>Local Folder</th><th>Git Root</th><th>History Templates</th><th>Web Templates</th><th>Update Script</th><th>Active</th><th>Created</th><th>Actions</th></tr></thead>';
           content += '<tbody>';
 
           websites.forEach(website => {

package/root-bare-template.html

@@ -9,68 +9,73 @@
   <meta content="http://hl7.org/fhir" name="author"/>
   <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <!-- Bootstrap core CSS -->
-  <link rel="stylesheet" href="/assets/css/bootstrap.css"/>
-  <link rel="stylesheet" href="/assets/css/bootstrap-fhir.css"/>
-
-    <!-- Project extras -->
-  <link rel="stylesheet" href="/assets/css/project.css"/>
-  <link rel="stylesheet" href="/assets/css/pygments-manni.css"/>
-
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- [if lt IE 9]>
-  <script src="/assets/js/html5shiv.js"></script>
-  <script src="/assets/js/respond.min.js"></script>
-  <![endif] -->
-
-    <!-- Favicons -->
-  <link sizes="144x144" rel="apple-touch-icon-precomposed" href="/assets/ico/apple-touch-icon-144-precomposed.png"/>
-  <link sizes="114x114" rel="apple-touch-icon-precomposed" href="/assets/ico/apple-touch-icon-114-precomposed.png"/>
-  <link sizes="72x72" rel="apple-touch-icon-precomposed" href="/assets/ico/apple-touch-icon-72-precomposed.png"/>
-  <link rel="apple-touch-icon-precomposed" href="/assets/ico/apple-touch-icon-57-precomposed.png"/>
-  <link rel="shortcut icon" href="/assets/ico/favicon.png"/>
-<script type="text/javascript" src="/assets/js/json2.js"></script>
-<script type="text/javascript" src="/assets/js/statuspage.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.min.js"></script>
-<script type="text/javascript" src="/assets/js/jquery-ui.min.js"></script>
-<link rel="stylesheet" href="/assets/css/jquery.ui.all.css">
-<script type="text/javascript" src="/assets/js/jquery.ui.core.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.ui.widget.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.ui.mouse.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.ui.resizable.js"></script>
-<script type="text/javascript" src="/assets/js/jquery.ui.draggable.js"></script>
-<script type="text/javascript" src="/assets/js/jtip.js"></script>
-<script type="text/javascript" src="/assets/js/jcookie.js"></script>
-<script type="text/javascript" src="/assets/js/fhir-gw.js"></script>
+<style>
+  html {
+    font-family: sans-serif;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+  }
+
+  body {
+    margin: 0;
+    font-size: 12px;
+    color: #333;
+  }
+
+  h2 {
+    font-size: 20px;
+    margin: 0.67em 0;
+  }
+
+  h6 {
+    font-size: 12px;
+    margin: 0.67em 0;
+  }
+
+  strong {
+    font-weight: bold;
+  }
+
+  p {
+    margin: 1em 0;
+  }
+
+  canvas {
+    display: block;
+  }
+
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+  }
+
+  .row {
+    display: flex;
+    flex-wrap: wrap;
+    margin-right: -15px;
+    margin-left: -15px;
+  }
+
+  .col-12 {
+    flex: 0 0 100%;
+    max-width: 100%;
+    padding-right: 15px;
+    padding-left: 15px;
+  }
+
+  .mb-4 {
+    margin-bottom: 1.5rem;
+  }
+</style>
 </head>
 
-<body>
+<body style="margin-left: 10px">
 
-	<!-- /segment-breadcrumb -->
-
-	<div id="segment-content" class="segment">  <!-- segment-content -->
-	<div class="container">  <!-- container -->
-            <div class="row">
-            	<div class="inner-wrapper">
- <div class="col-9">
-
-  <h2>[%title%] </h2>
+<h2>[%title%] </h2>
 
 [%content%]
 
 
- </div>
-
-
-				</div>  <!-- /inner-wrapper -->
-            </div>  <!-- /row -->
-        </div>  <!-- /container -->
-    </div>  <!-- /segment-content -->
-
-
-
-
-
       <!-- JS and analytics only. -->
       <!-- Bootstrap core JavaScript
 ================================================== -->

package/translations/Messages.properties

@@ -1298,7 +1298,7 @@ VIEWDEFINITION_SHOULD_HAVE_NAME = No name provided. A name is required in many c
 VIEWDEFINITION_TYPE_MISMATCH = The path expression ''{0}'' does not return a value of the type ''{1}'' - found ''{2}''{3}
 VIEWDEFINITION_UNABLE_TO_TYPE = Unable to determine a type (found ''{0}''){1}
 VIEWDEFINITION_UNKNOWN_RESOURCE = The name ''{0}'' is not a valid resource{1}
-VS_EXP_FILTER_UNK = ValueSet ''{0}'' Filter by property ''{1}'' and op ''{2}'' is not supported yet
+VS_EXP_FILTER_UNK = ValueSet ''{0}'' Filter by property ''{1}'' and op ''{2}'' is not supported (yet?)
 VS_EXP_IMPORT_CS = Cannot include value set ''{0}'' because it''s actually a code system
 VS_EXP_IMPORT_CS_PINNED =  Cannot include value set ''{0}'' version ''{1}'' because it''s actually a code system
 VS_EXP_IMPORT_CS_PINNED_X =  Cannot exclude value set ''{0}'' version ''{1}'' because it''s actually a code system
@@ -1400,7 +1400,7 @@ TEXT_LINK_NO_DATA = No data element was found in the textLink extension
 TEXT_LINK_SELECTOR_INVALID = The textLink selector ''{0}'' is invalid: {1}
 SD_CONTEXT_SHOULD_ELEMENT_NOT_FOUND = The element {0} is not valid
 SD_CONTEXT_SHOULD_ELEMENT_NOT_FOUND_VER = The element {0} is not valid in version {1}
-FILTER_NOT_UNDERSTOOD = The filter "{0} {1} {2}" from the value set {3} was not understood in the context of {4}
+FILTER_NOT_UNDERSTOOD = The filter "{0} {1} {2}" is not understood or supported
 XHTML_CONTROL_NO_SOURCE = The xhtml node at ''{0}'' does not have a class attribute to indicate its source (boilerplate, generated, or original) and this is required by the profile {1}
 XHTML_XHTML_MIXED_LANG = The xhtml has some language sections ({0}), and also has content that is not in a language section
 XHTML_CONTROL_NO_LANGS = The xhtml has some language sections ({0}), but language sections are prohibited in this context by the profile {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/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
@@ -1223,7 +1224,7 @@ class FhirCodeSystemProvider extends BaseCSServices {
 
     // Handle concept/code hierarchy filters
     if ((prop === 'concept' || prop === 'code')) {
-      results = await this._handleConceptFilter(filterContext, op, value);
+      results = await this._handleConceptFilter(filterContext, prop, op, value);
     }
 
     // Handle child existence filter
@@ -1247,7 +1248,8 @@ class FhirCodeSystemProvider extends BaseCSServices {
     }
 
     if (!results) {
-      throw new Error(`The filter ${prop} ${op} ${value} was not understood`)
+      throw new Issue('error', 'exception', null, 'FILTER_NOT_UNDERSTOOD',
+            this.opContext.i18n.translate('FILTER_NOT_UNDERSTOOD', this.opContext.langs, [prop, op, value]), 'vs-invalid', 422);
     }
     // Add to filter context
     if (!filterContext.filters) {
@@ -1266,15 +1268,17 @@ class FhirCodeSystemProvider extends BaseCSServices {
    * @returns {Promise<FhirCodeSystemProviderFilterContext>} Filter results
    * @private
    */
-  async _handleConceptFilter(filterContext, op, value) {
+  async _handleConceptFilter(filterContext, prop, op, value) {
     const results = new FhirCodeSystemProviderFilterContext();
 
     if (op === 'is-a' || op === 'descendent-of') {
       // Find all descendants of the specified code
       const includeRoot = (op === 'is-a');
       await this._addDescendants(results, value, includeRoot);
-    }
-    else if (op === 'is-not-a') {
+    } else if (op === 'child-of') {
+      // Find all descendants of the specified code
+      await this._addChildren(results, value);
+    } else if (op === 'is-not-a') {
       // Find all concepts that are NOT descendants of the specified code
       const excludeDescendants = this.codeSystem.getDescendants(value);
       const excludeSet = new Set([value, ...excludeDescendants]);
@@ -1309,7 +1313,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,8 +1324,11 @@ 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);
       }
+    } else {
+      throw new Issue('error', 'exception', null, 'FILTER_NOT_UNDERSTOOD',
+          this.opContext.i18n.translate('FILTER_NOT_UNDERSTOOD', this.opContext.langs, [prop, op, value]), 'vs-invalid', 422);
     }
 
     return results;
@@ -1352,6 +1359,27 @@ class FhirCodeSystemProvider extends BaseCSServices {
     }
   }
 
+  /**
+   * Add immediate children of a code to the results
+   * @param {FhirCodeSystemProviderFilterContext} results - Results to add to
+   * @param {string} ancestorCode - The parent code
+   * @private
+   */
+  async _addChildren(results, parentCode) {
+    const concept = this.codeSystem.getConceptByCode(parentCode);
+    if (concept) {
+      const descendants = this.codeSystem.getChildren(parentCode);
+      for (const code of descendants) {
+        if (code !== parentCode) { // should not be
+          const concept = this.codeSystem.getConceptByCode(code);
+          if (concept) {
+            results.add(concept, 0);
+          }
+        }
+      }
+    }
+  }
+
   /**
    * Handle child exists filter
    * @param {FilterExecutionContext} filterContext - Filter context
@@ -1428,7 +1456,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;

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

@@ -1622,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/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;
+}