@featurevisor/core 2.5.0 → 2.6.0

package/lib/tester/testProject.js

@@ -12,7 +12,7 @@ const printTestResult_1 = require("./printTestResult");
 const builder_1 = require("../builder");
 const config_1 = require("../config");
 const list_1 = require("../list");
-async function executeTest(test, deps, options, datafileContentByEnvironment) {
+async function executeTest(test, deps, options, datafileContentByKey) {
     const { datasource, projectConfig, rootDirectoryPath } = deps;
     const extension = datasource.getExtension();
     const relativeTestFilePath = test.key + (extension ? `.${extension}` : "");
@@ -37,7 +37,7 @@ async function executeTest(test, deps, options, datafileContentByEnvironment) {
         testResult = await (0, testSegment_1.testSegment)(datasource, tAsSegment, options);
     }
     else {
-        testResult = await (0, testFeature_1.testFeature)(datasource, projectConfig, tAsFeature, options, datafileContentByEnvironment);
+        testResult = await (0, testFeature_1.testFeature)(datasource, projectConfig, tAsFeature, options, datafileContentByKey);
     }
     if (!options.onlyFailures) {
         // show all
@@ -73,7 +73,7 @@ async function testProject(deps, testOptions = {}) {
     let failedTestsCount = 0;
     let passedAssertionsCount = 0;
     let failedAssertionsCount = 0;
-    const datafileContentByEnvironment = new Map();
+    const datafileContentByKey = new Map();
     // with environments
     if (Array.isArray(projectConfig.environments)) {
         for (const environment of projectConfig.environments) {
@@ -84,7 +84,24 @@ async function testProject(deps, testOptions = {}) {
                 environment: environment,
                 inflate: options.inflate,
             }, existingState);
-            datafileContentByEnvironment.set(environment, datafileContent);
+            datafileContentByKey.set(environment, datafileContent);
+            // by scope
+            if (projectConfig.scopes && options.withScopes) {
+                for (const scope of projectConfig.scopes) {
+                    const existingState = await datasource.readState(environment);
+                    const datafileContent = await (0, builder_1.buildDatafile)(projectConfig, datasource, {
+                        schemaVersion: options.schemaVersion || config_1.SCHEMA_VERSION,
+                        revision: "include-scoped-features",
+                        environment: environment,
+                        inflate: options.inflate,
+                        tag: scope.tag,
+                        tags: scope.tags,
+                    }, existingState);
+                    const scopedDatafileContent = (0, builder_1.buildScopedDatafile)(datafileContent, scope.context);
+                    datafileContentByKey.set(`${environment}-scope-${scope.name}`, scopedDatafileContent);
+                }
+            }
+            // @TODO: by tag
         }
     }
     // no environments
@@ -96,7 +113,24 @@ async function testProject(deps, testOptions = {}) {
             environment: false,
             inflate: options.inflate,
         }, existingState);
-        datafileContentByEnvironment.set(false, datafileContent);
+        datafileContentByKey.set(false, datafileContent);
+        // by scope
+        if (projectConfig.scopes && options.withScopes) {
+            for (const scope of projectConfig.scopes) {
+                const existingState = await datasource.readState(false);
+                const datafileContent = await (0, builder_1.buildDatafile)(projectConfig, datasource, {
+                    schemaVersion: options.schemaVersion || config_1.SCHEMA_VERSION,
+                    revision: "include-scoped-features",
+                    environment: false,
+                    inflate: options.inflate,
+                    tag: scope.tag,
+                    tags: scope.tags,
+                }, existingState);
+                const scopedDatafileContent = (0, builder_1.buildScopedDatafile)(datafileContent, scope.context);
+                datafileContentByKey.set(`scope-${scope.name}`, scopedDatafileContent);
+            }
+        }
+        // @TODO: by tag
     }
     const tests = await (0, list_1.listEntities)({
         rootDirectoryPath,
@@ -108,7 +142,7 @@ async function testProject(deps, testOptions = {}) {
         },
     }, "test");
     for (const test of tests) {
-        const executionResult = await executeTest(test, deps, options, datafileContentByEnvironment);
+        const executionResult = await executeTest(test, deps, options, datafileContentByKey);
         if (!executionResult) {
             continue;
         }

package/lib/tester/testProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"testProject.js","sourceRoot":"","sources":["../../src/tester/testProject.ts"],"names":[],"mappings":";;;AAoCA,kCAiEC;AAED,kCAkHC;AAzND,yBAAyB;AAIzB,+CAA4C;AAC5C,+CAA4C;AAC5C,2CAAgF;AAEhF,qDAAkD;AAClD,uDAAoD;AAEpD,wCAA2C;AAC3C,sCAA2C;AAE3C,kCAAuC;AAsBhC,KAAK,UAAU,WAAW,CAC/B,IAAU,EACV,IAAkB,EAClB,OAA2B,EAC3B,4BAA0D;IAE1D,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAE9D,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC;IAC5C,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE3E,MAAM,UAAU,GAAG,IAAmB,CAAC;IACvC,MAAM,UAAU,GAAG,IAAmB,CAAC;IACvC,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IACrD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAExD,MAAM,eAAe,GAAoB;QACvC,MAAM,EAAE,IAAI;QACZ,eAAe,EAAE;YACf,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,CAAC;SACV;KACF,CAAC;IAEF,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5D,eAAe,CAAC,MAAM,GAAG,KAAK,CAAC;QAE/B,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,IAAI,UAAU,CAAC;IACf,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,UAAU,GAAG,MAAM,IAAA,yBAAW,EAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,MAAM,IAAA,yBAAW,EAC5B,UAAU,EACV,aAAa,EACb,UAAU,EACV,OAAO,EACP,4BAA4B,CAC7B,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,WAAW;QACX,IAAA,iCAAe,EAAC,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,mBAAmB;QACnB,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACvB,IAAA,iCAAe,EAAC,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,eAAe,CAAC,MAAM,GAAG,KAAK,CAAC;QAE/B,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAC/F,eAAe,CAAC,eAAe,CAAC,MAAM;YACpC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IACxE,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,IAAkB,EAClB,cAAkC,EAAE;IAEpC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEvE,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,mCAAmC,aAAa,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACrF,QAAQ,GAAG,IAAI,CAAC;QAEhB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IAEzB,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAC9B,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAE9B,MAAM,4BAA4B,GAAiC,IAAI,GAAG,EAAE,CAAC;IAE7E,oBAAoB;IACpB,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9C,KAAK,MAAM,WAAW,IAAI,aAAa,CAAC,YAAY,EAAE,CAAC;YACrD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAC9D,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAa,EACzC,aAAa,EACb,UAAU,EACV;gBACE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,uBAAc;gBACtD,QAAQ,EAAE,sBAAsB;gBAChC,WAAW,EAAE,WAAW;gBACxB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,EACD,aAAa,CACd,CAAC;YAEF,4BAA4B,CAAC,GAAG,CAAC,WAAW,EAAE,eAAkC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAED,kBAAkB;IAClB,IAAI,aAAa,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;QACzC,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAa,EACzC,aAAa,EACb,UAAU,EACV;YACE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,uBAAc;YACtD,QAAQ,EAAE,sBAAsB;YAChC,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,EACD,aAAa,CACd,CAAC;QAEF,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,eAAkC,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAY,EAC9B;QACE,iBAAiB;QACjB,aAAa;QACb,UAAU;QACV,OAAO,EAAE;YACP,GAAG,WAAW;YACd,WAAW,EAAE,IAAI;SAClB;KACF,EACD,MAAM,CACP,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,4BAA4B,CAAC,CAAC;QAE7F,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,SAAS;QACX,CAAC;QAED,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;YAC3B,gBAAgB,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,IAAI,CAAC;YAChB,gBAAgB,IAAI,CAAC,CAAC;QACxB,CAAC;QAED,qBAAqB,IAAI,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC;QAChE,qBAAqB,IAAI,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC;IAClE,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IAExC,IAAI,OAAO,CAAC,YAAY,KAAK,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,gBAAgB,GAAG,eAAe,gBAAgB,YAAY,gBAAgB,SAAS,CAAC;IAC9F,MAAM,qBAAqB,GAAG,eAAe,qBAAqB,YAAY,qBAAqB,SAAS,CAAC;IAC7G,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,0BAAc,EAAE,gBAAgB,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,0BAAc,EAAE,qBAAqB,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,4BAAgB,EAAE,gBAAgB,CAAC,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,4BAAgB,EAAE,qBAAqB,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,2BAAe,EAAE,eAAe,IAAA,+BAAc,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAExE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAEY,QAAA,UAAU,GAAW;IAChC,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,KAAK,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE;QAC/E,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC;YACE,iBAAiB;YACjB,aAAa;YACb,UAAU;YACV,OAAO,EAAE,MAAM;SAChB,EACD,MAA4B,CAC7B,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,QAAQ,EAAE;QACR;YACE,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,eAAe;SAC7B;QACD;YACE,OAAO,EAAE,2BAA2B;YACpC,WAAW,EAAE,gCAAgC;SAC9C;QACD;YACE,OAAO,EAAE,iCAAiC;YAC1C,WAAW,EAAE,sCAAsC;SACpD;QACD;YACE,OAAO,EAAE,qBAAqB;YAC9B,WAAW,EAAE,uBAAuB;SACrC;QACD;YACE,OAAO,EAAE,qBAAqB;YAC9B,WAAW,EAAE,qCAAqC;SACnD;QACD;YACE,OAAO,EAAE,gBAAgB;YACzB,WAAW,EAAE,uBAAuB;SACrC;KACF;CACF,CAAC"}
+{"version":3,"file":"testProject.js","sourceRoot":"","sources":["../../src/tester/testProject.ts"],"names":[],"mappings":";;;AAsCA,kCAiEC;AAED,kCA4KC;AArRD,yBAAyB;AAIzB,+CAA4C;AAC5C,+CAA4C;AAC5C,2CAAgF;AAEhF,qDAAkD;AAClD,uDAAoD;AAEpD,wCAAgE;AAChE,sCAA2C;AAE3C,kCAAuC;AAwBhC,KAAK,UAAU,WAAW,CAC/B,IAAU,EACV,IAAkB,EAClB,OAA2B,EAC3B,oBAA0C;IAE1C,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAE9D,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC;IAC5C,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE3E,MAAM,UAAU,GAAG,IAAmB,CAAC;IACvC,MAAM,UAAU,GAAG,IAAmB,CAAC;IACvC,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;IACrD,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IAExD,MAAM,eAAe,GAAoB;QACvC,MAAM,EAAE,IAAI;QACZ,eAAe,EAAE;YACf,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,CAAC;SACV;KACF,CAAC;IAEF,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5D,eAAe,CAAC,MAAM,GAAG,KAAK,CAAC;QAE/B,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,IAAI,UAAU,CAAC;IACf,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,UAAU,GAAG,MAAM,IAAA,yBAAW,EAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,MAAM,IAAA,yBAAW,EAC5B,UAAU,EACV,aAAa,EACb,UAAU,EACV,OAAO,EACP,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,WAAW;QACX,IAAA,iCAAe,EAAC,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,mBAAmB;QACnB,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACvB,IAAA,iCAAe,EAAC,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,eAAe,CAAC,MAAM,GAAG,KAAK,CAAC;QAE/B,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAC/F,eAAe,CAAC,eAAe,CAAC,MAAM;YACpC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;IACxE,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,IAAkB,EAClB,cAAkC,EAAE;IAEpC,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEvE,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,mCAAmC,aAAa,CAAC,kBAAkB,EAAE,CAAC,CAAC;QACrF,QAAQ,GAAG,IAAI,CAAC;QAEhB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IAEzB,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAC9B,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAE9B,MAAM,oBAAoB,GAAyB,IAAI,GAAG,EAAE,CAAC;IAE7D,oBAAoB;IACpB,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9C,KAAK,MAAM,WAAW,IAAI,aAAa,CAAC,YAAY,EAAE,CAAC;YACrD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAC9D,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAa,EACzC,aAAa,EACb,UAAU,EACV;gBACE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,uBAAc;gBACtD,QAAQ,EAAE,sBAAsB;gBAChC,WAAW,EAAE,WAAW;gBACxB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,EACD,aAAa,CACd,CAAC;YAEF,oBAAoB,CAAC,GAAG,CAAC,WAAW,EAAE,eAAkC,CAAC,CAAC;YAE1E,WAAW;YACX,IAAI,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC/C,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;oBACzC,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;oBAC9D,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAa,EACzC,aAAa,EACb,UAAU,EACV;wBACE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,uBAAc;wBACtD,QAAQ,EAAE,yBAAyB;wBACnC,WAAW,EAAE,WAAW;wBACxB,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,GAAG,EAAE,KAAK,CAAC,GAAG;wBACd,IAAI,EAAE,KAAK,CAAC,IAAI;qBACjB,EACD,aAAa,CACd,CAAC;oBAEF,MAAM,qBAAqB,GAAG,IAAA,6BAAmB,EAC/C,eAAkC,EAClC,KAAK,CAAC,OAAO,CACd,CAAC;oBAEF,oBAAoB,CAAC,GAAG,CAAC,GAAG,WAAW,UAAU,KAAK,CAAC,IAAI,EAAE,EAAE,qBAAqB,CAAC,CAAC;gBACxF,CAAC;YACH,CAAC;YAED,gBAAgB;QAClB,CAAC;IACH,CAAC;IAED,kBAAkB;IAClB,IAAI,aAAa,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;QACzC,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAa,EACzC,aAAa,EACb,UAAU,EACV;YACE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,uBAAc;YACtD,QAAQ,EAAE,sBAAsB;YAChC,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,EACD,aAAa,CACd,CAAC;QAEF,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE,eAAkC,CAAC,CAAC;QAEpE,WAAW;QACX,IAAI,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YAC/C,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;gBACzC,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBACxD,MAAM,eAAe,GAAG,MAAM,IAAA,uBAAa,EACzC,aAAa,EACb,UAAU,EACV;oBACE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,uBAAc;oBACtD,QAAQ,EAAE,yBAAyB;oBACnC,WAAW,EAAE,KAAK;oBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,GAAG,EAAE,KAAK,CAAC,GAAG;oBACd,IAAI,EAAE,KAAK,CAAC,IAAI;iBACjB,EACD,aAAa,CACd,CAAC;gBAEF,MAAM,qBAAqB,GAAG,IAAA,6BAAmB,EAC/C,eAAkC,EAClC,KAAK,CAAC,OAAO,CACd,CAAC;gBAEF,oBAAoB,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,IAAI,EAAE,EAAE,qBAAqB,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QAED,gBAAgB;IAClB,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAY,EAC9B;QACE,iBAAiB;QACjB,aAAa;QACb,UAAU;QACV,OAAO,EAAE;YACP,GAAG,WAAW;YACd,WAAW,EAAE,IAAI;SAClB;KACF,EACD,MAAM,CACP,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAErF,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,SAAS;QACX,CAAC;QAED,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;YAC3B,gBAAgB,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,IAAI,CAAC;YAChB,gBAAgB,IAAI,CAAC,CAAC;QACxB,CAAC;QAED,qBAAqB,IAAI,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC;QAChE,qBAAqB,IAAI,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC;IAClE,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IAExC,IAAI,OAAO,CAAC,YAAY,KAAK,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,gBAAgB,GAAG,eAAe,gBAAgB,YAAY,gBAAgB,SAAS,CAAC;IAC9F,MAAM,qBAAqB,GAAG,eAAe,qBAAqB,YAAY,qBAAqB,SAAS,CAAC;IAC7G,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,0BAAc,EAAE,gBAAgB,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,0BAAc,EAAE,qBAAqB,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,4BAAgB,EAAE,gBAAgB,CAAC,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,4BAAgB,EAAE,qBAAqB,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,2BAAe,EAAE,eAAe,IAAA,+BAAc,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAExE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAEY,QAAA,UAAU,GAAW;IAChC,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,KAAK,WAAW,EAAE,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE;QAC/E,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC;YACE,iBAAiB;YACjB,aAAa;YACb,UAAU;YACV,OAAO,EAAE,MAAM;SAChB,EACD,MAA4B,CAC7B,CAAC;QAEF,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,QAAQ,EAAE;QACR;YACE,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,eAAe;SAC7B;QACD;YACE,OAAO,EAAE,2BAA2B;YACpC,WAAW,EAAE,gCAAgC;SAC9C;QACD;YACE,OAAO,EAAE,iCAAiC;YAC1C,WAAW,EAAE,sCAAsC;SACpD;QACD;YACE,OAAO,EAAE,qBAAqB;YAC9B,WAAW,EAAE,uBAAuB;SACrC;QACD;YACE,OAAO,EAAE,qBAAqB;YAC9B,WAAW,EAAE,qCAAqC;SACnD;QACD;YACE,OAAO,EAAE,gBAAgB;YACzB,WAAW,EAAE,uBAAuB;SACrC;KACF;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@featurevisor/core",
-  "version": "2.5.0",
+  "version": "2.6.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": "2.3.3",
-    "@featurevisor/site": "2.5.0",
-    "@featurevisor/types": "2.1.2",
+    "@featurevisor/sdk": "2.6.0",
+    "@featurevisor/site": "2.6.0",
+    "@featurevisor/types": "2.6.0",
     "axios": "^1.3.4",
     "js-yaml": "^4.1.0",
     "tar": "^6.1.13",
@@ -53,5 +53,5 @@
     "@types/js-yaml": "^4.0.5",
     "@types/tar": "^6.1.4"
   },
-  "gitHead": "de951e1db0184ba2ed10a143a47cf65c3263faa2"
+  "gitHead": "e5dafb8a51d7653e35fe17cacc0c14d7e95f69d0"
 }

