ng-openapi 0.2.22-pr-91-bugfix-nested-objects-parameter-fb5e988.0 → 0.2.22-pr-92-feature-single-request-parameter-0b340a2.0

package/README.md

@@ -113,6 +113,7 @@ ng-openapi -i ./swagger.json -o ./src/api --date-type string
 - `customHeaders` - Headers to add to all HTTP requests
 - `responseTypeMapping` - Map content types to Angular HttpClient response types
 - `customizeMethodName` - Function to customize generated method names
+- `useSingleRequestParameter` - Generate one request object parameter per method instead of positional parameters (default: `false`)
 - `compilerOptions` - TypeScript compiler options for code generation
 
 ## Generated Files Structure

package/cli.cjs

@@ -41,7 +41,7 @@ __name(isUrl, "isUrl");
 // src/lib/cli.ts
 var import_commander = require("commander");
 var fs4 = __toESM(require("fs"));
-var path12 = __toESM(require("path"));
+var path13 = __toESM(require("path"));
 
 // package.json
 var version = "0.2.21";
@@ -51,11 +51,11 @@ var import_ts_morph7 = require("ts-morph");
 
 // ../shared/src/utils/string.utils.ts
 function camelCase(str) {
-  return str.replace(/[-_.\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
 }
 __name(camelCase, "camelCase");
 function pascalCase(str) {
-  return str.replace(/[-_.\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
 }
 __name(pascalCase, "pascalCase");
 function pascalCaseForEnums(str) {
@@ -166,12 +166,12 @@ function extractPaths(swaggerPaths = {}, methods = [
   "head"
 ]) {
   const paths = [];
-  Object.entries(swaggerPaths).forEach(([path13, pathItem]) => {
+  Object.entries(swaggerPaths).forEach(([path14, pathItem]) => {
     methods.forEach((method) => {
       if (pathItem[method]) {
         const operation = pathItem[method];
         paths.push({
-          path: path13,
+          path: path14,
           method: method.toUpperCase(),
           operationId: operation.operationId,
           summary: operation.summary,
@@ -395,6 +395,10 @@ var SERVICE_GENERATOR_HEADER_COMMENT = /* @__PURE__ */ __name((controllerName) =
 * Do not edit this file manually
 */
 `, "SERVICE_GENERATOR_HEADER_COMMENT");
+var REQUEST_PARAMS_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Generated request parameter interfaces
+* Do not edit this file manually
+*/
+`;
 var MAIN_INDEX_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Entrypoint for the client
 * Do not edit this file manually
 */
@@ -2045,7 +2049,7 @@ return httpParams.append(key, value);`
 
 // src/lib/generators/service/service.generator.ts
 var import_ts_morph6 = require("ts-morph");
-var path9 = __toESM(require("path"));
+var path10 = __toESM(require("path"));
 
 // src/lib/generators/service/service-method/service-method-body.generator.ts
 var ServiceMethodBodyGenerator = class {
@@ -2299,6 +2303,73 @@ return this.httpClient.${httpMethod}(url, requestOptions)${parseResponse};`;
   }
 };
 
+// src/lib/generators/service/service-method/service-method-request-object.generator.ts
+var ServiceMethodRequestObjectGenerator = class {
+  static {
+    __name(this, "ServiceMethodRequestObjectGenerator");
+  }
+  /** First-occurrence-wins dedupe, shared by the flat and single-request parameter builders. */
+  static dedupe(params) {
+    const seen = /* @__PURE__ */ new Set();
+    return params.filter((param) => {
+      if (seen.has(param.name)) {
+        return false;
+      }
+      seen.add(param.name);
+      return true;
+    });
+  }
+  static createEntry(interfaceName, parameters) {
+    return {
+      interfaceName,
+      parameters,
+      varName: this.resolveVarName(parameters),
+      isOptional: parameters.every((param) => param.hasQuestionToken)
+    };
+  }
+  static toRequestParameter(entry) {
+    return {
+      name: entry.varName,
+      type: entry.interfaceName,
+      hasQuestionToken: entry.isOptional
+    };
+  }
+  static toInterfaceProperties(entry) {
+    return entry.parameters.map((param) => ({
+      name: param.name,
+      type: param.type,
+      hasQuestionToken: param.hasQuestionToken
+    }));
+  }
+  /**
+   * The destructuring statement placed at the top of the method body so the
+   * existing body templates keep referencing plain local identifiers.
+   */
+  static toDestructureStatement(entry) {
+    const names = entry.parameters.map((param) => param.name).join(", ");
+    const source = entry.isOptional ? `${entry.varName} ?? {}` : entry.varName;
+    return `const { ${names} } = ${source};`;
+  }
+  /** Destructured properties share the method scope, so the request variable must not collide with them. */
+  static resolveVarName(parameters) {
+    const used = new Set(parameters.map((param) => param.name));
+    for (const candidate of [
+      "request",
+      "requestParams",
+      "requestParameters"
+    ]) {
+      if (!used.has(candidate)) {
+        return candidate;
+      }
+    }
+    let suffix = 2;
+    while (used.has(`requestParameters${suffix}`)) {
+      suffix++;
+    }
+    return `requestParameters${suffix}`;
+  }
+};
+
 // src/lib/generators/service/service-method/service-method-params.generator.ts
 var ServiceMethodParamsGenerator = class {
   static {
@@ -2313,19 +2384,10 @@ var ServiceMethodParamsGenerator = class {
   generateMethodParameters(operation) {
     const params = this.generateApiParameters(operation);
     const optionsParam = this.addOptionsParameter(params);
-    const combined = [
+    return ServiceMethodRequestObjectGenerator.dedupe([
       ...params,
       ...optionsParam
-    ];
-    const seen = /* @__PURE__ */ new Set();
-    const uniqueParams = [];
-    for (const param of combined) {
-      if (!seen.has(param.name)) {
-        seen.add(param.name);
-        uniqueParams.push(param);
-      }
-    }
-    return uniqueParams;
+    ]);
   }
   generateApiParameters(operation) {
     const params = [];
@@ -2432,7 +2494,7 @@ var ServiceMethodOverloadsGenerator = class {
     this.config = config;
     this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
-  generateMethodOverloads(operation) {
+  generateMethodOverloads(operation, requestObject) {
     const observeTypes = [
       "body",
       "response",
@@ -2441,38 +2503,35 @@ var ServiceMethodOverloadsGenerator = class {
     const overloads = [];
     const responseType = this.determineResponseTypeForOperation(operation);
     observeTypes.forEach((observe) => {
-      const overload = this.generateMethodOverload(operation, observe, responseType);
+      const overload = this.generateMethodOverload(operation, observe, responseType, requestObject);
       if (overload) {
         overloads.push(overload);
       }
     });
     return overloads;
   }
-  generateMethodOverload(operation, observe, responseType) {
+  generateMethodOverload(operation, observe, responseType, requestObject) {
     this.responseDataType = this.generateOverloadResponseType(operation);
-    const params = this.generateOverloadParameters(operation, observe, responseType);
+    const params = requestObject ? this.generateSingleRequestOverloadParameters(requestObject, observe, responseType) : this.generateOverloadParameters(operation, observe, responseType);
     const returnType = this.generateOverloadReturnType(observe);
     return {
       parameters: params,
       returnType
     };
   }
+  generateSingleRequestOverloadParameters(requestObject, observe, responseType) {
+    return [
+      ServiceMethodRequestObjectGenerator.toRequestParameter(requestObject),
+      ...this.addOverloadOptionsParameter(requestObject.parameters, observe, responseType)
+    ];
+  }
   generateOverloadParameters(operation, observe, responseType) {
     const params = this.paramsGenerator.generateApiParameters(operation);
     const optionsParam = this.addOverloadOptionsParameter(params, observe, responseType);
-    const combined = [
+    return ServiceMethodRequestObjectGenerator.dedupe([
       ...params,
       ...optionsParam
-    ];
-    const seen = /* @__PURE__ */ new Set();
-    const uniqueParams = [];
-    for (const param of combined) {
-      if (!seen.has(param.name)) {
-        seen.add(param.name);
-        uniqueParams.push(param);
-      }
-    }
-    return uniqueParams;
+    ]);
   }
   addOverloadOptionsParameter(params, observe, responseType) {
     return [
@@ -2550,12 +2609,16 @@ var ServiceMethodGenerator = class {
     this.overloadsGenerator = new ServiceMethodOverloadsGenerator(config, parser);
     this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
-  addServiceMethod(serviceClass, operation) {
+  addServiceMethod(serviceClass, operation, requestObject) {
     const methodName = this.generateMethodName(operation);
-    const parameters = this.paramsGenerator.generateMethodParameters(operation);
+    const parameters = requestObject ? this.generateSingleRequestParameters(requestObject) : this.paramsGenerator.generateMethodParameters(operation);
     const returnType = this.generateReturnType();
-    const methodBody = this.bodyGenerator.generateMethodBody(operation);
-    const methodOverLoads = this.overloadsGenerator.generateMethodOverloads(operation);
+    let methodBody = this.bodyGenerator.generateMethodBody(operation);
+    if (requestObject) {
+      methodBody = `${ServiceMethodRequestObjectGenerator.toDestructureStatement(requestObject)}
+${methodBody}`;
+    }
+    const methodOverLoads = this.overloadsGenerator.generateMethodOverloads(operation, requestObject);
     serviceClass.addMethod({
       name: methodName,
       parameters,
@@ -2567,6 +2630,12 @@ var ServiceMethodGenerator = class {
       ] : void 0
     });
   }
+  generateSingleRequestParameters(requestObject) {
+    return [
+      ServiceMethodRequestObjectGenerator.toRequestParameter(requestObject),
+      ...this.paramsGenerator.addOptionsParameter(requestObject.parameters)
+    ];
+  }
   generateMethodName(operation) {
     if (this.config.options.customizeMethodName) {
       if (operation.operationId == null) {
@@ -2593,6 +2662,97 @@ var ServiceMethodGenerator = class {
   }
 };
 
+// src/lib/generators/service/request-params.generator.ts
+var path9 = __toESM(require("path"));
+var RequestParamsGenerator = class {
+  static {
+    __name(this, "RequestParamsGenerator");
+  }
+  project;
+  paramsGenerator;
+  registry = /* @__PURE__ */ new Map();
+  usedInterfaceNames = /* @__PURE__ */ new Set();
+  constructor(parser, project, config) {
+    this.project = project;
+    this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
+  }
+  buildRegistry(controllerGroups, getMethodName) {
+    Object.entries(controllerGroups).forEach(([controllerName, operations]) => {
+      operations.forEach((operation) => {
+        const parameters = ServiceMethodRequestObjectGenerator.dedupe(this.paramsGenerator.generateApiParameters(operation));
+        if (parameters.length === 0) {
+          return;
+        }
+        const reserved = parameters.find((param) => param.name === "observe" || param.name === "options");
+        if (reserved) {
+          throw new Error(`Parameter name '${reserved.name}' conflicts with the reserved '${reserved.name}' method parameter when useSingleRequestParameter is enabled: (${operation.method}) ${operation.path}`);
+        }
+        const interfaceName = this.reserveInterfaceName(controllerName, getMethodName(operation));
+        this.registry.set(operation, ServiceMethodRequestObjectGenerator.createEntry(interfaceName, parameters));
+      });
+    });
+    return this.registry;
+  }
+  generate(outputRoot) {
+    if (this.registry.size === 0) {
+      return;
+    }
+    const filePath = path9.join(outputRoot, "models", "request-params.ts");
+    const sourceFile = this.project.createSourceFile(filePath, "", {
+      overwrite: true
+    });
+    this.registry.forEach((entry, operation) => {
+      sourceFile.addInterface({
+        name: entry.interfaceName,
+        isExported: true,
+        properties: ServiceMethodRequestObjectGenerator.toInterfaceProperties(entry),
+        docs: operation.description ? [
+          operation.description
+        ] : void 0
+      });
+    });
+    sourceFile.fixMissingImports().formatText();
+    sourceFile.insertText(0, REQUEST_PARAMS_GENERATOR_HEADER_COMMENT);
+    sourceFile.saveSync();
+    this.addModelsBarrelExport(outputRoot);
+  }
+  /**
+   * Method names are only unique per service class, so interfaces sharing the
+   * global request-params file fall back to a controller-prefixed name on collision.
+   */
+  reserveInterfaceName(controllerName, methodName) {
+    const base = `${pascalCase(methodName)}Params`;
+    const candidates = [
+      base,
+      `${pascalCase(controllerName)}${base}`
+    ];
+    for (const candidate of candidates) {
+      if (!this.usedInterfaceNames.has(candidate)) {
+        this.usedInterfaceNames.add(candidate);
+        return candidate;
+      }
+    }
+    let suffix = 2;
+    while (this.usedInterfaceNames.has(`${candidates[1]}${suffix}`)) {
+      suffix++;
+    }
+    const name = `${candidates[1]}${suffix}`;
+    this.usedInterfaceNames.add(name);
+    return name;
+  }
+  addModelsBarrelExport(outputRoot) {
+    const modelsIndex = this.project.getSourceFile(path9.join(outputRoot, "models", "index.ts"));
+    if (!modelsIndex) {
+      return;
+    }
+    modelsIndex.addExportDeclaration({
+      moduleSpecifier: "./request-params"
+    });
+    modelsIndex.formatText();
+    modelsIndex.saveSync();
+  }
+};
+
 // src/lib/generators/service/service.generator.ts
 var ServiceGenerator = class {
   static {
@@ -2603,6 +2763,7 @@ var ServiceGenerator = class {
   spec;
   config;
   methodGenerator;
+  requestObjects;
   constructor(parser, project, config) {
     this.config = config;
     this.project = project;
@@ -2615,23 +2776,28 @@ var ServiceGenerator = class {
     this.methodGenerator = new ServiceMethodGenerator(config, parser);
   }
   async generate(outputRoot) {
-    const outputDir = path9.join(outputRoot, "services");
+    const outputDir = path10.join(outputRoot, "services");
     const paths = extractPaths(this.spec.paths);
     if (paths.length === 0) {
       console.warn("No API paths found in the specification");
       return;
     }
     const controllerGroups = this.groupPathsByController(paths);
+    if (this.config.options.useSingleRequestParameter) {
+      const requestParamsGenerator = new RequestParamsGenerator(this.parser, this.project, this.config);
+      this.requestObjects = requestParamsGenerator.buildRegistry(controllerGroups, (operation) => this.methodGenerator.generateMethodName(operation));
+      requestParamsGenerator.generate(outputRoot);
+    }
     await Promise.all(Object.entries(controllerGroups).map(([controllerName, operations]) => this.generateServiceFile(controllerName, operations, outputDir)));
   }
   groupPathsByController(paths) {
     const groups = {};
-    paths.forEach((path13) => {
+    paths.forEach((path14) => {
       let controllerName = "Default";
-      if (path13.tags && path13.tags.length > 0) {
-        controllerName = path13.tags[0];
+      if (path14.tags && path14.tags.length > 0) {
+        controllerName = path14.tags[0];
       } else {
-        const pathParts = path13.path.split("/").filter((p) => p && !p.startsWith("{"));
+        const pathParts = path14.path.split("/").filter((p) => p && !p.startsWith("{"));
         if (pathParts.length > 1) {
           controllerName = pascalCase(pathParts[1]);
         }
@@ -2640,13 +2806,13 @@ var ServiceGenerator = class {
       if (!groups[controllerName]) {
         groups[controllerName] = [];
       }
-      groups[controllerName].push(path13);
+      groups[controllerName].push(path14);
     });
     return groups;
   }
   async generateServiceFile(controllerName, operations, outputDir) {
     const fileName = `${camelCase(controllerName)}.service.ts`;
-    const filePath = path9.join(outputDir, fileName);
+    const filePath = path10.join(outputDir, fileName);
     const sourceFile = this.project.createSourceFile(filePath, "", {
       overwrite: true
     });
@@ -2747,7 +2913,7 @@ var ServiceGenerator = class {
 return context.set(this.clientContextToken, '${this.config.clientName || "default"}');`
     });
     operations.forEach((operation) => {
-      this.methodGenerator.addServiceMethod(serviceClass, operation);
+      this.methodGenerator.addServiceMethod(serviceClass, operation, this.requestObjects?.get(operation));
     });
     if (hasDuplicateFunctionNames(serviceClass.getMethods())) {
       throw new Error(`Duplicate method names found in service class ${className}. Please ensure unique method names for each operation.`);
@@ -2757,7 +2923,7 @@ return context.set(this.clientContextToken, '${this.config.clientName || "defaul
 
 // src/lib/generators/service/service-index.generator.ts
 var fs2 = __toESM(require("fs"));
-var path10 = __toESM(require("path"));
+var path11 = __toESM(require("path"));
 var ServiceIndexGenerator = class {
   static {
     __name(this, "ServiceIndexGenerator");
@@ -2767,8 +2933,8 @@ var ServiceIndexGenerator = class {
     this.project = project;
   }
   generateIndex(outputRoot) {
-    const servicesDir = path10.join(outputRoot, "services");
-    const indexPath = path10.join(servicesDir, "index.ts");
+    const servicesDir = path11.join(outputRoot, "services");
+    const indexPath = path11.join(servicesDir, "index.ts");
     const sourceFile = this.project.createSourceFile(indexPath, "", {
       overwrite: true
     });
@@ -2789,7 +2955,7 @@ var ServiceIndexGenerator = class {
 
 // src/lib/core/generator.ts
 var fs3 = __toESM(require("fs"));
-var path11 = __toESM(require("path"));
+var path12 = __toESM(require("path"));
 function validateInput(inputPath) {
   if (isUrl(inputPath)) {
     return;
@@ -2797,7 +2963,7 @@ function validateInput(inputPath) {
   if (!fs3.existsSync(inputPath)) {
     throw new Error(`Input file not found: ${inputPath}`);
   }
-  const extension = path11.extname(inputPath).toLowerCase();
+  const extension = path12.extname(inputPath).toLowerCase();
   const supportedExtensions = [
     ".json",
     ".yaml",
@@ -2888,7 +3054,7 @@ __name(generateFromConfig, "generateFromConfig");
 // src/lib/cli.ts
 var program = new import_commander.Command();
 async function loadConfigFile(configPath) {
-  const resolvedPath = path12.resolve(configPath);
+  const resolvedPath = path13.resolve(configPath);
   if (!fs4.existsSync(resolvedPath)) {
     throw new Error(`Configuration file not found: ${resolvedPath}`);
   }
@@ -2902,12 +3068,12 @@ async function loadConfigFile(configPath) {
     if (!config.input || !config.output) {
       throw new Error('Configuration must include "input" and "output" properties');
     }
-    const configDir = path12.dirname(resolvedPath);
-    if (!isUrl(config.input) && !path12.isAbsolute(config.input)) {
-      config.input = path12.resolve(configDir, config.input);
+    const configDir = path13.dirname(resolvedPath);
+    if (!isUrl(config.input) && !path13.isAbsolute(config.input)) {
+      config.input = path13.resolve(configDir, config.input);
     }
-    if (!path12.isAbsolute(config.output)) {
-      config.output = path12.resolve(configDir, config.output);
+    if (!path13.isAbsolute(config.output)) {
+      config.output = path13.resolve(configDir, config.output);
     }
     return config;
   } catch (error) {

package/index.d.ts

@@ -204,6 +204,7 @@ interface GeneratorConfig {
             [contentType: string]: "json" | "blob" | "arraybuffer" | "text";
         };
         customizeMethodName?: (operationId: string) => string;
+        useSingleRequestParameter?: boolean;
     };
     compilerOptions?: {
         declaration?: boolean;
@@ -272,6 +273,7 @@ declare const CONTENT_TYPES: {
 declare const TYPE_GENERATOR_HEADER_COMMENT: string;
 declare const SERVICE_INDEX_GENERATOR_HEADER_COMMENT: string;
 declare const SERVICE_GENERATOR_HEADER_COMMENT: (controllerName: string) => string;
+declare const REQUEST_PARAMS_GENERATOR_HEADER_COMMENT: string;
 declare const MAIN_INDEX_GENERATOR_HEADER_COMMENT: string;
 declare const PROVIDER_GENERATOR_HEADER_COMMENT: string;
 declare const BASE_INTERCEPTOR_HEADER_COMMENT: (clientName: string) => string;
@@ -288,4 +290,4 @@ declare function validateInput(inputPath: string): void;
  */
 declare function generateFromConfig(config: GeneratorConfig): Promise<void>;
 
-export { BASE_INTERCEPTOR_HEADER_COMMENT, CONTENT_TYPES, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getInterceptorsTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, pascalCaseForEnums, type placeHolder, screamingSnakeCase, validateInput };
+export { BASE_INTERCEPTOR_HEADER_COMMENT, CONTENT_TYPES, type EnumValueObject, type GeneratorConfig, type GetMethodGenerationContext, HTTP_RESOURCE_GENERATOR_HEADER_COMMENT, type IPluginGenerator, type IPluginGeneratorClass, MAIN_INDEX_GENERATOR_HEADER_COMMENT, type MethodGenerationContext, type NgOpenapiClientConfig, PROVIDER_GENERATOR_HEADER_COMMENT, type Parameter, type PathInfo, REQUEST_PARAMS_GENERATOR_HEADER_COMMENT, type RequestBody, SERVICE_GENERATOR_HEADER_COMMENT, SERVICE_INDEX_GENERATOR_HEADER_COMMENT, type SwaggerDefinition, SwaggerParser, type SwaggerResponse, type SwaggerSpec, TYPE_GENERATOR_HEADER_COMMENT, type TypeSchema, ZOD_PLUGIN_GENERATOR_HEADER_COMMENT, ZOD_PLUGIN_INDEX_GENERATOR_HEADER_COMMENT, camelCase, escapeString, extractPaths, generateFromConfig, generateParseRequestTypeParams, getBasePathTokenName, getClientContextTokenName, getInterceptorsTokenName, getRequestBodyType, getResponseType, getResponseTypeFromResponse, getTypeScriptType, hasDuplicateFunctionNames, inferResponseTypeFromContentType, isDataTypeInterface, isPrimitiveType, kebabCase, nullableType, pascalCase, pascalCaseForEnums, type placeHolder, screamingSnakeCase, validateInput };

package/index.js

@@ -78,6 +78,7 @@ __export(index_exports, {
   HTTP_RESOURCE_GENERATOR_HEADER_COMMENT: () => HTTP_RESOURCE_GENERATOR_HEADER_COMMENT,
   MAIN_INDEX_GENERATOR_HEADER_COMMENT: () => MAIN_INDEX_GENERATOR_HEADER_COMMENT,
   PROVIDER_GENERATOR_HEADER_COMMENT: () => PROVIDER_GENERATOR_HEADER_COMMENT,
+  REQUEST_PARAMS_GENERATOR_HEADER_COMMENT: () => REQUEST_PARAMS_GENERATOR_HEADER_COMMENT,
   SERVICE_GENERATOR_HEADER_COMMENT: () => SERVICE_GENERATOR_HEADER_COMMENT,
   SERVICE_INDEX_GENERATOR_HEADER_COMMENT: () => SERVICE_INDEX_GENERATOR_HEADER_COMMENT,
   SwaggerParser: () => SwaggerParser,
@@ -114,7 +115,7 @@ var import_ts_morph7 = require("ts-morph");
 
 // ../shared/src/utils/string.utils.ts
 function camelCase(str) {
-  return str.replace(/[-_.\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toLowerCase());
 }
 __name(camelCase, "camelCase");
 function kebabCase(str) {
@@ -122,7 +123,7 @@ function kebabCase(str) {
 }
 __name(kebabCase, "kebabCase");
 function pascalCase(str) {
-  return str.replace(/[-_.\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
+  return str.replace(/[-_\s]+(.)?/g, (_, char) => char ? char.toUpperCase() : "").replace(/^./, (char) => char.toUpperCase());
 }
 __name(pascalCase, "pascalCase");
 function screamingSnakeCase(str) {
@@ -237,12 +238,12 @@ function extractPaths(swaggerPaths = {}, methods = [
   "head"
 ]) {
   const paths = [];
-  Object.entries(swaggerPaths).forEach(([path12, pathItem]) => {
+  Object.entries(swaggerPaths).forEach(([path13, pathItem]) => {
     methods.forEach((method) => {
       if (pathItem[method]) {
         const operation = pathItem[method];
         paths.push({
-          path: path12,
+          path: path13,
           method: method.toUpperCase(),
           operationId: operation.operationId,
           summary: operation.summary,
@@ -480,6 +481,10 @@ var SERVICE_GENERATOR_HEADER_COMMENT = /* @__PURE__ */ __name((controllerName) =
 * Do not edit this file manually
 */
 `, "SERVICE_GENERATOR_HEADER_COMMENT");
+var REQUEST_PARAMS_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Generated request parameter interfaces
+* Do not edit this file manually
+*/
+`;
 var MAIN_INDEX_GENERATOR_HEADER_COMMENT = defaultHeaderComment + `* Entrypoint for the client
 * Do not edit this file manually
 */
@@ -2169,7 +2174,7 @@ var HttpParamsBuilderGenerator = _HttpParamsBuilderGenerator;
 
 // src/lib/generators/service/service.generator.ts
 var import_ts_morph6 = require("ts-morph");
-var path9 = __toESM(require("path"));
+var path10 = __toESM(require("path"));
 
 // src/lib/generators/service/service-method/service-method-body.generator.ts
 var _ServiceMethodBodyGenerator = class _ServiceMethodBodyGenerator {
@@ -2431,6 +2436,72 @@ return this.httpClient.${httpMethod}(url, requestOptions)${parseResponse};`;
 __name(_ServiceMethodBodyGenerator, "ServiceMethodBodyGenerator");
 var ServiceMethodBodyGenerator = _ServiceMethodBodyGenerator;
 
+// src/lib/generators/service/service-method/service-method-request-object.generator.ts
+var _ServiceMethodRequestObjectGenerator = class _ServiceMethodRequestObjectGenerator {
+  /** First-occurrence-wins dedupe, shared by the flat and single-request parameter builders. */
+  static dedupe(params) {
+    const seen = /* @__PURE__ */ new Set();
+    return params.filter((param) => {
+      if (seen.has(param.name)) {
+        return false;
+      }
+      seen.add(param.name);
+      return true;
+    });
+  }
+  static createEntry(interfaceName, parameters) {
+    return {
+      interfaceName,
+      parameters,
+      varName: this.resolveVarName(parameters),
+      isOptional: parameters.every((param) => param.hasQuestionToken)
+    };
+  }
+  static toRequestParameter(entry) {
+    return {
+      name: entry.varName,
+      type: entry.interfaceName,
+      hasQuestionToken: entry.isOptional
+    };
+  }
+  static toInterfaceProperties(entry) {
+    return entry.parameters.map((param) => ({
+      name: param.name,
+      type: param.type,
+      hasQuestionToken: param.hasQuestionToken
+    }));
+  }
+  /**
+   * The destructuring statement placed at the top of the method body so the
+   * existing body templates keep referencing plain local identifiers.
+   */
+  static toDestructureStatement(entry) {
+    const names = entry.parameters.map((param) => param.name).join(", ");
+    const source = entry.isOptional ? `${entry.varName} ?? {}` : entry.varName;
+    return `const { ${names} } = ${source};`;
+  }
+  /** Destructured properties share the method scope, so the request variable must not collide with them. */
+  static resolveVarName(parameters) {
+    const used = new Set(parameters.map((param) => param.name));
+    for (const candidate of [
+      "request",
+      "requestParams",
+      "requestParameters"
+    ]) {
+      if (!used.has(candidate)) {
+        return candidate;
+      }
+    }
+    let suffix = 2;
+    while (used.has(`requestParameters${suffix}`)) {
+      suffix++;
+    }
+    return `requestParameters${suffix}`;
+  }
+};
+__name(_ServiceMethodRequestObjectGenerator, "ServiceMethodRequestObjectGenerator");
+var ServiceMethodRequestObjectGenerator = _ServiceMethodRequestObjectGenerator;
+
 // src/lib/generators/service/service-method/service-method-params.generator.ts
 var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
   constructor(config, parser) {
@@ -2442,19 +2513,10 @@ var _ServiceMethodParamsGenerator = class _ServiceMethodParamsGenerator {
   generateMethodParameters(operation) {
     const params = this.generateApiParameters(operation);
     const optionsParam = this.addOptionsParameter(params);
-    const combined = [
+    return ServiceMethodRequestObjectGenerator.dedupe([
       ...params,
       ...optionsParam
-    ];
-    const seen = /* @__PURE__ */ new Set();
-    const uniqueParams = [];
-    for (const param of combined) {
-      if (!seen.has(param.name)) {
-        seen.add(param.name);
-        uniqueParams.push(param);
-      }
-    }
-    return uniqueParams;
+    ]);
   }
   generateApiParameters(operation) {
     var _a, _b, _c, _d, _e;
@@ -2564,7 +2626,7 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
     this.config = config;
     this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
-  generateMethodOverloads(operation) {
+  generateMethodOverloads(operation, requestObject) {
     const observeTypes = [
       "body",
       "response",
@@ -2573,38 +2635,35 @@ var _ServiceMethodOverloadsGenerator = class _ServiceMethodOverloadsGenerator {
     const overloads = [];
     const responseType = this.determineResponseTypeForOperation(operation);
     observeTypes.forEach((observe) => {
-      const overload = this.generateMethodOverload(operation, observe, responseType);
+      const overload = this.generateMethodOverload(operation, observe, responseType, requestObject);
       if (overload) {
         overloads.push(overload);
       }
     });
     return overloads;
   }
-  generateMethodOverload(operation, observe, responseType) {
+  generateMethodOverload(operation, observe, responseType, requestObject) {
     this.responseDataType = this.generateOverloadResponseType(operation);
-    const params = this.generateOverloadParameters(operation, observe, responseType);
+    const params = requestObject ? this.generateSingleRequestOverloadParameters(requestObject, observe, responseType) : this.generateOverloadParameters(operation, observe, responseType);
     const returnType = this.generateOverloadReturnType(observe);
     return {
       parameters: params,
       returnType
     };
   }
+  generateSingleRequestOverloadParameters(requestObject, observe, responseType) {
+    return [
+      ServiceMethodRequestObjectGenerator.toRequestParameter(requestObject),
+      ...this.addOverloadOptionsParameter(requestObject.parameters, observe, responseType)
+    ];
+  }
   generateOverloadParameters(operation, observe, responseType) {
     const params = this.paramsGenerator.generateApiParameters(operation);
     const optionsParam = this.addOverloadOptionsParameter(params, observe, responseType);
-    const combined = [
+    return ServiceMethodRequestObjectGenerator.dedupe([
       ...params,
       ...optionsParam
-    ];
-    const seen = /* @__PURE__ */ new Set();
-    const uniqueParams = [];
-    for (const param of combined) {
-      if (!seen.has(param.name)) {
-        seen.add(param.name);
-        uniqueParams.push(param);
-      }
-    }
-    return uniqueParams;
+    ]);
   }
   addOverloadOptionsParameter(params, observe, responseType) {
     return [
@@ -2684,12 +2743,16 @@ var _ServiceMethodGenerator = class _ServiceMethodGenerator {
     this.overloadsGenerator = new ServiceMethodOverloadsGenerator(config, parser);
     this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
   }
-  addServiceMethod(serviceClass, operation) {
+  addServiceMethod(serviceClass, operation, requestObject) {
     const methodName = this.generateMethodName(operation);
-    const parameters = this.paramsGenerator.generateMethodParameters(operation);
+    const parameters = requestObject ? this.generateSingleRequestParameters(requestObject) : this.paramsGenerator.generateMethodParameters(operation);
     const returnType = this.generateReturnType();
-    const methodBody = this.bodyGenerator.generateMethodBody(operation);
-    const methodOverLoads = this.overloadsGenerator.generateMethodOverloads(operation);
+    let methodBody = this.bodyGenerator.generateMethodBody(operation);
+    if (requestObject) {
+      methodBody = `${ServiceMethodRequestObjectGenerator.toDestructureStatement(requestObject)}
+${methodBody}`;
+    }
+    const methodOverLoads = this.overloadsGenerator.generateMethodOverloads(operation, requestObject);
     serviceClass.addMethod({
       name: methodName,
       parameters,
@@ -2701,6 +2764,12 @@ var _ServiceMethodGenerator = class _ServiceMethodGenerator {
       ] : void 0
     });
   }
+  generateSingleRequestParameters(requestObject) {
+    return [
+      ServiceMethodRequestObjectGenerator.toRequestParameter(requestObject),
+      ...this.paramsGenerator.addOptionsParameter(requestObject.parameters)
+    ];
+  }
   generateMethodName(operation) {
     if (this.config.options.customizeMethodName) {
       if (operation.operationId == null) {
@@ -2729,6 +2798,96 @@ var _ServiceMethodGenerator = class _ServiceMethodGenerator {
 __name(_ServiceMethodGenerator, "ServiceMethodGenerator");
 var ServiceMethodGenerator = _ServiceMethodGenerator;
 
+// src/lib/generators/service/request-params.generator.ts
+var path9 = __toESM(require("path"));
+var _RequestParamsGenerator = class _RequestParamsGenerator {
+  constructor(parser, project, config) {
+    __publicField(this, "project");
+    __publicField(this, "paramsGenerator");
+    __publicField(this, "registry", /* @__PURE__ */ new Map());
+    __publicField(this, "usedInterfaceNames", /* @__PURE__ */ new Set());
+    this.project = project;
+    this.paramsGenerator = new ServiceMethodParamsGenerator(config, parser);
+  }
+  buildRegistry(controllerGroups, getMethodName) {
+    Object.entries(controllerGroups).forEach(([controllerName, operations]) => {
+      operations.forEach((operation) => {
+        const parameters = ServiceMethodRequestObjectGenerator.dedupe(this.paramsGenerator.generateApiParameters(operation));
+        if (parameters.length === 0) {
+          return;
+        }
+        const reserved = parameters.find((param) => param.name === "observe" || param.name === "options");
+        if (reserved) {
+          throw new Error(`Parameter name '${reserved.name}' conflicts with the reserved '${reserved.name}' method parameter when useSingleRequestParameter is enabled: (${operation.method}) ${operation.path}`);
+        }
+        const interfaceName = this.reserveInterfaceName(controllerName, getMethodName(operation));
+        this.registry.set(operation, ServiceMethodRequestObjectGenerator.createEntry(interfaceName, parameters));
+      });
+    });
+    return this.registry;
+  }
+  generate(outputRoot) {
+    if (this.registry.size === 0) {
+      return;
+    }
+    const filePath = path9.join(outputRoot, "models", "request-params.ts");
+    const sourceFile = this.project.createSourceFile(filePath, "", {
+      overwrite: true
+    });
+    this.registry.forEach((entry, operation) => {
+      sourceFile.addInterface({
+        name: entry.interfaceName,
+        isExported: true,
+        properties: ServiceMethodRequestObjectGenerator.toInterfaceProperties(entry),
+        docs: operation.description ? [
+          operation.description
+        ] : void 0
+      });
+    });
+    sourceFile.fixMissingImports().formatText();
+    sourceFile.insertText(0, REQUEST_PARAMS_GENERATOR_HEADER_COMMENT);
+    sourceFile.saveSync();
+    this.addModelsBarrelExport(outputRoot);
+  }
+  /**
+   * Method names are only unique per service class, so interfaces sharing the
+   * global request-params file fall back to a controller-prefixed name on collision.
+   */
+  reserveInterfaceName(controllerName, methodName) {
+    const base = `${pascalCase(methodName)}Params`;
+    const candidates = [
+      base,
+      `${pascalCase(controllerName)}${base}`
+    ];
+    for (const candidate of candidates) {
+      if (!this.usedInterfaceNames.has(candidate)) {
+        this.usedInterfaceNames.add(candidate);
+        return candidate;
+      }
+    }
+    let suffix = 2;
+    while (this.usedInterfaceNames.has(`${candidates[1]}${suffix}`)) {
+      suffix++;
+    }
+    const name = `${candidates[1]}${suffix}`;
+    this.usedInterfaceNames.add(name);
+    return name;
+  }
+  addModelsBarrelExport(outputRoot) {
+    const modelsIndex = this.project.getSourceFile(path9.join(outputRoot, "models", "index.ts"));
+    if (!modelsIndex) {
+      return;
+    }
+    modelsIndex.addExportDeclaration({
+      moduleSpecifier: "./request-params"
+    });
+    modelsIndex.formatText();
+    modelsIndex.saveSync();
+  }
+};
+__name(_RequestParamsGenerator, "RequestParamsGenerator");
+var RequestParamsGenerator = _RequestParamsGenerator;
+
 // src/lib/generators/service/service.generator.ts
 var _ServiceGenerator = class _ServiceGenerator {
   constructor(parser, project, config) {
@@ -2737,6 +2896,7 @@ var _ServiceGenerator = class _ServiceGenerator {
     __publicField(this, "spec");
     __publicField(this, "config");
     __publicField(this, "methodGenerator");
+    __publicField(this, "requestObjects");
     this.config = config;
     this.project = project;
     this.parser = parser;
@@ -2749,24 +2909,29 @@ var _ServiceGenerator = class _ServiceGenerator {
   }
   generate(outputRoot) {
     return __async(this, null, function* () {
-      const outputDir = path9.join(outputRoot, "services");
+      const outputDir = path10.join(outputRoot, "services");
       const paths = extractPaths(this.spec.paths);
       if (paths.length === 0) {
         console.warn("No API paths found in the specification");
         return;
       }
       const controllerGroups = this.groupPathsByController(paths);
+      if (this.config.options.useSingleRequestParameter) {
+        const requestParamsGenerator = new RequestParamsGenerator(this.parser, this.project, this.config);
+        this.requestObjects = requestParamsGenerator.buildRegistry(controllerGroups, (operation) => this.methodGenerator.generateMethodName(operation));
+        requestParamsGenerator.generate(outputRoot);
+      }
       yield Promise.all(Object.entries(controllerGroups).map(([controllerName, operations]) => this.generateServiceFile(controllerName, operations, outputDir)));
     });
   }
   groupPathsByController(paths) {
     const groups = {};
-    paths.forEach((path12) => {
+    paths.forEach((path13) => {
       let controllerName = "Default";
-      if (path12.tags && path12.tags.length > 0) {
-        controllerName = path12.tags[0];
+      if (path13.tags && path13.tags.length > 0) {
+        controllerName = path13.tags[0];
       } else {
-        const pathParts = path12.path.split("/").filter((p) => p && !p.startsWith("{"));
+        const pathParts = path13.path.split("/").filter((p) => p && !p.startsWith("{"));
         if (pathParts.length > 1) {
           controllerName = pascalCase(pathParts[1]);
         }
@@ -2775,14 +2940,14 @@ var _ServiceGenerator = class _ServiceGenerator {
       if (!groups[controllerName]) {
         groups[controllerName] = [];
       }
-      groups[controllerName].push(path12);
+      groups[controllerName].push(path13);
     });
     return groups;
   }
   generateServiceFile(controllerName, operations, outputDir) {
     return __async(this, null, function* () {
       const fileName = `${camelCase(controllerName)}.service.ts`;
-      const filePath = path9.join(outputDir, fileName);
+      const filePath = path10.join(outputDir, fileName);
       const sourceFile = this.project.createSourceFile(filePath, "", {
         overwrite: true
       });
@@ -2884,7 +3049,8 @@ var _ServiceGenerator = class _ServiceGenerator {
 return context.set(this.clientContextToken, '${this.config.clientName || "default"}');`
     });
     operations.forEach((operation) => {
-      this.methodGenerator.addServiceMethod(serviceClass, operation);
+      var _a;
+      this.methodGenerator.addServiceMethod(serviceClass, operation, (_a = this.requestObjects) == null ? void 0 : _a.get(operation));
     });
     if (hasDuplicateFunctionNames(serviceClass.getMethods())) {
       throw new Error(`Duplicate method names found in service class ${className}. Please ensure unique method names for each operation.`);
@@ -2896,15 +3062,15 @@ var ServiceGenerator = _ServiceGenerator;
 
 // src/lib/generators/service/service-index.generator.ts
 var fs2 = __toESM(require("fs"));
-var path10 = __toESM(require("path"));
+var path11 = __toESM(require("path"));
 var _ServiceIndexGenerator = class _ServiceIndexGenerator {
   constructor(project) {
     __publicField(this, "project");
     this.project = project;
   }
   generateIndex(outputRoot) {
-    const servicesDir = path10.join(outputRoot, "services");
-    const indexPath = path10.join(servicesDir, "index.ts");
+    const servicesDir = path11.join(outputRoot, "services");
+    const indexPath = path11.join(servicesDir, "index.ts");
     const sourceFile = this.project.createSourceFile(indexPath, "", {
       overwrite: true
     });
@@ -2927,7 +3093,7 @@ var ServiceIndexGenerator = _ServiceIndexGenerator;
 
 // src/lib/core/generator.ts
 var fs3 = __toESM(require("fs"));
-var path11 = __toESM(require("path"));
+var path12 = __toESM(require("path"));
 function validateInput(inputPath) {
   if (isUrl(inputPath)) {
     return;
@@ -2935,7 +3101,7 @@ function validateInput(inputPath) {
   if (!fs3.existsSync(inputPath)) {
     throw new Error(`Input file not found: ${inputPath}`);
   }
-  const extension = path11.extname(inputPath).toLowerCase();
+  const extension = path12.extname(inputPath).toLowerCase();
   const supportedExtensions = [
     ".json",
     ".yaml",
@@ -3031,6 +3197,7 @@ __name(generateFromConfig, "generateFromConfig");
   HTTP_RESOURCE_GENERATOR_HEADER_COMMENT,
   MAIN_INDEX_GENERATOR_HEADER_COMMENT,
   PROVIDER_GENERATOR_HEADER_COMMENT,
+  REQUEST_PARAMS_GENERATOR_HEADER_COMMENT,
   SERVICE_GENERATOR_HEADER_COMMENT,
   SERVICE_INDEX_GENERATOR_HEADER_COMMENT,
   SwaggerParser,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ng-openapi",
-    "version": "0.2.22-pr-91-bugfix-nested-objects-parameter-fb5e988.0",
+    "version": "0.2.22-pr-92-feature-single-request-parameter-0b340a2.0",
     "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications",
     "keywords": [
         "ng-openapi",