babelfhir-ts 1.6.11 → 1.6.12

package/out/src/generator/emitters/class/enrichResourceHandlers.js

@@ -317,11 +317,16 @@ export function generateEnrichResourceEnd() {
       }
     }
 
+    // No display on the RxNorm fallback. 'Amoxicillin 250mg' was paired with
+    // 1049502, which RxNorm defines as an oxycodone product, and the HL7 validator
+    // answered "Wrong Display Name ... Valid display is one of 5 choices". A Coding
+    // without a display is conformant, and an unverifiable display is a liability:
+    // when the binding does resolve, the display comes from the expansion instead.
     // Medication — isik-med-1: code.exists() or ingredient.exists()
     if (/^Medication$/i.test(baseResource)) {
       if (!('code' in base) && !('ingredient' in base)) {
-        const resolved = resolveBindingCode('code', '${TS.RXNORM}', '1049502', 'Amoxicillin 250mg');
-        base.code = resolved || { coding: [{ system: '${TS.RXNORM}', code: '1049502', display: 'Amoxicillin 250mg' }] };
+        const resolved = resolveBindingCode('code', '${TS.RXNORM}', '1049502');
+        base.code = resolved || { coding: [{ system: '${TS.RXNORM}', code: '1049502' }] };
       }
     }
 
