@atomic-ehr/codegen 0.0.1-canary.20251110160104.576d657 → 0.0.1-canary.20251112172458.7608c8c

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: [],
@@ -6179,7 +6174,7 @@ var cleanup = async (opts, logger) => {
   }
 };
 var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) => {
-  await afs3.mkdir(outputDir, { recursive: true });
+  await afs2.mkdir(outputDir, { recursive: true });
   logger.info(`Writing TypeSchema files to ${outputDir}/...`);
   const files = {};
   for (const ts of typeSchemas) {
@@ -6190,7 +6185,7 @@ var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) =>
     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);
+    const baseName = Path3.join(outputDir, pkgPath, name);
     if (!files[baseName]) files[baseName] = [];
     if (!files[baseName]?.some((e) => e === json)) {
       files[baseName].push(json);
@@ -6205,26 +6200,26 @@ var writeTypeSchemasToSeparateFiles = async (typeSchemas, outputDir, logger) =>
         } else {
           fullName = `${baseName}-${index}.typeschema.json`;
         }
-        await afs3.mkdir(Path4.dirname(fullName), { recursive: true });
-        await afs3.writeFile(fullName, 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 afs3.mkdir(Path4.dirname(outputFile), { recursive: true });
+  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 afs3.appendFile(outputFile, `${json}
+    await afs2.appendFile(outputFile, `${json}
 `);
   }
 };
 var tryWriteTypeSchema = async (typeSchemas, opts, logger) => {
   if (!opts.typeSchemaOutputDir) return;
   try {
-    if (Path4.extname(opts.typeSchemaOutputDir) === ".ndjson") {
+    if (Path3.extname(opts.typeSchemaOutputDir) === ".ndjson") {
       await writeTypeSchemasToSingleFile(typeSchemas, opts.typeSchemaOutputDir, logger);
     } else {
       await writeTypeSchemasToSeparateFiles(typeSchemas, opts.typeSchemaOutputDir, logger);
@@ -6312,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: "//",
@@ -6320,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({
@@ -6403,7 +6398,7 @@ var APIBuilder = class {
       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, {