babelfhir-ts 1.6.8 → 1.6.9

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

@@ -112,14 +112,20 @@ export const EMITTED_RANGES = {
     /**
      * 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
+     * 0.3.0 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.
+     *
+     * 0.3.10 is the floor because `AutoFormField` gained `options` there, and the
+     * emitted form now carries the bound ValueSet's concepts on every coded
+     * field. Below it the property is not in the type and is ignored by
+     * `autoForm`, so a required-binding field renders as free text: the form
+     * still builds, and every constraint the binding states is gone from it.
      */
-    prefab: '^0.3.0',
+    prefab: '^0.3.10',
     /**
      * Generated FHIR client base package (`@babelfhir-ts/client-<slug>`).
      *

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

@@ -28,9 +28,9 @@ function ensurePrefabDir(outputDir) {
  * Emit `prefab/<InterfaceName>Prefab.ts` for a single profile.
  * Registers the profile so {@link finalizePrefabOutput} can build the barrel.
  */
-export function writePrefabProfile(outputDir, interfaceName, fields, resourceType) {
+export function writePrefabProfile(outputDir, interfaceName, fields, resourceType, valueSets) {
     const dir = ensurePrefabDir(outputDir);
-    const { code, fieldCount } = generatePrefabRenderer(interfaceName, fields, { resourceType });
+    const { code, fieldCount } = generatePrefabRenderer(interfaceName, fields, { resourceType, valueSets });
     const filePath = path.join(dir, `${interfaceName}Prefab.ts`);
     fs.writeFileSync(filePath, code);
     let map = emittedProfiles.get(outputDir);

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

@@ -68,6 +68,17 @@ function emitToRowBody(descriptors) {
     const lines = descriptors.map(d => `    ${d.name}: ${rowAccessor(d)},`);
     return lines.join('\n');
 }
+/**
+ * Emit an `AutoFormOption[]` literal for a bound field.
+ *
+ * The label is omitted when the concept carried no display, because prefab
+ * already falls back to the value and restating it would only make the
+ * generated file longer.
+ */
+function emitOptionsLiteral(options) {
+    const entries = options.map(o => o.label ? `{ value: ${JSON.stringify(o.value)}, label: ${JSON.stringify(o.label)} }` : `{ value: ${JSON.stringify(o.value)} }`);
+    return `[${entries.join(', ')}]`;
+}
 /** Emit `autoForm` field descriptors. */
 function emitFormFields(descriptors) {
     const lines = [];
@@ -80,6 +91,7 @@ function emitFormFields(descriptors) {
             continue;
         if (d.isArray)
             continue; // v1: scalars only
+        const options = d.enumOptions?.length ? d.enumOptions : undefined;
         let type = 'text';
         if (d.kind === 'number')
             type = 'number';
@@ -87,14 +99,13 @@ function emitFormFields(descriptors) {
             type = 'switch';
         else if (d.kind === 'date')
             type = 'date';
-        else if (d.enumValues && d.enumValues.length > 0)
+        else if (options)
             type = 'select';
         const extra = [`name: '${d.name}'`, `label: ${JSON.stringify(d.label)}`, `type: '${type}'`];
         if (d.required)
             extra.push('required: true');
-        // NOTE: @maxhealth.tech/prefab AutoFormField does not yet carry an `options`
-        // property for select inputs; the enum list is elided until the upstream
-        // type is widened. See prefab-ui#TODO.
+        if (options)
+            extra.push(`options: ${emitOptionsLiteral(options)}`);
         lines.push(`    { ${extra.join(', ')} },`);
         seen.add(d.name);
     }
@@ -206,7 +217,7 @@ function emitBrowserTitleExpr(titleDescriptor, interfaceName) {
         : `selected.dot('${titleDescriptor.name}')`;
 }
 export function generatePrefabRenderer(interfaceName, fields, options) {
-    const rawDescriptors = fields.flatMap(describeField);
+    const rawDescriptors = fields.flatMap(f => describeField(f, options?.valueSets));
     const descriptors = dedupeDescriptors(rawDescriptors);
     const resourceType = options?.resourceType;
     const tableDescriptors = pickTableDescriptors(descriptors);

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

@@ -8,6 +8,8 @@
  * This module is deliberately small and data-driven so it can later be
  * extracted into a shared codegen-spec package (see design notes).
  */
+import { lookupBoundValueSet } from '../requiredBindings.js';
+import { ctx } from '../../fhir/versionContext.js';
 /** Lower-cased FHIR primitive type codes. */
 const PRIMITIVE_TEXT = new Set([
     'string', 'code', 'uri', 'url', 'canonical', 'id', 'oid', 'uuid', 'markdown', 'xhtml',
@@ -23,6 +25,29 @@ function labelFor(name) {
     const spaced = name.replace(/([A-Z])/g, ' $1').replace(/[._-]/g, ' ').trim();
     return spaced.charAt(0).toUpperCase() + spaced.slice(1);
 }
+/**
+ * Build the choice list for a bound field, or undefined when there is none to
+ * offer.
+ *
+ * The parsed ValueSet is preferred over the codes the SD parser sampled onto
+ * the binding: it carries the concept displays, and it is the whole set rather
+ * than a subset. Both paths are capped at the same `STORE_CODES` threshold the
+ * parser and the interface emitter already use to decide a ValueSet is small
+ * enough to enumerate — past it a Select stops being a usable control and the
+ * field stays a free-text input.
+ */
+function selectOptionsFor(field, valueSets) {
+    const limit = ctx().valueSetThresholds.STORE_CODES;
+    const resolved = lookupBoundValueSet(field.binding?.uri, valueSets);
+    const concepts = resolved?.valueSet.concepts;
+    if (concepts?.length && concepts.length <= limit) {
+        return concepts.map(c => ({ value: c.code, ...(c.display ? { label: c.display } : {}) }));
+    }
+    const sampled = field.binding?.codes?.filter(c => c.code).map(c => ({ value: c.code }));
+    if (sampled?.length && sampled.length <= limit)
+        return sampled;
+    return undefined;
+}
 function kindForType(fhirType) {
     if (PRIMITIVE_TEXT.has(fhirType))
         return 'text';
@@ -86,7 +111,7 @@ function kindForType(fhirType) {
  * on the typed interface. Detail views for nested backbone elements are a
  * follow-up once slicing-aware tree rendering lands.
  */
-export function describeField(field) {
+export function describeField(field, valueSets) {
     if (field.isForbidden)
         return [];
     if (!field.type)
@@ -132,7 +157,7 @@ export function describeField(field) {
                 label: labelFor(variantPropName),
                 valueSetUri: field.binding?.uri,
                 bindingStrength: field.binding?.strength,
-                enumValues: field.binding?.codes?.map(c => c.code).filter(Boolean),
+                enumOptions: selectOptionsFor(field, valueSets),
             });
         }
         return out;
@@ -158,7 +183,7 @@ export function describeField(field) {
             label: labelFor(bareName),
             valueSetUri: field.binding?.uri,
             bindingStrength: field.binding?.strength,
-            enumValues: field.binding?.codes?.map(c => c.code).filter(Boolean),
+            enumOptions: selectOptionsFor(field, valueSets),
         }];
 }
 /**

package/out/src/generator/emitters/requiredBindings.js

@@ -21,17 +21,31 @@ import { stripVersionFromCanonicalUrl } from '../core/utils.js';
 import { sanitizeValueSetName } from './valueset/valueSetGenerator.js';
 /** Types FHIR permits a binding on. */
 const BINDABLE_TYPES = ['code', 'Coding', 'CodeableConcept', 'Quantity', 'string', 'uri'];
-export function resolveRequiredBindingValueSet(bindingUri, valueSets) {
+/**
+ * Resolve a binding URI to its parsed ValueSet, versioned key first.
+ *
+ * A binding may cite `…/ValueSet/foo|1.0.0` while the package indexes the
+ * ValueSet under its unversioned canonical, so both keys have to be tried.
+ * Every emitter that reads concepts off a binding needs the same two lookups,
+ * which is why it lives here rather than in each of them.
+ */
+export function lookupBoundValueSet(bindingUri, valueSets) {
     if (!bindingUri || !valueSets)
         return undefined;
-    let vs = valueSets.get(bindingUri);
-    let resolvedUri = bindingUri;
-    if (!vs && bindingUri.includes('|')) {
-        resolvedUri = stripVersionFromCanonicalUrl(bindingUri);
-        vs = valueSets.get(resolvedUri);
-    }
-    if (!vs)
+    const direct = valueSets.get(bindingUri);
+    if (direct)
+        return { valueSet: direct, resolvedUri: bindingUri };
+    if (!bindingUri.includes('|'))
+        return undefined;
+    const strippedUri = stripVersionFromCanonicalUrl(bindingUri);
+    const stripped = valueSets.get(strippedUri);
+    return stripped ? { valueSet: stripped, resolvedUri: strippedUri } : undefined;
+}
+export function resolveRequiredBindingValueSet(bindingUri, valueSets) {
+    const resolved = lookupBoundValueSet(bindingUri, valueSets);
+    if (!resolved || !bindingUri)
         return undefined;
+    const { valueSet: vs, resolvedUri } = resolved;
     const displayName = resolvedUri.split('/').pop() || vs.name;
     if (vs.concepts.length === 0) {
         if (vs.systems && vs.systems.length > 0) {

package/out/src/generator/sdProcessor.js

@@ -750,7 +750,7 @@ export async function processStructureDefinition(sd, ctx) {
     }
     if (flags?.prefab) {
         const { writePrefabProfile } = await import('./emitters/prefab/prefabEmitter.js');
-        writePrefabProfile(outputDir, interfaceName, aligned.alignedNewFields, sd.type);
+        writePrefabProfile(outputDir, interfaceName, aligned.alignedNewFields, sd.type, valueSets);
     }
     logger.log(`Generated artifacts for ${interfaceName}`);
     return interfaceName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "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",
@@ -87,7 +87,7 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@max-health-inc/config": "^3.1.0",
-    "@maxhealth.tech/prefab": "^0.3.7",
+    "@maxhealth.tech/prefab": "^0.3.11",
     "@types/node": "^25.9.5",
     "@types/semver": "^7.8.0",
     "@types/unzipper": "^0.10.11",