package/src/builder/buildDatafile.ts

@@ -38,6 +38,8 @@ export interface CustomDatafileOptions {
   revision?: string;
   schemaVersion?: string;
   inflate?: number;
+  tag?: string;
+  tags?: BuildTags;
 }
 
 export async function getCustomDatafile(
@@ -60,6 +62,8 @@ export async function getCustomDatafile(
       environment: options.environment,
       features: featuresToInclude,
       inflate: options.inflate,
+      tag: options.tag,
+      tags: options.tags,
     },
     existingState,
   );
@@ -67,12 +71,23 @@ export async function getCustomDatafile(
   return datafileContent;
 }
 
+export interface BuildOrTags {
+  or: string[];
+}
+
+export interface BuildAndTags {
+  and: string[];
+}
+
+export type BuildTags = BuildOrTags | BuildAndTags | string[];
+
 export interface BuildOptions {
   schemaVersion: string;
   revision: string;
   revisionFromHash?: boolean;
   environment: string | false;
   tag?: string;
+  tags?: BuildTags;
   features?: FeatureKey[];
   inflate?: number;
 }
@@ -105,6 +120,38 @@ export async function buildDatafile(
         continue;
       }
 
+      if (options.tags) {
+        // plain array of tags: treat as OR tags
+        if (Array.isArray(options.tags)) {
+          if (
+            options.tags.some((searchTag) => parsedFeature.tags.indexOf(searchTag) !== -1) === false
+          ) {
+            continue;
+          }
+        } else {
+          // OR tags
+          const orTags = options.tags as BuildOrTags;
+          if (orTags.or) {
+            if (
+              orTags.or.some((searchTag) => parsedFeature.tags.indexOf(searchTag) !== -1) === false
+            ) {
+              continue;
+            }
+          }
+
+          // AND tags
+          const andTags = options.tags as BuildAndTags;
+          if (andTags.and) {
+            if (
+              andTags.and.every((searchTag) => parsedFeature.tags.indexOf(searchTag) !== -1) ===
+              false
+            ) {
+              continue;
+            }
+          }
+        }
+      }
+
       if (options.features && options.features.indexOf(featureKey) === -1) {
         continue;
       }

