@atomic-ehr/codegen 0.0.4-canary.20251222144228.ac2a1d7 → 0.0.4-canary.20251223085924.a5813d1

package/dist/index.js

@@ -3,11 +3,11 @@ import * as fs from 'fs';
 import fs__default, { existsSync } from 'fs';
 import * as afs2 from 'fs/promises';
 import { readFile } from 'fs/promises';
-import * as Path5 from 'path';
-import Path5__default, { resolve } from 'path';
+import * as Path from 'path';
+import Path__default, { resolve } from 'path';
 import { CanonicalManager } from '@atomic-ehr/fhir-canonical-manager';
-import assert3 from 'assert';
 import { fileURLToPath } from 'url';
+import assert3 from 'assert';
 import * as YAML from 'yaml';
 import * as fhirschema from '@atomic-ehr/fhirschema';
 import { isStructureDefinition } from '@atomic-ehr/fhirschema';
@@ -244,7 +244,7 @@ var FileSystemWriter = class {
   }
   cd(path, gen) {
     const prev = this.currentDir;
-    this.currentDir = path.startsWith("/") ? Path5.join(this.opts.outputDir, path) : Path5.join(this.currentDir ?? this.opts.outputDir, path);
+    this.currentDir = path.startsWith("/") ? Path.join(this.opts.outputDir, path) : Path.join(this.currentDir ?? this.opts.outputDir, path);
     this.onDiskMkDir(this.currentDir);
     this.logger()?.debug(`cd '${this.currentDir}'`);
     gen();
@@ -253,12 +253,16 @@ var FileSystemWriter = class {
   cat(fn, gen) {
     if (this.currentFile) throw new Error("Can't open file when another file is open");
     if (fn.includes("/")) throw new Error(`Change file path separatly: ${fn}`);
-    const relPath = Path5.normalize(`${this.currentDir}/${fn}`);
+    const relPath = Path.normalize(`${this.currentDir}/${fn}`);
     try {
       const descriptor = this.onDiskOpenFile(relPath);
       this.logger()?.debug(`cat > '${relPath}'`);
       this.currentFile = { descriptor, relPath };
-      this.writtenFilesBuffer[this.currentFile.relPath] = { relPath, absPath: Path5.resolve(relPath), tokens: [] };
+      this.writtenFilesBuffer[this.currentFile.relPath] = {
+        relPath,
+        absPath: Path.resolve(relPath),
+        tokens: []
+      };
       gen();
     } finally {
       if (this.currentFile) this.onDiskCloseFile(this.currentFile.descriptor);
@@ -272,9 +276,21 @@ var FileSystemWriter = class {
     if (!buf) throw new Error("No buffer found");
     buf.tokens.push(str);
   }
+  cp(source, destination) {
+    if (!this.opts.resolveAssets) throw new Error("resolveAssets is not defined");
+    source = Path.resolve(this.opts.resolveAssets(source));
+    destination = Path.normalize(`${this.currentDir ?? this.opts.outputDir}/${destination}`);
+    const content = fs.readFileSync(source, "utf8");
+    this.writtenFilesBuffer[destination] = {
+      relPath: destination,
+      absPath: Path.resolve(destination),
+      tokens: [content]
+    };
+    fs.cpSync(source, destination);
+  }
   writtenFiles() {
     return Object.values(this.writtenFilesBuffer).map(({ relPath, absPath, tokens }) => {
-      return { relPath, absPath, content: tokens.join() };
+      return { relPath, absPath, content: tokens.join("") };
     }).sort((a, b) => a.relPath.localeCompare(b.relPath));
   }
 };
@@ -488,6 +504,15 @@ function formatName(input) {
 }
 
 // src/api/writer-generator/csharp/csharp.ts
+var resolveCSharpAssets = (fn) => {
+  const __filename2 = fileURLToPath(import.meta.url);
+  const __dirname = Path__default.dirname(__filename2);
+  if (__filename2.endsWith("dist/index.js")) {
+    return Path__default.resolve(__dirname, "..", "assets", "api", "writer-generator", "csharp", fn);
+  } else {
+    return Path__default.resolve(__dirname, "../../../..", "assets", "api", "writer-generator", "csharp", fn);
+  }
+};
 var PRIMITIVE_TYPE_MAP = {
   boolean: "bool",
   instant: "string",
@@ -553,6 +578,7 @@ var CSharp = class extends Writer {
       tabSize: 4,
       withDebugComment: false,
       commentLinePrefix: "//",
+      resolveAssets: options.resolveAssets ?? resolveCSharpAssets,
       ...options
     });
   }
@@ -658,8 +684,8 @@ var CSharp = class extends Writer {
       "CSharpSDK",
       "System.Text.Json",
       "System.Text.Json.Serialization",
-      this.opts.targetNamespace,
-      ...packages.map((pkg) => `${this.opts.targetNamespace}.${pkg}`)
+      this.opts.rootNamespace,
+      ...packages.map((pkg) => `${this.opts.rootNamespace}.${pkg}`)
     ];
     for (const using of globalUsings) this.lineSM("global", "using", using);
   }
@@ -668,7 +694,7 @@ var CSharp = class extends Writer {
       this.cat("base.cs", () => {
         this.generateDisclaimer();
         this.line();
-        this.lineSM("namespace", this.opts.targetNamespace);
+        this.lineSM("namespace", this.opts.rootNamespace);
         for (const schema of complexTypes) {
           const packageName = formatName(schema.identifier.package);
           this.generateType(schema, packageName);
@@ -685,7 +711,7 @@ var CSharp = class extends Writer {
       this.cat(`${schema.identifier.name}.cs`, () => {
         this.generateDisclaimer();
         this.line();
-        this.lineSM("namespace", `${this.opts.targetNamespace}.${packageName}`);
+        this.lineSM("namespace", `${this.opts.rootNamespace}.${packageName}`);
         this.line();
         this.generateType(schema, packageName);
       });
@@ -709,7 +735,7 @@ var CSharp = class extends Writer {
   generateEnumFileContent(packageName, enums) {
     this.lineSM("using", "System.ComponentModel");
     this.line();
-    this.lineSM(`namespace ${this.opts.targetNamespace}.${packageName}`);
+    this.lineSM(`namespace ${this.opts.rootNamespace}.${packageName}`);
     for (const [enumName, values] of Object.entries(enums)) {
       this.generateEnum(enumName, values);
     }
@@ -731,7 +757,7 @@ var CSharp = class extends Writer {
         this.cat(`${packageName}ResourceDictionary.cs`, () => {
           this.generateDisclaimer();
           this.line();
-          this.lineSM(`namespace ${this.opts.targetNamespace}`);
+          this.lineSM(`namespace ${this.opts.rootNamespace}`);
           this.generateResourceDictionaryClass(packageName, packageResources);
         });
       }
@@ -749,13 +775,13 @@ var CSharp = class extends Writer {
     });
   }
   copyStaticFiles() {
-    if (!this.opts.staticSourceDir) return;
-    const sourcePath = Path5__default.resolve(this.opts.staticSourceDir);
-    fs__default.cpSync(sourcePath, this.opts.outputDir, { recursive: true });
+    this.cp("Client.cs", "Client.cs");
+    this.cp("Helper.cs", "Helper.cs");
   }
   generateHelperFile() {
-    const sourceFile = "src/api/writer-generator/csharp/Helper.cs";
-    const destFile = Path5__default.join(this.opts.outputDir, "Helper.cs");
+    if (this.opts.inMemoryOnly) return;
+    const sourceFile = resolveCSharpAssets("Helper.cs");
+    const destFile = Path__default.join(this.opts.outputDir, "Helper.cs");
     fs__default.copyFileSync(sourceFile, destFile);
   }
 };
@@ -978,7 +1004,7 @@ var mkTypeSchemaIndex = (schemas, { resolutionTree, logger }) => {
       }
     }
     const raw = filename.endsWith(".yaml") ? YAML.stringify(tree) : JSON.stringify(tree, void 0, 2);
-    await afs2.mkdir(Path5.dirname(filename), { recursive: true });
+    await afs2.mkdir(Path.dirname(filename), { recursive: true });
     await afs2.writeFile(filename, raw);
   };
   return {
@@ -1100,18 +1126,18 @@ var deriveResourceName = (id) => {
   return pascalCase(id.name);
 };
 var resolvePyAssets = (fn) => {
-  const __dirname = Path5.dirname(fileURLToPath(import.meta.url));
+  const __dirname = Path.dirname(fileURLToPath(import.meta.url));
   if (__filename.endsWith("dist/index.js")) {
-    return Path5.resolve(__dirname, "..", "assets", "api", "writer-generator", "python", fn);
+    return Path.resolve(__dirname, "..", "assets", "api", "writer-generator", "python", fn);
   } else {
-    return Path5.resolve(__dirname, "../../..", "assets", "api", "writer-generator", "python", fn);
+    return Path.resolve(__dirname, "../../..", "assets", "api", "writer-generator", "python", fn);
   }
 };
 var Python = class extends Writer {
   nameFormatFunction;
   tsIndex;
   constructor(options) {
-    super(options);
+    super({ ...options, resolveAssets: options.resolveAssets ?? resolvePyAssets });
     this.nameFormatFunction = this.getFieldFormatFunction(options.fieldFormat);
   }
   async generate(tsIndex) {
@@ -1125,7 +1151,7 @@ var Python = class extends Writer {
   }
   generateRootPackages(groups) {
     this.generateRootInitFile(groups);
-    fs__default.cpSync(resolvePyAssets("requirements.txt"), Path5.resolve(this.opts.outputDir, "requirements.txt"));
+    this.cp(resolvePyAssets("requirements.txt"), "requirements.txt");
   }
   generateSDKPackages(groups) {
     this.generateComplexTypesPackages(groups.groupedComplexTypes);
@@ -2875,7 +2901,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 = Path5.join(outputDir, pkgPath, name);
+    const baseName = Path.join(outputDir, pkgPath, name);
     if (!files[baseName]) files[baseName] = [];
     if (!files[baseName]?.some((e) => e === json)) {
       files[baseName].push(json);
@@ -2890,7 +2916,7 @@ var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) =>
         } else {
           fullName = `${baseName}-${index}.typeschema.json`;
         }
-        await afs2.mkdir(Path5.dirname(fullName), { recursive: true });
+        await afs2.mkdir(Path.dirname(fullName), { recursive: true });
         await afs2.writeFile(fullName, json);
       })
     );
@@ -2898,7 +2924,7 @@ var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) =>
 };
 var writeTypeSchemasToSingleFile = async (typeSchemas, outputFile, logger) => {
   logger.info(`Writing TypeSchema files to: ${outputFile}`);
-  await afs2.mkdir(Path5.dirname(outputFile), { recursive: true });
+  await afs2.mkdir(Path.dirname(outputFile), { recursive: true });
   logger.info(`Writing TypeSchemas to one file ${outputFile}...`);
   for (const ts of typeSchemas) {
     const json = JSON.stringify(ts, null, 2);
@@ -2909,7 +2935,7 @@ var writeTypeSchemasToSingleFile = async (typeSchemas, outputFile, logger) => {
 var tryWriteTypeSchema = async (typeSchemas, opts, logger) => {
   if (!opts.typeSchemaOutputDir) return;
   try {
-    if (Path5.extname(opts.typeSchemaOutputDir) === ".ndjson") {
+    if (Path.extname(opts.typeSchemaOutputDir) === ".ndjson") {
       await writeTypeSchemasToSingleFile(typeSchemas, opts.typeSchemaOutputDir, logger);
     } else {
       await writeTypeSchemasToSeparateFiles(typeSchemas, opts.typeSchemaOutputDir, logger);
@@ -2972,7 +2998,7 @@ var APIBuilder = class {
     return this;
   }
   localTgzPackage(archivePath) {
-    this.localTgzArchives.push(Path5.resolve(archivePath));
+    this.localTgzArchives.push(Path.resolve(archivePath));
     return this;
   }
   fromSchemas(schemas) {
@@ -2983,7 +3009,7 @@ var APIBuilder = class {
   typescript(userOpts) {
     const defaultWriterOpts = {
       logger: this.logger,
-      outputDir: Path5.join(this.options.outputDir, "/types"),
+      outputDir: Path.join(this.options.outputDir, "/types"),
       tabSize: 4,
       withDebugComment: false,
       commentLinePrefix: "//",
@@ -3025,18 +3051,24 @@ var APIBuilder = class {
     this.logger.debug(`Configured python generator`);
     return this;
   }
-  csharp(namespace, staticSourceDir) {
-    const generator = new CSharp({
-      outputDir: Path5.join(this.options.outputDir, "/types"),
-      staticSourceDir: staticSourceDir ?? void 0,
-      targetNamespace: namespace,
-      logger: new CodegenLogger({
-        prefix: "C#",
-        timestamp: true,
-        suppressLoggingLevel: []
-      })
-    });
-    this.generators.set("C#", generator);
+  csharp(userOptions) {
+    const defaultWriterOpts = {
+      logger: this.logger,
+      outputDir: Path.join(this.options.outputDir, "/types"),
+      tabSize: 4,
+      withDebugComment: false,
+      commentLinePrefix: "//"
+    };
+    const defaultCSharpOpts = {
+      ...defaultWriterOpts,
+      rootNamespace: "Fhir.Types"
+    };
+    const opts = {
+      ...defaultCSharpOpts,
+      ...Object.fromEntries(Object.entries(userOptions).filter(([_, v]) => v !== void 0))
+    };
+    const generator = new CSharp(opts);
+    this.generators.set("csharp", generator);
     this.logger.debug(`Configured C# generator`);
     return this;
   }
@@ -3087,7 +3119,7 @@ var APIBuilder = class {
     const result = {
       success: false,
       outputDir: this.options.outputDir,
-      filesGenerated: [],
+      filesGenerated: {},
       errors: [],
       warnings: [],
       duration: 0
@@ -3179,7 +3211,9 @@ var APIBuilder = class {
       try {
         await generator.generate(tsIndex);
         const fileBuffer = generator.writtenFiles();
-        result.filesGenerated.push(...fileBuffer.map((e) => e.absPath));
+        fileBuffer.forEach((buf) => {
+          result.filesGenerated[buf.relPath] = buf.content;
+        });
         this.logger.info(`Generating ${type} finished successfully`);
       } catch (error) {
         result.errors.push(