@featurevisor/core 1.5.1 → 1.6.0

package/lib/linter/testSchema.js

@@ -1,48 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestsJoiSchema = void 0;
-var Joi = require("joi");
-function getTestsJoiSchema(projectConfig, availableFeatureKeys, availableSegmentKeys) {
-    var _a, _b;
-    var segmentTestJoiSchema = Joi.object({
-        segment: (_a = Joi.string())
-            .valid.apply(_a, availableSegmentKeys).required(),
-        assertions: Joi.array().items(Joi.object({
-            matrix: Joi.object().optional(),
-            description: Joi.string().optional(),
-            context: Joi.object(),
-            expectedToMatch: Joi.boolean(),
-        })),
-    });
-    var featureTestJoiSchema = Joi.object({
-        feature: (_b = Joi.string())
-            .valid.apply(_b, availableFeatureKeys).required(),
-        assertions: Joi.array().items(Joi.object({
-            matrix: Joi.object().optional(),
-            description: Joi.string().optional(),
-            at: Joi.alternatives().try(Joi.number().precision(3).min(0).max(100).required(), 
-            // because of supporting matrix
-            Joi.string().required()),
-            environment: Joi.string()
-                .custom(function (value, helpers) {
+exports.getTestsZodSchema = void 0;
+var zod_1 = require("zod");
+function getTestsZodSchema(projectConfig, availableFeatureKeys, availableSegmentKeys) {
+    var segmentTestZodSchema = zod_1.z
+        .object({
+        segment: zod_1.z.string().refine(function (value) { return availableSegmentKeys.includes(value); }, function (value) { return ({
+            message: "Unknown segment \"".concat(value, "\""),
+        }); }),
+        assertions: zod_1.z.array(zod_1.z
+            .object({
+            matrix: zod_1.z.record(zod_1.z.unknown()).optional(),
+            description: zod_1.z.string().optional(),
+            context: zod_1.z.record(zod_1.z.unknown()),
+            expectedToMatch: zod_1.z.boolean(),
+        })
+            .strict()),
+    })
+        .strict();
+    var featureTestZodSchema = zod_1.z
+        .object({
+        feature: zod_1.z.string().refine(function (value) { return availableFeatureKeys.includes(value); }, function (value) { return ({
+            message: "Unknown feature \"".concat(value, "\""),
+        }); }),
+        assertions: zod_1.z.array(zod_1.z
+            .object({
+            matrix: zod_1.z.record(zod_1.z.unknown()).optional(),
+            description: zod_1.z.string().optional(),
+            at: zod_1.z.union([
+                zod_1.z.number().min(0).max(100),
+                // because of supporting matrix
+                zod_1.z.string(),
+            ]),
+            environment: zod_1.z.string().refine(function (value) {
                 if (value.indexOf("${{") === 0) {
                     // allow unknown strings for matrix
-                    return value;
+                    return true;
                 }
                 // otherwise only known environments should be passed
                 if (projectConfig.environments.includes(value)) {
-                    return value;
+                    return true;
                 }
-                return helpers.error("any.invalid");
-            })
-                .required(),
-            context: Joi.object().required(),
-            expectedToBeEnabled: Joi.boolean().required(),
-            expectedVariation: Joi.alternatives().try(Joi.string(), Joi.number(), Joi.boolean()),
-            expectedVariables: Joi.object(),
-        })),
-    });
-    return Joi.alternatives().try(segmentTestJoiSchema, featureTestJoiSchema);
+                return false;
+            }, function (value) { return ({
+                message: "Unknown environment \"".concat(value, "\""),
+            }); }),
+            context: zod_1.z.record(zod_1.z.unknown()),
+            expectedToBeEnabled: zod_1.z.boolean(),
+            expectedVariation: zod_1.z.string().optional(),
+            expectedVariables: zod_1.z.record(zod_1.z.unknown()).optional(),
+        })
+            .strict()),
+    })
+        .strict();
+    return zod_1.z.union([segmentTestZodSchema, featureTestZodSchema]);
 }
-exports.getTestsJoiSchema = getTestsJoiSchema;
+exports.getTestsZodSchema = getTestsZodSchema;
 //# sourceMappingURL=testSchema.js.map

package/lib/linter/testSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"testSchema.js","sourceRoot":"","sources":["../../src/linter/testSchema.ts"],"names":[],"mappings":";;;AAAA,yBAA2B;AAI3B,SAAgB,iBAAiB,CAC/B,aAA4B,EAC5B,oBAA8B,EAC9B,oBAA8B;;IAE9B,IAAM,oBAAoB,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,OAAO,EAAE,CAAA,KAAA,GAAG,CAAC,MAAM,EAAE,CAAA;aAClB,KAAK,WAAI,oBAAoB,EAC7B,QAAQ,EAAE;QACb,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAC3B,GAAG,CAAC,MAAM,CAAC;YACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC/B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACpC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE;YACrB,eAAe,EAAE,GAAG,CAAC,OAAO,EAAE;SAC/B,CAAC,CACH;KACF,CAAC,CAAC;IAEH,IAAM,oBAAoB,GAAG,GAAG,CAAC,MAAM,CAAC;QACtC,OAAO,EAAE,CAAA,KAAA,GAAG,CAAC,MAAM,EAAE,CAAA;aAClB,KAAK,WAAI,oBAAoB,EAC7B,QAAQ,EAAE;QACb,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAC3B,GAAG,CAAC,MAAM,CAAC;YACT,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC/B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACpC,EAAE,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACxB,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;YAEpD,+BAA+B;YAC/B,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CACxB;YACD,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE;iBACtB,MAAM,CAAC,UAAC,KAAK,EAAE,OAAO;gBACrB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBAC9B,mCAAmC;oBACnC,OAAO,KAAK,CAAC;iBACd;gBAED,qDAAqD;gBACrD,IAAI,aAAa,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC9C,OAAO,KAAK,CAAC;iBACd;gBAED,OAAO,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACtC,CAAC,CAAC;iBACD,QAAQ,EAAE;YACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAChC,mBAAmB,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;YAC7C,iBAAiB,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;YACpF,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE;SAChC,CAAC,CACH;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;AAC5E,CAAC;AAzDD,8CAyDC"}
+{"version":3,"file":"testSchema.js","sourceRoot":"","sources":["../../src/linter/testSchema.ts"],"names":[],"mappings":"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"}

