babelfhir-ts 1.5.0 → 1.5.2

package/out/src/generator/emitters/client/clientReadmeGenerator.js

@@ -223,7 +223,7 @@ export interface Bundle<T = ${fhirNs}.Resource> {
   type: "collection" | "searchset" | "transaction-response" | "transaction" | "batch" | "batch-response" | "document" | "message" | "history";
   total?: number;
   link?: { relation: string; url: string }[];
-  entry?: { resource?: T; fullUrl?: string; search?: { mode?: string; score?: number }; request?: { method: string; url: string }; response?: { status: string } }[];
+  entry?: { resource?: T; fullUrl?: string; search?: { mode?: string; score?: number }; request?: { method: 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH'; url: string }; response?: { status: string } }[];
 }
 
 export declare class FhirResourceReader<T extends ${fhirNs}.Resource, S extends SearchParams = SearchParams> {

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

@@ -29,7 +29,7 @@ function ensurePrefabDir(outputDir) {
  */
 export function writePrefabProfile(outputDir, interfaceName, fields, resourceType) {
     const dir = ensurePrefabDir(outputDir);
-    const { code, fieldCount } = generatePrefabRenderer(interfaceName, fields);
+    const { code, fieldCount } = generatePrefabRenderer(interfaceName, fields, { resourceType });
     const filePath = path.join(dir, `${interfaceName}Prefab.ts`);
     fs.writeFileSync(filePath, code);
     let map = emittedProfiles.get(outputDir);
@@ -138,7 +138,16 @@ function buildMcpViewsTs(profiles) {
  * @see https://babelfhir-ts.dev/generated-code
  */
 
-import type { FhirViewRegistry } from '@babelfhir-ts/mcp';
+/**
+ * Registry consumed by createFhirMcpServer() to resolve profile-aware
+ * table / detail views. Defined inline to avoid a heavy dependency on
+ * the full \`@babelfhir-ts/mcp\` package at compile time.
+ */
+export interface FhirViewRegistry {
+  table?: (resourceType: string, resources: unknown[]) => unknown | undefined;
+  detail?: (resource: unknown) => unknown | undefined;
+}
+
 ${imports.join('\n')}
 
 const TABLE_MAP: Record<string, (resources: unknown[]) => unknown> = {

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

@@ -72,6 +72,7 @@ function rowAccessor(d) {
             return `formatPeriod(${first})`;
         case 'image':
             return `formatAttachmentUrl(${first})`;
+        case 'dicom':
         case 'nested':
         case 'json':
             return `${prop}`; // raw; Detail view handles these separately
@@ -92,7 +93,7 @@ function emitFormFields(descriptors) {
         if (seen.has(d.name))
             continue;
         // Forms can't capture complex nested structures cleanly; skip them.
-        if (d.kind === 'nested' || d.kind === 'json' || d.kind === 'image')
+        if (d.kind === 'nested' || d.kind === 'json' || d.kind === 'image' || d.kind === 'dicom')
             continue;
         if (d.isArray)
             continue; // v1: scalars only
@@ -143,6 +144,7 @@ function formatPipeFor(kind) {
         case 'date': return 'fhirDate';
         case 'boolean': return 'fhirBoolean';
         case 'image': return 'attachmentUrl';
+        case 'dicom': return undefined; // rendered as DicomViewer component, not a pipe
         case 'text':
         case 'number':
         case 'nested':
@@ -220,9 +222,10 @@ function emitBrowserTitleExpr(titleDescriptor, interfaceName) {
         ? `selected.formatted('${titleDescriptor.name}', '${pipe}')`
         : `selected.dot('${titleDescriptor.name}')`;
 }
-export function generatePrefabRenderer(interfaceName, fields) {
+export function generatePrefabRenderer(interfaceName, fields, options) {
     const rawDescriptors = fields.flatMap(describeField);
     const descriptors = dedupeDescriptors(rawDescriptors);
+    const resourceType = options?.resourceType;
     const tableDescriptors = pickTableDescriptors(descriptors);
     const titleDescriptor = findTitleDescriptor(descriptors);
     // Only use the title field for the detail heading when it's actually present
@@ -286,10 +289,12 @@ export function generatePrefabRenderer(interfaceName, fields) {
     // unconditional when the profile has at least one table-renderable field.
     // `PrefabAppOptions` is imported as a type to let callers thread through
     // theme / scripts / onMount overrides without re-declaring the shape.
+    const isImagingStudy = resourceType === 'ImagingStudy';
     const prefabImports = [
         'Card',
         'CardContent',
         'Column',
+        ...(isImagingStudy ? ['Component'] : []),
         'DataTable',
         'Detail',
         'Heading',
@@ -304,6 +309,62 @@ export function generatePrefabRenderer(interfaceName, fields) {
     ];
     const prefabImportLines = prefabImports.map(c => `  ${c},`).join('\n');
     const prefabTypeImportLine = `import type { PrefabAppOptions } from '@maxhealth.tech/prefab';`;
+    // --- DicomViewer helper (emitted only for ImagingStudy profiles) --------
+    // Produces { type: "DicomViewer", wadoRsRoot, studyUID, seriesUID } in the
+    // wire format. The renderer resolves this via registerComponent at runtime.
+    const dicomHelperBlock = isImagingStudy ? `
+/**
+ * Emit a DicomViewer custom component node.
+ *
+ * Wire format: \`{ type: "DicomViewer", wadoRsRoot, studyUID, seriesUID }\`
+ * The host renderer must have a \`DicomViewer\` component registered via
+ * \`registerComponent('DicomViewer', renderFn)\` — prefab passes props
+ * through to whatever render function is registered for the type.
+ */
+function DicomViewer(props: { wadoRsRoot: string; studyUID: string; seriesUID?: string }) {
+  const c = new Component('DicomViewer');
+  c.getProps = () => ({ ...props });
+  return c;
+}
+
+/**
+ * Extract WADO-RS root URL from ImagingStudy.endpoint references.
+ * Falls back to series-level endpoints if study-level is absent.
+ */
+function extractWadoRsRoot(resource: ${interfaceName}): string | undefined {
+  // Study-level endpoint: resource.endpoint[].reference
+  const studyEndpoint = (resource as any).endpoint?.[0]?.reference;
+  if (studyEndpoint) return studyEndpoint;
+  // Series-level fallback
+  return (resource as any).series?.[0]?.endpoint?.[0]?.reference;
+}
+
+/**
+ * Extract the DICOM Study Instance UID from the resource.
+ * ImagingStudy stores it as an identifier with system 'urn:dicom:uid'
+ * (value prefixed with 'urn:oid:') or in a top-level dedicated field
+ * depending on the FHIR version (R5 uses .identifier, R4 relies on
+ * identifier with the DICOM system).
+ */
+function extractStudyUID(resource: ${interfaceName}): string | undefined {
+  const identifiers = (resource as any).identifier as Array<{ system?: string; value?: string }> | undefined;
+  const dicomId = identifiers?.find(id => id.system === 'urn:dicom:uid');
+  if (dicomId?.value) {
+    // Strip 'urn:oid:' prefix if present
+    return dicomId.value.replace(/^urn:oid:/, '');
+  }
+  return undefined;
+}
+` : '';
+    // DicomViewer detail section — appended after the Card in the detail view
+    const dicomDetailSection = isImagingStudy ? `
+      // --- DICOM Viewer (ImagingStudy) ---
+      ...((resource as any).series ?? []).map((s: any, idx: number) => {
+        const wadoRsRoot = extractWadoRsRoot(resource);
+        const studyUID = extractStudyUID(resource);
+        if (!wadoRsRoot || !studyUID || !s.uid) return undefined;
+        return DicomViewer({ wadoRsRoot, studyUID, seriesUID: s.uid });
+      }).filter(Boolean),` : '';
     const code = `/**
  * Auto-generated prefab render functions for ${interfaceName}.
  * DO NOT EDIT MANUALLY — regenerate with: babelfhir-ts --prefab
@@ -320,7 +381,7 @@ ${formatterImportBlock}import { styles } from './styles.js';
 // with \`new Function()\` in the browser — closures are not preserved, so
 // each pipe in \`FHIR_PIPES\` inlines all logic it needs.
 import { FHIR_PIPES } from './registerFhirPipes.js';
-
+${dicomHelperBlock}
 export interface ${interfaceName}Row {
 ${rowInterfaceProps}
 }
@@ -359,6 +420,7 @@ ${detailRows}
           }),
         ],
       }),
+${dicomDetailSection}
     ],
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "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",
@@ -79,6 +79,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.24.0",
+    "@maxhealth.tech/prefab": "^0.2.22",
     "@types/node": "^25.5.0",
     "@types/unzipper": "^0.10.11",
     "@vitest/coverage-v8": "^4.0.15",
@@ -92,14 +93,14 @@
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.30.1",
     "vitepress": "^1.6.4",
+    "vitepress-plugin-llms": "^1.12.2",
     "vitest": "^4.0.15",
     "zod": "^4.3.6"
   },
   "dependencies": {
-    "@maxhealth.tech/prefab": "^0.2.1",
-    "@types/fhir": "^0.0.41",
+    "@types/fhir": "^0.0.42",
     "consola": "^3.4.2",
-    "fhirpath": "^4.9.1",
+    "fhirpath": "^4.10.0",
     "tar": "^7.4.3",
     "tsx": "^4.19.3",
     "unzipper": "^0.12.3"