Skip to content

Commit 975d44e

Browse files
ferdikoomenferdikoomen
committed
- Adding wip for Angular client
1 parent 40ef68f commit 975d44e

23 files changed

+363
-77
lines changed

‎bin/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const params = program
1212
.version(pkg.version)
1313
.requiredOption('-i, --input <value>', 'OpenAPI specification, can be a path, url or string content (required)')
1414
.requiredOption('-o, --output <value>', 'Output directory (required)')
15-
.option('-c, --client <value>', 'HTTP client to generate [fetch, xhr, node, axios]', 'fetch')
15+
.option('-c, --client <value>', 'HTTP client to generate [fetch, xhr, node, axios, angular]', 'fetch')
1616
.option('--useOptions', 'Use options instead of arguments')
1717
.option('--useUnionTypes', 'Use union types instead of enums')
1818
.option('--exportCore <value>', 'Write core files to disk', true)

‎package.json‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,15 @@
5858
"codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b"
5959
},
6060
"dependencies": {
61-
"@types/node-fetch": "^2.5.12",
62-
"abort-controller": "^3.0.0",
63-
"axios": "^0.25.0",
6461
"camelcase": "^6.3.0",
6562
"commander": "^8.3.0",
66-
"form-data": "^4.0.0",
6763
"handlebars": "^4.7.6",
68-
"json-schema-ref-parser": "^9.0.7",
69-
"node-fetch": "^2.6.6"
64+
"json-schema-ref-parser": "^9.0.7"
7065
},
7166
"devDependencies": {
67+
"@angular/common": "13.1.3",
68+
"@angular/core": "13.1.3",
69+
"@angular/platform-browser": "13.1.3",
7270
"@babel/cli": "7.16.8",
7371
"@babel/core": "7.16.12",
7472
"@babel/preset-env": "7.16.11",
@@ -80,27 +78,34 @@
8078
"@types/glob": "7.2.0",
8179
"@types/jest": "27.4.0",
8280
"@types/node": "17.0.10",
81+
"@types/node-fetch": "^2.5.12",
8382
"@types/qs": "6.9.7",
84-
"@typescript-eslint/eslint-plugin": "5.10.0",
85-
"@typescript-eslint/parser": "5.10.0",
83+
"@typescript-eslint/eslint-plugin": "5.10.1",
84+
"@typescript-eslint/parser": "5.10.1",
85+
"abort-controller": "^3.0.0",
86+
"axios": "^0.25.0",
8687
"codecov": "3.8.3",
8788
"eslint": "8.7.0",
8889
"eslint-config-prettier": "8.3.0",
8990
"eslint-plugin-prettier": "4.0.0",
9091
"eslint-plugin-simple-import-sort": "7.0.0",
9192
"express": "4.17.2",
93+
"form-data": "^4.0.0",
9294
"glob": "7.2.0",
9395
"jest": "27.4.7",
9496
"jest-cli": "27.4.7",
97+
"node-fetch": "^2.6.6",
9598
"prettier": "2.5.1",
9699
"puppeteer": "13.1.1",
97100
"qs": "6.10.3",
98101
"rimraf": "^3.0.2",
99102
"rollup": "2.66.0",
100103
"rollup-plugin-node-externals": "3.1.2",
101104
"rollup-plugin-terser": "7.0.2",
105+
"rxjs": "7.5.2",
102106
"ts-node": "10.4.0",
103107
"tslib": "2.3.1",
104-
"typescript": "4.5.5"
108+
"typescript": "4.5.5",
109+
"zone.js": "0.11.4"
105110
}
106111
}

‎src/HttpClient.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ export enum HttpClient {
33
XHR = 'xhr',
44
NODE = 'node',
55
AXIOS = 'axios',
6+
ANGULAR = 'angular',
67
}

‎src/templates/core/angular/getHeaders.hbs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
async function getHeaders(options: ApiRequestOptions): Promise<HttpHeaders> {
2+
const token = await resolve(options, OpenAPI.TOKEN);
3+
const username = await resolve(options, OpenAPI.USERNAME);
4+
const password = await resolve(options, OpenAPI.PASSWORD);
5+
const additionalHeaders = await resolve(options, OpenAPI.HEADERS);
6+
7+
const defaultHeaders = Object.entries({
8+
Accept: 'application/json',
9+
...additionalHeaders,
10+
...options.headers,
11+
})
12+
.filter(([_, value]) => isDefined(value))
13+
.reduce((headers, [key, value]) => ({
14+
...headers,
15+
[key]: String(value),
16+
}), {} as Record<string, string>);
17+
18+
const headers = new HttpHeaders(defaultHeaders);
19+
20+
if (isStringWithValue(token)) {
21+
headers.append('Authorization', `Bearer ${token}`);
22+
}
23+
24+
if (isStringWithValue(username) && isStringWithValue(password)) {
25+
const credentials = base64(`${username}:${password}`);
26+
headers.append('Authorization', `Basic ${credentials}`);
27+
}
28+
29+
if (options.body) {
30+
if (options.mediaType) {
31+
headers.append('Content-Type', options.mediaType);
32+
} else if (isBlob(options.body)) {
33+
headers.append('Content-Type', options.body.type || 'application/octet-stream');
34+
} else if (isString(options.body)) {
35+
headers.append('Content-Type', 'text/plain');
36+
} else if (!isFormData(options.body)) {
37+
headers.append('Content-Type', 'application/json');
38+
}
39+
}
40+
41+
return headers;
42+
}

