babelfhir-ts 1.5.16 → 1.5.18

package/out/src/generator/core/generatedPackageDeps.js

@@ -0,0 +1,78 @@
+/**
+ * Dependency ranges written into a generated package's `package.json`.
+ *
+ * Single source of truth: the generated-package manifest is assembled in two
+ * places (the archive pipeline and the directory pipeline in
+ * `src/generator/index.ts`), and both must emit identical ranges. Keep the
+ * ranges here, not inline at the call sites.
+ *
+ * These ranges describe what the *consumer* of a generated package installs,
+ * so they are deliberately wider than this repo's own devDependencies.
+ */
+/**
+ * Runtime/peer ranges emitted into generated packages.
+ *
+ * `fhirpath` is a peer so the host decides the version. All of 3.x/4.x/5.x are
+ * accepted: generated validators only call `fhirpath.evaluate()` and import
+ * `fhirpath/fhir-context/<model>/index.js`, both of which are stable across
+ * those majors. The `/index.js` filename is required — fhirpath >= 5 declares
+ * an `exports` map, so extensionless deep paths no longer resolve.
+ */
+export const EMITTED_RANGES = {
+    /** FHIR type declarations backing the emitted `.d.ts` files. */
+    fhirTypes: '^0.0.41',
+    /** FHIRPath engine used by emitted constraint validators. */
+    fhirpath: '^3.0.0 || ^4.0.0 || ^5.0.0',
+    /** Schema runtime for `--schema zod` output. */
+    zod: '^4.0.0',
+    /**
+     * Prefab UI runtime for `--prefab` output.
+     *
+     * 0.3.0 is the floor: it introduced wire protocol 0.3, where the theme is
+     * compiled into the top-level `css` array, `stylesheets` carries external
+     * URLs, and `mode` forces a colour scheme. Emitted renderers pass `theme`
+     * and spread `PrefabAppOptions` into `PrefabApp`, so they rely on a >= 0.3
+     * serializer/renderer pair to apply themes. A 0.2.x renderer would silently
+     * drop them.
+     */
+    prefab: '^0.3.0',
+    /** Generated FHIR client base package (`@babelfhir-ts/client-<slug>`). */
+    client: '^0.2.0',
+    /** Shared base zod schemas (`@babelfhir-ts/zod`). */
+    zodBase: '^0.2.0',
+    /** DICOMweb helpers (`@babelfhir-ts/dicomweb`). */
+    dicomweb: '^0.1.0',
+};
+/**
+ * Build the dependency sections of a generated package's `package.json` from
+ * the active generation flags.
+ *
+ * @param flags      Generation flags for this run.
+ * @param clientSlug FHIR version slug used in the client package name.
+ */
+export function buildGeneratedPackageDeps(flags, clientSlug) {
+    // Type definitions for FHIR are needed for the emitted .d.ts files.
+    const dependencies = {
+        '@types/fhir': EMITTED_RANGES.fhirTypes,
+    };
+    // fhirpath is required at runtime by validators; keep as peer so the host
+    // decides the version.
+    const peerDependencies = {
+        fhirpath: EMITTED_RANGES.fhirpath,
+    };
+    // The generated client extends the versioned base client package.
+    if (!flags?.noClient) {
+        dependencies[`@babelfhir-ts/client-${clientSlug}`] = EMITTED_RANGES.client;
+    }
+    if (flags?.schema === 'zod') {
+        dependencies['@babelfhir-ts/zod'] = EMITTED_RANGES.zodBase;
+        peerDependencies.zod = EMITTED_RANGES.zod;
+    }
+    if (flags?.dicomweb) {
+        dependencies['@babelfhir-ts/dicomweb'] = EMITTED_RANGES.dicomweb;
+    }
+    if (flags?.prefab) {
+        dependencies['@maxhealth.tech/prefab'] = EMITTED_RANGES.prefab;
+    }
+    return { dependencies, peerDependencies };
+}

package/out/src/generator/emitters/interface/processNestedField.js