package/lib/tester/cliFormat.d.ts

@@ -1,3 +1,4 @@
 export declare const CLI_FORMAT_RED = "\u001B[31m%s\u001B[0m";
 export declare const CLI_FORMAT_GREEN = "\u001B[32m%s\u001B[0m";
 export declare const CLI_FORMAT_BOLD = "\u001B[1m%s\u001B[0m";
+export declare const CLI_FORMAT_UNDERLINE = "\u001B[4m%s\u001B[0m";

package/lib/tester/cliFormat.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLI_FORMAT_BOLD = exports.CLI_FORMAT_GREEN = exports.CLI_FORMAT_RED = void 0;
+exports.CLI_FORMAT_UNDERLINE = exports.CLI_FORMAT_BOLD = exports.CLI_FORMAT_GREEN = exports.CLI_FORMAT_RED = void 0;
 exports.CLI_FORMAT_RED = "\x1b[31m%s\x1b[0m";
 exports.CLI_FORMAT_GREEN = "\x1b[32m%s\x1b[0m";
 exports.CLI_FORMAT_BOLD = "\x1b[1m%s\x1b[0m";
+exports.CLI_FORMAT_UNDERLINE = "\x1b[4m%s\x1b[0m";
 //# sourceMappingURL=cliFormat.js.map

package/lib/tester/cliFormat.js.map

