@atomic-ehr/codegen 0.0.1-canary.20250830233015.ec9aae7 → 0.0.1-canary.20250923152114.2852906

package/dist/cli/utils/prompts.js

@@ -35,7 +35,6 @@ export async function promptInitConfig() {
         choices: [
             { name: "TypeScript", value: "typescript", checked: true },
             { name: "Python", value: "python" },
-            { name: "REST Client", value: "rest-client" },
         ],
     });
     const packageManager = (await select({
@@ -154,27 +153,6 @@ export async function promptGeneratorConfig(generatorId) {
                 default: true,
             });
             break;
-        case "rest-client":
-            config.httpClient = await select({
-                message: "HTTP client library:",
-                choices: [
-                    { name: "Fetch (native)", value: "fetch" },
-                    { name: "Axios", value: "axios" },
-                    { name: "Node fetch", value: "node-fetch" },
-                ],
-                default: "fetch",
-            });
-            config.authentication = await select({
-                message: "Authentication type:",
-                choices: [
-                    { name: "None", value: "none" },
-                    { name: "Bearer token", value: "bearer" },
-                    { name: "Basic auth", value: "basic" },
-                    { name: "OAuth2", value: "oauth2" },
-                ],
-                default: "none",
-            });
-            break;
     }
     return config;
 }

package/dist/config.d.ts

@@ -4,43 +4,6 @@
  * Simple configuration system compatible ONLY with the new high-level APIBuilder.
  * All legacy config functionality has been removed.
  */
-/**
- * REST Client generator configuration options
- */
-export interface RestClientConfig {
-    /** Name of the generated client class */
-    clientName?: string;
-    /** Include client-side resource validation */
-    includeValidation?: boolean;
-    /** Include enhanced error handling */
-    includeErrorHandling?: boolean;
-    /** Include request interceptors */
-    includeRequestInterceptors?: boolean;
-    /** Override base URL in client (for testing) */
-    baseUrlOverride?: string;
-    /** Generate enhanced search parameter types */
-    enhancedSearch?: boolean;
-    /** Enable chained search builder generation with fluent API */
-    chainedSearchBuilder?: boolean;
-    /** Enable IDE autocomplete for search params via string literal unions */
-    searchAutocomplete?: boolean;
-    /** Generate enums (string literal unions) from bound ValueSets when possible */
-    generateValueSetEnums?: boolean;
-    /** Generate utility methods */
-    includeUtilities?: boolean;
-    /** Generate resource validators */
-    generateValidators?: boolean;
-    /** Use FHIR canonical manager for search parameters */
-    useCanonicalManager?: boolean;
-    /** Timeout for HTTP requests */
-    defaultTimeout?: number;
-    /** Default retry count */
-    defaultRetries?: number;
-    /** Include documentation in generated client */
-    includeDocumentation?: boolean;
-    /** Generate examples and usage patterns */
-    generateExamples?: boolean;
-}
 /**
  * TypeScript generator configuration options
  */
