adorn-api 1.0.16 → 1.0.17

package/dist/cli.js

@@ -8,7 +8,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // src/cli.ts
 import { writeFileSync as writeFileSync2, mkdirSync as mkdirSync2, rmSync, existsSync as existsSync2, readFileSync as readFileSync3, statSync } from "fs";
-import { resolve as resolve3 } from "path";
+import { resolve as resolve3, dirname as dirname3 } from "path";
+import { fileURLToPath } from "url";
 
 // src/compiler/runner/createProgram.ts
 import ts from "typescript";
@@ -977,7 +978,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",
@@ -987,7 +988,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",
@@ -2481,6 +2482,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;
   }
@@ -2491,10 +2495,35 @@ var Spinner = class {
     let frameIndex = 0;
     this.interval = setInterval(() => {
       const frame = this.frames[frameIndex];
-      process.stdout.write(`\r${frame} ${this.message}`);
+      if (this.customStatus) {
+        process.stdout.write(`\r${frame} ${this.customStatus}`);
+      } else if (this.total > 0) {
+        process.stdout.write(`\r${frame} ${this.message} (${this.current}/${this.total})`);
+      } else {
+        process.stdout.write(`\r${frame} ${this.message}`);
+      }
       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;
+  }
+  /**
+   * Clear the custom status message.
+   */
+  clearStatus() {
+    this.customStatus = void 0;
+  }
   /**
    * Stop the spinner with a completion message.
    */
@@ -2503,7 +2532,7 @@ var Spinner = class {
       clearInterval(this.interval);
       this.interval = void 0;
     }
-    process.stdout.write("\r" + " ".repeat(50) + "\r");
+    process.stdout.write("\r" + " ".repeat(60) + "\r");
     if (completedMessage) {
       process.stdout.write(completedMessage + "\n");
     }
@@ -3270,7 +3299,24 @@ var SchemaGraph = class {
 // src/cli.ts
 import ts13 from "typescript";
 import process2 from "process";
-var ADORN_VERSION = "0.1.0";
+var ADORN_VERSION = (() => {
+  try {
+    const localPkgPath = resolve3(process2.cwd(), "package.json");
+    try {
+      const localPkg = JSON.parse(readFileSync3(localPkgPath, "utf-8"));
+      if (localPkg.bin?.["adorn-api"] || localPkg.name === "adorn-api") {
+        return localPkg.version ?? "0.0.0";
+      }
+    } catch {
+    }
+    const cliDir = dirname3(fileURLToPath(import.meta.url));
+    const bundledPkgPath = resolve3(cliDir, "..", "package.json");
+    const bundledPkg = JSON.parse(readFileSync3(bundledPkgPath, "utf-8"));
+    return bundledPkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+})();
 function log(msg, options) {
   if (options?.indent) {
     process2.stdout.write("  " + msg + "\n");
@@ -3463,10 +3509,15 @@ 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();
+  let processedControllers = 0;
+  let processedOperations = 0;
   const openapi = generateOpenAPI(controllers, checker, { title: "API", version: "1.0.0" });
+  if (!quiet) {
+    openapiSpinner.setStatus(`Processed ${controllers.length} controllers, ${totalOperations} operations`);
+  }
+  if (!quiet) openapiSpinner.stop();
   const schemaCount = Object.keys(openapi.components?.schemas || {}).length;
   let splitEnabled = false;
   if (!noSplit && schemaCount >= splitThreshold) {