babelfhir-ts 1.3.0 → 1.3.2

package/README.md

@@ -17,9 +17,9 @@
 
 <!-- Tech Stack Badges -->
 <p align="center">
-  <img src="https://img.shields.io/badge/TypeScript-5.8-3178c6?logo=typescript" alt="TypeScript">
+  <img src="https://img.shields.io/badge/TypeScript-6.0-3178c6?logo=typescript" alt="TypeScript">
   <img src="https://img.shields.io/badge/Node.js-18%2B-339933?logo=node.js" alt="Node.js">
-  <img src="https://img.shields.io/badge/Zod-3.x-3068b7?logo=zod" alt="Zod">
+  <img src="https://img.shields.io/badge/Zod-4.x-3068b7?logo=zod" alt="Zod">
 </p>
 
 <!-- FHIR Client Packages -->
@@ -32,8 +32,7 @@
 
 <!-- Validation & Imaging Packages -->
 <p align="center">
-  <a href="https://www.npmjs.com/package/@babelfhir-ts/zod-r4"><img src="https://img.shields.io/npm/v/@babelfhir-ts/zod-r4.svg?label=%40babelfhir-ts%2Fzod-r4" alt="zod-r4"></a>
-  <a href="https://www.npmjs.com/package/@babelfhir-ts/zod-r4b"><img src="https://img.shields.io/npm/v/@babelfhir-ts/zod-r4b.svg?label=%40babelfhir-ts%2Fzod-r4b" alt="zod-r4b"></a>
+  <a href="https://www.npmjs.com/package/@babelfhir-ts/zod"><img src="https://img.shields.io/npm/v/@babelfhir-ts/zod.svg?label=%40babelfhir-ts%2Fzod" alt="zod"></a>
   <a href="https://www.npmjs.com/package/@babelfhir-ts/dicomweb"><img src="https://img.shields.io/npm/v/@babelfhir-ts/dicomweb.svg?label=%40babelfhir-ts%2Fdicomweb" alt="dicomweb"></a>
 </p>
 

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

