babelfhir-ts 1.6.9 → 1.6.10

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

@@ -119,13 +119,17 @@ export const EMITTED_RANGES = {
      * 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.
+     * 0.3.12 is the floor, for what the emitted form puts on a coded field.
+     * `AutoFormField` gained `options` in 0.3.10 — below that the property is not
+     * in the type, `autoForm` ignores it, and a bound field renders as free text.
+     * 0.3.12 then moved `required` onto every stateful control and added
+     * `Select({ multiple })`: before it, `autoForm` dropped `required` on the
+     * Select path because the component could not carry it, and a repeating coded
+     * element had no multi-select to render as. On 0.3.10 or 0.3.11 the form still
+     * builds and still offers the right choices, but a required element is not
+     * marked required and a repeating one takes a single value.
      */
-    prefab: '^0.3.10',
+    prefab: '^0.3.12',
     /**
      * Generated FHIR client base package (`@babelfhir-ts/client-<slug>`).
      *

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

@@ -341,6 +341,32 @@ export function mergeFields(newFields, oldFields) {
     // Return the merged fields as an array
     return Array.from(fieldMap.values());
 }
+/**
+ * Copies a directory tree, optionally keeping only the files a predicate accepts.
+ *
+ * Shared by the compile-time dependency providers, which each need part of an
+ * installed package inside the output's `node_modules` — the zod runtime whole,
+ * prefab's declarations only.
+ *
+ * @param filter - Called per file with its absolute source path. Omit to copy everything.
+ *                 A directory left empty by the filter is not created.
+ */
+export function copyDirRecursive(src, dest, filter) {
+    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        const srcPath = path.join(src, entry.name);
+        const destPath = path.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            fs.mkdirSync(destPath, { recursive: true });
+            copyDirRecursive(srcPath, destPath, filter);
+            if (fs.readdirSync(destPath).length === 0)
+                fs.rmdirSync(destPath);
+        }
+        else if (!filter || filter(srcPath)) {
+            fs.mkdirSync(path.dirname(destPath), { recursive: true });
+            fs.copyFileSync(srcPath, destPath);
+        }
+    }
+}
 /**
  * Ensures the given directory exists, creating it if necessary.
  */

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

