- Working solution for export client

Author: ferdikoomen

src/index.ts

@@ -39,13 +39,13 @@ export type Options = {
  * @param clientName Custom client class name
  * @param useOptions Use options or arguments functions
  * @param useUnionTypes Use union types instead of enums
- * @param exportCore: Generate core client classes
- * @param exportServices: Generate services
- * @param exportModels: Generate models
- * @param exportSchemas: Generate schemas
- * @param indent: Indentation options (4, 2 or tab)
- * @param postfix: Service name postfix
- * @param request: Path to custom request file
+ * @param exportCore Generate core client classes
+ * @param exportServices Generate services
+ * @param exportModels Generate models
+ * @param exportSchemas Generate schemas
+ * @param indent Indentation options (4, 2 or tab)
+ * @param postfix Service name postfix
+ * @param request Path to custom request file
  * @param write Write the files to disk (true or false)
  */
 export const generate = async ({

src/openApi/v2/parser/getOperation.ts

@@ -5,7 +5,6 @@ import type { OpenApiOperation } from '../interfaces/OpenApiOperation';
 import { getOperationErrors } from './getOperationErrors';
 import { getOperationName } from './getOperationName';
 import { getOperationParameters } from './getOperationParameters';
-import { getOperationPath } from './getOperationPath';
 import { getOperationResponseHeader } from './getOperationResponseHeader';
 import { getOperationResponses } from './getOperationResponses';
 import { getOperationResults } from './getOperationResults';
@@ -22,7 +21,6 @@ export const getOperation = (
 ): Operation => {
     const serviceName = getServiceName(tag);
     const operationName = getOperationName(op.operationId || `${method}`);
-    const operationPath = getOperationPath(url);
 
     // Create a new operation object for this method.
     const operation: Operation = {
@@ -32,7 +30,7 @@ export const getOperation = (
         description: op.description || null,
         deprecated: op.deprecated === true,
         method: method.toUpperCase(),
-        path: operationPath,
+        path: url,
         parameters: [...pathParams.parameters],
         parametersPath: [...pathParams.parametersPath],
         parametersQuery: [...pathParams.parametersQuery],

src/openApi/v2/parser/getOperationPath.spec.ts

@@ -6,7 +6,6 @@ import type { OpenApiRequestBody } from '../interfaces/OpenApiRequestBody';
 import { getOperationErrors } from './getOperationErrors';
 import { getOperationName } from './getOperationName';
 import { getOperationParameters } from './getOperationParameters';
-import { getOperationPath } from './getOperationPath';
 import { getOperationRequestBody } from './getOperationRequestBody';
 import { getOperationResponseHeader } from './getOperationResponseHeader';
 import { getOperationResponses } from './getOperationResponses';
@@ -25,7 +24,6 @@ export const getOperation = (
 ): Operation => {
     const serviceName = getServiceName(tag);
     const operationName = getOperationName(op.operationId || `${method}`);
-    const operationPath = getOperationPath(url);
 
     // Create a new operation object for this method.
     const operation: Operation = {
@@ -35,7 +33,7 @@ export const getOperation = (
         description: op.description || null,
         deprecated: op.deprecated === true,
         method: method.toUpperCase(),
-        path: operationPath,
+        path: url,
         parameters: [...pathParams.parameters],
         parametersPath: [...pathParams.parametersPath],
         parametersQuery: [...pathParams.parametersQuery],

src/openApi/v2/parser/getOperationPath.ts

@@ -14,9 +14,9 @@ type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest;
 
 export class {{{clientName}}} {
 
-{{#each services}}
+	{{#each services}}
 	public readonly {{{camelCase name}}}: {{{name}}}{{{@root.postfix}}};
-{{/each}}
+	{{/each}}
 
 	private readonly request: BaseHttpRequest;
 

src/openApi/v3/parser/getOperation.ts

@@ -2,7 +2,8 @@
 
 export type ApiRequestOptions = {
 	readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
-	readonly path: string;
+	readonly url: string;
+	readonly path?: Record<string, any>;
 	readonly cookies?: Record<string, any>;
 	readonly headers?: Record<string, any>;
 	readonly query?: Record<string, any>;

src/openApi/v3/parser/getOperationPath.spec.ts

@@ -5,6 +5,7 @@ import type { CancelablePromise } from './CancelablePromise';
 import type { OpenAPIConfig } from './OpenAPI';
 
 export class BaseHttpRequest {
+
 	protected readonly config: OpenAPIConfig;
 
 	constructor(config: OpenAPIConfig) {