@goast/typescript 0.2.14 → 0.2.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -1,11 +1,11 @@
1
- # typescript
2
-
3
- This library was generated with [Nx](https://nx.dev).
4
-
5
- ## Building
6
-
7
- Run `nx build typescript` to build the library.
8
-
9
- ## Running unit tests
10
-
11
- Run `nx test typescript` to execute the unit tests via [Jest](https://jestjs.io).
1
+ # typescript
2
+
3
+ This library was generated with [Nx](https://nx.dev).
4
+
5
+ ## Building
6
+
7
+ Run `nx build typescript` to build the library.
8
+
9
+ ## Running unit tests
10
+
11
+ Run `nx test typescript` to execute the unit tests via [Jest](https://jestjs.io).
@@ -1,14 +1,28 @@
1
1
  import { HttpErrorResponse, HttpEvent, HttpResponse } from '@angular/common/http';
2
- import { Observable, filter, firstValueFrom } from 'rxjs';
2
+ import { Observable, Subscription, filter, take, map, catchError, EMPTY } from 'rxjs';
3
3
 
4
- export async function waitForResponse<T extends HttpResponse<any> | HttpErrorResponse>(
4
+ export type AbortablePromise<T> = {
5
+ abort(): void;
6
+ then<TResult1 = T, TResult2 = never>(
7
+ onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
8
+ onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
9
+ ): AbortablePromise<TResult1 | TResult2>;
10
+ catch<TResult = never>(
11
+ onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
12
+ ): AbortablePromise<T | TResult>;
13
+ finally(onfinally?: (() => void) | undefined | null): AbortablePromise<T>;
14
+ };
15
+
16
+ export function waitForResponse<T extends HttpResponse<any> | HttpErrorResponse>(
5
17
  httpEvents: Observable<HttpEvent<any>>,
6
18
  options: { errorResponseTypes: Record<number, 'text' | 'json'> },
7
- ): Promise<T> {
8
- try {
9
- const response = await firstValueFrom(httpEvents.pipe(filter((event) => event instanceof HttpResponse)));
10
- return response as T;
11
- } catch (error) {
19
+ ): AbortablePromise<T> {
20
+ return firstValueFromAbortable<T>(
21
+ httpEvents.pipe(
22
+ filter((event) => event instanceof HttpResponse),
23
+ map((response) => response as T),
24
+ ),
25
+ ).catch((error) => {
12
26
  if (error instanceof HttpErrorResponse) {
13
27
  if (options.errorResponseTypes[error.status] === 'json' && typeof error.error === 'string') {
14
28
  return new HttpErrorResponse({
@@ -22,5 +36,45 @@ export async function waitForResponse<T extends HttpResponse<any> | HttpErrorRes
22
36
  return error as T;
23
37
  }
24
38
  throw error;
25
- }
39
+ });
40
+ }
41
+
42
+ function firstValueFromAbortable<T>(observable: Observable<T>): AbortablePromise<T> {
43
+ let subscription: Subscription | undefined = undefined;
44
+ let _reject: ((reason?: any) => void) | undefined = undefined;
45
+ const abortFn = () => {
46
+ if (!subscription) {
47
+ throw new Error('Not subscribed yet.');
48
+ }
49
+ subscription.unsubscribe();
50
+ _reject?.(new DOMException('The request has been aborted.', 'AbortError'));
51
+ };
52
+
53
+ return createAbortablePromise(
54
+ new Promise<T>((resolve, reject) => {
55
+ _reject = reject;
56
+ subscription = observable
57
+ .pipe(
58
+ take(1),
59
+ catchError((e: unknown) => {
60
+ reject(e);
61
+ return EMPTY;
62
+ }),
63
+ )
64
+ .subscribe((x: T) => resolve(x));
65
+ }),
66
+ abortFn,
67
+ );
68
+ }
69
+
70
+ function createAbortablePromise<T>(promise: Promise<T>, abortFn: () => void) {
71
+ const thenFn = promise.then.bind(promise);
72
+ const catchFn = promise.catch.bind(promise);
73
+ const finallyFn = promise.finally?.bind(promise);
74
+ return Object.assign(promise, {
75
+ then: (...args: any[]) => createAbortablePromise(thenFn(...args), abortFn),
76
+ catch: (...args: any[]) => createAbortablePromise(catchFn(...args), abortFn),
77
+ finally: finallyFn ? (...args: any[]) => createAbortablePromise(finallyFn(...args), abortFn) : undefined,
78
+ abort: abortFn,
79
+ });
26
80
  }
@@ -1,372 +1,372 @@
1
- import { HttpRequest, HttpParameterCodec, HttpParams, HttpHeaders, HttpContext } from '@angular/common/http';
2
-
3
- /**
4
- * Custom parameter codec to correctly handle the plus sign in parameter
5
- * values. See https://github.com/angular/angular/issues/18261
6
- */
7
- class ParameterCodec implements HttpParameterCodec {
8
- encodeKey(key: string): string {
9
- return encodeURIComponent(key);
10
- }
11
-
12
- encodeValue(value: string): string {
13
- return encodeURIComponent(value);
14
- }
15
-
16
- decodeKey(key: string): string {
17
- return decodeURIComponent(key);
18
- }
19
-
20
- decodeValue(value: string): string {
21
- return decodeURIComponent(value);
22
- }
23
- }
24
- const ParameterCodecInstance = new ParameterCodec();
25
-
26
- /**
27
- * Defines the options for appending a parameter
28
- */
29
- interface ParameterOptions {
30
- style?: string;
31
- explode?: boolean;
32
- }
33
-
34
- /**
35
- * Base class for a parameter
36
- */
37
- abstract class Parameter {
38
- constructor(
39
- public name: string,
40
- public value: any,
41
- public options: ParameterOptions,
42
- defaultStyle: string,
43
- defaultExplode: boolean,
44
- ) {
45
- this.options = options || {};
46
- if (this.options.style === null || this.options.style === undefined) {
47
- this.options.style = defaultStyle;
48
- }
49
- if (this.options.explode === null || this.options.explode === undefined) {
50
- this.options.explode = defaultExplode;
51
- }
52
- }
53
-
54
- serializeValue(value: any, separator = ','): string {
55
- if (value === null || value === undefined) {
56
- return '';
57
- } else if (value instanceof Array) {
58
- return value
59
- .map((v) => this.serializeValue(v).split(separator).join(encodeURIComponent(separator)))
60
- .join(separator);
61
- } else if (typeof value === 'object') {
62
- const array: string[] = [];
63
- for (const key of Object.keys(value)) {
64
- let propVal = value[key];
65
- if (propVal !== null && propVal !== undefined) {
66
- propVal = this.serializeValue(propVal).split(separator).join(encodeURIComponent(separator));
67
- if (this.options.explode) {
68
- array.push(`${key}=${propVal}`);
69
- } else {
70
- array.push(key);
71
- array.push(propVal);
72
- }
73
- }
74
- }
75
- return array.join(separator);
76
- } else {
77
- return String(value);
78
- }
79
- }
80
- }
81
-
82
- /**
83
- * A parameter in the operation path
84
- */
85
- class PathParameter extends Parameter {
86
- constructor(name: string, value: any, options: ParameterOptions) {
87
- super(name, value, options, 'simple', false);
88
- }
89
-
90
- append(path: string): string {
91
- let value = this.value;
92
- if (value === null || value === undefined) {
93
- value = '';
94
- }
95
- let prefix = this.options.style === 'label' ? '.' : '';
96
- const separator = this.options.explode ? (prefix === '' ? ',' : prefix) : ',';
97
- let alreadySerialized = false;
98
- if (this.options.style === 'matrix') {
99
- // The parameter name is just used as prefix, except in some cases...
100
- prefix = `;${this.name}=`;
101
- if (this.options.explode && typeof value === 'object') {
102
- prefix = ';';
103
- if (value instanceof Array) {
104
- // For arrays we have to repeat the name for each element
105
- value = value.map((v) => `${this.name}=${this.serializeValue(v, ';')}`);
106
- value = value.join(';');
107
- alreadySerialized = true;
108
- } else {
109
- // For objects we have to put each the key / value pairs
110
- value = this.serializeValue(value, ';');
111
- alreadySerialized = true;
112
- }
113
- }
114
- }
115
- value = prefix + (alreadySerialized ? value : this.serializeValue(value, separator));
116
- // Replace both the plain variable and the corresponding variant taking in the prefix and explode into account
117
- path = path.replace(`{${this.name}}`, value);
118
- path = path.replace(`{${prefix}${this.name}${this.options.explode ? '*' : ''}}`, value);
119
- return path;
120
- }
121
-
122
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
123
- // @ts-ignore
124
- serializeValue(value: any, separator = ','): string {
125
- let result = typeof value === 'string' ? encodeURIComponent(value) : super.serializeValue(value, separator);
126
- result = result.replace(/%3D/g, '=');
127
- result = result.replace(/%3B/g, ';');
128
- result = result.replace(/%2C/g, ',');
129
- return result;
130
- }
131
- }
132
-
133
- /**
134
- * A parameter in the query
135
- */
136
- class QueryParameter extends Parameter {
137
- constructor(name: string, value: any, options: ParameterOptions) {
138
- super(name, value, options, 'form', true);
139
- }
140
-
141
- append(params: HttpParams): HttpParams {
142
- if (this.value instanceof Array) {
143
- // Array serialization
144
- if (this.options.explode) {
145
- for (const v of this.value) {
146
- params = params.append(this.name, this.serializeValue(v));
147
- }
148
- } else {
149
- const separator =
150
- this.options.style === 'spaceDelimited' ? ' ' : this.options.style === 'pipeDelimited' ? '|' : ',';
151
- return params.append(this.name, this.serializeValue(this.value, separator));
152
- }
153
- } else if (this.value !== null && typeof this.value === 'object') {
154
- // Object serialization
155
- if (this.options.style === 'deepObject') {
156
- // Append a parameter for each key, in the form `name[key]`
157
- for (const key of Object.keys(this.value)) {
158
- const propVal = this.value[key];
159
- if (propVal !== null && propVal !== undefined) {
160
- params = params.append(`${this.name}[${key}]`, this.serializeValue(propVal));
161
- }
162
- }
163
- } else if (this.options.explode) {
164
- // Append a parameter for each key without using the parameter name
165
- for (const key of Object.keys(this.value)) {
166
- const propVal = this.value[key];
167
- if (propVal !== null && propVal !== undefined) {
168
- params = params.append(key, this.serializeValue(propVal));
169
- }
170
- }
171
- } else {
172
- // Append a single parameter whose values are a comma-separated list of key,value,key,value...
173
- const array: any[] = [];
174
- for (const key of Object.keys(this.value)) {
175
- const propVal = this.value[key];
176
- if (propVal !== null && propVal !== undefined) {
177
- array.push(key);
178
- array.push(propVal);
179
- }
180
- }
181
- params = params.append(this.name, this.serializeValue(array));
182
- }
183
- } else if (this.value !== null && this.value !== undefined) {
184
- // Plain value
185
- params = params.append(this.name, this.serializeValue(this.value));
186
- }
187
- return params;
188
- }
189
- }
190
-
191
- /**
192
- * A parameter in the HTTP request header
193
- */
194
- class HeaderParameter extends Parameter {
195
- constructor(name: string, value: any, options: ParameterOptions) {
196
- super(name, value, options, 'simple', false);
197
- }
198
-
199
- append(headers: HttpHeaders): HttpHeaders {
200
- if (this.value !== null && this.value !== undefined) {
201
- if (this.value instanceof Array) {
202
- for (const v of this.value) {
203
- headers = headers.append(this.name, this.serializeValue(v));
204
- }
205
- } else {
206
- headers = headers.append(this.name, this.serializeValue(this.value));
207
- }
208
- }
209
- return headers;
210
- }
211
- }
212
-
213
- /**
214
- * Helper to build http requests from parameters
215
- */
216
- export class RequestBuilder {
217
- private _path = new Map<string, PathParameter>();
218
- private _query = new Map<string, QueryParameter>();
219
- private _header = new Map<string, HeaderParameter>();
220
- _bodyContent: any | null;
221
- _bodyContentType?: string;
222
-
223
- constructor(
224
- public rootUrl: string,
225
- public operationPath: string,
226
- public method: string,
227
- ) {}
228
-
229
- /**
230
- * Sets a path parameter
231
- */
232
- path(name: string, value: any, options?: ParameterOptions): void {
233
- this._path.set(name, new PathParameter(name, value, options || {}));
234
- }
235
-
236
- /**
237
- * Sets a query parameter
238
- */
239
- query(name: string, value: any, options?: ParameterOptions): void {
240
- this._query.set(name, new QueryParameter(name, value, options || {}));
241
- }
242
-
243
- /**
244
- * Sets a header parameter
245
- */
246
- header(name: string, value: any, options?: ParameterOptions): void {
247
- this._header.set(name, new HeaderParameter(name, value, options || {}));
248
- }
249
-
250
- /**
251
- * Sets the body content, along with the content type
252
- */
253
- body(value: any, contentType = 'application/json'): void {
254
- if (value instanceof Blob) {
255
- this._bodyContentType = value.type;
256
- } else {
257
- this._bodyContentType = contentType;
258
- }
259
- if (this._bodyContentType === 'application/x-www-form-urlencoded' && value !== null && typeof value === 'object') {
260
- // Handle URL-encoded data
261
- const pairs: Array<[string, string]> = [];
262
- for (const key of Object.keys(value)) {
263
- let val = value[key];
264
- if (!(val instanceof Array)) {
265
- val = [val];
266
- }
267
- for (const v of val) {
268
- const formValue = this.formDataValue(v);
269
- if (formValue !== null) {
270
- pairs.push([key, formValue]);
271
- }
272
- }
273
- }
274
- this._bodyContent = pairs.map((p) => `${encodeURIComponent(p[0])}=${encodeURIComponent(p[1])}`).join('&');
275
- } else if (this._bodyContentType === 'multipart/form-data') {
276
- // Handle multipart form data
277
- const formData = new FormData();
278
- if (value !== null && value !== undefined) {
279
- for (const key of Object.keys(value)) {
280
- const val = value[key];
281
- if (val instanceof Array) {
282
- for (const v of val) {
283
- const toAppend = this.formDataValue(v);
284
- if (toAppend !== null) {
285
- formData.append(key, toAppend);
286
- }
287
- }
288
- } else {
289
- const toAppend = this.formDataValue(val);
290
- if (toAppend !== null) {
291
- formData.set(key, toAppend);
292
- }
293
- }
294
- }
295
- }
296
- this._bodyContent = formData;
297
- } else {
298
- // The body is the plain content
299
- this._bodyContent = value;
300
- }
301
- }
302
-
303
- private formDataValue(value: any): any {
304
- if (value === null || value === undefined) {
305
- return null;
306
- }
307
- if (value instanceof Blob) {
308
- return value;
309
- }
310
- if (typeof value === 'object') {
311
- return JSON.stringify(value);
312
- }
313
- return String(value);
314
- }
315
-
316
- /**
317
- * Builds the request with the current set parameters
318
- */
319
- build<T = any>(options?: {
320
- /** Which content types to accept */
321
- accept?: string;
322
-
323
- /** The expected response type */
324
- responseType?: 'json' | 'text' | 'blob' | 'arraybuffer';
325
-
326
- /** Whether to report progress on uploads / downloads */
327
- reportProgress?: boolean;
328
-
329
- /** Allow passing HttpContext for HttpClient */
330
- context?: HttpContext;
331
- }): HttpRequest<T> {
332
- options = options || {};
333
-
334
- // Path parameters
335
- let path = this.operationPath;
336
- for (const pathParam of this._path.values()) {
337
- path = pathParam.append(path);
338
- }
339
- const url = this.rootUrl + path;
340
-
341
- // Query parameters
342
- let httpParams = new HttpParams({
343
- encoder: ParameterCodecInstance,
344
- });
345
- for (const queryParam of this._query.values()) {
346
- httpParams = queryParam.append(httpParams);
347
- }
348
-
349
- // Header parameters
350
- let httpHeaders = new HttpHeaders();
351
- if (options.accept) {
352
- httpHeaders = httpHeaders.append('Accept', options.accept);
353
- }
354
- for (const headerParam of this._header.values()) {
355
- httpHeaders = headerParam.append(httpHeaders);
356
- }
357
-
358
- // Request content headers
359
- if (this._bodyContentType && !(this._bodyContent instanceof FormData)) {
360
- httpHeaders = httpHeaders.set('Content-Type', this._bodyContentType);
361
- }
362
-
363
- // Perform the request
364
- return new HttpRequest<T>(this.method.toUpperCase(), url, this._bodyContent, {
365
- params: httpParams,
366
- headers: httpHeaders,
367
- responseType: options.responseType,
368
- reportProgress: options.reportProgress,
369
- context: options.context,
370
- });
371
- }
372
- }
1
+ import { HttpRequest, HttpParameterCodec, HttpParams, HttpHeaders, HttpContext } from '@angular/common/http';
2
+
3
+ /**
4
+ * Custom parameter codec to correctly handle the plus sign in parameter
5
+ * values. See https://github.com/angular/angular/issues/18261
6
+ */
7
+ class ParameterCodec implements HttpParameterCodec {
8
+ encodeKey(key: string): string {
9
+ return encodeURIComponent(key);
10
+ }
11
+
12
+ encodeValue(value: string): string {
13
+ return encodeURIComponent(value);
14
+ }
15
+
16
+ decodeKey(key: string): string {
17
+ return decodeURIComponent(key);
18
+ }
19
+
20
+ decodeValue(value: string): string {
21
+ return decodeURIComponent(value);
22
+ }
23
+ }
24
+ const ParameterCodecInstance = new ParameterCodec();
25
+
26
+ /**
27
+ * Defines the options for appending a parameter
28
+ */
29
+ interface ParameterOptions {
30
+ style?: string;
31
+ explode?: boolean;
32
+ }
33
+
34
+ /**
35
+ * Base class for a parameter
36
+ */
37
+ abstract class Parameter {
38
+ constructor(
39
+ public name: string,
40
+ public value: any,
41
+ public options: ParameterOptions,
42
+ defaultStyle: string,
43
+ defaultExplode: boolean,
44
+ ) {
45
+ this.options = options || {};
46
+ if (this.options.style === null || this.options.style === undefined) {
47
+ this.options.style = defaultStyle;
48
+ }
49
+ if (this.options.explode === null || this.options.explode === undefined) {
50
+ this.options.explode = defaultExplode;
51
+ }
52
+ }
53
+
54
+ serializeValue(value: any, separator = ','): string {
55
+ if (value === null || value === undefined) {
56
+ return '';
57
+ } else if (value instanceof Array) {
58
+ return value
59
+ .map((v) => this.serializeValue(v).split(separator).join(encodeURIComponent(separator)))
60
+ .join(separator);
61
+ } else if (typeof value === 'object') {
62
+ const array: string[] = [];
63
+ for (const key of Object.keys(value)) {
64
+ let propVal = value[key];
65
+ if (propVal !== null && propVal !== undefined) {
66
+ propVal = this.serializeValue(propVal).split(separator).join(encodeURIComponent(separator));
67
+ if (this.options.explode) {
68
+ array.push(`${key}=${propVal}`);
69
+ } else {
70
+ array.push(key);
71
+ array.push(propVal);
72
+ }
73
+ }
74
+ }
75
+ return array.join(separator);
76
+ } else {
77
+ return String(value);
78
+ }
79
+ }
80
+ }
81
+
82
+ /**
83
+ * A parameter in the operation path
84
+ */
85
+ class PathParameter extends Parameter {
86
+ constructor(name: string, value: any, options: ParameterOptions) {
87
+ super(name, value, options, 'simple', false);
88
+ }
89
+
90
+ append(path: string): string {
91
+ let value = this.value;
92
+ if (value === null || value === undefined) {
93
+ value = '';
94
+ }
95
+ let prefix = this.options.style === 'label' ? '.' : '';
96
+ const separator = this.options.explode ? (prefix === '' ? ',' : prefix) : ',';
97
+ let alreadySerialized = false;
98
+ if (this.options.style === 'matrix') {
99
+ // The parameter name is just used as prefix, except in some cases...
100
+ prefix = `;${this.name}=`;
101
+ if (this.options.explode && typeof value === 'object') {
102
+ prefix = ';';
103
+ if (value instanceof Array) {
104
+ // For arrays we have to repeat the name for each element
105
+ value = value.map((v) => `${this.name}=${this.serializeValue(v, ';')}`);
106
+ value = value.join(';');
107
+ alreadySerialized = true;
108
+ } else {
109
+ // For objects we have to put each the key / value pairs
110
+ value = this.serializeValue(value, ';');
111
+ alreadySerialized = true;
112
+ }
113
+ }
114
+ }
115
+ value = prefix + (alreadySerialized ? value : this.serializeValue(value, separator));
116
+ // Replace both the plain variable and the corresponding variant taking in the prefix and explode into account
117
+ path = path.replace(`{${this.name}}`, value);
118
+ path = path.replace(`{${prefix}${this.name}${this.options.explode ? '*' : ''}}`, value);
119
+ return path;
120
+ }
121
+
122
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
123
+ // @ts-ignore
124
+ serializeValue(value: any, separator = ','): string {
125
+ let result = typeof value === 'string' ? encodeURIComponent(value) : super.serializeValue(value, separator);
126
+ result = result.replace(/%3D/g, '=');
127
+ result = result.replace(/%3B/g, ';');
128
+ result = result.replace(/%2C/g, ',');
129
+ return result;
130
+ }
131
+ }
132
+
133
+ /**
134
+ * A parameter in the query
135
+ */
136
+ class QueryParameter extends Parameter {
137
+ constructor(name: string, value: any, options: ParameterOptions) {
138
+ super(name, value, options, 'form', true);
139
+ }
140
+
141
+ append(params: HttpParams): HttpParams {
142
+ if (this.value instanceof Array) {
143
+ // Array serialization
144
+ if (this.options.explode) {
145
+ for (const v of this.value) {
146
+ params = params.append(this.name, this.serializeValue(v));
147
+ }
148
+ } else {
149
+ const separator =
150
+ this.options.style === 'spaceDelimited' ? ' ' : this.options.style === 'pipeDelimited' ? '|' : ',';
151
+ return params.append(this.name, this.serializeValue(this.value, separator));
152
+ }
153
+ } else if (this.value !== null && typeof this.value === 'object') {
154
+ // Object serialization
155
+ if (this.options.style === 'deepObject') {
156
+ // Append a parameter for each key, in the form `name[key]`
157
+ for (const key of Object.keys(this.value)) {
158
+ const propVal = this.value[key];
159
+ if (propVal !== null && propVal !== undefined) {
160
+ params = params.append(`${this.name}[${key}]`, this.serializeValue(propVal));
161
+ }
162
+ }
163
+ } else if (this.options.explode) {
164
+ // Append a parameter for each key without using the parameter name
165
+ for (const key of Object.keys(this.value)) {
166
+ const propVal = this.value[key];
167
+ if (propVal !== null && propVal !== undefined) {
168
+ params = params.append(key, this.serializeValue(propVal));
169
+ }
170
+ }
171
+ } else {
172
+ // Append a single parameter whose values are a comma-separated list of key,value,key,value...
173
+ const array: any[] = [];
174
+ for (const key of Object.keys(this.value)) {
175
+ const propVal = this.value[key];
176
+ if (propVal !== null && propVal !== undefined) {
177
+ array.push(key);
178
+ array.push(propVal);
179
+ }
180
+ }
181
+ params = params.append(this.name, this.serializeValue(array));
182
+ }
183
+ } else if (this.value !== null && this.value !== undefined) {
184
+ // Plain value
185
+ params = params.append(this.name, this.serializeValue(this.value));
186
+ }
187
+ return params;
188
+ }
189
+ }
190
+
191
+ /**
192
+ * A parameter in the HTTP request header
193
+ */
194
+ class HeaderParameter extends Parameter {
195
+ constructor(name: string, value: any, options: ParameterOptions) {
196
+ super(name, value, options, 'simple', false);
197
+ }
198
+
199
+ append(headers: HttpHeaders): HttpHeaders {
200
+ if (this.value !== null && this.value !== undefined) {
201
+ if (this.value instanceof Array) {
202
+ for (const v of this.value) {
203
+ headers = headers.append(this.name, this.serializeValue(v));
204
+ }
205
+ } else {
206
+ headers = headers.append(this.name, this.serializeValue(this.value));
207
+ }
208
+ }
209
+ return headers;
210
+ }
211
+ }
212
+
213
+ /**
214
+ * Helper to build http requests from parameters
215
+ */
216
+ export class RequestBuilder {
217
+ private _path = new Map<string, PathParameter>();
218
+ private _query = new Map<string, QueryParameter>();
219
+ private _header = new Map<string, HeaderParameter>();
220
+ _bodyContent: any | null;
221
+ _bodyContentType?: string;
222
+
223
+ constructor(
224
+ public rootUrl: string,
225
+ public operationPath: string,
226
+ public method: string,
227
+ ) {}
228
+
229
+ /**
230
+ * Sets a path parameter
231
+ */
232
+ path(name: string, value: any, options?: ParameterOptions): void {
233
+ this._path.set(name, new PathParameter(name, value, options || {}));
234
+ }
235
+
236
+ /**
237
+ * Sets a query parameter
238
+ */
239
+ query(name: string, value: any, options?: ParameterOptions): void {
240
+ this._query.set(name, new QueryParameter(name, value, options || {}));
241
+ }
242
+
243
+ /**
244
+ * Sets a header parameter
245
+ */
246
+ header(name: string, value: any, options?: ParameterOptions): void {
247
+ this._header.set(name, new HeaderParameter(name, value, options || {}));
248
+ }
249
+
250
+ /**
251
+ * Sets the body content, along with the content type
252
+ */
253
+ body(value: any, contentType = 'application/json'): void {
254
+ if (value instanceof Blob) {
255
+ this._bodyContentType = value.type;
256
+ } else {
257
+ this._bodyContentType = contentType;
258
+ }
259
+ if (this._bodyContentType === 'application/x-www-form-urlencoded' && value !== null && typeof value === 'object') {
260
+ // Handle URL-encoded data
261
+ const pairs: Array<[string, string]> = [];
262
+ for (const key of Object.keys(value)) {
263
+ let val = value[key];
264
+ if (!(val instanceof Array)) {
265
+ val = [val];
266
+ }
267
+ for (const v of val) {
268
+ const formValue = this.formDataValue(v);
269
+ if (formValue !== null) {
270
+ pairs.push([key, formValue]);
271
+ }
272
+ }
273
+ }
274
+ this._bodyContent = pairs.map((p) => `${encodeURIComponent(p[0])}=${encodeURIComponent(p[1])}`).join('&');
275
+ } else if (this._bodyContentType === 'multipart/form-data') {
276
+ // Handle multipart form data
277
+ const formData = new FormData();
278
+ if (value !== null && value !== undefined) {
279
+ for (const key of Object.keys(value)) {
280
+ const val = value[key];
281
+ if (val instanceof Array) {
282
+ for (const v of val) {
283
+ const toAppend = this.formDataValue(v);
284
+ if (toAppend !== null) {
285
+ formData.append(key, toAppend);
286
+ }
287
+ }
288
+ } else {
289
+ const toAppend = this.formDataValue(val);
290
+ if (toAppend !== null) {
291
+ formData.set(key, toAppend);
292
+ }
293
+ }
294
+ }
295
+ }
296
+ this._bodyContent = formData;
297
+ } else {
298
+ // The body is the plain content
299
+ this._bodyContent = value;
300
+ }
301
+ }
302
+
303
+ private formDataValue(value: any): any {
304
+ if (value === null || value === undefined) {
305
+ return null;
306
+ }
307
+ if (value instanceof Blob) {
308
+ return value;
309
+ }
310
+ if (typeof value === 'object') {
311
+ return JSON.stringify(value);
312
+ }
313
+ return String(value);
314
+ }
315
+
316
+ /**
317
+ * Builds the request with the current set parameters
318
+ */
319
+ build<T = any>(options?: {
320
+ /** Which content types to accept */
321
+ accept?: string;
322
+
323
+ /** The expected response type */
324
+ responseType?: 'json' | 'text' | 'blob' | 'arraybuffer';
325
+
326
+ /** Whether to report progress on uploads / downloads */
327
+ reportProgress?: boolean;
328
+
329
+ /** Allow passing HttpContext for HttpClient */
330
+ context?: HttpContext;
331
+ }): HttpRequest<T> {
332
+ options = options || {};
333
+
334
+ // Path parameters
335
+ let path = this.operationPath;
336
+ for (const pathParam of this._path.values()) {
337
+ path = pathParam.append(path);
338
+ }
339
+ const url = this.rootUrl + path;
340
+
341
+ // Query parameters
342
+ let httpParams = new HttpParams({
343
+ encoder: ParameterCodecInstance,
344
+ });
345
+ for (const queryParam of this._query.values()) {
346
+ httpParams = queryParam.append(httpParams);
347
+ }
348
+
349
+ // Header parameters
350
+ let httpHeaders = new HttpHeaders();
351
+ if (options.accept) {
352
+ httpHeaders = httpHeaders.append('Accept', options.accept);
353
+ }
354
+ for (const headerParam of this._header.values()) {
355
+ httpHeaders = headerParam.append(httpHeaders);
356
+ }
357
+
358
+ // Request content headers
359
+ if (this._bodyContentType && !(this._bodyContent instanceof FormData)) {
360
+ httpHeaders = httpHeaders.set('Content-Type', this._bodyContentType);
361
+ }
362
+
363
+ // Perform the request
364
+ return new HttpRequest<T>(this.method.toUpperCase(), url, this._bodyContent, {
365
+ params: httpParams,
366
+ headers: httpHeaders,
367
+ responseType: options.responseType,
368
+ reportProgress: options.reportProgress,
369
+ context: options.context,
370
+ });
371
+ }
372
+ }
@@ -174,7 +174,7 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
174
174
  const hasParams = this.hasEndpointParams(ctx, endpoint);
175
175
  const paramsOptional = !endpoint.parameters.some((p) => p.required) && !((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.required);
176
176
  const responseModelType = ast_1.ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx));
177
- const returnType = ast_1.ts.refs.promise([responseModelType]);
177
+ const returnType = ctx.refs.abortablePromise([responseModelType]);
178
178
  const accept = (_d = (_c = (_b = this.getEndpointSuccessResponse(ctx, endpoint)) === null || _b === void 0 ? void 0 : _b.contentOptions[0]) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : '*/*';
179
179
  const responseType = this.contentTypeToResponseType(accept);
180
180
  return ast_1.ts.method(this.getEndpointMethodName(ctx, endpoint), {
@@ -10,6 +10,7 @@ function getReferenceFactories(options) {
10
10
  const utilsDirPath = (0, path_1.resolve)(options.outputDir, options.utilsDirPath);
11
11
  return {
12
12
  // angular-service.utils.ts
13
+ abortablePromise: ast_1.ts.reference.genericFactory('AbortablePromise', (0, path_1.join)(utilsDirPath, 'angular-service.utils.ts')),
13
14
  waitForResponse: ast_1.ts.reference.genericFactory('waitForResponse', (0, path_1.join)(utilsDirPath, 'angular-service.utils.ts')),
14
15
  // request-builder.ts
15
16
  requestBuilder: ast_1.ts.reference.factory('RequestBuilder', (0, path_1.join)(utilsDirPath, 'request-builder.ts')),
@@ -171,7 +171,7 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
171
171
  const hasParams = this.hasEndpointParams(ctx, endpoint);
172
172
  const paramsOptional = !endpoint.parameters.some((p) => p.required) && !((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.required);
173
173
  const responseModelType = ts.reference(this.getResponseModelName(ctx, endpoint), this.getResponseModelFilePath(ctx));
174
- const returnType = ts.refs.promise([responseModelType]);
174
+ const returnType = ctx.refs.abortablePromise([responseModelType]);
175
175
  const accept = (_d = (_c = (_b = this.getEndpointSuccessResponse(ctx, endpoint)) === null || _b === void 0 ? void 0 : _b.contentOptions[0]) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : '*/*';
176
176
  const responseType = this.contentTypeToResponseType(accept);
177
177
  return ts.method(this.getEndpointMethodName(ctx, endpoint), {
@@ -7,6 +7,7 @@ export function getReferenceFactories(options) {
7
7
  const utilsDirPath = resolve(options.outputDir, options.utilsDirPath);
8
8
  return {
9
9
  // angular-service.utils.ts
10
+ abortablePromise: ts.reference.genericFactory('AbortablePromise', join(utilsDirPath, 'angular-service.utils.ts')),
10
11
  waitForResponse: ts.reference.genericFactory('waitForResponse', join(utilsDirPath, 'angular-service.utils.ts')),
11
12
  // request-builder.ts
12
13
  requestBuilder: ts.reference.factory('RequestBuilder', join(utilsDirPath, 'request-builder.ts')),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goast/typescript",
3
- "version": "0.2.14",
3
+ "version": "0.2.15",
4
4
  "repository": "https://github.com/MaSch0212/goast.git",
5
5
  "author": {
6
6
  "name": "Marc Schmidt (MaSch0212)",
@@ -1,6 +1,13 @@
1
1
  import { ts } from '../../../ast';
2
2
  import type { TypeScriptAngularServicesGeneratorConfig } from './models';
3
3
  export declare function getReferenceFactories(options: TypeScriptAngularServicesGeneratorConfig): {
4
+ abortablePromise: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(generics: [ts.Type<TBuilder>]) => ts.Reference<TBuilder, never>) & {
5
+ refName: string;
6
+ moduleNameOrfilePath: import("@goast/core").Nullable<string>;
7
+ infer: <TBuilder_1 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_1, never>;
8
+ } & {
9
+ moduleNameOrfilePath: string;
10
+ };
4
11
  waitForResponse: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(generics: [ts.Type<TBuilder>]) => ts.Reference<TBuilder, never>) & {
5
12
  refName: string;
6
13
  moduleNameOrfilePath: import("@goast/core").Nullable<string>;