@@ -11,7 +11,7 @@ export function generateClass(className, interfaceName, baseResource, requiredFi
     const resourceTypeLine = addResourceType && baseResource && baseResource !== 'Resource' ? `resourceType: '${baseResource}',` : (addResourceType ? `resourceType: 'Resource',` : '');
     // Only true FHIR Resources (not datatypes like Identifier, Attachment, Extension) can carry meta.profile.
     const enableMetaProfile = addResourceType && !!profileUrl;
-    const constructorMetaProfile = enableMetaProfile ? `ensureProfile(this.resource, '${profileUrl}');` : '';
+    const constructorMetaProfile = enableMetaProfile ? `ensureProfile(this.resource as WithMeta, '${profileUrl}');` : '';
     const setterMetaProfile = constructorMetaProfile; // same logic
     const randomMetaProfileInit = enableMetaProfile ? `ensureProfile(base as WithMeta, '${profileUrl}');` : '// (no profileUrl provided or profile targets a datatype – meta.profile not applicable)';
     // Assemble required field initialisers (excluding id & resourceType)

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

@@ -35,8 +35,8 @@ const __require = createRequire(import.meta.url);` : ''}
 
 // Helper emitted only when meta.profile enforcement is applicable (resource profiles)
 ${enableMetaProfile ? `type WithMeta = { meta?: { profile?: string[] } };
-function ensureProfile<R extends WithMeta>(res: R, profile: string): void {
-  if (!res.meta) { (res as WithMeta).meta = { profile: [profile] }; return; }
+function ensureProfile(res: WithMeta, profile: string): void {
+  if (!res.meta) { res.meta = { profile: [profile] }; return; }
   if (!res.meta.profile) { res.meta.profile = [profile]; return; }
   if (!res.meta.profile.includes(profile)) { res.meta.profile = [...res.meta.profile, profile]; }
 }` : ''}

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

@@ -2,7 +2,7 @@
  * Generates Zod schemas from parsed FHIR StructureDefinition fields.
  * Follows the same Field[] → code string pattern as validatorGenerator.ts and interfaceGenerator.ts.
  *
- * Complex FHIR base types are imported from @babelfhir-ts/zod-<version>
+ * Complex FHIR base types are imported from @babelfhir-ts/zod/<version>
  * instead of being inlined, mirroring the @babelfhir-ts/client-<version> pattern.
  */
 import { sanitizeValueSetName } from '../valueset/valueSetGenerator.js';
@@ -217,11 +217,11 @@ export function generateZodSchema(interfaceName, newFields, baseResource, baseFi
     }
     // Emit file header
     lines.push(`import { z } from "zod";`);
-    // Add base-type imports from @babelfhir-ts/zod-<version>
+    // Add base-type imports from @babelfhir-ts/zod/<version>
     if (baseTypeImports.size > 0) {
         const sorted = Array.from(baseTypeImports).sort();
         const specifiers = sorted.map(t => `${t}Schema`).join(', ');
-        lines.push(`import { ${specifiers} } from "@babelfhir-ts/zod-${versionSlug()}";`);
+        lines.push(`import { ${specifiers} } from "@babelfhir-ts/zod/${versionSlug()}";`);
     }
     // Add FHIR type imports for referenced complex types (profiled, not base)
     if (imports.size > 0) {
@@ -329,7 +329,7 @@ function buildZodType(field, valueSets, valueSetImports, complexTypeImports, bas
     if (zodPrimitive) {
         return zodPrimitive;
     }
-    // Known FHIR complex types — import from @babelfhir-ts/zod-<version>
+    // Known FHIR complex types — import from @babelfhir-ts/zod/<version>
     // Check both isFhirType (interfaces.json) and zodPackageTypes (dataTypes.json)
     // to handle types like SimpleQuantity that are in zod packages but not in interfaces
     if (getZodPackageTypes().has(fhirType)) {

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

@@ -1,7 +1,7 @@
 /**
- * Installs @babelfhir-ts/zod-<version> into the generated output's node_modules.
+ * Installs @babelfhir-ts/zod into the generated output's node_modules.
  *
- * If the pre-built runtime package (packages/zod-<version>/dist/) exists,
+ * If the pre-built runtime package (packages/zod/dist/<version>/) exists,
  * the full JS + d.ts files are copied so the generated Zod schemas work both
  * at compile time AND at runtime (parity tests, generate:random:zod, etc.).
  *
@@ -28,35 +28,38 @@ function findRepoRoot() {
 }
 export function installBaseZodTypes(outputDir) {
     const slug = versionSlug();
-    const zodPkg = `zod-${slug}`;
-    const pkgDir = path.join(outputDir, 'node_modules', '@babelfhir-ts', zodPkg);
+    const pkgDir = path.join(outputDir, 'node_modules', '@babelfhir-ts', 'zod');
     fs.mkdirSync(pkgDir, { recursive: true });
     // Try to install the full runtime package first
     const repoRoot = findRepoRoot();
-    const runtimeDist = path.join(repoRoot, 'packages', zodPkg, 'dist');
+    const runtimeDist = path.join(repoRoot, 'packages', 'zod', 'dist', slug);
     if (fs.existsSync(runtimeDist)) {
         // Copy the real package.json from the runtime package
-        const srcPkgJson = path.join(repoRoot, 'packages', zodPkg, 'package.json');
+        const srcPkgJson = path.join(repoRoot, 'packages', 'zod', 'package.json');
         if (fs.existsSync(srcPkgJson)) {
             fs.copyFileSync(srcPkgJson, path.join(pkgDir, 'package.json'));
         }
-        // Copy all runtime dist files (JS + d.ts)
-        const distDir = path.join(pkgDir, 'dist');
-        fs.mkdirSync(distDir, { recursive: true });
+        // Copy all runtime dist files into the version-specific subdirectory
+        const distSlugDir = path.join(pkgDir, slug);
+        fs.mkdirSync(distSlugDir, { recursive: true });
         for (const file of fs.readdirSync(runtimeDist)) {
-            fs.copyFileSync(path.join(runtimeDist, file), path.join(distDir, file));
+            fs.copyFileSync(path.join(runtimeDist, file), path.join(distSlugDir, file));
         }
         return;
     }
     // Fallback: generate stubs with both types (.d.ts) AND runtime JS (.js)
     // The runtime JS exports permissive schemas so dynamic imports don't crash.
     fs.writeFileSync(path.join(pkgDir, 'package.json'), JSON.stringify({
-        name: `@babelfhir-ts/${zodPkg}`,
+        name: '@babelfhir-ts/zod',
         version: '0.0.0-stubs',
         type: 'module',
-        main: 'index.js',
-        types: 'index.d.ts',
+        exports: {
+            [`./${slug}`]: { import: `./${slug}/index.js`, types: `./${slug}/index.d.ts` },
+            [`./${slug}/*`]: { import: `./${slug}/*.js`, types: `./${slug}/*.d.ts` },
+        },
     }, null, 2));
+    const versionDir = path.join(pkgDir, slug);
+    fs.mkdirSync(versionDir, { recursive: true });
     const dtsLines = [
         `import { z } from "zod";`,
         '',
@@ -72,6 +75,6 @@ export function installBaseZodTypes(outputDir) {
     }
     dtsLines.push('');
     jsLines.push('');
-    fs.writeFileSync(path.join(pkgDir, 'index.d.ts'), dtsLines.join('\n'));
-    fs.writeFileSync(path.join(pkgDir, 'index.js'), jsLines.join('\n'));
+    fs.writeFileSync(path.join(versionDir, 'index.d.ts'), dtsLines.join('\n'));
+    fs.writeFileSync(path.join(versionDir, 'index.js'), jsLines.join('\n'));
 }

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

@@ -1,5 +1,5 @@
 /**
- * FHIR complex types available in @babelfhir-ts/zod-<version>.
+ * FHIR complex types available in @babelfhir-ts/zod/<version>.
  * Shared between the schema generator (for import resolution) and the
  * stub installer (for type declaration generation).
  *

package/out/src/generator/index.js

@@ -385,9 +385,9 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
         if (!flags?.noClient) {
             generatedPackageJson.dependencies[`@babelfhir-ts/client-${versionSlug()}`] = '^0.2.0';
         }
-        // When zod schemas are generated, add @babelfhir-ts/zod-<version> + zod peer dependency
+        // When zod schemas are generated, add @babelfhir-ts/zod + zod peer dependency
         if (flags?.schema === 'zod') {
-            generatedPackageJson.dependencies[`@babelfhir-ts/zod-${versionSlug()}`] = '^0.1.0';
+            generatedPackageJson.dependencies['@babelfhir-ts/zod'] = '^0.2.0';
             generatedPackageJson.peerDependencies['zod'] = '^4.0.0';
         }
         // When dicomweb is enabled, add @babelfhir-ts/dicomweb dependency
@@ -453,11 +453,11 @@ export async function generateIntoPackage(packageArchivePath, outArchivePath, fl
         // Remove base client type stubs — they were only needed for tsc to resolve
         // @babelfhir-ts/client-<version> imports during compilation. The real package is
         // installed by the consumer via npm.
-        // Keep @babelfhir-ts/zod-<version> when zod schemas were generated (runtime needed for parity tests)
+        // Keep @babelfhir-ts/zod when zod schemas were generated (runtime needed for parity tests)
         const babelfhirDir = path.join(outputDir, 'node_modules', '@babelfhir-ts');
         if (fs.existsSync(babelfhirDir)) {
             for (const entry of fs.readdirSync(babelfhirDir)) {
-                if (flags?.schema === 'zod' && entry.startsWith('zod-'))
+                if (flags?.schema === 'zod' && entry === 'zod')
                     continue;
                 try {
                     fs.rmSync(path.join(babelfhirDir, entry), { recursive: true, force: true });
@@ -587,7 +587,7 @@ export async function generateIntoPackageDirect(packageArchivePath, flags) {
         generatedPackageJson.dependencies[`@babelfhir-ts/client-${versionSlug()}`] = '^0.2.0';
     }
     if (flags?.schema === 'zod') {
-        generatedPackageJson.dependencies[`@babelfhir-ts/zod-${versionSlug()}`] = '^0.1.0';
+        generatedPackageJson.dependencies['@babelfhir-ts/zod'] = '^0.2.0';
         generatedPackageJson.peerDependencies['zod'] = '^4.0.0';
     }
     // When dicomweb is enabled, add @babelfhir-ts/dicomweb dependency
@@ -643,7 +643,7 @@ export async function generateIntoPackageDirect(packageArchivePath, flags) {
     const babelfhirDir = path.join(outputDir, 'node_modules', '@babelfhir-ts');
     if (fs.existsSync(babelfhirDir)) {
         for (const entry of fs.readdirSync(babelfhirDir)) {
-            if (flags?.schema === 'zod' && entry.startsWith('zod-'))
+            if (flags?.schema === 'zod' && entry === 'zod')
                 continue;
             try {
                 fs.rmSync(path.join(babelfhirDir, entry), { recursive: true, force: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.3.0",
+  "version": "1.3.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",