@featurevisor/core 2.13.0 → 2.15.0

package/lib/utils/git.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommit = getCommit;
 const path = require("path");
+function isWithinDirectory(directoryPath, fileDirectoryPath) {
+    return (fileDirectoryPath === directoryPath || fileDirectoryPath.startsWith(directoryPath + path.sep));
+}
 function parseGitCommitShowOutput(gitShowOutput) {
     const result = {
         hash: "",
@@ -72,22 +75,26 @@ function getCommit(gitShowOutput, options) {
         const relativeDir = path.dirname(absolutePath);
         // get entity type
         let type = "attribute";
-        if (relativeDir === projectConfig.attributesDirectoryPath) {
+        if (isWithinDirectory(projectConfig.attributesDirectoryPath, relativeDir)) {
             type = "attribute";
         }
-        else if (relativeDir === projectConfig.segmentsDirectoryPath) {
+        else if (isWithinDirectory(projectConfig.segmentsDirectoryPath, relativeDir)) {
             type = "segment";
         }
-        else if (relativeDir === projectConfig.featuresDirectoryPath) {
+        else if (isWithinDirectory(projectConfig.featuresDirectoryPath, relativeDir)) {
+            type = "feature";
+        }
+        else if (projectConfig.splitByEnvironment &&
+            isWithinDirectory(projectConfig.environmentsDirectoryPath, relativeDir)) {
             type = "feature";
         }
-        else if (relativeDir === projectConfig.groupsDirectoryPath) {
+        else if (isWithinDirectory(projectConfig.groupsDirectoryPath, relativeDir)) {
             type = "group";
         }
-        else if (relativeDir === projectConfig.schemasDirectoryPath) {
+        else if (isWithinDirectory(projectConfig.schemasDirectoryPath, relativeDir)) {
             type = "schema";
         }
-        else if (relativeDir === projectConfig.testsDirectoryPath) {
+        else if (isWithinDirectory(projectConfig.testsDirectoryPath, relativeDir)) {
             type = "test";
         }
         else {
@@ -101,7 +108,25 @@ function getCommit(gitShowOutput, options) {
             // unknown extension
             return;
         }
-        const key = fileName.replace(extensionWithDot, "");
+        let key = fileName.replace(extensionWithDot, "");
+        if (type === "feature" &&
+            projectConfig.splitByEnvironment &&
+            absolutePath.startsWith(projectConfig.environmentsDirectoryPath + path.sep)) {
+            const featureRelativePath = absolutePath
+                .replace(projectConfig.environmentsDirectoryPath + path.sep, "")
+                .split(path.sep)
+                .slice(1)
+                .join(path.sep)
+                .replace(extensionWithDot, "");
+            key = featureRelativePath.replace(/\\/g, "/");
+        }
+        else if (type === "feature" &&
+            absolutePath.startsWith(projectConfig.featuresDirectoryPath + path.sep)) {
+            key = absolutePath
+                .replace(projectConfig.featuresDirectoryPath + path.sep, "")
+                .replace(extensionWithDot, "")
+                .replace(/\\/g, "/");
+        }
         const entityDiff = {
             type,
             key,

package/lib/utils/git.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@featurevisor/core",
-  "version": "2.13.0",
+  "version": "2.15.0",
   "description": "Core package of Featurevisor for Node.js usage",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -49,5 +49,5 @@
     "yargs": "^17.7.2",
     "zod": "^3.22.4"
   },
-  "gitHead": "7f6fadd9c233f676f7439613544bef08520a4e36"
+  "gitHead": "5d3bb98dcc4f3570d5fc43413b095e753f5bcd59"
 }

package/src/builder/buildDatafile.ts

@@ -30,6 +30,10 @@ import { generateHashForDatafile, generateHashForFeature, getSegmentHashes } fro
 import { getTraffic } from "./traffic";
 import { getFeatureRanges } from "./getFeatureRanges";
 import { convertToV1 } from "./convertToV1";
+import {
+  resolveMutationsForMultipleVariables,
+  resolveMutationsForSingleVariable,
+} from "./mutateVariables";
 
 export interface CustomDatafileOptions {
   featureKey?: string;
@@ -210,7 +214,10 @@ export async function buildDatafile(
               const mappedVariation: any = {
                 value: variation.value,
                 weight: variation.weight, // @NOTE: added so state files can maintain weight info, but datafiles don't need this. find a way to remove it from datafiles later
-                variables: variation.variables,
+                variables: resolveMutationsForMultipleVariables(
+                  parsedFeature.variablesSchema,
+                  variation.variables,
+                ),
                 variableOverrides: variation.variableOverrides,
               };
 
@@ -235,7 +242,11 @@ export async function buildDatafile(
                           projectConfig.stringify && typeof override.conditions !== "string"
                             ? JSON.stringify(override.conditions)
                             : override.conditions,
-                        value: override.value,
+                        value: resolveMutationsForSingleVariable(
+                          parsedFeature.variablesSchema,
+                          variableKey,
+                          override.value,
+                        ),
                       };
                     }
 
@@ -252,7 +263,11 @@ export async function buildDatafile(
                           projectConfig.stringify && typeof override.segments !== "string"
                             ? JSON.stringify(override.segments)
                             : override.segments,
-                        value: override.value,
+                        value: resolveMutationsForSingleVariable(
+                          parsedFeature.variablesSchema,
+                          variableKey,
+                          override.value,
+                        ),
                       };
                     }
 
@@ -272,6 +287,10 @@ export async function buildDatafile(
         ).map((t: Traffic) => {
           return {
             ...t,
+            variables: resolveMutationsForMultipleVariables(
+              parsedFeature.variablesSchema,
+              t.variables,
+            ),
             segments:
               typeof t.segments !== "string" && projectConfig.stringify
                 ? JSON.stringify(t.segments)
@@ -352,6 +371,13 @@ export async function buildDatafile(
                 : f.conditions;
           }
 
+          if (f.variables) {
+            f.variables = resolveMutationsForMultipleVariables(
+              parsedFeature.variablesSchema,
+              f.variables,
+            );
+          }
+
           return f;
         });
       }