adorn-api 1.0.22 → 1.0.23

package/dist/cli/progress.d.ts

@@ -93,6 +93,8 @@ export declare class Spinner {
     private current;
     private total;
     private customStatus?;
+    private frameIndex;
+    private lastLineLength;
     constructor(message?: string);
     /**
      * Start the spinner.

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;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"}
+{"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;IAC9B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,cAAc,CAAa;gBAEvB,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;IAe/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

@@ -323,7 +323,7 @@ function unwrapPromiseTypeNode(typeNode) {
 }
 
 // src/compiler/schema/openapi.ts
-var import_typescript11 = __toESM(require("typescript"), 1);
+var import_typescript12 = __toESM(require("typescript"), 1);
 
 // src/compiler/schema/typeToJsonSchema.ts
 var import_typescript7 = __toESM(require("typescript"), 1);
@@ -1629,7 +1629,221 @@ function resolveAndCollectObjectProps(schema, components) {
 }
 
 // src/compiler/schema/queryBuilderAnalyzer.ts
+var import_typescript10 = __toESM(require("typescript"), 1);
+
+// src/compiler/schema/serviceCallAnalyzer.ts
 var import_typescript9 = __toESM(require("typescript"), 1);
+var ServiceCallAnalyzer = class {
+  checker;
+  program;
+  cache = /* @__PURE__ */ new Map();
+  analyzedMethods = /* @__PURE__ */ new Set();
+  constructor(checker, program) {
+    this.checker = checker;
+    this.program = program;
+  }
+  /**
+   * Analyzes a controller method for query builder patterns, following service calls
+   */
+  analyzeControllerMethod(methodDeclaration, options = {}) {
+    const cacheKey = this.getMethodCacheKey(methodDeclaration);
+    if (this.cache.has(cacheKey)) {
+      return this.cache.get(cacheKey) ?? null;
+    }
+    const maxDepth = options.maxDepth ?? 3;
+    const schema = this.analyzeMethodWithServiceCalls(methodDeclaration, 0, maxDepth, options);
+    this.cache.set(cacheKey, schema);
+    return schema;
+  }
+  /**
+   * Recursively analyzes method with service call traversal
+   */
+  analyzeMethodWithServiceCalls(methodDeclaration, currentDepth, maxDepth, options) {
+    if (currentDepth >= maxDepth) {
+      return null;
+    }
+    const methodKey = this.getMethodCacheKey(methodDeclaration);
+    if (this.analyzedMethods.has(methodKey)) {
+      return null;
+    }
+    this.analyzedMethods.add(methodKey);
+    const directSchema = analyzeQueryBuilderForSchema(methodDeclaration, this.checker);
+    if (directSchema) {
+      return directSchema;
+    }
+    const serviceCalls = this.findServiceCalls(methodDeclaration);
+    for (const serviceCall of serviceCalls) {
+      const serviceSchema = this.analyzeServiceMethod(serviceCall, currentDepth, maxDepth, options);
+      if (serviceSchema) {
+        return serviceSchema;
+      }
+    }
+    return null;
+  }
+  /**
+   * Analyzes a service method for query builder patterns
+   */
+  analyzeServiceMethod(serviceCall, currentDepth, maxDepth, options) {
+    const directSchema = analyzeQueryBuilderForSchema(serviceCall.methodDeclaration, this.checker);
+    if (directSchema) {
+      return directSchema;
+    }
+    if (options.analyzeHelpers) {
+      return this.analyzeMethodWithServiceCalls(
+        serviceCall.methodDeclaration,
+        currentDepth + 1,
+        maxDepth,
+        options
+      );
+    }
+    return null;
+  }
+  /**
+   * Finds service calls in a method body
+   */
+  findServiceCalls(methodDeclaration) {
+    const serviceCalls = [];
+    const body = methodDeclaration.body;
+    if (!body) {
+      return serviceCalls;
+    }
+    const visitor = (node) => {
+      if (import_typescript9.default.isCallExpression(node)) {
+        const serviceCall = this.resolveServiceCall(node);
+        if (serviceCall) {
+          serviceCalls.push(serviceCall);
+        }
+      }
+      import_typescript9.default.forEachChild(node, visitor);
+    };
+    import_typescript9.default.forEachChild(body, visitor);
+    return serviceCalls;
+  }
+  /**
+   * Resolves a call expression to a service method
+   */
+  resolveServiceCall(callExpression) {
+    if (import_typescript9.default.isPropertyAccessExpression(callExpression.expression)) {
+      const propAccess = callExpression.expression;
+      const methodName = propAccess.name.text;
+      const objectType = this.checker.getTypeAtLocation(propAccess.expression);
+      const objectSymbol = objectType.getSymbol();
+      if (objectSymbol) {
+        const classDeclaration = this.findClassDeclaration(objectSymbol);
+        if (classDeclaration) {
+          const methodDeclaration = this.findMethodDeclaration(classDeclaration, methodName);
+          if (methodDeclaration) {
+            return {
+              serviceName: classDeclaration.name?.text || "Unknown",
+              methodName,
+              filePath: classDeclaration.getSourceFile().fileName,
+              classDeclaration,
+              methodDeclaration
+            };
+          }
+        }
+      }
+    }
+    if (import_typescript9.default.isPropertyAccessExpression(callExpression.expression)) {
+      const propAccess = callExpression.expression;
+      const methodName = propAccess.name.text;
+      if (import_typescript9.default.isIdentifier(propAccess.expression)) {
+        const className = propAccess.expression.text;
+        const classSymbol = this.checker.getSymbolAtLocation(propAccess.expression);
+        if (classSymbol) {
+          const classDeclaration = this.findClassDeclaration(classSymbol);
+          if (classDeclaration && classDeclaration.name?.text === className) {
+            const methodDeclaration = this.findMethodDeclaration(classDeclaration, methodName);
+            if (methodDeclaration) {
+              return {
+                serviceName: className,
+                methodName,
+                filePath: classDeclaration.getSourceFile().fileName,
+                classDeclaration,
+                methodDeclaration
+              };
+            }
+          }
+        }
+      }
+    }
+    return null;
+  }
+  /**
+   * Finds class declaration from a symbol
+   */
+  findClassDeclaration(symbol) {
+    const declarations = symbol.getDeclarations();
+    if (!declarations) return null;
+    for (const declaration of declarations) {
+      if (import_typescript9.default.isClassDeclaration(declaration)) {
+        return declaration;
+      }
+    }
+    return null;
+  }
+  /**
+   * Finds method declaration in a class
+   */
+  findMethodDeclaration(classDeclaration, methodName) {
+    for (const member of classDeclaration.members) {
+      if (import_typescript9.default.isMethodDeclaration(member) && member.name) {
+        if (import_typescript9.default.isIdentifier(member.name) && member.name.text === methodName) {
+          return member;
+        }
+      }
+    }
+    return null;
+  }
+  /**
+   * Generates cache key for a method
+   */
+  getMethodCacheKey(methodDeclaration) {
+    const sourceFile = methodDeclaration.getSourceFile();
+    const className = this.getClassName(methodDeclaration);
+    const methodName = methodDeclaration.name?.getText() || "unknown";
+    const line = sourceFile.getLineAndCharacterOfPosition(methodDeclaration.getStart()).line;
+    return `${sourceFile.fileName}:${className}:${methodName}:${line}`;
+  }
+  /**
+   * Gets class name from method declaration
+   */
+  getClassName(methodDeclaration) {
+    let node = methodDeclaration;
+    while (node) {
+      if (import_typescript9.default.isClassDeclaration(node)) {
+        return node.name?.text || "Unknown";
+      }
+      node = node.parent;
+    }
+    return "Unknown";
+  }
+  /**
+   * Clears the analysis cache
+   */
+  clearCache() {
+    this.cache.clear();
+    this.analyzedMethods.clear();
+  }
+  /**
+   * Gets cache statistics
+   */
+  getCacheStats() {
+    return {
+      cached: this.cache.size,
+      analyzed: this.analyzedMethods.size
+    };
+  }
+};
+function analyzeControllerWithServiceCalls(methodDeclaration, checker, program, options = {}) {
+  if (!program) {
+    return null;
+  }
+  const analyzer = new ServiceCallAnalyzer(checker, program);
+  return analyzer.analyzeControllerMethod(methodDeclaration, options);
+}
+
+// src/compiler/schema/queryBuilderAnalyzer.ts
 function analyzeQueryBuilderForSchema(methodDeclaration, checker, options = {}) {
   const body = methodDeclaration.body;
   if (!body) {
@@ -1649,8 +1863,18 @@ function analyzeQueryBuilderForSchema(methodDeclaration, checker, options = {})
   }
   return parseQueryBuilderChain(callChain, checker, options);
 }
