adorn-api 1.0.16 → 1.0.18

package/dist/cli/progress.d.ts

@@ -90,11 +90,26 @@ export declare class Spinner {
     private frames;
     private interval?;
     private message;
+    private current;
+    private total;
+    private customStatus?;
     constructor(message?: string);
     /**
      * Start the spinner.
      */
     start(): void;
+    /**
+     * Set progress counters.
+     */
+    setProgress(current: number, total: number): void;
+    /**
+     * Set a custom status message (overrides counters).
+     */
+    setStatus(status: string): void;
+    /**
+     * Clear the custom status message.
+     */
+    clearStatus(): void;
     /**
      * Stop the spinner with a completion message.
      */

package/dist/cli/progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,WAAW,CAAa;gBAEpB,OAAO,GAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAO;IAMhE;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAYhD;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAcnD;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAY/C;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAOjC;;OAEG;IACH,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAK1B;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM7B;;OAEG;IACH,eAAe,IAAI,MAAM;IAIzB;;OAEG;IACH,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAW3D;;OAEG;IACH,SAAS,IAAI,aAAa,EAAE;IAI5B;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IA+B1C;;OAEG;IACH,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI;CAWxE;AAED;;GAEG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,GAAE,MAAW;IAIhC;;OAEG;IACH,KAAK,IAAI,IAAI;IASb;;OAEG;IACH,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI;IAYrC;;OAEG;IACH,IAAI,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI;CAMnC"}
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../src/cli/progress.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,WAAW,CAAa;gBAEpB,OAAO,GAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAO;IAMhE;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAYhD;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAgBnD;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAY/C;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAOjC;;OAEG;IACH,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAK1B;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM7B;;OAEG;IACH,eAAe,IAAI,MAAM;IAIzB;;OAEG;IACH,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAW3D;;OAEG;IACH,SAAS,IAAI,aAAa,EAAE;IAI5B;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IA6B1C;;OAEG;IACH,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI;CAWxE;AAED;;GAEG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,YAAY,CAAC,CAAS;gBAElB,OAAO,GAAE,MAAW;IAIhC;;OAEG;IACH,KAAK,IAAI,IAAI;IAoBb;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKjD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAU/B;;OAEG;IACH,WAAW,IAAI,IAAI;IAInB;;OAEG;IACH,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI;IAgBrC;;OAEG;IACH,IAAI,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI;CAMnC"}

package/dist/cli.cjs

@@ -26,6 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // src/cli.ts
 var import_node_fs6 = require("fs");
 var import_node_path6 = require("path");
+var import_node_url = require("url");
 
 // src/compiler/runner/createProgram.ts
 var import_typescript = __toESM(require("typescript"), 1);
@@ -994,7 +995,7 @@ function handleMetalOrmWrapper(type, ctx) {
         required: ["id"]
       };
       if (wrapperName === "ManyToManyCollection" && typeArgs?.[1]) {
-        wrapperRel.pivot = typeArgs[1];
+        wrapperRel.pivot = ctx.checker.typeToString(typeArgs[1]);
       }
       return {
         type: "array",
@@ -1004,7 +1005,7 @@ function handleMetalOrmWrapper(type, ctx) {
     }
     const items = targetType ? typeToJsonSchema(targetType, ctx) : {};
     if (wrapperName === "ManyToManyCollection" && typeArgs?.[1]) {
-      wrapperRel.pivot = typeArgs[1];
+      wrapperRel.pivot = ctx.checker.typeToString(typeArgs[1]);
     }
     return {
       type: "array",
@@ -1590,7 +1591,12 @@ function generateOpenAPI(controllers, checker, options = {}) {
     mode: "response"
   };
   const paths = {};
-  for (const controller of controllers) {
+  const { onProgress } = options;
+  for (let i = 0; i < controllers.length; i++) {
+    const controller = controllers[i];
+    if (onProgress) {
+      onProgress(`Processing controller ${controller.className}`, i + 1, controllers.length);
+    }
     for (const operation of controller.operations) {
       const fullPath = convertToOpenApiPath(controller.basePath, operation.path);
       if (!paths[fullPath]) {
@@ -1601,6 +1607,9 @@ function generateOpenAPI(controllers, checker, options = {}) {
     }
   }
   const schemas = Object.fromEntries(components);
+  if (onProgress) {
+    onProgress("Generating and cleaning schemas", controllers.length, controllers.length);
+  }
   cleanupMetalOrmWrappers(schemas, paths);
   return {
     openapi: "3.1.0",
@@ -2390,7 +2399,7 @@ var ProgressTracker = class {
     }
     if (!this.quiet) {
       const elapsed = phase ? this.formatElapsed(phase.startTime, phase.endTime) : "";
-      const status = this.verbose ? `\u2713 ${message || name} ${elapsed}` : `\u2713 ${message || name}`;
+      const status = this.verbose ? `\u2713 ${message || name} ${elapsed}` : `\u2713 ${message || name} ${elapsed}`;
       this.log(status);
     }
   }
@@ -2462,7 +2471,6 @@ var ProgressTracker = class {
    */
   printSummary(stats) {
     if (this.quiet) return;
-    const totalTime = this.getTotalElapsed();
     this.log("");
     this.log("Build Summary:");
     this.log(`  Controllers:     ${stats.controllers}`);
@@ -2499,6 +2507,9 @@ var Spinner = class {
   frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u28B0", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   interval;
   message;
+  current = 0;
+  total = 0;
+  customStatus;
   constructor(message = "") {
     this.message = message;
   }
@@ -2509,10 +2520,45 @@ var Spinner = class {
     let frameIndex = 0;
     this.interval = setInterval(() => {
       const frame = this.frames[frameIndex];
-      import_node_process.default.stdout.write(`\r${frame} ${this.message}`);
+      let output;
+      if (this.customStatus) {
+        output = `\r${frame} ${this.customStatus}`;
+      } else if (this.total > 0) {
+        output = `\r${frame} ${this.message} (${this.current}/${this.total})`;
+      } else {
+        output = `\r${frame} ${this.message}`;
+      }
+      import_node_process.default.stdout.write(output);
+      if (import_node_process.default.stdout.writable) {
+        import_node_process.default.stdout.write("");
+      }
       frameIndex = (frameIndex + 1) % this.frames.length;
     }, 80);
   }
+  /**
+   * Set progress counters.
+   */
+  setProgress(current, total) {
+    this.current = current;
+    this.total = total;
+  }
+  /**
+   * Set a custom status message (overrides counters).
+   */
+  setStatus(status) {
+    this.customStatus = status;
+    const frame = this.frames[this.current];
+    import_node_process.default.stdout.write(`\r${frame} ${status}`);
+    if (import_node_process.default.stdout.writable) {
+      import_node_process.default.stdout.write("");
+    }
+  }
+  /**
+   * Clear the custom status message.
+   */
+  clearStatus() {
+    this.customStatus = void 0;
+  }
   /**
    * Stop the spinner with a completion message.
    */
@@ -2521,10 +2567,13 @@ var Spinner = class {
       clearInterval(this.interval);
       this.interval = void 0;
     }
-    import_node_process.default.stdout.write("\r" + " ".repeat(50) + "\r");
+    import_node_process.default.stdout.write("\r" + " ".repeat(60) + "\r");
     if (completedMessage) {
       import_node_process.default.stdout.write(completedMessage + "\n");
     }
+    if (import_node_process.default.stdout.writable) {
+      import_node_process.default.stdout.write("");
+    }
   }
   /**
    * Stop the spinner with a failure message.
@@ -2919,12 +2968,17 @@ function generateModularOpenAPI(openapi, partitioning, config) {
     outputDir,
     schemasDir = "schemas",
     createIndexFile = true,
-    prettyPrint = true
+    prettyPrint = true,
+    onProgress
   } = config;
   const indent = prettyPrint ? 2 : 0;
   let totalSize = 0;
   const schemaFiles = [];
+  (0, import_node_fs5.mkdirSync)(outputDir, { recursive: true });
   if (!partitioning.shouldSplit || partitioning.groups.length === 1) {
+    if (onProgress) {
+      onProgress("Writing single OpenAPI file", 1, 1);
+    }
     const mainPath2 = (0, import_node_path5.resolve)(outputDir, "openapi.json");
     (0, import_node_fs5.writeFileSync)(mainPath2, JSON.stringify(openapi, null, indent));
     totalSize = Buffer.byteLength(JSON.stringify(openapi));
@@ -2937,9 +2991,16 @@ function generateModularOpenAPI(openapi, partitioning, config) {
   }
   const schemasPath = (0, import_node_path5.resolve)(outputDir, schemasDir);
   (0, import_node_fs5.mkdirSync)(schemasPath, { recursive: true });
+  if (onProgress) {
+    onProgress("Creating schemas directory", 0, partitioning.groups.length + 2);
+  }
   const schemaMap = collectAllSchemas(partitioning.groups);
   const schemaToFile = /* @__PURE__ */ new Map();
-  for (const group of partitioning.groups) {
+  for (let i = 0; i < partitioning.groups.length; i++) {
+    const group = partitioning.groups[i];
+    if (onProgress) {
+      onProgress(`Writing schema group ${group.name} (${group.schemas.size} schemas)`, i + 1, partitioning.groups.length + 2);
+    }
     const filename = getSchemaFilename(group);
     const filePath = (0, import_node_path5.resolve)(outputDir, filename);
     const content = generateSchemaFileContent(group, schemaMap);
@@ -2952,12 +3013,18 @@ function generateModularOpenAPI(openapi, partitioning, config) {
   }
   let indexFile;
   if (createIndexFile) {
+    if (onProgress) {
+      onProgress("Generating index file", partitioning.groups.length + 1, partitioning.groups.length + 2);
+    }
     const indexPath = (0, import_node_path5.resolve)(outputDir, "schemas/index.json");
     const indexContent = generateSchemaIndex(partitioning.groups, schemaMap);
     (0, import_node_fs5.writeFileSync)(indexPath, JSON.stringify(indexContent, null, indent));
     totalSize += Buffer.byteLength(JSON.stringify(indexContent));
     indexFile = indexPath;
   }
+  if (onProgress) {
+    onProgress("Generating main OpenAPI spec", partitioning.groups.length + 2, partitioning.groups.length + 2);
+  }
   const mainSpec = generateMainSpec(openapi, schemaMap, schemaToFile);
   const mainPath = (0, import_node_path5.resolve)(outputDir, "openapi.json");
   (0, import_node_fs5.writeFileSync)(mainPath, JSON.stringify(mainSpec, null, indent));
@@ -3288,7 +3355,28 @@ var SchemaGraph = class {
 // src/cli.ts
 var import_typescript13 = __toESM(require("typescript"), 1);
 var import_node_process2 = __toESM(require("process"), 1);
-var ADORN_VERSION = "0.1.0";
+var import_meta2 = {};
+var ADORN_VERSION = (() => {
+  const tryReadPackageJson = (filePath) => {
+    try {
+      const pkg = JSON.parse((0, import_node_fs6.readFileSync)(filePath, "utf-8"));
+      return pkg.version ?? null;
+    } catch {
+      return null;
+    }
+  };
+  const cliDir = (0, import_node_path6.dirname)((0, import_node_url.fileURLToPath)(import_meta2.url));
+  const bundledPkgPath = (0, import_node_path6.resolve)(cliDir, "..", "package.json");
+  const bundledVersion = tryReadPackageJson(bundledPkgPath);
+  if (bundledVersion) return bundledVersion;
+  const localPkgPath = (0, import_node_path6.resolve)(import_node_process2.default.cwd(), "package.json");
+  const localVersion = tryReadPackageJson(localPkgPath);
+  if (localVersion) return localVersion;
+  const nodeModulesPath = (0, import_node_path6.resolve)(cliDir, "..", "package.json");
+  const nodeModulesVersion = tryReadPackageJson(nodeModulesPath);
+  if (nodeModulesVersion) return nodeModulesVersion;
+  return "0.0.0";
+})();
 function log(msg, options) {
   if (options?.indent) {
     import_node_process2.default.stdout.write("  " + msg + "\n");
@@ -3481,10 +3569,21 @@ async function buildCommand(args) {
     }
   }
   progress.startPhase("openapi", "Generating OpenAPI schema");
-  if (verbose) {
-    progress.verboseLog("Processing schemas from type definitions");
+  const openapiSpinner = new Spinner("Processing schemas");
+  if (!quiet) openapiSpinner.start();
+  const openapi = generateOpenAPI(controllers, checker, {
+    title: "API",
+    version: "1.0.0",
+    onProgress: (message, current, total) => {
+      if (!quiet) {
+        openapiSpinner.setStatus(`${message} (${current}/${total})`);
+      }
+    }
+  });
+  if (!quiet) {
+    openapiSpinner.setStatus(`Processed ${controllers.length} controllers, ${totalOperations} operations`);
   }
-  const openapi = generateOpenAPI(controllers, checker, { title: "API", version: "1.0.0" });
+  if (!quiet) openapiSpinner.stop();
   const schemaCount = Object.keys(openapi.components?.schemas || {}).length;
   let splitEnabled = false;
   if (!noSplit && schemaCount >= splitThreshold) {
@@ -3502,14 +3601,24 @@ async function buildCommand(args) {
     if (splitEnabled) {
       progress.verboseLog(`Partitioning result: ${partitioning.strategy} strategy`);
       progress.verboseLog(`Recommendation: ${partitioning.recommendation}`);
+      if (!quiet) {
+        log(`  Auto-split enabled: ${partitioning.strategy} strategy`);
+      }
+      const splitSpinner = new Spinner("Writing split schema files");
+      if (!quiet) splitSpinner.start();
       generateModularOpenAPI(openapi, partitioning, {
         outputDir: outputPath,
         schemasDir: "schemas",
         createIndexFile: true,
-        prettyPrint: true
+        prettyPrint: true,
+        onProgress: (step, index, total) => {
+          if (!quiet) {
+            progress.logSub(`${step} (${index}/${total})`);
+          }
+        }
       });
+      if (!quiet) splitSpinner.stop();
       if (!quiet) {
-        log(`  Auto-split enabled: ${partitioning.strategy} strategy`);
         log(`  Schema groups: ${partitioning.groups.length}`);
       }
     } else {