@atomic-ehr/codegen 0.0.1-canary.20251110140511.b3e2283 → 0.0.1-canary.20251112172458.7608c8c

package/dist/index.d.ts

@@ -883,10 +883,6 @@ declare class APIBuilder {
     writeTypeTree(filename: string): this;
     treeShake(tree: TreeShake): this;
     writeTypeSchemas(target: string): this;
-    private writeTypeSchemasToSeparateFiles;
-    private writeTypeSchemasToSingleFile;
-    private tryWriteTypeSchema;
-    cleanup(): Promise<void>;
     generate(): Promise<GenerationResult>;
     /**
      * Generate and return the results without writing to files
@@ -912,29 +908,10 @@ declare class APIBuilder {
     private loadFromFiles;
     private executeGenerators;
 }
-/**
- * Create a new API builder instance
- */
-declare function createAPI(options?: APIBuilderOptions): APIBuilder;
 /**
  * Create an API builder instance from a configuration object
  */
 declare function createAPIFromConfig(config: Config): APIBuilder;
-/**
- * Convenience function for quick TypeScript generation from a package
- */
-declare function generateTypesFromPackage(packageName: string, outputDir: string, options?: {
-    version?: string;
-    verbose?: boolean;
-    validate?: boolean;
-}): Promise<GenerationResult>;
-/**
- * Convenience function for quick TypeScript generation from files
- */
-declare function generateTypesFromFiles(inputFiles: string[], outputDir: string, options?: {
-    verbose?: boolean;
-    validate?: boolean;
-}): Promise<GenerationResult>;
 
 /**
  * Core types and interfaces for the base generator system
@@ -2220,4 +2197,4 @@ declare class TypeScriptGenerator extends BaseGenerator<TypeScriptGeneratorOptio
     private generateMainIndexFile;
 }
 
-export { APIBuilder, type APIBuilderOptions, CONFIG_FILE_NAMES, type Config, ConfigLoader, type ConfigValidationError, type ConfigValidationResult, ConfigValidator, DEFAULT_CONFIG, type GeneratedFile, type GenerationResult, type PackageMeta as PackageInfo, type ProgressCallback$1 as ProgressCallback, type TypeSchema, TypeSchemaCache, type TypeSchemaConfig, type Field as TypeSchemaField, TypeSchemaGenerator, type Identifier as TypeSchemaIdentifier, TypeSchemaParser, TypeScriptGenerator, type TypeScriptGeneratorConfig, type TypeScriptGeneratorOptions, configLoader, createAPI, createAPIFromConfig, defineConfig, generateTypesFromFiles, generateTypesFromPackage, isConfig, loadConfig };
+export { APIBuilder, type APIBuilderOptions, CONFIG_FILE_NAMES, type Config, ConfigLoader, type ConfigValidationError, type ConfigValidationResult, ConfigValidator, DEFAULT_CONFIG, type GeneratedFile, type GenerationResult, type PackageMeta as PackageInfo, type ProgressCallback$1 as ProgressCallback, type TypeSchema, TypeSchemaCache, type TypeSchemaConfig, type Field as TypeSchemaField, TypeSchemaGenerator, type Identifier as TypeSchemaIdentifier, TypeSchemaParser, TypeScriptGenerator, type TypeScriptGeneratorConfig, type TypeScriptGeneratorOptions, configLoader, createAPIFromConfig, defineConfig, isConfig, loadConfig };

package/dist/index.js

@@ -1,9 +1,9 @@
 import * as fs from 'fs';
 import fs__default, { existsSync, mkdirSync } from 'fs';
-import * as afs3 from 'fs/promises';
+import * as afs2 from 'fs/promises';
 import { readdir, stat, unlink, readFile, writeFile, access, mkdir, rm } from 'fs/promises';
-import * as Path4 from 'path';
-import Path4__default, { join, resolve, dirname, relative } from 'path';
+import * as Path3 from 'path';
+import Path3__default, { join, resolve, dirname, relative } from 'path';
 import { CanonicalManager } from '@atomic-ehr/fhir-canonical-manager';
 import * as fhirschema from '@atomic-ehr/fhirschema';
 import { isStructureDefinition } from '@atomic-ehr/fhirschema';
@@ -2327,13 +2327,8 @@ new CodegenLogger();
 function createLogger(options = {}) {
   return new CodegenLogger(options);
 }
-var readPackageJSON = async (workDir, packageMeta) => {
-  const packageJSONFileName = Path4.join(workDir, "node_modules", packageMeta.name, "package.json");
-  const packageJSON = JSON.parse(await afs3.readFile(packageJSONFileName, "utf8"));
-  return packageJSON;
-};
-var readPackageDependencies = async (workDir, packageMeta) => {
-  const packageJSON = await readPackageJSON(workDir, packageMeta);
+var readPackageDependencies = async (manager, packageMeta) => {
+  const packageJSON = await manager.packageJson(packageMeta.name);
   const dependencies = packageJSON.dependencies;
   if (dependencies !== void 0) {
     return Object.entries(dependencies).map(([name, version]) => {
@@ -2363,7 +2358,7 @@ var mkPackageAwareResolver = async (manager, pkg, deep, acc, logger) => {
     if (index.canonicalResolution[url]) logger?.dry_warn(`Duplicate canonical URL: ${url} at ${pkgId}.`);
     index.canonicalResolution[url] = [{ deep, pkg, pkgId, resource }];
   }
-  const deps = await readPackageDependencies("tmp/fhir", pkg);
+  const deps = await readPackageDependencies(manager, pkg);
   for (const depPkg of deps) {
     const { canonicalResolution } = await mkPackageAwareResolver(manager, depPkg, deep + 1, acc, logger);
     for (const [surl, resolutions] of Object.entries(canonicalResolution)) {
@@ -3042,7 +3037,7 @@ var FileSystemWriter = class {
   }
   cd(path, gen) {
     const prev = this.currentDir;
-    this.currentDir = path.startsWith("/") ? Path4.join(this.opts.outputDir, path) : Path4.join(this.currentDir, path);
+    this.currentDir = path.startsWith("/") ? Path3.join(this.opts.outputDir, path) : Path3.join(this.currentDir, path);
     if (!fs.existsSync(this.currentDir)) {
       fs.mkdirSync(this.currentDir, { recursive: true });
     }
@@ -3467,12 +3462,12 @@ var CSharp = class extends Writer {
   }
   copyStaticFiles() {
     if (!this.staticSourceDir) return;
-    const sourcePath = Path4__default.resolve(this.staticSourceDir);
+    const sourcePath = Path3__default.resolve(this.staticSourceDir);
     fs__default.cpSync(sourcePath, this.opts.outputDir, { recursive: true });
   }
   generateHelperFile() {
     const sourceFile = "src/api/writer-generator/csharp/Helper.cs";
-    const destFile = Path4__default.join(this.opts.outputDir, "Helper.cs");
+    const destFile = Path3__default.join(this.opts.outputDir, "Helper.cs");
     fs__default.copyFileSync(sourceFile, destFile);
   }
 };
@@ -3691,7 +3686,7 @@ var mkTypeSchemaIndex = (schemas, logger) => {
       }
     }
     const raw = filename.endsWith(".yaml") ? YAML.stringify(tree) : JSON.stringify(tree, void 0, 2);
-    await afs3.writeFile(filename, raw);
+    await afs2.writeFile(filename, raw);
   };
   return {
     _schemaIndex: index,
@@ -6132,7 +6127,7 @@ var writerToGenerator = (writerGen) => {
   const getGeneratedFiles = () => {
     return writerGen.writtenFiles().map((fn) => {
       return {
-        path: Path4.normalize(Path4.join(writerGen.opts.outputDir, fn)),
+        path: Path3.normalize(Path3.join(writerGen.opts.outputDir, fn)),
         filename: fn.replace(/^.*[\\/]/, ""),
         content: "",
         exports: [],
@@ -6155,6 +6150,86 @@ var normalizeFileName = (str) => {
   if (res.length === 0) return "unknown";
   return res;
 };
+var cleanup = async (opts, logger) => {
+  logger.info(`Cleaning outputs...`);
+  try {
+    logger.info(`Clean ${opts.outputDir}`);
+    fs.rmSync(opts.outputDir, { recursive: true, force: true });
+    if (opts.typeSchemaOutputDir) {
+      logger.info(`Clean ${opts.typeSchemaOutputDir}`);
+      fs.rmSync(opts.typeSchemaOutputDir, {
+        recursive: true,
+        force: true
+      });
+    }
+    if (opts.exportTypeTree) {
+      logger.info(`Clean ${opts.exportTypeTree}`);
+      fs.rmSync(opts.exportTypeTree, {
+        recursive: true,
+        force: true
+      });
+    }
+  } catch (error) {
+    logger.warn(`Error cleaning output directory: ${error instanceof Error ? error.message : String(error)}`);
+  }
+};
+var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) => {
+  await afs2.mkdir(outputDir, { recursive: true });
+  logger.info(`Writing TypeSchema files to ${outputDir}/...`);
+  const files = {};
+  for (const ts of typeSchemas) {
+    const pkg = {
+      name: ts.identifier.package,
+      version: ts.identifier.version
+    };
+    const pkgPath = normalizeFileName(packageMetaToFhir(pkg));
+    const name = normalizeFileName(`${ts.identifier.name}(${extractNameFromCanonical(ts.identifier.url)})`);
+    const json = JSON.stringify(ts, null, 2);
+    const baseName = Path3.join(outputDir, pkgPath, name);
+    if (!files[baseName]) files[baseName] = [];
+    if (!files[baseName]?.some((e) => e === json)) {
+      files[baseName].push(json);
+    }
+  }
+  for (const [baseName, jsons] of Object.entries(files)) {
+    await Promise.all(
+      jsons.map(async (json, index) => {
+        let fullName;
+        if (index === 0) {
+          fullName = `${baseName}.typeschema.json`;
+        } else {
+          fullName = `${baseName}-${index}.typeschema.json`;
+        }
+        await afs2.mkdir(Path3.dirname(fullName), { recursive: true });
+        await afs2.writeFile(fullName, json);
+      })
+    );
+  }
+};
+var writeTypeSchemasToSingleFile = async (typeSchemas, outputFile, logger) => {
+  logger.info(`Writing TypeSchema files to: ${outputFile}`);
+  await afs2.mkdir(Path3.dirname(outputFile), { recursive: true });
+  logger.info(`Writing TypeSchemas to one file ${outputFile}...`);
+  for (const ts of typeSchemas) {
+    const json = JSON.stringify(ts, null, 2);
+    await afs2.appendFile(outputFile, `${json}
+`);
+  }
+};
+var tryWriteTypeSchema = async (typeSchemas, opts, logger) => {
+  if (!opts.typeSchemaOutputDir) return;
+  try {
+    if (Path3.extname(opts.typeSchemaOutputDir) === ".ndjson") {
+      await writeTypeSchemasToSingleFile(typeSchemas, opts.typeSchemaOutputDir, logger);
+    } else {
+      await writeTypeSchemasToSeparateFiles(typeSchemas, opts.typeSchemaOutputDir, logger);
+    }
+    logger.info(`Writing TypeSchema - DONE`);
+  } catch (error) {
+    logger.error("Failed to write TypeSchema output", error instanceof Error ? error : new Error(String(error)));
+    if (opts.throwException) throw error;
+  }
+};
 var APIBuilder = class {
   schemas = [];
   options;
@@ -6190,7 +6265,8 @@ var APIBuilder = class {
     }
   }
   fromPackage(packageName, version) {
-    this.packages.push(packageMetaToNpm({ name: packageName, version: version || "latest" }));
+    const pkg = packageMetaToNpm({ name: packageName, version: version || "latest" });
+    this.packages.push(pkg);
     return this;
   }
   fromFiles(...filePaths) {
@@ -6231,7 +6307,7 @@ var APIBuilder = class {
   }
   typescript(opts) {
     const writerOpts = {
-      outputDir: Path4.join(this.options.outputDir, "/types"),
+      outputDir: Path3.join(this.options.outputDir, "/types"),
       tabSize: 4,
       withDebugComment: false,
       commentLinePrefix: "//",
@@ -6239,14 +6315,14 @@ var APIBuilder = class {
     };
     const effectiveOpts = { logger: this.logger, ...writerOpts, ...opts };
     const generator = writerToGenerator(new TypeScript(effectiveOpts));
-    this.generators.set("typescript2", generator);
-    this.logger.debug(`Configured TypeScript2 generator (${JSON.stringify(effectiveOpts, void 0, 2)})`);
+    this.generators.set("typescript", generator);
+    this.logger.debug(`Configured TypeScript generator (${JSON.stringify(effectiveOpts, void 0, 2)})`);
     return this;
   }
   csharp(namespace, staticSourceDir) {
     const generator = writerToGenerator(
       new CSharp({
-        outputDir: Path4.join(this.options.outputDir, "/types"),
+        outputDir: Path3.join(this.options.outputDir, "/types"),
         staticSourceDir: staticSourceDir ?? void 0,
         targetNamespace: namespace,
         logger: new CodegenLogger({
@@ -6306,92 +6382,6 @@ var APIBuilder = class {
     this.options.typeSchemaOutputDir = target;
     return this;
   }
-  async writeTypeSchemasToSeparateFiles(typeSchemas, outputDir) {
-    await afs3.mkdir(outputDir, { recursive: true });
-    this.logger.info(`Writing TypeSchema files to ${outputDir}/...`);
-    const files = {};
-    for (const ts of typeSchemas) {
-      const pkg = {
-        name: ts.identifier.package,
-        version: ts.identifier.version
-      };
-      const pkgPath = normalizeFileName(packageMetaToFhir(pkg));
-      const name = normalizeFileName(`${ts.identifier.name}(${extractNameFromCanonical(ts.identifier.url)})`);
-      const json = JSON.stringify(ts, null, 2);
-      const baseName = Path4.join(outputDir, pkgPath, name);
-      if (!files[baseName]) files[baseName] = [];
-      if (!files[baseName]?.some((e) => e === json)) {
-        files[baseName].push(json);
-      }
-    }
-    for (const [baseName, jsons] of Object.entries(files)) {
-      await Promise.all(
-        jsons.map(async (json, index) => {
-          let fullName;
-          if (index === 0) {
-            fullName = `${baseName}.typeschema.json`;
-          } else {
-            fullName = `${baseName}-${index}.typeschema.json`;
-          }
-          await afs3.mkdir(Path4.dirname(fullName), { recursive: true });
-          await afs3.writeFile(fullName, json);
-        })
-      );
-    }
-  }
-  async writeTypeSchemasToSingleFile(typeSchemas, outputFile) {
-    this.logger.info(`Writing TypeSchema files to: ${outputFile}`);
-    if (this.options.cleanOutput && fs.existsSync(outputFile)) fs.rmSync(outputFile);
-    await afs3.mkdir(Path4.dirname(outputFile), { recursive: true });
-    this.logger.info(`Writing TypeSchemas to one file ${outputFile}...`);
-    for (const ts of typeSchemas) {
-      const json = JSON.stringify(ts, null, 2);
-      await afs3.appendFile(outputFile, `${json}
-`);
-    }
-  }
-  async tryWriteTypeSchema(typeSchemas) {
-    if (!this.options.typeSchemaOutputDir) return;
-    try {
-      if (Path4.extname(this.options.typeSchemaOutputDir) === ".ndjson") {
-        await this.writeTypeSchemasToSingleFile(typeSchemas, this.options.typeSchemaOutputDir);
-      } else {
-        await this.writeTypeSchemasToSeparateFiles(typeSchemas, this.options.typeSchemaOutputDir);
-      }
-      this.logger.info(`Writing TypeSchema - DONE`);
-    } catch (error) {
-      this.logger.error(
-        "Failed to write TypeSchema output",
-        error instanceof Error ? error : new Error(String(error))
-      );
-      if (this.options.throwException) throw error;
-    }
-  }
-  async cleanup() {
-    this.logger.info(`Cleaning outputs...`);
-    try {
-      this.logger.info(`Clean ${this.options.outputDir}`);
-      fs.rmSync(this.options.outputDir, { recursive: true, force: true });
-      if (this.options.typeSchemaOutputDir) {
-        this.logger.info(`Clean ${this.options.typeSchemaOutputDir}`);
-        fs.rmSync(this.options.typeSchemaOutputDir, {
-          recursive: true,
-          force: true
-        });
-      }
-      if (this.options.exportTypeTree) {
-        this.logger.info(`Clean ${this.options.exportTypeTree}`);
-        fs.rmSync(this.options.exportTypeTree, {
-          recursive: true,
-          force: true
-        });
-      }
-    } catch (error) {
-      this.logger.warn(
-        `Error cleaning output directory: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
   async generate() {
     const startTime = performance.now();
     const result = {
@@ -6404,11 +6394,11 @@ var APIBuilder = class {
     };
     this.logger.debug(`Starting generation with ${this.generators.size} generators`);
     try {
-      if (this.options.cleanOutput) this.cleanup();
+      if (this.options.cleanOutput) cleanup(this.options, this.logger);
       this.logger.info("Initialize Canonical Manager");
       const manager = CanonicalManager({
         packages: this.packages,
-        workingDir: "tmp/fhir"
+        workingDir: ".codegen-cache/canonical-manager-cache"
       });
       await manager.init();
       const register = await registerFromManager(manager, {
@@ -6416,7 +6406,7 @@ var APIBuilder = class {
         focusedPackages: this.packages.map(npmToPackageMeta)
       });
       const typeSchemas = await generateTypeSchemas(register, this.logger);
-      await this.tryWriteTypeSchema(typeSchemas);
+      await tryWriteTypeSchema(typeSchemas, this.options, this.logger);
       let tsIndex = mkTypeSchemaIndex(typeSchemas, this.logger);
       if (this.options.treeShake) tsIndex = treeShake(tsIndex, this.options.treeShake, this.logger);
       if (this.options.exportTypeTree) await tsIndex.exportTree(this.options.exportTypeTree);
@@ -6508,9 +6498,6 @@ var APIBuilder = class {
     }
   }
 };
-function createAPI(options) {
-  return new APIBuilder(options);
-}
 function createAPIFromConfig(config) {
   const builder = new APIBuilder({
     outputDir: config.outputDir,
@@ -6533,18 +6520,6 @@ function createAPIFromConfig(config) {
   }
   return builder;
 }
-async function generateTypesFromPackage(packageName, outputDir, options = {}) {
-  return createAPI({
-    outputDir,
-    verbose: options.verbose
-  }).fromPackage(packageName, options.version).typescriptDepricated().generate();
-}
-async function generateTypesFromFiles(inputFiles, outputDir, options = {}) {
-  return createAPI({
-    outputDir,
-    verbose: options.verbose
-  }).fromFiles(...inputFiles).typescriptDepricated().generate();
-}
 var DEFAULT_CONFIG = {
   outputDir: "./generated",
   verbose: false,
@@ -7057,6 +7032,6 @@ function defineConfig(config) {
   return config;
 }
 
-export { APIBuilder, CONFIG_FILE_NAMES, ConfigLoader, ConfigValidator, DEFAULT_CONFIG, TypeSchemaCache, TypeSchemaGenerator, TypeSchemaParser, TypeScriptGenerator, configLoader, createAPI, createAPIFromConfig, defineConfig, generateTypesFromFiles, generateTypesFromPackage, isConfig, loadConfig };
+export { APIBuilder, CONFIG_FILE_NAMES, ConfigLoader, ConfigValidator, DEFAULT_CONFIG, TypeSchemaCache, TypeSchemaGenerator, TypeSchemaParser, TypeScriptGenerator, configLoader, createAPIFromConfig, defineConfig, isConfig, loadConfig };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map