@@ -1 +1 @@
-{"version":3,"file":"cliFormat.js","sourceRoot":"","sources":["../../src/tester/cliFormat.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,mBAAmB,CAAC;AACrC,QAAA,gBAAgB,GAAG,mBAAmB,CAAC;AAEvC,QAAA,eAAe,GAAG,kBAAkB,CAAC"}
+{"version":3,"file":"cliFormat.js","sourceRoot":"","sources":["../../src/tester/cliFormat.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,mBAAmB,CAAC;AACrC,QAAA,gBAAgB,GAAG,mBAAmB,CAAC;AAEvC,QAAA,eAAe,GAAG,kBAAkB,CAAC;AACrC,QAAA,oBAAoB,GAAG,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@featurevisor/core",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Core package of Featurevisor for Node.js usage",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -48,14 +48,14 @@
     "@featurevisor/site": "^1.5.1",
     "@featurevisor/types": "^1.3.0",
     "axios": "^1.3.4",
-    "joi": "^17.8.3",
     "js-yaml": "^4.1.0",
     "mkdirp": "^2.1.3",
-    "tar": "^6.1.13"
+    "tar": "^6.1.13",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.5",
     "@types/tar": "^6.1.4"
   },
-  "gitHead": "1202fddb786e61079771c78f5a4a33dddd11bdfe"
+  "gitHead": "9d9a317843b028cc68ec0ff4ce060fe1404368d8"
 }

package/src/linter/attributeSchema.ts

@@ -1,12 +1,14 @@
-import * as Joi from "joi";
+import { z } from "zod";
 
-export function getAttributeJoiSchema() {
-  const attributeJoiSchema = Joi.object({
-    archived: Joi.boolean(),
-    type: Joi.string().valid("boolean", "string", "integer", "double", "date", "semver").required(),
-    description: Joi.string().required(),
-    capture: Joi.boolean(),
-  });
+export function getAttributeZodSchema() {
+  const attributeZodSchema = z
+    .object({
+      archived: z.boolean().optional(),
+      type: z.enum(["boolean", "string", "integer", "double", "date", "semver"]),
+      description: z.string(),
+      capture: z.boolean().optional(),
+    })
+    .strict();
 
-  return attributeJoiSchema;
+  return attributeZodSchema;
 }

package/src/linter/checkPercentageExceedingSlot.ts

@@ -0,0 +1,41 @@
+import { Group } from "@featurevisor/types";
+
+import { Datasource } from "../datasource";
+
+// @TODO: ideally in future, this check should be done from Feature level,
+// as well as Group level as done here
+export async function checkForFeatureExceedingGroupSlotPercentage(
+  datasource: Datasource,
+  group: Group,
+  availableFeatureKeys: string[],
+) {
+  for (const slot of group.slots) {
+    const maxPercentageForRule = slot.percentage;
+
+    if (slot.feature) {
+      const featureKey = slot.feature;
+      const featureExists = availableFeatureKeys.indexOf(featureKey) > -1;
+
+      if (!featureExists) {
+        throw new Error(`Unknown feature "${featureKey}"`);
+      }
+
+      const parsedFeature = await datasource.readFeature(featureKey);
+
+      const environmentKeys = Object.keys(parsedFeature.environments);
+      for (const environmentKey of environmentKeys) {
+        const environment = parsedFeature.environments[environmentKey];
+        const rules = environment.rules;
+
+        for (const rule of rules) {
+          if (rule.percentage > maxPercentageForRule) {
+            // @TODO: this does not help with same feature belonging to multiple slots. fix that.
+            throw new Error(
+              `Feature ${featureKey}'s rule ${rule.key} in ${environmentKey} has a percentage of ${rule.percentage} which is greater than the maximum percentage of ${maxPercentageForRule} for the slot`,
+            );
+          }
+        }
+      }
+    }
+  }
+}

package/src/linter/conditionSchema.ts

@@ -1,114 +1,137 @@
-import * as Joi from "joi";
+import { z } from "zod";
 
 import { ProjectConfig } from "../config";
 
-export function getConditionsJoiSchema(
+const commonOperators: [string, ...string[]] = ["equals", "notEquals"];
+const numericOperators = ["greaterThan", "greaterThanOrEquals", "lessThan", "lessThanOrEquals"];
+const stringOperators = ["contains", "notContains", "startsWith", "endsWith"];
+const semverOperators = [
+  "semverEquals",
+  "semverNotEquals",
+  "semverGreaterThan",
+  "semverGreaterThanOrEquals",
+  "semverLessThan",
+  "semverLessThanOrEquals",
+];
+const dateOperators = ["before", "after"];
+const arrayOperators = ["in", "notIn"];
+
+export function getConditionsZodSchema(
   projectConfig: ProjectConfig,
-  availableAttributeKeys: string[],
+  availableAttributeKeys: [string, ...string[]],
 ) {
-  const plainConditionJoiSchema = Joi.object({
-    attribute: Joi.string()
-      .valid(...availableAttributeKeys)
-      .required(),
-    operator: Joi.string()
-      .valid(
-        "equals",
-        "notEquals",
+  const plainConditionZodSchema = z
+    .object({
+      attribute: z.string().refine(
+        (value) => availableAttributeKeys.includes(value),
+        (value) => ({
+          message: `Unknown attribute "${value}"`,
+        }),
+      ),
+      operator: z.enum([
+        ...commonOperators,
+        ...numericOperators,
+        ...stringOperators,
+        ...semverOperators,
+        ...dateOperators,
+        ...arrayOperators,
+      ]),
+      value: z.union([
+        z.string(),
+        z.array(z.string()),
+        z.number(),
+        z.boolean(),
+        z.date(),
+        z.null(),
+      ]),
+    })
+    .superRefine((data, context) => {
+      // common
+      if (
+        commonOperators.includes(data.operator) &&
+        !(
+          data.value === null ||
+          typeof data.value === "string" ||
+          typeof data.value === "number" ||
+          typeof data.value === "boolean" ||
+          data.value instanceof Date ||
+          data.value === null
+        )
+      ) {
+        context.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `when operator is "${data.operator}", value has to be either a string, number, boolean, date or null`,
+          path: ["value"],
+        });
+      }
 
-        // numeric
-        "greaterThan",
-        "greaterThanOrEquals",
-        "lessThan",
-        "lessThanOrEquals",
+      // numeric
+      if (numericOperators.includes(data.operator) && typeof data.value !== "number") {
+        context.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `when operator is "${data.operator}", value must be a number`,
+          path: ["value"],
+        });
+      }
 
-        // string
-        "contains",
-        "notContains",
-        "startsWith",
-        "endsWith",
+      // string
+      if (stringOperators.includes(data.operator) && typeof data.value !== "string") {
+        context.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `when operator is "${data.operator}", value must be a string`,
+          path: ["value"],
+        });
+      }
 
-        // semver (string)
-        "semverEquals",
-        "semverNotEquals",
-        "semverGreaterThan",
-        "semverGreaterThanOrEquals",
-        "semverLessThan",
-        "semverLessThanOrEquals",
+      // semver
+      if (semverOperators.includes(data.operator) && typeof data.value !== "string") {
+        context.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `when operator is "${data.operator}", value must be a string`,
+          path: ["value"],
+        });
+      }
 
-        // date comparisons
-        "before",
-        "after",
+      // date
+      if (dateOperators.includes(data.operator) && !(data.value instanceof Date)) {
+        context.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `when operator is "${data.operator}", value must be a date`,
+          path: ["value"],
+        });
+      }
 