@@ -0,0 +1,104 @@
+/**
+ * Makes `@maxhealth.tech/prefab` resolvable while the generated output compiles.
+ *
+ * `--prefab` emits renderers that import the real prefab API, and the emitted
+ * package declares prefab as a dependency — but nothing puts it where the
+ * generator's own `tsc` pass can see it. Every emitted renderer then failed
+ * TS2307 and the whole package failed to compile, so a `--prefab` run produced
+ * no `prefab/` in the shipped package at all. It only ever passed when the
+ * output happened to sit inside a tree that already had prefab installed, which
+ * is why it looks fine from this repo's own `output/` and fails in CI.
+ *
+ * The real declarations are used rather than a stub. The emitted renderers are
+ * checked against prefab's actual component signatures, and their `.d.ts` quotes
+ * prefab's types back to the consumer — a hand-written stub would both drift
+ * from the library and erase those types from the emitted package.
+ *
+ * Two sources, in order: a copy already installed alongside the generator (this
+ * repo, where prefab is a devDependency), else a one-package install from the
+ * registry (an `npx babelfhir-ts` run, which ships no devDependencies). Only
+ * the declarations are copied — `tsc` reads no JavaScript — and whatever this
+ * added is removed after the compile, because the consumer installs the real
+ * dependency themselves.
+ */
+import fs from 'fs';
+import path from 'path';
+import { spawnSync } from 'child_process';
+import { fileURLToPath } from 'url';
+import { copyDirRecursive } from '../../core/utils.js';
+import { EMITTED_RANGES } from '../../core/generatedPackageDeps.js';
+import { logger } from '../../../logger.js';
+const log = logger.withTag('prefab');
+const PACKAGE_NAME = '@maxhealth.tech/prefab';
+const PACKAGE_SEGMENTS = PACKAGE_NAME.split('/');
+/** How far up a tree to look for a `node_modules` holding the package. */
+const MAX_LOOKUP_DEPTH = 8;
+/** The package directory under a given tree root, whether or not it exists. */
+function packageDirIn(root) {
+    return path.join(root, 'node_modules', ...PACKAGE_SEGMENTS);
+}
+/** Walk up from `start`, returning the first installed copy found. */
+function findInstalledCopy(start) {
+    let dir = start;
+    for (let i = 0; i < MAX_LOOKUP_DEPTH; i++) {
+        const candidate = packageDirIn(dir);
+        if (fs.existsSync(path.join(candidate, 'package.json')))
+            return candidate;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return undefined;
+}
+/** Install the package into the output dir, declarations included. */
+function installFromRegistry(outputDir) {
+    const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+    const spec = `${PACKAGE_NAME}@${EMITTED_RANGES.prefab}`;
+    log.debug(`Installing ${spec} for the output typecheck`);
+    const result = spawnSync(npm, ['install', '--no-save', '--no-package-lock', '--no-audit', '--no-fund',
+        '--prefix', outputDir, spec], { stdio: 'pipe', encoding: 'utf8' });
+    if (result.status !== 0) {
+        log.warn(`Could not install ${spec}: ${result.stderr?.trim() || `exit ${result.status}`}`);
+        return false;
+    }
+    return fs.existsSync(path.join(packageDirIn(outputDir), 'package.json'));
+}
+/**
+ * Ensure the emitted `prefab/` files can be typechecked from `outputDir`.
+ *
+ * @returns a cleanup that removes what this added, and does nothing when the
+ *          package was already resolvable.
+ */
+export function providePrefabTypes(outputDir) {
+    const alreadyResolvable = findInstalledCopy(outputDir);
+    if (alreadyResolvable) {
+        log.debug(`Typechecking prefab output against ${alreadyResolvable}`);
+        return () => { };
+    }
+    const target = packageDirIn(outputDir);
+    const generatorDir = path.dirname(fileURLToPath(import.meta.url));
+    const alongsideGenerator = findInstalledCopy(generatorDir);
+    if (alongsideGenerator) {
+        fs.mkdirSync(target, { recursive: true });
+        // Declarations only: `tsc` never reads the JavaScript, and prefab ships
+        // browser bundles and source maps that would triple the copy for nothing.
+        copyDirRecursive(alongsideGenerator, target, src => src.endsWith('.d.ts') || path.basename(src) === 'package.json');
+    }
+    else if (!installFromRegistry(outputDir)) {
+        throw new Error(`--prefab needs ${PACKAGE_NAME} to typecheck the emitted renderers, and it could not be ` +
+            `resolved next to the generator or installed from the registry. Install ` +
+            `${PACKAGE_NAME}@${EMITTED_RANGES.prefab} where generation runs, or drop --prefab.`);
+    }
+    return () => {
+        try {
+            fs.rmSync(target, { recursive: true, force: true });
+        }
+        catch { /* ignore */ }
+        // Leave `@maxhealth.tech/` behind only while it still holds something else.
+        try {
+            fs.rmdirSync(path.dirname(target));
+        }
+        catch { /* not empty — fine */ }
+    };
+}

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

@@ -89,9 +89,12 @@ function emitFormFields(descriptors) {
         // Forms can't capture complex nested structures cleanly; skip them.
         if (d.kind === 'nested' || d.kind === 'json' || d.kind === 'image' || d.kind === 'dicom')
             continue;
-        if (d.isArray)
-            continue; // v1: scalars only
         const options = d.enumOptions?.length ? d.enumOptions : undefined;
+        // A repeating element is only expressible as a form field when the choices
+        // are enumerated: prefab's multi-select submits a list under the name, which
+        // is the element's own shape. Any other array still has no control.
+        if (d.isArray && !options)
+            continue;
         let type = 'text';
         if (d.kind === 'number')
             type = 'number';
@@ -106,6 +109,8 @@ function emitFormFields(descriptors) {
             extra.push('required: true');
         if (options)
             extra.push(`options: ${emitOptionsLiteral(options)}`);
+        if (d.isArray)
+            extra.push('multiple: true');
         lines.push(`    { ${extra.join(', ')} },`);
         seen.add(d.name);
     }

package/out/src/generator/emitters/zod/zodStubInstaller.js

@@ -12,6 +12,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { versionSlug } from '../../fhir/versionContext.js';
 import { getZodPackageTypes } from './zodTypes.js';
+import { copyDirRecursive } from '../../core/utils.js';
 /** Resolve the repo root from this file's location (src/generator/emitters/zod/) */
 function findRepoRoot() {
     const selfDir = path.dirname(fileURLToPath(import.meta.url));
@@ -26,20 +27,6 @@ function findRepoRoot() {
     }
     return path.resolve(selfDir, '..', '..', '..', '..');
 }
-/** Recursively copy a directory's contents, handling nested subdirectories. */
-function copyDirRecursive(src, dest) {
-    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-        const srcPath = path.join(src, entry.name);
-        const destPath = path.join(dest, entry.name);
-        if (entry.isDirectory()) {
-            fs.mkdirSync(destPath, { recursive: true });
-            copyDirRecursive(srcPath, destPath);
-        }
-        else {
-            fs.copyFileSync(srcPath, destPath);
-        }
-    }
-}
 export function installBaseZodTypes(outputDir) {
     const slug = versionSlug();
     const pkgDir = path.join(outputDir, 'node_modules', '@babelfhir-ts', 'zod');

package/out/src/generator/index.js

@@ -619,10 +619,19 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
         // Install fhirpath type stub so tsc can resolve validator imports
         const { installFhirpathStub, removeFhirpathStub } = await import('./emitters/validator/fhirpathStubInstaller.js');
         installFhirpathStub(outputDir);
+        // Emitted renderers import the real prefab API, which nothing has installed here yet
+        const releasePrefabTypes = flags?.prefab
+            ? (await import('./emitters/prefab/prefabDepProvider.js')).providePrefabTypes(outputDir)
+            : undefined;
         // Compile TypeScript to JavaScript
         endPhase = startPhase('compile');
         logger.log('Compiling TypeScript to JavaScript...');
-        await compileTypeScriptToJS(outputDir);
+        try {
+            await compileTypeScriptToJS(outputDir);
+        }
+        finally {
+            releasePrefabTypes?.();
+        }
         endPhase(); // compile
         // Remove fhirpath stub — the real package is a peer dependency
         removeFhirpathStub(outputDir);
@@ -841,9 +850,17 @@ export async function generateIntoPackageDirect(packageArchivePath, flags) {
     }
     const { installFhirpathStub, removeFhirpathStub } = await import('./emitters/validator/fhirpathStubInstaller.js');
     installFhirpathStub(outputDir);
+    const releasePrefabTypes = flags?.prefab
+        ? (await import('./emitters/prefab/prefabDepProvider.js')).providePrefabTypes(outputDir)
+        : undefined;
     endPhase = startPhase('compile');
     logger.log('Compiling TypeScript to JavaScript...');
-    await compileTypeScriptToJS(outputDir);
+    try {
+        await compileTypeScriptToJS(outputDir);
+    }
+    finally {
+        releasePrefabTypes?.();
+    }
     endPhase(); // compile
     removeFhirpathStub(outputDir);
     const babelfhirDir = path.join(outputDir, 'node_modules', '@babelfhir-ts');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.6.9",
+  "version": "1.6.10",
   "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.11",
+    "@maxhealth.tech/prefab": "^0.3.12",
     "@types/node": "^25.9.5",
     "@types/semver": "^7.8.0",
     "@types/unzipper": "^0.10.11",