package/src/builder/buildProject.ts

@@ -3,8 +3,11 @@ import { Datasource } from "../datasource";
 
 import { getNextRevision } from "./revision";
 import { buildDatafile, getCustomDatafile } from "./buildDatafile";
+import { buildScopedDatafile } from "./buildScopedDatafile";
 import { Dependencies } from "../dependencies";
 import { Plugin } from "../cli";
+import type { Scope } from "../config";
+
 import type { DatafileContent } from "@featurevisor/types";
 
 export interface BuildCLIOptions {
@@ -20,6 +23,9 @@ export interface BuildCLIOptions {
   stateFiles?: boolean; // --no-state-files in CLI
   inflate?: number;
   datafilesDir?: string;
+
+  tag?: string;
+  scope?: string; // scope name only
 }
 
 async function buildForEnvironment({
@@ -28,6 +34,7 @@ async function buildForEnvironment({
   nextRevision,
   environment,
   tags,
+  scopes,
   cliOptions,
 }: {
   projectConfig: ProjectConfig;
@@ -35,12 +42,14 @@ async function buildForEnvironment({
   nextRevision: string;
   environment: string | false;
   tags: string[];
+  scopes?: Scope[];
   cliOptions: BuildCLIOptions;
 }) {
   console.log(`\nBuilding datafiles for environment: ${environment}`);
 
   const existingState = await datasource.readState(environment);
 
+  // by tag
   for (const tag of tags) {
     console.log(`\n  => Tag: ${tag}`);
 
@@ -66,6 +75,41 @@ async function buildForEnvironment({
     });
   }
 
+  // by scope
+  if (scopes) {
+    for (const scope of scopes) {
+      console.log(`\n  => Scope: ${scope.name}`);
+
+      const datafileContent = await buildDatafile(
+        projectConfig,
+        datasource,
+        {
+          schemaVersion: cliOptions.schemaVersion || SCHEMA_VERSION,
+          revision: nextRevision,
+          revisionFromHash: cliOptions.revisionFromHash,
+          environment: environment,
+          tag: scope.tag,
+          tags: scope.tags,
+          inflate: cliOptions.inflate,
+        },
+        existingState,
+      );
+
+      const scopedDatafileContent = buildScopedDatafile(
+        datafileContent as DatafileContent,
+        scope.context,
+      );
+
+      // write scoped datafile
+      await datasource.writeDatafile(scopedDatafileContent, {
+        environment,
+        tag: scope.tag,
+        scope: scope,
+        datafilesDir: cliOptions.datafilesDir,
+      });
+    }
+  }
+
   if (typeof cliOptions.stateFiles === "undefined" || cliOptions.stateFiles) {
     // write state for environment
     await datasource.writeState(environment, existingState);
@@ -89,15 +133,25 @@ export async function buildProject(deps: Dependencies, cliOptions: BuildCLIOptio
    * while tests can be run anywhere else.
    */
   if (cliOptions.environment && cliOptions.json) {
-    const datafileContent = await getCustomDatafile({
+    const scope = cliOptions.scope
+      ? projectConfig.scopes?.find((scope) => scope.name === cliOptions.scope)
+      : undefined;
+
+    let datafileContent = await getCustomDatafile({
       featureKey: cliOptions.feature,
       environment: cliOptions.environment,
       projectConfig,
       datasource,
       revision: cliOptions.revision,
       schemaVersion: cliOptions.schemaVersion,
+      tag: cliOptions.tag,
+      tags: scope?.tags,
     });
 
+    if (scope) {
+      datafileContent = buildScopedDatafile(datafileContent as DatafileContent, scope.context);
+    }
+
     if (cliOptions.pretty) {
       console.log(JSON.stringify(datafileContent, null, 2));
     } else {
@@ -110,8 +164,7 @@ export async function buildProject(deps: Dependencies, cliOptions: BuildCLIOptio
   /**
    * Regular build process that writes to disk.
    */
-  const tags = projectConfig.tags;
-  const environments = projectConfig.environments;
+  const { tags, environments, scopes } = projectConfig;
 
   const currentRevision = await datasource.readRevision();
   console.log("\nCurrent revision:", currentRevision);
@@ -128,6 +181,7 @@ export async function buildProject(deps: Dependencies, cliOptions: BuildCLIOptio
         nextRevision,
         environment,
         tags,
+        scopes,
         cliOptions,
       });
     }
@@ -141,6 +195,7 @@ export async function buildProject(deps: Dependencies, cliOptions: BuildCLIOptio
       nextRevision,
       environment: false,
       tags,
+      scopes,
       cliOptions,
     });
   }