@atomic-ehr/codegen 0.0.1-canary.20250811151625.dc70a39 → 0.0.1-canary.20250811234617.ea1d6c1

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

@@ -47,6 +47,8 @@ export declare class TypeScriptAPIGenerator {
     private resourceTypes;
     private currentSchemaName?;
     private profileTypes;
+    private profilesByPackage;
+    private packageNameMap;
     private enumTypes;
     private globalEnumTypes;
     private fieldEnumMap;
@@ -104,6 +106,10 @@ export declare class TypeScriptAPIGenerator {
     getOptions(): TypeScriptAPIOptions;
     private generateIndexFile;
     private ensureDirectoryExists;
+    /**
+     * Clean the output directory by removing all existing files and subdirectories
+     */
+    private cleanOutputDirectory;
     /**
      * Filter schemas based on includeExtensions option
      */
@@ -112,6 +118,18 @@ export declare class TypeScriptAPIGenerator {
      * Generate index files for subfolders
      */
     private generateSubfolderIndexFiles;
+    /**
+     * Generate profile index files with package-based organization
+     */
+    private generateProfileIndexFiles;
+    /**
+     * Generate index file for a specific package
+     */
+    private generatePackageIndex;
+    /**
+     * Generate main profiles index with namespace exports
+     */
+    private generateMainProfilesIndex;
     /**
      * Generate index content for a subfolder
      */
@@ -132,6 +150,18 @@ export declare class TypeScriptAPIGenerator {
      * Get filename for schema
      */
     private getFilename;
+    /**
+     * Sanitize package name for use as directory name
+     */
+    private sanitizePackageName;
+    /**
+     * Generate namespace name from original package name by capitalizing each dot-separated segment
+     */
+    private generateNamespaceName;
+    /**
+     * Calculate the correct import path from current profile to base type
+     */
+    private calculateImportPath;
     /**
      * Generate TypeScript for a profile schema
      */

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

@@ -1 +1 @@
-{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/api/generators/typescript.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../../src/api/generators/typescript.ts"],"names":[],"mappings":"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"}

package/dist/cli/index.js

@@ -17,7 +17,7 @@ import {
   step,
   success,
   warn
-} from "../index-ggpfvj56.js";
+} from "../index-ts25e982.js";
 
 // node_modules/emoji-regex/index.js
 var require_emoji_regex = __commonJS((exports, module) => {

package/dist/{index-ggpfvj56.js → index-ts25e982.js}

@@ -4997,7 +4997,7 @@ ${resourceTypesArray.map((type) => `  '${type}': ${type};`).join(`
 }
 
 // src/api/generators/typescript.ts
-import { mkdir as mkdir3, writeFile as writeFile5 } from "node:fs/promises";
+import { access as access2, mkdir as mkdir3, rm, writeFile as writeFile5 } from "node:fs/promises";
 import { dirname as dirname2, join as join11 } from "node:path";
 
 // src/utils.ts
@@ -5039,6 +5039,8 @@ class TypeScriptAPIGenerator {
   resourceTypes = new Set;
   currentSchemaName;
   profileTypes = new Set;
+  profilesByPackage = new Map;
+  packageNameMap = new Map;
   enumTypes = new Map;
   globalEnumTypes = new Map;
   fieldEnumMap = new Map;
@@ -5247,6 +5249,7 @@ class TypeScriptAPIGenerator {
     const filteredSchemas = this.filterSchemas(schemas);
     const results = await this.transformSchemas(filteredSchemas);
     const generatedFiles = [];
+    await this.cleanOutputDirectory();
     await mkdir3(this.options.outputDir, { recursive: true });
     if (this.options.includeProfiles) {
       await mkdir3(join11(this.options.outputDir, "profiles"), {
@@ -5468,6 +5471,17 @@ ${result.content}` : result.content;
     const dir = dirname2(filePath);
     await mkdir3(dir, { recursive: true });
   }
+  async cleanOutputDirectory() {
+    try {
+      await access2(this.options.outputDir);
+      this.logger.debug(`Cleaning output directory: ${this.options.outputDir}`);
+      await rm(this.options.outputDir, { recursive: true, force: true });
+    } catch (error2) {
+      if (error2?.code !== "ENOENT") {
+        this.logger.warn(`Failed to clean output directory: ${error2}`);
+      }
+    }
+  }
   filterSchemas(schemas) {
     if (this.options.includeExtensions) {
       return schemas;
@@ -5483,17 +5497,88 @@ ${result.content}` : result.content;
       subfolders.push("profiles");
     }
     for (const subfolder of subfolders) {
-      const subfolderResults = results.filter((r) => r.filename.startsWith(`${subfolder}/`));
-      const indexContent = this.generateSubfolderIndex(subfolderResults, subfolder);
-      const indexPath = join11(this.options.outputDir, subfolder, "index.ts");
-      await writeFile5(indexPath, indexContent, "utf-8");
+      if (subfolder === "profiles") {
+        await this.generateProfileIndexFiles(generatedFiles);
+      } else {
+        const subfolderResults = results.filter((r) => r.filename.startsWith(`${subfolder}/`));
+        const indexContent = this.generateSubfolderIndex(subfolderResults, subfolder);
+        const indexPath = join11(this.options.outputDir, subfolder, "index.ts");
+        await writeFile5(indexPath, indexContent, "utf-8");
+        generatedFiles.push({
+          path: indexPath,
+          filename: `${subfolder}/index.ts`,
+          content: indexContent,
+          exports: subfolderResults.flatMap((r) => r.exports)
+        });
+      }
+    }
+  }
+  async generateProfileIndexFiles(generatedFiles) {
+    for (const [
+      packageName,
+      profileNames
+    ] of this.profilesByPackage.entries()) {
+      const packageIndexContent = this.generatePackageIndex(packageName, profileNames);
+      const packageIndexPath = join11(this.options.outputDir, "profiles", packageName, "index.ts");
+      await writeFile5(packageIndexPath, packageIndexContent, "utf-8");
       generatedFiles.push({
-        path: indexPath,
-        filename: `${subfolder}/index.ts`,
-        content: indexContent,
-        exports: subfolderResults.flatMap((r) => r.exports)
+        path: packageIndexPath,
+        filename: `profiles/${packageName}/index.ts`,
+        content: packageIndexContent,
+        exports: profileNames
       });
     }
+    const mainProfilesIndex = this.generateMainProfilesIndex();
+    const mainIndexPath = join11(this.options.outputDir, "profiles", "index.ts");
+    await writeFile5(mainIndexPath, mainProfilesIndex, "utf-8");
+    generatedFiles.push({
+      path: mainIndexPath,
+      filename: "profiles/index.ts",
+      content: mainProfilesIndex,
+      exports: Array.from(this.profilesByPackage.keys())
+    });
+  }
+  generatePackageIndex(packageName, profileNames) {
+    const lines = [];
+    lines.push("/**");
+    lines.push(` * ${packageName} Profiles Index`);
+    lines.push(" * ");
+    lines.push(" * Auto-generated exports for all profile types in this package.");
+    lines.push(" */");
+    lines.push("");
+    if (profileNames.length === 0) {
+      lines.push("// No profiles in this package");
+      lines.push("export {};");
+      return lines.join(`
+`);
+    }
+    for (const profileName of profileNames) {
+      lines.push(`export type { ${profileName} } from './${profileName}';`);
+    }
+    return lines.join(`
+`);
+  }
+  generateMainProfilesIndex() {
+    const lines = [];
+    lines.push("/**");
+    lines.push(" * Profiles Index");
+    lines.push(" * ");
+    lines.push(" * Auto-generated namespace exports for all profile packages.");
+    lines.push(" */");
+    lines.push("");
+    if (this.profilesByPackage.size === 0) {
+      lines.push("// No profile packages found");
+      lines.push("export {};");
+      return lines.join(`
+`);
+    }
+    for (const sanitizedPackageName of this.profilesByPackage.keys()) {
+      const originalPackageName = this.packageNameMap.get(sanitizedPackageName);
+      const namespaceNameForExport = this.generateNamespaceName(originalPackageName);
+      lines.push(`export * as ${namespaceNameForExport} from './${sanitizedPackageName}';`);
+    }
+    return lines.join(`
+`);
   }
   generateSubfolderIndex(results, subfolder) {
     const lines = [];
@@ -5543,18 +5628,49 @@ ${result.content}` : result.content;
   }
   getBaseInterface(schema) {
     if ((isTypeSchemaForResourceComplexTypeLogical(schema) || schema.identifier.kind === "profile") && schema.base) {
-      return this.getType(schema.base);
+      const baseIdentifier = schema.base;
+      const typeInfo = this.getType(baseIdentifier);
+      return {
+        ...typeInfo,
+        baseIdentifier
+      };
     }
     return null;
   }
   getFilename(identifier) {
     const name = toPascalCase(identifier.name);
     if (identifier.kind === "profile" && this.options.includeProfiles) {
-      const subfolder = "profiles";
+      const originalPackageName = identifier.package;
+      const sanitizedPackageName = this.sanitizePackageName(originalPackageName);
+      const subfolder = `profiles/${sanitizedPackageName}`;
+      if (!this.profilesByPackage.has(sanitizedPackageName)) {
+        this.profilesByPackage.set(sanitizedPackageName, []);
+        this.packageNameMap.set(sanitizedPackageName, originalPackageName);
+      }
+      this.profilesByPackage.get(sanitizedPackageName).push(name);
       return `${subfolder}/${name}.ts`;
     }
     return `${name}.ts`;
   }
+  sanitizePackageName(packageName) {
+    return packageName.replace(/[@/.]/g, "-").replace(/[^a-zA-Z0-9\-_]/g, "").toLowerCase();
+  }
+  generateNamespaceName(originalPackageName) {
+    return originalPackageName.split(".").map((segment) => this.toPascalCase(segment)).join("");
+  }
+  calculateImportPath(currentSchema, baseIdentifier) {
+    if (baseIdentifier.kind === "profile") {
+      const currentPackage = this.sanitizePackageName(currentSchema.identifier.package);
+      const basePackage = this.sanitizePackageName(baseIdentifier.package);
+      if (currentPackage === basePackage) {
+        return `./${this.formatTypeName(baseIdentifier.name)}`;
+      } else {
+        return `../${basePackage}/${this.formatTypeName(baseIdentifier.name)}`;
+      }
+    } else {
+      return `../../${this.formatTypeName(baseIdentifier.name)}`;
+    }
+  }
   async generateProfile(schema) {
     this.imports.clear();
     this.exports.clear();
@@ -5582,9 +5698,9 @@ ${result.content}` : result.content;
     }
     this.exports.add(interfaceName);
     const baseInterface = this.getBaseInterface(schema);
-    if (baseInterface && !baseInterface.isPrimitive) {
-      const importPath = baseInterface.value;
-      this.imports.set(baseInterface.value, `../${importPath}`);
+    if (baseInterface && !baseInterface.isPrimitive && baseInterface.baseIdentifier) {
+      const importPath = this.calculateImportPath(schema, baseInterface.baseIdentifier);
+      this.imports.set(baseInterface.value, importPath);
       lines.push(`export interface ${interfaceName} extends ${baseInterface.value} {`);
     } else {
       lines.push(`export interface ${interfaceName} {`);
@@ -5640,7 +5756,8 @@ ${result.content}` : result.content;
       } else if (field.type) {
         const subType = this.getType(field.type);
         if (!subType.isPrimitive) {
-          this.imports.set(subType.value, `../${subType.value}`);
+          const importPath = this.calculateImportPath(schema, field.type);
+          this.imports.set(subType.value, importPath);
         }
         typeString = subType.value;
       }
@@ -5652,7 +5769,8 @@ ${result.content}` : result.content;
       } else if (field.type) {
         const subType = this.getType(field.type);
         if (!subType.isPrimitive) {
-          this.imports.set(subType.value, `../${subType.value}`);
+          const importPath = this.calculateImportPath(schema, field.type);
+          this.imports.set(subType.value, importPath);
         }
         typeString = subType.value;
       }
@@ -5684,8 +5802,9 @@ ${result.content}` : result.content;
     lines.push("\tconst errors: string[] = [];");
     lines.push("");
     const baseInterface = this.getBaseInterface(schema);
-    if (baseInterface && !baseInterface.isPrimitive) {
-      this.imports.set(`is${baseInterface.value}`, `../${baseInterface.value}`);
+    if (baseInterface && !baseInterface.isPrimitive && baseInterface.baseIdentifier) {
+      const importPath = this.calculateImportPath(schema, baseInterface.baseIdentifier);
+      this.imports.set(`is${baseInterface.value}`, importPath);
       lines.push(`	// Validate base resource`);
       lines.push(`	if (!is${baseInterface.value}(resource)) {`);
       lines.push(`		return { valid: false, errors: ['Not a valid ${baseInterface.value} resource'] };`);
@@ -5722,7 +5841,7 @@ ${result.content}` : result.content;
     lines.push("\t\terrors");
     lines.push("\t};");
     lines.push("}");
-    this.imports.set("ValidationResult", "../types");
+    this.imports.set("ValidationResult", "../../types");
     return lines.join(`
 `);
   }
@@ -5860,8 +5979,9 @@ ${result.content}` : result.content;
     lines.push(" */");
     lines.push(`export function ${guardName}(resource: unknown): resource is ${interfaceName} {`);
     const baseInterface = this.getBaseInterface(schema);
-    if (baseInterface && !baseInterface.isPrimitive) {
-      this.imports.set(`is${baseInterface.value}`, `../${baseInterface.value}`);
+    if (baseInterface && !baseInterface.isPrimitive && baseInterface.baseIdentifier) {
+      const importPath = this.calculateImportPath(schema, baseInterface.baseIdentifier);
+      this.imports.set(`is${baseInterface.value}`, importPath);
       lines.push(`	if (!is${baseInterface.value}(resource)) return false;`);
       lines.push("");
       lines.push(`	const typed = resource as ${baseInterface.value};`);

package/dist/index.js

@@ -16,7 +16,7 @@ import {
   generateTypesFromPackage,
   isConfig,
   loadConfig
-} from "./index-ggpfvj56.js";
+} from "./index-ts25e982.js";
 export {
   loadConfig,
   isConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomic-ehr/codegen",
-  "version": "0.0.1-canary.20250811151625.dc70a39",
+  "version": "0.0.1-canary.20250811234617.ea1d6c1",
   "description": "Code generation tools for FHIR resources and TypeSchema definitions",
   "keywords": [
     "fhir",