@atomic-ehr/codegen 0.0.1-canary.20250830224431.6d211a5 → 0.0.1-canary.20250831211734.bb1536b

package/dist/api/builder.d.ts

@@ -4,7 +4,7 @@
  * Provides a fluent, chainable API for common codegen use cases with pre-built generators.
  * This builder pattern allows users to configure generation in a declarative way.
  */
-import type { Config, RestClientConfig, TypeSchemaConfig } from "../config.js";
+import type { Config, TypeSchemaConfig } from "../config.js";
 import type { TypeSchema } from "../typeschema/type-schema.types.js";
 import type { CodegenLogger } from "../utils/codegen-logger.js";
 /**
@@ -79,10 +79,6 @@ export declare class APIBuilder {
         valueSetMode?: 'all' | 'required-only' | 'custom';
         valueSetDirectory?: string;
     }): APIBuilder;
-    /**
-     * Configure REST client generation
-     */
-    restClient(options?: RestClientConfig): APIBuilder;
     /**
      * Set a progress callback for monitoring generation
      */
@@ -99,10 +95,6 @@ export declare class APIBuilder {
      * Enable/disable validation
      */
     validate(enabled?: boolean): APIBuilder;
-    /**
-     * Ensure TypeScript generator is configured if REST client is configured
-     */
-    private ensureTypeScriptForRestClient;
     /**
      * Execute the generation process
      */

package/dist/api/builder.js

@@ -6,7 +6,6 @@
  */
 import { TypeSchemaCache, TypeSchemaGenerator, TypeSchemaParser, } from "../typeschema/index.js";
 import { createLogger } from "../utils/codegen-logger.js";
-import { RestClientGenerator } from "./generators/rest-client.js";
 import { TypeScriptGenerator } from "./generators/typescript.js";
 /**
  * High-Level API Builder class
@@ -99,21 +98,6 @@ export class APIBuilder {
         this.logger.debug(`Configured TypeScript generator (${options.moduleFormat || "esm"})`);
         return this;
     }
-    /**
-     * Configure REST client generation
-     */
-    restClient(options = {}) {
-        // REST client goes in client subfolder
-        const clientOutputDir = `${this.options.outputDir}/client`;
-        const generator = new RestClientGenerator({
-            outputDir: clientOutputDir,
-            logger: this.logger.child("REST"),
-            ...options, // Pass all RestClientConfig options
-        });
-        this.generators.set("restclient", generator);
-        this.logger.debug(`Configured REST client generator (${options.clientName || "FHIRClient"})`);
-        return this;
-    }
     /**
      * Set a progress callback for monitoring generation
      */
@@ -149,29 +133,10 @@ export class APIBuilder {
         this.options.validate = enabled;
         return this;
     }
-    /**
-     * Ensure TypeScript generator is configured if REST client is configured
-     */
-    ensureTypeScriptForRestClient() {
-        const hasRestClient = this.generators.has("restclient");
-        const hasTypeScript = this.generators.has("typescript");
-        if (hasRestClient && !hasTypeScript) {
-            this.logger.debug("Automatically adding TypeScript generator for REST client");
-            // Add TypeScript generator with minimal config
-            this.typescript({
-                moduleFormat: "esm",
-                generateIndex: true,
-                includeDocuments: false,
-                namingConvention: "PascalCase",
-            });
-        }
-    }
     /**
      * Execute the generation process
      */
     async generate() {
-        // Ensure TypeScript is configured if REST client is configured
-        this.ensureTypeScriptForRestClient();
         const startTime = performance.now();
         const result = {
             success: false,
@@ -253,7 +218,7 @@ export class APIBuilder {
             logger: this.logger.child("Schema"),
             treeshake: this.typeSchemaConfig?.treeshake,
         }, this.typeSchemaConfig);
-        this.typeSchemaGenerator = generator; // Store for REST client generation
+        this.typeSchemaGenerator = generator;
         const schemas = await generator.generateFromPackage(packageName, version);
         this.schemas = [...this.schemas, ...schemas];
         if (this.cache) {
@@ -344,11 +309,6 @@ export function createAPIFromConfig(config) {
     if (config.typescript) {
         builder.typescript(config.typescript);
     }
-    // Configure REST client generator if specified
-    if (config.restClient) {
-        console.log("fsdfdsfsdfdsf");
-        builder.restClient(config.restClient);
-    }
     return builder;
 }
 /**

package/dist/api/generators/typescript.d.ts

@@ -100,6 +100,14 @@ export declare class TypeScriptGenerator extends BaseGenerator<TypeScriptGenerat
      * Get the TypeScript type name for a binding
      */
     private getValueSetTypeName;
+    /**
+     * Check if a field has enum values that should be inlined
+     */
+    private shouldUseInlineEnum;
+    /**
+     * Generate inline enum type from field enum values
+     */
+    private generateInlineEnumType;
     private shouldSkipSchema;
     private getFilenameForSchema;
     private extractImportsFromContent;
@@ -153,6 +161,10 @@ export declare class TypeScriptGenerator extends BaseGenerator<TypeScriptGenerat
      * Get current options for compatibility with API builder
      */
     getOptions(): TypeScriptGeneratorOptions;
+    /**
+     * Override generate to clean directory first
+     */
+    generate(schemas: TypeSchema[]): Promise<GeneratedFile[]>;
     /**
      * Run post-generation hooks - generate utility files
      */

package/dist/api/generators/typescript.js

@@ -183,6 +183,10 @@ export class TypeScriptGenerator extends BaseGenerator {
         if (!binding) {
             return false;
         }
+        // If generateValueSets is false, never use value set types
+        if (!this.tsOptions.generateValueSets) {
+            return false;
+        }
         const valueSetTypeName = this.typeMapper.formatTypeName(binding.name);
         return this.collectedValueSets.has(valueSetTypeName);
     }
@@ -192,6 +196,31 @@ export class TypeScriptGenerator extends BaseGenerator {
     getValueSetTypeName(binding) {
         return this.typeMapper.formatTypeName(binding.name);
     }
+    /**
+     * Check if a field has enum values that should be inlined
+     */
+    shouldUseInlineEnum(field) {
+        if (!field) {
+            return false;
+        }
+        // Only use inline enums when generateValueSets is false
+        if (this.tsOptions.generateValueSets) {
+            return false;
+        }
+        // Check if field has enum values directly on the field
+        return field.enum && Array.isArray(field.enum) && field.enum.length > 0;
+    }
+    /**
+     * Generate inline enum type from field enum values
+     */
+    generateInlineEnumType(field) {
+        if (!field.enum || !Array.isArray(field.enum)) {
+            return "string"; // fallback
+        }
+        // Create union type from enum values
+        const enumValues = field.enum.map((value) => `'${value}'`).join(' | ');
+        return enumValues;
+    }
     shouldSkipSchema(schema) {
         if (schema.identifier.kind === "value-set" ||
             schema.identifier.kind === "binding" ||
@@ -411,7 +440,7 @@ export class TypeScriptGenerator extends BaseGenerator {
         if ("choices" in field && field.choices && Array.isArray(field.choices)) {
             return imports;
         }
-        // Handle value set imports
+        // Handle value set imports (only when generateValueSets is true)
         if (field.binding && this.shouldUseValueSetType(field.binding)) {
             const valueSetTypeName = this.getValueSetTypeName(field.binding);
             imports.push(valueSetTypeName);
@@ -527,6 +556,10 @@ export class TypeScriptGenerator extends BaseGenerator {
                 const valueSetTypeName = this.getValueSetTypeName(field.binding);
                 typeString = valueSetTypeName;
             }
+            else if (field.binding && this.shouldUseInlineEnum(field)) {
+                // Generate inline enum union type when generateValueSets is false
+                typeString = this.generateInlineEnumType(field);
+            }
             else {
                 // Existing type mapping logic
                 const languageType = this.typeMapper.mapType(field.type);
@@ -621,6 +654,16 @@ export class TypeScriptGenerator extends BaseGenerator {
     getOptions() {
         return { ...this.options };
     }
+    /**
+     * Override generate to clean directory first
+     */
+    async generate(schemas) {
+        // Clean output directory before generation
+        await this.fileManager.cleanDirectory();
+        this.logger.debug("Cleaned output directory before generation");
+        // Call parent implementation
+        return super.generate(schemas);
+    }
     /**
      * Run post-generation hooks - generate utility files
      */
@@ -781,13 +824,13 @@ export class TypeScriptGenerator extends BaseGenerator {
         // Export utilities
         lines.push('export * from "./utilities.js";');
         // Export value sets if any were generated
-        if (this.collectedValueSets.size > 0) {
+        if (this.tsOptions.generateValueSets && this.collectedValueSets.size > 0) {
             lines.push('');
             lines.push('// Value Sets');
             lines.push('export * from "./valuesets/index.js";');
         }
         const content = lines.join('\n');
         await this.fileManager.writeFile('index.ts', content);
-        this.logger.info(`Generated index.ts with type exports${this.collectedValueSets.size > 0 ? ' and value sets' : ''}`);
+        this.logger.info(`Generated index.ts with type exports${this.tsOptions.generateValueSets && this.collectedValueSets.size > 0 ? ' and value sets' : ''}`);
     }
 }

package/dist/api/index.d.ts

@@ -12,8 +12,6 @@ export type { PackageInfo } from "../typeschema/types.js";
 export type { APIBuilderOptions, GenerationResult, ProgressCallback, } from "./builder.js";
 export { APIBuilder, createAPI, createAPIFromConfig, generateTypesFromFiles, generateTypesFromPackage, } from "./builder.js";
 export type { GeneratedFile } from "./generators/base/index.js";
-export type { GeneratedRestClient, RestClientOptions, } from "./generators/rest-client.js";
-export { RestClientGenerator } from "./generators/rest-client.js";
 export type { TypeScriptGeneratorOptions } from "./generators/typescript.js";
 export { TypeScriptGenerator } from "./generators/typescript.js";
 /**

package/dist/api/index.js

@@ -10,7 +10,6 @@
 export { TypeSchemaCache, TypeSchemaGenerator, TypeSchemaParser, } from "../typeschema/index.js";
 // Export main API builder and utilities
 export { APIBuilder, createAPI, createAPIFromConfig, generateTypesFromFiles, generateTypesFromPackage, } from "./builder.js";
-export { RestClientGenerator } from "./generators/rest-client.js";
 // Export generator classes for advanced usage
 export { TypeScriptGenerator } from "./generators/typescript.js";
 /**

package/dist/cli/commands/generate.js

@@ -67,7 +67,6 @@ export const generateCommand = {
                 logger.info(`Packages: ${config.packages?.length || 0}`);
                 logger.info(`Files: ${config.files?.length || 0}`);
                 logger.info(`TypeScript generation: ${config.typescript ? "enabled" : "disabled"}`);
-                logger.info(`REST Client generation: ${config.restClient ? "enabled" : "disabled"}`);
             }
             // Create API builder with config options
             const builder = new APIBuilder({
@@ -109,18 +108,9 @@ export const generateCommand = {
                 }
                 builder.typescript(config.typescript);
             }
-            if (config.restClient) {
-                if (verbose) {
-                    logger.info("Configuring REST Client generation from config");
-                    logger.debug(`Client name: ${config.restClient.clientName || "FHIRClient"}`);
-                    logger.debug(`Include validation: ${config.restClient.includeValidation ?? false}`);
-                    logger.debug(`Enhanced search: ${config.restClient.enhancedSearch ?? false}`);
-                }
-                builder.restClient(config.restClient);
-            }
             // Check that at least one generator is configured
-            if (!config.typescript && !config.restClient) {
-                throw new Error("No generators configured. Please enable 'typescript' or 'restClient' in your config file.");
+            if (!config.typescript) {
+                throw new Error("No generators configured. Please enable 'typescript' in your config file.");
             }
             // Add progress callback if verbose
             if (verbose) {