@featurevisor/core 0.37.1 → 0.39.0

package/coverage/lcov.info

@@ -47,22 +47,22 @@ end_of_record
 TN:
 SF:lib/traffic.js
 FN:6,detectIfVariationsChanged
-FN:11,(anonymous_1)
+FN:12,(anonymous_1)
 FN:17,(anonymous_2)
-FN:23,getRulePercentageDiff
-FN:32,detectIfRangesChanged
-FN:43,getTraffic
-FN:53,(anonymous_6)
-FN:72,(anonymous_7)
-FN:83,(anonymous_8)
-FN:94,(anonymous_9)
-FN:101,(anonymous_10)
-FN:109,(anonymous_11)
+FN:26,getRulePercentageDiff
+FN:35,detectIfRangesChanged
+FN:46,getTraffic
+FN:56,(anonymous_6)
+FN:75,(anonymous_7)
+FN:86,(anonymous_8)
+FN:98,(anonymous_9)
+FN:105,(anonymous_10)
+FN:114,(anonymous_11)
 FNF:12
 FNH:12
 FNDA:9,detectIfVariationsChanged
-FNDA:16,(anonymous_1)
-FNDA:15,(anonymous_2)
+FNDA:15,(anonymous_1)
+FNDA:16,(anonymous_2)
 FNDA:9,getRulePercentageDiff
 FNDA:9,detectIfRangesChanged
 FNDA:9,getTraffic
@@ -79,100 +79,108 @@ DA:5,1
 DA:8,9
 DA:9,3
 DA:11,6
-DA:12,16
-DA:13,16
-DA:18,15
-DA:19,15
-DA:22,1
-DA:25,9
-DA:26,3
-DA:28,6
-DA:29,6
-DA:31,1
-DA:34,9
-DA:35,3
-DA:37,6
-DA:38,6
-DA:40,0
-DA:42,1
-DA:50,9
-DA:52,9
+DA:13,15
+DA:14,15
+DA:17,6
+DA:18,16
+DA:19,16
+DA:25,1
+DA:28,9
+DA:29,3
+DA:31,6
+DA:32,6
+DA:34,1
+DA:37,9
+DA:38,3
+DA:40,6
+DA:41,6
+DA:43,0
+DA:45,1
 DA:53,9
-DA:54,9
 DA:55,9
-DA:64,9
-DA:65,0
+DA:56,9
+DA:57,9
+DA:58,9
 DA:67,9
 DA:68,0
-DA:71,9
-DA:72,9
-DA:73,9
+DA:70,9
+DA:71,0
 DA:74,9
 DA:75,9
-DA:79,9
-DA:80,9
-DA:82,1
-DA:83,1
-DA:84,2
-DA:85,2
-DA:89,2
-DA:90,2
-DA:92,1
-DA:94,9
-DA:95,22
-DA:96,22
-DA:97,22
+DA:76,9
+DA:77,9
+DA:78,9
+DA:82,9
+DA:83,9
+DA:85,1
+DA:86,1
+DA:87,2
+DA:88,2
+DA:92,2
+DA:93,2
+DA:95,1
+DA:97,9
+DA:98,9
+DA:99,22
 DA:100,22
 DA:101,22
-DA:102,21
-DA:107,22
-DA:109,9
-DA:110,23
-DA:111,0
-DA:113,23
-DA:115,9
-DA:117,9
-DA:119,1
-LF:61
-LH:57
+DA:104,22
+DA:105,22
+DA:106,21
+DA:111,22
+DA:114,9
+DA:115,23
+DA:116,0
+DA:118,23
+DA:120,9
+DA:122,9
+DA:124,1
+LF:63
+LH:59
 BRDA:8,0,0,3
 BRDA:8,0,1,6
-BRDA:25,1,0,3
-BRDA:25,1,1,6
-BRDA:34,2,0,3
-BRDA:34,2,1,6
-BRDA:37,3,0,6
-BRDA:37,3,1,0
-BRDA:52,4,0,0
-BRDA:52,4,1,9
-BRDA:52,5,0,9
-BRDA:52,5,1,0
-BRDA:57,6,0,0
-BRDA:57,6,1,9
-BRDA:64,7,0,0
-BRDA:64,7,1,9
-BRDA:67,8,0,0
-BRDA:67,8,1,9
-BRDA:72,9,0,3
-BRDA:72,9,1,6
-BRDA:72,10,0,9
-BRDA:72,10,1,9
-BRDA:75,11,0,9
+BRDA:8,1,0,9
+BRDA:8,1,1,6
+BRDA:11,2,0,6
+BRDA:11,2,1,0
+BRDA:28,3,0,3
+BRDA:28,3,1,6
+BRDA:37,4,0,3
+BRDA:37,4,1,6
+BRDA:40,5,0,6
+BRDA:40,5,1,0
+BRDA:55,6,0,0
+BRDA:55,6,1,9
+BRDA:55,7,0,9
+BRDA:55,7,1,0
+BRDA:60,8,0,0
+BRDA:60,8,1,9
+BRDA:67,9,0,0
+BRDA:67,9,1,9
+BRDA:70,10,0,0
+BRDA:70,10,1,9
+BRDA:75,11,0,3
 BRDA:75,11,1,6