@@ -152,7 +115,6 @@ export interface Config {
     validate?: boolean;
     cache?: boolean;
     typescript?: TypeScriptGeneratorConfig;
-    restClient?: RestClientConfig;
     typeSchema?: TypeSchemaConfig;
     packages?: string[];
     files?: string[];
@@ -193,7 +155,6 @@ export declare class ConfigValidator {
     validate(config: unknown): ConfigValidationResult;
     private validateTypeScriptConfig;
     private validateValidatorOptions;
-    private validateRestClientConfig;
     private validateGuardOptions;
     private validateProfileOptions;
     private validateTypeSchemaConfig;

package/dist/config.js

@@ -16,24 +16,6 @@ export const DEFAULT_CONFIG = {
     overwrite: true,
     validate: true,
     cache: true,
-    restClient: {
-        clientName: "FHIRClient",
-        includeValidation: false,
-        includeErrorHandling: true,
-        includeRequestInterceptors: false,
-        baseUrlOverride: "",
-        enhancedSearch: false,
-        chainedSearchBuilder: false,
-        searchAutocomplete: true,
-        generateValueSetEnums: true,
-        includeUtilities: true,
-        generateValidators: false,
-        useCanonicalManager: true,
-        defaultTimeout: 30000,
-        defaultRetries: 0,
-        includeDocumentation: true,
-        generateExamples: false,
-    },
     typescript: {
         moduleFormat: "esm",
         generateIndex: true,
@@ -185,11 +167,6 @@ export class ConfigValidator {
             const tsErrors = this.validateTypeSchemaConfig(cfg.typeSchema);
             result.errors.push(...tsErrors);
         }
-        // Validate restClient config
-        if (cfg.restClient !== undefined) {
-            const rcErrors = this.validateRestClientConfig(cfg.restClient);
-            result.errors.push(...rcErrors);
-        }
         // Validate packages array
         if (cfg.packages !== undefined) {
             if (!Array.isArray(cfg.packages)) {
@@ -345,80 +322,6 @@ export class ConfigValidator {
         }
         return errors;
     }
-    validateRestClientConfig(config) {
-        const errors = [];
-        if (typeof config !== "object" || config === null) {
-            errors.push({
-                path: "restClient",
-                message: "restClient config must be an object",
-                value: config,
-            });
-            return errors;
-        }
-        const cfg = config;
-        // Validate clientName
-        if (cfg.clientName !== undefined && typeof cfg.clientName !== "string") {
-            errors.push({
-                path: "restClient.clientName",
-                message: "clientName must be a string",
-                value: cfg.clientName,
-            });
-        }
-        // Validate baseUrlOverride
-        if (cfg.baseUrlOverride !== undefined &&
-            typeof cfg.baseUrlOverride !== "string") {
-            errors.push({
-                path: "restClient.baseUrlOverride",
-                message: "baseUrlOverride must be a string",
-                value: cfg.baseUrlOverride,
-            });
-        }
-        // Validate timeout
-        if (cfg.defaultTimeout !== undefined) {
-            if (typeof cfg.defaultTimeout !== "number" || cfg.defaultTimeout <= 0) {
-                errors.push({
-                    path: "restClient.defaultTimeout",
-                    message: "defaultTimeout must be a positive number",
-                    value: cfg.defaultTimeout,
-                });
-            }
-        }
-        // Validate retries
-        if (cfg.defaultRetries !== undefined) {
-            if (typeof cfg.defaultRetries !== "number" || cfg.defaultRetries < 0) {
-                errors.push({
-                    path: "restClient.defaultRetries",
-                    message: "defaultRetries must be a non-negative number",
-                    value: cfg.defaultRetries,
-                });
-            }
-        }
-        // Validate boolean fields
-        const booleanFields = [
-            "includeValidation",
-            "includeErrorHandling",
-            "includeRequestInterceptors",
-            "enhancedSearch",
-            "chainedSearchBuilder",
-            "searchAutocomplete",
-            "generateValueSetEnums",
-            "includeUtilities",
-            "generateValidators",
-            "useCanonicalManager",
-            "includeDocumentation",
-            "generateExamples",
-        ];
-        for (const field of booleanFields) {
-            if (cfg[field] !== undefined && typeof cfg[field] !== "boolean") {
-                errors.push({
-                    path: `restClient.${field}`,
-                    message: `${field} must be a boolean`,
-                    value: cfg[field],
-                });
-            }
-        }
-        return errors;
-    }
     validateGuardOptions(config) {
         const errors = [];
         if (typeof config !== "object" || config === null) {
@@ -653,17 +556,6 @@ export class ConfigLoader {
                 ...userConfig.typescript,
             },
         };
-        // Only include restClient if it was explicitly defined in user config
-        if (userConfig.restClient !== undefined) {
-            merged.restClient = {
-                ...DEFAULT_CONFIG.restClient,
-                ...userConfig.restClient,
-            };
-        }
-        else {
-            // Remove restClient from merged config if not defined in user config
-            delete merged.restClient;
-        }
         return merged;
     }
 }

package/dist/typeschema/generator.d.ts

@@ -17,22 +17,13 @@ import type { PackageInfo, TypeschemaGeneratorOptions } from "./types.js";
 export declare class TypeSchemaGenerator {
     private manager;
     private options;
-    private cache;
     private cacheConfig?;
+    private cache?;
     private logger;
     constructor(options?: TypeschemaGeneratorOptions, cacheConfig?: TypeSchemaConfig);
-    /**
-     * Initialize the cache if configured
-     */
     private initializeCache;
-    /**
-     * Generate TypeSchema from a FHIR package name
-     */
     generateFromPackage(packageName: string, packageVersion?: string): Promise<TypeSchema[]>;
-    /**
-     * Generate TypeSchema from individual FHIR schema
-     */
-    generateFromSchema(fhirSchema: FHIRSchema, packageInfo?: PackageInfo): Promise<TypeSchema[]>;
+    generateFromFhirSchema(fhirSchema: FHIRSchema, packageInfo?: PackageInfo): Promise<TypeSchema[]>;
     /**
      * Generate TypeSchema from multiple FHIR schemas with FHIR-specific enhancements
      */

package/dist/typeschema/generator.js

@@ -19,16 +19,11 @@ import { transformValueSet } from "./value-set/processor.js";
 export class TypeSchemaGenerator {
     manager;
     options;
-    cache = null;
     cacheConfig;
+    cache;
     logger;
     constructor(options = {}, cacheConfig) {
-        this.options = {
-            resourceTypes: [],
-            maxDepth: 10,
-            verbose: false,
-            ...options,
-        };
+        this.options = { verbose: false, ...options };
         this.manager = CanonicalManager({ packages: [], workingDir: "tmp/fhir" });
         this.cacheConfig = cacheConfig;
         this.logger =
@@ -38,18 +33,12 @@ export class TypeSchemaGenerator {
                     prefix: "TypeSchema",
                 });
     }
-    /**
-     * Initialize the cache if configured
-     */
     async initializeCache() {
         if (this.cacheConfig && !this.cache) {
             this.cache = new TypeSchemaCache(this.cacheConfig);
             await this.cache.initialize();
         }
     }
-    /**
-     * Generate TypeSchema from a FHIR package name
-     */
     async generateFromPackage(packageName, packageVersion) {
         await this.initializeCache();
         const forceRegenerate = this.cacheConfig?.forceRegenerate ?? false;
@@ -129,10 +118,7 @@ export class TypeSchemaGenerator {
         }
         return allSchemas;
     }
-    /**
-     * Generate TypeSchema from individual FHIR schema
-     */
-    async generateFromSchema(fhirSchema, packageInfo) {
+    async generateFromFhirSchema(fhirSchema, packageInfo) {
         this.logger.info("Transforming FHIR schema to TypeSchema");
         return transformFHIRSchema(fhirSchema, this.manager, packageInfo);
     }
@@ -373,5 +359,5 @@ export async function generateTypeSchemaFromSchemas(fhirSchemas, packageInfo, op
  */
 export async function generateTypeSchemaFromSchema(fhirSchema, packageInfo, options = {}) {
     const generator = new TypeSchemaGenerator(options);
-    return await generator.generateFromSchema(fhirSchema, packageInfo);
+    return await generator.generateFromFhirSchema(fhirSchema, packageInfo);
 }

package/dist/typeschema/index.d.ts

@@ -9,58 +9,8 @@
  * - Reading TypeSchema documents
  * - Validating TypeSchema documents
  */
-import type { TypeSchema } from "./type-schema.types.js";
-import type { TypeschemaParserOptions } from "./types.js";
-export { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
-export type { FHIRSchema, FHIRSchemaElement } from "@atomic-ehr/fhirschema";
-export { cacheSchema, clearGlobalCache, getCachedSchema, getGlobalCache, initializeGlobalCache, isCached, TypeSchemaCache, } from "./cache.js";
-export { buildEnum, collectBindingSchemas, extractValueSetConcepts, generateBindingSchema, } from "./core/binding.js";
-export { buildField, buildNestedField, getElementHierarchy, isExcluded, isNestedElement, isRequired, mergeElementHierarchy, } from "./core/field-builder.js";
-export { buildBindingIdentifier, buildNestedIdentifier, buildSchemaIdentifier, buildValueSetIdentifier, dropVersionFromUrl, } from "./core/identifier.js";
-export { buildNestedTypes, collectNestedElements, extractNestedDependencies, } from "./core/nested-types.js";
-export { transformFHIRSchema, transformFHIRSchemas, } from "./core/transformer.js";
-export { generateTypeSchemaFromPackage, generateTypeSchemaFromSchema, generateTypeSchemaFromSchemas, TypeSchemaGenerator, } from "./generator.js";
-export { parseTypeSchemaFromFile, parseTypeSchemaFromFiles, parseTypeSchemaFromString, TypeSchemaParser, } from "./parser.js";
+export type { FHIRSchema } from "@atomic-ehr/fhirschema";
+export { TypeSchemaCache } from "./cache.js";
+export { TypeSchemaGenerator } from "./generator.js";
+export { TypeSchemaParser } from "./parser.js";
 export * from "./type-schema.types.js";
-export type { PackageInfo, TypeschemaGeneratorOptions, TypeschemaParserOptions, } from "./types.js";
-export { isTypeSchemaBinding, isTypeSchemaForResourceComplexTypeLogical, isTypeSchemaValueSet, } from "./utils.js";
-export { transformValueSet } from "./value-set/processor.js";
-/**
- * TypeSchema Core API class
- *
- * Provides core TypeSchema functionality: convert, read, and validate.
- * Does NOT include target-specific generation (like TypeScript generation).
- * Use target generators in src/api/generators/ for output generation.
- */
-export declare class TypeSchemaAPI {
-    private generator;
-    private parser;
-    private cache;
-    constructor(options?: {
-        generator?: any;
-        parser?: TypeschemaParserOptions;
-        validator?: {
-            strict?: boolean;
-        };
-    });
-    /**
-     * Convert FHIR package to TypeSchema
-     */
-    generateFromPackage(packageName: string, packageVersion?: string): Promise<TypeSchema[]>;
-    /**
-     * Parse TypeSchema from files
-     */
-    parseFromFiles(inputFiles: string[]): Promise<TypeSchema[]>;
-}
-/**
- * Create a new TypeSchema API instance
- */
-export declare function createTypeSchemaAPI(options?: ConstructorParameters<typeof TypeSchemaAPI>[0]): TypeSchemaAPI;
-/**
- * Convenience function to convert FHIR package to TypeSchema
- */
-export declare function generateTypeSchemaFromPackageCore(packageName: string, packageVersion?: string): Promise<TypeSchema[]>;
-/**
- * Convenience function to parse TypeSchema from files
- */
-export declare function parseTypeSchemaFromFilesCore(inputFiles: string[]): Promise<TypeSchema[]>;

package/dist/typeschema/index.js

@@ -9,84 +9,7 @@
  * - Reading TypeSchema documents
  * - Validating TypeSchema documents
  */
-import { TypeSchemaCache } from "./cache.js";
-import { TypeSchemaGenerator } from "./generator.js";
-import { TypeSchemaParser } from "./parser.js";
-// Re-export core dependencies
-export { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
-// Export cache functionality
-export { cacheSchema, clearGlobalCache, getCachedSchema, getGlobalCache, initializeGlobalCache, isCached, TypeSchemaCache, } from "./cache.js";
-// Re-export utility functions for FHIR processing
-export { buildEnum, collectBindingSchemas, extractValueSetConcepts, generateBindingSchema, } from "./core/binding.js";
-export { buildField, buildNestedField, getElementHierarchy, isExcluded, isNestedElement, isRequired, mergeElementHierarchy, } from "./core/field-builder.js";
-export { buildBindingIdentifier, buildNestedIdentifier, buildSchemaIdentifier, buildValueSetIdentifier, dropVersionFromUrl, } from "./core/identifier.js";
-export { buildNestedTypes, collectNestedElements, extractNestedDependencies, } from "./core/nested-types.js";
-// Re-export FHIR transformation utilities
-export { transformFHIRSchema, transformFHIRSchemas, } from "./core/transformer.js";
-// Export generator functionality (FHIR -> TypeSchema)
-export { generateTypeSchemaFromPackage, generateTypeSchemaFromSchema, generateTypeSchemaFromSchemas, TypeSchemaGenerator, } from "./generator.js";
-// Export parser functionality (Read TypeSchema)
-export { parseTypeSchemaFromFile, parseTypeSchemaFromFiles, parseTypeSchemaFromString, TypeSchemaParser, } from "./parser.js";
-// Profile processing temporarily disabled (not in core TypeSchema spec)
-// export { transformProfile } from "./profile/processor";
-// Export new comprehensive types (preferred)
+export { TypeSchemaCache } from "./cache.js";
+export { TypeSchemaGenerator } from "./generator.js";
+export { TypeSchemaParser } from "./parser.js";
 export * from "./type-schema.types.js";
-// Export typeschema-specific utils (renamed to avoid conflicts)
-export { isTypeSchemaBinding, isTypeSchemaForResourceComplexTypeLogical, isTypeSchemaValueSet, } from "./utils.js";
-// Export value set processing
-export { transformValueSet } from "./value-set/processor.js";
-/**
- * TypeSchema Core API class
- *
- * Provides core TypeSchema functionality: convert, read, and validate.
- * Does NOT include target-specific generation (like TypeScript generation).
- * Use target generators in src/api/generators/ for output generation.
- */
-export class TypeSchemaAPI {
-    generator;
-    parser;
-    cache;
-    constructor(options = {}) {
-        this.generator = new TypeSchemaGenerator(options.generator);
-        this.parser = new TypeSchemaParser(options.parser);
-        this.cache = new TypeSchemaCache();
-    }
-    /**
-     * Convert FHIR package to TypeSchema
-     */
-    async generateFromPackage(packageName, packageVersion) {
-        const schemas = await this.generator.generateFromPackage(packageName, packageVersion);
-        // Cache generated schemas
-        this.cache.setMany(schemas);
-        return schemas;
-    }
-    /**
-     * Parse TypeSchema from files
-     */
-    async parseFromFiles(inputFiles) {
-        const schemas = await this.parser.parseFromFiles(inputFiles);
-        // Cache parsed schemas
-        this.cache.setMany(schemas);
-        return schemas;
-    }
-}
-/**
- * Create a new TypeSchema API instance
- */
-export function createTypeSchemaAPI(options) {
-    return new TypeSchemaAPI(options);
-}
-/**
- * Convenience function to convert FHIR package to TypeSchema
- */
-export async function generateTypeSchemaFromPackageCore(packageName, packageVersion) {
-    const api = createTypeSchemaAPI();
-    return await api.generateFromPackage(packageName, packageVersion);
-}
-/**
- * Convenience function to parse TypeSchema from files
- */
-export async function parseTypeSchemaFromFilesCore(inputFiles) {
-    const api = createTypeSchemaAPI();
-    return await api.parseFromFiles(inputFiles);
-}

package/dist/typeschema/types.d.ts

@@ -480,9 +480,7 @@ export interface TypeSchemaForBinding {
 }
 export type TypeSchemaField = RegularField | PolymorphicValueXFieldDeclaration | PolymorphicValueXFieldInstance;
 export interface TypeschemaGeneratorOptions {
-    resourceTypes?: string[];
     verbose?: boolean;
-    maxDepth?: number;
     logger?: import("../utils/codegen-logger").CodegenLogger;
     treeshake?: string[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomic-ehr/codegen",
-  "version": "0.0.1-canary.20250830233015.ec9aae7",
+  "version": "0.0.1-canary.20250923152114.2852906",
   "description": "Code generation tools for FHIR resources and TypeSchema definitions",
   "keywords": [
     "fhir",
@@ -46,6 +46,7 @@
     "build": "rm -rf dist && bunx tsc --project tsconfig.build.json && bun build src/cli/index.ts --outfile dist/cli/atomic-codegen.js --target node --format esm --minify --external typescript && tail -n +2 dist/cli/atomic-codegen.js > dist/cli/temp.js && echo '#!/usr/bin/env node' > dist/cli/index.js && cat dist/cli/temp.js >> dist/cli/index.js && chmod +x dist/cli/index.js && rm dist/cli/atomic-codegen.js dist/cli/temp.js",
     "typecheck": "bunx tsc --noEmit",
     "lint": "biome check --write",
+    "format": "biome format --write",
     "quality": "bun run typecheck && bun run lint && bun run test:unit",
     "cli": "bun run src/cli/index.ts",
     "codegen": "bun run src/cli/index.ts",

package/dist/api/generators/rest-client.d.ts

@@ -1,117 +0,0 @@
-/**
- * REST Client Generator
- *
- * Generates a fetch-based FHIR REST client with TypeScript autocompletion
- * and type safety for all FHIR resources.
- */
-import type { RestClientConfig } from "../../config.js";
-import type { TypeSchema } from "../../typeschema/type-schema.types";
-import type { CodegenLogger } from "../../utils/codegen-logger.js";
-/**
- * Options for the REST Client generator
- * Extends RestClientConfig with outputDir
- */
-export interface RestClientOptions extends RestClientConfig {
-    outputDir: string;
-    logger?: CodegenLogger;
-}
-/**
- * Generated file result
- */
-export interface GeneratedRestClient {
-    path: string;
-    filename: string;
-    content: string;
-    exports: string[];
-}
-/**
- * REST Client Generator
- *
- * Generates a type-safe FHIR REST client with autocompletion for all
- * available resource types.
- */
-export declare class RestClientGenerator {
-    private options;
-    private resourceTypes;
-    private searchParameterEnhancer;
-    private validationGenerator;
-    private logger;
-    constructor(options: RestClientOptions);
-    /**
-     * Collect resource types from schemas
-     */
-    private collectResourceTypes;
-    /**
-     * Generate the REST client from TypeSchema documents
-     */
-    generate(schemas: TypeSchema[]): Promise<GeneratedRestClient[]>;
-    /**
-     * Generate the main client file
-     */
-    private generateClientFile;
-    /**
-     * Generate the types file
-     */
-    private generateTypesFile;
-    /**
-     * Generate error handling code
-     */
-    private generateErrorHandling;
-    /**
-     * Generate error handling methods
-     */
-    private generateErrorHandlingMethods;
-    /**
-     * Set output directory
-     */
-    setOutputDir(directory: string): void;
-    /**
-     * Update generator options
-     */
-    setOptions(options: Partial<RestClientOptions>): void;
-    /**
-     * Get current options
-     */
-    getOptions(): RestClientOptions;
-    /**
-     * Generate enhanced search parameters file
-     */
-    private generateEnhancedSearchParamsFile;
-    /**
-     * Generate validation configuration fields
-     */
-    private generateValidationConfigFields;
-    /**
-     * Generate validation types file
-     */
-    private generateValidationTypesFile;
-    /**
-     * Generate resource validators file
-     */
-    private generateValidatorsFile;
-    /**
-     * Generate CRUD methods with conditional validation support
-     */
-    private generateCRUDMethods;
-    /**
-     * Generate validation code for CRUD operations
-     */
-    private generateValidationCode;
-    /**
-     * Generate the search method with conditional enhanced search support
-     */
-    private generateSearchMethod;
-    /**
-     * Generate validation methods for the client
-     */
-    private generateValidationMethods;
-    /**
-     * Generate search parameter handling code based on configuration
-     */
-    private generateSearchParameterHandlingCode;
-    /**
-     * Generate utility file with ResourceTypeMap
-     */
-    private generateUtilityFile;
-    private ensureDirectoryExists;
-}