Merge pull request #346 from splitio/SDKS-8407_polishing

Large segment refactors

Author: EmilianoSanchez

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "1.16.1-rc.12",
+  "version": "1.17.1-rc.0",
   "description": "Split JavaScript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package.json

@@ -30,6 +30,10 @@ export interface IInSegmentMatcherData {
   segmentName: string
 }
 
+export interface IInLargeSegmentMatcherData {
+  largeSegmentName: string
+}
+
 export interface IDependencyMatcherData {
   split: string,
   treatments: string[]
@@ -43,6 +47,7 @@ interface ISplitMatcherBase {
     attribute: string | null
   }
   userDefinedSegmentMatcherData?: null | IInSegmentMatcherData
+  userDefinedLargeSegmentMatcherData?: null | IInLargeSegmentMatcherData
   whitelistMatcherData?: null | IWhitelistMatcherData
   unaryNumericMatcherData?: null | IUnaryNumericMatcherData
   betweenMatcherData?: null | IBetweenMatcherData
@@ -63,7 +68,7 @@ interface IInSegmentMatcher extends ISplitMatcherBase {
 
 interface IInLargeSegmentMatcher extends ISplitMatcherBase {
   matcherType: 'IN_LARGE_SEGMENT',
-  userDefinedSegmentMatcherData: IInSegmentMatcherData
+  userDefinedLargeSegmentMatcherData: IInLargeSegmentMatcherData
 }
 
 interface IWhitelistMatcher extends ISplitMatcherBase {

src/dtos/types.ts

@@ -4,7 +4,7 @@ import { segmentTransform } from './segment';
 import { whitelistTransform } from './whitelist';
 import { numericTransform } from './unaryNumeric';
 import { zeroSinceHH, zeroSinceSS } from '../convertions';
-import { IBetweenMatcherData, IInSegmentMatcherData, ISplitMatcher, IUnaryNumericMatcherData } from '../../dtos/types';
+import { IBetweenMatcherData, IInLargeSegmentMatcherData, IInSegmentMatcherData, ISplitMatcher, IUnaryNumericMatcherData } from '../../dtos/types';
 import { IMatcherDto } from '../types';
 
 /**
@@ -18,6 +18,7 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
       negate,
       keySelector,
       userDefinedSegmentMatcherData,
+      userDefinedLargeSegmentMatcherData,
       whitelistMatcherData, /* whitelistObject, provided by 'WHITELIST', 'IN_LIST_SEMVER', set and string matchers */
       unaryNumericMatcherData,
       betweenMatcherData,
@@ -33,8 +34,10 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
     let dataType = matcherDataTypes.STRING;
     let value = undefined;
 
-    if (type === matcherTypes.IN_SEGMENT || type === matcherTypes.IN_LARGE_SEGMENT) {
+    if (type === matcherTypes.IN_SEGMENT) {
       value = segmentTransform(userDefinedSegmentMatcherData as IInSegmentMatcherData);
+    } else if (type === matcherTypes.IN_LARGE_SEGMENT) {
+      value = segmentTransform(userDefinedLargeSegmentMatcherData as IInLargeSegmentMatcherData);
     } else if (type === matcherTypes.EQUAL_TO) {
       value = numericTransform(unaryNumericMatcherData as IUnaryNumericMatcherData);
       dataType = matcherDataTypes.NUMBER;

src/evaluator/matchersTransform/index.ts

@@ -1,8 +1,10 @@
-import { IInSegmentMatcherData } from '../../dtos/types';
+import { IInSegmentMatcherData, IInLargeSegmentMatcherData } from '../../dtos/types';
 
 /**
  * Extract segment name as a plain string.
  */
-export function segmentTransform(segment?: IInSegmentMatcherData) {
-  return segment ? segment.segmentName : undefined;
+export function segmentTransform(segment?: IInSegmentMatcherData | IInLargeSegmentMatcherData) {
+  return segment ?
+    (segment as IInSegmentMatcherData).segmentName || (segment as IInLargeSegmentMatcherData).largeSegmentName :
+    undefined;
 }