-BRDA:75,11,2,2
-BRDA:75,11,3,1
-BRDA:80,12,0,1
-BRDA:80,12,1,8
-BRDA:80,13,0,9
-BRDA:80,13,1,6
-BRDA:97,14,0,20
-BRDA:97,14,1,2
-BRDA:110,15,0,0
-BRDA:110,15,1,23
-BRDA:110,16,0,23
-BRDA:110,16,1,23
-BRF:36
-BRH:29
+BRDA:75,12,0,9
+BRDA:75,12,1,9
+BRDA:78,13,0,9
+BRDA:78,13,1,6
+BRDA:78,13,2,2
+BRDA:78,13,3,1
+BRDA:83,14,0,1
+BRDA:83,14,1,8
+BRDA:83,15,0,9
+BRDA:83,15,1,6
+BRDA:97,16,0,9
+BRDA:97,16,1,0
+BRDA:101,17,0,20
+BRDA:101,17,1,2
+BRDA:115,18,0,0
+BRDA:115,18,1,23
+BRDA:115,19,0,23
+BRDA:115,19,1,23
+BRF:42
+BRH:33
 end_of_record
 TN:
 SF:src/allocator.ts
@@ -220,22 +228,22 @@ end_of_record
 TN:
 SF:src/traffic.ts
 FN:6,detectIfVariationsChanged
-FN:16,(anonymous_1)
+FN:15,(anonymous_1)
 FN:20,(anonymous_2)
-FN:24,getRulePercentageDiff
-FN:37,detectIfRangesChanged
-FN:52,getTraffic
-FN:67,(anonymous_6)
-FN:91,(anonymous_7)
-FN:107,(anonymous_8)
-FN:121,(anonymous_9)
-FN:130,(anonymous_10)
-FN:143,(anonymous_11)
+FN:28,getRulePercentageDiff
+FN:41,detectIfRangesChanged
+FN:56,getTraffic
+FN:71,(anonymous_6)
+FN:95,(anonymous_7)
+FN:111,(anonymous_8)
+FN:126,(anonymous_9)
+FN:135,(anonymous_10)
+FN:149,(anonymous_11)
 FNF:12
 FNH:12
 FNDA:9,detectIfVariationsChanged
-FNDA:16,(anonymous_1)
-FNDA:15,(anonymous_2)
+FNDA:15,(anonymous_1)
+FNDA:16,(anonymous_2)
 FNDA:9,getRulePercentageDiff
 FNDA:9,detectIfRangesChanged
 FNDA:9,getTraffic
@@ -251,86 +259,93 @@ DA:6,1
 DA:10,9
 DA:11,3
 DA:14,6
-DA:16,16
-DA:20,15
-DA:24,1
-DA:28,9
-DA:29,3
-DA:32,6
-DA:34,6
-DA:37,1
-DA:41,9
-DA:42,3
-DA:45,6
-DA:46,6
-DA:49,0
-DA:52,1
-DA:61,9
+DA:15,15
+DA:18,6
+DA:20,16
+DA:28,1
+DA:32,9
+DA:33,3
+DA:36,6
+DA:38,6
+DA:41,1
+DA:45,9
+DA:46,3
+DA:49,6
+DA:50,6
+DA:53,0
+DA:56,1
 DA:65,9
-DA:67,9
-DA:68,9
-DA:70,9
-DA:81,9
-DA:82,0
+DA:69,9
+DA:71,9
+DA:72,9
+DA:74,9
 DA:85,9
 DA:86,0
-DA:90,9
-DA:91,9
-DA:92,9
-DA:93,9
+DA:89,9
+DA:90,0
+DA:94,9
+DA:95,9
 DA:96,9
