@atomic-ehr/codegen 0.0.2-canary.20251114095108.8d8e927 → 0.0.2-canary.20251114133113.0a35a8a

package/dist/index.js

@@ -2,8 +2,8 @@ import * as fs from 'fs';
 import fs__default, { existsSync, mkdirSync } from 'fs';
 import * as afs2 from 'fs/promises';
 import { readdir, stat, unlink, readFile, writeFile, access, mkdir, rm } from 'fs/promises';
-import * as Path3 from 'path';
-import Path3__default, { join, resolve, dirname, relative } from 'path';
+import * as Path4 from 'path';
+import Path4__default, { join, resolve, dirname, relative } from 'path';
 import { CanonicalManager } from '@atomic-ehr/fhir-canonical-manager';
 import * as fhirschema from '@atomic-ehr/fhirschema';
 import { isStructureDefinition } from '@atomic-ehr/fhirschema';
@@ -3036,7 +3036,7 @@ var FileSystemWriter = class {
   }
   cd(path, gen) {
     const prev = this.currentDir;
-    this.currentDir = path.startsWith("/") ? Path3.join(this.opts.outputDir, path) : Path3.join(this.currentDir, path);
+    this.currentDir = path.startsWith("/") ? Path4.join(this.opts.outputDir, path) : Path4.join(this.currentDir, path);
     if (!fs.existsSync(this.currentDir)) {
       fs.mkdirSync(this.currentDir, { recursive: true });
     }
@@ -3461,12 +3461,12 @@ var CSharp = class extends Writer {
   }
   copyStaticFiles() {
     if (!this.staticSourceDir) return;
-    const sourcePath = Path3__default.resolve(this.staticSourceDir);
+    const sourcePath = Path4__default.resolve(this.staticSourceDir);
     fs__default.cpSync(sourcePath, this.opts.outputDir, { recursive: true });
   }
   generateHelperFile() {
     const sourceFile = "src/api/writer-generator/csharp/Helper.cs";
-    const destFile = Path3__default.join(this.opts.outputDir, "Helper.cs");
+    const destFile = Path4__default.join(this.opts.outputDir, "Helper.cs");
     fs__default.copyFileSync(sourceFile, destFile);
   }
 };
@@ -3685,6 +3685,7 @@ var mkTypeSchemaIndex = (schemas, logger) => {
       }
     }
     const raw = filename.endsWith(".yaml") ? YAML.stringify(tree) : JSON.stringify(tree, void 0, 2);
