@atomic-ehr/codegen 0.0.1-canary.20250811235950.67a72a5 → 0.0.1-canary.20250812081907.f886676

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

@@ -142,6 +142,19 @@ export declare class TypeScriptAPIGenerator {
      * Get TypeScript type for a TypeSchema identifier
      */
     private getType;
+    /**
+     * Check if a profile identifier represents an extension
+     */
+    private isExtensionProfile;
+    /**
+     * Check if a schema extends Extension by looking at its base type
+     */
+    private isExtensionSchema;
+    /**
+     * Generate extension name from URL
+     * e.g., http://hl7.org/fhir/StructureDefinition/contactpoint-area -> ExtensionContactpointArea
+     */
+    private generateExtensionName;
     /**
      * Get base interface for schema
      */
@@ -162,6 +175,10 @@ export declare class TypeScriptAPIGenerator {
      * Calculate the correct import path from current profile to base type
      */
     private calculateImportPath;
+    /**
+     * Track actual interface names for profile index generation
+     */
+    private trackProfileInterfaceName;
     /**
      * Generate TypeScript for a profile schema
      */
@@ -174,6 +191,34 @@ export declare class TypeScriptAPIGenerator {
      * Generate TypeScript for a profile field with constraints
      */
     private generateProfileField;
+    /**
+     * Get list of field names that have constraints in a profile
+     */
+    private getConstrainedFields;
+    /**
+     * Check if a field has significant constraints that warrant generation
+     */
+    private hasSignificantConstraints;
+    /**
+     * Check if a constraint is significant enough to warrant field generation
+     */
+    private isSignificantConstraint;
+    /**
+     * Generate a constrained field for a profile with proper typing
+     */
+    private generateConstrainedProfileField;
+    /**
+     * Generate a choice instance field (e.g., effectiveDateTime, effectivePeriod)
+     */
+    private generateChoiceInstanceField;
+    /**
+     * Generate field from constraint-only definition
+     */
+    private generateFieldFromConstraint;
+    /**
+     * Collect imports needed for a constrained field
+     */
+    private collectImportsForField;
     /**
      * Generate an enum type for a field with enumerated values
      */

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-m60p8fkc.js";
+} from "../index-4p27vhn8.js";
 
 // node_modules/emoji-regex/index.js
 var require_emoji_regex = __commonJS((exports, module) => {

package/dist/{index-m60p8fkc.js → index-4p27vhn8.js}

@@ -5241,11 +5241,17 @@ class TypeScriptAPIGenerator {
       const result = await this.transformSchema(schema);
       if (result) {
         results.push(result);
+        if (schema.identifier.kind === "profile" && result.exports && result.exports.length > 0) {
+          const interfaceName = result.exports[0];
+          this.trackProfileInterfaceName(schema.identifier, result.filename, interfaceName ?? "");
+        }
       }
     }
     return results;
   }
   async generate(schemas) {
+    this.profilesByPackage.clear();
+    this.packageNameMap.clear();
     const filteredSchemas = this.filterSchemas(schemas);
     const results = await this.transformSchemas(filteredSchemas);
     const generatedFiles = [];
@@ -5514,18 +5520,15 @@ ${result.content}` : result.content;
     }
   }
   async generateProfileIndexFiles(generatedFiles) {
-    for (const [
-      packageName,
-      profileNames
-    ] of this.profilesByPackage.entries()) {
-      const packageIndexContent = this.generatePackageIndex(packageName, profileNames);
+    for (const [packageName, profiles] of this.profilesByPackage.entries()) {
+      const packageIndexContent = this.generatePackageIndex(packageName, profiles);
       const packageIndexPath = join11(this.options.outputDir, "profiles", packageName, "index.ts");
       await writeFile5(packageIndexPath, packageIndexContent, "utf-8");
       generatedFiles.push({
         path: packageIndexPath,
         filename: `profiles/${packageName}/index.ts`,
         content: packageIndexContent,
-        exports: profileNames
+        exports: profiles.map((p) => p.interfaceName)
       });
     }
     const mainProfilesIndex = this.generateMainProfilesIndex();
@@ -5538,7 +5541,7 @@ ${result.content}` : result.content;
       exports: Array.from(this.profilesByPackage.keys())
     });
   }
-  generatePackageIndex(packageName, profileNames) {
+  generatePackageIndex(packageName, profiles) {
     const lines = [];
     lines.push("/**");
     lines.push(` * ${packageName} Profiles Index`);
@@ -5546,14 +5549,14 @@ ${result.content}` : result.content;
     lines.push(" * Auto-generated exports for all profile types in this package.");
     lines.push(" */");
     lines.push("");
-    if (profileNames.length === 0) {
+    if (profiles.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}';`);
+    for (const profile of profiles) {
+      lines.push(`export type { ${profile.interfaceName} } from './${profile.filename}';`);
     }
     return lines.join(`
 `);
@@ -5624,7 +5627,43 @@ ${result.content}` : result.content;
     if (primitiveType) {
       return { isPrimitive: true, value: primitiveType };
     }
-    return { isPrimitive: false, value: this.formatTypeName(identifier.name) };
+    let typeName = identifier.name;
+    if (identifier.kind === "profile") {
+      if (this.isExtensionProfile(identifier)) {
+        typeName = this.generateExtensionName(identifier);
+      } else if (identifier.url && identifier.url.includes("vitalsigns") && !typeName.includes("Observation")) {
+        typeName = `observation-${typeName}`;
+      }
+    }
+    return { isPrimitive: false, value: this.formatTypeName(typeName) };
+  }
+  isExtensionProfile(identifier) {
+    if (identifier.url) {
+      const isKnownProfile = identifier.url.includes("/vitalsigns") || identifier.url.includes("/bmi") || identifier.url.includes("/bodyheight") || identifier.url.includes("/bodyweight") || identifier.url.includes("/bodytemp") || identifier.url.includes("/headcircum") || identifier.url.includes("/heartrate") || identifier.url.includes("/oxygensat") || identifier.url.includes("/resprate") || identifier.url.includes("/bp") || identifier.url.includes("/vitalspanel");
+      return identifier.url.includes("/StructureDefinition/") && !isKnownProfile;
+    }
+    return false;
+  }
+  isExtensionSchema(schema) {
+    if (schema.identifier.kind === "profile") {
+      const profileSchema = schema;
+      if (profileSchema.base && profileSchema.base.name === "Extension") {
+        return true;
+      }
+    }
+    return false;
+  }
+  generateExtensionName(identifier) {
+    if (!identifier.url) {
+      return `Extension${this.formatTypeName(identifier.name)}`;
+    }
+    const urlParts = identifier.url.split("/");
+    const extensionName = urlParts[urlParts.length - 1];
+    if (!extensionName) {
+      return `Extension${this.formatTypeName(identifier.name)}`;
+    }
+    const formattedName = extensionName.split(/[-_]/).map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase()).join("");
+    return `Extension${formattedName}`;
   }
   getBaseInterface(schema) {
     if ((isTypeSchemaForResourceComplexTypeLogical(schema) || schema.identifier.kind === "profile") && schema.base) {
@@ -5647,7 +5686,6 @@ ${result.content}` : result.content;
         this.profilesByPackage.set(sanitizedPackageName, []);
         this.packageNameMap.set(sanitizedPackageName, originalPackageName);
       }
-      this.profilesByPackage.get(sanitizedPackageName).push(name);
       return `${subfolder}/${name}.ts`;
     }
     return `${name}.ts`;