-DA:101,9
-DA:103,9
-DA:105,1
-DA:107,1
-DA:108,2
-DA:113,2
-DA:115,2
-DA:118,1
-DA:121,9
-DA:122,22
-DA:123,22
-DA:125,22
+DA:97,9
+DA:100,9
+DA:105,9
+DA:107,9
+DA:109,1
+DA:111,1
+DA:112,2
+DA:117,2
+DA:119,2
+DA:122,1
+DA:125,9
+DA:126,9
+DA:127,22
 DA:128,22
 DA:130,22
-DA:131,21
-DA:137,22
-DA:143,9
-DA:144,23
-DA:145,0
-DA:148,23
-DA:151,9
-DA:154,9
-LF:56
-LH:52
+DA:133,22
+DA:135,22
+DA:136,21
+DA:142,22
+DA:149,9
+DA:150,23
+DA:151,0
+DA:154,23
+DA:157,9
+DA:160,9
+LF:58
+LH:54
 BRDA:10,0,0,3
-BRDA:28,1,0,3
-BRDA:41,2,0,3
-BRDA:45,3,0,6
-BRDA:65,4,0,0
-BRDA:65,4,1,9
-BRDA:65,5,0,9
-BRDA:65,5,1,0
-BRDA:73,6,0,0
-BRDA:73,6,1,9
-BRDA:81,7,0,0
-BRDA:85,8,0,0
-BRDA:91,9,0,3
-BRDA:91,9,1,6
-BRDA:91,10,0,9
-BRDA:91,10,1,9
-BRDA:96,11,0,9
-BRDA:96,11,1,6
-BRDA:96,11,2,2
-BRDA:96,11,3,1
-BRDA:103,12,0,1
-BRDA:103,13,0,9
-BRDA:103,13,1,6
-BRDA:125,14,0,20
-BRDA:125,14,1,2
-BRDA:144,15,0,0
-BRDA:144,16,0,23
-BRDA:144,16,1,23
-BRF:28
-BRH:22
+BRDA:10,1,0,9
+BRDA:10,1,1,6
+BRDA:14,2,0,6
+BRDA:14,2,1,0
+BRDA:32,3,0,3
+BRDA:45,4,0,3
+BRDA:49,5,0,6
+BRDA:69,6,0,0
+BRDA:69,6,1,9
+BRDA:69,7,0,9
+BRDA:69,7,1,0
+BRDA:77,8,0,0
+BRDA:77,8,1,9
+BRDA:85,9,0,0
+BRDA:89,10,0,0
+BRDA:95,11,0,3
+BRDA:95,11,1,6
+BRDA:95,12,0,9
+BRDA:95,12,1,9
+BRDA:100,13,0,9
+BRDA:100,13,1,6
+BRDA:100,13,2,2
+BRDA:100,13,3,1
+BRDA:107,14,0,1
+BRDA:107,15,0,9
+BRDA:107,15,1,6
+BRDA:125,16,0,9
+BRDA:130,17,0,20
+BRDA:130,17,1,2
+BRDA:150,18,0,0
+BRDA:150,19,0,23
+BRDA:150,19,1,23
+BRF:33
+BRH:26
 end_of_record

package/lib/builder.d.ts

@@ -8,9 +8,17 @@ export interface BuildOptions {
 }
 export declare function getDatafilePath(projectConfig: ProjectConfig, environment: EnvironmentKey, tag: string): string;
 export declare function getExistingStateFilePath(projectConfig: ProjectConfig, environment: EnvironmentKey): string;
-export declare function getFeatureRanges(projectConfig: ProjectConfig): Map<FeatureKey, Range[]>;
+export type FeatureRanges = Map<FeatureKey, Range[]>;
+interface FeatureRangesResult {
+    featureRanges: FeatureRanges;
+    featureIsInGroup: {
+        [key: string]: boolean;
+    };
+}
+export declare function getFeatureRanges(projectConfig: ProjectConfig): FeatureRangesResult;
 export declare function buildDatafile(projectConfig: ProjectConfig, options: BuildOptions, existingState: ExistingState): DatafileContent;
 export interface BuildCLIOptions {
     revision?: string;
 }
 export declare function buildProject(rootDirectoryPath: any, projectConfig: ProjectConfig, cliOptions?: BuildCLIOptions): void;
+export {};

package/lib/builder.js