+    await afs2.mkdir(Path4.dirname(filename), { recursive: true });
     await afs2.writeFile(filename, raw);
   };
   return {
@@ -5807,17 +5808,22 @@ var TypeScript = class extends Writer {
   }
   generateFhirPackageIndexFile(schemas) {
     this.cat("index.ts", () => {
-      let exports = schemas.map((schema) => ({
-        identifier: schema.identifier,
-        tsPackageName: tsModuleName(schema.identifier),
-        resourceName: tsResourceName(schema.identifier)
-      })).sort((a, b) => a.resourceName.localeCompare(b.resourceName));
+      let exports = schemas.flatMap((schema) => [
+        {
+          identifier: schema.identifier,
+          tsPackageName: tsModuleName(schema.identifier),
+          resourceName: tsResourceName(schema.identifier),
+          nestedTypes: isResourceTypeSchema(schema) && schema.nested ? schema.nested.map((n) => tsResourceName(n.identifier)) : []
+        }
+      ]).sort((a, b) => a.resourceName.localeCompare(b.resourceName));
       exports = Array.from(new Map(exports.map((exp) => [exp.resourceName.toLowerCase(), exp])).values()).sort(
         (a, b) => a.resourceName.localeCompare(b.resourceName)
       );
       for (const exp of exports) {
         this.debugComment(exp.identifier);
-        this.lineSM(`export type { ${exp.resourceName} } from "./${exp.tsPackageName}"`);
+        this.lineSM(
+          `export type { ${[exp.resourceName, ...exp.nestedTypes].join(", ")} } from "./${exp.tsPackageName}"`
+        );
       }
     });
   }
@@ -5944,7 +5950,7 @@ var TypeScript = class extends Writer {
         const tsName2 = tsFieldName(fieldName);
         let tsType;
         if (field.enum) {
-          tsType = field.enum.map((e) => `'${e}'`).join(" | ");
+          tsType = `(${field.enum.map((e) => `'${e}'`).join(" | ")})`;
         } else if (field.reference && field.reference.length > 0) {
           const specialization = tsIndex.findLastSpecialization(flatProfile);
           if (!isSpecializationTypeSchema(specialization))
@@ -6126,7 +6132,7 @@ var writerToGenerator = (writerGen) => {
   const getGeneratedFiles = () => {
     return writerGen.writtenFiles().map((fn) => {
       return {
-        path: Path3.normalize(Path3.join(writerGen.opts.outputDir, fn)),
+        path: Path4.normalize(Path4.join(writerGen.opts.outputDir, fn)),
         filename: fn.replace(/^.*[\\/]/, ""),
         content: "",
         exports: [],
@@ -6184,7 +6190,7 @@ var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) =>
     const pkgPath = normalizeFileName(packageMetaToFhir(pkg));
     const name = normalizeFileName(`${ts.identifier.name}(${extractNameFromCanonical(ts.identifier.url)})`);
     const json = JSON.stringify(ts, null, 2);
-    const baseName = Path3.join(outputDir, pkgPath, name);
+    const baseName = Path4.join(outputDir, pkgPath, name);
     if (!files[baseName]) files[baseName] = [];
     if (!files[baseName]?.some((e) => e === json)) {
       files[baseName].push(json);
@@ -6199,7 +6205,7 @@ var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) =>
         } else {
           fullName = `${baseName}-${index}.typeschema.json`;
         }
-        await afs2.mkdir(Path3.dirname(fullName), { recursive: true });
+        await afs2.mkdir(Path4.dirname(fullName), { recursive: true });
         await afs2.writeFile(fullName, json);
       })
     );
@@ -6207,7 +6213,7 @@ var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) =>
 };
 var writeTypeSchemasToSingleFile = async (typeSchemas, outputFile, logger) => {
   logger.info(`Writing TypeSchema files to: ${outputFile}`);
-  await afs2.mkdir(Path3.dirname(outputFile), { recursive: true });
+  await afs2.mkdir(Path4.dirname(outputFile), { recursive: true });
   logger.info(`Writing TypeSchemas to one file ${outputFile}...`);
   for (const ts of typeSchemas) {
     const json = JSON.stringify(ts, null, 2);
@@ -6218,7 +6224,7 @@ var writeTypeSchemasToSingleFile = async (typeSchemas, outputFile, logger) => {
 var tryWriteTypeSchema = async (typeSchemas, opts, logger) => {
   if (!opts.typeSchemaOutputDir) return;
   try {
-    if (Path3.extname(opts.typeSchemaOutputDir) === ".ndjson") {
+    if (Path4.extname(opts.typeSchemaOutputDir) === ".ndjson") {
       await writeTypeSchemasToSingleFile(typeSchemas, opts.typeSchemaOutputDir, logger);
     } else {
       await writeTypeSchemasToSeparateFiles(typeSchemas, opts.typeSchemaOutputDir, logger);
@@ -6310,7 +6316,7 @@ var APIBuilder = class {
   }
   typescript(opts) {
     const writerOpts = {
-      outputDir: Path3.join(this.options.outputDir, "/types"),
+      outputDir: Path4.join(this.options.outputDir, "/types"),
       tabSize: 4,
       withDebugComment: false,
       commentLinePrefix: "//",
@@ -6326,7 +6332,7 @@ var APIBuilder = class {
   csharp(namespace, staticSourceDir) {
     const generator = writerToGenerator(
       new CSharp({
-        outputDir: Path3.join(this.options.outputDir, "/types"),
+        outputDir: Path4.join(this.options.outputDir, "/types"),
         staticSourceDir: staticSourceDir ?? void 0,
         targetNamespace: namespace,
         logger: new CodegenLogger({