flagsmith-nodejs 2.3.0 → 2.4.1

package/examples/local-evaluation/package.json

@@ -39,7 +39,7 @@
   "bugs": "https://github.com/vferdiansyah/nodejs-es6-boilerplate/issues",
   "homepage": "https://github.com/vferdiansyah/nodejs-es6-boilerplate#readme",
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
+    "@babel/cli": "^7.18.10",
     "@babel/core": "^7.5.5",
     "@babel/preset-env": "^7.5.5",
     "eslint": "^6.2.1",

package/flagsmith-engine/segments/constants.ts

@@ -16,6 +16,9 @@ export const NOT_CONTAINS = 'NOT_CONTAINS';
 export const NOT_EQUAL = 'NOT_EQUAL';
 export const REGEX = 'REGEX';
 export const PERCENTAGE_SPLIT = 'PERCENTAGE_SPLIT';
+export const IS_SET = 'IS_SET';
+export const IS_NOT_SET = 'IS_NOT_SET';
+export const MODULO = 'MODULO';
 
 export const CONDITION_OPERATORS = {
     EQUAL,
@@ -27,5 +30,8 @@ export const CONDITION_OPERATORS = {
     NOT_CONTAINS,
     NOT_EQUAL,
     REGEX,
-    PERCENTAGE_SPLIT
+    PERCENTAGE_SPLIT,
+    IS_SET,
+    IS_NOT_SET,
+    MODULO
 };

package/flagsmith-engine/segments/evaluators.ts

@@ -2,7 +2,7 @@ import { EnvironmentModel } from '../environments/models';
 import { IdentityModel } from '../identities/models';
 import { TraitModel } from '../identities/traits/models';
 import { getHashedPercentateForObjIds } from '../utils/hashing';
-import { PERCENTAGE_SPLIT } from './constants';
+import { PERCENTAGE_SPLIT, IS_SET, IS_NOT_SET } from './constants';
 import { SegmentConditionModel, SegmentModel, SegmentRuleModel } from './models';
 
 export function getIdentitySegments(
@@ -55,18 +55,22 @@ function traitsMatchSegmentRule(
     );
 }
 
-function traitsMatchSegmentCondition(
+export function traitsMatchSegmentCondition(
     identityTraits: TraitModel[],
     condition: SegmentConditionModel,
     segmentId: number | string,
     identityId: number | string
 ): boolean {
     if (condition.operator == PERCENTAGE_SPLIT) {
-        return getHashedPercentateForObjIds([segmentId, identityId]) <= parseFloat(condition.value);
+        return getHashedPercentateForObjIds([segmentId, identityId]) <= parseFloat(String(condition.value));
     }
-
     const traits = identityTraits.filter(t => t.traitKey === condition.property_);
     const trait = traits.length > 0 ? traits[0] : undefined;
-
+    if (condition.operator === IS_SET ) {
+        return !!trait;
+    } else if (condition.operator === IS_NOT_SET){
+        return trait == undefined;
+    }
     return trait ? condition.matchesTraitValue(trait.traitValue) : false;
-}
+
+}

package/flagsmith-engine/segments/models.ts

@@ -8,6 +8,7 @@ import {
     NONE_RULE,
     NOT_CONTAINS,
     REGEX,
+    MODULO,
     CONDITION_OPERATORS
 } from './constants';
 import { isSemver } from './util';
@@ -44,14 +45,15 @@ export const getMatchingFunctions = (semver: boolean) => (semver ? semverMatchin
 export class SegmentConditionModel {
     EXCEPTION_OPERATOR_METHODS: { [key: string]: string } = {
         [NOT_CONTAINS]: 'evaluateNotContains',
-        [REGEX]: 'evaluateRegex'
+        [REGEX]: 'evaluateRegex',
+        [MODULO]: 'evaluateModulo',
     };
 
     operator: string;
-    value: string;
-    property_: string | undefined;
+    value: string | null | undefined;
+    property_: string | null | undefined;
 
-    constructor(operator: string, value: string, property?: string) {
+    constructor(operator: string, value?: string | null | undefined, property?: string | null | undefined) {
         this.operator = operator;
         this.value = value;
         this.property_ = property;
@@ -63,7 +65,15 @@ export class SegmentConditionModel {
                 return !traitValue.includes(this.value);
             },
             evaluateRegex: (traitValue: any) => {
-                return !!traitValue.match(new RegExp(this.value));
+                return !!this.value && !!traitValue.match(new RegExp(this.value));
+            },
+            evaluateModulo: (traitValue: any) => {
+                if (isNaN(parseFloat(traitValue)) || !this.value) {
+                    return false
+                }
+                const parts = (this.value).split("|");
+                const [divisor, reminder] = [parseFloat(parts[0]), parseFloat(parts[1])];
+                return traitValue % divisor === reminder
             }
         };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flagsmith-nodejs",
-  "version": "2.3.0",
+  "version": "2.4.1",
   "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": {

package/sdk/index.ts

@@ -323,7 +323,8 @@ export class Flagsmith {
         const flags = Flags.fromFeatureStateModels({
             featureStates: featureStates,
             analyticsProcessor: this.analyticsProcessor,
-            defaultFlagHandler: this.defaultFlagHandler
+            defaultFlagHandler: this.defaultFlagHandler,
+            identityID: identityModel.djangoID || identityModel.identityUuid
         });
 
         if (!!this.cache) {