@@ -5663,18 +5701,39 @@ ${result.content}` : result.content;
       const currentPackage = this.sanitizePackageName(currentSchema.identifier.package);
       const basePackage = this.sanitizePackageName(baseIdentifier.package);
       if (currentPackage === basePackage) {
-        return `./${this.formatTypeName(baseIdentifier.name)}`;
+        const baseTypeInfo = this.getType(baseIdentifier);
+        return `./${baseTypeInfo.value}`;
       } else {
-        return `../${basePackage}/${this.formatTypeName(baseIdentifier.name)}`;
+        const baseTypeInfo = this.getType(baseIdentifier);
+        return `../${basePackage}/${baseTypeInfo.value}`;
       }
     } else {
       return `../../${this.formatTypeName(baseIdentifier.name)}`;
     }
   }
+  trackProfileInterfaceName(identifier, filename, interfaceName) {
+    if (identifier.kind === "profile" && identifier.package) {
+      const originalPackageName = identifier.package;
+      const sanitizedPackageName = this.sanitizePackageName(originalPackageName);
+      if (!this.profilesByPackage.has(sanitizedPackageName)) {
+        this.profilesByPackage.set(sanitizedPackageName, []);
+        this.packageNameMap.set(sanitizedPackageName, originalPackageName);
+      }
+      const baseFilename = filename.split("/").pop()?.replace(/\.ts$/, "") || filename;
+      this.profilesByPackage.get(sanitizedPackageName).push({
+        filename: baseFilename,
+        interfaceName
+      });
+    }
+  }
   async generateProfile(schema) {
     this.imports.clear();
     this.exports.clear();
-    this.currentSchemaName = this.formatTypeName(schema.identifier.name);
+    if (this.isExtensionSchema(schema)) {
+      this.currentSchemaName = this.generateExtensionName(schema.identifier);
+    } else {
+      this.currentSchemaName = this.formatTypeName(schema.identifier.name);
+    }
     this.profileTypes.add(this.currentSchemaName);
     const content = this.generateTypeScriptForProfile(schema);
     const imports = new Map(this.imports);
@@ -5689,11 +5748,16 @@ ${result.content}` : result.content;
   }
   generateTypeScriptForProfile(schema) {
     const lines = [];
-    const interfaceName = this.formatTypeName(schema.identifier.name);
+    const interfaceName = this.currentSchemaName || this.formatTypeName(schema.identifier.name);
+    const isExtension = this.isExtensionSchema(schema);
     if (schema.description) {
       lines.push("/**");
       lines.push(` * ${schema.description}`);
-      lines.push(` * @profile ${schema.identifier.url}`);
+      if (isExtension) {
+        lines.push(` * @extension ${schema.identifier.url}`);
+      } else {
+        lines.push(` * @profile ${schema.identifier.url}`);
+      }
       lines.push(" */");
     }
     this.exports.add(interfaceName);
@@ -5705,7 +5769,34 @@ ${result.content}` : result.content;
     } else {
       lines.push(`export interface ${interfaceName} {`);
     }
-    if (isTypeSchemaForResourceComplexTypeLogical(schema) || schema.identifier.kind === "profile") {
+    if (schema.identifier.kind === "profile") {
+      const constrainedFields = this.getConstrainedFields(schema);
+      for (const fieldName of constrainedFields) {
+        this.collectImportsForField(fieldName, schema);
+      }
+      if (constrainedFields.length > 0) {
+        const baseType = baseInterface?.value || "{}";
+        let fieldsToOmit = constrainedFields;
+        if (isExtension && !fieldsToOmit.includes("url")) {
+          fieldsToOmit = [...constrainedFields, "url"];
+        }
+        const omittedFields = fieldsToOmit.map((field) => `'${field}'`).join(" | ");
+        lines[lines.length - 1] = `export interface ${interfaceName} extends Omit<${baseType}, ${omittedFields}> {`;
+        if (isExtension) {
+          lines.push(`	url: '${schema.identifier.url}';`);
+        }
+        for (const fieldName of constrainedFields) {
+          const fieldLine = this.generateConstrainedProfileField(fieldName, schema);
+          if (fieldLine) {
+            lines.push(`	${fieldLine}`);
+          }
+        }
+      } else if (isExtension) {
+        const baseType = baseInterface?.value || "Extension";
+        lines[lines.length - 1] = `export interface ${interfaceName} extends Omit<${baseType}, 'url'> {`;
+        lines.push(`	url: '${schema.identifier.url}';`);
+      }
+    } else if (isTypeSchemaForResourceComplexTypeLogical(schema)) {
       if (schema.constraints && Object.keys(schema.constraints).length > 0) {
         for (const [path9, constraint] of Object.entries(schema.constraints)) {
           const fieldName = path9.includes(".") ? path9.split(".").pop() : path9;
@@ -5722,15 +5813,13 @@ ${result.content}` : result.content;
           }
         }
       }
-      lines.push("}");
-      if (schema.nested) {
-        for (const nested of schema.nested) {
-          lines.push("");
-          lines.push(this.generateNested(this.currentSchemaName ?? "", nested));
-        }
+    }
+    lines.push("}");
+    if (schema.nested) {
+      for (const nested of schema.nested) {
+        lines.push("");
+        lines.push(this.generateNested(this.currentSchemaName ?? "", nested));
       }
-    } else {
-      lines.push("}");
     }
     return lines.join(`
 `);
@@ -5786,6 +5875,199 @@ ${result.content}` : result.content;
     const arrayType = array ? "[]" : "";
     return `${fieldName}${optional}: ${typeString}${arrayType};`;
   }
+  getConstrainedFields(schema) {
+    const constrainedFields = [];
+    const choiceBaseFields = new Set;
+    if (schema.fields) {
+      const fields = schema.fields;
+      for (const [fieldName, field] of Object.entries(fields)) {
+        if (field.choices && Array.isArray(field.choices)) {
+          choiceBaseFields.add(fieldName);
+        }
+        if (field.choiceOf) {
+          choiceBaseFields.add(field.choiceOf);
+          constrainedFields.push(fieldName);
+        } else if (this.hasSignificantConstraints(field, fieldName, schema)) {
+          constrainedFields.push(fieldName);
+        }
+      }
+    }
+    if (schema.constraints) {
+      const constraints = schema.constraints;
+      for (const [path9, constraint] of Object.entries(constraints)) {
+        const fieldName = path9.includes(".") ? path9.split(".").pop() : path9;
+        if (fieldName && !constrainedFields.includes(fieldName)) {
+          if (this.isSignificantConstraint(constraint)) {
+            constrainedFields.push(fieldName);
+          }
+        }
+      }
+    }
+    for (const choiceBaseField of choiceBaseFields) {
+      if (!constrainedFields.includes(choiceBaseField)) {
+        constrainedFields.push(choiceBaseField);
+      }
+    }
+    return constrainedFields;
+  }
+  hasSignificantConstraints(field, fieldName, schema) {
+    if (field.binding && field.binding.strength && field.binding.valueSet) {
+      return true;
+    }
+    if (field.min !== undefined && field.min > 0) {
+      return true;
+    }
+    if (field.type && Array.isArray(field.type) && field.type.length > 0) {
+      return true;
+    }
+    if (field.choices && Array.isArray(field.choices)) {
+      return true;
+    }
+    if (field.values && Array.isArray(field.values)) {
+      return true;
+    }
+    return false;
+  }
+  isSignificantConstraint(constraint) {
+    if (constraint.min !== undefined && constraint.min > 0) {
+      return true;
+    }
+    if (constraint.type && Array.isArray(constraint.type)) {
+      return true;
+    }
+    if (constraint.binding) {
+      return true;
+    }
+    return false;
+  }
+  generateConstrainedProfileField(fieldName, schema) {
+    const field = schema.fields?.[fieldName];
+    if (!field) {
+      const constraint2 = schema.constraints?.[fieldName];
+      if (constraint2) {
+        return this.generateFieldFromConstraint(fieldName, constraint2, schema);
+      }
+      return null;
+    }
+    if (field.choices && Array.isArray(field.choices)) {
+      return null;
+    }
+    if (field.choiceOf) {
+      return this.generateChoiceInstanceField(fieldName, field, schema);
+    }
+    let required = field.required || false;
+    if (field.min !== undefined && field.min > 0) {
+      required = true;
+    }
+    const constraint = schema.constraints?.[fieldName];
+    if (constraint && constraint.min !== undefined && constraint.min > 0) {
+      required = true;
+    }
+    let typeString = "any";
+    if (field.type) {
+      const typeInfo = this.getType(field.type);
+      typeString = typeInfo.value;
+    }
+    if (field.enum && Array.isArray(field.enum)) {
+      const enumValues = field.enum.map((v) => `'${v}'`).join(" | ");
+      typeString = enumValues;
+    } else if (field.values && Array.isArray(field.values)) {
+      const enumValues = field.values.map((v) => `'${v}'`).join(" | ");
+      typeString = enumValues;
+    }
+    if (field.binding && field.binding.strength === "required" && field.binding.valueSet) {}
+    if (field.type && Array.isArray(field.type)) {
+      const referenceTypes = field.type.filter((t) => t.code === "Reference" && t.targetProfile).map((t) => {
+        const profile = t.targetProfile.split("/").pop();
+        return `'${profile}'`;
+      });
+      if (referenceTypes.length > 0) {
+        typeString = `Reference<${referenceTypes.join(" | ")}>`;
+      }
+    }
+    let array = field.array || false;
+    if (field.max === "*" || constraint && constraint.max === "*") {
+      array = true;
+    }
+    const optional = !required ? "?" : "";
+    const arrayType = array ? "[]" : "";
+    return `${fieldName}${optional}: ${typeString}${arrayType};`;
+  }
+  generateChoiceInstanceField(fieldName, field, schema) {
+    let required = field.required || false;
+    if (field.min !== undefined && field.min > 0) {
+      required = true;
+    }
+    const constraint = schema.constraints?.[fieldName];
+    if (constraint && constraint.min !== undefined && constraint.min > 0) {
+      required = true;
+    }
+    let typeString = "any";
+    if (field.type) {
+      const typeInfo = this.getType(field.type);
+      typeString = typeInfo.value;
+      if (!typeInfo.isPrimitive) {
+        const importPath = this.calculateImportPath(schema, field.type);
+        this.imports.set(typeInfo.value, importPath);
+      }
+    }
+    if (field.enum && Array.isArray(field.enum)) {
+      const enumValues = field.enum.map((v) => `'${v}'`).join(" | ");
+      typeString = enumValues;
+    }
+    if (field.reference && Array.isArray(field.reference)) {
+      typeString = this.buildReferenceType(field.reference);
+    }
+    let array = field.array || false;
+    if (field.max === "*" || constraint && constraint.max === "*") {
+      array = true;
+    }
+    const optional = !required ? "?" : "";
+    const arrayType = array ? "[]" : "";
+    return `${fieldName}${optional}: ${typeString}${arrayType};`;
+  }
+  generateFieldFromConstraint(fieldName, constraint, schema) {
+    let typeString = "any";
+    const required = constraint.min !== undefined && constraint.min > 0;
+    const array = constraint.max === "*";
+    if (constraint.type && Array.isArray(constraint.type)) {
+      const types4 = constraint.type.map((t) => {
+        if (t.code === "Reference" && t.targetProfile) {
+          const profile = t.targetProfile.split("/").pop();
+          return `Reference<'${profile}'>`;
+        }
+        return t.code || t;
+      });
+      typeString = types4.length === 1 ? types4[0] : `(${types4.join(" | ")})`;
+    }
+    const optional = !required ? "?" : "";
+    const arrayType = array ? "[]" : "";
+    return `${fieldName}${optional}: ${typeString}${arrayType};`;
+  }
+  collectImportsForField(fieldName, schema) {
+    const field = schema.fields?.[fieldName];
+    if (!field)
+      return;
+    if (field.type && !field.type.isPrimitive) {
+      const typeInfo = this.getType(field.type);
+      if (!typeInfo.isPrimitive) {
+        const importPath = this.calculateImportPath(schema, field.type);
+        this.imports.set(typeInfo.value, importPath);
+      }
+    }
+    if (field.choices && Array.isArray(field.choices)) {
+      field.choices.forEach((choice) => {
+        const choiceField = schema.fields?.[choice];
+        if (choiceField && choiceField.type) {
+          const typeInfo = this.getType(choiceField.type);
+          if (!typeInfo.isPrimitive) {
+            const importPath = this.calculateImportPath(schema, choiceField.type);
+            this.imports.set(typeInfo.value, importPath);
+          }
+        }
+      });
+    }
+  }
   generateEnumType(fieldName, enumValues, baseName) {
     const prefix = baseName || this.currentSchemaName || "";
     const enumTypeName = `${prefix}${this.toPascalCase(fieldName)}Values`;

package/dist/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomic-ehr/codegen",
-  "version": "0.0.1-canary.20250811235950.67a72a5",
+  "version": "0.0.1-canary.20250812081907.f886676",
   "description": "Code generation tools for FHIR resources and TypeSchema definitions",
   "keywords": [
     "fhir",