@atomic-ehr/codegen 0.0.1-canary.20250924120719.44f2f7c → 0.0.1-canary.20250927094522.7f26cfe

package/dist/cli/utils/log.d.ts

@@ -1,8 +1,8 @@
 /**
  * CLI Utilities - Re-exports from main utils with spinner support
  */
-import { createSpinner } from "./spinner.js";
-export { type CodegenLogger, complete, configure, createLogger, debug, dim, error, header, info, type LogOptions, list, plain, progress, section, step, success, table, warn, } from "../../utils/codegen-logger.js";
+import { createSpinner } from "./spinner";
+export { type CodegenLogger, complete, configure, createLogger, debug, dim, error, header, info, type LogOptions, list, plain, progress, section, step, success, table, warn, } from "../../utils/codegen-logger";
 export { createSpinner };
 /**
  * Run a task with a spinner

package/dist/cli/utils/log.js

@@ -1,9 +1,9 @@
 /**
  * CLI Utilities - Re-exports from main utils with spinner support
  */
-import { createSpinner } from "./spinner.js";
+import { createSpinner } from "./spinner";
 // Re-export all logger functions from the main utils
-export { complete, configure, createLogger, debug, dim, error, header, info, list, plain, progress, section, step, success, table, warn, } from "../../utils/codegen-logger.js";
+export { complete, configure, createLogger, debug, dim, error, header, info, list, plain, progress, section, step, success, table, warn, } from "../../utils/codegen-logger";
 // Export CLI-specific utilities
 export { createSpinner };
 /**

package/dist/config.d.ts

@@ -22,11 +22,11 @@ export interface TypeScriptGeneratorConfig {
     /** Include helper validation functions in value set files (default: false) */
     includeValueSetHelpers?: boolean;
     /** Which binding strengths to generate value sets for (default: ['required']) */
-    valueSetStrengths?: ('required' | 'preferred' | 'extensible' | 'example')[];
+    valueSetStrengths?: ("required" | "preferred" | "extensible" | "example")[];
     /** Directory name for value set files (relative to outputDir) (default: 'valuesets') */
     valueSetDirectory?: string;
     /** Value set generation mode (default: 'required-only') */
-    valueSetMode?: 'all' | 'required-only' | 'custom';
+    valueSetMode?: "all" | "required-only" | "custom";
     fhirVersion?: "R4" | "R5";
     resourceTypes?: string[];
     maxDepth?: number;

package/dist/config.js

