fhirsmith 0.9.0 → 0.9.2

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}

package/tx/cs/cs-cs.js

@@ -1224,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
@@ -1248,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) {
@@ -1267,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]);
@@ -1323,6 +1326,9 @@ class FhirCodeSystemProvider extends BaseCSServices {
       } catch (error) {
         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;
@@ -1353,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

package/tx/importers/import-sct.module.js

@@ -48,37 +48,37 @@ class SnomedModule extends BaseTerminologyModule {
   registerCommands(terminologyCommand, globalOptions) {
     // Import command
     terminologyCommand
-      .command('import')
-      .description('Import SNOMED CT data from RF2 source directory')
-      .option('-s, --source <directory>', 'Source directory containing RF2 files')
-      .option('-b, --base <directory>', 'Base edition directory (for extensions)')
-      .option('-d, --dest <file>', 'Destination cache file')
-      .option('-e, --edition <code>', 'Edition code (e.g., 900000000000207008 for International)')
-      .option('-v, --version <version>', 'Version in YYYYMMDD format (e.g., 20250801)')
-      .option('-u, --uri <uri>', 'Version URI (overrides edition/version if provided)')
-      .option('-l, --language <code>', 'Default language code (overrides edition default if provided)')
-      .option('-y, --yes', 'Skip confirmations')
-      .action(async (options) => {
-        await this.handleImportCommand({...globalOptions, ...options});
-      });
+        .command('import')
+        .description('Import SNOMED CT data from RF2 source directory')
+        .option('-s, --source <directory>', 'Source directory containing RF2 files')
+        .option('-b, --base <directory>', 'Base edition directory (for extensions)')
+        .option('-d, --dest <file>', 'Destination cache file')
+        .option('-e, --edition <code>', 'Edition code (e.g., 900000000000207008 for International)')
+        .option('-v, --version <version>', 'Version in YYYYMMDD format (e.g., 20250801)')
+        .option('-u, --uri <uri>', 'Version URI (overrides edition/version if provided)')
+        .option('-l, --language <code>', 'Default language code (overrides edition default if provided)')
+        .option('-y, --yes', 'Skip confirmations')
+        .action(async (options) => {
+          await this.handleImportCommand({...globalOptions, ...options});
+        });
 
     // Validate command
     terminologyCommand
-      .command('validate')
-      .description('Validate SNOMED CT RF2 directory structure')
-      .option('-s, --source <directory>', 'Source directory to validate')
-      .action(async (options) => {
-        await this.handleValidateCommand({...globalOptions, ...options});
-      });
+        .command('validate')
+        .description('Validate SNOMED CT RF2 directory structure')
+        .option('-s, --source <directory>', 'Source directory to validate')
+        .action(async (options) => {
+          await this.handleValidateCommand({...globalOptions, ...options});
+        });
 
     // Status command
     terminologyCommand
-      .command('status')
-      .description('Show status of SNOMED CT cache')
-      .option('-d, --dest <file>', 'Cache file to check')
-      .action(async (options) => {
-        await this.handleStatusCommand({...globalOptions, ...options});
-      });
+        .command('status')
+        .description('Show status of SNOMED CT cache')
+        .option('-d, --dest <file>', 'Cache file to check')
+        .action(async (options) => {
+          await this.handleStatusCommand({...globalOptions, ...options});
+        });
   }
 
   async handleImportCommand(options) {
@@ -633,7 +633,7 @@ class SnomedModule extends BaseTerminologyModule {
     }
 
     const additionalAnswers = additionalQuestions.length > 0 ?
-      await inquirer.prompt(additionalQuestions) : {};
+        await inquirer.prompt(additionalQuestions) : {};
 
     // Build the final configuration
     const config = {
@@ -774,7 +774,7 @@ class SnomedModule extends BaseTerminologyModule {
       } else if (firstLine.startsWith('id\teffectiveTime\tactive\tmoduleId\tconceptId\tlanguageCode\ttypeId\tterm\tcaseSignificanceId')) {
         files.descriptions.push(filePath);
       } else if (firstLine.startsWith('id\teffectiveTime\tactive\tmoduleId\tsourceId\tdestinationId\trelationshipGroup\ttypeId\tcharacteristicTypeId\tmodifierId') &&
-        !filePath.includes('StatedRelationship')) {
+          !filePath.includes('StatedRelationship')) {
         files.relationships.push(filePath);
       }
     } catch (error) {
@@ -1165,6 +1165,19 @@ class SnomedImporter {
       refsetDirectories: []
     };
 
+    // For extensions: load base edition files first so that all International
+    // Edition concepts, descriptions, and relationships are present before the
+    // extension content is layered on top.
+    if (this.config.base) {
+      if (this.config.verbose) {
+        console.log(`Loading base edition from: ${this.config.base}`);
+      }
+      this._scanDirectory(this.config.base, files);
+    }
+
+    // Then load the extension (or standalone edition) source files.
+    // For extensions these come second so that extension rows can override
+    // base rows where the same component has been updated.
     this._scanDirectory(this.config.source, files);
     return files;
   }
@@ -1200,7 +1213,7 @@ class SnomedImporter {
       } else if (firstLine.startsWith('id\teffectiveTime\tactive\tmoduleId\tconceptId\tlanguageCode\ttypeId\tterm\tcaseSignificanceId')) {
         files.descriptions.push(filePath);
       } else if (firstLine.startsWith('id\teffectiveTime\tactive\tmoduleId\tsourceId\tdestinationId\trelationshipGroup\ttypeId\tcharacteristicTypeId\tmodifierId') &&
-        !filePath.includes('StatedRelationship')) {
+          !filePath.includes('StatedRelationship')) {
         files.relationships.push(filePath);
       }
     } catch (error) {
@@ -1250,6 +1263,9 @@ class SnomedImporter {
     this.conceptList = [];
     let processedLines = 0;
 
+    // When loading base + extension, track list indices for fast replacement
+    const conceptIdToListIndex = this.config.base ? new Map() : null;
+
     for (let i = 0; i < this.files.concepts.length; i++) {
       const file = this.files.concepts[i];
       const rl = readline.createInterface({
@@ -1275,8 +1291,23 @@ class SnomedImporter {
           };
 
           if (this.conceptMap.has(concept.id)) {
-            throw new Error(`Duplicate Concept Id at line ${lineCount}: ${concept.id} - check you are processing the snapshot not the full edition`);
+            // When loading base + extension, the same concept may appear in both.
+            // The extension snapshot row takes precedence (it is loaded second).
+            // If there is no base directory this is a genuine duplicate in a single
+            // snapshot and we should still raise an error.
+            if (!this.config.base) {
+              throw new Error(`Duplicate Concept Id at line ${lineCount}: ${concept.id} - check you are processing the snapshot not the full edition`);
+            }
+            // Replace the base edition row with the extension row
+            const idx = conceptIdToListIndex.get(concept.id);
+            if (idx !== undefined) {
+              this.conceptList[idx] = concept;
+            }
+            this.conceptMap.set(concept.id, concept);
           } else {
+            if (conceptIdToListIndex) {
+              conceptIdToListIndex.set(concept.id, this.conceptList.length);
+            }
             this.conceptList.push(concept);
             this.conceptMap.set(concept.id, concept);
           }
@@ -1347,6 +1378,12 @@ class SnomedImporter {
     const descriptionList = [];
     let processedLines = 0;
 
+    // Build a lookup from description id -> index in descriptionList so that
+    // extension rows can replace base rows for the same description.
+    if (this.config.base) {
+      this._descriptionIdSet = new Map();
+    }
+
     for (const file of this.files.descriptions) {
       const rl = readline.createInterface({
         input: fs.createReadStream(file),
@@ -1372,7 +1409,19 @@ class SnomedImporter {
             caseSignificanceId: BigInt(parts[8])
           };
 
-          descriptionList.push(desc);
+          // When loading base + extension, the same description may appear in
+          // both.  The extension row (loaded second) takes precedence.
+          if (this.config.base && this._descriptionIdSet) {
+            const existingIdx = this._descriptionIdSet.get(desc.id);
+            if (existingIdx !== undefined) {
+              descriptionList[existingIdx] = desc;
+            } else {
+              this._descriptionIdSet.set(desc.id, descriptionList.length);
+              descriptionList.push(desc);
+            }
+          } else {
+            descriptionList.push(desc);
+          }
         }
 
         processedLines++;
@@ -1417,8 +1466,8 @@ class SnomedImporter {
         const caps = this.conceptMap.get(desc.caseSignificanceId);
 
         const descOffset = this.descriptions.addDescription(
-          termOffset, desc.id, effectiveTime, concept.index,
-          module.index, kind.index, caps.index, desc.active, lang
+            termOffset, desc.id, effectiveTime, concept.index,
+            module.index, kind.index, caps.index, desc.active, lang
         );
 
         // Track description on concept
@@ -1692,6 +1741,11 @@ class SnomedImporter {
     }
     this.isAIndex = isAConcept.index;
 
+    // Pass 1: collect all relationship rows, deduplicating so that extension
+    // rows (loaded second) override base rows with the same relationship id.
+    const relationshipRows = [];
+    const relationshipIdMap = this.config.base ? new Map() : null; // id -> index in relationshipRows
+
     for (const file of this.files.relationships) {
       const rl = readline.createInterface({
         input: fs.createReadStream(file),
@@ -1718,40 +1772,16 @@ class SnomedImporter {
             modifierId: BigInt(parts[9])
           };
 
-          const source = this.conceptMap.get(rel.sourceId);
-          const destination = this.conceptMap.get(rel.destinationId);
-          const type = this.conceptMap.get(rel.typeId);
-
-          if (source && destination && type) {
-            const effectiveTime = this.convertDateToSnomedDate(rel.effectiveTime);
-
-            // Check if this is a defining relationship
-            const defining = rel.characteristicTypeId === RF2_MAGIC_RELN_DEFINING ||
-              rel.characteristicTypeId === RF2_MAGIC_RELN_STATED ||
-              rel.characteristicTypeId === RF2_MAGIC_RELN_INFERRED;
-
-            const relationshipIndex = this.relationships.addRelationship(
-              rel.id, source.index, destination.index, type.index,
-              0, 0, 0, effectiveTime, rel.active, defining, rel.relationshipGroup
-            );
-
-            // Track parent/child relationships for is-a relationships
-            if (type.index === this.isAIndex && defining) {
-              const sourceTracker = this.getOrCreateConceptTracker(source.index);
-              if (rel.active) {
-                sourceTracker.addActiveParent(destination.index);
-              } else {
-                sourceTracker.addInactiveParent(destination.index);
-              }
+          if (relationshipIdMap) {
+            const existingIdx = relationshipIdMap.get(rel.id);
+            if (existingIdx !== undefined) {
+              relationshipRows[existingIdx] = rel;
+            } else {
+              relationshipIdMap.set(rel.id, relationshipRows.length);
+              relationshipRows.push(rel);
             }
-
-            // Track inbound/outbound relationships
-            const sourceTracker = this.getOrCreateConceptTracker(source.index);
-            const destTracker = this.getOrCreateConceptTracker(destination.index);
-
-            sourceTracker.addOutbound(relationshipIndex);
-            destTracker.addInbound(relationshipIndex);
-
+          } else {
+            relationshipRows.push(rel);
           }
         }
 
@@ -1762,10 +1792,62 @@ class SnomedImporter {
       }
     }
 
+    if (this.progressReporter) {
+      this.progressReporter.completeTask('Reading Relationships', processedLines, totalLines);
+    }
+
+    // Pass 2: process the deduplicated relationship rows into the binary
+    // structures and concept trackers.
+    const buildProgressBar = this.progressReporter?.createTaskProgressBar('Building Relationships');
+    buildProgressBar?.start(relationshipRows.length, 0);
+
+    for (let i = 0; i < relationshipRows.length; i++) {
+      const rel = relationshipRows[i];
+
+      const source = this.conceptMap.get(rel.sourceId);
+      const destination = this.conceptMap.get(rel.destinationId);
+      const type = this.conceptMap.get(rel.typeId);
+
+      if (source && destination && type) {
+        const effectiveTime = this.convertDateToSnomedDate(rel.effectiveTime);
+
+        // Check if this is a defining relationship
+        const defining = rel.characteristicTypeId === RF2_MAGIC_RELN_DEFINING ||
+            rel.characteristicTypeId === RF2_MAGIC_RELN_STATED ||
+            rel.characteristicTypeId === RF2_MAGIC_RELN_INFERRED;
+
+        const relationshipIndex = this.relationships.addRelationship(
+            rel.id, source.index, destination.index, type.index,
+            0, 0, 0, effectiveTime, rel.active, defining, rel.relationshipGroup
+        );
+
+        // Track parent/child relationships for is-a relationships
+        if (type.index === this.isAIndex && defining) {
+          const sourceTracker = this.getOrCreateConceptTracker(source.index);
+          if (rel.active) {
+            sourceTracker.addActiveParent(destination.index);
+          } else {
+            sourceTracker.addInactiveParent(destination.index);
+          }
+        }
+
+        // Track inbound/outbound relationships
+        const sourceTracker = this.getOrCreateConceptTracker(source.index);
+        const destTracker = this.getOrCreateConceptTracker(destination.index);
+
+        sourceTracker.addOutbound(relationshipIndex);
+        destTracker.addInbound(relationshipIndex);
+      }
+
+      if (i % 1000 === 0) {
+        buildProgressBar?.update(i);
+      }
+    }
+
     this.relationships.doneBuild();
 
     if (this.progressReporter) {
-      this.progressReporter.completeTask('Reading Relationships', processedLines, totalLines);
+      this.progressReporter.completeTask('Building Relationships', relationshipRows.length, relationshipRows.length);
     }
   }
 
@@ -1800,9 +1882,9 @@ class SnomedImporter {
         // Set parents if concept has any
         if (tracker.activeParents.length > 0 || tracker.inactiveParents.length > 0) {
           const activeParentsRef = tracker.activeParents.length > 0 ?
-            this.refs.addReferences(tracker.activeParents) : 0;
+              this.refs.addReferences(tracker.activeParents) : 0;
           const inactiveParentsRef = tracker.inactiveParents.length > 0 ?
-            this.refs.addReferences(tracker.inactiveParents) : 0;
+              this.refs.addReferences(tracker.inactiveParents) : 0;
 
           this.concepts.setParents(concept.index, activeParentsRef, inactiveParentsRef);
         } else {
@@ -2104,14 +2186,14 @@ class SnomedImporter {
     // NOTE: This calls addString() so it must happen AFTER strings.reopen()
     for (const refSet of refSetsArray) {
       this.refsetIndex.addReferenceSet(
-        this.addString(refSet.title),    // This needs strings builder to be active
-        refSet.filename,
-        refSet.index,
-        refSet.membersByRef,
-        refSet.membersByName,
-        refSet.fieldTypes,
-        refSet.fieldNames,
-        refSet.langs
+          this.addString(refSet.title),    // This needs strings builder to be active
+          refSet.filename,
+          refSet.index,
+          refSet.membersByRef,
+          refSet.membersByName,
+          refSet.fieldTypes,
+          refSet.fieldNames,
+          refSet.langs
       );
     }
   }
@@ -2216,7 +2298,13 @@ class SnomedImporter {
         if (!refSet || currentRefSetId !== refSetId) {
           currentRefSetId = refSetId;
           refSet = this.getOrCreateRefSet(refSetId, displayName, isLangRefset);
-          refSet.filename = this.addString(path.relative(this.config.source, filePath));
+          // Compute relative path — the file may live under the base directory
+          // rather than the extension source directory.
+          let relPath = path.relative(this.config.source, filePath);
+          if (this.config.base && relPath.startsWith('..')) {
+            relPath = path.relative(this.config.base, filePath);
+          }
+          refSet.filename = this.addString(relPath);
           refSet.fieldTypes = this.getOrCreateFieldTypes(fieldTypes);
           refSet.fieldNames = this.getOrCreateFieldNames(headers.slice(6), fieldTypes); // Additional fields beyond standard 6
         }
@@ -2577,8 +2665,8 @@ class SnomedImporter {
     };
 
     const services = new SnomedExpressionServices(
-      snomedStructures,
-      this.isAIndex
+        snomedStructures,
+        this.isAIndex
     );
 
     // Set building flag to true so services will generate normal forms dynamically

package/tx/library/extensions.js

@@ -56,7 +56,13 @@ const Extensions = {
     if (!resource) {
       return undefined;
     }
-    const extensions = Array.isArray(resource) ? resource : (resource.extension || []);
+    let extensions = Array.isArray(resource) ? resource : (resource.extension || []);
+    for (let ext of extensions || []) {
+      if (ext.url === url) {
+        return getValuePrimitive(ext);
+      }
+    }
+    extensions = Array.isArray(resource) ? resource : (resource.modifierExtension || []);
     for (let ext of extensions || []) {
       if (ext.url === url) {
         return getValuePrimitive(ext);

package/tx/library/renderer.js

@@ -466,14 +466,15 @@ class Renderer {
         li.tx(" "+ this.translate('VALUE_SET_WHERE')+" ");
         li.startCommaList("and");
         for (let f of inc.filter) {
-          if (f.op == 'exists') {
+          let op = this.readFilterOp(f);
+          if (op == 'exists') {
             if (f.value == "true") {
               li.commaItem(f.property+" "+ this.translate('VALUE_SET_EXISTS'));
             } else {
               li.commaItem(f.property+" "+ this.translate('VALUE_SET_DOESNT_EXIST'));
             }
           } else {
-            li.commaItem(f.property + " " + f.op + " ");
+            li.commaItem(f.property + " " + op + " ");
             const loc = this.linkResolver ? await this.linkResolver.resolveCode(this.opContext, inc.system, inc.version, f.value) : null;
             if (loc) {
               li.ah(loc.link).tx(loc.description);
@@ -2243,6 +2244,14 @@ class Renderer {
         return defn+' = ' + value;
     }
   }
+
+  readFilterOp(f) {
+    if (f._op) {
+      return Extensions.readString(f._op, 'http://hl7.org/fhir/5.0/StructureDefinition/extension-ValueSet.compose.include.filter.op');
+    } else {
+      return f.op;
+    }
+  }
 }
 
 module.exports = { Renderer };

package/tx/library.js

@@ -35,6 +35,7 @@ const { OCLCodeSystemProvider, OCLSourceCodeSystemFactory } = require('./ocl/cs-
 const { OCLValueSetProvider } = require('./ocl/vs-ocl');
 const { OCLConceptMapProvider } = require('./ocl/cm-ocl');
 const {UriServicesFactory} = require("./cs/cs-uri");
+const {debugLog} = require("./operation-context");
 
 /**
  * This class holds all the loaded content ready for processing
@@ -185,6 +186,7 @@ class Library {
       try {
         await this.processSource(source, this.packageManager, "cs");
       } catch (error) {
+        debugLog(error);
         console.error(`Failed to load code systems from '${source}': ${error.message}`);
         throw error;
       }
@@ -196,6 +198,7 @@ class Library {
       try {
         await this.processSource(source, this.packageManager, "npm");
       } catch (error) {
+        debugLog(error);
         console.error(`Failed to load package '${source}': ${error.message}`);
         throw error;
       }