adorn-api 1.0.16 → 1.0.17

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;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;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;IAeb;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKjD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B;;OAEG;IACH,WAAW,IAAI,IAAI;IAInB;;OAEG;IACH,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI;IAYrC;;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",
@@ -2499,6 +2500,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 +2513,35 @@ var Spinner = class {
     let frameIndex = 0;
     this.interval = setInterval(() => {
       const frame = this.frames[frameIndex];
-      import_node_process.default.stdout.write(`\r${frame} ${this.message}`);
+      if (this.customStatus) {
+        import_node_process.default.stdout.write(`\r${frame} ${this.customStatus}`);
+      } else if (this.total > 0) {
+        import_node_process.default.stdout.write(`\r${frame} ${this.message} (${this.current}/${this.total})`);
+      } else {
+        import_node_process.default.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.
    */
@@ -2521,7 +2550,7 @@ 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");
     }
@@ -3288,7 +3317,25 @@ 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 = (() => {
+  try {
+    const localPkgPath = (0, import_node_path6.resolve)(import_node_process2.default.cwd(), "package.json");
+    try {
+      const localPkg = JSON.parse((0, import_node_fs6.readFileSync)(localPkgPath, "utf-8"));
+      if (localPkg.bin?.["adorn-api"] || localPkg.name === "adorn-api") {
+        return localPkg.version ?? "0.0.0";
+      }
+    } catch {
+    }
+    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 bundledPkg = JSON.parse((0, import_node_fs6.readFileSync)(bundledPkgPath, "utf-8"));
+    return bundledPkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+})();
 function log(msg, options) {
   if (options?.indent) {
     import_node_process2.default.stdout.write("  " + msg + "\n");
@@ -3481,10 +3528,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) {