unleash-server 4.2.0 → 4.2.4

package/dist/lib/services/client-metrics/ttl-list.d.ts

@@ -1,19 +1,26 @@
-export = TTLList;
-declare class TTLList extends EventEmitter {
-    constructor({ interval, expireAmount, expireType, }?: {
-        interval?: number;
-        expireAmount?: number;
-        expireType?: string;
-    });
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import List from './list';
+import { Duration } from 'date-fns';
+interface ConstructorArgs {
     interval: number;
     expireAmount: number;
-    expireType: string;
-    list: List;
+    expireType: keyof Duration | 'milliseconds';
+}
+export default class TTLList<T> extends EventEmitter {
+    private readonly interval;
+    private readonly expireAmount;
+    private readonly expireType;
+    list: List<{
+        ttl: Date;
+        value: T;
+    }>;
+    private timer;
+    private readonly getExpiryFrom;
+    constructor({ interval, expireAmount, expireType, }?: Partial<ConstructorArgs>);
     startTimer(): void;
-    timer: NodeJS.Timeout;
-    add(value: any, timestamp?: Date): void;
+    add(value: T, timestamp?: Date): void;
     timedCheck(): void;
     destroy(): void;
 }
-import { EventEmitter } from "events";
-import List = require("./list");
+export {};

package/dist/lib/services/client-metrics/ttl-list.js

@@ -1,15 +1,27 @@
-'use strict';
-const { EventEmitter } = require('events');
-const moment = require('moment');
-const List = require('./list');
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = require("events");
+const list_1 = __importDefault(require("./list"));
+const date_fns_1 = require("date-fns");
 // this list must have entries with sorted ttl range
-module.exports = class TTLList extends EventEmitter {
-    constructor({ interval = 1000, expireAmount = 1, expireType = 'hours', } = {}) {
+class TTLList extends events_1.EventEmitter {
+    constructor({ interval = (0, date_fns_1.secondsToMilliseconds)(1), expireAmount = 1, expireType = 'hours', } = {}) {
         super();
         this.interval = interval;
         this.expireAmount = expireAmount;
         this.expireType = expireType;
-        this.list = new List();
+        this.getExpiryFrom = (timestamp) => {
+            if (this.expireType === 'milliseconds') {
+                return (0, date_fns_1.addMilliseconds)(timestamp, expireAmount);
+            }
+            else {
+                return (0, date_fns_1.add)(timestamp, { [expireType]: expireAmount });
+            }
+        };
+        this.list = new list_1.default();
         this.list.on('evicted', ({ value, ttl }) => {
             this.emit('expire', value, ttl);
         });
@@ -26,8 +38,8 @@ module.exports = class TTLList extends EventEmitter {
         }
     }
     add(value, timestamp = new Date()) {
-        const ttl = moment(timestamp).add(this.expireAmount, this.expireType);
-        if (moment().isBefore(ttl)) {
+        const ttl = this.getExpiryFrom(timestamp);
+        if ((0, date_fns_1.isFuture)(ttl)) {
             this.list.add({ ttl, value });
         }
         else {
@@ -35,15 +47,14 @@ module.exports = class TTLList extends EventEmitter {
         }
     }
     timedCheck() {
-        const now = moment();
-        this.list.reverseRemoveUntilTrue(({ value }) => now.isBefore(value.ttl));
+        this.list.reverseRemoveUntilTrue(({ value }) => (0, date_fns_1.isFuture)(value.ttl));
         this.startTimer();
     }
     destroy() {
-        // https://github.com/nodejs/node/issues/9561
-        // clearTimeout(this.timer);
-        // this.timer = null;
+        clearTimeout(this.timer);
+        this.timer = null;
         this.list = null;
     }
-};
+}
+exports.default = TTLList;
 //# sourceMappingURL=ttl-list.js.map

package/dist/lib/services/client-metrics/ttl-list.js.map

@@ -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,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE/B,oDAAoD;AACpD,MAAM,CAAC,OAAO,GAAG,MAAM,OAAQ,SAAQ,YAAY;IAC/C,YAAY,EACR,QAAQ,GAAG,IAAI,EACf,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,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,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,IAAI,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxB,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,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3C,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAC1B,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAED,OAAO;QACH,6CAA6C;QAC7C,4BAA4B;QAC5B,qBAAqB;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ,CAAC"}
+{"version":3,"file":"ttl-list.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/ttl-list.ts"],"names":[],"mappings":";;;;;AAAA,mCAAsC;AACtC,kDAA0B;AAC1B,uCAMkB;AAQlB,oDAAoD;AACpD,MAAqB,OAAW,SAAQ,qBAAY;IAahD,YAAY,EACR,QAAQ,GAAG,IAAA,gCAAqB,EAAC,CAAC,CAAC,EACnC,YAAY,GAAG,CAAC,EAChB,UAAU,GAAG,OAAO,MACM,EAAE;QAC5B,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,IAAA,0BAAe,EAAC,SAAS,EAAE,YAAY,CAAC,CAAC;aACnD;iBAAM;gBACH,OAAO,IAAA,cAAG,EAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;aACzD;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,IAAI,GAAG,IAAI,cAAI,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,KAAQ,EAAE,SAAS,GAAG,IAAI,IAAI,EAAE;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,IAAA,mBAAQ,EAAC,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,IAAA,mBAAQ,EAAC,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;AArED,0BAqEC"}

package/dist/lib/services/client-metrics/ttl-list.test.js

@@ -1,9 +1,13 @@
-'use strict';
-const moment = require('moment');
-const TTLList = require('./ttl-list');
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const date_fns_1 = require("date-fns");
+const ttl_list_1 = __importDefault(require("./ttl-list"));
 test('should emit expire', (done) => {
     jest.useFakeTimers('modern');
-    const list = new TTLList({
+    const list = new ttl_list_1.default({
         interval: 20,
         expireAmount: 10,
         expireType: 'milliseconds',
@@ -19,29 +23,49 @@ test('should emit expire', (done) => {
 });
 test('should slice off list', () => {
     jest.useFakeTimers('modern');
-    const list = new TTLList({
+    const list = new ttl_list_1.default({
         interval: 10,
         expireAmount: 10,
         expireType: 'milliseconds',
     });
-    list.add({ n: '1' }, moment().add(1, 'milliseconds'));
-    list.add({ n: '2' }, moment().add(50, 'milliseconds'));
-    list.add({ n: '3' }, moment().add(200, 'milliseconds'));
-    list.add({ n: '4' }, moment().add(300, 'milliseconds'));
+    list.add({ n: '1' }, (0, date_fns_1.addMilliseconds)(Date.now(), 1));
+    list.add({ n: '2' }, (0, date_fns_1.addMilliseconds)(Date.now(), 50));
+    list.add({ n: '3' }, (0, date_fns_1.addMilliseconds)(Date.now(), 200));
+    list.add({ n: '4' }, (0, date_fns_1.addMilliseconds)(Date.now(), 300));
     const expired = [];
     list.on('expire', (entry) => {
         // console.timeEnd(entry.n);
         expired.push(entry);
     });
+    expect(expired).toHaveLength(0);
+    expect(list.list.toArray()).toHaveLength(4);
     jest.advanceTimersByTime(21);
     expect(expired).toHaveLength(1);
+    expect(list.list.toArray()).toHaveLength(3);
     jest.advanceTimersByTime(51);
     expect(expired).toHaveLength(2);
+    expect(list.list.toArray()).toHaveLength(2);
     jest.advanceTimersByTime(201);
     expect(expired).toHaveLength(3);
+    expect(list.list.toArray()).toHaveLength(1);
     jest.advanceTimersByTime(301);
     expect(expired).toHaveLength(4);
+    expect(list.list.toArray()).toHaveLength(0);
     list.destroy();
     jest.useRealTimers();
 });
+test('should add item created in the past but expiring in the future', () => {
+    jest.useFakeTimers('modern');
+    const list = new ttl_list_1.default({
+        interval: 10,
+        expireAmount: 10,
+        expireType: 'milliseconds',
+    });
+    const expireCallback = jest.fn();
+    list.on('expire', expireCallback);
+    list.add({ n: '1' }, new Date());
+    expect(expireCallback).not.toHaveBeenCalled();
+    expect(list.list.toArray()).toHaveLength(1);
+    jest.useRealTimers();
+});
 //# sourceMappingURL=ttl-list.test.js.map

package/dist/lib/services/client-metrics/ttl-list.test.js.map

@@ -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,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEtC,IAAI,CAAC,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;IAChC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC;QACrB,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,cAAc;KAC7B,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;QACxB,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnB,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC7B,IAAI,CAAC,aAAa,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC;QACrB,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,cAAc;KAC7B,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;IACtD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IACvD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;IACxD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,EAAE,CAAC;IAEnB,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;QACxB,4BAA4B;QAC5B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAEhC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAEhC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAEhC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAEhC,IAAI,CAAC,OAAO,EAAE,CAAC;IACf,IAAI,CAAC,aAAa,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ttl-list.test.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/ttl-list.test.ts"],"names":[],"mappings":";;;;;AAAA,uCAA2C;AAC3C,0DAAiC;AAEjC,IAAI,CAAC,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;IAChC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,IAAI,kBAAO,CAAgB;QACpC,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,cAAc;KAC7B,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;QACxB,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnB,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC7B,IAAI,CAAC,aAAa,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAG,IAAI,kBAAO,CAAgB;QACpC,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,cAAc;KAC7B,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,IAAA,0BAAe,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACrD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,IAAA,0BAAe,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACtD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,IAAA,0BAAe,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;IACvD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,IAAA,0BAAe,EAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;IAEvD,MAAM,OAAO,GAAG,EAAE,CAAC;IAEnB,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;QACxB,4BAA4B;QAC5B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5C,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5C,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5C,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5C,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5C,IAAI,CAAC,OAAO,EAAE,CAAC;IACf,IAAI,CAAC,aAAa,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IACxE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAE7B,MAAM,IAAI,GAAG,IAAI,kBAAO,CAAgB;QACpC,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,cAAc;KAC7B,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IACjC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAElC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IAEjC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC9C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAE5C,IAAI,CAAC,aAAa,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC"}

package/dist/lib/services/environment-service.d.ts

@@ -5,8 +5,9 @@ export default class EnvironmentService {
     private logger;
     private environmentStore;
     private featureStrategiesStore;
+    private projectStore;
     private featureEnvironmentStore;
-    constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'environmentStore' | 'featureStrategiesStore' | 'featureEnvironmentStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>);
+    constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, projectStore, }: Pick<IUnleashStores, 'environmentStore' | 'featureStrategiesStore' | 'featureEnvironmentStore' | 'projectStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>);
     getAll(): Promise<IEnvironment[]>;
     get(name: string): Promise<IEnvironment>;
     updateSortOrder(sortOrder: ISortOrder): Promise<void>;

package/dist/lib/services/environment-service.js

@@ -7,12 +7,14 @@ const db_error_1 = require("../error/db-error");
 const name_exists_error_1 = __importDefault(require("../error/name-exists-error"));
 const state_schema_1 = require("./state-schema");
 const notfound_error_1 = __importDefault(require("../error/notfound-error"));
+const minimum_one_environment_error_1 = __importDefault(require("../error/minimum-one-environment-error"));
 class EnvironmentService {
-    constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, }, { getLogger }) {
+    constructor({ environmentStore, featureStrategiesStore, featureEnvironmentStore, projectStore, }, { getLogger }) {
         this.logger = getLogger('services/environment-service.ts');
         this.environmentStore = environmentStore;
         this.featureStrategiesStore = featureStrategiesStore;
         this.featureEnvironmentStore = featureEnvironmentStore;
+        this.projectStore = projectStore;
     }
     async getAll() {
         return this.environmentStore.getAll();
@@ -47,8 +49,13 @@ class EnvironmentService {
         }
     }
     async removeEnvironmentFromProject(environment, projectId) {
-        await this.featureEnvironmentStore.disconnectFeatures(environment, projectId);
-        await this.featureEnvironmentStore.disconnectProject(environment, projectId);
+        const projectEnvs = await this.projectStore.getEnvironmentsForProject(projectId);
+        if (projectEnvs.length > 1) {
+            await this.featureEnvironmentStore.disconnectFeatures(environment, projectId);
+            await this.featureEnvironmentStore.disconnectProject(environment, projectId);
+            return;
+        }
+        throw new minimum_one_environment_error_1.default('You must always have one active environment');
     }
 }
 exports.default = EnvironmentService;

package/dist/lib/services/environment-service.js.map

@@ -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;IASnC,YACI,EACI,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,GAM1B,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;IAC3D,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,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CACjD,WAAW,EACX,SAAS,CACZ,CAAC;QACF,MAAM,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAChD,WAAW,EACX,SAAS,CACZ,CAAC;IACN,CAAC;CACJ;AA1FD,qCA0FC"}
+{"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"}

package/dist/lib/services/event-service.d.ts

@@ -1,6 +1,6 @@
 import { IUnleashConfig } from '../types/option';
 import { IUnleashStores } from '../types/stores';
-import { IEvent } from '../types/model';
+import { IEvent } from '../types/events';
 export default class EventService {
     private logger;
     private eventStore;

package/dist/lib/services/event-service.js

@@ -9,7 +9,7 @@ class EventService {
         return this.eventStore.getEvents();
     }
     async getEventsForToggle(name) {
-        return this.eventStore.getEventsFilterByType(name);
+        return this.eventStore.getEventsForFeature(name);
     }
     async getEventsForProject(project) {
         return this.eventStore.getEventsFilterByProject(project);

package/dist/lib/services/event-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-service.js","sourceRoot":"","sources":["../../../src/lib/services/event-service.ts"],"names":[],"mappings":";;AAMA,MAAqB,YAAY;IAK7B,YACI,EAAE,UAAU,EAAsC,EAClD,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,2BAA2B,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC;CACJ;AAxBD,+BAwBC;AAED,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC"}
+{"version":3,"file":"event-service.js","sourceRoot":"","sources":["../../../src/lib/services/event-service.ts"],"names":[],"mappings":";;AAMA,MAAqB,YAAY;IAK7B,YACI,EAAE,UAAU,EAAsC,EAClD,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,2BAA2B,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAC7D,CAAC;CACJ;AAxBD,+BAwBC;AAED,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC"}

package/dist/lib/services/feature-tag-service.js

@@ -17,6 +17,7 @@ class FeatureTagService {
     async listTags(featureName) {
         return this.featureTagStore.getAllTagsForFeature(featureName);
     }
+    // TODO: add project Id
     async addTag(featureName, tag, userName) {
         await feature_schema_1.nameSchema.validateAsync({ name: featureName });
         const validatedTag = await tag_schema_1.tagSchema.validateAsync(tag);
@@ -25,10 +26,8 @@ class FeatureTagService {
         await this.eventStore.store({
             type: events_1.FEATURE_TAGGED,
             createdBy: userName,
-            data: {
-                featureName,
-                tag: validatedTag,
-            },
+            featureName,
+            data: validatedTag,
         });
         return validatedTag;
     }
@@ -42,22 +41,19 @@ class FeatureTagService {
                 await this.eventStore.store({
                     type: events_1.TAG_CREATED,
                     createdBy: userName,
-                    data: {
-                        tag,
-                    },
+                    data: tag,
                 });
             }
         }
     }
+    // TODO: add project Id
     async removeTag(featureName, tag, userName) {
         await this.featureTagStore.untagFeature(featureName, tag);
         await this.eventStore.store({
             type: events_1.FEATURE_UNTAGGED,
             createdBy: userName,
-            data: {
-                featureName,
-                tag,
-            },
+            featureName,
+            data: tag,
         });
     }
 }

package/dist/lib/services/feature-tag-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature-tag-service.js","sourceRoot":"","sources":["../../../src/lib/services/feature-tag-service.ts"],"names":[],"mappings":";;;;;AAAA,6EAAoD;AAEpD,6DAAsD;AACtD,4CAAgF;AAGhF,6CAAyC;AAMzC,MAAM,iBAAiB;IASnB,YACI,EACI,QAAQ,EACR,eAAe,EACf,UAAU,GACwD,EACtE,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,kCAAkC,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,WAAmB;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,MAAM,CACR,WAAmB,EACnB,GAAS,EACT,QAAgB;QAEhB,MAAM,2BAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,MAAM,sBAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAEjE,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,uBAAc;YACpB,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE;gBACF,WAAW;gBACX,GAAG,EAAE,YAAY;aACpB;SACJ,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAS,EAAE,QAAgB;QAC/C,IAAI;YACA,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;SACnD;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,KAAK,YAAY,wBAAa,EAAE;gBAChC,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;oBACxB,IAAI,EAAE,oBAAW;oBACjB,SAAS,EAAE,QAAQ;oBACnB,IAAI,EAAE;wBACF,GAAG;qBACN;iBACJ,CAAC,CAAC;aACN;SACJ;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CACX,WAAmB,EACnB,GAAS,EACT,QAAgB;QAEhB,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,yBAAgB;YACtB,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE;gBACF,WAAW;gBACX,GAAG;aACN;SACJ,CAAC,CAAC;IACP,CAAC;CACJ;AAED,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"feature-tag-service.js","sourceRoot":"","sources":["../../../src/lib/services/feature-tag-service.ts"],"names":[],"mappings":";;;;;AAAA,6EAAoD;AAEpD,6DAAsD;AACtD,4CAAgF;AAGhF,6CAAyC;AAMzC,MAAM,iBAAiB;IASnB,YACI,EACI,QAAQ,EACR,eAAe,EACf,UAAU,GACwD,EACtE,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,kCAAkC,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,WAAmB;QAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IAClE,CAAC;IAED,uBAAuB;IACvB,KAAK,CAAC,MAAM,CACR,WAAmB,EACnB,GAAS,EACT,QAAgB;QAEhB,MAAM,2BAAU,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,MAAM,sBAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAEjE,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,uBAAc;YACpB,SAAS,EAAE,QAAQ;YACnB,WAAW;YACX,IAAI,EAAE,YAAY;SACrB,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAS,EAAE,QAAgB;QAC/C,IAAI;YACA,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;SACnD;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,KAAK,YAAY,wBAAa,EAAE;gBAChC,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;oBACxB,IAAI,EAAE,oBAAW;oBACjB,SAAS,EAAE,QAAQ;oBACnB,IAAI,EAAE,GAAG;iBACZ,CAAC,CAAC;aACN;SACJ;IACL,CAAC;IAED,uBAAuB;IACvB,KAAK,CAAC,SAAS,CACX,WAAmB,EACnB,GAAS,EACT,QAAgB;QAEhB,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,yBAAgB;YACtB,SAAS,EAAE,QAAQ;YACnB,WAAW;YACX,IAAI,EAAE,GAAG;SACZ,CAAC,CAAC;IACP,CAAC;CACJ;AAED,kBAAe,iBAAiB,CAAC"}

package/dist/lib/services/{feature-toggle-service-v2.d.ts → feature-toggle-service.d.ts}

@@ -3,18 +3,28 @@ import { IUnleashStores } from '../types/stores';
 import { FeatureConfigurationClient } from '../types/stores/feature-strategies-store';
 import { FeatureToggle, FeatureToggleDTO, FeatureToggleWithEnvironment, FeatureToggleLegacy, IFeatureEnvironmentInfo, IFeatureOverview, IFeatureStrategy, IFeatureToggleQuery, IStrategyConfig } from '../types/model';
 import { Operation } from 'fast-json-patch';
-declare class FeatureToggleServiceV2 {
+interface IFeatureContext {
+    featureName: string;
+    projectId: string;
+}
+interface IFeatureStrategyContext extends IFeatureContext {
+    environment: string;
+}
+declare class FeatureToggleService {
     private logger;
     private featureStrategiesStore;
     private featureToggleStore;
     private featureToggleClientStore;
-    private featureTagStore;
+    private tagStore;
     private featureEnvironmentStore;
     private projectStore;
     private eventStore;
     constructor({ featureStrategiesStore, featureToggleStore, featureToggleClientStore, projectStore, eventStore, featureTagStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'featureStrategiesStore' | 'featureToggleStore' | 'featureToggleClientStore' | 'projectStore' | 'eventStore' | 'featureTagStore' | 'featureEnvironmentStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>);
-    patchFeature(projectId: string, featureName: string, userName: string, operations: Operation[]): Promise<FeatureToggle>;
-    createStrategy(strategyConfig: Omit<IStrategyConfig, 'id'>, projectId: string, featureName: string, userName: string, environment?: string): Promise<IStrategyConfig>;
+    validateFeatureContext({ featureName, projectId, }: IFeatureContext): Promise<void>;
+    validateFeatureStrategyContext(strategy: IFeatureStrategy, { featureName, projectId }: IFeatureStrategyContext): void;
+    patchFeature(project: string, featureName: string, createdBy: string, operations: Operation[]): Promise<FeatureToggle>;
+    featureStrategyToPublic(featureStrategy: IFeatureStrategy): IStrategyConfig;
+    createStrategy(strategyConfig: Omit<IStrategyConfig, 'id'>, context: IFeatureStrategyContext, createdBy: string): Promise<IStrategyConfig>;
     /**
      * PUT /api/admin/projects/:projectId/features/:featureName/strategies/:strategyId ?
      * {
@@ -22,21 +32,21 @@ declare class FeatureToggleServiceV2 {
      * }
      * @param id
      * @param updates
+     * @param context - Which context does this strategy live in (projectId, featureName, environment)
+     * @param userName - Human readable id of the user performing the update
      */
-    updateStrategy(id: string, environment: string, project: string, userName: string, updates: Partial<IFeatureStrategy>): Promise<IStrategyConfig>;
-    updateStrategyParameter(id: string, name: string, value: string | number, userName: string, project: string, environment: string): Promise<IStrategyConfig>;
+    updateStrategy(id: string, updates: Partial<IFeatureStrategy>, context: IFeatureStrategyContext, userName: string): Promise<IStrategyConfig>;
+    updateStrategyParameter(id: string, name: string, value: string | number, context: IFeatureStrategyContext, userName: string): Promise<IStrategyConfig>;
     /**
      * DELETE /api/admin/projects/:projectId/features/:featureName/environments/:environmentName/strategies/:strategyId
      * {
      *
      * }
      * @param id - strategy id
-     * @param featureName - Name of the feature the strategy belongs to
-     * @param userName - Who's doing the change
-     * @param project - Which project does this feature toggle belong to
+     * @param context - Which context does this strategy live in (projectId, featureName, environment)
      * @param environment - Which environment does this strategy belong to
      */
-    deleteStrategy(id: string, featureName: string, userName: string, project?: string, environment?: string): Promise<void>;
+    deleteStrategy(id: string, context: IFeatureStrategyContext, createdBy: string): Promise<void>;
     getStrategiesForEnvironment(project: string, featureName: string, environment?: string): Promise<IStrategyConfig[]>;
     /**
      * GET /api/admin/projects/:project/features/:featureName
@@ -60,7 +70,7 @@ declare class FeatureToggleServiceV2 {
     getFeatureToggles(query?: IFeatureToggleQuery, archived?: boolean): Promise<FeatureToggle[]>;
     getFeatureOverview(projectId: string, archived?: boolean): Promise<IFeatureOverview[]>;
     getFeatureToggle(featureName: string): Promise<FeatureToggleWithEnvironment>;
-    createFeatureToggle(projectId: string, value: FeatureToggleDTO, userName: string): Promise<FeatureToggle>;
+    createFeatureToggle(projectId: string, value: FeatureToggleDTO, createdBy: string): Promise<FeatureToggle>;
     cloneFeatureToggle(featureName: string, projectId: string, newFeatureName: string, replaceGroupId: boolean, userName: string): Promise<FeatureToggle>;
     updateFeatureToggle(projectId: string, updatedFeature: FeatureToggleDTO, userName: string): Promise<FeatureToggle>;
     getFeatureCountForProject(projectId: string): Promise<number>;
@@ -72,18 +82,18 @@ declare class FeatureToggleServiceV2 {
     validateName(name: string): Promise<string>;
     validateUniqueFeatureName(name: string): Promise<void>;
     hasFeature(name: string): Promise<boolean>;
-    updateStale(featureName: string, isStale: boolean, userName: string): Promise<any>;
-    archiveToggle(name: string, userName: string): Promise<void>;
-    updateEnabled(projectId: string, featureName: string, environment: string, enabled: boolean, userName: string): Promise<FeatureToggle>;
-    storeFeatureUpdatedEventLegacy(featureName: string, userName: string): Promise<FeatureToggleLegacy>;
+    updateStale(featureName: string, isStale: boolean, createdBy: string): Promise<any>;
+    archiveToggle(featureName: string, createdBy: string): Promise<void>;
+    updateEnabled(project: string, featureName: string, environment: string, enabled: boolean, createdBy: string): Promise<FeatureToggle>;
+    storeFeatureUpdatedEventLegacy(featureName: string, createdBy: string): Promise<FeatureToggleLegacy>;
     toggle(projectId: string, featureName: string, environment: string, userName: string): Promise<FeatureToggle>;
     getFeatureToggleLegacy(featureName: string): Promise<FeatureToggleLegacy>;
-    changeProject(featureName: string, newProject: string, userName: string): Promise<void>;
+    changeProject(featureName: string, newProject: string, createdBy: string): Promise<void>;
     getArchivedFeatures(): Promise<FeatureToggle[]>;
-    deleteFeature(featureName: string, userName: string): Promise<void>;
-    reviveToggle(featureName: string, userName: string): Promise<void>;
+    deleteFeature(featureName: string, createdBy: string): Promise<void>;
+    reviveToggle(featureName: string, createdBy: string): Promise<void>;
     getMetadataForAllFeatures(archived: boolean): Promise<FeatureToggle[]>;
     getProjectId(name: string): Promise<string>;
     updateFeatureStrategyProject(featureName: string, newProjectId: string): Promise<void>;
 }
-export default FeatureToggleServiceV2;
+export default FeatureToggleService;