flagsmith-nodejs 2.0.0-beta.7 → 2.0.2

package/build/flagsmith-engine/features/models.d.ts

@@ -22,10 +22,16 @@ export declare class FeatureStateModel {
     enabled: boolean;
     djangoID: number;
     featurestateUUID: string;
+    featureSegment?: FeatureSegment;
     private value;
     multivariateFeatureStateValues: MultivariateFeatureStateValueModel[];
     constructor(feature: FeatureModel, enabled: boolean, djangoID: number, value?: any, featurestateUuid?: string);
     setValue(value: any): void;
     getValue(identityId?: number | string): any;
+    isHigherSegmentPriority(other: FeatureStateModel): boolean;
     getMultivariateValue(identityID: number | string): any;
 }
+export declare class FeatureSegment {
+    priority: number;
+    constructor(priority: number);
+}

package/build/flagsmith-engine/features/models.js

@@ -11,7 +11,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FeatureStateModel = exports.MultivariateFeatureStateValueModel = exports.MultivariateFeatureOptionModel = exports.FeatureModel = void 0;
+exports.FeatureSegment = exports.FeatureStateModel = exports.MultivariateFeatureStateValueModel = exports.MultivariateFeatureOptionModel = exports.FeatureModel = void 0;
 var uuid_1 = require("uuid");
 var hashing_1 = require("../utils/hashing");
 var FeatureModel = /** @class */ (function () {
@@ -65,6 +65,22 @@ var FeatureStateModel = /** @class */ (function () {
         }
         return this.value;
     };
+    /*
+        Returns `True` if `this` is higher segment priority than `other`
+        (i.e. has lower value for featureSegment.priority)
+        NOTE:
+            A segment will be considered higher priority only if:
+            1. `other` does not have a feature segment(i.e: it is an environment feature state or it's a
+            feature state with feature segment but from an old document that does not have `featureSegment.priority`)
+            but `this` does.
+            2. `other` have a feature segment with high priority
+    */
+    FeatureStateModel.prototype.isHigherSegmentPriority = function (other) {
+        if (!other.featureSegment || !this.featureSegment) {
+            return !!this.featureSegment && !other.featureSegment;
+        }
+        return this.featureSegment.priority < other.featureSegment.priority;
+    };
     FeatureStateModel.prototype.getMultivariateValue = function (identityID) {
         var e_1, _a;
         var percentageValue = (0, hashing_1.getHashedPercentateForObjIds)([
@@ -73,7 +89,7 @@ var FeatureStateModel = /** @class */ (function () {
         ]);
         var startPercentage = 0;
         var sortedF = this.multivariateFeatureStateValues.sort(function (a, b) {
-            return !!(a.id && b.id) ? a.id - b.id : a.mvFsValueUuid > b.mvFsValueUuid ? -1 : 1;
+            return a.id - b.id;
         });
         try {
             for (var sortedF_1 = __values(sortedF), sortedF_1_1 = sortedF_1.next(); !sortedF_1_1.done; sortedF_1_1 = sortedF_1.next()) {
@@ -97,3 +113,10 @@ var FeatureStateModel = /** @class */ (function () {
     return FeatureStateModel;
 }());
 exports.FeatureStateModel = FeatureStateModel;
+var FeatureSegment = /** @class */ (function () {
+    function FeatureSegment(priority) {
+        this.priority = priority;
+    }
+    return FeatureSegment;
+}());
+exports.FeatureSegment = FeatureSegment;

package/build/flagsmith-engine/features/util.d.ts

@@ -1,3 +1,4 @@
-import { FeatureModel, FeatureStateModel } from './models';
+import { FeatureModel, FeatureSegment, FeatureStateModel } from './models';
 export declare function buildFeatureModel(featuresModelJSON: any): FeatureModel;
 export declare function buildFeatureStateModel(featuresStateModelJSON: any): FeatureStateModel;
+export declare function buildFeatureSegment(featureSegmentJSON: any): FeatureSegment;

package/build/flagsmith-engine/features/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildFeatureStateModel = exports.buildFeatureModel = void 0;
+exports.buildFeatureSegment = exports.buildFeatureStateModel = exports.buildFeatureModel = void 0;
 var models_1 = require("./models");
 function buildFeatureModel(featuresModelJSON) {
     return new models_1.FeatureModel(featuresModelJSON.id, featuresModelJSON.name, featuresModelJSON.type);
@@ -8,6 +8,9 @@ function buildFeatureModel(featuresModelJSON) {
 exports.buildFeatureModel = buildFeatureModel;
 function buildFeatureStateModel(featuresStateModelJSON) {
     var featureStateModel = new models_1.FeatureStateModel(buildFeatureModel(featuresStateModelJSON.feature), featuresStateModelJSON.enabled, featuresStateModelJSON.django_id, featuresStateModelJSON.feature_state_value, featuresStateModelJSON.uuid);
+    featureStateModel.featureSegment = featuresStateModelJSON.feature_segment ?
+        buildFeatureSegment(featuresStateModelJSON.feature_segment) :
+        undefined;
     var multivariateFeatureStateValues = featuresStateModelJSON.multivariate_feature_state_values
         ? featuresStateModelJSON.multivariate_feature_state_values.map(function (fsv) {
             var featureOption = new models_1.MultivariateFeatureOptionModel(fsv.multivariate_feature_option.value, fsv.multivariate_feature_option.id);
@@ -18,3 +21,7 @@ function buildFeatureStateModel(featuresStateModelJSON) {
     return featureStateModel;
 }
 exports.buildFeatureStateModel = buildFeatureStateModel;
+function buildFeatureSegment(featureSegmentJSON) {
+    return new models_1.FeatureSegment(featureSegmentJSON.priority);
+}
+exports.buildFeatureSegment = buildFeatureSegment;

package/build/flagsmith-engine/index.js

@@ -39,9 +39,11 @@ function getIdentityFeatureStatesDict(environment, identity, overrideTraits) {
             try {
                 for (var _g = (e_3 = void 0, __values(matchingSegment.featureStates)), _h = _g.next(); !_h.done; _h = _g.next()) {
                     var featureState = _h.value;
-                    // note that feature states are stored on the segment in descending priority
-                    // order so we only care that the last one is added
-                    // TODO: can we optimise this?
+                    if (featureStates[featureState.feature.id]) {
+                        if (featureStates[featureState.feature.id].isHigherSegmentPriority(featureState)) {
+                            continue;
+                        }
+                    }
                     featureStates[featureState.feature.id] = featureState;
                 }
             }
@@ -63,7 +65,7 @@ function getIdentityFeatureStatesDict(environment, identity, overrideTraits) {
     }
     try {
         // Override with any feature states defined directly the identity
-        for (var _j = __values(identity.identityFeatures || []), _k = _j.next(); !_k.done; _k = _j.next()) {
+        for (var _j = __values(identity.identityFeatures), _k = _j.next(); !_k.done; _k = _j.next()) {
             var fs = _k.value;
             if (featureStates[fs.feature.id]) {
                 featureStates[fs.feature.id] = fs;

package/build/flagsmith-engine/segments/models.d.ts

@@ -4,6 +4,12 @@ export declare const any: (iterable: Array<any>) => boolean;
 export declare const matchingFunctions: {
     [x: string]: (thisValue: any, otherValue: any) => any;
 };
+export declare const semverMatchingFunction: {
+    [x: string]: ((thisValue: any, otherValue: any) => any) | ((thisValue: any, otherValue: any) => boolean);
+};
+export declare const getMatchingFunctions: (semver: boolean) => {
+    [x: string]: (thisValue: any, otherValue: any) => any;
+};
 export declare class SegmentConditionModel {
     EXCEPTION_OPERATOR_METHODS: {
         [key: string]: string;

package/build/flagsmith-engine/segments/models.js

@@ -1,9 +1,25 @@
 "use strict";
-var _a;
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SegmentModel = exports.SegmentRuleModel = exports.SegmentConditionModel = exports.matchingFunctions = exports.any = exports.all = void 0;
+exports.SegmentModel = exports.SegmentRuleModel = exports.SegmentConditionModel = exports.getMatchingFunctions = exports.semverMatchingFunction = exports.matchingFunctions = exports.any = exports.all = void 0;
+var semver_1 = __importDefault(require("semver"));
 var utils_1 = require("../utils");
 var constants_1 = require("./constants");
+var util_1 = require("./util");
 var all = function (iterable) { return iterable.filter(function (e) { return !!e; }).length === iterable.length; };
 exports.all = all;
 var any = function (iterable) { return iterable.filter(function (e) { return !!e; }).length > 0; };
@@ -23,6 +39,13 @@ exports.matchingFunctions = (_a = {},
         return otherValue.includes(thisValue);
     },
     _a);
+exports.semverMatchingFunction = __assign(__assign({}, exports.matchingFunctions), (_b = {}, _b[constants_1.CONDITION_OPERATORS.EQUAL] = function (thisValue, otherValue) { return semver_1.default.eq(thisValue, otherValue); }, _b[constants_1.CONDITION_OPERATORS.GREATER_THAN] = function (thisValue, otherValue) { return semver_1.default.gt(otherValue, thisValue); }, _b[constants_1.CONDITION_OPERATORS.GREATER_THAN_INCLUSIVE] = function (thisValue, otherValue) {
+    return semver_1.default.gte(otherValue, thisValue);
+}, _b[constants_1.CONDITION_OPERATORS.LESS_THAN] = function (thisValue, otherValue) { return semver_1.default.gt(thisValue, otherValue); }, _b[constants_1.CONDITION_OPERATORS.LESS_THAN_INCLUSIVE] = function (thisValue, otherValue) {
+    return semver_1.default.gte(thisValue, otherValue);
+}, _b));
+var getMatchingFunctions = function (semver) { return (semver ? exports.semverMatchingFunction : exports.matchingFunctions); };
+exports.getMatchingFunctions = getMatchingFunctions;
 var SegmentConditionModel = /** @class */ (function () {
     function SegmentConditionModel(operator, value, property) {
         var _a;
@@ -50,8 +73,10 @@ var SegmentConditionModel = /** @class */ (function () {
             return evaluatorFunction(traitValue);
         }
         var defaultFunction = function (x, y) { return false; };
-        var matchingFunction = exports.matchingFunctions[this.operator] || defaultFunction;
-        var castToTypeOfTraitValue = (0, utils_1.getCastingFunction)(traitValue);
+        var matchingFunctionSet = (0, exports.getMatchingFunctions)((0, util_1.isSemver)(this.value));
+        var matchingFunction = matchingFunctionSet[this.operator] || defaultFunction;
+        var traitType = (0, util_1.isSemver)(this.value) ? 'semver' : typeof traitValue;
+        var castToTypeOfTraitValue = (0, utils_1.getCastingFunction)(traitType);
         return matchingFunction(castToTypeOfTraitValue(this.value), traitValue);
     };
     return SegmentConditionModel;

package/build/flagsmith-engine/segments/util.d.ts

@@ -2,3 +2,5 @@ import { SegmentConditionModel, SegmentModel, SegmentRuleModel } from './models'
 export declare function buildSegmentConditionModel(segmentConditionJSON: any): SegmentConditionModel;
 export declare function buildSegmentRuleModel(ruleModelJSON: any): SegmentRuleModel;
 export declare function buildSegmentModel(segmentModelJSON: any): SegmentModel;
+export declare function isSemver(value: any): boolean;
+export declare function removeSemverSuffix(value: string): string;

package/build/flagsmith-engine/segments/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSegmentModel = exports.buildSegmentRuleModel = exports.buildSegmentConditionModel = void 0;
+exports.removeSemverSuffix = exports.isSemver = exports.buildSegmentModel = exports.buildSegmentRuleModel = exports.buildSegmentConditionModel = void 0;
 var util_1 = require("../features/util");
 var models_1 = require("./models");
 function buildSegmentConditionModel(segmentConditionJSON) {
@@ -23,3 +23,11 @@ function buildSegmentModel(segmentModelJSON) {
     return model;
 }
 exports.buildSegmentModel = buildSegmentModel;
+function isSemver(value) {
+    return typeof value == 'string' && value.endsWith(':semver');
+}
+exports.isSemver = isSemver;
+function removeSemverSuffix(value) {
+    return value.replace(':semver', '');
+}
+exports.removeSemverSuffix = removeSemverSuffix;

package/build/flagsmith-engine/utils/index.d.ts

@@ -1 +1 @@
-export declare function getCastingFunction(input: any): CallableFunction;
+export declare function getCastingFunction(traitType: 'boolean' | 'string' | 'number' | 'semver' | any): CallableFunction;

package/build/flagsmith-engine/utils/index.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCastingFunction = void 0;
-function getCastingFunction(input) {
-    switch (typeof input) {
+var util_1 = require("../segments/util");
+function getCastingFunction(traitType) {
+    switch (traitType) {
         case 'boolean':
             return function (x) { return !['False', 'false'].includes(x); };
         case 'number':
             return function (x) { return parseFloat(x); };
+        case 'semver':
+            return function (x) { return (0, util_1.removeSemverSuffix)(x); };
         default:
             return function (x) { return String(x); };
     }

package/build/sdk/index.js

@@ -74,7 +74,7 @@ var models_3 = require("./models");
 var polling_manager_1 = require("./polling_manager");
 var utils_1 = require("./utils");
 var evaluators_1 = require("../flagsmith-engine/segments/evaluators");
-var DEFAULT_API_URL = 'https://api.flagsmith.com/api/v1/';
+var DEFAULT_API_URL = 'https://edge.api.flagsmith.com/api/v1/';
 var Flagsmith = /** @class */ (function () {
     /**
      * A Flagsmith client.
@@ -332,7 +332,7 @@ var Flagsmith = /** @class */ (function () {
                                 timeout: this.requestTimeoutSeconds || undefined,
                                 body: JSON.stringify(body),
                                 headers: headers
-                            }, this.retries, 1000, (this.requestTimeoutSeconds || 10) * 1000)];
+                            }, this.retries, (this.requestTimeoutSeconds || 10) * 1000)];
                     case 1:
                         data = _e.sent();
                         if (data.status !== 200) {

package/build/sdk/utils.d.ts

@@ -1,5 +1,5 @@
 import { Response } from 'node-fetch';
-export declare function generateIdentitiesData(identifier: string, traits?: {
+export declare function generateIdentitiesData(identifier: string, traits: {
     [key: string]: any;
 }): {
     identifier: string;
@@ -9,4 +9,4 @@ export declare function generateIdentitiesData(identifier: string, traits?: {
     }[];
 };
 export declare const delay: (ms: number) => Promise<unknown>;
-export declare const retryFetch: (url: string, fetchOptions: {} | undefined, retries: number | undefined, retryDelay: number | undefined, timeout: number) => Promise<Response>;
+export declare const retryFetch: (url: string, fetchOptions: any, retries: number | undefined, timeout: number) => Promise<Response>;

package/build/sdk/utils.js

@@ -45,7 +45,7 @@ var node_fetch_1 = __importDefault(require("node-fetch"));
 if (typeof node_fetch_1.default.default !== 'undefined')
     node_fetch_1.default = node_fetch_1.default.default;
 function generateIdentitiesData(identifier, traits) {
-    var traitsGenerated = Object.entries(traits || {}).map(function (trait) { return ({
+    var traitsGenerated = Object.entries(traits).map(function (trait) { return ({
         trait_key: trait[0],
         trait_value: trait[1]
     }); });
@@ -59,10 +59,8 @@ var delay = function (ms) {
     return new Promise(function (resolve) { return setTimeout(function () { return resolve(undefined); }, ms); });
 };
 exports.delay = delay;
-var retryFetch = function (url, fetchOptions, retries, retryDelay, timeout) {
-    if (fetchOptions === void 0) { fetchOptions = {}; }
+var retryFetch = function (url, fetchOptions, retries, timeout) {
     if (retries === void 0) { retries = 3; }
-    if (retryDelay === void 0) { retryDelay = 1000; }
     return new Promise(function (resolve, reject) {
         // check for timeout
         if (timeout)
@@ -75,7 +73,7 @@ var retryFetch = function (url, fetchOptions, retries, retryDelay, timeout) {
                     switch (_a.label) {
                         case 0:
                             if (!(n > 0)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, (0, exports.delay)(retryDelay)];
+                            return [4 /*yield*/, (0, exports.delay)(1000)];
                         case 1:
                             _a.sent();
                             wrapper(--n);

package/flagsmith-engine/features/models.ts

@@ -51,6 +51,7 @@ export class FeatureStateModel {
     enabled: boolean;
     djangoID: number;
     featurestateUUID: string = uuidv4();
+    featureSegment?: FeatureSegment;
     private value: any;
     multivariateFeatureStateValues: MultivariateFeatureStateValueModel[] = [];
 
@@ -79,6 +80,23 @@ export class FeatureStateModel {
         return this.value;
     }
 
+    /* 
+        Returns `True` if `this` is higher segment priority than `other`
+        (i.e. has lower value for featureSegment.priority)
+        NOTE:
+            A segment will be considered higher priority only if:
+            1. `other` does not have a feature segment(i.e: it is an environment feature state or it's a
+            feature state with feature segment but from an old document that does not have `featureSegment.priority`)
+            but `this` does.
+            2. `other` have a feature segment with high priority
+    */
+    isHigherSegmentPriority(other: FeatureStateModel): boolean {
+        if (!other.featureSegment || !this.featureSegment) {
+            return !!this.featureSegment && !other.featureSegment;
+        }
+        return this.featureSegment.priority < other.featureSegment.priority;
+    }
+    
     getMultivariateValue(identityID: number | string) {
         const percentageValue = getHashedPercentateForObjIds([
             this.djangoID || this.featurestateUUID,
@@ -86,9 +104,9 @@ export class FeatureStateModel {
         ]);
 
         let startPercentage = 0;
-        const sortedF = this.multivariateFeatureStateValues.sort((a, b) =>
-            !!(a.id && b.id) ? a.id - b.id : a.mvFsValueUuid > b.mvFsValueUuid ? -1 : 1
-        );
+        const sortedF = this.multivariateFeatureStateValues.sort((a, b) =>{
+            return a.id - b.id;
+        });
         for (const myValue of sortedF) {
             const limit = myValue.percentageAllocation + startPercentage;
             if (startPercentage <= percentageValue && percentageValue < limit) {
@@ -99,3 +117,11 @@ export class FeatureStateModel {
         return this.value;
     }
 }
+
+export class FeatureSegment {
+    priority: number;
+
+    constructor(priority: number) {
+        this.priority = priority;
+    }
+}

package/flagsmith-engine/features/util.ts

@@ -1,5 +1,6 @@
 import {
     FeatureModel,
+    FeatureSegment,
     FeatureStateModel,
     MultivariateFeatureOptionModel,
     MultivariateFeatureStateValueModel
@@ -18,6 +19,10 @@ export function buildFeatureStateModel(featuresStateModelJSON: any): FeatureStat
         featuresStateModelJSON.uuid
     );
 
+    featureStateModel.featureSegment = featuresStateModelJSON.feature_segment ? 
+        buildFeatureSegment(featuresStateModelJSON.feature_segment) : 
+        undefined;
+
     const multivariateFeatureStateValues = featuresStateModelJSON.multivariate_feature_state_values
         ? featuresStateModelJSON.multivariate_feature_state_values.map((fsv: any) => {
               const featureOption = new MultivariateFeatureOptionModel(
@@ -36,3 +41,7 @@ export function buildFeatureStateModel(featuresStateModelJSON: any): FeatureStat
 
     return featureStateModel;
 }
+
+export function buildFeatureSegment(featureSegmentJSON: any): FeatureSegment {
+    return new FeatureSegment(featureSegmentJSON.priority);
+}

package/flagsmith-engine/index.ts

@@ -25,15 +25,17 @@ function getIdentityFeatureStatesDict(
     );
     for (const matchingSegment of identitySegments) {
         for (const featureState of matchingSegment.featureStates) {
-            // note that feature states are stored on the segment in descending priority
-            // order so we only care that the last one is added
-            // TODO: can we optimise this?
+            if (featureStates[featureState.feature.id]) {
+                if (featureStates[featureState.feature.id].isHigherSegmentPriority(featureState)) {
+                    continue;
+                }
+            }
             featureStates[featureState.feature.id] = featureState;
         }
     }
 
     // Override with any feature states defined directly the identity
-    for (const fs of identity.identityFeatures || []) {
+    for (const fs of identity.identityFeatures) {
         if (featureStates[fs.feature.id]) {
             featureStates[fs.feature.id] = fs;
         }

package/flagsmith-engine/segments/models.ts

@@ -1,3 +1,5 @@
+import semver from 'semver';
+
 import { FeatureStateModel } from '../features/models';
 import { getCastingFunction as getCastingFunction } from '../utils';
 import {
@@ -8,6 +10,7 @@ import {
     REGEX,
     CONDITION_OPERATORS
 } from './constants';
+import { isSemver } from './util';
 
 export const all = (iterable: Array<any>) => iterable.filter(e => !!e).length === iterable.length;
 export const any = (iterable: Array<any>) => iterable.filter(e => !!e).length > 0;
@@ -25,6 +28,19 @@ export const matchingFunctions = {
         otherValue.includes(thisValue),
 };
 
+export const semverMatchingFunction = {
+    ...matchingFunctions,
+    [CONDITION_OPERATORS.EQUAL]: (thisValue: any, otherValue: any) => semver.eq(thisValue, otherValue),
+    [CONDITION_OPERATORS.GREATER_THAN]: (thisValue: any, otherValue: any) => semver.gt(otherValue, thisValue),
+    [CONDITION_OPERATORS.GREATER_THAN_INCLUSIVE]: (thisValue: any, otherValue: any) =>
+        semver.gte(otherValue, thisValue),
+    [CONDITION_OPERATORS.LESS_THAN]: (thisValue: any, otherValue: any) => semver.gt(thisValue, otherValue),
+    [CONDITION_OPERATORS.LESS_THAN_INCLUSIVE]: (thisValue: any, otherValue: any) =>
+        semver.gte(thisValue, otherValue),
+}
+
+export const getMatchingFunctions = (semver: boolean) => (semver ? semverMatchingFunction : matchingFunctions);
+
 export class SegmentConditionModel {
     EXCEPTION_OPERATOR_METHODS: { [key: string]: string } = {
         [NOT_CONTAINS]: 'evaluateNotContains',
@@ -59,9 +75,12 @@ export class SegmentConditionModel {
 
         const defaultFunction = (x: any, y: any) => false;
 
-        const matchingFunction = matchingFunctions[this.operator] || defaultFunction;
+        const matchingFunctionSet = getMatchingFunctions(isSemver(this.value));
+        const matchingFunction = matchingFunctionSet[this.operator] || defaultFunction;
+
+        const traitType = isSemver(this.value) ? 'semver' : typeof traitValue;
+        const castToTypeOfTraitValue = getCastingFunction(traitType);
 
-        const castToTypeOfTraitValue = getCastingFunction(traitValue);
         return matchingFunction(castToTypeOfTraitValue(this.value), traitValue);
     }
 }

package/flagsmith-engine/segments/util.ts

@@ -27,3 +27,11 @@ export function buildSegmentModel(segmentModelJSON: any): SegmentModel {
 
     return model;
 }
+
+export function isSemver(value: any) {
+    return typeof value == 'string' && value.endsWith(':semver');
+}
+
+export function removeSemverSuffix(value: string) {
+    return value.replace(':semver', '');
+}

package/flagsmith-engine/utils/index.ts

@@ -1,9 +1,13 @@
-export function getCastingFunction(input: any): CallableFunction {
-    switch (typeof input) {
+import { removeSemverSuffix } from "../segments/util";
+
+export function getCastingFunction(traitType: 'boolean' | 'string' | 'number' | 'semver' | any): CallableFunction {
+    switch (traitType) {
         case 'boolean':
             return (x: any) => !['False', 'false'].includes(x);
         case 'number':
             return (x: any) => parseFloat(x);
+        case 'semver':
+            return (x: any) => removeSemverSuffix(x);
         default:
             return (x: any) => String(x);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flagsmith-nodejs",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.2",
   "description": "Flagsmith lets you manage features flags and remote config across web, mobile and server side applications. Deliver true Continuous Integration. Get builds out faster. Control who has access to new features.",
   "main": "build/index.js",
   "repository": {
@@ -46,19 +46,21 @@
     "test:watch": "jest --coverage --watch --coverageReporters='text'",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --coverage --watch --coverageReporters='text'",
     "build": "tsc",
-    "prepublish": "npm run build",
+    "prepublish": "npm i && npm run build",
     "prepare": "husky install"
   },
   "dependencies": {
     "big-integer": "^1.6.51",
     "md5": "^2.3.0",
     "node-fetch": "^2.1.2",
+    "semver": "^7.3.7",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/jest": "^27.4.1",
     "@types/md5": "^2.3.2",
     "@types/node-fetch": "^2.6.1",
+    "@types/semver": "^7.3.9",
     "@types/uuid": "^8.3.4",
     "esbuild": "^0.14.25",
     "husky": "^7.0.4",
@@ -67,4 +69,4 @@
     "ts-jest": "^27.1.3",
     "typescript": "^4.6.2"
   }
-}
+}

package/sdk/index.ts

@@ -14,7 +14,7 @@ import { SegmentModel } from '../flagsmith-engine/segments/models';
 import { getIdentitySegments } from '../flagsmith-engine/segments/evaluators';
 import { FlagsmithCache } from './types';
 
-const DEFAULT_API_URL = 'https://api.flagsmith.com/api/v1/';
+const DEFAULT_API_URL = 'https://edge.api.flagsmith.com/api/v1/';
 
 export class Flagsmith {
     environmentKey?: string;
@@ -269,7 +269,6 @@ export class Flagsmith {
                 headers: headers
             },
             this.retries,
-            1000,
             (this.requestTimeoutSeconds || 10) * 1000
         );
 

package/sdk/utils.ts

@@ -2,8 +2,8 @@ import fetch, { Response } from 'node-fetch';
 // @ts-ignore
 if (typeof fetch.default !== 'undefined') fetch = fetch.default;
 
-export function generateIdentitiesData(identifier: string, traits?: { [key: string]: any }) {
-    const traitsGenerated = Object.entries(traits || {}).map(trait => ({
+export function generateIdentitiesData(identifier: string, traits: { [key: string]: any }) {
+    const traitsGenerated = Object.entries(traits).map(trait => ({
         trait_key: trait[0],
         trait_value: trait[1]
     }));
@@ -18,9 +18,8 @@ export const delay = (ms: number) =>
 
 export const retryFetch = (
     url: string,
-    fetchOptions = {},
+    fetchOptions: any,
     retries = 3,
-    retryDelay = 1000,
     timeout: number
 ): Promise<Response> => {
     return new Promise((resolve, reject) => {
@@ -32,7 +31,7 @@ export const retryFetch = (
                 .then(res => resolve(res))
                 .catch(async err => {
                     if (n > 0) {
-                        await delay(retryDelay);
+                        await delay(1000);
                         wrapper(--n);
                     } else {
                         reject(err);

package/tests/engine/unit/features/models.test.ts

@@ -66,7 +66,7 @@ test('test_feature_state_get_value_mv_values', () => {
         const mvFeatureState = new FeatureStateModel(myFeature, true, 1);
         mvFeatureState.multivariateFeatureStateValues = [
             mvFeatureStateValue1,
-            mvFeatureStateValue2
+            mvFeatureStateValue2,
         ];
 
         mvFeatureState.setValue(mvFeatureControlValue);

package/tests/engine/unit/segments/segments_model.test.ts

@@ -62,6 +62,26 @@ const conditionMatchCases: [string, string | number | boolean, string, boolean][
     [CONDITION_OPERATORS.NOT_CONTAINS, 'bar', 'baz', true],
     [CONDITION_OPERATORS.REGEX, 'foo', '[a-z]+', true],
     [CONDITION_OPERATORS.REGEX, 'FOO', '[a-z]+', false],
+    [CONDITION_OPERATORS.EQUAL, "1.0.0", "1.0.0:semver", true],
+    [CONDITION_OPERATORS.EQUAL, "1.0.0", "1.0.0:semver", true],
+    [CONDITION_OPERATORS.EQUAL, "1.0.0", "1.0.1:semver", false],
+    [CONDITION_OPERATORS.NOT_EQUAL, "1.0.0", "1.0.0:semver", false],
+    [CONDITION_OPERATORS.NOT_EQUAL, "1.0.0", "1.0.1:semver", true],
+    [CONDITION_OPERATORS.GREATER_THAN, "1.0.1", "1.0.0:semver", true],
+    [CONDITION_OPERATORS.GREATER_THAN, "1.0.0", "1.0.0-beta:semver", true],
+    [CONDITION_OPERATORS.GREATER_THAN, "1.0.1", "1.2.0:semver", false],
+    [CONDITION_OPERATORS.GREATER_THAN, "1.0.1", "1.0.1:semver", false],
+    [CONDITION_OPERATORS.GREATER_THAN, "1.2.4", "1.2.3-pre.2+build.4:semver", true],
+    [CONDITION_OPERATORS.LESS_THAN, "1.0.0", "1.0.1:semver", true],
+    [CONDITION_OPERATORS.LESS_THAN, "1.0.0", "1.0.0:semver", false],
+    [CONDITION_OPERATORS.LESS_THAN, "1.0.1", "1.0.0:semver", false],
+    [CONDITION_OPERATORS.LESS_THAN, "1.0.0-rc.2", "1.0.0-rc.3:semver", true],
+    [CONDITION_OPERATORS.GREATER_THAN_INCLUSIVE, "1.0.1", "1.0.0:semver", true],
+    [CONDITION_OPERATORS.GREATER_THAN_INCLUSIVE, "1.0.1", "1.2.0:semver", false],
+    [CONDITION_OPERATORS.GREATER_THAN_INCLUSIVE, "1.0.1", "1.0.1:semver", true],
+    [CONDITION_OPERATORS.LESS_THAN_INCLUSIVE, "1.0.0", "1.0.1:semver", true],
+    [CONDITION_OPERATORS.LESS_THAN_INCLUSIVE, "1.0.0", "1.0.0:semver", true],
+    [CONDITION_OPERATORS.LESS_THAN_INCLUSIVE, "1.0.1", "1.0.0:semver", false],
     ['BAD_OP', 'a', 'a', false]
 ];