adding TweedBaseContext as required parameter in generated client

paytweed · Oct 30, 2024 · b807cc8 · b807cc8
1 parent 31aaf72
commit b807cc8
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/src/client/interfaces/OperationParameter.d.ts b/src/client/interfaces/OperationParameter.d.ts
@@ -1,7 +1,7 @@
 import type { Model } from './Model';
 
 export interface OperationParameter extends Model {
-    in: 'path' | 'query' | 'header' | 'formData' | 'body' | 'cookie';
+    in: 'path' | 'query' | 'header' | 'formData' | 'body' | 'cookie' | 'param';
     prop: string;
     mediaType: string | null;
 }
diff --git a/src/openApi/v2/parser/getOperation.ts b/src/openApi/v2/parser/getOperation.ts
@@ -70,6 +70,27 @@ export const getOperation = (
         });
     }
 
+    operation.parameters.push({
+        name: 'context',
+        type: 'TweedBaseContext',
+        in: 'param',
+        base: 'TweedBaseContext',
+        description: 'Tweed context for context propagation',
+        export: 'generic',
+        isDefinition: false,
+        isNullable: false,
+        isReadOnly: false,
+        isRequired: true,
+        link: null,
+        mediaType: null,
+        prop: '',
+        properties: [],
+        enum: [],
+        enums: [],
+        imports: [],
+        template: null,
+    });
+
     operation.parameters = operation.parameters.sort(sortByRequired);
 
     return operation;

diff --git a/src/openApi/v3/parser/getOperation.ts b/src/openApi/v3/parser/getOperation.ts
@@ -82,6 +82,26 @@ export const getOperation = (
     }
 
     operation.parameters = operation.parameters.sort(sortByRequired);
+    operation.parameters.push({
+        name: 'context',
+        type: 'TweedBaseContext',
+        in: 'param',
+        base: 'TweedBaseContext',
+        description: 'Tweed context for context propagation',
+        export: 'generic',
+        isDefinition: false,
+        isNullable: false,
+        isReadOnly: false,
+        isRequired: true,
+        link: null,
+        mediaType: null,
+        prop: '',
+        properties: [],
+        enum: [],
+        enums: [],
+        imports: [],
+        template: null,
+    });
 
     return operation;
 };
diff --git a/src/templates/core/ApiRequestOptions.hbs b/src/templates/core/ApiRequestOptions.hbs
@@ -1,10 +1,12 @@
 {{>header}}
-import { TweedBaseContext } from "@paytweed/context";
+
+
+import { TweedBaseContext } from '@paytweed/context';
 
 export type ApiRequestOptions = {
 	readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
 	readonly url: string;
-	readonly context: TweedContext
+	readonly context: TweedBaseContext
 	readonly path?: Record<string, any>;
 	readonly cookies?: Record<string, any>;
 	readonly headers?: Record<string, any>;

diff --git a/src/templates/core/BaseHttpRequest.hbs b/src/templates/core/BaseHttpRequest.hbs
@@ -8,7 +8,7 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { OpenAPIConfig } from './OpenAPI';
 {{else}}
 import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { CancelablePromise } from './CancelablePromise';
+import { AxiosResponse } from '@paytweed/http-client';
 import type { OpenAPIConfig } from './OpenAPI';
 {{/equals}}
 
@@ -26,6 +26,6 @@ export abstract class BaseHttpRequest {
 	{{#equals @root.httpClient 'angular'}}
 	public abstract request<T>(options: ApiRequestOptions): Observable<T>;
 	{{else}}
-	public abstract request<T>(options: ApiRequestOptions): CancelablePromise<T>;
+	public abstract request<T>(options: ApiRequestOptions): Promise<AxiosResponse<T>>;
 	{{/equals}}
 }
diff --git a/src/templates/exportService.hbs b/src/templates/exportService.hbs
@@ -18,7 +18,8 @@ import type { {{{this}}} } from '../models/{{{this}}}';
 
 {{/if}}
 {{#notEquals @root.httpClient 'angular'}}
-import type { CancelablePromise } from '../core/CancelablePromise';
+import { AxiosResponse } from '@paytweed/http-client';
+import { TweedBaseContext } from '@paytweed/context';
 {{/notEquals}}
 {{#if @root.exportClient}}
 {{#equals @root.httpClient 'angular'}}
@@ -75,20 +76,21 @@ export class {{{name}}}{{{@root.postfix}}} {
 	public {{{name}}}({{>parameters}}): Observable<{{>result}}> {
 		return this.httpRequest.request({
 	{{else}}
-	public {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> {
+	public {{{name}}}({{>parameters}}): Promise<AxiosResponse<{{>result}}>> {
 		return this.httpRequest.request({
 	{{/equals}}
 	{{else}}
 	{{#equals @root.httpClient 'angular'}}
 	public {{{name}}}({{>parameters}}): Observable<{{>result}}> {
 		return __request(OpenAPI, this.http, {
 	{{else}}
-	public static {{{name}}}({{>parameters}}): CancelablePromise<{{>result}}> {
+	public static {{{name}}}({{>parameters}}): Promise<AxiosResponse<{{>result}}>> {
 		return __request(OpenAPI, {
 	{{/equals}}
 	{{/if}}
 			method: '{{{method}}}',
 			url: '{{{path}}}',
+			context,
 			{{#if parametersPath}}
 			path: {
 				{{#each parametersPath}}