feat: useOptions for Parameters separating body to new object.

Author: moretalk

src/templates/core/BaseHttpRequest.hbs

@@ -5,9 +5,9 @@ import type { OpenAPIConfig } from './OpenAPI';
 import type { CancelablePromise } from './CancelablePromise';
 
 export class BaseHttpRequest {
-    readonly openApiConfig: OpenAPIConfig;
+    readonly openApiConfig: OpenAPIConfig2;
 
-    constructor(openApiConfig: OpenAPIConfig) {
+    constructor(openApiConfig: OpenAPIConfig2) {
         this.openApiConfig = openApiConfig;
     }
 

src/templates/core/OpenAPI.hbs

@@ -3,14 +3,23 @@
 import type { ApiRequestOptions } from './ApiRequestOptions';
 
 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
-type Headers = Record<string, string>;
 
 export type OpenAPIConfig = {
     edge?: string;
     token?: string | Resolver<string>;
     accountSid?: string | Resolver<string>;
     authToken?: string | Resolver<string>;
 }
+
+export type OpenAPIConfig2 = {
+    base: string;
+    version: string;
+    edge: string;
+    token?: string | Resolver<string>;
+    accountSid?: string | Resolver<string>;
+    authToken?: string | Resolver<string>;
+}
+
 {{#unless @root.exportClient}}
 
 export const OpenAPI: OpenAPIConfig = {

src/templates/exportAppClient.hbs

@@ -1,7 +1,7 @@
 {{>header}}
 
 import { BaseHttpRequest } from './core/BaseHttpRequest';
-import type { OpenAPIConfig } from './core/OpenAPI';
+import type { OpenAPIConfig, OpenAPIConfig2 } from './core/OpenAPI';
 import { {{{httpClientRequest}}} } from './core/{{{httpClientRequest}}}';
 {{#if services}}
 {{#each services}}
@@ -18,15 +18,14 @@ export class {{{clientName}}} {{#if service}}extends {{{service.name}}} {{/if}}{
 {{/each}}
     readonly request: BaseHttpRequest;
 
-    constructor(openApiConfig?: OpenAPIConfig, HttpRequest: new (config: OpenAPIConfig) => BaseHttpRequest = {{{httpClientRequest}}}) {
+    constructor(openApiConfig?: OpenAPIConfig, HttpRequest: new (config: OpenAPIConfig2) => BaseHttpRequest = {{{httpClientRequest}}}) {
         {{#if service}}const request{{else}}this.request{{/if}} = new HttpRequest({
             base: '{{{server}}}',
             edge: openApiConfig?.edge ?? '{{#if server.edgeRegions}}{{server.edgeRegions.[0]}}{{else}}gll{{/if}}',
             version: '{{{version}}}',
             token: openApiConfig?.token,
             accountSid: openApiConfig?.accountSid,
-            authToken: openApiConfig?.authToken,
-            headers: openApiConfig?.headers
+            authToken: openApiConfig?.authToken
         });
         {{#if service}}
         super(request);

src/templates/partials/parameters.hbs

@@ -1,17 +1,21 @@
 {{#if parameters}}
 {{#if @root.useOptions~}}
+{{#each parameters}}
+{{#equals name 'requestBody'}}{{{name}}}{{>isRequired}}: Writeable<{{>type}}>,{{/equals}}
+{{/each}}
 {
 {{#each parameters}}
-{{{name}}}{{#if default}} = {{{default}}}{{/if}},
+{{#notEquals name 'requestBody'}}{{{name}}}{{#if default}} = {{{default}}}{{/if}},{{/notEquals}}
 {{/each}}
 }: {
 {{#each parameters}}
 {{#if description}}
 /** {{{description}}} **/
 {{/if}}
-{{{name}}}{{>isRequired}}: {{#equals name 'requestBody'}}Writeable<{{>type}}>{{else}}{{>type}}{{/equals}},
+{{#notEquals name 'requestBody'}}{{{name}}}{{>isRequired}}: {{>type}},{{/notEquals}}
 {{/each}}
 }
+
 {{~else}}
 
 {{#each parameters}}