@vr1/be-driven-syntax-sugar 1.0.0 → 2.0.1

package/build/scenario.d.ts

@@ -1,3 +1,4 @@
-import { StepWrapper } from "./types/StepWrapper";
 import { ScenarioFirstStep } from "@vr1/be-driven-interface";
-export declare function scenario(wrapper: StepWrapper): ScenarioFirstStep;
+import { ScenarioOptions } from "./types/ScenarioOptions";
+export declare function scenario(testName: string, options?: ScenarioOptions): ScenarioFirstStep;
+export declare function scenario(options?: ScenarioOptions): ScenarioFirstStep;

package/build/scenario.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scenario = scenario;
 const testScenario_1 = require("./testScenario");
-function scenario(wrapper) {
-    return new testScenario_1.TestScenario(wrapper);
+function scenario(first, second) {
+    const testName = typeof first === "string" ? first : "";
+    const options = (typeof first === "object" ? first : second) ?? {};
+    return new testScenario_1.TestScenario(testName, options);
 }
 //# sourceMappingURL=scenario.js.map

package/build/scenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"scenario.js","sourceRoot":"","sources":["../src/scenario.ts"],"names":[],"mappings":";;AAIA,4BAEC;AALD,iDAA8C;AAG9C,SAAgB,QAAQ,CAAC,OAAoB;IAC3C,OAAO,IAAI,2BAAY,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"file":"scenario.js","sourceRoot":"","sources":["../src/scenario.ts"],"names":[],"mappings":";;AAMA,4BAIC;AAVD,iDAA8C;AAM9C,SAAgB,QAAQ,CAAC,KAAgC,EAAE,MAAwB;IACjF,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,MAAM,OAAO,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnE,OAAO,IAAI,2BAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC"}

package/build/testScenario/ScenarioSteps.d.ts

@@ -0,0 +1,10 @@
+import { Step } from "@vr1/be-driven-interface";
+import { Test } from "./TestStep";
+export declare class ScenarioSteps<T extends Step<any>> implements Step<T> {
+    protected test: Test;
+    constructor(test: Test);
+    given<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T;
+    when<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T;
+    then<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T;
+    and<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T;
+}

package/build/testScenario/ScenarioSteps.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScenarioSteps = void 0;
+const be_driven_interface_1 = require("@vr1/be-driven-interface");
+const function_name_to_sentence_1 = require("@vr1/function-name-to-sentence");
+class ScenarioSteps {
+    test;
+    constructor(test) {
+        this.test = test;
+    }
+    given(func, ...args) {
+        this.test.steps.push(createStep(func, args, be_driven_interface_1.StepType.Given));
+        return this;
+    }
+    when(func, ...args) {
+        this.test.steps.push(createStep(func, args, be_driven_interface_1.StepType.When));
+        return this;
+    }
+    then(func, ...args) {
+        this.test.steps.push(createStep(func, args, be_driven_interface_1.StepType.Then));
+        return this;
+    }
+    and(func, ...args) {
+        const previousStep = this.test.steps[this.test.steps.length - 1];
+        this.test.steps.push(createStep(func, args, previousStep.stepType, true));
+        return this;
+    }
+}
+exports.ScenarioSteps = ScenarioSteps;
+function createStep(target, args, type, and = false) {
+    const stepType = target.stepType ?? type;
+    if (stepType !== type)
+        throw new Error(`Cannot use ${stepType} type of step, ${type} was expected.`);
+    return {
+        stepName: createName(target, args),
+        target,
+        stepType,
+        args,
+        and
+    };
+}
+function createName(target, args) {
+    return (target.stepName != null && target.stepName !== "")
+        ? args.reduce((prev, cur, i) => prev.replace(new RegExp(`\\{${i}\\}`, "g"), cur), target.stepName)
+        : (0, function_name_to_sentence_1.functionNameToSentence)(target.name);
+}
+//# sourceMappingURL=ScenarioSteps.js.map

package/build/testScenario/ScenarioSteps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScenarioSteps.js","sourceRoot":"","sources":["../../src/testScenario/ScenarioSteps.ts"],"names":[],"mappings":";;;AAAA,kEAA0D;AAE1D,8EAAwE;AAGxE,MAAa,aAAa;IACF;IAAtB,YAAsB,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAI,CAAC;IAE9B,KAAK,CAA8D,IAAe,EAAE,GAAG,IAAW;QACvG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,8BAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,OAAO,IAAW,CAAC;IACrB,CAAC;IAEM,IAAI,CAA8D,IAAe,EAAE,GAAG,IAAW;QACtG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,8BAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,OAAO,IAAW,CAAC;IACrB,CAAC;IAEM,IAAI,CAA8D,IAAe,EAAE,GAAG,IAAW;QACtG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,8BAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,OAAO,IAAW,CAAC;IACrB,CAAC;IAEM,GAAG,CAA8D,IAAe,EAAE,GAAG,IAAW;QACrG,MAAM,YAAY,GAAa,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAa,CAAC;QACvF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QAC1E,OAAO,IAAW,CAAC;IACrB,CAAC;CACF;AAvBD,sCAuBC;AAED,SAAS,UAAU,CAAC,MAAW,EAAE,IAAW,EAAE,IAAc,EAAE,MAAe,KAAK;IAChF,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC;IACzC,IAAI,QAAQ,KAAK,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,QAAQ,kBAAkB,IAAI,gBAAgB,CAAC,CAAC;IACrG,OAAO;QACL,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC;QAClC,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,GAAG;KACJ,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,MAAW,EAAE,IAAW;IAC1C,OAAO,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC;QACxD,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;QAClG,CAAC,CAAC,IAAA,kDAAsB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC1C,CAAC"}

package/build/testScenario/TestScenario.d.ts

@@ -1,13 +1,9 @@
-import { Scenario } from "@vr1/be-driven-interface";
-import { StepWrapper } from "../types";
-export declare class TestScenario implements Scenario {
-    private wrapper;
-    private steps;
-    constructor(wrapper: StepWrapper);
-    given<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario;
-    when<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario;
-    then<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario;
-    and<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario;
-    split(): Scenario;
+import { Scenario, Variance } from "@vr1/be-driven-interface";
+import { ScenarioOptions } from "../types/ScenarioOptions";
+import { ScenarioSteps } from "./ScenarioSteps";
+export declare class TestScenario extends ScenarioSteps<Scenario> implements Scenario {
+    private options;
+    constructor(testName: string, options: ScenarioOptions);
+    vary(...variance: Variance[]): Scenario;
     run(): Promise<void>;
 }

package/build/testScenario/TestScenario.js

@@ -1,52 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestScenario = void 0;
-const be_driven_interface_1 = require("@vr1/be-driven-interface");
 const runTest_1 = require("./runTest");
-class TestScenario {
-    wrapper;
-    steps = [];
-    constructor(wrapper) {
-        this.wrapper = wrapper;
+const ScenarioSteps_1 = require("./ScenarioSteps");
+class TestScenario extends ScenarioSteps_1.ScenarioSteps {
+    options;
+    constructor(testName, options) {
+        super({ testName, steps: [] });
+        this.options = options;
     }
-    given(func, ...args) {
-        this.steps.push(createStep(func, args, be_driven_interface_1.StepType.Given));
+    vary(...variance) {
+        const subTests = variance.map((_, i) => ({ testName: `${i}`, steps: [] }));
+        this.test.steps.push(subTests);
+        variance.forEach((v, i) => v((testName) => {
+            if (typeof (testName) === "string" && testName !== "")
+                subTests[i].testName = testName;
+            return new ScenarioSteps_1.ScenarioSteps(subTests[i]);
+        }));
         return this;
     }
-    when(func, ...args) {
-        this.steps.push(createStep(func, args, be_driven_interface_1.StepType.When));
-        return this;
-    }
-    then(func, ...args) {
-        this.steps.push(createStep(func, args, be_driven_interface_1.StepType.Then));
-        return this;
-    }
-    and(func, ...args) {
-        this.steps.push(createStep(func, args, this.steps[this.steps.length - 1].type));
-        return this;
-    }
-    split() {
-        throw new Error("Splitting test into several tests is not supported in syntax-sugar mode.");
-    }
-    run() {
-        const steps = this.steps;
-        this.steps = null;
-        return (0, runTest_1.runTest)(this.wrapper, steps);
+    async run() {
+        const test = this.test;
+        this.test = null;
+        await Promise.all((0, runTest_1.runTest)(this.options, test));
     }
 }
 exports.TestScenario = TestScenario;
-function createStep(target, args, type) {
-    const stepType = target.stepType ?? type;
-    if (stepType !== type)
-        throw new Error(`Cannot use ${stepType} type of step, ${type} was expected.`);
-    return {
-        name: createName(target, args),
-        target,
-        type,
-        args,
-    };
-}
-function createName(target, args) {
-    return args.reduce((prev, cur, i) => prev.replace(new RegExp(`\\{${i}\\}`, "g"), cur), target.stepName ?? target.name);
-}
 //# sourceMappingURL=TestScenario.js.map

package/build/testScenario/TestScenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestScenario.js","sourceRoot":"","sources":["../../src/testScenario/TestScenario.ts"],"names":[],"mappings":";;;AACA,kEAA8D;AAG9D,uCAAoC;AAEpC,MAAa,YAAY;IAGH;IAFZ,KAAK,GAAe,EAAE,CAAC;IAE/B,YAAoB,OAAoB;QAApB,YAAO,GAAP,OAAO,CAAa;IAAI,CAAC;IAEtC,KAAK,CAA+E,IAAe,EAAE,GAAG,IAAW;QACxH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,8BAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IACM,IAAI,CAA+E,IAAe,EAAE,GAAG,IAAW;QACvH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,8BAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;IACM,IAAI,CAA+E,IAAe,EAAE,GAAG,IAAW;QACvH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,8BAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;IACM,GAAG,CAA+E,IAAe,EAAE,GAAG,IAAW;QACtH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK;QACV,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;IAC9F,CAAC;IAEM,GAAG;QACR,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,OAAO,IAAA,iBAAO,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;CACF;AA/BD,oCA+BC;AAED,SAAS,UAAU,CAAC,MAAW,EAAE,IAAW,EAAE,IAAc;IAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC;IACzC,IAAI,QAAQ,KAAK,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,QAAQ,kBAAkB,IAAI,gBAAgB,CAAC,CAAC;IACrG,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC;QAC9B,MAAM;QACN,IAAI;QACJ,IAAI;KACL,CAAC;AACJ,CAAC;AACD,SAAS,UAAU,CAAC,MAAW,EAAE,IAAW;IAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;AACzH,CAAC"}
+{"version":3,"file":"TestScenario.js","sourceRoot":"","sources":["../../src/testScenario/TestScenario.ts"],"names":[],"mappings":";;;AAEA,uCAAoC;AAEpC,mDAAgD;AAIhD,MAAa,YAAa,SAAQ,6BAAuB;IACjB;IAAtC,YAAY,QAAgB,EAAU,OAAwB;QAC5D,KAAK,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QADK,YAAO,GAAP,OAAO,CAAiB;IAE9D,CAAC;IAEM,IAAI,CAAC,GAAG,QAAoB;QACjC,MAAM,QAAQ,GAAW,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE;YACxC,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,QAAQ,IAAI,QAAQ,KAAK,EAAE;gBAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACvF,OAAO,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,MAAM,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAO,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;CACF;AApBD,oCAoBC"}

package/build/testScenario/TestStep.d.ts

@@ -1,7 +1,12 @@
 import { StepType } from "@vr1/be-driven-interface";
 export interface TestStep {
-    type: StepType;
-    name: string;
+    stepType: StepType;
+    and: boolean;
+    stepName: string;
     target: Function;
     args: any[];
 }
+export interface Test {
+    testName: string;
+    steps: Array<TestStep | Test[]>;
+}

package/build/testScenario/runTest.d.ts

@@ -1,3 +1,4 @@
-import { StepWrapper } from "../types";
-import { TestStep } from "./TestStep";
-export declare function runTest(wrapper: StepWrapper, steps: TestStep[]): Promise<void>;
+import { ScenarioOptions } from "../types/ScenarioOptions";
+import { Test, TestStep } from "./TestStep";
+export declare function runTest(options: ScenarioOptions, test: Test): Array<Promise<void>>;
+export declare function runSteps(options: ScenarioOptions, testName: string, steps: TestStep[]): Promise<void>;

package/build/testScenario/runTest.js

@@ -1,13 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTest = runTest;
-async function runTest(wrapper, steps) {
+exports.runSteps = runSteps;
+const array_multiplex_1 = require("@vr1/array-multiplex");
+const defaultOptions = {
+    testWrapper: async (name, test) => test(),
+    stepWrapper: async (type, name, step) => step(),
+};
+function runTest(options, test) {
+    options = { ...defaultOptions, ...options };
+    const multi = (0, array_multiplex_1.multiplex)(test.steps);
+    const promises = multi.map(line => runTestLine(options, test.testName, line));
+    return promises;
+}
+async function runTestLine(options, testName, line) {
+    const subTests = line.filter(isTest);
+    const fullTestName = subTests.reduce((acc, test) => `${acc} ${test.testName}`, testName);
+    const steps = line.flatMap(step => isTest(step) ? step.steps : step);
+    await runSteps(options, fullTestName, steps);
+}
+function isTest(test) {
+    return typeof test.testName === "string";
+}
+async function runSteps(options, testName, steps) {
+    options = { ...defaultOptions, ...options };
     const store = {};
-    for (let step of steps) {
-        await wrapper(step.type, step.name, async () => {
-            const stepOutput = await step.target.call(store, ...step.args);
-            Object.assign(store, stepOutput);
-        });
-    }
+    Object.assign(store, options.initialData);
+    await options.testWrapper(testName, async (data) => {
+        Object.assign(store, data);
+        for (let step of steps) {
+            const stepType = step.and ? "And" : step.stepType;
+            await options.stepWrapper(stepType, step.stepName, async () => {
+                const stepOutput = await step.target.call(store, ...step.args);
+                Object.assign(store, stepOutput);
+            });
+        }
+    });
 }
 //# sourceMappingURL=runTest.js.map

package/build/testScenario/runTest.js.map

@@ -1 +1 @@
-{"version":3,"file":"runTest.js","sourceRoot":"","sources":["../../src/testScenario/runTest.ts"],"names":[],"mappings":";;AAGA,0BASC;AATM,KAAK,UAAU,OAAO,CAAC,OAAoB,EAAE,KAAiB;IACnE,MAAM,KAAK,GAAG,EAAE,CAAC;IAEjB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/D,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"runTest.js","sourceRoot":"","sources":["../../src/testScenario/runTest.ts"],"names":[],"mappings":";;AASA,0BAKC;AAaD,4BAkBC;AA7CD,0DAAiD;AAIjD,MAAM,cAAc,GAAoB;IACtC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;IACzC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE;CAChD,CAAC;AAEF,SAAgB,OAAO,CAAC,OAAwB,EAAE,IAAU;IAC1D,OAAO,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC;IAC5C,MAAM,KAAK,GAAG,IAAA,2BAAS,EAAkB,IAAI,CAAC,KAAK,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAC9E,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,OAAwB,EAAE,QAAgB,EAAE,IAAyB;IAC9F,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;IACzF,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACnF,MAAM,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,MAAM,CAAC,IAAqB;IACnC,OAAO,OAAa,IAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAClD,CAAC;AAEM,KAAK,UAAU,QAAQ,CAAC,OAAwB,EAAE,QAAgB,EAAE,KAAiB;IAC1F,OAAO,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,EAAE,CAAC;IAE5C,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1C,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;QAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3B,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAkB,CAAC;YAC5D,MAAM,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;gBAC5D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/D,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AAGL,CAAC"}

package/build/types/ScenarioOptions.d.ts

@@ -0,0 +1,7 @@
+import { StepWrapper } from "./StepWrapper";
+import { TestWrapper } from "./TestWrapper";
+export interface ScenarioOptions {
+    stepWrapper?: StepWrapper;
+    testWrapper?: TestWrapper;
+    initialData?: object;
+}

package/build/types/ScenarioOptions.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ScenarioOptions.js.map

package/build/types/ScenarioOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScenarioOptions.js","sourceRoot":"","sources":["../../src/types/ScenarioOptions.ts"],"names":[],"mappings":""}

package/build/types/StepWrapper.d.ts

@@ -1,2 +1 @@
-import { StepType } from "@vr1/be-driven-interface";
-export type StepWrapper = (type: StepType, name: string, func: () => Promise<void>) => Promise<void>;
+export type StepWrapper = (stepType: string, name: string, step: () => Promise<void>) => Promise<void>;

package/build/types/TestWrapper.d.ts

@@ -0,0 +1 @@
+export type TestWrapper = (testName: string, test: (initialData?: object) => Promise<void>) => void;

package/build/types/TestWrapper.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=TestWrapper.js.map

package/build/types/TestWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TestWrapper.js","sourceRoot":"","sources":["../../src/types/TestWrapper.ts"],"names":[],"mappings":""}

package/build/types/index.d.ts

@@ -1 +1,3 @@
 export * from "./StepWrapper";
+export * from "./TestWrapper";
+export * from "./ScenarioOptions";

package/build/types/index.js

@@ -15,4 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./StepWrapper"), exports);
+__exportStar(require("./TestWrapper"), exports);
+__exportStar(require("./ScenarioOptions"), exports);
 //# sourceMappingURL=index.js.map

package/build/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,oDAAkC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vr1/be-driven-syntax-sugar",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "description": "syntax sugar to write pw and jest tests in bdd style ",
   "repository": {
     "type": "git",
@@ -40,6 +40,8 @@
     "typescript": "^5.7.3"
   },
   "dependencies": {
-    "@vr1/be-driven-interface": "^1.2.0"
+    "@vr1/array-multiplex": "^1.1.0",
+    "@vr1/be-driven-interface": "^2.0.4",
+    "@vr1/function-name-to-sentence": "^1.0.0"
   }
 }

package/src/scenario.ts

@@ -1,8 +1,12 @@
-import { StepWrapper } from "./types/StepWrapper";
 import { TestScenario } from "./testScenario";
 import { ScenarioFirstStep } from "@vr1/be-driven-interface";
+import { ScenarioOptions } from "./types/ScenarioOptions";
 
-export function scenario(wrapper: StepWrapper): ScenarioFirstStep {
-  return new TestScenario(wrapper);
+export function scenario(testName: string, options?: ScenarioOptions): ScenarioFirstStep;
+export function scenario(options?: ScenarioOptions): ScenarioFirstStep;
+export function scenario(first?: string | ScenarioOptions, second?: ScenarioOptions): ScenarioFirstStep {
+  const testName = typeof first === "string" ? first : "";
+  const options = (typeof first === "object" ? first : second) ?? {};
+  return new TestScenario(testName, options);
 }
 

package/src/testScenario/ScenarioSteps.ts

@@ -0,0 +1,48 @@
+import { StepType, Step } from "@vr1/be-driven-interface";
+import { Test, TestStep } from "./TestStep";
+import { functionNameToSentence } from "@vr1/function-name-to-sentence";
+
+
+export class ScenarioSteps<T extends Step<any>> implements Step<T> {
+  constructor(protected test: Test) { }
+
+  public given<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T {
+    this.test.steps.push(createStep(func, args, StepType.Given));
+    return this as any;
+  }
+
+  public when<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T {
+    this.test.steps.push(createStep(func, args, StepType.When));
+    return this as any;
+  }
+
+  public then<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T {
+    this.test.steps.push(createStep(func, args, StepType.Then));
+    return this as any;
+  }
+
+  public and<TArgs extends any[], TMnemonic extends (...a: TArgs) => any>(func: TMnemonic, ...args: TArgs): T {
+    const previousStep: TestStep = this.test.steps[this.test.steps.length - 1] as TestStep;
+    this.test.steps.push(createStep(func, args, previousStep.stepType, true));
+    return this as any;
+  }
+}
+
+function createStep(target: any, args: any[], type: StepType, and: boolean = false): TestStep {
+  const stepType = target.stepType ?? type;
+  if (stepType !== type) throw new Error(`Cannot use ${stepType} type of step, ${type} was expected.`);
+  return {
+    stepName: createName(target, args),
+    target,
+    stepType,
+    args,
+    and
+  };
+}
+
+function createName(target: any, args: any[]): string {
+  return (target.stepName != null && target.stepName !== "")
+    ? args.reduce((prev, cur, i) => prev.replace(new RegExp(`\\{${i}\\}`, "g"), cur), target.stepName)
+    : functionNameToSentence(target.name);
+}
+

package/src/testScenario/TestScenario.ts

@@ -1,53 +1,29 @@
 
-import { Scenario, StepType } from "@vr1/be-driven-interface";
-import { StepWrapper } from "../types";
-import { TestStep } from "./TestStep";
+import { Scenario, Variance } from "@vr1/be-driven-interface";
 import { runTest } from "./runTest";
+import { ScenarioOptions } from "../types/ScenarioOptions";
+import { ScenarioSteps } from "./ScenarioSteps";
+import { Test } from "./TestStep";
 
-export class TestScenario implements Scenario {
-  private steps: TestStep[] = [];
 
-  constructor(private wrapper: StepWrapper) { }
-
-  public given<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario {
-    this.steps.push(createStep(func, args, StepType.Given));
-    return this;
-  }
-  public when<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario {
-    this.steps.push(createStep(func, args, StepType.When));
-    return this;
-  }
-  public then<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario {
-    this.steps.push(createStep(func, args, StepType.Then));
-    return this;
-  }
-  public and<TArgs extends any[], TMnemonic extends (...a: TArgs) => void | Promise<void>>(func: TMnemonic, ...args: TArgs): Scenario {
-    this.steps.push(createStep(func, args, this.steps[this.steps.length - 1].type));
-    return this;
+export class TestScenario extends ScenarioSteps<Scenario> implements Scenario {
+  constructor(testName: string, private options: ScenarioOptions) {
+    super({ testName, steps: [] });
   }
 
-  public split(): Scenario {
-    throw new Error("Splitting test into several tests is not supported in syntax-sugar mode.");
+  public vary(...variance: Variance[]): Scenario {
+    const subTests: Test[] = variance.map((_, i) => ({ testName: `${i}`, steps: [] }));
+    this.test.steps.push(subTests);
+    variance.forEach((v, i) => v((testName) => {
+      if (typeof (testName) === "string" && testName !== "") subTests[i].testName = testName;
+      return new ScenarioSteps(subTests[i]);
+    }));
+    return this;
   }
 
-  public run(): Promise<void> {
-    const steps = this.steps;
-    this.steps = null;
-    return runTest(this.wrapper, steps);
+  public async run(): Promise<void> {
+    const test = this.test;
+    this.test = null;
+    await Promise.all(runTest(this.options, test));
   }
 }
-
-function createStep(target: any, args: any[], type: StepType): TestStep {
-  const stepType = target.stepType ?? type;
-  if (stepType !== type) throw new Error(`Cannot use ${stepType} type of step, ${type} was expected.`);
-  return {
-    name: createName(target, args),
-    target,
-    type,
-    args,
-  };
-}
-function createName(target: any, args: any[]): string {
-  return args.reduce((prev, cur, i) => prev.replace(new RegExp(`\\{${i}\\}`, "g"), cur), target.stepName ?? target.name);
-}
-

package/src/testScenario/TestStep.ts

@@ -1,8 +1,14 @@
 import { StepType } from "@vr1/be-driven-interface";
 
 export interface TestStep {
-  type: StepType;
-  name: string;
+  stepType: StepType;
+  and: boolean;
+  stepName: string;
   target: Function;
   args: any[];
 }
+
+export interface Test {
+  testName: string;
+  steps: Array<TestStep | Test[]>;
+}

package/src/testScenario/runTest.ts

@@ -1,13 +1,48 @@
-import { StepWrapper } from "../types";
-import { TestStep } from "./TestStep";
+import { multiplex } from "@vr1/array-multiplex";
+import { ScenarioOptions } from "../types/ScenarioOptions";
+import { Test, TestStep } from "./TestStep";
+
+const defaultOptions: ScenarioOptions = {
+  testWrapper: async (name, test) => test(),
+  stepWrapper: async (type, name, step) => step(),
+};
+
+export function runTest(options: ScenarioOptions, test: Test): Array<Promise<void>> {
+  options = { ...defaultOptions, ...options };
+  const multi = multiplex<TestStep | Test>(test.steps);
+  const promises = multi.map(line => runTestLine(options, test.testName, line));
+  return promises;
+}
+
+async function runTestLine(options: ScenarioOptions, testName: string, line: (Test | TestStep)[]): Promise<void> {
+  const subTests = line.filter(isTest);
+  const fullTestName = subTests.reduce((acc, test) => `${acc} ${test.testName}`, testName);
+  const steps = line.flatMap(step => isTest(step) ? step.steps as TestStep[] : step);
+  await runSteps(options, fullTestName, steps);
+}
+
+function isTest(test: Test | TestStep): test is Test {
+  return typeof (<any>test).testName === "string";
+}
+
+export async function runSteps(options: ScenarioOptions, testName: string, steps: TestStep[]): Promise<void> {
+  options = { ...defaultOptions, ...options };
 
-export async function runTest(wrapper: StepWrapper, steps: TestStep[]): Promise<void> {
   const store = {};
+  Object.assign(store, options.initialData);
+
+  await options.testWrapper(testName, async data => {
+    Object.assign(store, data);
+    for (let step of steps) {
+      const stepType = step.and ? "And" : step.stepType as string;
+      await options.stepWrapper(stepType, step.stepName, async () => {
+        const stepOutput = await step.target.call(store, ...step.args);
+        Object.assign(store, stepOutput);
+      });
+    }
+  });
+
 
-  for (let step of steps) {
-    await wrapper(step.type, step.name, async () => {
-      const stepOutput = await step.target.call(store, ...step.args);
-      Object.assign(store, stepOutput);
-    });
-  }
 }
+
+

package/src/types/ScenarioOptions.ts

@@ -0,0 +1,9 @@
+import { StepWrapper } from "./StepWrapper";
+import { TestWrapper } from "./TestWrapper";
+
+export interface ScenarioOptions {
+  stepWrapper?: StepWrapper;
+  testWrapper?: TestWrapper;
+  initialData?: object;
+}
+

package/src/types/StepWrapper.ts

@@ -1,3 +1 @@
-import { StepType } from "@vr1/be-driven-interface";
-
-export type StepWrapper = (type: StepType, name: string, func: () => Promise<void>) => Promise<void>;
+export type StepWrapper = (stepType: string, name: string, step: () => Promise<void>) => Promise<void>;

package/src/types/TestWrapper.ts

@@ -0,0 +1 @@
+export type TestWrapper = (testName: string, test: (initialData?: object) => Promise<void>) => void;

package/src/types/index.ts

@@ -1 +1,3 @@
 export * from "./StepWrapper";
+export * from "./TestWrapper";
+export * from "./ScenarioOptions";