@goast/typescript 0.8.0-beta.1 → 0.8.0
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/LICENSE +21 -21
- package/README.md +52 -52
- package/assets/client/angular/angular-service.utils.ts +82 -82
- package/assets/client/angular/request-builder.ts +377 -377
- package/assets/client/fetch/fetch-client.utils.ts +52 -52
- package/assets/client/k6/request-builder.js +448 -448
- package/assets/client/k6/request-builder.ts +366 -366
- package/assets/stubs/easy-network-stub/easy-network-stub.utils.ts +257 -257
- package/esm/src/generators/models/model-generator.d.ts +22 -0
- package/esm/src/generators/models/model-generator.d.ts.map +1 -1
- package/esm/src/generators/models/model-generator.js +37 -5
- package/esm/src/generators/services/angular-services/angular-service-generator.js +9 -9
- package/esm/src/generators/services/angular-services/angular-services-generator.js +2 -2
- package/esm/src/generators/services/easy-network-stub/easy-network-stub-generator.js +9 -9
- package/esm/src/generators/services/fetch-clients/fetch-client-generator.js +4 -4
- package/esm/src/generators/services/k6-clients/k6-client-generator.d.ts.map +1 -1
- package/esm/src/generators/services/k6-clients/k6-client-generator.js +23 -13
- package/esm/src/import-collection.d.ts.map +1 -1
- package/esm/src/import-collection.js +2 -2
- package/package.json +2 -2
- package/script/src/generators/models/model-generator.d.ts +22 -0
- package/script/src/generators/models/model-generator.d.ts.map +1 -1
- package/script/src/generators/models/model-generator.js +37 -5
- package/script/src/generators/services/angular-services/angular-service-generator.js +9 -9
- package/script/src/generators/services/angular-services/angular-services-generator.js +2 -2
- package/script/src/generators/services/easy-network-stub/easy-network-stub-generator.js +9 -9
- package/script/src/generators/services/fetch-clients/fetch-client-generator.js +4 -4
- package/script/src/generators/services/k6-clients/k6-client-generator.d.ts.map +1 -1
- package/script/src/generators/services/k6-clients/k6-client-generator.js +23 -13
- package/script/src/import-collection.d.ts.map +1 -1
- package/script/src/import-collection.js +1 -1
- package/src/mod.ts +7 -0
- package/src/src/assets.ts +9 -0
- package/src/src/ast/_index.ts +54 -0
- package/src/src/ast/common.ts +1 -0
- package/src/src/ast/index.ts +1 -0
- package/src/src/ast/node.ts +10 -0
- package/src/src/ast/nodes/argument.ts +40 -0
- package/src/src/ast/nodes/array-type.ts +49 -0
- package/src/src/ast/nodes/arrow-function.ts +91 -0
- package/src/src/ast/nodes/call.ts +55 -0
- package/src/src/ast/nodes/class.ts +133 -0
- package/src/src/ast/nodes/constructor-parameter.ts +70 -0
- package/src/src/ast/nodes/constructor.ts +77 -0
- package/src/src/ast/nodes/decorator.ts +76 -0
- package/src/src/ast/nodes/doc-tag.ts +291 -0
- package/src/src/ast/nodes/doc.ts +102 -0
- package/src/src/ast/nodes/enum-value.ts +72 -0
- package/src/src/ast/nodes/enum.ts +77 -0
- package/src/src/ast/nodes/export.ts +54 -0
- package/src/src/ast/nodes/function-type.ts +60 -0
- package/src/src/ast/nodes/function.ts +107 -0
- package/src/src/ast/nodes/generic-parameter.ts +71 -0
- package/src/src/ast/nodes/indexer.ts +60 -0
- package/src/src/ast/nodes/interface.ts +117 -0
- package/src/src/ast/nodes/intersection-type.ts +67 -0
- package/src/src/ast/nodes/lookup-type.ts +53 -0
- package/src/src/ast/nodes/method.ts +138 -0
- package/src/src/ast/nodes/object-type.ts +52 -0
- package/src/src/ast/nodes/object.ts +48 -0
- package/src/src/ast/nodes/parameter.ts +85 -0
- package/src/src/ast/nodes/property-accessor.ts +173 -0
- package/src/src/ast/nodes/property.ts +192 -0
- package/src/src/ast/nodes/reference.ts +194 -0
- package/src/src/ast/nodes/string.ts +49 -0
- package/src/src/ast/nodes/tuple.ts +53 -0
- package/src/src/ast/nodes/type-alias.ts +75 -0
- package/src/src/ast/nodes/typeof.ts +42 -0
- package/src/src/ast/nodes/types.ts +40 -0
- package/src/src/ast/nodes/union-type.ts +62 -0
- package/src/src/ast/nodes/variable.ts +73 -0
- package/src/src/ast/references/angular.ts +24 -0
- package/src/src/ast/references/easy-network-stub.ts +21 -0
- package/src/src/ast/references/index.ts +5 -0
- package/src/src/ast/references/k6.ts +8 -0
- package/src/src/ast/references/rxjs.ts +7 -0
- package/src/src/ast/references/typescript.ts +35 -0
- package/src/src/ast/utils/get-type-script-builder-options.ts +19 -0
- package/src/src/ast/utils/to-ts-node.ts +27 -0
- package/src/src/ast/utils/write-ts-generic-parameters.ts +25 -0
- package/src/src/ast/utils/write-ts-members.ts +28 -0
- package/src/src/ast/utils/write-ts-nodes.ts +35 -0
- package/src/src/ast/utils/write-ts-parameters.ts +25 -0
- package/src/src/common-results.ts +26 -0
- package/src/src/config.ts +96 -0
- package/src/src/file-builder.ts +137 -0
- package/src/src/generators/file-generator.ts +15 -0
- package/src/src/generators/index.ts +6 -0
- package/src/src/generators/models/index.ts +3 -0
- package/src/src/generators/models/model-generator.ts +530 -0
- package/src/src/generators/models/models-generator.ts +108 -0
- package/src/src/generators/models/models.ts +121 -0
- package/src/src/generators/services/angular-services/angular-service-generator.ts +431 -0
- package/src/src/generators/services/angular-services/angular-services-generator.ts +295 -0
- package/src/src/generators/services/angular-services/index.ts +3 -0
- package/src/src/generators/services/angular-services/models.ts +277 -0
- package/src/src/generators/services/angular-services/refs.ts +54 -0
- package/src/src/generators/services/easy-network-stub/easy-network-stub-generator.ts +250 -0
- package/src/src/generators/services/easy-network-stub/easy-network-stubs-generator.ts +211 -0
- package/src/src/generators/services/easy-network-stub/index.ts +3 -0
- package/src/src/generators/services/easy-network-stub/models.ts +124 -0
- package/src/src/generators/services/easy-network-stub/refs.ts +47 -0
- package/src/src/generators/services/fetch-clients/fetch-client-generator.ts +305 -0
- package/src/src/generators/services/fetch-clients/fetch-clients-generator.ts +163 -0
- package/src/src/generators/services/fetch-clients/index.ts +3 -0
- package/src/src/generators/services/fetch-clients/models.ts +130 -0
- package/src/src/generators/services/fetch-clients/refs.ts +21 -0
- package/src/src/generators/services/k6-clients/index.ts +3 -0
- package/src/src/generators/services/k6-clients/k6-client-generator.ts +515 -0
- package/src/src/generators/services/k6-clients/k6-clients-generator.ts +171 -0
- package/src/src/generators/services/k6-clients/models.ts +247 -0
- package/src/src/generators/services/k6-clients/refs.ts +16 -0
- package/src/src/import-collection.ts +236 -0
- package/src/src/utils.ts +79 -0
package/LICENSE
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2021 Marc Schmidt
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2021 Marc Schmidt
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,52 +1,52 @@
|
|
|
1
|
-
# gOAst (@goast/typescript)
|
|
2
|
-
|
|
3
|
-
[](https://www.npmjs.com/package/@goast/typescript)
|
|
4
|
-
[](https://jsr.io/@goast/typescript)
|
|
5
|
-
|
|
6
|
-
**gOAst** stands for **g**enerative **O**pen **A**PI **s**pecification **t**ransformer, a tool designed to transform
|
|
7
|
-
OpenAPI specifications into various forms with flexibility and extensibility at its core.
|
|
8
|
-
|
|
9
|
-
For more Information, please visit the [gOAst GitHub Repository](https://github.com/MaSch0212/goast/blob/main).
|
|
10
|
-
|
|
11
|
-
## Purpose 👍
|
|
12
|
-
|
|
13
|
-
The `@goast/typescript` package provides generators for [TypeScript](https://www.typescriptlang.org/) code generation
|
|
14
|
-
from OpenAPI specifications.
|
|
15
|
-
|
|
16
|
-
## Usage Example 🚀
|
|
17
|
-
|
|
18
|
-
```typescript
|
|
19
|
-
import { OpenApiGenerator } from '@goast/core';
|
|
20
|
-
import { TypeScriptFetchClientsGenerator, TypeScriptModelsGenerator } from '@goast/typescript';
|
|
21
|
-
|
|
22
|
-
async function main() {
|
|
23
|
-
await new OpenApiGenerator({ outputDir: '.api' })
|
|
24
|
-
.useType(TypeScriptModelsGenerator)
|
|
25
|
-
.useType(TypeScriptFetchClientsGenerator)
|
|
26
|
-
.parseAndGenerateFromDir('.openapi');
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
main();
|
|
30
|
-
```
|
|
31
|
-
|
|
32
|
-
## Available Generators 📚
|
|
33
|
-
|
|
34
|
-
- [`TypeScriptModelsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Models%20Generator): Generates
|
|
35
|
-
TypeScript interfaces or types from schemas in the OpenAPI specification(s).
|
|
36
|
-
- [`TypeScriptFetchClientsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Fetch%20Clients%20Generator):
|
|
37
|
-
Generates Fetch clients for TypeScript from paths in the OpenAPI specification(s).
|
|
38
|
-
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
39
|
-
- [`TypeScriptAngularServicesGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Angular%20Services%20Generator):
|
|
40
|
-
Generates [Angular](https://angular.dev/) services from paths in the OpenAPI specification(s).
|
|
41
|
-
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
42
|
-
- [`TypeScriptEasyNetworkStubsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Easy%20Network%20Stubs%20Generator):
|
|
43
|
-
Generates [easy-network-stub](https://github.com/LoaderB0T/easy-network-stub) classes from paths in the OpenAPI
|
|
44
|
-
specification(s).
|
|
45
|
-
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
46
|
-
- [`TypeScriptK6ClientsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20K6%20Clients%20Generator):
|
|
47
|
-
Generates [k6](https://k6.io/) clients from paths in the OpenAPI specification(s).
|
|
48
|
-
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
49
|
-
|
|
50
|
-
## API Documentation 📖
|
|
51
|
-
|
|
52
|
-
The API documentation can be found [here](https://github.com/MaSch0212/goast/wiki/TypeScript%20Generators).
|
|
1
|
+
# gOAst (@goast/typescript)
|
|
2
|
+
|
|
3
|
+
[](https://www.npmjs.com/package/@goast/typescript)
|
|
4
|
+
[](https://jsr.io/@goast/typescript)
|
|
5
|
+
|
|
6
|
+
**gOAst** stands for **g**enerative **O**pen **A**PI **s**pecification **t**ransformer, a tool designed to transform
|
|
7
|
+
OpenAPI specifications into various forms with flexibility and extensibility at its core.
|
|
8
|
+
|
|
9
|
+
For more Information, please visit the [gOAst GitHub Repository](https://github.com/MaSch0212/goast/blob/main).
|
|
10
|
+
|
|
11
|
+
## Purpose 👍
|
|
12
|
+
|
|
13
|
+
The `@goast/typescript` package provides generators for [TypeScript](https://www.typescriptlang.org/) code generation
|
|
14
|
+
from OpenAPI specifications.
|
|
15
|
+
|
|
16
|
+
## Usage Example 🚀
|
|
17
|
+
|
|
18
|
+
```typescript
|
|
19
|
+
import { OpenApiGenerator } from '@goast/core';
|
|
20
|
+
import { TypeScriptFetchClientsGenerator, TypeScriptModelsGenerator } from '@goast/typescript';
|
|
21
|
+
|
|
22
|
+
async function main() {
|
|
23
|
+
await new OpenApiGenerator({ outputDir: '.api' })
|
|
24
|
+
.useType(TypeScriptModelsGenerator)
|
|
25
|
+
.useType(TypeScriptFetchClientsGenerator)
|
|
26
|
+
.parseAndGenerateFromDir('.openapi');
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
main();
|
|
30
|
+
```
|
|
31
|
+
|
|
32
|
+
## Available Generators 📚
|
|
33
|
+
|
|
34
|
+
- [`TypeScriptModelsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Models%20Generator): Generates
|
|
35
|
+
TypeScript interfaces or types from schemas in the OpenAPI specification(s).
|
|
36
|
+
- [`TypeScriptFetchClientsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Fetch%20Clients%20Generator):
|
|
37
|
+
Generates Fetch clients for TypeScript from paths in the OpenAPI specification(s).
|
|
38
|
+
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
39
|
+
- [`TypeScriptAngularServicesGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Angular%20Services%20Generator):
|
|
40
|
+
Generates [Angular](https://angular.dev/) services from paths in the OpenAPI specification(s).
|
|
41
|
+
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
42
|
+
- [`TypeScriptEasyNetworkStubsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20Easy%20Network%20Stubs%20Generator):
|
|
43
|
+
Generates [easy-network-stub](https://github.com/LoaderB0T/easy-network-stub) classes from paths in the OpenAPI
|
|
44
|
+
specification(s).
|
|
45
|
+
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
46
|
+
- [`TypeScriptK6ClientsGenerator`](https://github.com/MaSch0212/goast/wiki/TypeScript%20K6%20Clients%20Generator):
|
|
47
|
+
Generates [k6](https://k6.io/) clients from paths in the OpenAPI specification(s).
|
|
48
|
+
- Depends on the output of the `TypeScriptModelsGenerator` generator.
|
|
49
|
+
|
|
50
|
+
## API Documentation 📖
|
|
51
|
+
|
|
52
|
+
The API documentation can be found [here](https://github.com/MaSch0212/goast/wiki/TypeScript%20Generators).
|
|
@@ -1,82 +1,82 @@
|
|
|
1
|
-
import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
|
|
2
|
-
import { catchError, EMPTY, filter, map, type Observable, type Subscription, take } from 'rxjs';
|
|
3
|
-
|
|
4
|
-
import type { HttpEvent } from '@angular/common/http';
|
|
5
|
-
|
|
6
|
-
export type AbortablePromise<T> = Omit<Promise<T>, 'then' | 'catch' | 'finally'> & {
|
|
7
|
-
abort(): void;
|
|
8
|
-
then<TResult1 = T, TResult2 = never>(
|
|
9
|
-
onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
|
|
10
|
-
onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
|
|
11
|
-
): AbortablePromise<TResult1 | TResult2>;
|
|
12
|
-
catch<TResult = never>(
|
|
13
|
-
onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
|
|
14
|
-
): AbortablePromise<T | TResult>;
|
|
15
|
-
finally(onfinally?: (() => void) | undefined | null): AbortablePromise<T>;
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
export function waitForResponse<T extends HttpResponse<any> | HttpErrorResponse>(
|
|
19
|
-
httpEvents: Observable<HttpEvent<any>>,
|
|
20
|
-
options: { errorResponseTypes: Record<number, 'text' | 'json'> },
|
|
21
|
-
): AbortablePromise<T> {
|
|
22
|
-
return firstValueFromAbortable<T>(
|
|
23
|
-
httpEvents.pipe(
|
|
24
|
-
filter((event) => event instanceof HttpResponse),
|
|
25
|
-
map((response) => response as T),
|
|
26
|
-
),
|
|
27
|
-
).catch((error) => {
|
|
28
|
-
if (error instanceof HttpErrorResponse) {
|
|
29
|
-
if (options.errorResponseTypes[error.status] === 'json' && typeof error.error === 'string') {
|
|
30
|
-
return new HttpErrorResponse({
|
|
31
|
-
error: JSON.parse(error.error),
|
|
32
|
-
headers: error.headers,
|
|
33
|
-
status: error.status,
|
|
34
|
-
statusText: error.statusText,
|
|
35
|
-
url: error.url ?? undefined,
|
|
36
|
-
}) as T;
|
|
37
|
-
}
|
|
38
|
-
return error as T;
|
|
39
|
-
}
|
|
40
|
-
throw error;
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
function firstValueFromAbortable<T>(observable: Observable<T>): AbortablePromise<T> {
|
|
45
|
-
let subscription: Subscription | undefined = undefined;
|
|
46
|
-
let _reject: ((reason?: any) => void) | undefined = undefined;
|
|
47
|
-
const abortFn = () => {
|
|
48
|
-
if (!subscription) {
|
|
49
|
-
throw new Error('Not subscribed yet.');
|
|
50
|
-
}
|
|
51
|
-
subscription.unsubscribe();
|
|
52
|
-
_reject?.(new DOMException('The request has been aborted.', 'AbortError'));
|
|
53
|
-
};
|
|
54
|
-
|
|
55
|
-
return createAbortablePromise(
|
|
56
|
-
new Promise<T>((resolve, reject) => {
|
|
57
|
-
_reject = reject;
|
|
58
|
-
subscription = observable
|
|
59
|
-
.pipe(
|
|
60
|
-
take(1),
|
|
61
|
-
catchError((e: unknown) => {
|
|
62
|
-
reject(e);
|
|
63
|
-
return EMPTY;
|
|
64
|
-
}),
|
|
65
|
-
)
|
|
66
|
-
.subscribe((x: T) => resolve(x));
|
|
67
|
-
}),
|
|
68
|
-
abortFn,
|
|
69
|
-
);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
function createAbortablePromise<T>(promise: Promise<T>, abortFn: () => void) {
|
|
73
|
-
const thenFn = promise.then.bind(promise);
|
|
74
|
-
const catchFn = promise.catch.bind(promise);
|
|
75
|
-
const finallyFn = promise.finally?.bind(promise);
|
|
76
|
-
return Object.assign(promise, {
|
|
77
|
-
then: (...args: any[]) => createAbortablePromise(thenFn(...args), abortFn),
|
|
78
|
-
catch: (...args: any[]) => createAbortablePromise(catchFn(...args), abortFn),
|
|
79
|
-
finally: finallyFn ? (...args: any[]) => createAbortablePromise(finallyFn(...args), abortFn) : undefined,
|
|
80
|
-
abort: abortFn,
|
|
81
|
-
});
|
|
82
|
-
}
|
|
1
|
+
import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
|
|
2
|
+
import { catchError, EMPTY, filter, map, type Observable, type Subscription, take } from 'rxjs';
|
|
3
|
+
|
|
4
|
+
import type { HttpEvent } from '@angular/common/http';
|
|
5
|
+
|
|
6
|
+
export type AbortablePromise<T> = Omit<Promise<T>, 'then' | 'catch' | 'finally'> & {
|
|
7
|
+
abort(): void;
|
|
8
|
+
then<TResult1 = T, TResult2 = never>(
|
|
9
|
+
onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
|
|
10
|
+
onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
|
|
11
|
+
): AbortablePromise<TResult1 | TResult2>;
|
|
12
|
+
catch<TResult = never>(
|
|
13
|
+
onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
|
|
14
|
+
): AbortablePromise<T | TResult>;
|
|
15
|
+
finally(onfinally?: (() => void) | undefined | null): AbortablePromise<T>;
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
export function waitForResponse<T extends HttpResponse<any> | HttpErrorResponse>(
|
|
19
|
+
httpEvents: Observable<HttpEvent<any>>,
|
|
20
|
+
options: { errorResponseTypes: Record<number, 'text' | 'json'> },
|
|
21
|
+
): AbortablePromise<T> {
|
|
22
|
+
return firstValueFromAbortable<T>(
|
|
23
|
+
httpEvents.pipe(
|
|
24
|
+
filter((event) => event instanceof HttpResponse),
|
|
25
|
+
map((response) => response as T),
|
|
26
|
+
),
|
|
27
|
+
).catch((error) => {
|
|
28
|
+
if (error instanceof HttpErrorResponse) {
|
|
29
|
+
if (options.errorResponseTypes[error.status] === 'json' && typeof error.error === 'string') {
|
|
30
|
+
return new HttpErrorResponse({
|
|
31
|
+
error: JSON.parse(error.error),
|
|
32
|
+
headers: error.headers,
|
|
33
|
+
status: error.status,
|
|
34
|
+
statusText: error.statusText,
|
|
35
|
+
url: error.url ?? undefined,
|
|
36
|
+
}) as T;
|
|
37
|
+
}
|
|
38
|
+
return error as T;
|
|
39
|
+
}
|
|
40
|
+
throw error;
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function firstValueFromAbortable<T>(observable: Observable<T>): AbortablePromise<T> {
|
|
45
|
+
let subscription: Subscription | undefined = undefined;
|
|
46
|
+
let _reject: ((reason?: any) => void) | undefined = undefined;
|
|
47
|
+
const abortFn = () => {
|
|
48
|
+
if (!subscription) {
|
|
49
|
+
throw new Error('Not subscribed yet.');
|
|
50
|
+
}
|
|
51
|
+
subscription.unsubscribe();
|
|
52
|
+
_reject?.(new DOMException('The request has been aborted.', 'AbortError'));
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
return createAbortablePromise(
|
|
56
|
+
new Promise<T>((resolve, reject) => {
|
|
57
|
+
_reject = reject;
|
|
58
|
+
subscription = observable
|
|
59
|
+
.pipe(
|
|
60
|
+
take(1),
|
|
61
|
+
catchError((e: unknown) => {
|
|
62
|
+
reject(e);
|
|
63
|
+
return EMPTY;
|
|
64
|
+
}),
|
|
65
|
+
)
|
|
66
|
+
.subscribe((x: T) => resolve(x));
|
|
67
|
+
}),
|
|
68
|
+
abortFn,
|
|
69
|
+
);
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function createAbortablePromise<T>(promise: Promise<T>, abortFn: () => void) {
|
|
73
|
+
const thenFn = promise.then.bind(promise);
|
|
74
|
+
const catchFn = promise.catch.bind(promise);
|
|
75
|
+
const finallyFn = promise.finally?.bind(promise);
|
|
76
|
+
return Object.assign(promise, {
|
|
77
|
+
then: (...args: any[]) => createAbortablePromise(thenFn(...args), abortFn),
|
|
78
|
+
catch: (...args: any[]) => createAbortablePromise(catchFn(...args), abortFn),
|
|
79
|
+
finally: finallyFn ? (...args: any[]) => createAbortablePromise(finallyFn(...args), abortFn) : undefined,
|
|
80
|
+
abort: abortFn,
|
|
81
|
+
});
|
|
82
|
+
}
|