@atomic-ehr/codegen 0.0.1-canary.20251007123452.75482df → 0.0.1-canary.20251007145120.703d8ab

package/dist/index.js

@@ -5430,8 +5430,8 @@ var Writer = class extends FileSystemWriter {
   }
   disclaimer() {
     return [
-      "WARNING: This file is autogenerated by FHIR Schema Codegen.",
-      "https://github.com/fhir-schema/fhir-schema-codegen",
+      "WARNING: This file is autogenerated by @atomic-ehr/codegen.",
+      "GitHub: https://github.com/orgs/atomic-ehr/repositories",
       "Any manual changes made to this file may be overwritten."
     ];
   }
@@ -5532,76 +5532,62 @@ var primitiveType2tsType = {
   id: "string",
   xhtml: "string"
 };
+var tsFhirPackageDir = (name) => {
+  return kebabCase(name);
+};
+var tsModuleName = (id) => {
+  return pascalCase(id.name);
+};
+var tsModuleFileName = (id) => {
+  return `${tsModuleName(id)}.ts`;
+};
 var canonicalToName = (canonical, dropFragment = true) => {
   if (!canonical) return void 0;
   let localName = canonical.split("/").pop();
-  if (dropFragment && localName?.includes("#")) {
+  if (!localName) return void 0;
+  if (dropFragment && localName.includes("#")) {
     localName = localName.split("#")[0];
   }
-  if (/^\d/.test(localName ?? "")) {
+  if (!localName) return void 0;
+  if (/^\d/.test(localName)) {
     localName = `number_${localName}`;
   }
-  return localName?.replace(/[- ]/g, "_");
-};
-var tsBaseFileName = (id) => {
-  return pascalCase(id.name);
+  return normalizeTsName(localName);
 };
-var tsFileName = (id) => {
-  return `${tsBaseFileName(id)}.ts`;
+var tsResourceName = (id) => {
+  if (id.kind === "nested") {
+    const url = id.url;
+    const path = canonicalToName(url, false);
+    if (!path) return "";
+    const [resourceName, fragment] = path.split("#");
+    const name = uppercaseFirstLetterOfEach((fragment ?? "").split(".")).join("");
+    return normalizeTsName([resourceName, name].join(""));
+  }
+  return normalizeTsName(id.name);
 };
-var normalizeName = (n) => {
-  if (n === "extends") {
-    return "extends_";
-  }
+var tsFieldName = (n) => normalizeTsName(n);
+var normalizeTsName = (n) => {
   return n.replace(/[- ]/g, "_");
 };
-var resourceName = (id) => {
-  return normalizeName(id.name);
-};
-var deriveNestedSchemaName = (url) => {
-  const path = canonicalToName(url, false);
-  if (!path) {
-    return "";
-  }
-  const [resourceName2, fragment] = path.split("#");
-  const name = uppercaseFirstLetterOfEach((fragment ?? "").split(".")).join("");
-  return [resourceName2, name].join("");
-};
 var TypeScript = class extends Writer {
   resourceRelatives = [];
-  tsImport(tsPackageName, ...entities) {
-    this.lineSM(`import { ${entities.join(", ")} } from '${tsPackageName}'`);
+  tsImportType(tsPackageName, ...entities) {
+    this.lineSM(`import type { ${entities.join(", ")} } from '${tsPackageName}'`);
   }
   generateFhirPackageIndexFile(schemas) {
     this.cat("index.ts", () => {
       let exports = schemas.map((schema) => ({
         identifier: schema.identifier,
-        tsPackageName: tsBaseFileName(schema.identifier),
-        resourceName: resourceName(schema.identifier)
+        tsPackageName: tsModuleName(schema.identifier),
+        resourceName: tsResourceName(schema.identifier)
       })).sort((a, b) => a.resourceName.localeCompare(b.resourceName));
       exports = Array.from(new Map(exports.map((exp) => [exp.resourceName.toLowerCase(), exp])).values()).sort(
         (a, b) => a.resourceName.localeCompare(b.resourceName)
       );
       for (const exp of exports) {
         this.debugComment(exp.identifier);
-        this.tsImport(`./${exp.tsPackageName}`, exp.resourceName);
-      }
-      this.lineSM(`export { ${exports.map((e) => e.resourceName).join(", ")} }`);
-      this.line("");
-      this.curlyBlock(["export type ResourceTypeMap = "], () => {
-        this.lineSM("User: Record<string, any>");
-        exports.forEach((exp) => {
-          this.debugComment(exp.identifier);
-          this.lineSM(`${exp.resourceName}: ${exp.resourceName}`);
-        });
-      });
-      this.lineSM("export type ResourceType = keyof ResourceTypeMap");
-      this.squareBlock(["export const resourceList: readonly ResourceType[] = "], () => {
-        exports.forEach((exp) => {
-          this.debugComment(exp.identifier);
-          this.line(`'${exp.resourceName}', `);
-        });
-      });
+        this.lineSM(`export type { ${exp.resourceName} } from './${exp.tsPackageName}'`);
+      }
     });
   }
   generateDependenciesImports(schema) {
@@ -5613,17 +5599,30 @@ var TypeScript = class extends Writer {
         })),
         ...schema.dependencies.filter((dep) => ["nested"].includes(dep.kind)).map((dep) => ({
           tsPackage: `../${kebabCase(dep.package)}/${pascalCase(canonicalToName(dep.url) ?? "")}`,
-          name: deriveNestedSchemaName(dep.url)
+          name: tsResourceName(dep)
         }))
       ].sort((a, b) => a.name.localeCompare(b.name));
       for (const dep of deps) {
-        this.tsImport(dep.tsPackage, dep.name);
+        this.tsImportType(dep.tsPackage, dep.name);
       }
+      this.line();
+    }
+  }
+  generateComplexTypeReexports(schema) {
+    const complexTypeDeps = schema.dependencies?.filter((dep) => ["complex-type"].includes(dep.kind)).map((dep) => ({
+      tsPackage: `../${kebabCase(dep.package)}/${pascalCase(dep.name)}`,
+      name: uppercaseFirstLetter(dep.name)
+    }));
+    if (complexTypeDeps && complexTypeDeps.length > 0) {
+      for (const dep of complexTypeDeps) {
+        this.lineSM(`export type { ${dep.name} }from '${dep.tsPackage}';`);
+      }
+      this.line();
     }
   }
   addFieldExtension(fieldName, field) {
     if (field.type.kind === "primitive-type") {
-      this.lineSM(`_${normalizeName(fieldName)}?: Element`);
+      this.lineSM(`_${tsFieldName(fieldName)}?: Element`);
     }
   }
   generateType(schema) {
@@ -5631,17 +5630,15 @@ var TypeScript = class extends Writer {
     if (schema.identifier.name === "Reference") {
       name = "Reference<T extends string = string>";
     } else if (schema.identifier.kind === "nested") {
-      name = normalizeName(deriveNestedSchemaName(schema.identifier.url));
+      name = tsResourceName(schema.identifier);
     } else {
-      name = normalizeName(schema.identifier.name);
+      name = tsResourceName(schema.identifier);
     }
     const parent = canonicalToName(schema.base?.url);
     const extendsClause = parent && `extends ${parent}`;
     this.debugComment(schema.identifier);
     this.curlyBlock(["export", "interface", name, extendsClause], () => {
-      if (!schema.fields) {
-        return;
-      }
+      if (!schema.fields) return;
       if (schema.identifier.kind === "resource") {
         const possibleResourceTypes = [schema.identifier];
         possibleResourceTypes.push(...resourceChildren(this.resourceRelatives, schema.identifier));
@@ -5653,7 +5650,7 @@ var TypeScript = class extends Writer {
         const field = notChoiceDeclaration(anyField);
         if (field === void 0) continue;
         this.debugComment(fieldName, ":", field);
-        const fieldNameFixed = normalizeName(fieldName);
+        const fieldNameFixed = tsFieldName(fieldName);
         const optionalSymbol = field.required ? "" : "?";
         const arraySymbol = field.array ? "[]" : "";
         if (field.type === void 0) {
@@ -5661,7 +5658,7 @@ var TypeScript = class extends Writer {
         }
         let type = field.type.name;
         if (field.type.kind === "nested") {
-          type = deriveNestedSchemaName(field.type.url);
+          type = tsResourceName(field.type);
         }
         if (field.type.kind === "primitive-type") {
           type = primitiveType2tsType[field.type.name] ?? "string";
@@ -5693,11 +5690,11 @@ var TypeScript = class extends Writer {
     }
   }
   generateResourceModule(schema) {
-    this.cat(`${tsFileName(schema.identifier)}`, () => {
+    this.cat(`${tsModuleFileName(schema.identifier)}`, () => {
       this.generateDisclaimer();
       if (["complex-type", "resource", "logical", "nested"].includes(schema.identifier.kind)) {
         this.generateDependenciesImports(schema);
-        this.line();
+        this.generateComplexTypeReexports(schema);
         this.generateNestedTypes(schema);
         this.generateType(schema);
       } else {
@@ -5706,18 +5703,18 @@ var TypeScript = class extends Writer {
     });
   }
   generate(schemas) {
-    this.resourceRelatives = resourceRelatives(schemas);
     const typesToGenerate = [
       ...collectComplexTypes(schemas),
       ...collectResources(schemas)
       // ...collectLogicalModels(typeSchemas),
       // ...collectProfiles(typeSchemas),
     ];
+    this.resourceRelatives = resourceRelatives(typesToGenerate);
     const grouped = groupByPackages(typesToGenerate);
     this.cd("/", () => {
       for (const [packageName, packageSchemas] of Object.entries(grouped)) {
-        const tsPackageName = kebabCase(packageName);
-        this.cd(tsPackageName, () => {
+        const tsPackageDir = tsFhirPackageDir(packageName);
+        this.cd(tsPackageDir, () => {
           for (const schema of packageSchemas) {
             this.generateResourceModule(schema);
           }