‎src/templates/core/angular/getRequestBody.hbs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
function getRequestBody(options: ApiRequestOptions): BodyInit | undefined {
2+
if (options.body) {
3+
if (options.mediaType?.includes('/json')) {
4+
return JSON.stringify(options.body)
5+
} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
6+
return options.body;
7+
} else {
8+
return JSON.stringify(options.body);
9+
}
10+
}
11+
return;
12+
}

‎src/templates/core/angular/getResponseBody.hbs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
async function getResponseBody(response: Response): Promise<any> {
2+
if (response.status !== 204) {
3+
try {
4+
const contentType = response.headers.get('Content-Type');
5+
if (contentType) {
6+
const isJSON = contentType.toLowerCase().startsWith('application/json');
7+
if (isJSON) {
8+
return await response.json();
9+
} else {
10+
return await response.text();
11+
}
12+
}
13+
} catch (error) {
14+
console.error(error);
15+
}
16+
}
17+
return;
18+
}

‎src/templates/core/angular/getResponseHeader.hbs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
function getResponseHeader(response: Response, responseHeader?: string): string | undefined {
2+
if (responseHeader) {
3+
const content = response.headers.get(responseHeader);
4+
if (isString(content)) {
5+
return content;
6+
}
7+
}
8+
return;
9+
}

‎src/templates/core/angular/request.hbs‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
{{>header}}
2+
3+
import { HttpClient, HttpHeaders } from '@angular/common/http';
4+
import { Observable } from 'rxjs';
5+
6+
import { ApiError } from './ApiError';
7+
import type { ApiRequestOptions } from './ApiRequestOptions';
8+
import type { ApiResult } from './ApiResult';
9+
import { CancelablePromise } from './CancelablePromise';
10+
import type { OnCancel } from './CancelablePromise';
11+
import { OpenAPI } from './OpenAPI';
12+
13+
{{>functions/isDefined}}
14+
15+
16+
{{>functions/isString}}
17+
18+
19+
{{>functions/isStringWithValue}}
20+
21+
22+
{{>functions/isBlob}}
23+
24+
25+
{{>functions/isFormData}}
26+
27+
28+
{{>functions/base64}}
29+
30+
31+
{{>functions/getQueryString}}
32+
33+
34+
{{>functions/getUrl}}
35+
36+
37+
{{>functions/getFormData}}
38+
39+
40+
{{>functions/resolve}}
41+
42+
43+
{{>angular/getHeaders}}
44+
45+
46+
{{>angular/getRequestBody}}
47+
48+
49+
{{>angular/sendRequest}}
50+
51+
52+
{{>angular/getResponseHeader}}
53+
54+
55+
{{>angular/getResponseBody}}
56+
57+
58+
{{>functions/catchErrors}}
59+
60+
61+
/**
62+
* Request using fetch client
63+
* @param http The Angular HTTP client
64+
* @param options The request options from the service
65+
* @returns CancelablePromise<T>
66+
* @throws ApiError
67+
*/
68+
export function request<T>(http: HttpClient, options: ApiRequestOptions): Observable<T> {
69+
return new CancelablePromise<T>(async (resolve, reject, onCancel) => {
70+
try {
71+
const url = getUrl(options);
72+
const formData = getFormData(options);
73+
const body = getRequestBody(options);
74+
const headers = await getHeaders(options);
75+
76+
if (!onCancel.isCancelled) {
77+
const response = await sendRequest(options, url, formData, body, headers, onCancel);
78+
const responseBody = await getResponseBody(response);
79+
const responseHeader = getResponseHeader(response, options.responseHeader);
80+
81+
const result: ApiResult = {
82+
url,
83+
ok: response.ok,
84+
status: response.status,
85+
statusText: response.statusText,
86+
body: responseHeader || responseBody,
87+
};
88+
89+
catchErrors(options, result);
90+
91+
resolve(result.body);
92+
}
93+
} catch (error) {
94+
reject(error);
95+
}
96+
});
97+
}

‎src/templates/core/angular/sendRequest.hbs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
async function sendRequest(
2+
options: ApiRequestOptions,
3+
url: string,
4+
formData: FormData | undefined,
5+
body: BodyInit | undefined,
6+
headers: Headers,
7+
onCancel: OnCancel
8+
): Promise<Response> {
9+
const controller = new AbortController();
10+
11+
const request: RequestInit = {
12+
headers,
13+
body: body || formData,
14+
method: options.method,
15+
signal: controller.signal,
16+
};
17+
18+
if (OpenAPI.WITH_CREDENTIALS) {
19+
request.credentials = OpenAPI.CREDENTIALS;
20+
}
21+
22+
onCancel(() => controller.abort());
23+
24+
return await fetch(url, request);
25+
}

‎src/templates/core/axios/request.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { OpenAPI } from './OpenAPI';
6565
* @throws ApiError
6666
*/
6767
export function request<T>(options: ApiRequestOptions): CancelablePromise<T> {
68-
return new CancelablePromise(async (resolve, reject, onCancel) => {
68+
return new CancelablePromise<T>(async (resolve, reject, onCancel) => {
6969
try {
7070
const url = getUrl(options);
7171
const formData = getFormData(options);

0 commit comments

Comments
 (0)