@featurevisor/core 1.30.1 → 1.32.0

package/lib/tester/testProject.js

@@ -113,7 +113,7 @@ function executeTest(testFile, deps, options, patterns, datafileContentByEnviron
 }
 function testProject(deps_1) {
     return __awaiter(this, arguments, void 0, function (deps, options) {
-        var projectConfig, datasource, hasError, testFiles, startTime, patterns, passedTestsCount, failedTestsCount, passedAssertionsCount, failedAssertionsCount, datafileContentByEnvironment, _i, _a, environment, existingState, datafileContent, _b, testFiles_1, testFile, executionResult, diffInMs, testSpecsMessage, testAssertionsMessage;
+        var projectConfig, datasource, hasError, testFiles, startTime, patterns, passedTestsCount, failedTestsCount, passedAssertionsCount, failedAssertionsCount, datafileContentByEnvironment, _i, _a, environment, existingState, datafileContent, existingState, datafileContent, _b, testFiles_1, testFile, executionResult, diffInMs, testSpecsMessage, testAssertionsMessage;
         if (options === void 0) { options = {}; }
         return __generator(this, function (_c) {
             switch (_c.label) {
@@ -142,7 +142,8 @@ function testProject(deps_1) {
                     failedTestsCount = 0;
                     passedAssertionsCount = 0;
                     failedAssertionsCount = 0;
-                    datafileContentByEnvironment = {};
+                    datafileContentByEnvironment = new Map();
+                    if (!Array.isArray(projectConfig.environments)) return [3 /*break*/, 6];
                     _i = 0, _a = projectConfig.environments;
                     _c.label = 2;
                 case 2:
@@ -159,22 +160,37 @@ function testProject(deps_1) {
                         }, existingState)];
                 case 4:
                     datafileContent = _c.sent();
-                    datafileContentByEnvironment[environment] = datafileContent;
+                    datafileContentByEnvironment.set(environment, datafileContent);
                     _c.label = 5;
                 case 5:
                     _i++;
                     return [3 /*break*/, 2];
                 case 6:
-                    _b = 0, testFiles_1 = testFiles;
-                    _c.label = 7;
+                    if (!(projectConfig.environments === false)) return [3 /*break*/, 9];
+                    return [4 /*yield*/, datasource.readState(false)];
                 case 7:
-                    if (!(_b < testFiles_1.length)) return [3 /*break*/, 10];
+                    existingState = _c.sent();
+                    return [4 /*yield*/, (0, builder_1.buildDatafile)(projectConfig, datasource, {
+                            schemaVersion: options.schemaVersion || config_1.SCHEMA_VERSION,
+                            revision: "include-all-features",
+                            environment: false,
+                            inflate: options.inflate,
+                        }, existingState)];
+                case 8:
+                    datafileContent = _c.sent();
+                    datafileContentByEnvironment.set(false, datafileContent);
+                    _c.label = 9;
+                case 9:
+                    _b = 0, testFiles_1 = testFiles;
+                    _c.label = 10;
+                case 10:
+                    if (!(_b < testFiles_1.length)) return [3 /*break*/, 13];
                     testFile = testFiles_1[_b];
                     return [4 /*yield*/, executeTest(testFile, deps, options, patterns, datafileContentByEnvironment)];
-                case 8:
+                case 11:
                     executionResult = _c.sent();
                     if (!executionResult) {
-                        return [3 /*break*/, 9];
+                        return [3 /*break*/, 12];
                     }
                     if (executionResult.passed) {
                         passedTestsCount += 1;
@@ -185,11 +201,11 @@ function testProject(deps_1) {
                     }
                     passedAssertionsCount += executionResult.assertionsCount.passed;
                     failedAssertionsCount += executionResult.assertionsCount.failed;
-                    _c.label = 9;
-                case 9:
+                    _c.label = 12;
+                case 12:
                     _b++;
-                    return [3 /*break*/, 7];
-                case 10:
+                    return [3 /*break*/, 10];
+                case 13:
                     diffInMs = Date.now() - startTime;
                     if (options.onlyFailures !== true || hasError) {
                         console.log("\n---");

package/lib/tester/testProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"testProject.js","sourceRoot":"","sources":["../../src/tester/testProject.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testProject.js","sourceRoot":"","sources":["../../src/tester/testProject.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@featurevisor/core",
-  "version": "1.30.1",
+  "version": "1.32.0",
   "description": "Core package of Featurevisor for Node.js usage",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -40,9 +40,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@featurevisor/sdk": "1.30.1",
-    "@featurevisor/site": "1.29.2",
-    "@featurevisor/types": "1.29.2",
+    "@featurevisor/sdk": "1.32.0",
+    "@featurevisor/site": "1.32.0",
+    "@featurevisor/types": "1.32.0",
     "axios": "^1.3.4",
     "js-yaml": "^4.1.0",
     "mkdirp": "^2.1.3",
@@ -54,5 +54,5 @@
     "@types/js-yaml": "^4.0.5",
     "@types/tar": "^6.1.4"
   },
-  "gitHead": "8dc524c8a2a2ccb85661177e37ef1aff7cab8273"
+  "gitHead": "c360fac0c91b586847633c2d41cf5e4d6922a9b8"
 }

package/src/assess-distribution/index.ts

@@ -67,7 +67,7 @@ function createContext(providedContext: Context, populateUuid?: AttributeKey[]):
 }
 
 export interface AssessDistributionOptions {
-  environment: string;
+  environment?: string;
   feature: FeatureKey;
   context: Context;
   n: number;
@@ -88,14 +88,14 @@ export async function assessDistribution(deps: Dependencies, options: AssessDist
    */
   const datafileBuildStart = Date.now();
   console.log(`\n\nBuilding datafile containing all features for "${options.environment}"...`);
-  const existingState = await datasource.readState(options.environment);
+  const existingState = await datasource.readState(options.environment || false);
   const datafileContent = await buildDatafile(
     projectConfig,
     datasource,
     {
       schemaVersion: options.schemaVersion || SCHEMA_VERSION,
       revision: "include-all-features",
-      environment: options.environment,
+      environment: options.environment || false,
       inflate: options.inflate,
     },
     existingState,

package/src/benchmark/index.ts

@@ -77,7 +77,7 @@ export function benchmarkFeatureVariable(
 }
 
 export interface BenchmarkOptions {
-  environment: string;
+  environment?: string;
   feature: string;
   n: number;
   context: Record<string, unknown>;
@@ -100,14 +100,14 @@ export async function benchmarkFeature(
 
   console.log(`Building datafile containing all features for "${options.environment}"...`);
   const datafileBuildStart = Date.now();
-  const existingState = await datasource.readState(options.environment);
+  const existingState = await datasource.readState(options.environment || false);
   const datafileContent = await buildDatafile(
     projectConfig,
     datasource,
     {
       schemaVersion: options.schemaVersion || SCHEMA_VERSION,
       revision: "include-all-features",
-      environment: options.environment,
+      environment: options.environment || false,
       inflate: options.inflate,
     },
     existingState,

package/src/builder/buildDatafile.ts

@@ -19,6 +19,9 @@ import {
   FeatureKey,
   Allocation,
   VariableSchema,
+  Expose,
+  Rule,
+  Force,
 } from "@featurevisor/types";
 
 import { ProjectConfig, SCHEMA_VERSION } from "../config";
@@ -66,7 +69,7 @@ export async function getCustomDatafile(options: CustomDatafileOptions): Promise
 export interface BuildOptions {
   schemaVersion: string;
   revision: string;
-  environment: string;
+  environment: string | false;
   tag?: string;
   features?: FeatureKey[];
   inflate?: number;
@@ -112,19 +115,33 @@ export async function buildDatafile(
         continue;
       }
 
-      if (parsedFeature.environments[options.environment].expose === false) {
+      let expose: Expose | undefined;
+      let rules: Rule[];
+      let force: Force[] | undefined;
+
+      if (options.environment && parsedFeature.environments) {
+        expose = parsedFeature.environments[options.environment].expose;
+        rules = parsedFeature.environments[options.environment].rules;
+        force = parsedFeature.environments[options.environment].force;
+      } else {
+        expose = parsedFeature.expose;
+        rules = parsedFeature.rules as Rule[];
+        force = parsedFeature.force;
+      }
+
+      if (expose === false) {
         continue;
       }
 
-      if (Array.isArray(parsedFeature.environments[options.environment].expose)) {
-        const exposeTags = parsedFeature.environments[options.environment].expose as string[];
+      if (Array.isArray(expose)) {
+        const exposeTags = expose;
 
         if (options.tag && exposeTags.indexOf(options.tag) === -1) {
           continue;
         }
       }
 
-      for (const parsedRule of parsedFeature.environments[options.environment].rules) {
+      for (const parsedRule of rules) {
         const extractedSegmentKeys = extractSegmentKeysFromGroupSegments(parsedRule.segments);
         extractedSegmentKeys.forEach((segmentKey) => segmentKeysUsedByTag.add(segmentKey));
       }
@@ -200,7 +217,7 @@ export async function buildDatafile(
           : undefined,
         traffic: getTraffic(
           parsedFeature.variations,
-          parsedFeature.environments[options.environment].rules,
+          rules,
           existingState.features[featureKey],
           featureRanges.get(featureKey) || [],
         ).map((t: Traffic) => {
@@ -253,8 +270,8 @@ export async function buildDatafile(
         });
       }
 
-      if (parsedFeature.environments[options.environment].force) {
-        feature.force = parsedFeature.environments[options.environment].force;
+      if (force) {
+        feature.force = force;
 
         feature.force?.forEach((f) => {
           if (f.segments) {
@@ -395,6 +412,14 @@ export async function buildDatafile(
     }, {});
 
     datafileContentV2.features = features.reduce((acc, feature) => {
+      if (Array.isArray(feature.variablesSchema)) {
+        feature.variablesSchema = feature.variablesSchema.reduce((vAcc, variableSchema) => {
+          vAcc[variableSchema.key] = variableSchema;
+
+          return vAcc;
+        }, {});
+      }
+
       acc[feature.key] = feature;
       return acc;
     }, {});

package/src/builder/buildProject.ts

@@ -1,4 +1,5 @@
-import { SCHEMA_VERSION } from "../config";
+import { SCHEMA_VERSION, ProjectConfig } from "../config";
+import { Datasource } from "../datasource";
 
 import { getNextRevision } from "./revision";
 import { buildDatafile, getCustomDatafile } from "./buildDatafile";
@@ -19,6 +20,58 @@ export interface BuildCLIOptions {
   datafilesDir?: string;
 }
 
+async function buildForEnvironment({
+  projectConfig,
+  datasource,
+  nextRevision,
+  environment,
+  tags,
+  cliOptions,
+}: {
+  projectConfig: ProjectConfig;
+  datasource: Datasource;
+  nextRevision: string;
+  environment: string | false;
+  tags: string[];
+  cliOptions: BuildCLIOptions;
+}) {
+  console.log(`\nBuilding datafiles for environment: ${environment}`);
+
+  const existingState = await datasource.readState(environment);
+
+  for (const tag of tags) {
+    console.log(`\n  => Tag: ${tag}`);
+
+    const datafileContent = await buildDatafile(
+      projectConfig,
+      datasource,
+      {
+        schemaVersion: cliOptions.schemaVersion || SCHEMA_VERSION,
+        revision: nextRevision,
+        environment: environment,
+        tag: tag,
+        inflate: cliOptions.inflate,
+      },
+      existingState,
+    );
+
+    // write datafile for environment/tag
+    await datasource.writeDatafile(datafileContent, {
+      environment,
+      tag,
+      datafilesDir: cliOptions.datafilesDir,
+    });
+  }
+
+  if (typeof cliOptions.stateFiles === "undefined" || cliOptions.stateFiles) {
+    // write state for environment
+    await datasource.writeState(environment, existingState);
+
+    // write revision
+    await datasource.writeRevision(nextRevision);
+  }
+}
+
 export async function buildProject(deps: Dependencies, cliOptions: BuildCLIOptions = {}) {
   const { projectConfig, datasource } = deps;
 
@@ -63,42 +116,30 @@ export async function buildProject(deps: Dependencies, cliOptions: BuildCLIOptio
   const nextRevision =
     (cliOptions.revision && cliOptions.revision.toString()) || getNextRevision(currentRevision);
 
-  for (const environment of environments) {
-    console.log(`\nBuilding datafiles for environment: ${environment}`);
-
-    const existingState = await datasource.readState(environment);
-
-    for (const tag of tags) {
-      console.log(`\n  => Tag: ${tag}`);
-
-      const datafileContent = await buildDatafile(
+  // with environments
+  if (Array.isArray(environments)) {
+    for (const environment of environments) {
+      await buildForEnvironment({
         projectConfig,
         datasource,
-        {
-          schemaVersion: cliOptions.schemaVersion || SCHEMA_VERSION,
-          revision: nextRevision,
-          environment: environment,
-          tag: tag,
-          inflate: cliOptions.inflate,
-        },
-        existingState,
-      );
-
-      // write datafile for environment/tag
-      await datasource.writeDatafile(datafileContent, {
+        nextRevision,
         environment,
-        tag,
-        datafilesDir: cliOptions.datafilesDir,
+        tags,
+        cliOptions,
       });
     }
+  }
 
-    if (typeof cliOptions.stateFiles === "undefined" || cliOptions.stateFiles) {
-      // write state for environment
-      await datasource.writeState(environment, existingState);
-
-      // write revision
-      await datasource.writeRevision(nextRevision);
-    }
+  // no environment
+  if (environments === false) {
+    await buildForEnvironment({
+      projectConfig,
+      datasource,
+      nextRevision,
+      environment: false,
+      tags,
+      cliOptions,
+    });
   }
 
   console.log("\nLatest revision:", nextRevision);

package/src/config/projectConfig.ts

@@ -39,7 +39,7 @@ export interface ProjectConfig {
   outputDirectoryPath: string;
   siteExportDirectoryPath: string;
 
-  environments: string[];
+  environments: string[] | false;
   tags: string[];
 
   adapter: any; // @TODO: type this properly later

package/src/datasource/adapter.ts

@@ -9,7 +9,7 @@ import {
 } from "@featurevisor/types";
 
 export interface DatafileOptions {
-  environment: EnvironmentKey;
+  environment: EnvironmentKey | false;
   tag: string;
   datafilesDir?: string;
 }
@@ -23,8 +23,11 @@ export abstract class Adapter {
   abstract deleteEntity(entityType: EntityType, entityKey: string): Promise<void>;
 
   // state
-  abstract readState(environment: EnvironmentKey): Promise<ExistingState>;
-  abstract writeState(environment: EnvironmentKey, existingState: ExistingState): Promise<void>;
+  abstract readState(environment: EnvironmentKey | false): Promise<ExistingState>;
+  abstract writeState(
+    environment: EnvironmentKey | false,
+    existingState: ExistingState,
+  ): Promise<void>;
 
   // datafile
   abstract readDatafile(options: DatafileOptions): Promise<DatafileContent>;

package/src/datasource/datasource.ts

@@ -35,11 +35,11 @@ export class Datasource {
   /**
    * State
    */
-  readState(environment: EnvironmentKey): Promise<ExistingState> {
+  readState(environment: EnvironmentKey | false): Promise<ExistingState> {
     return this.adapter.readState(environment);
   }
 
-  writeState(environment: EnvironmentKey, existingState: ExistingState) {
+  writeState(environment: EnvironmentKey | false, existingState: ExistingState) {
     return this.adapter.writeState(environment, existingState);
   }
 

package/src/datasource/filesystemAdapter.ts

@@ -23,9 +23,11 @@ const commitRegex = /^commit (\w+)\nAuthor: (.+) <(.+)>\nDate:   (.+)\n\n(.+)/gm
 
 export function getExistingStateFilePath(
   projectConfig: ProjectConfig,
-  environment: EnvironmentKey,
+  environment: EnvironmentKey | false,
 ): string {
-  return path.join(projectConfig.stateDirectoryPath, `existing-state-${environment}.json`);
+  const fileName = environment ? `existing-state-${environment}.json` : `existing-state.json`;
+
+  return path.join(projectConfig.stateDirectoryPath, fileName);
 }
 
 export function getRevisionFilePath(projectConfig: ProjectConfig): string {
@@ -185,7 +187,11 @@ export class FilesystemAdapter extends Adapter {
     const fileName = `datafile-tag-${options.tag}.json`;
     const dir = options.datafilesDir || this.config.outputDirectoryPath;
 
-    return path.join(dir, options.environment, fileName);
+    if (options.environment) {
+      return path.join(dir, options.environment, fileName);
+    }
+
+    return path.join(dir, fileName);
   }
 
   async readDatafile(options: DatafileOptions): Promise<DatafileContent> {
@@ -199,7 +205,9 @@ export class FilesystemAdapter extends Adapter {
   async writeDatafile(datafileContent: DatafileContent, options: DatafileOptions): Promise<void> {
     const dir = options.datafilesDir || this.config.outputDirectoryPath;
 
-    const outputEnvironmentDirPath = path.join(dir, options.environment);
+    const outputEnvironmentDirPath = options.environment
+      ? path.join(dir, options.environment)
+      : dir;
     mkdirp.sync(outputEnvironmentDirPath);
 
     const outputFilePath = this.getDatafilePath(options);

package/src/evaluate/index.ts

@@ -50,7 +50,7 @@ function printHeader(message: string) {
 }
 
 export interface EvaluateOptions {
-  environment: string;
+  environment?: string;
   feature: string;
   context: Record<string, unknown>;
   print?: boolean;
@@ -69,14 +69,14 @@ export interface Log {
 export async function evaluateFeature(deps: Dependencies, options: EvaluateOptions) {
   const { datasource, projectConfig } = deps;
 
-  const existingState = await datasource.readState(options.environment);
+  const existingState = await datasource.readState(options.environment || false);
   const datafileContent = await buildDatafile(
     projectConfig,
     datasource,
     {
       schemaVersion: options.schemaVersion || SCHEMA_VERSION,
       revision: "include-all-features",
-      environment: options.environment,
+      environment: options.environment || false,
       inflate: options.inflate,
     },
     existingState,
@@ -110,17 +110,21 @@ export async function evaluateFeature(deps: Dependencies, options: EvaluateOptio
 
   const feature = f.getFeature(options.feature);
   if (feature?.variablesSchema) {
-    feature.variablesSchema.forEach((v) => {
+    const variableKeys = Array.isArray(feature.variablesSchema)
+      ? feature.variablesSchema
+      : Object.keys(feature.variablesSchema);
+
+    variableKeys.forEach((variableKey) => {
       const variableEvaluation = f.evaluateVariable(
         options.feature,
-        v.key,
+        variableKey,
         options.context as Context,
       );
 
-      variableEvaluationLogs[v.key] = [...logs];
+      variableEvaluationLogs[variableKey] = [...logs];
       logs = [];
 
-      variableEvaluations[v.key] = variableEvaluation;
+      variableEvaluations[variableKey] = variableEvaluation;
     });
   }
 

package/src/find-usage/index.ts

@@ -52,34 +52,70 @@ export async function findAllUsageInFeatures(deps: Dependencies): Promise<UsageI
     }
 
     // variable overrides inside variations
-    projectConfig.environments.forEach((environment) => {
-      if (feature.variations) {
-        feature.variations.forEach((variation) => {
-          if (variation.variables) {
-            variation.variables.forEach((variable) => {
-              if (variable.overrides) {
-                variable.overrides.forEach((override) => {
-                  if (override.segments) {
-                    extractSegmentKeysFromGroupSegments(override.segments).forEach((segmentKey) =>
-                      usageInFeatures[featureKey].segments.add(segmentKey),
-                    );
-                  }
-
-                  if (override.conditions) {
-                    extractAttributeKeysFromConditions(override.conditions).forEach(
-                      (attributeKey) => usageInFeatures[featureKey].attributes.add(attributeKey),
-                    );
-                  }
-                });
-              }
-            });
-          }
-        });
-      }
+    if (feature.variations) {
+      feature.variations.forEach((variation) => {
+        if (variation.variables) {
+          variation.variables.forEach((variable) => {
+            if (variable.overrides) {
+              variable.overrides.forEach((override) => {
+                if (override.segments) {
+                  extractSegmentKeysFromGroupSegments(override.segments).forEach((segmentKey) =>
+                    usageInFeatures[featureKey].segments.add(segmentKey),
+                  );
+                }
+
+                if (override.conditions) {
+                  extractAttributeKeysFromConditions(override.conditions).forEach((attributeKey) =>
+                    usageInFeatures[featureKey].attributes.add(attributeKey),
+                  );
+                }
+              });
+            }
+          });
+        }
+      });
+    }
+
+    // with environments
+    if (Array.isArray(projectConfig.environments)) {
+      projectConfig.environments.forEach((environment) => {
+        if (!feature.environments) {
+          return;
+        }
+
+        // force
+        if (feature.environments[environment].force) {
+          feature.environments[environment].force?.forEach((force) => {
+            if (force.segments) {
+              extractSegmentKeysFromGroupSegments(force.segments).forEach((segmentKey) =>
+                usageInFeatures[featureKey].segments.add(segmentKey),
+              );
+            }
+
+            if (force.conditions) {
+              extractAttributeKeysFromConditions(force.conditions).forEach((attributeKey) =>
+                usageInFeatures[featureKey].attributes.add(attributeKey),
+              );
+            }
+          });
+        }
 
+        // rules
+        if (feature.environments[environment].rules) {
+          feature.environments[environment].rules?.forEach((rule) => {
+            extractSegmentKeysFromGroupSegments(rule.segments).forEach((segmentKey) =>
+              usageInFeatures[featureKey].segments.add(segmentKey),
+            );
+          });
+        }
+      });
+    }
+
+    // no environments
+    if (projectConfig.environments === false) {
       // force
-      if (feature.environments[environment].force) {
-        feature.environments[environment].force?.forEach((force) => {
+      if (feature.force) {
+        feature.force.forEach((force) => {
           if (force.segments) {
             extractSegmentKeysFromGroupSegments(force.segments).forEach((segmentKey) =>
               usageInFeatures[featureKey].segments.add(segmentKey),
@@ -95,14 +131,14 @@ export async function findAllUsageInFeatures(deps: Dependencies): Promise<UsageI
       }
 
       // rules
-      if (feature.environments[environment].rules) {
-        feature.environments[environment].rules?.forEach((rule) => {
+      if (feature.rules) {
+        feature.rules.forEach((rule) => {
           extractSegmentKeysFromGroupSegments(rule.segments).forEach((segmentKey) =>
             usageInFeatures[featureKey].segments.add(segmentKey),
           );
         });
       }
-    });
+    }
   }
 
   return usageInFeatures;