unleash-server 4.2.0 → 4.2.2
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/lib/create-config.js +6 -5
- package/dist/lib/create-config.js.map +1 -1
- package/dist/lib/db/client-instance-store.js +2 -2
- package/dist/lib/db/client-instance-store.js.map +1 -1
- package/dist/lib/db/client-metrics-db.js +2 -2
- package/dist/lib/db/client-metrics-db.js.map +1 -1
- package/dist/lib/db/client-metrics-store.js +2 -2
- package/dist/lib/db/client-metrics-store.js.map +1 -1
- package/dist/lib/db/session-store.js +2 -1
- package/dist/lib/db/session-store.js.map +1 -1
- package/dist/lib/error/minimum-one-environment-error.d.ts +5 -0
- package/dist/lib/error/minimum-one-environment-error.js +24 -0
- package/dist/lib/error/minimum-one-environment-error.js.map +1 -0
- package/dist/lib/metrics.js +3 -4
- package/dist/lib/metrics.js.map +1 -1
- package/dist/lib/middleware/rbac-middleware.js +2 -17
- package/dist/lib/middleware/rbac-middleware.js.map +1 -1
- package/dist/lib/middleware/rbac-middleware.test.js +0 -21
- package/dist/lib/middleware/rbac-middleware.test.js.map +1 -1
- package/dist/lib/middleware/secure-headers.js +2 -1
- package/dist/lib/middleware/secure-headers.js.map +1 -1
- package/dist/lib/middleware/session-db.js +2 -3
- package/dist/lib/middleware/session-db.js.map +1 -1
- package/dist/lib/routes/admin-api/feature.js +6 -2
- package/dist/lib/routes/admin-api/feature.js.map +1 -1
- package/dist/lib/routes/admin-api/project/features.js +11 -8
- package/dist/lib/routes/admin-api/project/features.js.map +1 -1
- package/dist/lib/routes/admin-api/state.js +2 -2
- package/dist/lib/routes/admin-api/state.js.map +1 -1
- package/dist/lib/routes/client-api/feature.test.js +3 -2
- package/dist/lib/routes/client-api/feature.test.js.map +1 -1
- package/dist/lib/routes/util.js +2 -0
- package/dist/lib/routes/util.js.map +1 -1
- package/dist/lib/services/addon-service.js +2 -2
- package/dist/lib/services/addon-service.js.map +1 -1
- package/dist/lib/services/api-token-service.js +2 -2
- package/dist/lib/services/api-token-service.js.map +1 -1
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js +3 -4
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js.map +1 -1
- package/dist/lib/services/client-metrics/client-metrics.test.js +74 -41
- package/dist/lib/services/client-metrics/client-metrics.test.js.map +1 -1
- package/dist/lib/services/client-metrics/index.js +8 -8
- package/dist/lib/services/client-metrics/index.js.map +1 -1
- package/dist/lib/services/client-metrics/ttl-list.d.ts +1 -0
- package/dist/lib/services/client-metrics/ttl-list.js +15 -9
- package/dist/lib/services/client-metrics/ttl-list.js.map +1 -1
- package/dist/lib/services/client-metrics/ttl-list.test.js +25 -5
- package/dist/lib/services/client-metrics/ttl-list.test.js.map +1 -1
- package/dist/lib/services/environment-service.d.ts +2 -1
- package/dist/lib/services/environment-service.js +10 -3
- package/dist/lib/services/environment-service.js.map +1 -1
- package/dist/lib/services/{feature-toggle-service-v2.d.ts → feature-toggle-service.d.ts} +16 -7
- package/dist/lib/services/{feature-toggle-service-v2.js → feature-toggle-service.js} +39 -14
- package/dist/lib/services/feature-toggle-service.js.map +1 -0
- package/dist/lib/services/index.js +3 -2
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/project-health-service.d.ts +1 -1
- package/dist/lib/services/project-health-service.js +3 -3
- package/dist/lib/services/project-health-service.js.map +1 -1
- package/dist/lib/services/project-service.d.ts +1 -1
- package/dist/lib/services/reset-token-service.js +2 -2
- package/dist/lib/services/reset-token-service.js.map +1 -1
- package/dist/lib/services/state-util.js +1 -1
- package/dist/lib/services/state-util.js.map +1 -1
- package/dist/lib/services/version-service.js +2 -2
- package/dist/lib/services/version-service.js.map +1 -1
- package/dist/lib/types/services.d.ts +3 -2
- package/dist/lib/util/constants.d.ts +0 -2
- package/dist/lib/util/constants.js +1 -3
- package/dist/lib/util/constants.js.map +1 -1
- package/dist/migrator.js +9 -2
- package/dist/migrator.js.map +1 -1
- package/dist/test/e2e/api/admin/feature-archive.e2e.test.js +1 -2
- package/dist/test/e2e/api/admin/feature-archive.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/feature.e2e.test.js +19 -2
- package/dist/test/e2e/api/admin/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/metrics.e2e.test.js +5 -3
- package/dist/test/e2e/api/admin/metrics.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/environments.e2e.test.js +10 -0
- package/dist/test/e2e/api/admin/project/environments.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js +114 -0
- package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/state.e2e.test.js +17 -13
- package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js +8 -4
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.token.access.e2e.test.js +4 -4
- package/dist/test/e2e/api/client/feature.token.access.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/register.e2e.test.js +1 -1
- package/dist/test/e2e/api/client/register.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/addon-service.e2e.test.js +1 -1
- package/dist/test/e2e/services/addon-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/api-token-service.e2e.test.js +5 -3
- package/dist/test/e2e/services/api-token-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/client-metrics-service.e2e.test.js +5 -2
- package/dist/test/e2e/services/client-metrics-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/environment-service.test.js +1 -1
- package/dist/test/e2e/services/environment-service.test.js.map +1 -1
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js +14 -11
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/project-health-service.e2e.test.js +2 -2
- package/dist/test/e2e/services/project-health-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/project-service.e2e.test.js +2 -2
- package/dist/test/e2e/services/project-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/session-service.e2e.test.js +5 -4
- package/dist/test/e2e/services/session-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +3 -2
- package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js +4 -6
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/event-store.e2e.test.js +1 -1
- package/dist/test/e2e/stores/event-store.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/feature-toggle-store.e2e.test.js +1 -1
- package/dist/test/e2e/stores/feature-toggle-store.e2e.test.js.map +1 -1
- package/package.json +6 -6
- package/dist/lib/services/feature-toggle-service-v2.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/client-metrics.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client-metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/client-metrics.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,22 +4,21 @@ const metrics_schema_1 = require("./metrics-schema");
|
|
|
4
4
|
const projection_1 = require("./projection");
|
|
5
5
|
const client_metrics_schema_1 = require("./client-metrics-schema");
|
|
6
6
|
const events_1 = require("../../types/events");
|
|
7
|
-
const TTLList = require("./ttl-list");
|
|
8
7
|
const register_schema_1 = require("./register-schema");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
8
|
+
const date_fns_1 = require("date-fns");
|
|
9
|
+
const TTLList = require("./ttl-list");
|
|
11
10
|
class ClientMetricsService {
|
|
12
|
-
constructor({ clientMetricsStore, strategyStore, featureToggleStore, clientInstanceStore, clientApplicationsStore, eventStore, }, { getLogger }, bulkInterval =
|
|
11
|
+
constructor({ clientMetricsStore, strategyStore, featureToggleStore, clientInstanceStore, clientApplicationsStore, eventStore, }, { getLogger }, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5), announcementInterval = (0, date_fns_1.minutesToMilliseconds)(5)) {
|
|
13
12
|
this.globalCount = 0;
|
|
14
13
|
this.apps = {};
|
|
15
14
|
this.lastHourProjection = new projection_1.Projection();
|
|
16
15
|
this.lastMinuteProjection = new projection_1.Projection();
|
|
17
16
|
this.lastHourList = new TTLList({
|
|
18
|
-
interval:
|
|
17
|
+
interval: (0, date_fns_1.secondsToMilliseconds)(10),
|
|
19
18
|
});
|
|
20
19
|
this.logger = null;
|
|
21
20
|
this.lastMinuteList = new TTLList({
|
|
22
|
-
interval:
|
|
21
|
+
interval: (0, date_fns_1.secondsToMilliseconds)(10),
|
|
23
22
|
expireType: 'minutes',
|
|
24
23
|
expireAmount: 1,
|
|
25
24
|
});
|
|
@@ -233,8 +232,9 @@ class ClientMetricsService {
|
|
|
233
232
|
this.lastMinuteProjection.add(n, countObj);
|
|
234
233
|
count += countObj.yes + countObj.no;
|
|
235
234
|
});
|
|
236
|
-
|
|
237
|
-
this.
|
|
235
|
+
const timestamp = typeof stop === 'string' ? (0, date_fns_1.parseISO)(stop) : stop;
|
|
236
|
+
this.lastHourList.add(toggles, timestamp);
|
|
237
|
+
this.lastMinuteList.add(toggles, timestamp);
|
|
238
238
|
this.globalCount += count;
|
|
239
239
|
// eslint-disable-next-line no-param-reassign
|
|
240
240
|
app.count += count;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/index.ts"],"names":[],"mappings":";;AAAA,qDAAqD;AACrD,6CAA0C;AAC1C,mEAA8D;AAC9D,+CAAyD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,22 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
const { EventEmitter } = require('events');
|
|
3
|
-
const moment = require('moment');
|
|
4
3
|
const List = require('./list');
|
|
4
|
+
const { add, isFuture, addMilliseconds, secondsToMilliseconds, } = require('date-fns');
|
|
5
5
|
// this list must have entries with sorted ttl range
|
|
6
6
|
module.exports = class TTLList extends EventEmitter {
|
|
7
|
-
constructor({ interval =
|
|
7
|
+
constructor({ interval = secondsToMilliseconds(1), expireAmount = 1, expireType = 'hours', } = {}) {
|
|
8
8
|
super();
|
|
9
9
|
this.interval = interval;
|
|
10
10
|
this.expireAmount = expireAmount;
|
|
11
11
|
this.expireType = expireType;
|
|
12
|
+
this.getExpiryFrom = (timestamp) => {
|
|
13
|
+
if (this.expireType === 'milliseconds') {
|
|
14
|
+
return addMilliseconds(timestamp, expireAmount);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
return add(timestamp, { [expireType]: expireAmount });
|
|
18
|
+
}
|
|
19
|
+
};
|
|
12
20
|
this.list = new List();
|
|
13
21
|
this.list.on('evicted', ({ value, ttl }) => {
|
|
14
22
|
this.emit('expire', value, ttl);
|
|
@@ -26,8 +34,8 @@ module.exports = class TTLList extends EventEmitter {
|
|
|
26
34
|
}
|
|
27
35
|
}
|
|
28
36
|
add(value, timestamp = new Date()) {
|
|
29
|
-
const ttl =
|
|
30
|
-
if (
|
|
37
|
+
const ttl = this.getExpiryFrom(timestamp);
|
|
38
|
+
if (isFuture(ttl)) {
|
|
31
39
|
this.list.add({ ttl, value });
|
|
32
40
|
}
|
|
33
41
|
else {
|
|
@@ -35,14 +43,12 @@ module.exports = class TTLList extends EventEmitter {
|
|
|
35
43
|
}
|
|
36
44
|
}
|
|
37
45
|
timedCheck() {
|
|
38
|
-
|
|
39
|
-
this.list.reverseRemoveUntilTrue(({ value }) => now.isBefore(value.ttl));
|
|
46
|
+
this.list.reverseRemoveUntilTrue(({ value }) => isFuture(value.ttl));
|
|
40
47
|
this.startTimer();
|
|
41
48
|
}
|
|
42
49
|
destroy() {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
// this.timer = null;
|
|
50
|
+
clearTimeout(this.timer);
|
|
51
|
+
this.timer = null;
|
|
46
52
|
this.list = null;
|
|
47
53
|
}
|
|
48
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ttl-list.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/ttl-list.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,
|
|
1
|
+
{"version":3,"file":"ttl-list.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/ttl-list.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,MAAM,EACF,GAAG,EACH,QAAQ,EACR,eAAe,EACf,qBAAqB,GACxB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAExB,oDAAoD;AACpD,MAAM,CAAC,OAAO,GAAG,MAAM,OAAQ,SAAQ,YAAY;IAC/C,YAAY,EACR,QAAQ,GAAG,qBAAqB,CAAC,CAAC,CAAC,EACnC,YAAY,GAAG,CAAC,EAChB,UAAU,GAAG,OAAO,GACvB,GAAG,EAAE;QACF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAI,CAAC,aAAa,GAAG,CAAC,SAAS,EAAE,EAAE;YAC/B,IAAI,IAAI,CAAC,UAAU,KAAK,cAAc,EAAE;gBACpC,OAAO,eAAe,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;aACnD;iBAAM;gBACH,OAAO,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;aACzD;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAED,UAAU;QACN,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACzB,IAAI,IAAI,CAAC,IAAI,EAAE;oBACX,IAAI,CAAC,UAAU,EAAE,CAAC;iBACrB;YACL,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;SACtB;IACL,CAAC;IAED,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,IAAI,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;SACjC;aAAM;YACH,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;SACnC;IACL,CAAC;IAED,UAAU;QACN,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAED,OAAO;QACH,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
-
const moment = require('moment');
|
|
3
2
|
const TTLList = require('./ttl-list');
|
|
3
|
+
const { addMilliseconds } = require('date-fns');
|
|
4
4
|
test('should emit expire', (done) => {
|
|
5
5
|
jest.useFakeTimers('modern');
|
|
6
6
|
const list = new TTLList({
|
|
@@ -24,24 +24,44 @@ test('should slice off list', () => {
|
|
|
24
24
|
expireAmount: 10,
|
|
25
25
|
expireType: 'milliseconds',
|
|
26
26
|
});
|
|
27
|
-
list.add({ n: '1' },
|
|
28
|
-
list.add({ n: '2' },
|
|
29
|
-
list.add({ n: '3' },
|
|
30
|
-
list.add({ n: '4' },
|
|
27
|
+
list.add({ n: '1' }, addMilliseconds(Date.now(), 1));
|
|
28
|
+
list.add({ n: '2' }, addMilliseconds(Date.now(), 50));
|
|
29
|
+
list.add({ n: '3' }, addMilliseconds(Date.now(), 200));
|
|
30
|
+
list.add({ n: '4' }, addMilliseconds(Date.now(), 300));
|
|
31
31
|
const expired = [];
|
|
32
32
|
list.on('expire', (entry) => {
|
|
33
33
|
// console.timeEnd(entry.n);
|
|
34
34
|
expired.push(entry);
|
|
35
35
|
});
|
|
36
|
+
expect(expired).toHaveLength(0);
|
|
37
|
+
expect(list.list.toArray()).toHaveLength(4);
|
|
36
38
|
jest.advanceTimersByTime(21);
|
|
37
39
|
expect(expired).toHaveLength(1);
|
|
40
|
+
expect(list.list.toArray()).toHaveLength(3);
|
|
38
41
|
jest.advanceTimersByTime(51);
|
|
39
42
|
expect(expired).toHaveLength(2);
|
|
43
|
+
expect(list.list.toArray()).toHaveLength(2);
|
|
40
44
|
jest.advanceTimersByTime(201);
|
|
41
45
|
expect(expired).toHaveLength(3);
|
|
46
|
+
expect(list.list.toArray()).toHaveLength(1);
|
|
42
47
|
jest.advanceTimersByTime(301);
|
|
43
48
|
expect(expired).toHaveLength(4);
|
|
49
|
+
expect(list.list.toArray()).toHaveLength(0);
|
|
44
50
|
list.destroy();
|
|
45
51
|
jest.useRealTimers();
|
|
46
52
|
});
|
|
53
|
+
test('should add item created in the past but expiring in the future', () => {
|
|
54
|
+
jest.useFakeTimers('modern');
|
|
55
|
+
const list = new TTLList({
|
|
56
|
+
interval: 10,
|
|
57
|
+
expireAmount: 10,
|
|
58
|
+
expireType: 'milliseconds',
|
|
59
|
+
});
|
|
60
|
+
const expireCallback = jest.fn();
|
|
61
|
+
list.on('expire', expireCallback);
|
|
62
|
+
list.add({ n: '1' }, new Date());
|
|
63
|
+
expect(expireCallback).not.toHaveBeenCalled();
|
|
64
|
+
expect(list.list.toArray()).toHaveLength(1);
|
|
65
|
+
jest.useRealTimers();
|
|
66
|
+
});
|
|
47
67
|
//# sourceMappingURL=ttl-list.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ttl-list.test.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/ttl-list.test.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,
|
|
1
|
+
{"version":3,"file":"ttl-list.test.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/ttl-list.test.js"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,9 @@ export default class EnvironmentService {
|
|
|
5
5
|
private logger;
|
|
6
6
|
private environmentStore;
|
|
7
7
|
private featureStrategiesStore;
|
|
8
|
+
private projectStore;
|
|
8
9
|
private featureEnvironmentStore;
|
|
9
|
-
constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'environmentStore' | 'featureStrategiesStore' | 'featureEnvironmentStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>);
|
|
10
|
+
constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, projectStore, }: Pick<IUnleashStores, 'environmentStore' | 'featureStrategiesStore' | 'featureEnvironmentStore' | 'projectStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>);
|
|
10
11
|
getAll(): Promise<IEnvironment[]>;
|
|
11
12
|
get(name: string): Promise<IEnvironment>;
|
|
12
13
|
updateSortOrder(sortOrder: ISortOrder): Promise<void>;
|
|
@@ -7,12 +7,14 @@ const db_error_1 = require("../error/db-error");
|
|
|
7
7
|
const name_exists_error_1 = __importDefault(require("../error/name-exists-error"));
|
|
8
8
|
const state_schema_1 = require("./state-schema");
|
|
9
9
|
const notfound_error_1 = __importDefault(require("../error/notfound-error"));
|
|
10
|
+
const minimum_one_environment_error_1 = __importDefault(require("../error/minimum-one-environment-error"));
|
|
10
11
|
class EnvironmentService {
|
|
11
|
-
constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, }, { getLogger }) {
|
|
12
|
+
constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, projectStore, }, { getLogger }) {
|
|
12
13
|
this.logger = getLogger('services/environment-service.ts');
|
|
13
14
|
this.environmentStore = environmentStore;
|
|
14
15
|
this.featureStrategiesStore = featureStrategiesStore;
|
|
15
16
|
this.featureEnvironmentStore = featureEnvironmentStore;
|
|
17
|
+
this.projectStore = projectStore;
|
|
16
18
|
}
|
|
17
19
|
async getAll() {
|
|
18
20
|
return this.environmentStore.getAll();
|
|
@@ -47,8 +49,13 @@ class EnvironmentService {
|
|
|
47
49
|
}
|
|
48
50
|
}
|
|
49
51
|
async removeEnvironmentFromProject(environment, projectId) {
|
|
50
|
-
await this.
|
|
51
|
-
|
|
52
|
+
const projectEnvs = await this.projectStore.getEnvironmentsForProject(projectId);
|
|
53
|
+
if (projectEnvs.length > 1) {
|
|
54
|
+
await this.featureEnvironmentStore.disconnectFeatures(environment, projectId);
|
|
55
|
+
await this.featureEnvironmentStore.disconnectProject(environment, projectId);
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
throw new minimum_one_environment_error_1.default('You must always have one active environment');
|
|
52
59
|
}
|
|
53
60
|
}
|
|
54
61
|
exports.default = EnvironmentService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment-service.js","sourceRoot":"","sources":["../../../src/lib/services/environment-service.ts"],"names":[],"mappings":";;;;;AAIA,gDAAgE;AAChE,mFAAyD;AACzD,iDAAiD;AACjD,6EAAoD;AAKpD,MAAqB,kBAAkB;
|
|
1
|
+
{"version":3,"file":"environment-service.js","sourceRoot":"","sources":["../../../src/lib/services/environment-service.ts"],"names":[],"mappings":";;;;;AAIA,gDAAgE;AAChE,mFAAyD;AACzD,iDAAiD;AACjD,6EAAoD;AAKpD,2GAAgF;AAEhF,MAAqB,kBAAkB;IAWnC,YACI,EACI,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACvB,YAAY,GAOf,EACD,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,iCAAiC,CAAC,CAAC;QAC3D,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,MAAM;QACR,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAqB;QACvC,MAAM,8BAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,OAAO,CAAC,GAAG,CACb,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAY,EAAE,KAAc;QAChD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,MAAM,EAAE;YACR,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;SACvE;QACD,MAAM,IAAI,wBAAa,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,uBAAuB,CACzB,WAAmB,EACnB,SAAiB;QAEjB,IAAI;YACA,MAAM,IAAI,CAAC,uBAAuB,CAAC,cAAc,CAC7C,WAAW,EACX,SAAS,CACZ,CAAC;YACF,MAAM,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAC9C,WAAW,EACX,SAAS,CACZ,CAAC;SACL;QAAC,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,CAAC,IAAI,KAAK,sCAA2B,EAAE;gBACxC,MAAM,IAAI,2BAAe,CACrB,GAAG,SAAS,gCAAgC,WAAW,UAAU,CACpE,CAAC;aACL;YACD,MAAM,CAAC,CAAC;SACX;IACL,CAAC;IAED,KAAK,CAAC,4BAA4B,CAC9B,WAAmB,EACnB,SAAiB;QAEjB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAyB,CACjE,SAAS,CACZ,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,MAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CACjD,WAAW,EACX,SAAS,CACZ,CAAC;YACF,MAAM,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAChD,WAAW,EACX,SAAS,CACZ,CAAC;YACF,OAAO;SACV;QACD,MAAM,IAAI,uCAA0B,CAChC,6CAA6C,CAChD,CAAC;IACN,CAAC;CACJ;AAzGD,qCAyGC"}
|
|
@@ -3,6 +3,13 @@ import { IUnleashStores } from '../types/stores';
|
|
|
3
3
|
import { FeatureConfigurationClient } from '../types/stores/feature-strategies-store';
|
|
4
4
|
import { FeatureToggle, FeatureToggleDTO, FeatureToggleWithEnvironment, FeatureToggleLegacy, IFeatureEnvironmentInfo, IFeatureOverview, IFeatureStrategy, IFeatureToggleQuery, IStrategyConfig } from '../types/model';
|
|
5
5
|
import { Operation } from 'fast-json-patch';
|
|
6
|
+
interface IFeatureContext {
|
|
7
|
+
featureName: string;
|
|
8
|
+
projectId: string;
|
|
9
|
+
}
|
|
10
|
+
interface IFeatureStrategyContext extends IFeatureContext {
|
|
11
|
+
environment: string;
|
|
12
|
+
}
|
|
6
13
|
declare class FeatureToggleServiceV2 {
|
|
7
14
|
private logger;
|
|
8
15
|
private featureStrategiesStore;
|
|
@@ -13,8 +20,10 @@ declare class FeatureToggleServiceV2 {
|
|
|
13
20
|
private projectStore;
|
|
14
21
|
private eventStore;
|
|
15
22
|
constructor({ featureStrategiesStore, featureToggleStore, featureToggleClientStore, projectStore, eventStore, featureTagStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'featureStrategiesStore' | 'featureToggleStore' | 'featureToggleClientStore' | 'projectStore' | 'eventStore' | 'featureTagStore' | 'featureEnvironmentStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>);
|
|
23
|
+
validateFeatureContext({ featureName, projectId, }: IFeatureContext): Promise<void>;
|
|
24
|
+
validateFeatureStrategyContext(strategy: IFeatureStrategy, { featureName, projectId }: IFeatureStrategyContext): void;
|
|
16
25
|
patchFeature(projectId: string, featureName: string, userName: string, operations: Operation[]): Promise<FeatureToggle>;
|
|
17
|
-
createStrategy(strategyConfig: Omit<IStrategyConfig, 'id'>,
|
|
26
|
+
createStrategy(strategyConfig: Omit<IStrategyConfig, 'id'>, context: IFeatureStrategyContext, userName: string): Promise<IStrategyConfig>;
|
|
18
27
|
/**
|
|
19
28
|
* PUT /api/admin/projects/:projectId/features/:featureName/strategies/:strategyId ?
|
|
20
29
|
* {
|
|
@@ -22,21 +31,21 @@ declare class FeatureToggleServiceV2 {
|
|
|
22
31
|
* }
|
|
23
32
|
* @param id
|
|
24
33
|
* @param updates
|
|
34
|
+
* @param context - Which context does this strategy live in (projectId, featureName, environment)
|
|
35
|
+
* @param userName - Human readable id of the user performing the update
|
|
25
36
|
*/
|
|
26
|
-
updateStrategy(id: string,
|
|
27
|
-
updateStrategyParameter(id: string, name: string, value: string | number,
|
|
37
|
+
updateStrategy(id: string, updates: Partial<IFeatureStrategy>, context: IFeatureStrategyContext, userName: string): Promise<IStrategyConfig>;
|
|
38
|
+
updateStrategyParameter(id: string, name: string, value: string | number, context: IFeatureStrategyContext, userName: string): Promise<IStrategyConfig>;
|
|
28
39
|
/**
|
|
29
40
|
* DELETE /api/admin/projects/:projectId/features/:featureName/environments/:environmentName/strategies/:strategyId
|
|
30
41
|
* {
|
|
31
42
|
*
|
|
32
43
|
* }
|
|
33
44
|
* @param id - strategy id
|
|
34
|
-
* @param
|
|
35
|
-
* @param userName - Who's doing the change
|
|
36
|
-
* @param project - Which project does this feature toggle belong to
|
|
45
|
+
* @param context - Which context does this strategy live in (projectId, featureName, environment)
|
|
37
46
|
* @param environment - Which environment does this strategy belong to
|
|
38
47
|
*/
|
|
39
|
-
deleteStrategy(id: string,
|
|
48
|
+
deleteStrategy(id: string, context: IFeatureStrategyContext, userName: string): Promise<void>;
|
|
40
49
|
getStrategiesForEnvironment(project: string, featureName: string, environment?: string): Promise<IStrategyConfig[]>;
|
|
41
50
|
/**
|
|
42
51
|
* GET /api/admin/projects/:project/features/:featureName
|
|
@@ -23,6 +23,20 @@ class FeatureToggleServiceV2 {
|
|
|
23
23
|
this.eventStore = eventStore;
|
|
24
24
|
this.featureEnvironmentStore = featureEnvironmentStore;
|
|
25
25
|
}
|
|
26
|
+
async validateFeatureContext({ featureName, projectId, }) {
|
|
27
|
+
const id = await this.featureToggleStore.getProjectId(featureName);
|
|
28
|
+
if (id !== projectId) {
|
|
29
|
+
throw new invalid_operation_error_1.default('You can not change the projectId for an activation strategy.');
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
validateFeatureStrategyContext(strategy, { featureName, projectId }) {
|
|
33
|
+
if (strategy.projectId !== projectId) {
|
|
34
|
+
throw new invalid_operation_error_1.default('You can not change the projectId for an activation strategy.');
|
|
35
|
+
}
|
|
36
|
+
if (strategy.featureName !== featureName) {
|
|
37
|
+
throw new invalid_operation_error_1.default('You can not change the featureName for an activation strategy.');
|
|
38
|
+
}
|
|
39
|
+
}
|
|
26
40
|
async patchFeature(projectId, featureName, userName, operations) {
|
|
27
41
|
const featureToggle = await this.getFeatureMetadata(featureName);
|
|
28
42
|
const { newDocument } = (0, fast_json_patch_1.applyPatch)((0, fast_json_patch_1.deepClone)(featureToggle), operations);
|
|
@@ -37,7 +51,9 @@ class FeatureToggleServiceV2 {
|
|
|
37
51
|
}
|
|
38
52
|
return updated;
|
|
39
53
|
}
|
|
40
|
-
async createStrategy(strategyConfig,
|
|
54
|
+
async createStrategy(strategyConfig, context, userName) {
|
|
55
|
+
const { featureName, projectId, environment } = context;
|
|
56
|
+
await this.validateFeatureContext(context);
|
|
41
57
|
try {
|
|
42
58
|
const newFeatureStrategy = await this.featureStrategiesStore.createStrategyFeatureEnv({
|
|
43
59
|
strategyName: strategyConfig.name,
|
|
@@ -81,10 +97,13 @@ class FeatureToggleServiceV2 {
|
|
|
81
97
|
* }
|
|
82
98
|
* @param id
|
|
83
99
|
* @param updates
|
|
100
|
+
* @param context - Which context does this strategy live in (projectId, featureName, environment)
|
|
101
|
+
* @param userName - Human readable id of the user performing the update
|
|
84
102
|
*/
|
|
85
|
-
|
|
86
|
-
|
|
103
|
+
async updateStrategy(id, updates, context, userName) {
|
|
104
|
+
const { projectId, environment } = context;
|
|
87
105
|
const existingStrategy = await this.featureStrategiesStore.get(id);
|
|
106
|
+
this.validateFeatureStrategyContext(existingStrategy, context);
|
|
88
107
|
if (existingStrategy.id === id) {
|
|
89
108
|
const strategy = await this.featureStrategiesStore.updateStrategy(id, updates);
|
|
90
109
|
const data = {
|
|
@@ -96,7 +115,7 @@ class FeatureToggleServiceV2 {
|
|
|
96
115
|
};
|
|
97
116
|
await this.eventStore.store({
|
|
98
117
|
type: events_1.FEATURE_STRATEGY_UPDATE,
|
|
99
|
-
project,
|
|
118
|
+
project: projectId,
|
|
100
119
|
environment,
|
|
101
120
|
createdBy: userName,
|
|
102
121
|
data,
|
|
@@ -105,9 +124,10 @@ class FeatureToggleServiceV2 {
|
|
|
105
124
|
}
|
|
106
125
|
throw new notfound_error_1.default(`Could not find strategy with id ${id}`);
|
|
107
126
|
}
|
|
108
|
-
|
|
109
|
-
|
|
127
|
+
async updateStrategyParameter(id, name, value, context, userName) {
|
|
128
|
+
const { projectId, environment } = context;
|
|
110
129
|
const existingStrategy = await this.featureStrategiesStore.get(id);
|
|
130
|
+
this.validateFeatureStrategyContext(existingStrategy, context);
|
|
111
131
|
if (existingStrategy.id === id) {
|
|
112
132
|
existingStrategy.parameters[name] = value;
|
|
113
133
|
const strategy = await this.featureStrategiesStore.updateStrategy(id, existingStrategy);
|
|
@@ -119,7 +139,7 @@ class FeatureToggleServiceV2 {
|
|
|
119
139
|
};
|
|
120
140
|
await this.eventStore.store({
|
|
121
141
|
type: events_1.FEATURE_STRATEGY_UPDATE,
|
|
122
|
-
project,
|
|
142
|
+
project: projectId,
|
|
123
143
|
environment,
|
|
124
144
|
createdBy: userName,
|
|
125
145
|
data,
|
|
@@ -134,16 +154,17 @@ class FeatureToggleServiceV2 {
|
|
|
134
154
|
*
|
|
135
155
|
* }
|
|
136
156
|
* @param id - strategy id
|
|
137
|
-
* @param
|
|
138
|
-
* @param userName - Who's doing the change
|
|
139
|
-
* @param project - Which project does this feature toggle belong to
|
|
157
|
+
* @param context - Which context does this strategy live in (projectId, featureName, environment)
|
|
140
158
|
* @param environment - Which environment does this strategy belong to
|
|
141
159
|
*/
|
|
142
|
-
async deleteStrategy(id,
|
|
160
|
+
async deleteStrategy(id, context, userName) {
|
|
161
|
+
const existingStrategy = await this.featureStrategiesStore.get(id);
|
|
162
|
+
const { featureName, projectId, environment } = context;
|
|
163
|
+
this.validateFeatureStrategyContext(existingStrategy, context);
|
|
143
164
|
await this.featureStrategiesStore.delete(id);
|
|
144
165
|
await this.eventStore.store({
|
|
145
166
|
type: events_1.FEATURE_STRATEGY_REMOVE,
|
|
146
|
-
project,
|
|
167
|
+
project: projectId,
|
|
147
168
|
environment,
|
|
148
169
|
createdBy: userName,
|
|
149
170
|
data: {
|
|
@@ -235,7 +256,11 @@ class FeatureToggleServiceV2 {
|
|
|
235
256
|
s.parameters.groupId = newFeatureName;
|
|
236
257
|
}
|
|
237
258
|
delete s.id;
|
|
238
|
-
createStrategies.push(this.createStrategy(s,
|
|
259
|
+
createStrategies.push(this.createStrategy(s, {
|
|
260
|
+
projectId,
|
|
261
|
+
featureName: newFeatureName,
|
|
262
|
+
environment: e.name,
|
|
263
|
+
}, userName));
|
|
239
264
|
}));
|
|
240
265
|
// Create strategies
|
|
241
266
|
await Promise.allSettled(createStrategies);
|
|
@@ -445,4 +470,4 @@ class FeatureToggleServiceV2 {
|
|
|
445
470
|
}
|
|
446
471
|
module.exports = FeatureToggleServiceV2;
|
|
447
472
|
exports.default = FeatureToggleServiceV2;
|
|
448
|
-
//# sourceMappingURL=feature-toggle-service
|
|
473
|
+
//# sourceMappingURL=feature-toggle-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feature-toggle-service.js","sourceRoot":"","sources":["../../../src/lib/services/feature-toggle-service.ts"],"names":[],"mappings":";;;;;AAGA,6EAAmD;AACnD,mFAAyD;AACzD,+FAAqE;AACrE,gDAA0D;AAC1D,6DAA6E;AAC7E,4CAeyB;AACzB,6EAAoD;AAuBpD,iDAAgD;AAChD,qDAAmE;AAWnE,MAAM,sBAAsB;IAiBxB,YACI,EACI,sBAAsB,EACtB,kBAAkB,EAClB,wBAAwB,EACxB,YAAY,EACZ,UAAU,EACV,eAAe,EACf,uBAAuB,GAU1B,EACD,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,uCAAuC,CAAC,CAAC;QACjE,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QACrD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,EACzB,WAAW,EACX,SAAS,GACK;QACd,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACnE,IAAI,EAAE,KAAK,SAAS,EAAE;YAClB,MAAM,IAAI,iCAAqB,CAC3B,8DAA8D,CACjE,CAAC;SACL;IACL,CAAC;IAED,8BAA8B,CAC1B,QAA0B,EAC1B,EAAE,WAAW,EAAE,SAAS,EAA2B;QAEnD,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS,EAAE;YAClC,MAAM,IAAI,iCAAqB,CAC3B,8DAA8D,CACjE,CAAC;SACL;QAED,IAAI,QAAQ,CAAC,WAAW,KAAK,WAAW,EAAE;YACtC,MAAM,IAAI,iCAAqB,CAC3B,gEAAgE,CACnE,CAAC;SACL;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CACd,SAAiB,EACjB,WAAmB,EACnB,QAAgB,EAChB,UAAuB;QAEvB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEjE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,4BAAU,EAC9B,IAAA,2BAAS,EAAC,aAAa,CAAC,EACxB,UAAU,CACb,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAC1C,SAAS,EACT,WAAW,EACX,QAAQ,CACX,CAAC;QACF,IAAI,aAAa,CAAC,KAAK,KAAK,WAAW,CAAC,KAAK,EAAE;YAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACxB,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,yBAAgB,CAAC,CAAC,CAAC,0BAAiB;gBAC9D,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,SAAS;gBAClB,SAAS,EAAE,QAAQ;aACtB,CAAC,CAAC;SACN;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,cAA2C,EAC3C,OAAgC,EAChC,QAAgB;QAEhB,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QACxD,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI;YACA,MAAM,kBAAkB,GACpB,MAAM,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,CAAC;gBACvD,YAAY,EAAE,cAAc,CAAC,IAAI;gBACjC,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,UAAU,EAAE,cAAc,CAAC,UAAU;gBACrC,SAAS,EAAE,cAAc,CAAC,SAAS;gBACnC,SAAS;gBACT,WAAW;gBACX,WAAW;aACd,CAAC,CAAC;YACP,MAAM,IAAI,GAAG;gBACT,EAAE,EAAE,kBAAkB,CAAC,EAAE;gBACzB,IAAI,EAAE,kBAAkB,CAAC,YAAY;gBACrC,WAAW,EAAE,kBAAkB,CAAC,WAAW;gBAC3C,UAAU,EAAE,kBAAkB,CAAC,UAAU;aAC5C,CAAC;YACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACxB,IAAI,EAAE,6BAAoB;gBAC1B,OAAO,EAAE,SAAS;gBAClB,SAAS,EAAE,QAAQ;gBACnB,WAAW;gBACX,IAAI,EAAE;oBACF,GAAG,IAAI;oBACP,IAAI,EAAE,WAAW;oBACjB,YAAY,EAAE,kBAAkB,CAAC,YAAY;iBAChD;aACJ,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,CAAC,IAAI,KAAK,gCAAqB,EAAE;gBAClC,MAAM,IAAI,wBAAY,CAClB,2DAA2D,CAC9D,CAAC;aACL;YACD,MAAM,CAAC,CAAC;SACX;IACL,CAAC;IACD;;;;;;;;;OASG;IAEH,KAAK,CAAC,cAAc,CAChB,EAAU,EACV,OAAkC,EAClC,OAAgC,EAChC,QAAgB;QAEhB,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAC3C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAE/D,IAAI,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;YAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAC7D,EAAE,EACF,OAAO,CACV,CAAC;YACF,MAAM,IAAI,GAAG;gBACT,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,IAAI,EAAE,QAAQ,CAAC,YAAY;gBAC3B,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,EAAE;gBACvC,UAAU,EAAE,QAAQ,CAAC,UAAU;aAClC,CAAC;YACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACxB,IAAI,EAAE,gCAAuB;gBAC7B,OAAO,EAAE,SAAS;gBAClB,WAAW;gBACX,SAAS,EAAE,QAAQ;gBACnB,IAAI;aACP,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACf;QACD,MAAM,IAAI,wBAAa,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,uBAAuB,CACzB,EAAU,EACV,IAAY,EACZ,KAAsB,EACtB,OAAgC,EAChC,QAAgB;QAEhB,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAE/D,IAAI,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;YAC5B,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAC7D,EAAE,EACF,gBAAgB,CACnB,CAAC;YACF,MAAM,IAAI,GAAG;gBACT,EAAE,EAAE,QAAQ,CAAC,EAAE;gBACf,IAAI,EAAE,QAAQ,CAAC,YAAY;gBAC3B,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,EAAE;gBACvC,UAAU,EAAE,QAAQ,CAAC,UAAU;aAClC,CAAC;YACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACxB,IAAI,EAAE,gCAAuB;gBAC7B,OAAO,EAAE,SAAS;gBAClB,WAAW;gBACX,SAAS,EAAE,QAAQ;gBACnB,IAAI;aACP,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACf;QACD,MAAM,IAAI,wBAAa,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,cAAc,CAChB,EAAU,EACV,OAAgC,EAChC,QAAgB;QAEhB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QACxD,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAE/D,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,gCAAuB;YAC7B,OAAO,EAAE,SAAS;YAClB,WAAW;YACX,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE;gBACF,EAAE;gBACF,IAAI,EAAE,WAAW;aACpB;SACJ,CAAC,CAAC;QAEH,6DAA6D;QAC7D,MAAM,IAAI,CAAC,uBAAuB,CAAC,gCAAgC,CAC/D,WAAW,EACX,WAAW,CACd,CAAC;IACN,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,OAAe,EACf,WAAmB,EACnB,cAAsB,uBAAW;QAEjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,qBAAqB,CACnE,WAAW,EACX,WAAW,CACd,CAAC;QACF,IAAI,MAAM,EAAE;YACR,MAAM,iBAAiB,GACnB,MAAM,IAAI,CAAC,sBAAsB,CAAC,0BAA0B,CACxD,OAAO,EACP,WAAW,EACX,WAAW,CACd,CAAC;YACN,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACrC,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,YAAY;gBACxB,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,SAAS,EAAE,KAAK,CAAC,SAAS;aAC7B,CAAC,CAAC,CAAC;SACP;QACD,MAAM,IAAI,wBAAa,CACnB,WAAW,WAAW,8BAA8B,WAAW,EAAE,CACpE,CAAC;IACN,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CACZ,WAAmB,EACnB,WAAoB,KAAK;QAEzB,OAAO,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,CACvD,WAAW,EACX,QAAQ,CACX,CAAC;IACN,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,WAAmB;QACxC,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,iBAAiB,CACnB,KAA2B;QAE3B,OAAO,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,iBAAiB,CACnB,KAA2B,EAC3B,WAAoB,KAAK;QAEzB,OAAO,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,SAAiB,EACjB,WAAoB,KAAK;QAEzB,OAAO,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CACjD,SAAS,EACT,QAAQ,CACX,CAAC;IACN,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,WAAmB;QAEnB,OAAO,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,CACvD,WAAW,EACX,KAAK,CACR,CAAC;IACN,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,SAAiB,EACjB,KAAuB,EACvB,QAAgB;QAEhB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,2BAA2B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,MAAM,EAAE;YACR,MAAM,WAAW,GAAG,MAAM,sCAAqB,CAAC,aAAa,CACzD,KAAK,CACR,CAAC;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CACtD,SAAS,EACT,WAAW,CACd,CAAC;YACF,MAAM,IAAI,CAAC,uBAAuB,CAAC,sCAAsC,CACrE,WAAW,CAAC,IAAI,EAChB,SAAS,CACZ,CAAC;YAEF,MAAM,IAAI,GAAG,EAAE,GAAG,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;YAEpD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBACxB,IAAI,EAAE,wBAAe;gBACrB,SAAS,EAAE,QAAQ;gBACnB,OAAO,EAAE,SAAS;gBAClB,IAAI;aACP,CAAC,CAAC;YAEH,OAAO,aAAa,CAAC;SACxB;QACD,MAAM,IAAI,wBAAa,CAAC,mBAAmB,SAAS,iBAAiB,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,WAAmB,EACnB,SAAiB,EACjB,cAAsB,EACtB,iBAA0B,IAAI,EAC9B,QAAgB;QAEhB,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,GAAG,QAAQ,0BAA0B,WAAW,OAAO,cAAc,EAAE,CAC1E,CAAC;QACF,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAExC,MAAM,OAAO,GACT,MAAM,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,CACtD,WAAW,CACd,CAAC;QAEN,MAAM,SAAS,GAAG,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;QAEvD,wBAAwB;QACxB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAC1C,SAAS,EACT,SAAS,EACT,QAAQ,CACX,CAAC;QAEF,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAC5B,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAqB,EAAE,EAAE,CACrD,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAkB,EAAE,EAAE;YACxC,IAAI,cAAc,IAAI,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAC1D,YAAY;gBACZ,CAAC,CAAC,UAAU,CAAC,OAAO,GAAG,cAAc,CAAC;aACzC;YACD,OAAO,CAAC,CAAC,EAAE,CAAC;YACZ,gBAAgB,CAAC,IAAI,CACjB,IAAI,CAAC,cAAc,CACf,CAAC,EACD;gBACI,SAAS;gBACT,WAAW,EAAE,cAAc;gBAC3B,WAAW,EAAE,CAAC,CAAC,IAAI;aACtB,EACD,QAAQ,CACX,CACJ,CAAC;QACN,CAAC,CAAC,CACL,CAAC;QAEF,oBAAoB;QACpB,MAAM,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAC3C,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,SAAiB,EACjB,cAAgC,EAChC,QAAgB;QAEhB,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,2BAA2B,WAAW,EAAE,CAAC,CAAC;QAEtE,MAAM,WAAW,GAAG,MAAM,sCAAqB,CAAC,aAAa,CACzD,cAAc,CACjB,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CACtD,SAAS,EACT,WAAW,CACd,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACxD,WAAW,CACd,CAAC;QAEF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,iCAAwB;YAC9B,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,SAAS;YAClB,IAAI;SACP,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,SAAiB;QAC7C,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;YACjC,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,SAAS;SACrB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,UAAkB,EAClB,cAAsB,uBAAW;QAEjC,MAAM,IAAI,CAAC,sBAAsB,CAAC,gCAAgC,CAC9D,UAAU,EACV,WAAW,CACd,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAkB;QAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,eAAe,CAC9D,UAAU,CACb,CAAC;QACF,OAAO;YACH,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,IAAI,EAAE,QAAQ,CAAC,YAAY;YAC3B,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,EAAE;YACvC,UAAU,EAAE,QAAQ,CAAC,UAAU;SAClC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,OAAe,EACf,WAAmB,EACnB,WAAmB;QAEnB,MAAM,WAAW,GACb,MAAM,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CACrD,WAAW,EACX,WAAW,CACd,CAAC;QACN,MAAM,UAAU,GACZ,MAAM,IAAI,CAAC,sBAAsB,CAAC,0BAA0B,CACxD,OAAO,EACP,WAAW,EACX,WAAW,CACd,CAAC;QACN,OAAO;YACH,IAAI,EAAE,WAAW;YACjB,WAAW;YACX,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,UAAU;SACb,CAAC;IACN,CAAC;IAED,KAAK,CAAC,iBAAiB,CACnB,SAAiB,EACjB,WAAmB;QAEnB,MAAM,IAAI,CAAC,sBAAsB,CAAC,4CAA4C,CAC1E,SAAS,EACT,WAAW,CACd,CAAC;QACF,MAAM,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAC/C,SAAS,EACT,WAAW,CACd,CAAC;IACN,CAAC;IAED,mBAAmB;IACnB,KAAK,CAAC,YAAY,CAAC,IAAY;QAC3B,MAAM,2BAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,IAAY;QACxC,IAAI,GAAG,CAAC;QACR,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACxD,GAAG,GAAG,OAAO,CAAC,QAAQ;gBAClB,CAAC,CAAC,kDAAkD;gBACpD,CAAC,CAAC,wCAAwC,CAAC;SAClD;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO;SACV;QACD,MAAM,IAAI,2BAAe,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,WAAW,CACb,WAAmB,EACnB,OAAgB,EAChB,QAAgB;QAEhB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/D,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC;QACxB,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACxD,WAAW,CACd,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAE5D,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,yBAAgB,CAAC,CAAC,CAAC,0BAAiB;YACpD,SAAS,EAAE,QAAQ;YACnB,IAAI;YACJ,IAAI;YACJ,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAY,EAAE,QAAgB;QAC9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,IAAI,GACN,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,yBAAgB;YACtB,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,EAAE,IAAI,EAAE;YACd,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI;SACP,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CACf,SAAiB,EACjB,WAAmB,EACnB,WAAmB,EACnB,OAAgB,EAChB,QAAgB;QAEhB,MAAM,cAAc,GAChB,MAAM,IAAI,CAAC,uBAAuB,CAAC,qBAAqB,CACpD,WAAW,EACX,WAAW,CACd,CAAC;QAEN,IAAI,cAAc,EAAE;YAChB,IAAI,OAAO,EAAE;gBACT,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,2BAA2B,CACrD,SAAS,EACT,WAAW,EACX,WAAW,CACd,CAAC;gBACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;oBACzB,MAAM,IAAI,iCAAqB,CAC3B,6DAA6D,CAChE,CAAC;iBACL;aACJ;YACD,MAAM,wBAAwB,GAC1B,MAAM,IAAI,CAAC,uBAAuB,CAAC,2BAA2B,CAC1D,WAAW,EACX,WAAW,EACX,OAAO,CACV,CAAC;YACN,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAE/D,IAAI,wBAAwB,GAAG,CAAC,EAAE;gBAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACxD,WAAW,CACd,CAAC;gBACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;oBACxB,IAAI,EAAE,OAAO;wBACT,CAAC,CAAC,oCAA2B;wBAC7B,CAAC,CAAC,qCAA4B;oBAClC,SAAS,EAAE,QAAQ;oBACnB,IAAI,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;oBAC3B,IAAI;oBACJ,OAAO,EAAE,SAAS;oBAClB,WAAW;iBACd,CAAC,CAAC;aACN;YACD,OAAO,OAAO,CAAC;SAClB;QACD,MAAM,IAAI,wBAAa,CACnB,8BAA8B,WAAW,iBAAiB,WAAW,EAAE,CAC1E,CAAC;IACN,CAAC;IAED,KAAK,CAAC,8BAA8B,CAChC,WAAmB,EACnB,QAAgB;QAEhB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACxD,WAAW,CACd,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAE/D,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,wBAAe;YACrB,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,OAAO;YACb,IAAI;YACJ,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,cAAc;IACd,KAAK,CAAC,MAAM,CACR,SAAiB,EACjB,WAAmB,EACnB,WAAmB,EACnB,QAAgB;QAEhB,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/C,MAAM,SAAS,GACX,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,CACnD,WAAW,EACX,WAAW,CACd,CAAC;QACN,OAAO,IAAI,CAAC,aAAa,CACrB,SAAS,EACT,WAAW,EACX,WAAW,EACX,CAAC,SAAS,EACV,QAAQ,CACX,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,WAAmB;QAEnB,MAAM,OAAO,GACT,MAAM,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,CACtD,WAAW,CACd,CAAC;QACN,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC;QACnD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,uBAAW,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,UAAU,EAAE,OAAO,IAAI,KAAK,CAAC;QAE7C,OAAO,EAAE,GAAG,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,aAAa,CACf,WAAmB,EACnB,UAAkB,EAClB,QAAgB;QAEhB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,OAAO,CAAC,OAAO,GAAG,UAAU,CAAC;QAC7B,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACxD,WAAW,CACd,CAAC;QACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,+BAAsB;YAC5B,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE;gBACF,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,UAAU;gBACV,UAAU;aACb;YACD,OAAO,EAAE,UAAU;YACnB,IAAI;SACP,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAmB,EAAE,QAAgB;QACrD,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,wBAAe;YACrB,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE;gBACF,WAAW;aACd;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAmB,EAAE,QAAgB;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACxD,WAAW,CACd,CAAC;QACF,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,wBAAe;YACrB,SAAS,EAAE,QAAQ;YACnB,IAAI;YACJ,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI;SACP,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,QAAiB;QAEjB,OAAO,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,4BAA4B,CAC9B,WAAmB,EACnB,YAAoB;QAEpB,MAAM,IAAI,CAAC,sBAAsB,CAAC,yCAAyC,CACvE,WAAW,EACX,YAAY,CACf,CAAC;IACN,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,sBAAsB,CAAC;AACxC,kBAAe,sBAAsB,CAAC"}
|
|
@@ -25,7 +25,7 @@ const reset_token_service_1 = __importDefault(require("./reset-token-service"));
|
|
|
25
25
|
const setting_service_1 = __importDefault(require("./setting-service"));
|
|
26
26
|
const session_service_1 = __importDefault(require("./session-service"));
|
|
27
27
|
const user_feedback_service_1 = __importDefault(require("./user-feedback-service"));
|
|
28
|
-
const
|
|
28
|
+
const feature_toggle_service_1 = __importDefault(require("./feature-toggle-service"));
|
|
29
29
|
const environment_service_1 = __importDefault(require("./environment-service"));
|
|
30
30
|
const feature_tag_service_1 = __importDefault(require("./feature-tag-service"));
|
|
31
31
|
const project_health_service_1 = __importDefault(require("./project-health-service"));
|
|
@@ -56,7 +56,7 @@ const createServices = (stores, config) => {
|
|
|
56
56
|
const versionService = new version_service_1.default(stores, config);
|
|
57
57
|
const healthService = new health_service_1.default(stores, config);
|
|
58
58
|
const userFeedbackService = new user_feedback_service_1.default(stores, config);
|
|
59
|
-
const featureToggleServiceV2 = new
|
|
59
|
+
const featureToggleServiceV2 = new feature_toggle_service_1.default(stores, config);
|
|
60
60
|
const environmentService = new environment_service_1.default(stores, config);
|
|
61
61
|
const featureTagService = new feature_tag_service_1.default(stores, config);
|
|
62
62
|
const projectHealthService = new project_health_service_1.default(stores, config, featureToggleServiceV2);
|
|
@@ -64,6 +64,7 @@ const createServices = (stores, config) => {
|
|
|
64
64
|
return {
|
|
65
65
|
accessService,
|
|
66
66
|
addonService,
|
|
67
|
+
featureToggleService: featureToggleServiceV2,
|
|
67
68
|
featureToggleServiceV2,
|
|
68
69
|
featureTypeService,
|
|
69
70
|
healthService,
|