@@ -27,9 +27,9 @@ export const DEFAULT_CONFIG = {
         includeCodeSystems: false,
         includeOperations: false,
         generateValueSets: false,
-        valueSetDirectory: 'valuesets',
-        valueSetMode: 'required-only',
-        valueSetStrengths: ['required'],
+        valueSetDirectory: "valuesets",
+        valueSetMode: "required-only",
+        valueSetStrengths: ["required"],
         includeValueSetHelpers: false,
         fhirVersion: "R4",
         resourceTypes: [],
@@ -107,7 +107,7 @@ export const DEFAULT_CONFIG = {
  */
 export const CONFIG_FILE_NAMES = [
     "atomic-codegen.config.ts",
-    "atomic-codegen.config.js",
+    "atomic-codegen.config",
     "atomic-codegen.config.json",
     ".atomic-codegenrc",
     "atomic-codegen.json",
@@ -504,7 +504,7 @@ export class ConfigLoader {
     async loadFromFile(filePath) {
         try {
             let config;
-            if (filePath.endsWith(".ts") || filePath.endsWith(".js")) {
+            if (filePath.endsWith(".ts") || filePath.endsWith("")) {
                 // Use dynamic import for TypeScript/JavaScript files
                 const absolutePath = resolve(filePath);
                 const importResult = await import(absolutePath);

package/dist/index.d.ts

@@ -78,5 +78,5 @@
  * @author Atomic EHR Team
  * @since 0.0.1
  */
-export * from "./api/index.js";
-export * from "./config.js";
+export * from "./api/index";
+export * from "./config";

package/dist/index.js

@@ -79,6 +79,6 @@
  * @since 0.0.1
  */
 // Export new high-level API (primary)
-export * from "./api/index.js";
+export * from "./api/index";
 // Export new config system
-export * from "./config.js";
+export * from "./config";

package/dist/typeschema/cache.d.ts

@@ -3,8 +3,8 @@
  *
  * Caching system for TypeSchema documents with both in-memory and persistent file-based storage.
  */
-import type { TypeSchemaConfig } from "../config.js";
-import type { TypeSchema, TypeSchemaIdentifier } from "./type-schema.types.js";
+import type { TypeSchemaConfig } from "@root/config";
+import type { TypeSchema, Identifier } from "@typeschema/types";
 /**
  * TypeSchema Cache with optional persistent storage
  */
@@ -20,7 +20,7 @@ export declare class TypeSchemaCache {
     /**
      * Retrieve a schema by identifier
      */
-    get(identifier: TypeSchemaIdentifier): TypeSchema | null;
+    get(identifier: Identifier): TypeSchema | null;
     /**
      * Retrieve a schema by URL
      */
@@ -28,7 +28,7 @@ export declare class TypeSchemaCache {
     /**
      * Check if a schema exists in cache
      */
-    has(identifier: TypeSchemaIdentifier): boolean;
+    has(identifier: Identifier): boolean;
     /**
      * Check if a schema exists by URL
      */
@@ -36,7 +36,7 @@ export declare class TypeSchemaCache {
     /**
      * Delete a schema from cache
      */
-    delete(identifier: TypeSchemaIdentifier): boolean;
+    delete(identifier: Identifier): boolean;
     /**
      * Delete a schema by URL
      */
@@ -97,8 +97,8 @@ export declare function cacheSchema(schema: TypeSchema): void;
 /**
  * Get cached schema using global cache
  */
-export declare function getCachedSchema(identifier: TypeSchemaIdentifier): TypeSchema | null;
+export declare function getCachedSchema(identifier: Identifier): TypeSchema | null;
 /**
  * Check if schema is cached using global cache
  */
-export declare function isCached(identifier: TypeSchemaIdentifier): boolean;
+export declare function isCached(identifier: Identifier): boolean;

package/dist/typeschema/core/binding.d.ts

@@ -5,7 +5,7 @@
  */
 import type { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
 import type { FHIRSchema, FHIRSchemaElement } from "@atomic-ehr/fhirschema";
-import type { PackageInfo, TypeSchemaForBinding } from "../types.js";
+import type { PackageInfo, TypeSchemaForBinding } from "../types";
 /**
  * Extract concepts from a ValueSet
  */

package/dist/typeschema/core/binding.js

@@ -4,8 +4,8 @@
  *
  * Functions for processing value set bindings and generating enums
  */
-import { buildFieldType } from "./field-builder.js";
-import { buildBindingIdentifier, buildValueSetIdentifier, dropVersionFromUrl, } from "./identifier.js";
+import { buildFieldType } from "./field-builder";
+import { buildBindingIdentifier, buildValueSetIdentifier, dropVersionFromUrl, } from "./identifier";
 /**
  * Extract concepts from a ValueSet
  */
@@ -86,8 +86,10 @@ export async function buildEnum(element, manager) {
     // 3. Preferred bindings on code types (for common usage patterns)
     // 4. Extensible bindings on Coding types (broader coverage)
     const shouldGenerateEnum = strength === "required" ||
-        (strength === "extensible" && (element.type === "code" || element.type === "Coding")) ||
-        (strength === "preferred" && (element.type === "code" || element.type === "Coding"));
+        (strength === "extensible" &&
+            (element.type === "code" || element.type === "Coding")) ||
+        (strength === "preferred" &&
+            (element.type === "code" || element.type === "Coding"));
     if (!shouldGenerateEnum) {
         return undefined;
     }

package/dist/typeschema/core/field-builder.d.ts

@@ -5,7 +5,7 @@
  */
 import type { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
 import type { FHIRSchema, FHIRSchemaElement } from "@atomic-ehr/fhirschema";
-import type { PackageInfo, TypeSchemaField, TypeSchemaIdentifier } from "../types.js";
+import type { PackageInfo, TypeSchemaField, Identifier } from "../types";
 /**
  * Get the full element hierarchy for a given path
  */
@@ -25,11 +25,11 @@ export declare function isExcluded(fhirSchema: FHIRSchema, path: string[], _mana
 /**
  * Build reference array from element refers
  */
-export declare function buildReferences(element: FHIRSchemaElement, manager: ReturnType<typeof CanonicalManager>, packageInfo?: PackageInfo): Promise<TypeSchemaIdentifier[] | undefined>;
+export declare function buildReferences(element: FHIRSchemaElement, manager: ReturnType<typeof CanonicalManager>, packageInfo?: PackageInfo): Promise<Identifier[] | undefined>;
 /**
  * Build field type identifier
  */
-export declare function buildFieldType(fhirSchema: FHIRSchema, _path: string[], element: FHIRSchemaElement, _manager: ReturnType<typeof CanonicalManager>, packageInfo?: PackageInfo): TypeSchemaIdentifier | undefined;
+export declare function buildFieldType(fhirSchema: FHIRSchema, _path: string[], element: FHIRSchemaElement, _manager: ReturnType<typeof CanonicalManager>, packageInfo?: PackageInfo): Identifier | undefined;
 /**
  * Build a TypeSchema field from a FHIRSchema element
  */

package/dist/typeschema/core/field-builder.js

@@ -1,6 +1,6 @@
 // @ts-nocheck
-import { buildEnum } from "./binding.js";
-import { buildBindingIdentifier, buildNestedIdentifier, buildSchemaIdentifier, } from "./identifier.js";
+import { buildEnum } from "./binding";
+import { buildBindingIdentifier, buildNestedIdentifier, buildSchemaIdentifier, } from "./identifier";
 /**
  * Get the full element hierarchy for a given path
  */
@@ -134,7 +134,7 @@ export async function buildReferences(element, manager, packageInfo) {
         try {
             const resource = await manager.resolve(ref);
             if (resource) {
-                references.push(buildSchemaIdentifier(resource, packageInfo));
+                references.push(buildSchemaIdentifier(resource));
             }
         }
         catch { }

package/dist/typeschema/core/identifier.d.ts

@@ -4,24 +4,12 @@
  * Functions for creating TypeSchema identifiers from FHIRSchema entities
  */
 import type { FHIRSchema } from "@atomic-ehr/fhirschema";
-import type { PackageInfo, TypeSchemaForValueSet, TypeSchemaIdentifier } from "../types";
-/**
- * Drop version suffix from canonical URL (e.g., "http://example.com|1.0.0" -> "http://example.com")
- */
+import type { PackageInfo, TypeSchemaForValueSet, Identifier, RichFHIRSchema } from "../types";
 export declare function dropVersionFromUrl(url: string | undefined): string | undefined;
-/**
- * Build identifier for primitive-type, complex-type, resource, or constraint
- */
-export declare function buildSchemaIdentifier(fhirSchema: FHIRSchema, packageInfo?: PackageInfo): TypeSchemaIdentifier;
-/**
- * Build nested type identifier for BackboneElements
- */
-export declare function buildNestedIdentifier(fhirSchema: FHIRSchema, path: string[], packageInfo?: PackageInfo): TypeSchemaIdentifier;
-/**
- * Build value set identifier
- */
-export declare function buildValueSetIdentifier(valueSetUrl: string, valueSet?: any, packageInfo?: PackageInfo): TypeSchemaForValueSet["identifier"];
+export declare function buildSchemaIdentifier(fhirSchema: RichFHIRSchema): Identifier;
+export declare function buildNestedIdentifier(fhirSchema: FHIRSchema, path: string[], packageInfo?: PackageInfo): Identifier;
+export declare function buildValueSetIdentifier(valueSetUrl: string, valueSet: any, packageInfo?: PackageInfo): TypeSchemaForValueSet["identifier"];
 /**
  * Build binding identifier for an element with value set binding
  */
-export declare function buildBindingIdentifier(fhirSchema: FHIRSchema, path: string[], bindingName?: string, packageInfo?: PackageInfo): TypeSchemaIdentifier;
+export declare function buildBindingIdentifier(fhirSchema: FHIRSchema, path: string[], bindingName?: string, packageInfo?: PackageInfo): Identifier;

package/dist/typeschema/core/identifier.js

@@ -3,73 +3,41 @@
  *
  * Functions for creating TypeSchema identifiers from FHIRSchema entities
  */
-/**
- * Drop version suffix from canonical URL (e.g., "http://example.com|1.0.0" -> "http://example.com")
- */
 export function dropVersionFromUrl(url) {
     if (!url)
         return undefined;
     return url.split("|")[0];
 }
-/**
- * Determine the kind of schema based on FHIRSchema properties
- */
 function determineKind(fhirSchema) {
-    // Check for constraint/profile
-    if (fhirSchema.derivation === "constraint") {
-        // Distinguish between profiles and other constraints
-        // Profiles typically constrain resources or complex types and have a base type
-        if (fhirSchema.base &&
-            (fhirSchema.type === "Resource" ||
-                fhirSchema.kind === "resource" ||
-                fhirSchema.kind === "complex-type")) {
-            return "profile";
-        }
+    if (fhirSchema.derivation === "constraint")
         return "profile";
-    }
-    // Use explicit kind if available
-    if (fhirSchema.kind) {
-        switch (fhirSchema.kind) {
-            case "primitive-type":
-                return "primitive-type";
-            case "complex-type":
-                return "complex-type";
-            case "resource":
-                return "resource";
-        }
-    }
-    // Default to resource
+    if (fhirSchema.kind === "primitive-type")
+        return "primitive-type";
+    if (fhirSchema.kind === "complex-type")
+        return "complex-type";
+    if (fhirSchema.kind === "resource")
+        return "resource";
     return "resource";
 }
-/**
- * Build identifier for primitive-type, complex-type, resource, or constraint
- */
-export function buildSchemaIdentifier(fhirSchema, packageInfo) {
-    const kind = determineKind(fhirSchema);
+export function buildSchemaIdentifier(fhirSchema) {
     return {
-        kind,
-        package: packageInfo?.name || fhirSchema.package_name || "undefined",
-        version: packageInfo?.version || fhirSchema.package_version || "undefined",
+        kind: determineKind(fhirSchema),
+        package: fhirSchema.package_meta.name,
+        version: fhirSchema.package_meta.version,
         name: fhirSchema.name,
         url: fhirSchema.url,
     };
 }
-/**
- * Build nested type identifier for BackboneElements
- */
 export function buildNestedIdentifier(fhirSchema, path, packageInfo) {
     const nestedName = path.join(".");
     return {
         kind: "nested",
-        package: packageInfo?.name || fhirSchema.package_name || "undefined",
-        version: packageInfo?.version || fhirSchema.package_version || "undefined",
+        package: packageInfo?.name || fhirSchema.package_meta.name || "undefined",
+        version: packageInfo?.version || fhirSchema.package_meta.version || "undefined",
         name: nestedName,
         url: `${fhirSchema.url}#${nestedName}`,
     };
 }
-/**
- * Build value set identifier
- */
 export function buildValueSetIdentifier(valueSetUrl, valueSet, packageInfo) {
     const cleanUrl = dropVersionFromUrl(valueSetUrl) || valueSetUrl;
     // Generate a meaningful name from the URL instead of using potentially hash-like IDs
@@ -107,8 +75,8 @@ export function buildBindingIdentifier(fhirSchema, path, bindingName, packageInf
     const name = bindingName || `${fhirSchema.name}.${pathStr}_binding`;
     return {
         kind: "binding",
-        package: packageInfo?.name || fhirSchema.package_name || "undefined",
-        version: packageInfo?.version || fhirSchema.package_version || "undefined",
+        package: packageInfo?.name || fhirSchema.package_meta.name || "undefined",
+        version: packageInfo?.version || fhirSchema.package_meta.version || "undefined",
         name,
         url: bindingName
             ? `urn:fhir:binding:${name}`

package/dist/typeschema/core/nested-types.d.ts

@@ -5,7 +5,7 @@
  */
 import type { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
 import type { FHIRSchema, FHIRSchemaElement } from "@atomic-ehr/fhirschema";
-import type { PackageInfo, TypeSchemaField, TypeSchemaIdentifier } from "../types.js";
+import type { PackageInfo, TypeSchemaField, Identifier } from "../types";
 /**
  * Collect all nested elements from a FHIRSchema
  */
@@ -21,4 +21,4 @@ export declare function buildNestedTypes(fhirSchema: FHIRSchema, manager: Return
 /**
  * Extract dependencies from nested types
  */
-export declare function extractNestedDependencies(nestedTypes: TypeSchemaNestedType[]): TypeSchemaIdentifier[];
+export declare function extractNestedDependencies(nestedTypes: TypeSchemaNestedType[]): Identifier[];

package/dist/typeschema/core/nested-types.js

@@ -1,6 +1,6 @@
 // @ts-nocheck
-import { buildField, buildNestedField, isNestedElement, } from "./field-builder.js";
-import { buildNestedIdentifier } from "./identifier.js";
+import { buildField, buildNestedField, isNestedElement } from "./field-builder";
+import { buildNestedIdentifier } from "./identifier";
 /**
  * Collect all nested elements from a FHIRSchema
  */

package/dist/typeschema/core/transformer.d.ts

@@ -5,8 +5,8 @@
  */
 import type { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
 import type { FHIRSchema, FHIRSchemaElement } from "@atomic-ehr/fhirschema";
-import type { TypeSchema, TypeSchemaField } from "../type-schema.types.js";
-import type { PackageInfo } from "../types.js";
+import type { TypeSchema, TypeSchemaField, RichFHIRSchema } from "@typeschema/types";
+import type { PackageInfo } from "../types";
 /**
  * Transform elements into fields
  */
@@ -15,4 +15,4 @@ export declare function transformElements(fhirSchema: FHIRSchema, parentPath: st
  * Transform a single FHIRSchema to TypeSchema(s) with enhanced categorization
  * Returns the main schema plus any binding schemas
  */
-export declare function transformFHIRSchema(manager: ReturnType<typeof CanonicalManager>, fhirSchema: FHIRSchema, packageInfo?: PackageInfo): Promise<TypeSchema[]>;
+export declare function transformFHIRSchema(manager: ReturnType<typeof CanonicalManager>, fhirSchema: RichFHIRSchema): Promise<TypeSchema[]>;

package/dist/typeschema/core/transformer.js

@@ -1,9 +1,9 @@
 // @ts-nocheck
-import { transformProfile } from "../profile/processor.js";
-import { collectBindingSchemas } from "./binding.js";
-import { buildField, buildNestedField, getElementHierarchy, isNestedElement, mergeElementHierarchy, } from "./field-builder.js";
-import { buildSchemaIdentifier } from "./identifier.js";
-import { buildNestedTypes, extractNestedDependencies } from "./nested-types.js";
+import { transformProfile } from "../profile/processor";
+import { collectBindingSchemas } from "./binding";
+import { buildField, buildNestedField, getElementHierarchy, isNestedElement, mergeElementHierarchy, } from "./field-builder";
+import { buildSchemaIdentifier } from "./identifier";
+import { buildNestedTypes, extractNestedDependencies } from "./nested-types";
 /**
  * Transform elements into fields
  */
@@ -86,7 +86,7 @@ function isExtensionSchema(fhirSchema, _identifier) {
  */
 async function transformValueSet(fhirSchema, _manager, packageInfo) {
     try {
-        const identifier = buildSchemaIdentifier(fhirSchema, packageInfo);
+        const identifier = buildSchemaIdentifier(fhirSchema);
         identifier.kind = "value-set"; // Ensure correct kind
         const valueSetSchema = {
             identifier,
@@ -123,7 +123,7 @@ async function transformValueSet(fhirSchema, _manager, packageInfo) {
  */
 async function transformExtension(fhirSchema, manager, packageInfo) {
     try {
-        const identifier = buildSchemaIdentifier(fhirSchema, packageInfo);
+        const identifier = buildSchemaIdentifier(fhirSchema);
         // Build base identifier if present
         let base;
         if (fhirSchema.base && fhirSchema.base !== "Extension") {
@@ -133,8 +133,8 @@ async function transformExtension(fhirSchema, manager, packageInfo) {
             const baseName = fhirSchema.base.split("/").pop() || fhirSchema.base;
             base = {
                 kind: "complex-type",
-                package: packageInfo?.name || "hl7.fhir.r4.core",
-                version: packageInfo?.version || "4.0.1",
+                package: "hl7.fhir.r4.core",
+                version: "4.0.1",
                 name: baseName,
                 url: baseUrl,
             };
@@ -191,29 +191,21 @@ async function transformExtension(fhirSchema, manager, packageInfo) {
  * Transform a single FHIRSchema to TypeSchema(s) with enhanced categorization
  * Returns the main schema plus any binding schemas
  */
-export async function transformFHIRSchema(manager, fhirSchema, packageInfo) {
+export async function transformFHIRSchema(manager, fhirSchema) {
     const results = [];
-    // Extract package info from schema if not provided
-    if (!packageInfo && (fhirSchema.package_name || fhirSchema.package_id)) {
-        packageInfo = {
-            name: fhirSchema.package_name || fhirSchema.package_id || "undefined",
-            version: fhirSchema.package_version || "undefined",
-        };
-    }
-    // Build main identifier with enhanced categorization
-    const identifier = buildSchemaIdentifier(fhirSchema, packageInfo);
+    const identifier = buildSchemaIdentifier(fhirSchema);
     // Handle profiles with specialized processor
     if (identifier.kind === "profile") {
-        const profileSchema = await transformProfile(fhirSchema, manager, packageInfo);
+        const profileSchema = await transformProfile(fhirSchema, manager, fhirSchema.package_meta);
         results.push(profileSchema);
         // Collect binding schemas for profiles too
-        const bindingSchemas = await collectBindingSchemas(fhirSchema, manager, packageInfo);
+        const bindingSchemas = await collectBindingSchemas(fhirSchema, manager, fhirSchema.package_meta);
         results.push(...bindingSchemas);
         return results;
     }
     // Handle value sets specially
     if (identifier.kind === "value-set" || fhirSchema.kind === "value-set") {
-        const valueSetSchema = await transformValueSet(fhirSchema, manager, packageInfo);
+        const valueSetSchema = await transformValueSet(fhirSchema, manager, fhirSchema.package_meta);
         if (valueSetSchema) {
             results.push(valueSetSchema);
         }
@@ -221,7 +213,7 @@ export async function transformFHIRSchema(manager, fhirSchema, packageInfo) {
     }
     // Handle extensions specially
     if (isExtensionSchema(fhirSchema, identifier)) {
-        const extensionSchema = await transformExtension(fhirSchema, manager, packageInfo);
+        const extensionSchema = await transformExtension(fhirSchema, manager, fhirSchema.package_meta);
         if (extensionSchema) {
             results.push(extensionSchema);
         }
@@ -279,10 +271,10 @@ export async function transformFHIRSchema(manager, fhirSchema, packageInfo) {
             kind: kind,
             package: isStandardFhir
                 ? "hl7.fhir.r4.core"
-                : packageInfo?.name || fhirSchema.package_name || "undefined",
+                : fhirSchema.package_meta.name || "undefined",
             version: isStandardFhir
                 ? "4.0.1"
-                : packageInfo?.version || fhirSchema.package_version || "undefined",
+                : fhirSchema.package_meta.version || "undefined",
             name: baseName,
             url: baseUrl,
         };
@@ -305,14 +297,14 @@ export async function transformFHIRSchema(manager, fhirSchema, packageInfo) {
     }
     // Transform elements into fields (for non-primitive types)
     if (fhirSchema.kind !== "primitive-type" && fhirSchema.elements) {
-        const fields = await transformElements(fhirSchema, [], fhirSchema.elements, manager, packageInfo);
+        const fields = await transformElements(fhirSchema, [], fhirSchema.elements, manager, fhirSchema.package_meta);
         if (Object.keys(fields).length > 0) {
             mainSchema.fields = fields;
         }
         // Extract field dependencies (types and bindings)
         allDependencies.push(...extractFieldDependencies(fields));
         // Build nested types
-        const nestedTypes = await buildNestedTypes(fhirSchema, manager, packageInfo);
+        const nestedTypes = await buildNestedTypes(fhirSchema, manager, fhirSchema.package_meta);
         if (nestedTypes.length > 0) {
             mainSchema.nested = nestedTypes;
             // Add nested type dependencies
@@ -328,7 +320,7 @@ export async function transformFHIRSchema(manager, fhirSchema, packageInfo) {
     // Add main schema to results
     results.push(mainSchema);
     // Collect and add binding schemas
-    const bindingSchemas = await collectBindingSchemas(fhirSchema, manager, packageInfo);
+    const bindingSchemas = await collectBindingSchemas(fhirSchema, manager, fhirSchema.package_meta);
     results.push(...bindingSchemas);
     return results;
 }

package/dist/typeschema/generator.d.ts

@@ -5,9 +5,8 @@
  * Provides high-level API for converting FHIR Structure Definitions to TypeSchema format.
  */
 import { type FHIRSchema, type StructureDefinition } from "@atomic-ehr/fhirschema";
-import type { TypeSchemaConfig } from "../config.js";
-import type { TypeSchema } from "./type-schema.types.js";
-import type { PackageInfo, TypeschemaGeneratorOptions } from "./types.js";
+import type { TypeSchemaConfig } from "@root/config";
+import type { PackageInfo, RichFHIRSchema, TypeSchema, TypeschemaGeneratorOptions } from "./types";
 /**
  * TypeSchema Generator class
  *
@@ -29,7 +28,7 @@ export declare class TypeSchemaGenerator {
     generateFhirSchemas(structureDefinitions: StructureDefinition[]): FHIRSchema[];
     generateValueSetSchemas(valueSets: any[], packageInfo: PackageInfo): Promise<TypeSchema[]>;
     generateFromPackage(packageName: string, packageVersion?: string): Promise<TypeSchema[]>;
-    generateResourceTypeSchemas(fhirSchemas: FHIRSchema[], packageInfo: PackageInfo): Promise<TypeSchema[]>;
+    generateResourceTypeSchemas(fhirSchemas: RichFHIRSchema[]): Promise<TypeSchema[]>;
     /**
      * Apply treeshaking to StructureDefinitions before FHIR schema transformation
      * This is more efficient and includes smart reference handling

package/dist/typeschema/generator.js

@@ -6,10 +6,11 @@
  */
 import { CanonicalManager } from "@atomic-ehr/fhir-canonical-manager";
 import * as fhirschema from "@atomic-ehr/fhirschema";
-import { createLogger } from "../utils/codegen-logger.js";
-import { TypeSchemaCache } from "./cache.js";
-import { transformFHIRSchema } from "./core/transformer.js";
-import { transformValueSet } from "./value-set/processor.js";
+import { createLogger } from "@root/utils/codegen-logger";
+import { TypeSchemaCache } from "./cache";
+import { transformFHIRSchema } from "./core/transformer";
+import { enrichFHIRSchema } from "./types";
+import { transformValueSet } from "./value-set/processor";
 /**
  * TypeSchema Generator class
  *
@@ -24,7 +25,8 @@ export class TypeSchemaGenerator {
     logger;
     constructor(options = {}, cacheConfig) {
         this.options = { verbose: false, ...options };
-        this.manager = CanonicalManager({ packages: [], workingDir: "tmp/fhir" });
+        this.manager = options.manager ||
+            CanonicalManager({ packages: [], workingDir: "tmp/fhir" });
         this.cacheConfig = cacheConfig;
         this.logger =
             options.logger ||
@@ -41,11 +43,7 @@ export class TypeSchemaGenerator {
     }
     async fetchPackage(packageName, packageVersion) {
         this.logger.step(`Loading FHIR package: ${packageName}${packageVersion ? `@${packageVersion}` : ""}`);
-        this.manager = CanonicalManager({
-            packages: [`${packageName}${packageVersion ? `@${packageVersion}` : ""}`],
-            workingDir: "tmp/fhir",
-        });
-        await this.manager.init();
+        await this.manager.addPackages(`${packageName}${packageVersion ? `@${packageVersion}` : ""}`);
         const allResources = await this.manager.search({});
         const structureDefinitions = allResources.filter((resource) => resource.resourceType === "StructureDefinition");
         const valueSets = allResources.filter((resource) => resource.resourceType === "ValueSet");
@@ -116,9 +114,9 @@ export class TypeSchemaGenerator {
             version: packageVersion || "latest",
         };
         const { valueSets, structureDefinitions } = await this.fetchPackage(packageName, packageVersion);
-        const fhirSchemas = this.generateFhirSchemas(structureDefinitions);
+        const fhirSchemas = this.generateFhirSchemas(structureDefinitions).map(enrichFHIRSchema);
         const valueSetSchemas = await this.generateValueSetSchemas(valueSets, packageInfo);
-        const schemas = await this.generateResourceTypeSchemas(fhirSchemas, packageInfo);
+        const schemas = await this.generateResourceTypeSchemas(fhirSchemas);
         const allSchemas = [...schemas, ...valueSetSchemas];
         if (this.cache) {
             for (const schema of allSchemas) {
@@ -127,11 +125,11 @@ export class TypeSchemaGenerator {
         }
         return allSchemas;
     }
-    async generateResourceTypeSchemas(fhirSchemas, packageInfo) {
+    async generateResourceTypeSchemas(fhirSchemas) {
         this.logger.info(`Transforming ${fhirSchemas.length} FHIR schemas to Type Schema`);
         const typeSchemas = [];
         for (const fhirSchema of fhirSchemas) {
-            typeSchemas.push(...(await transformFHIRSchema(this.manager, fhirSchema, packageInfo)));
+            typeSchemas.push(...(await transformFHIRSchema(this.manager, fhirSchema)));
         }
         return typeSchemas;
     }

package/dist/typeschema/index.d.ts

@@ -9,8 +9,7 @@
  * - Reading TypeSchema documents
  * - Validating TypeSchema documents
  */
-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 { TypeSchemaCache } from "./cache";
+export { TypeSchemaGenerator } from "./generator";
+export { TypeSchemaParser } from "./parser";
+export type { Identifier, TypeSchema } from "./types";

package/dist/typeschema/index.js

@@ -9,7 +9,7 @@
  * - Reading TypeSchema documents
  * - Validating TypeSchema documents
  */
-export { TypeSchemaCache } from "./cache.js";
-export { TypeSchemaGenerator } from "./generator.js";
-export { TypeSchemaParser } from "./parser.js";
-export * from "./type-schema.types.js";
+// Re-export core dependencies
+export { TypeSchemaCache } from "./cache";
+export { TypeSchemaGenerator } from "./generator";
+export { TypeSchemaParser } from "./parser";