@@ -330,8 +335,8 @@ export function generateEnrichResourceEnd() {
       if (!('status' in base)) base.status = 'active';
       if (!('intent' in base)) base.intent = 'order';
       if (!('medicationCodeableConcept' in base) && !('medicationReference' in base)) {
-        const resolved = resolveBindingCode('medicationCodeableConcept', '${TS.RXNORM}', '1049502', 'Amoxicillin 250mg');
-        base.medicationCodeableConcept = resolved || { coding: [{ system: '${TS.RXNORM}', code: '1049502', display: 'Amoxicillin 250mg' }] };
+        const resolved = resolveBindingCode('medicationCodeableConcept', '${TS.RXNORM}', '1049502');
+        base.medicationCodeableConcept = resolved || { coding: [{ system: '${TS.RXNORM}', code: '1049502' }] };
       }
       if (!('subject' in base)) base.subject = { reference: 'Patient/' + randomId() };
       // requester required when intent='order' (us-core-21 constraint)
@@ -342,8 +347,8 @@ export function generateEnrichResourceEnd() {
     if (/MedicationDispense/i.test(baseResource)) {
       if (!('status' in base)) base.status = 'completed';
       if (!('medicationCodeableConcept' in base) && !('medicationReference' in base)) {
-        const resolved = resolveBindingCode('medicationCodeableConcept', '${TS.RXNORM}', '1049502', 'Amoxicillin 250mg');
-        base.medicationCodeableConcept = resolved || { coding: [{ system: '${TS.RXNORM}', code: '1049502', display: 'Amoxicillin 250mg' }] };
+        const resolved = resolveBindingCode('medicationCodeableConcept', '${TS.RXNORM}', '1049502');
+        base.medicationCodeableConcept = resolved || { coding: [{ system: '${TS.RXNORM}', code: '1049502' }] };
       }
       if (!('subject' in base)) base.subject = { reference: 'Patient/' + randomId() };
       if (!('performer' in base)) base.performer = [{ actor: { reference: 'Practitioner/' + randomId() } }];

package/out/src/generator/emitters/class/sliceElementGenerator.js

@@ -4,6 +4,7 @@
  * Extracted helpers live in sliceElementDefaults.ts.
  */
 import { logger } from '../../../logger.js';
+import { ctx } from '../../fhir/versionContext.js';
 import { capitalise, deriveIdentifierConfig } from './classHeuristics.js';
 import { TS, EXAMPLE_ID_SYSTEM, RESOURCE_SKELETONS, compositionSkeleton, bundleEntry, matchSkeletonBySliceName, } from '../../core/constants.js';
 import { getDefaultValueForType, getTypePlaceholder, objectToCodeExpression, } from './sliceElementDefaults.js';
@@ -260,9 +261,14 @@ export function generateSliceElement(slice, elementType) {
                 }
                 const STRUCTURAL_BACKBONE_FIELDS = new Set(['extension', 'modifierExtension', 'part', 'contains']);
                 const rawType = child.type;
-                const effectiveType = (!rawType || rawType === 'any') && STRUCTURAL_BACKBONE_FIELDS.has(childPath)
+                // A child whose own type the differential does not restate still has one in
+                // the base datatype. Falling back to 'string' gave Identifier.system, a uri,
+                // the literal "placeholder", and the HL7 validator rightly answered
+                // "Identifier.system must be an absolute reference, not a local reference".
+                const declaredType = rawType || ctx().dataTypes[elementType]?.[childPath]?.type;
+                const effectiveType = (!declaredType || declaredType === 'any') && STRUCTURAL_BACKBONE_FIELDS.has(childPath)
                     ? 'BackboneElement'
-                    : (rawType || 'string');
+                    : (declaredType || 'string');
                 const placeholder = getTypePlaceholder(effectiveType);
                 if (placeholder !== undefined) {
                     if (!child.isRequired && (placeholder === '{ }' || placeholder === '{}')) {

package/out/src/generator/emitters/validator/extensionInvariants.js

@@ -0,0 +1,45 @@
+/**
+ * Invariants declared on an Extension's own StructureDefinition, evaluated against
+ * each matched extension in the resource that carries it.
+ *
+ * The extension profile's own validator already emits these, but that one runs only
+ * when an Extension is validated standalone. A resource embedding the extension
+ * checked that the slice was present and that its value[x] was permitted, and never
+ * evaluated the extension's constraints. KBV_EX_ERP_Multiple_Prescription is the
+ * clear case: "if the flag is true a period must be given" is an invariant on the
+ * extension SD, and the HL7 validator reports it on the containing MedicationRequest
+ * where we reported nothing.
+ *
+ * Split out of sliceExtensionValidation.ts to keep that file under the 650 LOC gate.
+ */
+/**
+ * Emit the invariant checks for one matched-extension list.
+ *
+ * Returns '' when the extension declares nothing worth checking, so callers can
+ * concatenate unconditionally.
+ */
+export function generateExtensionInvariantChecks(matchedArrayVar, extensionUrl, extMeta, ctx, indent) {
+    const constraints = extMeta?.constraints;
+    if (!constraints || constraints.length === 0)
+        return '';
+    // The fhirpath import is gated on the profile's own constraint list, so a profile
+    // that declares none would reference an undeclared `fhirpath` binding here.
+    if (ctx?.fhirpathNeeded)
+        ctx.fhirpathNeeded.value = true;
+    const lines = [];
+    lines.push(`${indent}// Invariants declared on extension ${extensionUrl}`);
+    lines.push(`${indent}for (const _invExt of ${matchedArrayVar}) {`);
+    for (const c of constraints) {
+        // Evaluated against the extension element rather than the resource: the
+        // expressions are written against Extension, exactly as the extension's own
+        // validator evaluates them.
+        lines.push(`${indent}  const _inv${c.key.replace(/[^A-Za-z0-9]/g, '_')} = await fhirpath.evaluate(`
+            + `node(_invExt), ${JSON.stringify(c.expression)}, `
+            + `{ resource, rootResource: resource }, fhirpath_model, fhirpathOptions);`);
+        lines.push(`${indent}  if (!_inv${c.key.replace(/[^A-Za-z0-9]/g, '_')}.every(Boolean)) {`);
+        lines.push(`${indent}    errors.push(${JSON.stringify(`Constraint violation: ${c.human}`)});`);
+        lines.push(`${indent}  }`);
+    }
+    lines.push(`${indent}}`);
+    return '\n' + lines.join('\n');
+}

package/out/src/generator/emitters/validator/sliceExtensionValidation.js

@@ -1,6 +1,7 @@
 /**
  * Extension and ValueSet slice validation strategies.
  */
+import { generateExtensionInvariantChecks } from './extensionInvariants.js';
 import { safeAccessor, safeList, sliceElseBranch, detectNestedArray, findArrayAncestor, isArrayPath, FHIR_PRIMITIVE_STRING_TYPES } from './sliceValidatorUtils.js';
 import { stripVersionFromCanonicalUrl, stripSliceSuffix } from '../../core/utils.js';
 import { buildSubExtensionScope, renderScopeHops } from './subExtensionScope.js';
@@ -517,7 +518,7 @@ ${indent}  if (_forbidden) {
 ${indent}    errors.push("Extension.value[x]: max allowed = 0, but found 1 (${forbidUrl})");
 ${indent}    errors.push("The Extension '${extensionUrl}' definition allows for the types [] but found type " + _forbidden.slice(5));
 ${indent}  }${generateSubExtensionChecks(extMeta, ctx, indent + '  ')}
-${indent}}`;
+${indent}}${generateExtensionInvariantChecks(matchedArrayVar, extensionUrl, extMeta, ctx, indent)}`;
     }
     const lines = [];
     const allowedProps = extMeta.valueTypes.map(t => `"value${valuePropertySuffix(t)}"`);
@@ -575,5 +576,6 @@ ${indent}}`;
         }
     }
     lines.push(`${indent}}`);
-    return '\n' + lines.join('\n');
+    return '\n' + lines.join('\n')
+        + generateExtensionInvariantChecks(matchedArrayVar, extensionUrl, extMeta, ctx, indent);
 }

package/out/src/generator/emitters/validator/validatorGenerator.js

@@ -216,10 +216,15 @@ export function generateValidateProfileFunction(interfaceName, fields, valueSets
             isChoiceType: false,
         });
     });
+    // Slice code can need fhirpath on its own: an extension's invariants are evaluated
+    // against each matched extension, and the profile carrying it need not declare a
+    // constraint of its own.
+    const fhirpathNeeded = { value: false };
     const sliceValidations = generateSliceValidations({
         fields, fieldPathMap, arrayFieldPaths, getValueSetForBinding,
         valueSetImports, profileUrl, profileName: interfaceName, baseResourceType,
         profileUrlToName, validatorImports, extensionMetadata, profileUrlToType, datatypeProfilePins,
+        fhirpathNeeded,
     });
     const closedSlicingValidations = generateClosedSlicingValidations(fields, profileUrl, baseResourceType, profileUrlToType);
     const primitiveFormatValidations = buildPrimitiveFormatValidations(fields);
@@ -491,7 +496,7 @@ ${body}
         const expr = c.constraint.expression || '';
         return /\bmemberOf\b/.test(expr) || /\bresolve\b/.test(expr);
     });
-    const fhirpathImport = filteredConstraints.length > 0
+    const fhirpathImport = filteredConstraints.length > 0 || fhirpathNeeded.value
         ? `import fhirpath from "fhirpath";\nimport fhirpath_model from "fhirpath/fhir-context/${fhirpathModelSlug()}/index.js";\n`
         : '';
     // `at`/`arr` are value imports: they replace the `as any` element probing that

package/out/src/generator/sdProcessor.js

@@ -21,6 +21,7 @@ import { ctx as versionCtx, fhirModuleSpecifier } from './fhir/versionContext.js
 import { registerProfile, addDiagnostic } from './core/sdDiagnostics.js';
 import { resetFetchFailureTracking, getFetchFailureCount, getFetchFailureWarning, recordFetchFailure, resolveComplexTypeChildType, ensureRandomSupportFile, ensureValidatorOptionsFile, } from './sdProcessorHelpers.js';
 import { extractAndDeduplicateRequiredFields, resolveChoiceSegments } from './sdProcessorRequiredFields.js';
+import { isBaseElementInvariant } from './emitters/validator/validatorExpressions.js';
 // Re-export public API consumed by index.ts / generationHelpers.ts
 export { resetFetchFailureTracking, getFetchFailureCount, getFetchFailureWarning };
 const log = logger.withTag('generator');
@@ -194,6 +195,52 @@ async function fillSliceProfileUrlsFromBaseProfiles(fields, baseDefinition) {
  * DTRStdQuestionnaire's contextExpression emitted no validation at all.
  * Callers must strip before reading; use `lookupExtensionMetadata`.
  */
+/**
+ * Invariants on an Extension SD, minus the ones the emitted validator handles
+ * elsewhere or evaluates differently from HL7.
+ *
+ * ext-1 is already checked structurally by the extension slice code, and ele-1
+ * diverges between fhirpath.js and HL7, so both are dropped here for the same
+ * reasons validatorGenerator drops them from a profile's own constraint list.
+ */
+function readExtensionConstraints(extSd) {
+    const els = extensionElements(extSd);
+    if (!els)
+        return undefined;
+    const out = [];
+    const seen = new Set();
+    for (const el of els) {
+        // Only invariants on the Extension root apply to the extension as a whole.
+        const path = el.path;
+        if (path !== 'Extension')
+            continue;
+        for (const c of (el.constraint ?? [])) {
+            const { key, human, expression, severity } = c;
+            if (!key || !human || !expression)
+                continue;
+            if (severity && severity !== 'error')
+                continue;
+            // By key first, because these are restated with local variations that defeat
+            // matching on the expression: the subscriptions-backport extensions write ele-1
+            // as `hasValue() or (children().count() > id.count()) or $this is Parameters`,
+            // and isBaseElementInvariant anchors its pattern, so the suffix slipped through
+            // and every backport extension reported ele-1 on its Subscription.
+            if (key === 'ele-1' || key === 'ext-1')
+                continue;
+            if (isBaseElementInvariant(expression))
+                continue;
+            if (/text\.div/.test(expression))
+                continue;
+            if (/\$[A-Z]/.test(expression))
+                continue;
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            out.push({ key, human, expression });
+        }
+    }
+    return out.length > 0 ? out : undefined;
+}
 async function resolveExtensionMetadata(fields) {
     const extUrls = new Set();
     for (const f of fields) {
@@ -220,6 +267,10 @@ async function resolveExtensionMetadata(fields) {
             const valueEl = els.find(el => el.path === 'Extension.value[x]' || el.id === 'Extension.value[x]');
             const subExtensions = collectSubExtensionSlices(els);
             const subExtensionMin = readSubExtensionMin(els);
+            // Read before the branching below: a complex extension returns early, and its
+            // invariants are exactly the ones worth carrying (Mehrfachverordnung's
+            // "if the flag is true a period is required" lives on such an SD).
+            const constraints = readExtensionConstraints(extSd);
             // A complex extension carries sub-extensions instead of a value, and forbids a
             // value outright (ext-1: extension.exists() != value.exists()). Recorded as an
             // empty type list — different from no entry at all, which would mean the SD
@@ -235,6 +286,7 @@ async function resolveExtensionMetadata(fields) {
                     valueTypes: [],
                     subExtensionMin,
                     subExtensions: subExtensions.length ? subExtensions : undefined,
+                    constraints,
                 });
                 return;
             }
@@ -243,7 +295,7 @@ async function resolveExtensionMetadata(fields) {
             const types = (valueEl.type || []).map((t) => t.code).filter(Boolean);
             if (types.length === 0)
                 return;
-            const entry = { valueTypes: types };
+            const entry = { valueTypes: types, constraints };
             // Check binding on value[x] first, then fall back to typed slices
             // (e.g., Extension.valueCode may carry the binding instead of Extension.value[x])
             let binding = readBinding(valueEl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "description": "BabelFHIR-TS: generate TypeScript interfaces, validators, and helper classes from FHIR R4/R4B/R5 StructureDefinitions (profiles) directly inside package archives.",
   "type": "module",
   "main": "out/src/main.js",