@@ -29,14 +29,6 @@ export function handleNestedField(args) {
     const fieldPathParts = field.name.split('.');
     const isExtensionField = fieldPathParts[fieldPathParts.length - 1] === 'extension' ||
         (field.sliceName && fieldPathParts[fieldPathParts.length - 2] === 'extension');
-    if (field.name.includes('bodySite')) {
-        logger.debug('[DEBUG bodySite treatAsNested]', {
-            fieldName: field.name,
-            sliceName: field.sliceName,
-            isExtensionField,
-            treatAsNested
-        });
-    }
     if (isExtensionField) {
         const hasExtensionSlices = fields.some(f => (f.name === field.name || f.name === `${field.name}.extension`) &&
             f.sliceName &&
@@ -46,6 +38,20 @@ export function handleNestedField(args) {
             treatAsNested = false;
         }
     }
+    // TODO(bug): `treatAsNested` is computed but never consulted when deciding
+    // whether to emit the nested interface below — both `= false` guards (payor
+    // without an explicit profile, and extension fields carrying slices) are
+    // therefore dead, contrary to their comments above. Honouring it would change
+    // emitted interfaces for those fields, so it needs a parity run rather than a
+    // drive-by fix. The debug log below is currently its only reader.
+    if (field.name.includes('bodySite')) {
+        logger.debug('[DEBUG bodySite treatAsNested]', {
+            fieldName: field.name,
+            sliceName: field.sliceName,
+            isExtensionField,
+            treatAsNested
+        });
+    }
     const nestedInterfaceName = `${parentInterfaceName}${capitalize(fieldName)}`;
     const nestedFields = fields.filter((f) => f.name.startsWith(`${field.name}.`));
     // Debug answer nested interface issue

package/out/src/generator/emitters/prefab/prefabEmitter.js

@@ -124,9 +124,13 @@ function buildMcpViewsTs(profiles) {
     const detailEntries = [];
     for (const [resourceType, interfaceName] of byResourceType) {
         const varBase = lowerFirst(interfaceName);
-        imports.push(`import { ${varBase}Table, ${varBase}Detail } from './${interfaceName}Prefab.js';`);
-        tableEntries.push(`  ${JSON.stringify(resourceType)}: (resources) => ${varBase}Table(resources as any),`);
-        detailEntries.push(`  ${JSON.stringify(resourceType)}: (resource) => ${varBase}Detail(resource as any),`);
+        imports.push(`import { ${varBase}Table, ${varBase}Detail } from './${interfaceName}Prefab.js';`, `import type { ${interfaceName} } from '../${interfaceName}.js';`);
+        // Narrow the registry's `unknown` payload to the profile interface rather
+        // than widening to `any`: the entry has already been selected by
+        // `resourceType`, and asserting to the concrete type keeps every downstream
+        // property access type-checked inside the view function.
+        tableEntries.push(`  ${JSON.stringify(resourceType)}: (resources) => ${varBase}Table(resources as ${interfaceName}[]),`);
+        detailEntries.push(`  ${JSON.stringify(resourceType)}: (resource) => ${varBase}Detail(resource as ${interfaceName}),`);
     }
     return `/**
  * AUTO-GENERATED by babelfhir-ts --prefab — do not edit.

package/out/src/generator/emitters/prefab/prefabRenderer.js

@@ -248,7 +248,7 @@ export function generatePrefabRenderer(interfaceName, fields, options) {
         ? `rowRecord.${titleDescriptor.name} ?? '${interfaceName}'`
         : `'${interfaceName}'`;
     // --- Browser (interactive master/detail) variant -----------------------
-    // Uses prefab 0.1.9 reactive primitives: `collection`, `signal`, `Ref`,
+    // Uses prefab reactive primitives: `collection`, `signal`, `Ref`,
     // `MasterDetail`, `Detail`, and the `find` pipe to resolve the selected
     // row. Columns and detail rows consume FHIR datatype pipes registered by
     // `./registerFhirPipes.js` (`humanName`, `contactPointBySystem`, etc.).
@@ -375,7 +375,7 @@ ${prefabImportLines}
 } from '@maxhealth.tech/prefab';
 ${prefabTypeImportLine}
 import type { ${interfaceName} } from '../${interfaceName}.js';
-${formatterImportBlock}import { styles } from './styles.js';
+${formatterImportBlock}import { styles, theme } from './styles.js';
 // Self-contained FHIR datatype pipes. Passed through \`PrefabApp({ pipes })\`
 // so the renderer can serialize them into the wire format and re-hydrate
 // with \`new Function()\` in the browser — closures are not preserved, so
@@ -527,7 +527,9 @@ ${browserDetailRowsLiteral}
  * own outer \`PrefabApp\`.
  *
  * Prerequisites (auto-imported at the top of this module):
- *   - \`@maxhealth.tech/prefab\` >= 0.1.9 (reactive primitives)
+ *   - \`@maxhealth.tech/prefab\` >= 0.3.0 (wire protocol 0.3: the theme is
+ *     compiled into the top-level \`css\` array, \`stylesheets\` carries
+ *     external URLs, and \`mode\` forces a colour scheme)
  *   - \`./registerFhirPipes.js\` (FHIR datatype pipes: humanName, …)
  */
 export function ${varBase}Browser(
@@ -535,18 +537,23 @@ export function ${varBase}Browser(
   options?: Partial<Omit<PrefabAppOptions, 'view'>> & { masterWidth?: string },
 ) {
   // Destructure the Browser-only \`masterWidth\` away from \`PrefabAppOptions\`
-  // passthrough so remaining keys (theme, scripts, onMount, …) spread
+  // passthrough so remaining keys (css, mode, scripts, onMount, …) spread
   // cleanly into the PrefabApp constructor.
-  const { masterWidth, title, pipes: userPipes, ...appOptions } = options ?? {};
+  const { masterWidth, title, pipes: userPipes, theme: userTheme, ...appOptions } = options ?? {};
 
   const { view } = ${varBase}BrowserView(resources, { masterWidth });
 
   return new PrefabApp({
     ...appOptions,
     title: title ?? '${interfaceName} Browser',
+    // The theme from \`prefab/styles.ts\` is applied by default so editing that
+    // file (or passing \`--prefab-styles\`) actually takes effect. prefab >= 0.3
+    // compiles it into the wire \`css\` array; an empty theme contributes
+    // nothing. A caller-supplied \`theme\` replaces it wholesale.
+    theme: userTheme ?? theme,
     // FHIR datatype pipes ship inline with the wire format so the browser
     // renderer hydrates them at mount time. User-supplied \`pipes\` override
-    // individual entries by name (same shallow-merge semantics as theme).
+    // individual entries by name.
     pipes: { ...FHIR_PIPES, ...(userPipes ?? {}) },
     view,
   });

package/out/src/generator/emitters/prefab/prefabRuntimeAssets.js

@@ -170,7 +170,7 @@ export type PrefabTheme = typeof theme;
  * of self-contained (closure-free) pipe functions plus a `registerFhirPipes`
  * convenience for Node-side registration.
  *
- * **Why self-contained?** prefab @0.2.1 serializes pipes via `fn.toString()`
+ * **Why self-contained?** prefab serializes pipes via `fn.toString()`
  * and hydrates them in the browser with `new Function(source)` — closures are
  * not preserved. Every helper in this module therefore inlines the logic it
  * needs (no cross-function calls, no imports from `./fhirFormat.js`). The

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

@@ -9,7 +9,12 @@
  */
 import fs from 'fs';
 import path from 'path';
-const FHIR_CONTEXT_VERSIONS = ['r4', 'r4b', 'r5'];
+// Mirrors the `fhir-context/` models the real fhirpath package ships (dstu2,
+// stu3, r4, r5 — there is no r4b model). Only the two we can emit are stubbed:
+// stubbing a model fhirpath does not ship would let a bad import specifier pass
+// `tsc` here and then fail at runtime in the consumer's install.
+// Keep in sync with fhirpathModelSlug() in src/generator/fhir/versionContext.ts.
+const FHIR_CONTEXT_VERSIONS = ['r4', 'r5'];
 export function installFhirpathStub(outputDir) {
     const pkgDir = path.join(outputDir, 'node_modules', 'fhirpath');
     fs.mkdirSync(pkgDir, { recursive: true });

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

@@ -1,7 +1,7 @@
 /**
  * BackboneElement and binding-codes slice validation strategies.
  */
-import { safeAccessor, sliceElseBranch, detectNestedArray, FHIR_PRIMITIVE_STRING_TYPES, collectWithinSliceMaxChildren, generateWithinSliceMaxChecks } from './sliceValidatorUtils.js';
+import { safeAccessor, safeList, sliceElseBranch, detectNestedArray, FHIR_PRIMITIVE_STRING_TYPES, collectWithinSliceMaxChildren, generateWithinSliceMaxChecks } from './sliceValidatorUtils.js';
 /** Collect required direct children of a BackboneElement slice for per-element validation. */
 export function collectRequiredSliceChildren(sliceElementId, fields, discriminatorProp, profileName, relPath) {
     const result = [];
@@ -199,7 +199,6 @@ export function generateBackboneElementValidation(slice, relPath, errorPath, sli
     }).join('');
     const maxChildren = collectWithinSliceMaxChildren(slice, fields);
     const maxChecksCode = generateWithinSliceMaxChecks(maxChildren, `${varName}Elements`, resourceType, relPath, sliceLabel);
-    const hasAnyChildChecks = requiredChildren.length > 0 || nestedChildren.length > 0 || maxChildren.length > 0;
     const childChecksCode = (requiredChildren.length > 0 || nestedChildren.length > 0
         ? `\n    for (const _matched of ${varName}Elements) {
       const _m = _matched as any;${directChecksInner}${nestedChecksInner}
@@ -240,8 +239,8 @@ export function generateBackboneElementValidation(slice, relPath, errorPath, sli
         const bbeElseBranch = sliceElseBranch(relPath, errorPath, sliceLabel);
         out.push(`
   // Required BackboneElement slice validation for ${relPath}:${sliceLabel} (discriminated by ${discriminatorProp})
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)})) {
-    const ${varName}Elements = ${safeAccessor(relPath)}.filter((item: any) => ${checks});
+  if (Array.isArray(${safeAccessor(relPath)})) {
+    const ${varName}Elements = ${safeList(relPath)}.filter((item: any) => ${checks});
     if (${varName}Elements.length < ${min}) {
       errors.push("No elements matched required slice: '${errorPath}:${sliceLabel}'");
     }${childChecksCode}
@@ -309,7 +308,6 @@ export function generateFixedValueSliceValidation(slice, relPath, errorPath, sli
     }).join('');
     const maxChildren = collectWithinSliceMaxChildren(slice, fields);
     const maxChecksCode = generateWithinSliceMaxChecks(maxChildren, `${varName}Elements`, resourceType, relPath, sliceLabel);
-    const hasChildChecks = requiredChildren.length > 0 || nestedChildren.length > 0 || fixedChildren.length > 0 || maxChildren.length > 0;
     const childChecksCode = (requiredChildren.length > 0 || nestedChildren.length > 0 || fixedChildren.length > 0
         ? `\n    for (const _matched of ${varName}Elements) {
       const _m = _matched as any;${directChecksInner}${nestedChecksInner}${fixedChecksInner}
@@ -374,8 +372,8 @@ export function generateFixedValueSliceValidation(slice, relPath, errorPath, sli
         const bbeElseBranch = sliceElseBranch(relPath, errorPath, sliceLabel);
         out.push(`
   // Required fixedValue slice validation for ${relPath}:${sliceLabel} (discriminated by ${discriminatorProp} === ${fixedVal})
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)})) {
-    const ${varName}Elements = ${safeAccessor(relPath)}.filter((item: any) => ${checks});
+  if (Array.isArray(${safeAccessor(relPath)})) {
+    const ${varName}Elements = ${safeList(relPath)}.filter((item: any) => ${checks});
     if (${varName}Elements.length < ${min}) {
       errors.push("No elements matched required slice: '${errorPath}:${sliceLabel}'");
     }${childChecksCode}
@@ -424,8 +422,8 @@ export function generateBindingCodesValidation(slice, baseName, relPath, errorPa
         if (slice.isArray) {
             out.push(`
   // Slice cardinality check for ${baseName}:${sliceLabel} (primitive code array)
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)}) && ${safeAccessor(relPath)}.length > 0) {
-    const ${varName}Count = ${safeAccessor(relPath)}.filter(item =>
+  if (${safeList(relPath)}.length > 0) {
+    const ${varName}Count = ${safeList(relPath)}.filter(item =>
       [${codes}].includes(item as string)
     ).length;
     if (${varName}Count < ${min}) {
@@ -452,8 +450,8 @@ export function generateBindingCodesValidation(slice, baseName, relPath, errorPa
         if (isCodingType) {
             out.push(`
   // Slice cardinality check for ${baseName}:${sliceLabel} (Coding array)
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)}) && ${safeAccessor(relPath)}.length > 0) {
-    const ${varName}Count = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (${safeList(relPath)}.length > 0) {
+    const ${varName}Count = ${safeList(relPath)}.filter((item: any) =>
       [${codes}].includes(item.code as string)
     ).length;
     if (${varName}Count < ${min}) {
@@ -464,8 +462,8 @@ export function generateBindingCodesValidation(slice, baseName, relPath, errorPa
         else {
             out.push(`
   // Slice cardinality check for ${baseName}:${sliceLabel}
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)}) && ${safeAccessor(relPath)}.length > 0) {
-    const ${varName}Count = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (${safeList(relPath)}.length > 0) {
+    const ${varName}Count = ${safeList(relPath)}.filter((item: any) =>
       (item.coding as Array<{ code?: string }> | undefined)?.some(coding => [${codes}].includes(coding.code as string))
     ).length;
     if (${varName}Count < ${min}) {

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

@@ -1,7 +1,7 @@
 /**
  * Extension and ValueSet slice validation strategies.
  */
-import { safeAccessor, sliceElseBranch, detectNestedArray, findArrayAncestor, isArrayPath, FHIR_PRIMITIVE_STRING_TYPES } from './sliceValidatorUtils.js';
+import { safeAccessor, safeList, sliceElseBranch, detectNestedArray, findArrayAncestor, isArrayPath, FHIR_PRIMITIVE_STRING_TYPES } from './sliceValidatorUtils.js';
 export function generateValueSetValidation(slice, baseName, relPath, errorPath, sliceLabel, varName, min, minText, getValueSetForBinding, valueSetImports, fields, out) {
     const vsInfo = getValueSetForBinding(slice.binding.uri);
     const vsInfoFull = vsInfo && !('systemOnly' in vsInfo && vsInfo.systemOnly) ? vsInfo : undefined;
@@ -45,8 +45,8 @@ export function generateValueSetValidation(slice, baseName, relPath, errorPath,
             if (isPrimitiveString) {
                 out.push(`
   // Slice validation for ${baseName}:${sliceLabel} using ValueSet validator (primitive string array)
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)}) && ${safeAccessor(relPath)}.length > 0) {
-    const ${varName}Count = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (${safeList(relPath)}.length > 0) {
+    const ${varName}Count = ${safeList(relPath)}.filter((item: any) =>
       typeof item === 'string' && ${vsInfoFull.validatorFn}(item)
     ).length;
     if (${varName}Count < ${min}) {
@@ -57,8 +57,8 @@ export function generateValueSetValidation(slice, baseName, relPath, errorPath,
             else if (isCodingType) {
                 out.push(`
   // Slice validation for ${baseName}:${sliceLabel} using ValueSet validator (Coding array)
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)}) && ${safeAccessor(relPath)}.length > 0) {
-    const ${varName}Count = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (${safeList(relPath)}.length > 0) {
+    const ${varName}Count = ${safeList(relPath)}.filter((item: any) =>
       item.code && ${vsInfoFull.validatorFn}(item.code)
     ).length;
     if (${varName}Count < ${min}) {
@@ -69,8 +69,8 @@ export function generateValueSetValidation(slice, baseName, relPath, errorPath,
             else {
                 out.push(`
   // Slice validation for ${baseName}:${sliceLabel} using ValueSet validator
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)}) && ${safeAccessor(relPath)}.length > 0) {
-    const ${varName}Count = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (${safeList(relPath)}.length > 0) {
+    const ${varName}Count = ${safeList(relPath)}.filter((item: any) =>
       (item.coding as Array<{ code?: string }> | undefined)?.some(coding => coding.code && ${vsInfoFull.validatorFn}(coding.code))
     ).length;
     if (${varName}Count < ${min}) {
@@ -147,8 +147,8 @@ export function generateValueSetValidation(slice, baseName, relPath, errorPath,
                 : `(item.coding as Array<{ system?: string }> | undefined)?.some(coding => coding.system !== undefined && ${systemsArr}.includes(coding.system))`;
             out.push(`
   // Slice system-only validation for ${baseName}:${sliceLabel} (ValueSet '${vsName}')
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)}) && ${safeAccessor(relPath)}.length > 0) {
-    const ${varName}Count = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (${safeList(relPath)}.length > 0) {
+    const ${varName}Count = ${safeList(relPath)}.filter((item: any) =>
       ${systemCheck}
     ).length;
     if (${varName}Count < ${min}) {
@@ -234,8 +234,8 @@ export function generateExistsExtensionValidation(slice, relPath, errorPath, sli
     if (slice.isArray || baseFieldIsArray) {
         out.push(`
   // Required slice validation for ${relPath}:${sliceLabel} (exists extension discriminator)
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)})) {
-    const ${varName}Elements = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (Array.isArray(${safeAccessor(relPath)})) {
+    const ${varName}Elements = ${safeList(relPath)}.filter((item: any) =>
       item.extension?.some((ext: { url?: string }) => ext.url === "${extensionUrl}")
     );
     if (${varName}Elements.length < ${min}) {
@@ -322,8 +322,8 @@ export function generateExtensionUrlSliceValidation(slice, relPath, errorPath, s
         const elseGuard = parentPath ? `else if (${safeAccessor(parentPath)})` : 'else';
         out.push(`
   // Required extension slice validation for ${relPath}:${sliceLabel} (url discriminator)
-  if (${parentGuard}${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)})) {
-    const ${varName}Elements = ${safeAccessor(relPath)}.filter((item: any) =>
+  if (${parentGuard}Array.isArray(${safeAccessor(relPath)})) {
+    const ${varName}Elements = ${safeList(relPath)}.filter((item: any) =>
       item.url === "${extensionUrl}"
     );
     if (${varName}Elements.length < ${min}) {
@@ -367,7 +367,7 @@ function generateExtensionValueChecks(matchedArrayVar, extensionUrl, extMeta, ct
     lines.push(`${indent}for (const _ext of ${matchedArrayVar}) {`);
     // -- Value type check --
     // Use Object.entries to get both key and value without re-indexing into the typed object
-    lines.push(`${indent}  const _valEntry = Object.entries(_ext).find(([k]) => k.startsWith("value"));`);
+    lines.push(`${indent}  const _valEntry = Object.entries(node(_ext)).find(([k]) => k.startsWith("value"));`);
     lines.push(`${indent}  if (_valEntry && !${allowedSet}.includes(_valEntry[0])) {`);
     lines.push(`${indent}    const _found = _valEntry[0].replace("value", "").toLowerCase();`);
     lines.push(`${indent}    errors.push("The Profile '${profileOrExtUrl}' definition allows for ${typesClause} but found type " + _found);`);
@@ -386,22 +386,25 @@ function generateExtensionValueChecks(matchedArrayVar, extensionUrl, extMeta, ct
             // when valueCode was expected). This mirrors the HL7 validator which
             // checks the value against the binding regardless of the value type.
             if (extMeta.valueTypes.length === 1 && (extMeta.valueTypes[0] === 'code' || extMeta.valueTypes[0] === 'string' || extMeta.valueTypes[0] === 'uri')) {
-                const propName = `value${valuePropertySuffix(extMeta.valueTypes[0])}`;
                 lines.push(`${indent}  if (_valEntry && typeof _valEntry[1] === "string" && !${vsInfoFull.validatorFn}(_valEntry[1])) {`);
                 lines.push(`${indent}    errors.push("The value provided ('" + _valEntry[1] + "') was not found in the value set '${vsInfoFull.displayName}' (${vsUri})");`);
                 lines.push(`${indent}  }`);
             }
             else if (extMeta.valueTypes.includes('CodeableConcept')) {
-                lines.push(`${indent}  if (_ext.valueCodeableConcept?.coding) {`);
-                lines.push(`${indent}    const _hasValid = _ext.valueCodeableConcept.coding.some((c: { code?: string }) => c.code && ${vsInfoFull.validatorFn}(c.code));`);
+                // `_ext` is an element of an `arr()` list and therefore `unknown`; reach the
+                // coding through `at()` and assert only the shape actually read.
+                lines.push(`${indent}  const _extCoding = at(_ext, 'valueCodeableConcept', 'coding') as Array<{ code?: string }> | undefined;`);
+                lines.push(`${indent}  if (_extCoding) {`);
+                lines.push(`${indent}    const _hasValid = _extCoding.some(c => c.code && ${vsInfoFull.validatorFn}(c.code));`);
                 lines.push(`${indent}    if (!_hasValid) {`);
                 lines.push(`${indent}      errors.push("None of the codings in the extension value are from the value set '${vsInfoFull.displayName}' (${vsUri})");`);
                 lines.push(`${indent}    }`);
                 lines.push(`${indent}  }`);
             }
             else if (extMeta.valueTypes.includes('Coding')) {
-                lines.push(`${indent}  if (_ext.valueCoding?.code && !${vsInfoFull.validatorFn}(_ext.valueCoding.code)) {`);
-                lines.push(`${indent}    errors.push("The value provided ('" + _ext.valueCoding.code + "') was not found in the value set '${vsInfoFull.displayName}' (${vsUri})");`);
+                lines.push(`${indent}  const _extCode = at(_ext, 'valueCoding', 'code') as string | undefined;`);
+                lines.push(`${indent}  if (_extCode && !${vsInfoFull.validatorFn}(_extCode)) {`);
+                lines.push(`${indent}    errors.push("The value provided ('" + _extCode + "') was not found in the value set '${vsInfoFull.displayName}' (${vsUri})");`);
                 lines.push(`${indent}  }`);
             }
         }

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

@@ -4,7 +4,7 @@
  * (patternCodeableConcept, patternCoding, BackboneElement, binding, ValueSet).
  */
 import { addDiagnostic } from '../../core/sdDiagnostics.js';
-import { safeAccessor, sliceElseBranch, rewritePrimitiveExtensionPath, isArrayPath, collectWithinSliceMaxChildren, generateWithinSliceMaxChecks } from './sliceValidatorUtils.js';
+import { safeAccessor, safeList, sliceElseBranch, rewritePrimitiveExtensionPath, isArrayPath, collectWithinSliceMaxChildren, generateWithinSliceMaxChecks } from './sliceValidatorUtils.js';
 import { generateBackboneElementValidation, generateBindingCodesValidation, generateFixedValueSliceValidation } from './sliceBackboneValidation.js';
 import { generateValueSetValidation, detectExistsExtensionDiscriminator, generateExistsExtensionValidation, detectExtensionUrlSlice, generateExtensionUrlSliceValidation, } from './sliceExtensionValidation.js';
 /**
@@ -235,7 +235,7 @@ function generateCrossSliceExclusivityValidations(slicesByBase, fields, fieldPat
         if (!isArrayPath(relPath, fieldPathMap, arrayFieldPaths))
             return;
         let code = `\n  // Cross-slice exclusivity validation for ${relPath}`;
-        code += `\n  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)})) {`;
+        code += `\n  if (Array.isArray(${safeAccessor(relPath)})) {`;
         code += `\n    for (const _el of ${safeAccessor(relPath)}) {`;
         code += `\n      const _matchedSlices: string[] = [];`;
         for (const m of matchers) {
@@ -374,8 +374,8 @@ function generatePatternCodeableConceptValidation(slice, relPath, errorPath, sli
         const elseBranch = sliceElseBranch(relPath, errorPath, sliceLabel);
         out.push(`
   // Required slice validation for ${relPath}:${sliceLabel}
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)})) {
-    const ${varName}Elements = ${safeAccessor(relPath)}.filter((item: any) => ${checks});
+  if (Array.isArray(${safeAccessor(relPath)})) {
+    const ${varName}Elements = ${safeList(relPath)}.filter((item: any) => ${checks});
     if (${varName}Elements.length < ${min}) {
       errors.push("No elements matched required slice: '${errorPath}:${sliceLabel}'");
     }${childMaxChecks}
@@ -698,8 +698,8 @@ function generateReferenceProfileDiscriminatorValidation(slice, relPath, errorPa
     const childMaxChecks = generateWithinSliceMaxChecks(maxChildren, `_${varName}Refs`, resType, relPath, sliceLabel);
     out.push(`
   // Required Reference-profile slice validation for ${relPath}:${sliceLabel} (target → ${targetResourceType})
-  if (${safeAccessor(relPath)} && Array.isArray(${safeAccessor(relPath)})) {
-    const _${varName}Refs = ${safeAccessor(relPath)}.filter((e: any) =>
+  if (Array.isArray(${safeAccessor(relPath)})) {
+    const _${varName}Refs = ${safeList(relPath)}.filter((e: any) =>
       e?.type === '${targetResourceType}' ||
       (typeof e?.reference === 'string' && (e.reference.startsWith('${targetResourceType}/') || new RegExp('/${targetResourceType}/').test(e.reference)))
     );

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

@@ -12,17 +12,32 @@ export const FHIR_PRIMITIVES = new Set([
 export const FHIR_PRIMITIVE_STRING_TYPES = new Set([
     'code', 'uri', 'url', 'string', 'id', 'oid', 'uuid', 'canonical',
 ]);
+/** Render a dotted path as `at()` arguments: `'channel', 'payload', 'extension'`. */
+export function atArgs(relPath) {
+    return relPath.split('.').map(p => `'${p}'`).join(', ');
+}
 /**
  * Convert a dotted relPath into a safe accessor expression for generated code.
  * For single-segment paths (e.g., "category"), returns `resource.category`.
  * For multi-segment paths (e.g., "channel.payload.extension"), returns
- * `(resource as any).channel?.payload?.extension` to avoid TS2339 errors.
+ * `at(resource, 'channel', 'payload', 'extension')` — typed as `unknown`, so
+ * the emitted code stays checked instead of being widened by an `as any` cast.
  */
 export function safeAccessor(relPath) {
     if (!relPath.includes('.'))
         return `resource.${relPath}`;
-    const parts = relPath.split('.');
-    return `(resource as any).${parts[0]}?.${parts.slice(1).join('?.')}`;
+    return `at(resource, ${atArgs(relPath)})`;
+}
+/**
+ * Like {@link safeAccessor} but typed as a list, for call sites that iterate,
+ * `.filter()` or read `.length`.
+ *
+ * `arr()` yields `[]` for absent/non-array values, so
+ * `safeList(p) + '.length > 0'` is equivalent to the
+ * `x && Array.isArray(x) && x.length > 0` guard it replaces.
+ */
+export function safeList(relPath) {
+    return `arr(${safeAccessor(relPath)})`;
 }
 /**
  * Generate an else branch for required slice validation that guards on parent existence.
@@ -31,8 +46,8 @@ export function sliceElseBranch(relPath, errorPath, sliceLabel) {
     if (!relPath.includes('.')) {
         return `} else {\n    errors.push("No elements matched required slice: '${errorPath}:${sliceLabel}'");\n  }`;
     }
-    const parentPath = relPath.split('.').slice(0, -1).join('?.');
-    return `} else if ((resource as any).${parentPath}) {\n    errors.push("No elements matched required slice: '${errorPath}:${sliceLabel}'");\n  }`;
+    const parentPath = relPath.split('.').slice(0, -1).join('.');
+    return `} else if (at(resource, ${atArgs(parentPath)})) {\n    errors.push("No elements matched required slice: '${errorPath}:${sliceLabel}'");\n  }`;
 }
 /** Detect whether a dotted relPath traverses an array-typed parent field. */
 export function detectNestedArray(relPath, fields) {
@@ -148,7 +163,7 @@ export function generateWithinSliceMaxChecks(children, elementsVarName, resType,
             // max=0 on choice type (e.g., value[x]): check no key starting with prefix exists
             code += `
     for (const _wsElem of ${elementsVarName}) {
-      if (Object.keys(_wsElem).some(k => k.startsWith("${childProp}"))) {
+      if (Object.keys(node(_wsElem)).some(k => k.startsWith("${childProp}"))) {
         errors.push("${resType}.${relPath}:${sliceLabel}.${fhirPath}: max allowed = 0, but found 1");
       }
     }`;
@@ -157,7 +172,7 @@ export function generateWithinSliceMaxChecks(children, elementsVarName, resType,
             // max=0: field must not exist at all — handles both scalar and array
             code += `
     for (const _wsElem of ${elementsVarName}) {
-      const _wsVal = (_wsElem as any).${childProp};
+      const _wsVal = at(_wsElem, '${childProp}');
       if (_wsVal !== undefined && _wsVal !== null) {
         errors.push("${resType}.${relPath}:${sliceLabel}.${fhirPath}: max allowed = 0, but found " + (Array.isArray(_wsVal) ? _wsVal.length : 1));
       }
@@ -167,7 +182,7 @@ export function generateWithinSliceMaxChecks(children, elementsVarName, resType,
             // array field: check count doesn't exceed max
             code += `
     for (const _wsElem of ${elementsVarName}) {
-      const _wsArr = (_wsElem as any).${childProp};
+      const _wsArr = at(_wsElem, '${childProp}');
       if (Array.isArray(_wsArr) && _wsArr.length > ${maxVal}) {
         errors.push("${resType}.${relPath}:${sliceLabel}.${fhirPath}: max allowed = ${maxVal}, but found " + _wsArr.length);
       }