-function analyzeQueryBuilderWithDetails(methodDeclaration, checker, options = {}, operationInfo) {
-  const schema = analyzeQueryBuilderForSchema(methodDeclaration, checker, options);
+function analyzeQueryBuilderWithServiceCalls(methodDeclaration, checker, program, options = {}, operationInfo) {
+  let schema = analyzeQueryBuilderForSchema(methodDeclaration, checker, options);
+  if (!schema && program) {
+    try {
+      schema = analyzeControllerWithServiceCalls(methodDeclaration, checker, program, {
+        maxDepth: options.maxDepth,
+        analyzeHelpers: options.analyzeHelpers
+      });
+    } catch (error) {
+      console.warn("Service call analysis failed:", error);
+    }
+  }
   return {
     detected: schema !== null,
     schema,
@@ -1665,12 +1889,12 @@ function analyzeWithVariableTracking(body, checker, options) {
   let isPaged = false;
   let hasReturn = false;
   for (const statement of body.statements) {
-    if (import_typescript9.default.isReturnStatement(statement)) {
+    if (import_typescript10.default.isReturnStatement(statement)) {
       hasReturn = true;
       const returnExpr = statement.expression;
-      if (returnExpr && import_typescript9.default.isCallExpression(returnExpr)) {
+      if (returnExpr && import_typescript10.default.isCallExpression(returnExpr)) {
         const callExpr = returnExpr;
-        if (import_typescript9.default.isIdentifier(callExpr.expression) && queryBuilderVar) {
+        if (import_typescript10.default.isIdentifier(callExpr.expression) && queryBuilderVar) {
           const varName = callExpr.expression.text;
           if (varName === queryBuilderVar) {
             const methodName = callExpr.expression.text;
@@ -1679,9 +1903,9 @@ function analyzeWithVariableTracking(body, checker, options) {
             }
           }
         }
-        if (import_typescript9.default.isPropertyAccessExpression(callExpr.expression) && queryBuilderVar) {
+        if (import_typescript10.default.isPropertyAccessExpression(callExpr.expression) && queryBuilderVar) {
           const propAccess = callExpr.expression;
-          if (import_typescript9.default.isIdentifier(propAccess.expression) && propAccess.expression.text === queryBuilderVar) {
+          if (import_typescript10.default.isIdentifier(propAccess.expression) && propAccess.expression.text === queryBuilderVar) {
             const methodName = propAccess.name.text;
             if (methodName === "executePaged") {
               isPaged = true;
@@ -1691,13 +1915,13 @@ function analyzeWithVariableTracking(body, checker, options) {
       }
       continue;
     }
-    if (!import_typescript9.default.isExpressionStatement(statement)) {
-      if (import_typescript9.default.isVariableStatement(statement)) {
+    if (!import_typescript10.default.isExpressionStatement(statement)) {
+      if (import_typescript10.default.isVariableStatement(statement)) {
         for (const declaration of statement.declarationList.declarations) {
-          if (!import_typescript9.default.isIdentifier(declaration.name)) continue;
+          if (!import_typescript10.default.isIdentifier(declaration.name)) continue;
           const varName = declaration.name.text;
           const initializer = declaration.initializer;
-          if (!initializer || !import_typescript9.default.isCallExpression(initializer)) continue;
+          if (!initializer || !import_typescript10.default.isCallExpression(initializer)) continue;
           const opInfo = extractChainedOperation(initializer);
           if (opInfo && (opInfo.operation === "selectFromEntity" || opInfo.operation === "selectFrom")) {
             queryBuilderVar = varName;
@@ -1710,13 +1934,13 @@ function analyzeWithVariableTracking(body, checker, options) {
       continue;
     }
     const expr = statement.expression;
-    if (import_typescript9.default.isBinaryExpression(expr) && expr.operatorToken.kind === import_typescript9.default.SyntaxKind.EqualsToken) {
-      if (!import_typescript9.default.isIdentifier(expr.left)) {
+    if (import_typescript10.default.isBinaryExpression(expr) && expr.operatorToken.kind === import_typescript10.default.SyntaxKind.EqualsToken) {
+      if (!import_typescript10.default.isIdentifier(expr.left)) {
         continue;
       }
       const varName = expr.left.text;
       const rightSide = expr.right;
-      if (import_typescript9.default.isCallExpression(rightSide)) {
+      if (import_typescript10.default.isCallExpression(rightSide)) {
         const opInfo = extractChainedOperation(rightSide);
         if (opInfo) {
           if (opInfo.operation === "selectFromEntity" || opInfo.operation === "selectFrom") {
@@ -1754,14 +1978,14 @@ function analyzeWithVariableTracking(body, checker, options) {
   };
 }
 function extractChainedOperation(callExpr) {
-  if (import_typescript9.default.isIdentifier(callExpr.expression)) {
+  if (import_typescript10.default.isIdentifier(callExpr.expression)) {
     const methodName2 = callExpr.expression.text;
     if (methodName2 === "selectFromEntity" || methodName2 === "selectFrom") {
       const entityArg = callExpr.arguments[0];
       let entityName = null;
-      if (import_typescript9.default.isIdentifier(entityArg)) {
+      if (import_typescript10.default.isIdentifier(entityArg)) {
         entityName = entityArg.text;
-      } else if (import_typescript9.default.isPropertyAccessExpression(entityArg)) {
+      } else if (import_typescript10.default.isPropertyAccessExpression(entityArg)) {
         entityName = entityArg.name.text;
       }
       return {
@@ -1772,7 +1996,7 @@ function extractChainedOperation(callExpr) {
       };
     }
   }
-  if (!import_typescript9.default.isPropertyAccessExpression(callExpr.expression)) {
+  if (!import_typescript10.default.isPropertyAccessExpression(callExpr.expression)) {
     return null;
   }
   const propAccess = callExpr.expression;
@@ -1780,7 +2004,7 @@ function extractChainedOperation(callExpr) {
   if (methodName === "select") {
     const fields = [];
     for (const arg of callExpr.arguments) {
-      if (import_typescript9.default.isStringLiteral(arg)) {
+      if (import_typescript10.default.isStringLiteral(arg)) {
         fields.push(arg.text);
       }
     }
@@ -1802,19 +2026,19 @@ function extractChainedOperation(callExpr) {
   return null;
 }
 function parseIncludeObjectLiteral(arg) {
-  if (!import_typescript9.default.isObjectLiteralExpression(arg)) {
+  if (!import_typescript10.default.isObjectLiteralExpression(arg)) {
     return null;
   }
   const includes = {};
   for (const prop of arg.properties) {
-    if (!import_typescript9.default.isPropertyAssignment(prop) || !import_typescript9.default.isIdentifier(prop.name)) {
+    if (!import_typescript10.default.isPropertyAssignment(prop) || !import_typescript10.default.isIdentifier(prop.name)) {
       continue;
     }
     const relationName = prop.name.text;
     const value = prop.initializer;
-    if (value.kind === import_typescript9.default.SyntaxKind.TrueKeyword) {
+    if (value.kind === import_typescript10.default.SyntaxKind.TrueKeyword) {
       includes[relationName] = true;
-    } else if (import_typescript9.default.isObjectLiteralExpression(value)) {
+    } else if (import_typescript10.default.isObjectLiteralExpression(value)) {
       const nestedSchema = parseNestedInclude(value, 0);
       if (nestedSchema) {
         includes[relationName] = nestedSchema;
@@ -1827,18 +2051,18 @@ function parseNestedInclude(obj, depth) {
   const selectedFields = [];
   const includes = {};
   for (const prop of obj.properties) {
-    if (!import_typescript9.default.isPropertyAssignment(prop) || !import_typescript9.default.isIdentifier(prop.name)) {
+    if (!import_typescript10.default.isPropertyAssignment(prop) || !import_typescript10.default.isIdentifier(prop.name)) {
       continue;
     }
     const propName = prop.name.text;
     const value = prop.initializer;
-    if (propName === "select" && import_typescript9.default.isArrayLiteralExpression(value)) {
+    if (propName === "select" && import_typescript10.default.isArrayLiteralExpression(value)) {
       for (const element of value.elements) {
-        if (import_typescript9.default.isStringLiteral(element)) {
+        if (import_typescript10.default.isStringLiteral(element)) {
           selectedFields.push(element.text);
         }
       }
-    } else if (propName === "include" && import_typescript9.default.isObjectLiteralExpression(value)) {
+    } else if (propName === "include" && import_typescript10.default.isObjectLiteralExpression(value)) {
       const nestedIncludes = parseIncludeObjectLiteral(value);
       if (nestedIncludes) {
         for (const [relName, relSchema] of Object.entries(nestedIncludes)) {
@@ -1855,10 +2079,10 @@ function parseNestedInclude(obj, depth) {
   };
 }
 function getMethodName(expression) {
-  if (import_typescript9.default.isIdentifier(expression)) {
+  if (import_typescript10.default.isIdentifier(expression)) {
     return expression.text;
   }
-  if (import_typescript9.default.isPropertyAccessExpression(expression)) {
+  if (import_typescript10.default.isPropertyAccessExpression(expression)) {
     return expression.name.text;
   }
   return null;
@@ -1866,7 +2090,7 @@ function getMethodName(expression) {
 function findReturnStatement(body) {
   let returnStatement = null;
   for (const statement of body.statements) {
-    if (import_typescript9.default.isReturnStatement(statement)) {
+    if (import_typescript10.default.isReturnStatement(statement)) {
       if (returnStatement !== null) {
         return null;
       }
@@ -1879,20 +2103,20 @@ function analyzeReturnExpression(expression) {
   if (!expression) {
     return null;
   }
-  if (import_typescript9.default.isCallExpression(expression)) {
+  if (import_typescript10.default.isCallExpression(expression)) {
     return buildCallChain(expression, null);
   }
   return null;
 }
 function buildCallChain(node, parent) {
-  if (import_typescript9.default.isCallExpression(node)) {
+  if (import_typescript10.default.isCallExpression(node)) {
     const callNode = {
       expression: node.expression,
       methodName: getMethodName(node.expression),
       arguments: node.arguments,
       parent
     };
-    if (import_typescript9.default.isPropertyAccessExpression(node.expression)) {
+    if (import_typescript10.default.isPropertyAccessExpression(node.expression)) {
       return buildCallChain(node.expression.expression, callNode);
     }
     return callNode;
@@ -1919,7 +2143,7 @@ function parseQueryBuilderChain(chain, checker, options) {
     const methodName = currentNode.methodName;
     if (methodName === "select") {
       for (const arg of currentNode.arguments) {
-        if (import_typescript9.default.isStringLiteral(arg)) {
+        if (import_typescript10.default.isStringLiteral(arg)) {
           selectedFields.add(arg.text);
         }
       }
@@ -1954,10 +2178,10 @@ function extractEntityName(callNode, checker) {
     return null;
   }
   const entityArg = callNode.arguments[0];
-  if (import_typescript9.default.isIdentifier(entityArg)) {
+  if (import_typescript10.default.isIdentifier(entityArg)) {
     return entityArg.text;
   }
-  if (import_typescript9.default.isPropertyAccessExpression(entityArg)) {
+  if (import_typescript10.default.isPropertyAccessExpression(entityArg)) {
     return entityArg.name.text;
   }
   return null;
@@ -1966,16 +2190,16 @@ function parseIncludeArgument(arg, includes, checker, options, depth) {
   if (!arg) {
     return;
   }
-  if (import_typescript9.default.isObjectLiteralExpression(arg)) {
+  if (import_typescript10.default.isObjectLiteralExpression(arg)) {
     for (const prop of arg.properties) {
-      if (!import_typescript9.default.isPropertyAssignment(prop) || !import_typescript9.default.isIdentifier(prop.name)) {
+      if (!import_typescript10.default.isPropertyAssignment(prop) || !import_typescript10.default.isIdentifier(prop.name)) {
         continue;
       }
       const relationName = prop.name.text;
       const value = prop.initializer;
-      if (value.kind === import_typescript9.default.SyntaxKind.TrueKeyword) {
+      if (value.kind === import_typescript10.default.SyntaxKind.TrueKeyword) {
         includes[relationName] = true;
-      } else if (import_typescript9.default.isObjectLiteralExpression(value)) {
+      } else if (import_typescript10.default.isObjectLiteralExpression(value)) {
         const maxDepth = options.maxDepth ?? 5;
         if (depth < maxDepth) {
           const nestedSchema = parseNestedInclude(value, depth + 1);
@@ -1989,7 +2213,7 @@ function parseIncludeArgument(arg, includes, checker, options, depth) {
 }
 
 // src/compiler/schema/queryBuilderSchemaBuilder.ts
-var import_typescript10 = require("typescript");
+var import_typescript11 = require("typescript");
 function wrapInPaginatedResult(schema) {
   return {
     type: "object",
@@ -2035,9 +2259,11 @@ function generateOpenAPI(controllers, checker, options = {}) {
         paths[fullPath] = {};
       }
       const method = operation.httpMethod.toLowerCase();
-      const analysisResult = analyzeQueryBuilderWithDetails(
+      const analysisResult = analyzeQueryBuilderWithServiceCalls(
         operation.methodDeclaration,
         checker,
+        null,
+        // TODO: Pass program when available
         {},
         {
           methodName: operation.operationId,
@@ -2340,12 +2566,12 @@ function mergeBodySchemaAnnotations(bodyParam, ctx, schema) {
   const declarations = typeSymbol.getDeclarations();
   if (!declarations || declarations.length === 0) return schema;
   const classDecl = declarations[0];
-  if (!import_typescript11.default.isClassDeclaration(classDecl)) return schema;
+  if (!import_typescript12.default.isClassDeclaration(classDecl)) return schema;
   const result = { ...schema };
   const props = { ...result.properties };
   for (const member of classDecl.members) {
-    if (!import_typescript11.default.isPropertyDeclaration(member) || !member.name) continue;
-    const propName = import_typescript11.default.isIdentifier(member.name) ? member.name.text : null;
+    if (!import_typescript12.default.isPropertyDeclaration(member) || !member.name) continue;
+    const propName = import_typescript12.default.isIdentifier(member.name) ? member.name.text : null;
     if (!propName) continue;
     if (!props[propName]) continue;
     const frags = extractPropertySchemaFragments(ctx.checker, member);
@@ -2358,7 +2584,7 @@ function mergeBodySchemaAnnotations(bodyParam, ctx, schema) {
 }
 
 // src/compiler/manifest/emit.ts
-var import_typescript12 = __toESM(require("typescript"), 1);
+var import_typescript13 = __toESM(require("typescript"), 1);
 function generateManifest(controllers, checker, version, validationMode = "ajv-runtime") {
   const components = /* @__PURE__ */ new Map();
   const ctx = {
@@ -2380,7 +2606,7 @@ function generateManifest(controllers, checker, version, validationMode = "ajv-r
     generator: {
       name: "adorn-api",
       version,
-      typescript: import_typescript12.default.version
+      typescript: import_typescript13.default.version
     },
     schemas: {
       kind: "openapi-3.1",
@@ -2866,7 +3092,7 @@ async function isStale(params) {
 // src/compiler/cache/writeCache.ts
 var import_node_fs4 = __toESM(require("fs"), 1);
 var import_node_path4 = __toESM(require("path"), 1);
-var import_typescript13 = __toESM(require("typescript"), 1);
+var import_typescript14 = __toESM(require("typescript"), 1);
 function statMtimeMs2(p) {
   return import_node_fs4.default.statSync(p).mtimeMs;
 }
@@ -2899,7 +3125,7 @@ function writeCache(params) {
     generator: {
       name: "adorn-api",
       version: params.adornVersion,
-      typescript: import_typescript13.default.version
+      typescript: import_typescript14.default.version
     },
     project: {
       tsconfigPath: params.tsconfigAbs,
@@ -3061,6 +3287,8 @@ var Spinner = class {
   current = 0;
   total = 0;
   customStatus;
+  frameIndex = 0;
+  lastLineLength = 0;
   constructor(message = "") {
     this.message = message;
   }
@@ -3068,9 +3296,8 @@ var Spinner = class {
    * Start the spinner.
    */
   start() {
-    let frameIndex = 0;
     this.interval = setInterval(() => {
-      const frame = this.frames[frameIndex];
+      const frame = this.frames[this.frameIndex];
       let output;
       if (this.customStatus) {
         output = `\r${frame} ${this.customStatus}`;
@@ -3079,11 +3306,12 @@ var Spinner = class {
       } else {
         output = `\r${frame} ${this.message}`;
       }
+      this.lastLineLength = output.length - 1;
       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;
+      this.frameIndex = (this.frameIndex + 1) % this.frames.length;
     }, 80);
   }
   /**
@@ -3098,8 +3326,12 @@ var Spinner = class {
    */
   setStatus(status) {
     this.customStatus = status;
-    const frame = this.frames[this.current];
-    import_node_process.default.stdout.write(`\r${frame} ${status}`);
+    const frame = this.frames[this.frameIndex];
+    const output = `\r${frame} ${status}`;
+    const clearLength = Math.max(this.lastLineLength, output.length - 1);
+    import_node_process.default.stdout.write("\r" + " ".repeat(clearLength) + "\r");
+    this.lastLineLength = output.length - 1;
+    import_node_process.default.stdout.write(output);
     if (import_node_process.default.stdout.writable) {
       import_node_process.default.stdout.write("");
     }
@@ -3118,7 +3350,7 @@ var Spinner = class {
       clearInterval(this.interval);
       this.interval = void 0;
     }
-    import_node_process.default.stdout.write("\r" + " ".repeat(60) + "\r");
+    import_node_process.default.stdout.write("\r" + " ".repeat(this.lastLineLength) + "\r");
     if (completedMessage) {
       import_node_process.default.stdout.write(completedMessage + "\n");
     }
@@ -3652,7 +3884,7 @@ function getEdgesByRelation(graph, relation) {
 }
 
 // src/compiler/graph/builder.ts
-var import_typescript14 = __toESM(require("typescript"), 1);
+var import_typescript15 = __toESM(require("typescript"), 1);
 
 // src/compiler/graph/schemaGraph.ts
 var SchemaGraph = class {
@@ -3904,7 +4136,7 @@ var SchemaGraph = class {
 };
 
 // src/cli.ts
-var import_typescript15 = __toESM(require("typescript"), 1);
+var import_typescript16 = __toESM(require("typescript"), 1);
 var import_node_process2 = __toESM(require("process"), 1);
 var import_meta2 = {};
 var ADORN_VERSION = (() => {
@@ -3983,7 +4215,7 @@ function sanitizeForJson(obj) {
   return result;
 }
 function buildControllerGraph(controllers) {
-  const graph = createGraph(import_typescript15.default.version);
+  const graph = createGraph(import_typescript16.default.version);
   const nodeMap = /* @__PURE__ */ new Map();
   for (const ctrl of controllers) {
     const nodeId = `Controller:${ctrl.className}`;
@@ -4095,7 +4327,7 @@ async function buildCommand(args) {
       outDir: outputDir,
       project: projectPath,
       adornVersion: ADORN_VERSION,
-      typescriptVersion: import_typescript15.default.version
+      typescriptVersion: import_typescript16.default.version
     });
     if (!stale.stale) {
       progress.completePhase("staleness-check");