@featurevisor/core 0.22.0 → 0.24.0

package/src/linter.ts

@@ -20,9 +20,14 @@ export function getAttributeJoiSchema(projectConfig: ProjectConfig) {
   return attributeJoiSchema;
 }
 
-export function getConditionsJoiSchema(projectConfig: ProjectConfig) {
+export function getConditionsJoiSchema(
+  projectConfig: ProjectConfig,
+  availableAttributeKeys: string[],
+) {
   const plainConditionJoiSchema = Joi.object({
-    attribute: Joi.string().required(),
+    attribute: Joi.string()
+      .valid(...availableAttributeKeys)
+      .required(),
     operator: Joi.string()
       .valid(
         "equals",
@@ -107,13 +112,13 @@ export function getSegmentJoiSchema(projectConfig: ProjectConfig, conditionsJoiS
   return segmentJoiSchema;
 }
 
-export function getGroupJoiSchema(projectConfig: ProjectConfig) {
+export function getGroupJoiSchema(projectConfig: ProjectConfig, availableFeatureKeys: string[]) {
   const groupJoiSchema = Joi.object({
     description: Joi.string().required(),
     slots: Joi.array()
       .items(
         Joi.object({
-          feature: Joi.string(),
+          feature: Joi.string().valid(...availableFeatureKeys),
           percentage: Joi.number().precision(3).min(0).max(100),
         }),
       )
@@ -161,7 +166,11 @@ export function getGroupJoiSchema(projectConfig: ProjectConfig) {
   return groupJoiSchema;
 }
 
-export function getFeatureJoiSchema(projectConfig: ProjectConfig, conditionsJoiSchema) {
+export function getFeatureJoiSchema(
+  projectConfig: ProjectConfig,
+  conditionsJoiSchema,
+  availableSegmentKeys: string[],
+) {
   const variationValueJoiSchema = Joi.alternatives().try(Joi.string(), Joi.number(), Joi.boolean());
   const variableValueJoiSchema = Joi.alternatives()
     .try(
@@ -187,7 +196,7 @@ export function getFeatureJoiSchema(projectConfig: ProjectConfig, conditionsJoiS
     )
     .allow("");
 
-  const plainGroupSegment = Joi.string();
+  const plainGroupSegment = Joi.string().valid("*", ...availableSegmentKeys);
 
   const andOrNotGroupSegment = Joi.alternatives()
     .try(
@@ -363,6 +372,10 @@ export function printJoiError(e: Joi.ValidationError) {
 export async function lintProject(projectConfig: ProjectConfig): Promise<boolean> {
   let hasError = false;
 
+  const availableAttributeKeys: string[] = [];
+  const availableSegmentKeys: string[] = [];
+  const availableFeatureKeys: string[] = [];
+
   // lint attributes
   console.log("Linting attributes...\n");
   const attributeFilePaths = getYAMLFiles(path.join(projectConfig.attributesDirectoryPath));
@@ -371,6 +384,8 @@ export async function lintProject(projectConfig: ProjectConfig): Promise<boolean
   for (const filePath of attributeFilePaths) {
     const key = path.basename(filePath, ".yml");
     const parsed = parseYaml(fs.readFileSync(filePath, "utf8")) as any;
+    availableAttributeKeys.push(key);
+
     console.log("  =>", key);
 
     try {
@@ -389,12 +404,14 @@ export async function lintProject(projectConfig: ProjectConfig): Promise<boolean
   // lint segments
   console.log("\nLinting segments...\n");
   const segmentFilePaths = getYAMLFiles(path.join(projectConfig.segmentsDirectoryPath));
-  const conditionsJoiSchema = getConditionsJoiSchema(projectConfig);
+  const conditionsJoiSchema = getConditionsJoiSchema(projectConfig, availableAttributeKeys);
   const segmentJoiSchema = getSegmentJoiSchema(projectConfig, conditionsJoiSchema);
 
   for (const filePath of segmentFilePaths) {
     const key = path.basename(filePath, ".yml");
     const parsed = parseYaml(fs.readFileSync(filePath, "utf8")) as any;
+    availableSegmentKeys.push(key);
+
     console.log("  =>", key);
 
     try {
@@ -414,7 +431,7 @@ export async function lintProject(projectConfig: ProjectConfig): Promise<boolean
   console.log("\nLinting groups...\n");
   if (fs.existsSync(projectConfig.groupsDirectoryPath)) {
     const groupFilePaths = getYAMLFiles(path.join(projectConfig.groupsDirectoryPath));
-    const groupJoiSchema = getGroupJoiSchema(projectConfig);
+    const groupJoiSchema = getGroupJoiSchema(projectConfig, availableFeatureKeys);
 
     for (const filePath of groupFilePaths) {
       const key = path.basename(filePath, ".yml");
@@ -440,11 +457,17 @@ export async function lintProject(projectConfig: ProjectConfig): Promise<boolean
   // lint features
   console.log("\nLinting features...\n");
   const featureFilePaths = getYAMLFiles(path.join(projectConfig.featuresDirectoryPath));
-  const featureJoiSchema = getFeatureJoiSchema(projectConfig, conditionsJoiSchema);
+  const featureJoiSchema = getFeatureJoiSchema(
+    projectConfig,
+    conditionsJoiSchema,
+    availableSegmentKeys,
+  );
 
   for (const filePath of featureFilePaths) {
     const key = path.basename(filePath, ".yml");
     const parsed = parseYaml(fs.readFileSync(filePath, "utf8")) as any;
+    availableFeatureKeys.push(key);
+
     console.log("  =>", key);
 
     try {

package/src/traffic.spec.ts

@@ -41,10 +41,7 @@ describe("core: Traffic", function () {
           {
             variation: "on",
             percentage: 80000,
-            range: {
-              start: 0,
-              end: 80000,
-            },
+            range: [0, 80000],
           },
         ],
       },
@@ -87,18 +84,12 @@ describe("core: Traffic", function () {
           {
             variation: "on",
             percentage: 40000,
-            range: {
-              start: 0,
-              end: 40000,
-            },
+            range: [0, 40000],
           },
           {
             variation: "off",
             percentage: 40000,
-            range: {
-              start: 40000,
-              end: 80000,
-            },
+            range: [40000, 80000],
           },
         ],
       },
@@ -145,26 +136,17 @@ describe("core: Traffic", function () {
           {
             variation: "yes",
             percentage: 33330,
-            range: {
-              start: 0,
-              end: 33330,
-            },
+            range: [0, 33330],
           },
           {
             variation: "no",
             percentage: 33330,
-            range: {
-              start: 33330,
-              end: 66660,
-            },
+            range: [33330, 66660],
           },
           {
             variation: "maybe",
             percentage: 33340,
-            range: {
-              start: 66660,
-              end: 100000,
-            },
+            range: [66660, 100000],
           },
         ],
       },
@@ -215,18 +197,12 @@ describe("core: Traffic", function () {
               {
                 variation: "on",
                 percentage: 40000,
-                range: {
-                  start: 0,
-                  end: 40000,
-                },
+                range: [0, 40000],
               },
               {
                 variation: "off",
                 percentage: 40000,
-                range: {
-                  start: 40000,
-                  end: 80000,
-                },
+                range: [40000, 80000],
               },
             ],
           },
@@ -244,36 +220,24 @@ describe("core: Traffic", function () {
           {
             variation: "on",
             percentage: 40000,
-            range: {
-              start: 0,
-              end: 40000,
-            },
+            range: [0, 40000],
           },
           {
             variation: "off",
             percentage: 40000,
-            range: {
-              start: 40000,
-              end: 80000,
-            },
+            range: [40000, 80000],
           },
 
           // new
           {
             variation: "on",
             percentage: 5000,
-            range: {
-              start: 80000,
-              end: 85000,
-            },
+            range: [80000, 85000],
           },
           {
             variation: "off",
             percentage: 5000,
-            range: {
-              start: 85000,
-              end: 90000,
-            },
+            range: [85000, 90000],
           },
         ],
       },
@@ -324,18 +288,12 @@ describe("core: Traffic", function () {
               {
                 variation: "on",
                 percentage: 40000,
-                range: {
-                  start: 0,
-                  end: 40000,
-                },
+                range: [0, 40000],
               },
               {
                 variation: "off",
                 percentage: 40000,
-                range: {
-                  start: 40000,
-                  end: 80000,
-                },
+                range: [40000, 80000],
               },
             ],
           },
@@ -352,18 +310,12 @@ describe("core: Traffic", function () {
           {
             variation: "on",
             percentage: 35000,
-            range: {
-              start: 0,
-              end: 35000,
-            },
+            range: [0, 35000],
           },
           {
             variation: "off",
             percentage: 35000,
-            range: {
-              start: 35000,
-              end: 70000,
-            },
+            range: [35000, 70000],
           },
         ],
       },
@@ -418,18 +370,12 @@ describe("core: Traffic", function () {
               {
                 variation: "a",
                 percentage: 40000,
-                range: {
-                  start: 0,
-                  end: 40000,
-                },
+                range: [0, 40000],
               },
               {
                 variation: "b",
                 percentage: 40000,
-                range: {
-                  start: 40000,
-                  end: 80000,
-                },
+                range: [40000, 80000],
               },
             ],
           },
@@ -446,26 +392,17 @@ describe("core: Traffic", function () {
           {
             variation: "a",
             percentage: 29997,
-            range: {
-              start: 0,
-              end: 29997,
-            },
+            range: [0, 29997],
           },
           {
             variation: "b",
             percentage: 29997,
-            range: {
-              start: 29997,
-              end: 59994,
-            },
+            range: [29997, 59994],
           },
           {
             variation: "c",
             percentage: 30006,
-            range: {
-              start: 59994,
-              end: 90000,
-            },
+            range: [59994, 90000],
           },
         ],
       },
@@ -524,18 +461,12 @@ describe("core: Traffic", function () {
               {
                 variation: "a",
                 percentage: 40000,
-                range: {
-                  start: 0,
-                  end: 40000,
-                },
+                range: [0, 40000],
               },
               {
                 variation: "b",
                 percentage: 40000,
-                range: {
-                  start: 40000,
-                  end: 80000,
-                },
+                range: [40000, 80000],
               },
             ],
           },
@@ -552,34 +483,22 @@ describe("core: Traffic", function () {
           {
             variation: "a",
             percentage: 25000,
-            range: {
-              start: 0,
-              end: 25000,
-            },
+            range: [0, 25000],
           },
           {
             variation: "b",
             percentage: 25000,
-            range: {
-              start: 25000,
-              end: 50000,
-            },
+            range: [25000, 50000],
           },
           {
             variation: "c",
             percentage: 25000,
-            range: {
-              start: 50000,
-              end: 75000,
-            },
+            range: [50000, 75000],
           },
           {
             variation: "d",
             percentage: 25000,
-            range: {
-              start: 75000,
-              end: 100000,
-            },
+            range: [75000, 100000],
           },
         ],
       },
@@ -638,34 +557,22 @@ describe("core: Traffic", function () {
               {
                 variation: "a",
                 percentage: 25000,
-                range: {
-                  start: 0,
-                  end: 25000,
-                },
+                range: [0, 25000],
               },
               {
                 variation: "b",
                 percentage: 25000,
-                range: {
-                  start: 25000,
-                  end: 50000,
-                },
+                range: [25000, 50000],
               },
               {
                 variation: "c",
                 percentage: 25000,
-                range: {
-                  start: 50000,
-                  end: 75000,
-                },
+                range: [50000, 75000],
               },
               {
                 variation: "d",
                 percentage: 25000,
-                range: {
-                  start: 75000,
-                  end: 100000,
-                },
+                range: [75000, 100000],
               },
             ],
           },
@@ -682,18 +589,12 @@ describe("core: Traffic", function () {
           {
             variation: "a",
             percentage: 50000,
-            range: {
-              start: 0,
-              end: 50000,
-            },
+            range: [0, 50000],
           },
           {
             variation: "b",
             percentage: 50000,
-            range: {
-              start: 50000,
-              end: 100000,
-            },
+            range: [50000, 100000],
           },
         ],
       },
@@ -752,34 +653,22 @@ describe("core: Traffic", function () {
               {
                 variation: "a",
                 percentage: 25000,
-                range: {
-                  start: 0,
-                  end: 25000,
-                },
+                range: [0, 25000],
               },
               {
                 variation: "b",
                 percentage: 25000,
-                range: {
-                  start: 25000,
-                  end: 50000,
-                },
+                range: [25000, 50000],
               },
               {
                 variation: "c",
                 percentage: 25000,
-                range: {
-                  start: 50000,
-                  end: 75000,
-                },
+                range: [50000, 75000],
               },
               {
                 variation: "d",
                 percentage: 25000,
-                range: {
-                  start: 75000,
-                  end: 100000,
-                },
+                range: [75000, 100000],
               },
             ],
           },
@@ -796,18 +685,12 @@ describe("core: Traffic", function () {
           {
             variation: "a",
             percentage: 40000,
-            range: {
-              start: 0,
-              end: 40000,
-            },
+            range: [0, 40000],
           },
           {
             variation: "b",
             percentage: 40000,
-            range: {
-              start: 40000,
-              end: 80000,
-            },
+            range: [40000, 80000],
           },
         ],
       },

package/src/traffic.ts

@@ -1,5 +1,13 @@
-import { Rule, ExistingFeature, Traffic, Variation, Range, Percentage } from "@featurevisor/types";
-import { MAX_BUCKETED_NUMBER } from "@featurevisor/sdk";
+import {
+  Rule,
+  ExistingFeature,
+  Traffic,
+  Variation,
+  Range,
+  Percentage,
+  RangeTuple,
+} from "@featurevisor/types";
+import { MAX_BUCKETED_NUMBER, getStartEndFromRange } from "@featurevisor/sdk";
 
 import { getAllocation, getUpdatedAvailableRangesAfterFilling } from "./allocator";
 
@@ -62,7 +70,7 @@ export function getTraffic(
 
   // @TODO: may be pass from builder directly?
   const availableRanges =
-    ranges && ranges.length > 0 ? ranges : [{ start: 0, end: MAX_BUCKETED_NUMBER }];
+    ranges && ranges.length > 0 ? ranges : ([[0, MAX_BUCKETED_NUMBER]] as RangeTuple[]);
 
   parsedRules.forEach(function (parsedRule) {
     const rulePercentage = parsedRule.percentage; // 0 - 100
@@ -113,10 +121,7 @@ export function getTraffic(
         const result = {
           variation,
           percentage, // @TODO remove it in next breaking semver
-          range: range || {
-            start: lastEnd,
-            end: percentage,
-          },
+          range: range ? getStartEndFromRange(range) : ([lastEnd, percentage] as RangeTuple),
         };
 
         existingSum += percentage || 0;