@tstdl/base 0.70.24 → 0.70.25
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/api/client.js +4 -1
- package/api/client.js.map +1 -1
- package/api/gateway.d.ts +1 -2
- package/api/gateway.js +53 -9
- package/api/gateway.js.map +1 -1
- package/api/middlewares/index.d.ts +0 -1
- package/api/middlewares/index.js +0 -1
- package/api/middlewares/index.js.map +1 -1
- package/api/module.d.ts +1 -0
- package/api/module.js +5 -1
- package/api/module.js.map +1 -1
- package/http/client/http-client-request.d.ts +1 -1
- package/package.json +4 -4
- package/api/middlewares/error-catch.middleware.d.ts +0 -4
- package/api/middlewares/error-catch.middleware.js +0 -43
- package/api/middlewares/error-catch.middleware.js.map +0 -1
package/api/client.js
CHANGED
package/api/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../source/api/client.ts"],"names":[],"mappings":";;;AAAA,kCAAoD;AAEpD,2CAAkD;AAElD,sCAA0G;AAE1G,0CAAwC;AACxC,oDAA8D;AAC9D,sDAA0D;AAE1D,mCAAuC;AAW1B,QAAA,gBAAgB,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAC1C,QAAA,mBAAmB,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAE3D,kDAAkD;AAClD,SAAgB,aAAa,CAA0B,UAAa,EAAE,UAAyB,EAAE;;IAC/F,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;IACjD,MAAM,kBAAkB,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,WAAW,EAAE,mCAAI,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,GAAG,kBAAkB,WAAW,CAAC;IAEjD,MAAM,GAAG,GAAG;QACV,CAAC,OAAO,CAAC,EAAE;YAIT,YAAY,UAAsB;gBAChC,IAAI,CAAC,wBAAgB,CAAC,GAAG,UAAU,CAAC;gBACpC,IAAI,CAAC,2BAAmB,CAAC,GAAG,UAAU,CAAC;YACzC,CAAC;SACF;KACF,CAAC,OAAO,CAAE,CAAC;IAEZ,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEnD,MAAM,IAAI,GAAG,IAAI,CAAC;IAClB,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,MAAM,CAAC;IAExC,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,gBAAgB,EAAE;QAC7C,MAAM,OAAO,GAAG,CAAC,IAAA,yBAAW,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,MAAM,CAAC,OAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,qCAAwB,CAAC,CAAC,CAAC,CAAE,CAAC;QAC3H,MAAM,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,KAAK,CAAC;QACtC,MAAM,aAAa,GAAG,IAAA,oBAAM,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,GAAG,CAAC;QACnE,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,oBAAY,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,aAAa,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,aAAa,GAAG,IAAI,IAAI,MAAA,MAAM,CAAC,QAAQ,mCAAI,IAAI,EAAE,CAAC;QAExJ,MAAM,mBAAmB,GAAG;YAC1B,KAAK,CAAC,CAAC,IAAI,CAAC,CAAiC,UAAkC;gBAC7E,MAAM,YAAY,GACd,CAAC,MAAM,CAAC,MAAM,YAAY,qCAA4B,CAAC,CAAC,CAAC,CAAC,QAAQ;oBAClE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,YAAY,8BAAqB,CAAC,CAAC,CAAC,CAAC,MAAM;wBACzD,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,YAAY,kCAAyB,CAAC,CAAC,CAAC,CAAC,QAAQ;4BAC/D,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM;gCACrC,CAAC,CAAC,MAAM,CAAC;gBAEnB,MAAM,OAAO,GAAG,IAAI,0BAAiB,CAAC;oBACpC,MAAM;oBACN,GAAG,EAAE,QAAQ;oBACb,YAAY;oBACZ,UAAU;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../source/api/client.ts"],"names":[],"mappings":"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"}
|
package/api/gateway.d.ts
CHANGED
|
@@ -42,8 +42,7 @@ export declare class ApiGateway implements Injectable<ApiGatewayOptions> {
|
|
|
42
42
|
private readonly prefix;
|
|
43
43
|
private readonly apis;
|
|
44
44
|
private readonly middlewares;
|
|
45
|
-
private readonly
|
|
46
|
-
private readonly errorCatchMiddleware;
|
|
45
|
+
private readonly supressedErrors;
|
|
47
46
|
private handler;
|
|
48
47
|
readonly [resolveArgumentType]: ApiGatewayOptions;
|
|
49
48
|
constructor(logger: Logger, options?: ApiGatewayOptions);
|
package/api/gateway.js
CHANGED
|
@@ -26,6 +26,7 @@ const object_1 = require("../utils/object");
|
|
|
26
26
|
const type_guards_1 = require("../utils/type-guards");
|
|
27
27
|
const api_controller_1 = require("./api-controller");
|
|
28
28
|
const middlewares_1 = require("./middlewares");
|
|
29
|
+
const response_1 = require("./response");
|
|
29
30
|
const types_1 = require("./types");
|
|
30
31
|
const UrlPattern = object_1.ForwardRef.create();
|
|
31
32
|
// eslint-disable-next-line no-eval
|
|
@@ -41,8 +42,7 @@ let ApiGateway = ApiGateway_1 = class ApiGateway {
|
|
|
41
42
|
this.prefix = (_a = options === null || options === void 0 ? void 0 : options.prefix) !== null && _a !== void 0 ? _a : 'api/';
|
|
42
43
|
this.apis = new Map();
|
|
43
44
|
this.middlewares = [];
|
|
44
|
-
this.
|
|
45
|
-
this.errorCatchMiddleware = (0, middlewares_1.errorCatchMiddleware)(logger, this.supressedErrorLogs);
|
|
45
|
+
this.supressedErrors = new Set();
|
|
46
46
|
this.updateMiddleware();
|
|
47
47
|
}
|
|
48
48
|
addMiddleware(middleware) {
|
|
@@ -51,7 +51,7 @@ let ApiGateway = ApiGateway_1 = class ApiGateway {
|
|
|
51
51
|
}
|
|
52
52
|
supressErrors(...errorTypes) {
|
|
53
53
|
for (const type of errorTypes) {
|
|
54
|
-
this.
|
|
54
|
+
this.supressedErrors.add(type);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
async registerApiController(controller) {
|
|
@@ -69,10 +69,23 @@ let ApiGateway = ApiGateway_1 = class ApiGateway {
|
|
|
69
69
|
const resource = (endpointDefinition.resource == types_1.rootResource) ? `${this.prefix}${versionPrefix}${base}` : `${this.prefix}${versionPrefix}${base}/${(_a = endpointDefinition.resource) !== null && _a !== void 0 ? _a : name}`;
|
|
70
70
|
const method = (_b = endpointDefinition.method) !== null && _b !== void 0 ? _b : 'GET';
|
|
71
71
|
let resourceApis = this.apis.get(resource);
|
|
72
|
+
console.log(resource);
|
|
72
73
|
if ((0, type_guards_1.isUndefined)(resourceApis)) {
|
|
73
74
|
resourceApis = (0, object_1.lazyObject)({
|
|
74
75
|
resource: { value: resource },
|
|
75
|
-
pattern: {
|
|
76
|
+
pattern: {
|
|
77
|
+
initializer: () => new UrlPattern({
|
|
78
|
+
pathname: resource,
|
|
79
|
+
baseURL: 'http://localhost',
|
|
80
|
+
username: '*',
|
|
81
|
+
password: '*',
|
|
82
|
+
protocol: '*',
|
|
83
|
+
hostname: '*',
|
|
84
|
+
port: '*',
|
|
85
|
+
search: '*',
|
|
86
|
+
hash: '*'
|
|
87
|
+
})
|
|
88
|
+
},
|
|
76
89
|
endpoints: { value: new Map() }
|
|
77
90
|
});
|
|
78
91
|
this.apis.set(resource, resourceApis);
|
|
@@ -83,14 +96,19 @@ let ApiGateway = ApiGateway_1 = class ApiGateway {
|
|
|
83
96
|
}
|
|
84
97
|
}
|
|
85
98
|
async handleHttpServerRequestContext({ request, respond }) {
|
|
86
|
-
const { api, patternResult } = this.getApiMetadata(request.url);
|
|
87
|
-
const endpoint = api.endpoints.get(request.method);
|
|
88
|
-
const response = await this.handler(request, { api, resourcePatternResult: patternResult, endpoint });
|
|
89
99
|
try {
|
|
100
|
+
const { api, patternResult } = this.getApiMetadata(request.url);
|
|
101
|
+
const endpoint = api.endpoints.get(request.method);
|
|
102
|
+
const response = await this.handler(request, { api, resourcePatternResult: patternResult, endpoint });
|
|
90
103
|
await respond(response);
|
|
91
104
|
}
|
|
92
105
|
catch (error) {
|
|
93
106
|
this.logger.error(error, { includeRest: false, includeStack: false });
|
|
107
|
+
try {
|
|
108
|
+
const response = handleApiError(error, this.supressedErrors, this.logger);
|
|
109
|
+
await respond(response);
|
|
110
|
+
}
|
|
111
|
+
catch ( /* ignore */_a) { /* ignore */ }
|
|
94
112
|
}
|
|
95
113
|
}
|
|
96
114
|
getApiMetadata(resource) {
|
|
@@ -103,10 +121,10 @@ let ApiGateway = ApiGateway_1 = class ApiGateway {
|
|
|
103
121
|
}
|
|
104
122
|
return { api, patternResult: result };
|
|
105
123
|
}
|
|
106
|
-
throw new error_1.NotFoundError(`resource ${resource.
|
|
124
|
+
throw new error_1.NotFoundError(`resource ${resource.pathname} not available`);
|
|
107
125
|
}
|
|
108
126
|
updateMiddleware() {
|
|
109
|
-
const middlewares = [
|
|
127
|
+
const middlewares = [middlewares_1.responseTimeMiddleware, middlewares_1.corsMiddleware, middlewares_1.allowedMethodsMiddleware, ...this.middlewares];
|
|
110
128
|
this.handler = (0, middleware_1.composeAsyncMiddleware)(middlewares, async (request, context) => this.middlewareHandler(request, context));
|
|
111
129
|
}
|
|
112
130
|
async middlewareHandler(request, context) {
|
|
@@ -156,4 +174,30 @@ ApiGateway = ApiGateway_1 = __decorate([
|
|
|
156
174
|
__metadata("design:paramtypes", [logger_1.Logger, Object])
|
|
157
175
|
], ApiGateway);
|
|
158
176
|
exports.ApiGateway = ApiGateway;
|
|
177
|
+
function handleApiError(error, supressedErrors, logger) {
|
|
178
|
+
logger.error(error, { includeRest: false, includeStack: false });
|
|
179
|
+
const response = new server_1.HttpServerResponse();
|
|
180
|
+
if (error instanceof Error) {
|
|
181
|
+
const errorConstructor = error.constructor;
|
|
182
|
+
const supressed = supressedErrors.has(errorConstructor);
|
|
183
|
+
if (!supressed) {
|
|
184
|
+
logger.error(error);
|
|
185
|
+
}
|
|
186
|
+
if ((0, response_1.hasErrorHandler)(errorConstructor)) {
|
|
187
|
+
response.statusCode = (0, response_1.getErrorStatusCode)(error);
|
|
188
|
+
response.body = { json: (0, response_1.createErrorResponse)(error) };
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
response.statusCode = 500;
|
|
192
|
+
response.body = { json: (0, response_1.createErrorResponse)('500', 'Internal Server Error') };
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
const formattedError = (0, helpers_1.formatError)(error, { includeStack: true, includeRest: true, handleBuiltInErrors: true });
|
|
197
|
+
logger.error(formattedError);
|
|
198
|
+
response.statusCode = 500;
|
|
199
|
+
response.body = { json: (0, response_1.createErrorResponse)('500', 'Internal Server Error') };
|
|
200
|
+
}
|
|
201
|
+
return response;
|
|
202
|
+
}
|
|
159
203
|
//# sourceMappingURL=gateway.js.map
|
package/api/gateway.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../source/api/gateway.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4CAA+F;
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../source/api/gateway.ts"],"names":[],"mappings":"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"}
|
package/api/middlewares/index.js
CHANGED
|
@@ -16,6 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./allowed-methods.middleware"), exports);
|
|
18
18
|
__exportStar(require("./cors.middleware"), exports);
|
|
19
|
-
__exportStar(require("./error-catch.middleware"), exports);
|
|
20
19
|
__exportStar(require("./response-time.middleware"), exports);
|
|
21
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/api/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,oDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/api/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,oDAAkC;AAClC,6DAA2C"}
|
package/api/module.d.ts
CHANGED
|
@@ -2,3 +2,4 @@ import type { Type } from "../types";
|
|
|
2
2
|
import type { ApiController } from './api-controller';
|
|
3
3
|
export declare type ApiControllers = Type<ApiController>[];
|
|
4
4
|
export declare const API_CONTROLLERS: import("../container").InjectionToken<ApiControllers, any>;
|
|
5
|
+
export declare function registerApiControllers(...controllers: (Type<ApiController> | Type<ApiController>[])[]): void;
|
package/api/module.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.API_CONTROLLERS = void 0;
|
|
3
|
+
exports.registerApiControllers = exports.API_CONTROLLERS = void 0;
|
|
4
4
|
const container_1 = require("../container");
|
|
5
5
|
exports.API_CONTROLLERS = (0, container_1.injectionToken)('API_CONTROLLERS');
|
|
6
|
+
function registerApiControllers(...controllers) {
|
|
7
|
+
container_1.container.register(exports.API_CONTROLLERS, { useValue: controllers.flatMap((controller) => controller) });
|
|
8
|
+
}
|
|
9
|
+
exports.registerApiControllers = registerApiControllers;
|
|
6
10
|
//# sourceMappingURL=module.js.map
|
package/api/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../source/api/module.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../source/api/module.ts"],"names":[],"mappings":";;;AAAA,4CAAwD;AAM3C,QAAA,eAAe,GAAG,IAAA,0BAAc,EAAiB,iBAAiB,CAAC,CAAC;AAEjF,SAAgB,sBAAsB,CAAC,GAAG,WAA4D;IACpG,qBAAS,CAAC,QAAQ,CAAC,uBAAe,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AACrG,CAAC;AAFD,wDAEC"}
|
|
@@ -114,7 +114,7 @@ export declare class HttpClientRequest<T extends HttpBodyType = HttpBodyType> im
|
|
|
114
114
|
context: StringMap;
|
|
115
115
|
get abortToken(): ReadonlyCancellationToken;
|
|
116
116
|
constructor(url: string, method?: HttpMethod, options?: HttpClientRequestOptions<T>);
|
|
117
|
-
constructor(
|
|
117
|
+
constructor(requestObject: HttpClientRequestObject<T>);
|
|
118
118
|
[dispose](): void;
|
|
119
119
|
/** abort the request */
|
|
120
120
|
abort(): void;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.70.
|
|
3
|
+
"version": "0.70.25",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
"@types/minio": "7.0",
|
|
24
24
|
"@types/node": ">=16",
|
|
25
25
|
"@types/yup": "0.29",
|
|
26
|
-
"@typescript-eslint/eslint-plugin": "5.
|
|
27
|
-
"@typescript-eslint/parser": "5.
|
|
28
|
-
"eslint": "8.
|
|
26
|
+
"@typescript-eslint/eslint-plugin": "5.15",
|
|
27
|
+
"@typescript-eslint/parser": "5.15",
|
|
28
|
+
"eslint": "8.11",
|
|
29
29
|
"ttypescript": "1.5",
|
|
30
30
|
"typescript": "4.6",
|
|
31
31
|
"typescript-transform-paths": "3.3"
|
|
@@ -1,43 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.errorCatchMiddleware = void 0;
|
|
4
|
-
const response_1 = require("../response");
|
|
5
|
-
const server_1 = require("../../http/server");
|
|
6
|
-
const helpers_1 = require("../../utils/helpers");
|
|
7
|
-
function errorCatchMiddleware(logger, supressedErrors) {
|
|
8
|
-
// eslint-disable-next-line @typescript-eslint/no-shadow
|
|
9
|
-
async function errorCatchMiddleware(request, next) {
|
|
10
|
-
try {
|
|
11
|
-
const response = await next(request);
|
|
12
|
-
return response;
|
|
13
|
-
}
|
|
14
|
-
catch (error) {
|
|
15
|
-
const response = new server_1.HttpServerResponse();
|
|
16
|
-
if (error instanceof Error) {
|
|
17
|
-
const errorConstructor = error.constructor;
|
|
18
|
-
const supressed = supressedErrors.has(errorConstructor);
|
|
19
|
-
if (!supressed) {
|
|
20
|
-
logger.error(error);
|
|
21
|
-
}
|
|
22
|
-
if ((0, response_1.hasErrorHandler)(errorConstructor)) {
|
|
23
|
-
response.statusCode = (0, response_1.getErrorStatusCode)(error);
|
|
24
|
-
response.body = { json: (0, response_1.createErrorResponse)(error) };
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
response.statusCode = 500;
|
|
28
|
-
response.body = { json: (0, response_1.createErrorResponse)('500', 'Internal Server Error') };
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
const formattedError = (0, helpers_1.formatError)(error, { includeStack: true, includeRest: true, handleBuiltInErrors: true });
|
|
33
|
-
logger.error(formattedError);
|
|
34
|
-
response.statusCode = 500;
|
|
35
|
-
response.body = { json: (0, response_1.createErrorResponse)('500', 'Internal Server Error') };
|
|
36
|
-
}
|
|
37
|
-
return response;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
return errorCatchMiddleware;
|
|
41
|
-
}
|
|
42
|
-
exports.errorCatchMiddleware = errorCatchMiddleware;
|
|
43
|
-
//# sourceMappingURL=error-catch.middleware.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"error-catch.middleware.js","sourceRoot":"","sources":["../../../source/api/middlewares/error-catch.middleware.ts"],"names":[],"mappings":";;;AAAA,0CAA0F;AAG1F,8CAAmD;AAGnD,iDAA8C;AAG9C,SAAgB,oBAAoB,CAAC,MAAc,EAAE,eAAiC;IACpF,wDAAwD;IACxD,KAAK,UAAU,oBAAoB,CAAC,OAA0B,EAAE,IAA8B;QAC5F,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;YACrC,OAAO,QAAQ,CAAC;SACjB;QACD,OAAO,KAAc,EAAE;YACrB,MAAM,QAAQ,GAAG,IAAI,2BAAkB,EAAE,CAAC;YAE1C,IAAI,KAAK,YAAY,KAAK,EAAE;gBAC1B,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAA8C,CAAC;gBAC9E,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAExD,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACrB;gBAED,IAAI,IAAA,0BAAe,EAAC,gBAAgB,CAAC,EAAE;oBACrC,QAAQ,CAAC,UAAU,GAAG,IAAA,6BAAkB,EAAC,KAAoB,CAAC,CAAC;oBAC/D,QAAQ,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,IAAA,8BAAmB,EAAC,KAAK,CAAC,EAAE,CAAC;iBACtD;qBACI;oBACH,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;oBAC1B,QAAQ,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,IAAA,8BAAmB,EAAC,KAAK,EAAE,uBAAuB,CAAC,EAAE,CAAC;iBAC/E;aACF;iBACI;gBACH,MAAM,cAAc,GAAG,IAAA,qBAAW,EAAC,KAAK,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChH,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBAE7B,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;gBAC1B,QAAQ,CAAC,IAAI,GAAG,EAAE,IAAI,EAAE,IAAA,8BAAmB,EAAC,KAAK,EAAE,uBAAuB,CAAC,EAAE,CAAC;aAC/E;YAED,OAAO,QAAQ,CAAC;SACjB;IACH,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAxCD,oDAwCC"}
|