@@ -29,6 +29,7 @@ function getExistingStateFilePath(projectConfig, environment) {
 exports.getExistingStateFilePath = getExistingStateFilePath;
 function getFeatureRanges(projectConfig) {
     var featureRanges = new Map();
+    var featureIsInGroup = {}; // featureKey => boolean
     var groups = [];
     if (fs.existsSync(projectConfig.groupsDirectoryPath)) {
         var groupFiles = fs
@@ -44,6 +45,9 @@ function getFeatureRanges(projectConfig) {
                 var isFirstSlot = slotIndex === 0;
                 if (slot.feature) {
                     var featureKey = slot.feature;
+                    if (typeof featureKey === "string") {
+                        featureIsInGroup[featureKey] = true;
+                    }
                     var featureRangesForFeature = featureRanges.get(featureKey) || [];
                     var start = isFirstSlot ? accumulatedPercentage : accumulatedPercentage + 1;
                     var end = accumulatedPercentage + slot.percentage * 1000;
@@ -58,7 +62,7 @@ function getFeatureRanges(projectConfig) {
             _loop_1(groupFile);
         }
     }
-    return featureRanges;
+    return { featureRanges: featureRanges, featureIsInGroup: featureIsInGroup };
 }
 exports.getFeatureRanges = getFeatureRanges;
 function buildDatafile(projectConfig, options, existingState) {
@@ -71,7 +75,7 @@ function buildDatafile(projectConfig, options, existingState) {
     };
     var segmentKeysUsedByTag = new Set();
     var attributeKeysUsedByTag = new Set();
-    var featureRanges = getFeatureRanges(projectConfig);
+    var _a = getFeatureRanges(projectConfig), featureRanges = _a.featureRanges, featureIsInGroup = _a.featureIsInGroup;
     // features
     var features = [];
     var featuresDirectory = projectConfig.featuresDirectoryPath;
@@ -91,66 +95,72 @@ function buildDatafile(projectConfig, options, existingState) {
             if (parsedFeature.environments[options.environment].expose === false) {
                 continue;
             }
-            for (var _a = 0, _b = parsedFeature.environments[options.environment].rules; _a < _b.length; _a++) {
-                var parsedRule = _b[_a];
+            for (var _b = 0, _c = parsedFeature.environments[options.environment].rules; _b < _c.length; _b++) {
+                var parsedRule = _c[_b];
                 var extractedSegmentKeys = (0, utils_1.extractSegmentKeysFromGroupSegments)(parsedRule.segments);
                 extractedSegmentKeys.forEach(function (segmentKey) { return segmentKeysUsedByTag.add(segmentKey); });
             }
             var feature = {
                 key: featureKey,
-                defaultVariation: parsedFeature.defaultVariation,
                 bucketBy: parsedFeature.bucketBy || projectConfig.defaultBucketBy,
-                variations: parsedFeature.variations.map(function (variation) {
-                    var mappedVariation = {
-                        value: variation.value,
-                        weight: variation.weight, // @TODO: added so state files can maintain weight info, but datafiles don't need this. find a way to remove it from datafiles later
-                    };
-                    if (!variation.variables) {
-                        return mappedVariation;
-                    }
-                    mappedVariation.variables = variation.variables.map(function (variable) {
-                        var mappedVariable = {
-                            key: variable.key,
-                            value: variable.value,
+                variations: Array.isArray(parsedFeature.variations)
+                    ? parsedFeature.variations.map(function (variation) {
+                        var mappedVariation = {
+                            value: variation.value,
+                            weight: variation.weight, // @TODO: added so state files can maintain weight info, but datafiles don't need this. find a way to remove it from datafiles later
                         };
-                        if (!variable.overrides) {
-                            return mappedVariable;
+                        if (!variation.variables) {
+                            return mappedVariation;
                         }
-                        mappedVariable.overrides = variable.overrides.map(function (override) {
-                            if (typeof override.conditions !== "undefined") {
-                                var extractedAttributeKeys = (0, utils_1.extractAttributeKeysFromConditions)(override.conditions);
-                                extractedAttributeKeys.forEach(function (attributeKey) {
-                                    return attributeKeysUsedByTag.add(attributeKey);
-                                });
-                                return {
-                                    conditions: JSON.stringify(override.conditions),
-                                    value: override.value,
-                                };
-                            }
-                            if (typeof override.segments !== "undefined") {
-                                var extractedSegmentKeys = (0, utils_1.extractSegmentKeysFromGroupSegments)(override.segments);
-                                extractedSegmentKeys.forEach(function (segmentKey) { return segmentKeysUsedByTag.add(segmentKey); });
-                                return {
-                                    segments: JSON.stringify(override.segments),
-                                    value: override.value,
-                                };
+                        mappedVariation.variables = variation.variables.map(function (variable) {
+                            var mappedVariable = {
+                                key: variable.key,
+                                value: variable.value,
+                            };
+                            if (!variable.overrides) {
+                                return mappedVariable;
                             }
-                            return override;
+                            mappedVariable.overrides = variable.overrides.map(function (override) {
+                                if (typeof override.conditions !== "undefined") {
+                                    var extractedAttributeKeys = (0, utils_1.extractAttributeKeysFromConditions)(override.conditions);
+                                    extractedAttributeKeys.forEach(function (attributeKey) {
+                                        return attributeKeysUsedByTag.add(attributeKey);
+                                    });
+                                    return {
+                                        conditions: JSON.stringify(override.conditions),
+                                        value: override.value,
+                                    };
+                                }
+                                if (typeof override.segments !== "undefined") {
+                                    var extractedSegmentKeys = (0, utils_1.extractSegmentKeysFromGroupSegments)(override.segments);
+                                    extractedSegmentKeys.forEach(function (segmentKey) {
+                                        return segmentKeysUsedByTag.add(segmentKey);
+                                    });
+                                    return {
+                                        segments: JSON.stringify(override.segments),
+                                        value: override.value,
+                                    };
+                                }
+                                return override;
+                            });
+                            return mappedVariable;
                         });
-                        return mappedVariable;
-                    });
-                    return mappedVariation;
-                }),
+                        return mappedVariation;
+                    })
+                    : undefined,
                 traffic: (0, traffic_1.getTraffic)(parsedFeature.variations, parsedFeature.environments[options.environment].rules, existingState.features[featureKey], featureRanges.get(featureKey) || []),
+                ranges: featureRanges.get(featureKey) || undefined,
             };
             // update state in memory, so that next datafile build can use it (in case it contains the same feature)
             existingState.features[featureKey] = {
-                variations: feature.variations.map(function (v) {
-                    return {
-                        value: v.value,
-                        weight: v.weight || 0,
-                    };
-                }),
+                variations: Array.isArray(feature.variations)
+                    ? feature.variations.map(function (v) {
+                        return {
+                            value: v.value,
+                            weight: v.weight || 0,
+                        };
+                    })
+                    : undefined,
                 traffic: feature.traffic.map(function (t) {
                     return {
                         key: t.key,
@@ -163,8 +173,10 @@ function buildDatafile(projectConfig, options, existingState) {
                         }),
                     };
                 }),
-                ranges: featureRanges.get(feature.key) || undefined,
             };
+            if (featureIsInGroup[featureKey] === true) {
+                feature.ranges = featureRanges.get(feature.key);
+            }
             if (parsedFeature.variablesSchema) {
                 feature.variablesSchema = parsedFeature.variablesSchema;
             }
@@ -179,8 +191,8 @@ function buildDatafile(projectConfig, options, existingState) {
     var segmentsDirectory = projectConfig.segmentsDirectoryPath;
     if (fs.existsSync(segmentsDirectory)) {
         var segmentFiles = fs.readdirSync(segmentsDirectory).filter(function (f) { return f.endsWith(".yml"); });
-        for (var _c = 0, segmentFiles_1 = segmentFiles; _c < segmentFiles_1.length; _c++) {
-            var segmentFile = segmentFiles_1[_c];
+        for (var _d = 0, segmentFiles_1 = segmentFiles; _d < segmentFiles_1.length; _d++) {
+            var segmentFile = segmentFiles_1[_d];
             var segmentKey = path.basename(segmentFile, ".yml");
             var segmentFilePath = path.join(segmentsDirectory, segmentFile);
             var parsedSegment = (0, utils_1.parseYaml)(fs.readFileSync(segmentFilePath, "utf8"));
@@ -206,8 +218,8 @@ function buildDatafile(projectConfig, options, existingState) {
     var attributesDirectory = projectConfig.attributesDirectoryPath;
     if (fs.existsSync(attributesDirectory)) {
         var attributeFiles = fs.readdirSync(attributesDirectory).filter(function (f) { return f.endsWith(".yml"); });
-        for (var _d = 0, attributeFiles_1 = attributeFiles; _d < attributeFiles_1.length; _d++) {
-            var attributeFile = attributeFiles_1[_d];
+        for (var _e = 0, attributeFiles_1 = attributeFiles; _e < attributeFiles_1.length; _e++) {
+            var attributeFile = attributeFiles_1[_e];
             var attributeKey = path.basename(attributeFile, ".yml");
             var attributeFilePath = path.join(attributesDirectory, attributeFile);
             var parsedAttribute = (0, utils_1.parseYaml)(fs.readFileSync(attributeFilePath, "utf8"));