@furystack/rest-service 6.0.2 → 6.0.5
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/dist/api-manager.js +6 -4
- package/dist/api-manager.js.map +1 -1
- package/dist/http-user-context.js +14 -8
- package/dist/http-user-context.js.map +1 -1
- package/dist/schema-validator/schema-validator.js.map +1 -1
- package/package.json +13 -13
- package/src/api-manager.ts +3 -2
- package/src/http-user-context.ts +9 -6
- package/src/schema-validator/schema-validator.ts +1 -1
- package/types/api-manager.d.ts +2 -3
- package/types/api-manager.d.ts.map +1 -1
- package/types/http-user-context.d.ts +4 -6
- package/types/http-user-context.d.ts.map +1 -1
package/dist/api-manager.js
CHANGED
|
@@ -14,8 +14,7 @@ require("./server-response-extensions");
|
|
|
14
14
|
const core_1 = require("@furystack/core");
|
|
15
15
|
const http_user_context_1 = require("./http-user-context");
|
|
16
16
|
let ApiManager = class ApiManager {
|
|
17
|
-
constructor(
|
|
18
|
-
this.serverManager = serverManager;
|
|
17
|
+
constructor() {
|
|
19
18
|
this.apis = new Map();
|
|
20
19
|
}
|
|
21
20
|
dispose() {
|
|
@@ -136,9 +135,12 @@ let ApiManager = class ApiManager {
|
|
|
136
135
|
}
|
|
137
136
|
}
|
|
138
137
|
};
|
|
138
|
+
tslib_1.__decorate([
|
|
139
|
+
(0, inject_1.Injected)(server_manager_1.ServerManager),
|
|
140
|
+
tslib_1.__metadata("design:type", server_manager_1.ServerManager)
|
|
141
|
+
], ApiManager.prototype, "serverManager", void 0);
|
|
139
142
|
ApiManager = tslib_1.__decorate([
|
|
140
|
-
(0, inject_1.Injectable)({ lifetime: 'singleton' })
|
|
141
|
-
tslib_1.__metadata("design:paramtypes", [server_manager_1.ServerManager])
|
|
143
|
+
(0, inject_1.Injectable)({ lifetime: 'singleton' })
|
|
142
144
|
], ApiManager);
|
|
143
145
|
exports.ApiManager = ApiManager;
|
|
144
146
|
//# sourceMappingURL=api-manager.js.map
|
package/dist/api-manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-manager.js","sourceRoot":"","sources":["../src/api-manager.ts"],"names":[],"mappings":";;;;AAAA,4CAAqE;AACrE,0CAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"api-manager.js","sourceRoot":"","sources":["../src/api-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,7 @@ const crypto_1 = require("crypto");
|
|
|
11
11
|
* Injectable UserContext for FuryStack HTTP Api
|
|
12
12
|
*/
|
|
13
13
|
let HttpUserContext = class HttpUserContext {
|
|
14
|
-
constructor(
|
|
15
|
-
this.authentication = authentication;
|
|
16
|
-
this.storeManager = storeManager;
|
|
17
|
-
this.authenticator = authenticator;
|
|
14
|
+
constructor() {
|
|
18
15
|
this.getUserStore = () => this.authentication.getUserStore(this.storeManager);
|
|
19
16
|
this.getSessionStore = () => this.authentication.getSessionStore(this.storeManager);
|
|
20
17
|
this.getUserByName = async (userName) => {
|
|
@@ -150,11 +147,20 @@ let HttpUserContext = class HttpUserContext {
|
|
|
150
147
|
}
|
|
151
148
|
}
|
|
152
149
|
};
|
|
150
|
+
tslib_1.__decorate([
|
|
151
|
+
(0, inject_1.Injected)(http_authentication_settings_1.HttpAuthenticationSettings),
|
|
152
|
+
tslib_1.__metadata("design:type", http_authentication_settings_1.HttpAuthenticationSettings)
|
|
153
|
+
], HttpUserContext.prototype, "authentication", void 0);
|
|
154
|
+
tslib_1.__decorate([
|
|
155
|
+
(0, inject_1.Injected)(core_1.StoreManager),
|
|
156
|
+
tslib_1.__metadata("design:type", core_1.StoreManager)
|
|
157
|
+
], HttpUserContext.prototype, "storeManager", void 0);
|
|
158
|
+
tslib_1.__decorate([
|
|
159
|
+
(0, inject_1.Injected)(security_1.PasswordAuthenticator),
|
|
160
|
+
tslib_1.__metadata("design:type", security_1.PasswordAuthenticator)
|
|
161
|
+
], HttpUserContext.prototype, "authenticator", void 0);
|
|
153
162
|
HttpUserContext = tslib_1.__decorate([
|
|
154
|
-
(0, inject_1.Injectable)({ lifetime: 'scoped' })
|
|
155
|
-
tslib_1.__metadata("design:paramtypes", [http_authentication_settings_1.HttpAuthenticationSettings,
|
|
156
|
-
core_1.StoreManager,
|
|
157
|
-
security_1.PasswordAuthenticator])
|
|
163
|
+
(0, inject_1.Injectable)({ lifetime: 'scoped' })
|
|
158
164
|
], HttpUserContext);
|
|
159
165
|
exports.HttpUserContext = HttpUserContext;
|
|
160
166
|
//# sourceMappingURL=http-user-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-user-context.js","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":";;;;AACA,0CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"http-user-context.js","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-validator.js","sourceRoot":"","sources":["../../src/schema-validator/schema-validator.ts"],"names":[],"mappings":";;;;AAAA,sDAA+C;AAC/C,sEAAoC;AACpC,uEAAiE;AAEjE,MAAa,eAAe;IAK1B,YAA6B,MAAe,EAAmB,UAAoB;QAAtD,WAAM,GAAN,MAAM,CAAS;QAAmB,eAAU,GAAV,UAAU,CAAU;QAJlE,QAAG,GAAG,IAAI,aAAG,CAAC;YAC7B,SAAS,EAAE,IAAI;YACf,GAAG,IAAI,CAAC,UAAU;SACnB,CAAC,CAAA;QAEA,IAAA,qBAAU,EAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;IAED;;;;;;OAMG;IACI,OAAO,CAAI,IAAS,EAAE,OAAqD;QAChF,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,iBAAiB,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"schema-validator.js","sourceRoot":"","sources":["../../src/schema-validator/schema-validator.ts"],"names":[],"mappings":";;;;AAAA,sDAA+C;AAC/C,sEAAoC;AACpC,uEAAiE;AAEjE,MAAa,eAAe;IAK1B,YAA6B,MAAe,EAAmB,UAAoB;QAAtD,WAAM,GAAN,MAAM,CAAS;QAAmB,eAAU,GAAV,UAAU,CAAU;QAJlE,QAAG,GAAG,IAAI,aAAG,CAAC;YAC7B,SAAS,EAAE,IAAI;YACf,GAAG,IAAI,CAAC,UAAU;SACnB,CAAC,CAAA;QAEA,IAAA,qBAAU,EAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;IAED;;;;;;OAMG;IACI,OAAO,CAAI,IAAS,EAAE,OAAqD;QAChF,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,iBAAiB,OAAO,CAAC,UAAoB,EAAE,EAAE,CAAA;QACxF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC5C,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QACjC,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,+CAAqB,CAAC,WAAW,CAAC,MAAuB,CAAC,CAAA;SACrE;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AA1BD,0CA0BC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@furystack/rest-service",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.5",
|
|
4
4
|
"description": "Repository implementation for FuryStack",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -29,24 +29,24 @@
|
|
|
29
29
|
},
|
|
30
30
|
"homepage": "https://github.com/furystack/furystack",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@furystack/core": "^11.0.
|
|
33
|
-
"@furystack/inject": "^
|
|
34
|
-
"@furystack/logging": "^3.0.
|
|
35
|
-
"@furystack/repository": "^6.0.
|
|
36
|
-
"@furystack/rest": "^4.0.
|
|
37
|
-
"@furystack/security": "^2.0.
|
|
38
|
-
"@furystack/utils": "^3.0.
|
|
32
|
+
"@furystack/core": "^11.0.4",
|
|
33
|
+
"@furystack/inject": "^7.0.0",
|
|
34
|
+
"@furystack/logging": "^3.0.4",
|
|
35
|
+
"@furystack/repository": "^6.0.4",
|
|
36
|
+
"@furystack/rest": "^4.0.3",
|
|
37
|
+
"@furystack/security": "^2.0.4",
|
|
38
|
+
"@furystack/utils": "^3.0.4",
|
|
39
39
|
"ajv": "^8.11.0",
|
|
40
40
|
"ajv-formats": "^2.1.1",
|
|
41
|
-
"path-to-regexp": "^6.2.
|
|
41
|
+
"path-to-regexp": "^6.2.1",
|
|
42
42
|
"semaphore-async-await": "^1.5.1",
|
|
43
43
|
"tslib": "^2.4.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@furystack/rest-client-got": "^2.0.
|
|
47
|
-
"@types/jest": "^27.5.
|
|
48
|
-
"@types/node": "^
|
|
49
|
-
"got": "^11.8.
|
|
46
|
+
"@furystack/rest-client-got": "^2.0.5",
|
|
47
|
+
"@types/jest": "^27.5.2",
|
|
48
|
+
"@types/node": "^18.0.0",
|
|
49
|
+
"got": "^11.8.5"
|
|
50
50
|
},
|
|
51
51
|
"typings": "./types/index.d.ts",
|
|
52
52
|
"gitHead": "1045d854bfd8c475b7035471d130d401417a2321"
|
package/src/api-manager.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Disposable, PathHelper, usingAsync } from '@furystack/utils'
|
|
2
2
|
import { deserializeQueryString, RestApi } from '@furystack/rest'
|
|
3
|
-
import { Injectable, Injector } from '@furystack/inject'
|
|
3
|
+
import { Injectable, Injected, Injector } from '@furystack/inject'
|
|
4
4
|
import { ServerManager, OnRequest } from './server-manager'
|
|
5
5
|
import { pathToRegexp, match } from 'path-to-regexp'
|
|
6
6
|
import { NotFoundAction } from './actions/not-found-action'
|
|
@@ -218,5 +218,6 @@ export class ApiManager implements Disposable {
|
|
|
218
218
|
}
|
|
219
219
|
}
|
|
220
220
|
|
|
221
|
-
|
|
221
|
+
@Injected(ServerManager)
|
|
222
|
+
private readonly serverManager!: ServerManager
|
|
222
223
|
}
|
package/src/http-user-context.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IncomingMessage, ServerResponse } from 'http'
|
|
2
2
|
import { User, StoreManager } from '@furystack/core'
|
|
3
|
-
import { Injectable } from '@furystack/inject'
|
|
3
|
+
import { Injectable, Injected } from '@furystack/inject'
|
|
4
4
|
import { HttpAuthenticationSettings } from './http-authentication-settings'
|
|
5
5
|
import { DefaultSession } from './models/default-session'
|
|
6
6
|
import { PasswordAuthenticator, UnauthenticatedError } from '@furystack/security'
|
|
@@ -160,9 +160,12 @@ export class HttpUserContext {
|
|
|
160
160
|
}
|
|
161
161
|
}
|
|
162
162
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
163
|
+
@Injected(HttpAuthenticationSettings)
|
|
164
|
+
public readonly authentication!: HttpAuthenticationSettings<User, DefaultSession>
|
|
165
|
+
|
|
166
|
+
@Injected(StoreManager)
|
|
167
|
+
private readonly storeManager!: StoreManager
|
|
168
|
+
|
|
169
|
+
@Injected(PasswordAuthenticator)
|
|
170
|
+
private readonly authenticator!: PasswordAuthenticator
|
|
168
171
|
}
|
|
@@ -19,7 +19,7 @@ export class SchemaValidator<TSchema extends { definitions: {} }> {
|
|
|
19
19
|
* @returns true in case of validation success
|
|
20
20
|
*/
|
|
21
21
|
public isValid<T>(data: any, options: { schemaName: keyof TSchema['definitions'] }): data is T {
|
|
22
|
-
const schema = { ...this.schema, $ref: `#/definitions/${options.schemaName}` }
|
|
22
|
+
const schema = { ...this.schema, $ref: `#/definitions/${options.schemaName as string}` }
|
|
23
23
|
const validatorFn = this.ajv.compile(schema)
|
|
24
24
|
const isValid = validatorFn(data)
|
|
25
25
|
if (!isValid) {
|
package/types/api-manager.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Disposable } from '@furystack/utils';
|
|
2
2
|
import { RestApi } from '@furystack/rest';
|
|
3
3
|
import { Injector } from '@furystack/inject';
|
|
4
|
-
import {
|
|
4
|
+
import { OnRequest } from './server-manager';
|
|
5
5
|
import { CorsOptions } from './models/cors-options';
|
|
6
6
|
import './server-response-extensions';
|
|
7
7
|
import { RequestAction } from './request-action-implementation';
|
|
@@ -41,7 +41,6 @@ export declare type OnRequestOptions = OnRequest & {
|
|
|
41
41
|
deserializeQueryParams?: (param: string) => any;
|
|
42
42
|
};
|
|
43
43
|
export declare class ApiManager implements Disposable {
|
|
44
|
-
private readonly serverManager;
|
|
45
44
|
private readonly apis;
|
|
46
45
|
dispose(): void;
|
|
47
46
|
private getSuportedMethods;
|
|
@@ -56,6 +55,6 @@ export declare class ApiManager implements Disposable {
|
|
|
56
55
|
private getActionFromEndpoint;
|
|
57
56
|
private executeAction;
|
|
58
57
|
private onMessage;
|
|
59
|
-
|
|
58
|
+
private readonly serverManager;
|
|
60
59
|
}
|
|
61
60
|
//# sourceMappingURL=api-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-manager.d.ts","sourceRoot":"","sources":["../src/api-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAA;AACrE,OAAO,EAA0B,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,
|
|
1
|
+
{"version":3,"file":"api-manager.d.ts","sourceRoot":"","sources":["../src/api-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAA;AACrE,OAAO,EAA0B,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAwB,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAiB,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAG3D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,OAAO,8BAA8B,CAAA;AAGrC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAA;AAE/D,oBAAY,qBAAqB,CAAC,CAAC,SAAS,OAAO,IAAI;KACpD,OAAO,IAAI,MAAM,CAAC,GAAG;SACnB,IAAI,IAAI,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS;YAAE,MAAM,EAAE,OAAO,CAAA;SAAE,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK;KACnH;CACF,CAAA;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,OAAO;IACpD,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAA;IAC7B,QAAQ,EAAE,QAAQ,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAA;CAChD;AAED,oBAAY,WAAW,GAAG;IACxB,CAAC,CAAC,EAAE,MAAM,GAAG;QACX,CAAC,CAAC,EAAE,MAAM,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,CAAA;SAAE,CAAA;KAC7E,CAAA;CACF,CAAA;AAED,oBAAY,gBAAgB,GAAG,SAAS,GAAG;IACzC,WAAW,EAAE,WAAW,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,QAAQ,CAAA;IAClB,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,sBAAsB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAA;CAChD,CAAA;AAED,qBACa,UAAW,YAAW,UAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;IAE/C,OAAO;IAId,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,UAAU;IAeL,MAAM,CAAC,CAAC,SAAS,OAAO,EAAE,EACrC,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,sBAAsB,GACvB,EAAE,mBAAmB,CAAC,CAAC,CAAC;IA6BlB,iBAAiB,CAAC,OAAO,EAAE;QAChC,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,GAAG,CAAC,EAAE,MAAM,CAAA;QACZ,WAAW,EAAE,MAAM,CAAA;QACnB,gBAAgB,EAAE,MAAM,EAAE,CAAA;KAC3B,GAAG,OAAO;IASX,OAAO,CAAC,qBAAqB;YAWf,aAAa;YA0Db,SAAS;IA2BvB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;CAC/C"}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
import { IncomingMessage, ServerResponse } from 'http';
|
|
2
|
-
import { User
|
|
2
|
+
import { User } from '@furystack/core';
|
|
3
3
|
import { HttpAuthenticationSettings } from './http-authentication-settings';
|
|
4
4
|
import { DefaultSession } from './models/default-session';
|
|
5
|
-
import { PasswordAuthenticator } from '@furystack/security';
|
|
6
5
|
/**
|
|
7
6
|
* Injectable UserContext for FuryStack HTTP Api
|
|
8
7
|
*/
|
|
9
8
|
export declare class HttpUserContext {
|
|
10
|
-
readonly authentication: HttpAuthenticationSettings<User, DefaultSession>;
|
|
11
|
-
private readonly storeManager;
|
|
12
|
-
private readonly authenticator;
|
|
13
9
|
getUserStore: () => import("@furystack/core").PhysicalStore<User, keyof User>;
|
|
14
10
|
getSessionStore: () => import("@furystack/core").PhysicalStore<DefaultSession, keyof DefaultSession>;
|
|
15
11
|
private getUserByName;
|
|
@@ -48,6 +44,8 @@ export declare class HttpUserContext {
|
|
|
48
44
|
*/
|
|
49
45
|
cookieLogin(user: User, serverResponse: ServerResponse): Promise<User>;
|
|
50
46
|
cookieLogout(request: IncomingMessage, response: ServerResponse): Promise<void>;
|
|
51
|
-
|
|
47
|
+
readonly authentication: HttpAuthenticationSettings<User, DefaultSession>;
|
|
48
|
+
private readonly storeManager;
|
|
49
|
+
private readonly authenticator;
|
|
52
50
|
}
|
|
53
51
|
//# sourceMappingURL=http-user-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-user-context.d.ts","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"http-user-context.d.ts","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AACtD,OAAO,EAAE,IAAI,EAAgB,MAAM,iBAAiB,CAAA;AAEpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAA;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAIzD;;GAEG;AACH,qBACa,eAAe;IACnB,YAAY,kEAA4D;IAExE,eAAe,sFAA+D;IAErF,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,cAAc,CAOrB;IAED,OAAO,CAAC,IAAI,CAAC,CAAM;IAEnB;;;OAGG;IACU,eAAe,CAAC,OAAO,EAAE,eAAe;IASrD;;;;;;OAMG;IACU,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzF;;;;;;OAMG;IACU,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAanD,cAAc,CAAC,OAAO,EAAE,eAAe;IAQ7C,uBAAuB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI;IAkB1D,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBzE;;;;;;OAMG;IACU,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtE,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,cAAc;IAW5E,SACgB,cAAc,EAAG,0BAA0B,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IAGjF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwB;CACvD"}
|