-        // array of strings
-        "in",
-        "notIn",
-      )
-      .required(),
-    value: Joi.when("operator", {
-      is: Joi.string().valid("equals", "notEquals"),
-      then: Joi.alternatives()
-        .try(Joi.string(), Joi.number(), Joi.boolean(), Joi.date())
-        .allow(null)
-        .required(),
-    })
-      .when("operator", {
-        is: Joi.string().valid(
-          "greaterThan",
-          "greaterThanOrEquals",
-          "lessThan",
-          "lessThanOrEquals",
-        ),
-        then: Joi.number().required(),
-      })
-      .when("operator", {
-        is: Joi.string().valid("contains", "notContains", "startsWith", "endsWith"),
-        then: Joi.string().required(),
+      // array
+      if (arrayOperators.includes(data.operator) && !Array.isArray(data.value)) {
+        context.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `when operator is "${data.operator}", value must be an array of strings`,
+          path: ["value"],
+        });
+      }
+    });
+
+  const andOrNotConditionZodSchema = z.union([
+    z
+      .object({
+        and: z.array(z.lazy(() => conditionZodSchema)),
       })
-      .when("operator", {
-        is: Joi.string().valid(
-          "semverEquals",
-          "semverNotEquals",
-          "semverGreaterThan",
-          "semverGreaterThanOrEquals",
-          "semverLessThan",
-          "semverLessThanOrEquals",
-        ),
-        then: Joi.string().required(),
+      .strict(),
+    z
+      .object({
+        or: z.array(z.lazy(() => conditionZodSchema)),
       })
-      .when("operator", {
-        is: Joi.string().valid("before", "after"),
-        then: Joi.alternatives(Joi.date(), Joi.string()).required(),
+      .strict(),
+    z
+      .object({
+        not: z.array(z.lazy(() => conditionZodSchema)),
       })
-      .when("operator", {
-        is: Joi.string().valid("in", "notIn"),
-        then: Joi.array().items(Joi.string()).required(),
-      }),
-  });
-
-  const andOrNotConditionJoiSchema = Joi.alternatives()
-    .try(
-      Joi.object({
-        and: Joi.array().items(Joi.link("#andOrNotCondition"), plainConditionJoiSchema),
-      }),
-      Joi.object({
-        or: Joi.array().items(Joi.link("#andOrNotCondition"), plainConditionJoiSchema),
-      }),
-      Joi.object({
-        // @TODO: allow plainConditionJoiSchema as well?
-        not: Joi.array().items(Joi.link("#andOrNotCondition"), plainConditionJoiSchema),
-      }),
-    )
-    .id("andOrNotCondition");
+      .strict(),
+  ]);
 
-  const conditionJoiSchema = Joi.alternatives().try(
-    andOrNotConditionJoiSchema,
-    plainConditionJoiSchema,
-  );
+  const conditionZodSchema = z.union([andOrNotConditionZodSchema, plainConditionZodSchema]);
 
-  const conditionsJoiSchema = Joi.alternatives().try(
-    conditionJoiSchema,
-    Joi.array().items(conditionJoiSchema),
-  );
+  const conditionsZodSchema = z.union([conditionZodSchema, z.array(conditionZodSchema)]);
 
-  return conditionsJoiSchema;
+  return conditionsZodSchema;
 }