@pgds/api-interface 1.4.71 → 1.5.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/README.md +1 -1
- package/client/FairtrailClient.js +10 -17
- package/client/FairtrailClient.js.map +1 -1
- package/lib/models/ReqUser.js +1 -1
- package/lib/models/ReqUser.js.map +1 -1
- package/lib/utils/asyncHooks.d.ts +4 -0
- package/lib/utils/asyncHooks.js +5 -2
- package/lib/utils/asyncHooks.js.map +1 -1
- package/lib/utils/logger.d.ts +1 -1
- package/package.json +2 -2
- package/utils/index.d.ts +1 -0
- package/utils/index.js +5 -1
- package/utils/index.js.map +1 -1
package/README.md
CHANGED
|
@@ -362,7 +362,7 @@ Prerequisites:
|
|
|
362
362
|
Then, in root, run:
|
|
363
363
|
|
|
364
364
|
```typescript
|
|
365
|
-
// Check out any untracked/ignored files (e.g. previously built files)
|
|
365
|
+
// Check out any untracked/ignored files (e.g. previously built files) ⚠ Do not do this unless you have committed any changes you want to keep ⚠
|
|
366
366
|
yarn clean
|
|
367
367
|
|
|
368
368
|
// Install dependencies
|
|
@@ -179,7 +179,7 @@ var FairtrailClient = /** @class */ (function (_super) {
|
|
|
179
179
|
});
|
|
180
180
|
FairtrailClient.prototype.getAuthHeaders = function (_authenticated_1) {
|
|
181
181
|
return __awaiter(this, arguments, void 0, function (_authenticated, otherHeaders) {
|
|
182
|
-
var authOrganizationHierarchyHeader
|
|
182
|
+
var authOrganizationHierarchyHeader;
|
|
183
183
|
var _a, _b, _c;
|
|
184
184
|
var _d, _e, _f, _g, _h;
|
|
185
185
|
if (otherHeaders === void 0) { otherHeaders = {}; }
|
|
@@ -195,33 +195,26 @@ var FairtrailClient = /** @class */ (function (_super) {
|
|
|
195
195
|
_a[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER] = JSON.stringify((_h = this.reqUser.organizationHierarchy) !== null && _h !== void 0 ? _h : {}),
|
|
196
196
|
_a)];
|
|
197
197
|
}
|
|
198
|
-
if (
|
|
198
|
+
if (this.reqAsGlobal) {
|
|
199
|
+
return [2 /*return*/, (_b = {},
|
|
200
|
+
_b[constants_1.AUTH_USER_HEADER] = this.serviceApiUser,
|
|
201
|
+
_b[constants_1.AUTH_ACTIVITIES_HEADER] = constants_1.GLOBAL_ACTIVITY,
|
|
202
|
+
_b)];
|
|
203
|
+
}
|
|
204
|
+
if (!this.reqAsOrganizationManager) return [3 /*break*/, 3];
|
|
199
205
|
authOrganizationHierarchyHeader = otherHeaders[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER];
|
|
200
206
|
if (!!authOrganizationHierarchyHeader) return [3 /*break*/, 2];
|
|
201
207
|
return [4 /*yield*/, this.getOrganizationHierarchyHeader(this.reqOrganizationId)];
|
|
202
208
|
case 1:
|
|
203
209
|
authOrganizationHierarchyHeader = _j.sent();
|
|
204
210
|
_j.label = 2;
|
|
205
|
-
case 2: return [2 /*return*/, (
|
|
206
|
-
_b[constants_1.AUTH_USER_HEADER] = this.serviceApiUser,
|
|
207
|
-
_b[constants_1.AUTH_ACTIVITIES_HEADER] = constants_1.GLOBAL_ACTIVITY,
|
|
208
|
-
_b[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER] = authOrganizationHierarchyHeader,
|
|
209
|
-
_b)];
|
|
210
|
-
case 3:
|
|
211
|
-
if (!this.reqAsOrganizationManager) return [3 /*break*/, 6];
|
|
212
|
-
authOrganizationHierarchyHeader = otherHeaders[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER];
|
|
213
|
-
if (!!authOrganizationHierarchyHeader) return [3 /*break*/, 5];
|
|
214
|
-
return [4 /*yield*/, this.getOrganizationHierarchyHeader(this.reqOrganizationId)];
|
|
215
|
-
case 4:
|
|
216
|
-
authOrganizationHierarchyHeader = _j.sent();
|
|
217
|
-
_j.label = 5;
|
|
218
|
-
case 5: return [2 /*return*/, (_c = {},
|
|
211
|
+
case 2: return [2 /*return*/, (_c = {},
|
|
219
212
|
_c[constants_1.AUTH_USER_HEADER] = this.serviceApiUser,
|
|
220
213
|
_c[constants_1.AUTH_ACTIVITIES_HEADER] = constants_1.CAN_MANAGE_ORGANIZATION_ACTIVITY,
|
|
221
214
|
_c[constants_1.AUTH_ORGANIZATION_HEADER] = this.reqOrganizationId,
|
|
222
215
|
_c[constants_1.AUTH_ORGANIZATION_HIERARCHY_HEADER] = authOrganizationHierarchyHeader,
|
|
223
216
|
_c)];
|
|
224
|
-
case
|
|
217
|
+
case 3: return [2 /*return*/, {}];
|
|
225
218
|
}
|
|
226
219
|
});
|
|
227
220
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FairtrailClient.js","sourceRoot":"","sources":["FairtrailClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAqD;AACrD,0CAQsB;AACtB,8BAAwC;AACxC,wCAA6C;AAC7C,wDAA0E;AAE1E,2CAA0C;AAE1C;;;;GAIG;AACH;IAAqC,mCAAU;IAA/C;;QAEU,iBAAW,GAAY,KAAK,CAAC;QAC7B,8BAAwB,GAAY,KAAK,CAAC;;
|
|
1
|
+
{"version":3,"file":"FairtrailClient.js","sourceRoot":"","sources":["FairtrailClient.ts"],"names":[],"mappings":"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"}
|
package/lib/models/ReqUser.js
CHANGED
|
@@ -66,7 +66,7 @@ var ReqUser = /** @class */ (function () {
|
|
|
66
66
|
return result;
|
|
67
67
|
};
|
|
68
68
|
ReqUser.prototype.getCompleteOrganizationTreeIds = function (organizationId) {
|
|
69
|
-
if ((0, utils_1.isGlobal)(this)) {
|
|
69
|
+
if ((0, utils_1.isGlobal)(this) && !organizationId) {
|
|
70
70
|
return Object.keys(this.organizationHierarchy);
|
|
71
71
|
}
|
|
72
72
|
var stack = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReqUser.js","sourceRoot":"","sources":["ReqUser.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAQvC;IAaE,iBAAY,EAYX;YAXC,MAAM,YAAA,EACN,cAAc,oBAAA,EACd,UAAU,gBAAA,EACV,WAAW,iBAAA,EACX,qBAAqB,2BAAA;QAQrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACI,wCAAsB,GAA7B,UAA8B,cAAuB,EAAE,cAAuB;QAC5E,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC,4BAA4B,CAAC,cAAe,EAAE,cAAc,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,8BAA8B,CAAC,cAAc,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAEO,8CAA4B,GAApC,UAAqC,gBAAwB,EAAE,cAAsB;QACnF,IACE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC;YAC1C,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YACtE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC;gBAC5C,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,EACxE,CAAC;YACD,OAAO,CAAC,cAAc,CAAC,CAAC;QAC1B,CAAC;QAED,IAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,IAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,IAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE3B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,IAAM,YAAY,GAAG,KAAK,CAAC,GAAG,EAAG,CAAC;YAElC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,YAAY,KAAK,gBAAgB,EAAE,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAE1B,KAAkC,UAA0C,EAA1C,KAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAA1C,cAA0C,EAA1C,IAA0C,EAAE,CAAC;gBAApE,IAAA,WAAmB,EAAlB,OAAO,QAAA,EAAE,QAAQ,QAAA;gBAC3B,IAAI,OAAO,KAAK,YAAY,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gDAA8B,GAAtC,UAAuC,cAAuB;QAC5D,IAAI,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ReqUser.js","sourceRoot":"","sources":["ReqUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,10 @@ interface RequestStore {
|
|
|
13
13
|
* Will be automatically be added to any requests made with the clients extending FairtrailClient.
|
|
14
14
|
**/
|
|
15
15
|
reqId: string;
|
|
16
|
+
/**
|
|
17
|
+
* User agent of the current request
|
|
18
|
+
*/
|
|
19
|
+
userAgent?: string;
|
|
16
20
|
}
|
|
17
21
|
type RequestContext = Request | string;
|
|
18
22
|
/**
|
package/lib/utils/asyncHooks.js
CHANGED
|
@@ -39,6 +39,7 @@ var constants_1 = require("../../constants");
|
|
|
39
39
|
var async_hooks_1 = require("async_hooks");
|
|
40
40
|
var ReqUser_1 = require("../models/ReqUser");
|
|
41
41
|
var uuid = __importStar(require("uuid"));
|
|
42
|
+
var USER_AGENT_HEADER = "user-agent";
|
|
42
43
|
function isRequest(reqContext) {
|
|
43
44
|
return !!reqContext && typeof reqContext === "object";
|
|
44
45
|
}
|
|
@@ -51,18 +52,20 @@ var asyncLocalStorage = new async_hooks_1.AsyncLocalStorage();
|
|
|
51
52
|
* @throws Any error thrown by the inputted function
|
|
52
53
|
*/
|
|
53
54
|
function runWithRequestContext(reqContext, fn) {
|
|
54
|
-
var _a, _b, _c, _d;
|
|
55
|
+
var _a, _b, _c, _d, _e;
|
|
55
56
|
var reqId = "";
|
|
56
57
|
var user = undefined;
|
|
58
|
+
var userAgent = undefined;
|
|
57
59
|
if (isRequest(reqContext)) {
|
|
58
60
|
reqId = (_c = (_b = (_a = reqContext.header) === null || _a === void 0 ? void 0 : _a.call(reqContext, constants_1.REQUEST_ID_HEADER)) !== null && _b !== void 0 ? _b : reqContext.getId()) !== null && _c !== void 0 ? _c : uuid.v4();
|
|
59
61
|
user = (_d = reqContext.user) !== null && _d !== void 0 ? _d : getFallbackUser(reqContext);
|
|
62
|
+
userAgent = (_e = reqContext.header) === null || _e === void 0 ? void 0 : _e.call(reqContext, USER_AGENT_HEADER);
|
|
60
63
|
}
|
|
61
64
|
else {
|
|
62
65
|
reqId = reqContext !== null && reqContext !== void 0 ? reqContext : uuid.v4();
|
|
63
66
|
}
|
|
64
67
|
return new Promise(function (resolve, reject) {
|
|
65
|
-
asyncLocalStorage.run({ reqId: reqId, user: user }, function () {
|
|
68
|
+
asyncLocalStorage.run({ reqId: reqId, user: user, userAgent: userAgent }, function () {
|
|
66
69
|
try {
|
|
67
70
|
resolve(fn());
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncHooks.js","sourceRoot":"","sources":["asyncHooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"asyncHooks.js","sourceRoot":"","sources":["asyncHooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmDA,sDA0BC;AAGD,kCAEC;AAlFD,6CAOyB;AACzB,2CAAgD;AAChD,6CAA4C;AAE5C,yCAA6B;AAE7B,IAAM,iBAAiB,GAAG,YAAY,CAAC;AAyBvC,SAAS,SAAS,CAAC,UAA0B;IAC3C,OAAO,CAAC,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,CAAC;AACxD,CAAC;AAED,IAAM,iBAAiB,GAAG,IAAI,+BAAiB,EAAgB,CAAC;AAEhE;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,UAA0B,EAC1B,EAA8B;;IAE9B,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,IAAI,GAAwB,SAAS,CAAC;IAC1C,IAAI,SAAS,GAAuB,SAAS,CAAC;IAE9C,IAAI,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,KAAK,GAAG,MAAA,MAAA,MAAA,UAAU,CAAC,MAAM,2DAAG,6BAAiB,CAAC,mCAAI,UAAU,CAAC,KAAK,EAAE,mCAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QAClF,IAAI,GAAG,MAAA,UAAU,CAAC,IAAI,mCAAI,eAAe,CAAC,UAAU,CAAC,CAAC;QAEtD,SAAS,GAAG,MAAA,UAAU,CAAC,MAAM,2DAAG,iBAAiB,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,CAAC,EAAE,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,iBAAiB,CAAC,GAAG,CAAC,EAAE,KAAK,OAAA,EAAE,IAAI,MAAA,EAAE,SAAS,WAAA,EAAE,EAAE;YAChD,IAAI,CAAC;gBACH,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAChB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,4CAA4C;AAC5C,SAAgB,WAAW;;IACzB,OAAO,MAAA,iBAAiB,CAAC,QAAQ,EAAE,mCAAK,EAAmB,CAAC;AAC9D,CAAC;AAED,mDAAmD;AACnD,SAAS,eAAe,CAAC,GAAY;IACnC,IAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,4BAAgB,CAAC,CAAC;IAC5C,IAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,oCAAwB,CAAC,CAAC;IACzD,IAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,kCAAsB,CAAC,CAAC;IACtD,IAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,oCAAwB,CAAC,CAAC;IAC5D,IAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,8CAAkC,EAAE,IAAI,CAAC,CAAC,CAAC;IAE/F,oDAAoD;IACpD,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,IAAI,CAAC,UAAU,IAAI,CAAC,cAAc,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACxF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAI,iBAAO,CAAC;QACjB,MAAM,QAAA;QACN,WAAW,aAAA;QACX,UAAU,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAC,GAAG,EAAE,MAAM,CACvC,UAAC,GAAG,EAAE,QAAQ;YACZ,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;YACrB,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAA6B,CAC9B;QACD,cAAc,gBAAA;QACd,qBAAqB,uBAAA;KACtB,CAAC,CAAC;AACL,CAAC"}
|
package/lib/utils/logger.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@pgds/api-interface",
|
|
3
3
|
"description": "Api interface for pgds services",
|
|
4
4
|
"authors": "Florry",
|
|
5
|
-
"version": "1.
|
|
5
|
+
"version": "1.5.0",
|
|
6
6
|
"main": "index.js",
|
|
7
7
|
"types": "types/",
|
|
8
8
|
"scripts": {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"dependencies": {
|
|
35
35
|
"@types/restify": "^8.5.12",
|
|
36
36
|
"@types/restify-errors": "^4.3.9",
|
|
37
|
-
"@pgds/utils": "1.
|
|
37
|
+
"@pgds/utils": "1.1.4",
|
|
38
38
|
"ajv": "8.17.1",
|
|
39
39
|
"ajv-formats": "3.0.1",
|
|
40
40
|
"axios": "1.7.9",
|
package/utils/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import { ReqUser } from "../lib/models/ReqUser";
|
|
|
7
7
|
*/
|
|
8
8
|
export declare function hasActivity(reqUser: ReqUser, activity: string, wildcardCheck?: boolean): boolean;
|
|
9
9
|
export declare function isGlobal(reqUser: ReqUser): boolean;
|
|
10
|
+
export declare function isPlatformAdmin(reqUser: ReqUser): boolean;
|
|
10
11
|
/**
|
|
11
12
|
* Short hand function to check if a user has the `canManageOrganization`(`CAN_MANAGE_ORGANIZATION_ACTIVITY`) activity.
|
|
12
13
|
*/
|
package/utils/index.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.hasActivity = hasActivity;
|
|
4
4
|
exports.isGlobal = isGlobal;
|
|
5
|
+
exports.isPlatformAdmin = isPlatformAdmin;
|
|
5
6
|
exports.canManageOrganization = canManageOrganization;
|
|
6
7
|
exports.isOrganizationAccessibleToUser = isOrganizationAccessibleToUser;
|
|
7
8
|
var constants_1 = require("../constants");
|
|
@@ -24,6 +25,9 @@ function hasActivity(reqUser, activity, wildcardCheck) {
|
|
|
24
25
|
function isGlobal(reqUser) {
|
|
25
26
|
return !!reqUser.activities[constants_1.GLOBAL_ACTIVITY];
|
|
26
27
|
}
|
|
28
|
+
function isPlatformAdmin(reqUser) {
|
|
29
|
+
return hasActivity(reqUser, constants_1.CAN_MANAGE_PLATFORM_ACTIVITY);
|
|
30
|
+
}
|
|
27
31
|
/**
|
|
28
32
|
* Short hand function to check if a user has the `canManageOrganization`(`CAN_MANAGE_ORGANIZATION_ACTIVITY`) activity.
|
|
29
33
|
*/
|
|
@@ -36,7 +40,7 @@ function canManageOrganization(reqUser) {
|
|
|
36
40
|
* @param organizationId The organizationId to check for access to.
|
|
37
41
|
*/
|
|
38
42
|
function isOrganizationAccessibleToUser(reqUser, organizationId) {
|
|
39
|
-
if (isGlobal(reqUser)) {
|
|
43
|
+
if (isGlobal(reqUser) || isPlatformAdmin(reqUser)) {
|
|
40
44
|
return true;
|
|
41
45
|
}
|
|
42
46
|
return reqUser.getOrganizationTreeIds().includes(organizationId);
|
package/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAUA,kCAMC;AAED,4BAEC;AAKD,sDAEC;AAOD,wEAMC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAUA,kCAMC;AAED,4BAEC;AAED,0CAEC;AAKD,sDAEC;AAOD,wEAMC;AA5CD,0CAA+G;AAC/G,yDAA4D;AAG5D;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,OAAgB,EAAE,QAAgB,EAAE,aAA6B;IAA7B,8BAAA,EAAA,oBAA6B;IAC3F,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,IAAA,+BAAgB,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC;AAED,SAAgB,QAAQ,CAAC,OAAgB;IACvC,OAAO,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,2BAAe,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,eAAe,CAAC,OAAgB;IAC9C,OAAO,WAAW,CAAC,OAAO,EAAE,wCAA4B,CAAC,CAAC;AAC5D,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,OAAO,WAAW,CAAC,OAAO,EAAE,4CAAgC,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,SAAgB,8BAA8B,CAAC,OAAgB,EAAE,cAAsB;IACrF,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,OAAO,CAAC,sBAAsB,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AACnE,CAAC"}
|