@splitsoftware/splitio-commons 3.1.1-rc.1 → 3.1.1-rc.2

package/cjs/evaluator/index.js

@@ -25,6 +25,12 @@ function treatmentsException(definitionNames) {
     });
     return evaluations;
 }
+function setEvaluationDataFromDefinition(evaluation, definition) {
+    return (0, objectAssign_1.objectAssign)(evaluation, {
+        definition: definition,
+        config: definition.configurations && definition.configurations[evaluation.treatment] || null
+    });
+}
 function evaluateFeature(log, key, definitionName, attributes, storage) {
     var definition;
     try {
@@ -98,8 +104,8 @@ function getEvaluation(log, key, definition, attributes, storage) {
         var split = (0, Engine_1.engineParser)(log, definition, storage);
         var evaluation = split.getTreatment(key, attributes, evaluateFeature);
         return (0, thenable_1.thenable)(evaluation) ?
-            evaluation.then(function (result) { return (0, objectAssign_1.objectAssign)(result, { definition: definition }); }) :
-            (0, objectAssign_1.objectAssign)(evaluation, { definition: definition });
+            evaluation.then(function (result) { return setEvaluationDataFromDefinition(result, definition); }) :
+            setEvaluationDataFromDefinition(evaluation, definition);
     }
     return EVALUATION_DEFINITION_NOT_FOUND;
 }
@@ -131,11 +137,10 @@ function evaluateDefaultTreatment(definitionName, storage) {
 exports.evaluateDefaultTreatment = evaluateDefaultTreatment;
 function getDefaultTreatment(definition) {
     if (definition) {
-        return {
+        return setEvaluationDataFromDefinition({
             treatment: definition.defaultTreatment,
-            label: labels_1.NO_CONDITION_MATCH,
-            definition: definition,
-        };
+            label: labels_1.NO_CONDITION_MATCH, // "default rule"
+        }, definition);
     }
     return EVALUATION_DEFINITION_NOT_FOUND;
 }

package/cjs/sdkClient/client.js

@@ -112,13 +112,11 @@ function clientFactory(params) {
     }
     // Internal function
     function processEvaluation(evaluation, featureFlagName, key, withConfig, invokingMethodName, queue, options) {
-        var _a;
         if (options === void 0) { options = {}; }
         var matchingKey = (0, key_1.getMatching)(key);
         var bucketingKey = (0, key_1.getBucketing)(key);
         var definition = evaluation.definition;
-        var treatment = evaluation.treatment, label = evaluation.label;
-        var config = ((_a = definition === null || definition === void 0 ? void 0 : definition.configurations) === null || _a === void 0 ? void 0 : _a[treatment]) || null;
+        var treatment = evaluation.treatment, label = evaluation.label, _a = evaluation.config, config = _a === void 0 ? null : _a;
         if (treatment === constants_1.CONTROL) {
             var fallbackTreatment = fallbackCalculator(featureFlagName, label);
             treatment = fallbackTreatment.treatment;

package/esm/evaluator/index.js

@@ -22,6 +22,12 @@ function treatmentsException(definitionNames) {
     });
     return evaluations;
 }
+function setEvaluationDataFromDefinition(evaluation, definition) {
+    return objectAssign(evaluation, {
+        definition: definition,
+        config: definition.configurations && definition.configurations[evaluation.treatment] || null
+    });
+}
 export function evaluateFeature(log, key, definitionName, attributes, storage) {
     var definition;
     try {
@@ -92,8 +98,8 @@ function getEvaluation(log, key, definition, attributes, storage) {
         var split = engineParser(log, definition, storage);
         var evaluation = split.getTreatment(key, attributes, evaluateFeature);
         return thenable(evaluation) ?
-            evaluation.then(function (result) { return objectAssign(result, { definition: definition }); }) :
-            objectAssign(evaluation, { definition: definition });
+            evaluation.then(function (result) { return setEvaluationDataFromDefinition(result, definition); }) :
+            setEvaluationDataFromDefinition(evaluation, definition);
     }
     return EVALUATION_DEFINITION_NOT_FOUND;
 }
@@ -124,11 +130,10 @@ export function evaluateDefaultTreatment(definitionName, storage) {
 }
 function getDefaultTreatment(definition) {
     if (definition) {
-        return {
+        return setEvaluationDataFromDefinition({
             treatment: definition.defaultTreatment,
-            label: NO_CONDITION_MATCH,
-            definition: definition,
-        };
+            label: NO_CONDITION_MATCH, // "default rule"
+        }, definition);
     }
     return EVALUATION_DEFINITION_NOT_FOUND;
 }

package/esm/sdkClient/client.js

@@ -108,13 +108,11 @@ export function clientFactory(params) {
     }
     // Internal function
     function processEvaluation(evaluation, featureFlagName, key, withConfig, invokingMethodName, queue, options) {
-        var _a;
         if (options === void 0) { options = {}; }
         var matchingKey = getMatching(key);
         var bucketingKey = getBucketing(key);
         var definition = evaluation.definition;
-        var treatment = evaluation.treatment, label = evaluation.label;
-        var config = ((_a = definition === null || definition === void 0 ? void 0 : definition.configurations) === null || _a === void 0 ? void 0 : _a[treatment]) || null;
+        var treatment = evaluation.treatment, label = evaluation.label, _a = evaluation.config, config = _a === void 0 ? null : _a;
         if (treatment === CONTROL) {
             var fallbackTreatment = fallbackCalculator(featureFlagName, label);
             treatment = fallbackTreatment.treatment;

package/package.json

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

package/src/evaluator/index.ts

@@ -31,6 +31,13 @@ function treatmentsException(definitionNames: string[]) {
   return evaluations;
 }
 
+function setEvaluationDataFromDefinition(evaluation: IEvaluation, definition: IDefinition): IEvaluation {
+  return objectAssign(evaluation, {
+    definition,
+    config: definition.configurations && definition.configurations[evaluation.treatment] || null
+  });
+}
+
 export function evaluateFeature(
   log: ILogger,
   key: SplitIO.SplitKey,
@@ -137,8 +144,8 @@ function getEvaluation(
     const evaluation = split.getTreatment(key, attributes, evaluateFeature);
 
     return thenable(evaluation) ?
-      evaluation.then(result => objectAssign(result, { definition })) :
-      objectAssign(evaluation, { definition });
+      evaluation.then(result => setEvaluationDataFromDefinition(result, definition)) :
+      setEvaluationDataFromDefinition(evaluation, definition);
   }
 
   return EVALUATION_DEFINITION_NOT_FOUND;
@@ -187,11 +194,10 @@ function getDefaultTreatment(
   definition: IDefinition | null,
 ): MaybeThenable<IEvaluation> {
   if (definition) {
-    return {
+    return setEvaluationDataFromDefinition({
       treatment: definition.defaultTreatment,
       label: NO_CONDITION_MATCH, // "default rule"
-      definition,
-    };
+    }, definition);
   }
 
   return EVALUATION_DEFINITION_NOT_FOUND;

package/src/evaluator/types.ts

@@ -22,6 +22,7 @@ export interface IEvaluation {
   treatment: string,
   label: string,
   definition?: IDefinition
+  config?: string | null | SplitIO.JsonObject
 }
 
 export type IDefinitionEvaluator = (log: ILogger, key: SplitIO.SplitKey, definitionName: string, attributes: SplitIO.Attributes | undefined, storage: IStorageSync | IStorageAsync) => MaybeThenable<IEvaluation>

package/src/sdkClient/client.ts

@@ -142,8 +142,7 @@ export function clientFactory(params: ISdkFactoryContext): SplitIO.IClient | Spl
     const bucketingKey = getBucketing(key);
 
     const { definition } = evaluation;
-    let { treatment, label } = evaluation;
-    let config = definition?.configurations?.[treatment] || null;
+    let { treatment, label, config = null } = evaluation;
 
     if (treatment === CONTROL) {
       const fallbackTreatment = fallbackCalculator(featureFlagName, label);