Merge pull request #45 from atomic-ehr/test-for-generators

Tests for generators

Author: ryukzak

src/api/builder.ts

@@ -65,7 +65,7 @@ export type ProgressCallback = (phase: string, current: number, total: number, m
 export interface GenerationResult {
     success: boolean;
     outputDir: string;
-    filesGenerated: string[];
+    filesGenerated: Record<string, string>;
     errors: string[];
     warnings: string[];
     duration: number;
@@ -405,7 +405,7 @@ export class APIBuilder {
         const result: GenerationResult = {
             success: false,
             outputDir: this.options.outputDir,
-            filesGenerated: [],
+            filesGenerated: {},
             errors: [],
             warnings: [],
             duration: 0,
@@ -519,7 +519,9 @@ export class APIBuilder {
             try {
                 await generator.generate(tsIndex);
                 const fileBuffer: 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(

src/api/writer-generator/csharp/csharp.ts

@@ -107,6 +107,7 @@ export class CSharp extends Writer<CSharpGeneratorOptions> {
             tabSize: 4,
             withDebugComment: false,
             commentLinePrefix: "//",
+            resolveAssets: options.resolveAssets ?? resolveCSharpAssets,
             ...options,
         });
     }
@@ -357,9 +358,8 @@ export class CSharp extends Writer<CSharpGeneratorOptions> {
     }
 
     private copyStaticFiles(): void {
-        if (this.opts.inMemoryOnly) return;
-        const sourceDir = resolveCSharpAssets("");
-        fs.cpSync(sourceDir, this.opts.outputDir, { recursive: true });
+        this.cp("Client.cs", "Client.cs");
+        this.cp("Helper.cs", "Helper.cs");
     }
 
     private generateHelperFile(): void {

src/api/writer-generator/python.ts

@@ -150,7 +150,7 @@ export class Python extends Writer<PythonGeneratorOptions> {
     private tsIndex: TypeSchemaIndex | undefined;
 
     constructor(options: PythonGeneratorOptions) {
-        super(options);
+        super({ ...options, resolveAssets: options.resolveAssets ?? resolvePyAssets });
         this.nameFormatFunction = this.getFieldFormatFunction(options.fieldFormat);
     }
 
@@ -166,7 +166,7 @@ export class Python extends Writer<PythonGeneratorOptions> {
 
     private generateRootPackages(groups: TypeSchemaPackageGroups): void {
         this.generateRootInitFile(groups);
-        fs.cpSync(resolvePyAssets("requirements.txt"), Path.resolve(this.opts.outputDir, "requirements.txt"));
+        this.cp(resolvePyAssets("requirements.txt"), "requirements.txt");
     }
 
     private generateSDKPackages(groups: TypeSchemaPackageGroups): void {

src/api/writer-generator/writer.ts

@@ -7,6 +7,7 @@ export type FileSystemWriterOptions = {
     outputDir: string;
     inMemoryOnly?: boolean;
     logger?: CodegenLogger;
+    resolveAssets?: (fn: string) => string;
 };
 
 export type WriterOptions = FileSystemWriterOptions & {
@@ -82,7 +83,11 @@ export abstract class FileSystemWriter<T extends FileSystemWriterOptions = FileS
 
             this.logger()?.debug(`cat > '${relPath}'`);
             this.currentFile = { descriptor, relPath };
-            this.writtenFilesBuffer[this.currentFile.relPath] = { relPath, absPath: Path.resolve(relPath), tokens: [] };
+            this.writtenFilesBuffer[this.currentFile.relPath] = {
+                relPath,
+                absPath: Path.resolve(relPath),
+                tokens: [],
+            };
 
             gen();
         } finally {
@@ -100,12 +105,25 @@ export abstract class FileSystemWriter<T extends FileSystemWriterOptions = FileS
         buf.tokens.push(str);
     }
 
+    cp(source: string, destination: string) {
+        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);
+    }
+
     abstract generate(_tsIndex: TypeSchemaIndex): Promise<void>;
 
     writtenFiles(): FileBuffer[] {
         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));
     }