testeranto 0.114.1 → 0.121.1

package/dist/common/build.js

@@ -36,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ansi_colors_1 = __importDefault(require("ansi-colors"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const readline_1 = __importDefault(require("readline"));
@@ -47,25 +48,21 @@ const web_html_js_1 = __importDefault(require("./web.html.js"));
 readline_1.default.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY)
     process.stdin.setRawMode(true);
-const getRunnables = (tests, payload = {
-    nodeEntryPoints: {},
-    webEntryPoints: {},
-}) => {
-    return tests.reduce((pt, cv, cndx, cry) => {
-        if (cv[1] === "node") {
-            pt.nodeEntryPoints[cv[0]] = path_1.default.resolve(`./docs/node/${cv[0].split(".").slice(0, -1).concat("mjs").join(".")}`);
-        }
-        else if (cv[1] === "web") {
-            pt.webEntryPoints[cv[0]] = path_1.default.resolve(`./docs/web/${cv[0].split(".").slice(0, -1).concat("mjs").join(".")}`);
-        }
-        if (cv[3].length) {
-            getRunnables(cv[3], payload);
-        }
-        return pt;
-    }, payload);
-};
-Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importStar(require(s))).then(async (module) => {
-    const rawConfig = module.default;
+let testName = process.argv[2];
+let mode = process.argv[3];
+if (mode !== "once" && mode !== "dev") {
+    console.error(`The 4th argument should be 'dev' or 'once', not '${mode}'.`);
+    process.exit(-1);
+}
+console.log("testeranto is building", testName, mode);
+Promise.resolve(`${process.cwd() + "/" + "testeranto.config.ts"}`).then(s => __importStar(require(s))).then(async (module) => {
+    const bigConfig = module.default;
+    const project = bigConfig.projects[testName];
+    if (!project) {
+        console.error("no project found for", testName, "in testeranto.config.ts");
+        process.exit(-1);
+    }
+    const rawConfig = bigConfig.projects[testName];
     const getSecondaryEndpointsPoints = (runtime) => {
         const meta = (ts, st) => {
             ts.forEach((t) => {
@@ -80,13 +77,25 @@ Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importSt
         };
         return Array.from(meta(config.tests, new Set()));
     };
-    const config = Object.assign(Object.assign({}, rawConfig), { buildDir: process.cwd() + "/" + rawConfig.outdir });
+    const config = Object.assign(Object.assign({}, rawConfig), { buildDir: process.cwd() + "/testeranto/bundles/" + testName });
+    console.log(`Press 'q' to shutdown gracefully. Press 'x' to shutdown forcefully.`);
+    process.stdin.on("keypress", (str, key) => {
+        if (key.name === "q") {
+            console.log("Testeranto-Build is shutting down...");
+            mode = "once";
+            onDone();
+        }
+        else if (key.name === "x") {
+            console.log("Testeranto-Build is shutting down forcefully...");
+            process.exit(-1);
+        }
+        else {
+            console.log(`Press 'q' to shutdown gracefully. Press 'x' to shutdown forcefully.`);
+        }
+    });
     let nodeDone = false;
     let webDone = false;
-    let mode = config.devMode ? "DEV" : "PROD";
     let status = "build";
-    // let pm: PM_Main | undefined = new PM_Main(config);
-    // const fileHashes = {};
     const { nodeEntryPoints, webEntryPoints } = getRunnables(config.tests);
     const onNodeDone = () => {
         nodeDone = true;
@@ -100,72 +109,67 @@ Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importSt
         if (nodeDone && webDone) {
             status = "built";
         }
-        if (nodeDone && webDone && status === "built") {
-            // Object.entries(nodeEntryPoints).forEach(([k, outputFile]) => {
-            //   console.log("watching", outputFile);
-            //   try {
-            //     watch(outputFile, async (filename) => {
-            //       const hash = await fileHash(outputFile);
-            //       if (fileHashes[k] !== hash) {
-            //         fileHashes[k] = hash;
-            //         console.log(`< ${filename} `);
-            //         pm.launchNode(k, outputFile);
-            //       }
-            //     });
-            //   } catch (e) {
-            //     console.error(e);
-            //   }
-            // });
-            // Object.entries(webEntryPoints).forEach(([k, outputFile]) => {
-            //   console.log("watching", outputFile);
-            //   watch(outputFile, async (filename) => {
-            //     const hash = await fileHash(outputFile);
-            //     console.log(`< ${filename} ${hash}`);
-            //     if (fileHashes[k] !== hash) {
-            //       fileHashes[k] = hash;
-            //       pm.launchWeb(k, outputFile);
-            //     }
-            //   });
-            // });
-        }
-        if (nodeDone && webDone && mode === "PROD") {
-            console.log("Testeranto-EsBuild is all done. Goodbye!");
+        if (nodeDone && webDone && mode === "once") {
+            console.log(ansi_colors_1.default.inverse(`${testName} has been built. Goodbye.`));
             process.exit();
         }
-        else {
-            if (mode === "PROD") {
-                console.log("waiting for tests to finish");
-                console.log(JSON.stringify({
-                    nodeDone: nodeDone,
-                    webDone: webDone,
-                    mode: mode,
-                }, null, 2));
-            }
-            else {
-                console.log("waiting for tests to change");
-            }
-            if (config.devMode) {
-                console.log("ready and watching for changes...");
-            }
-            else {
-                // pm.shutDown();
-            }
-            ////////////////////////////////////////////////////////////////////////////////
-        }
     };
-    console.log(`Press 'q' to shutdown gracefully. Press 'x' to shutdown forcefully.`);
-    process.stdin.on("keypress", (str, key) => {
-        if (key.name === "q") {
-            console.log("Testeranto-Build is shutting down...");
-            mode = "PROD";
-            onDone();
-        }
-        if (key.name === "x") {
-            console.log("Testeranto-Build is shutting down forcefully...");
-            process.exit(-1);
-        }
-    });
-    fs_1.default.writeFileSync(`${config.outdir}/testeranto.json`, JSON.stringify(config, null, 2));
+    if (!fs_1.default.existsSync(`testeranto/reports/${testName}`)) {
+        fs_1.default.mkdirSync(`testeranto/reports/${testName}`);
+    }
+    fs_1.default.writeFileSync(`${process.cwd()}/testeranto/reports/${testName}/index.html`, `
+    <!DOCTYPE html>
+    <html lang="en">
+  
+    <head>
+      <meta name="description" content="Webpage description goes here" />
+      <meta charset="utf-8" />
+      <title>kokomoBay - testeranto</title>
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
+      <meta name="author" content="" />
+  
+      <link rel="stylesheet" href="/kokomoBay/testeranto/ReportClient.css" />
+      <script type="module" src="/kokomoBay/testeranto/ReportClient.js"></script>
+  
+    </head>
+  
+    <body>
+      <div id="root">
+        react is loading
+      </div>
+    </body>
+  
+    </html>
+        `);
+    fs_1.default.writeFileSync(`testeranto/reports/${testName}/config.json`, JSON.stringify(config, null, 2));
+    fs_1.default.writeFileSync(`${process.cwd()}/testeranto/index.html`, `
+  <!DOCTYPE html>
+  <html lang="en">
+
+  <head>
+    <meta name="description" content="Webpage description goes here" />
+    <meta charset="utf-8" />
+    <title>kokomoBay - testeranto</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="author" content="" />
+
+    <script type="application/json" id="bigConfig">
+      ${JSON.stringify(Object.keys(bigConfig.projects))}
+    </script>
+
+    <link rel="stylesheet" href="/kokomoBay/testeranto/Project.css" />
+    <script type="module" src="/kokomoBay/testeranto/Project.js"></script>
+
+  </head>
+
+  <body>
+    <div id="root">
+      react is loading
+    </div>
+  </body>
+
+  </html>
+      `);
     Promise.resolve(Promise.all([...getSecondaryEndpointsPoints("web")].map(async (sourceFilePath) => {
         const sourceFileSplit = sourceFilePath.split("/");
         const sourceDir = sourceFileSplit.slice(0, -1);
@@ -174,13 +178,13 @@ Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importSt
             .split(".")
             .slice(0, -1)
             .join(".");
-        const htmlFilePath = path_1.default.normalize(`${process.cwd()}/${config.outdir}/web/${sourceDir.join("/")}/${sourceFileNameMinusJs}.html`);
+        const htmlFilePath = path_1.default.normalize(`${process.cwd()}/testeranto/bundles/web/${testName}/${sourceDir.join("/")}/${sourceFileNameMinusJs}.html`);
         const jsfilePath = `./${sourceFileNameMinusJs}.mjs`;
         return fs_1.default.promises
             .mkdir(path_1.default.dirname(htmlFilePath), { recursive: true })
             .then((x) => fs_1.default.writeFileSync(htmlFilePath, (0, web_html_js_1.default)(jsfilePath, htmlFilePath)));
     })));
-    (0, glob_1.glob)(`./${config.outdir}/chunk-*.mjs`, {
+    (0, glob_1.glob)(`${process.cwd()}/testeranto/bundles/${testName}/chunk-*.mjs`, {
         ignore: "node_modules/**",
     }).then((chunks) => {
         chunks.forEach((chunk) => {
@@ -189,9 +193,9 @@ Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importSt
     });
     await Promise.all([
         esbuild_1.default
-            .context((0, node_js_1.default)(config, Object.keys(nodeEntryPoints)))
+            .context((0, node_js_1.default)(config, Object.keys(nodeEntryPoints), testName))
             .then(async (nodeContext) => {
-            if (config.devMode) {
+            if (mode === "dev") {
                 await nodeContext.watch().then((v) => {
                     onNodeDone();
                 });
@@ -204,9 +208,9 @@ Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importSt
             return nodeContext;
         }),
         esbuild_1.default
-            .context((0, web_js_1.default)(config, Object.keys(webEntryPoints)))
+            .context((0, web_js_1.default)(config, Object.keys(webEntryPoints), testName))
             .then(async (webContext) => {
-            if (config.devMode) {
+            if (mode === "dev") {
                 await webContext.watch().then((v) => {
                     onWebDone();
                 });
@@ -220,3 +224,20 @@ Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importSt
         }),
     ]);
 });
+const getRunnables = (tests, payload = {
+    nodeEntryPoints: {},
+    webEntryPoints: {},
+}) => {
+    return tests.reduce((pt, cv, cndx, cry) => {
+        if (cv[1] === "node") {
+            pt.nodeEntryPoints[cv[0]] = path_1.default.resolve(`./docs/node/${cv[0].split(".").slice(0, -1).concat("mjs").join(".")}`);
+        }
+        else if (cv[1] === "web") {
+            pt.webEntryPoints[cv[0]] = path_1.default.resolve(`./docs/web/${cv[0].split(".").slice(0, -1).concat("mjs").join(".")}`);
+        }
+        if (cv[3].length) {
+            getRunnables(cv[3], payload);
+        }
+        return pt;
+    }, payload);
+};

package/dist/common/defaultConfig.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config = {
     src: "src",
-    outdir: "docs",
+    // outdir: "docs",
     tests: [],
     debugger: true,
     clearScreen: false,
     devMode: true,
     minify: false,
-    outbase: ".",
+    // outbase: ".",
     ports: ["3001"],
     externals: [],
     nodePlugins: [],

package/dist/common/esbuildConfigs/index.js

@@ -7,7 +7,7 @@ exports.default = (config) => {
         format: "esm",
         splitting: true,
         outExtension: { ".js": ".mjs" },
-        outbase: config.outbase,
+        outbase: ".",
         jsx: "transform",
         bundle: true,
         minify: config.minify === true,

package/dist/common/esbuildConfigs/inputFilesPlugin.js

@@ -11,15 +11,19 @@ const register = (entrypoint, sources) => {
     }
     sources.forEach((s) => otherInputs[entrypoint].add(s));
 };
-exports.default = (platform, entryPoints) => {
+exports.default = (platform, testName) => {
+    const d = `testeranto/bundles/${platform}/${testName}/`;
+    const f = `testeranto/bundles/${platform}/${testName}/metafile.json`;
+    if (!fs_1.default.existsSync(d)) {
+        fs_1.default.mkdirSync(d);
+    }
     return {
         register,
         inputFilesPluginFactory: {
             name: "metafileWriter",
             setup(build) {
                 build.onEnd((result) => {
-                    // console.log("build.onEnd", entryPoints);
-                    fs_1.default.writeFileSync(`docs/${platform}/metafile.json`, JSON.stringify(result, null, 2));
+                    fs_1.default.writeFileSync(f, JSON.stringify(result, null, 2));
                 });
             },
         },

package/dist/common/esbuildConfigs/node.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("./index.js"));
 const inputFilesPlugin_js_1 = __importDefault(require("./inputFilesPlugin.js"));
 const featuresPlugin_1 = __importDefault(require("./featuresPlugin"));
-exports.default = (config, entryPoints) => {
-    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("node", entryPoints);
-    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { splitting: true, outdir: config.outdir + "/node", 
+exports.default = (config, entryPoints, testName) => {
+    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("node", 
+    // entryPoints,
+    testName);
+    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { splitting: true, outdir: `testeranto/bundles/node/${testName}/`, 
         // inject: [`./node_modules/testeranto/dist/cjs-shim.js`],
         metafile: true, supported: {
             "dynamic-import": true,

package/dist/common/esbuildConfigs/web.js

@@ -7,9 +7,9 @@ const path_1 = __importDefault(require("path"));
 const index_js_1 = __importDefault(require("./index.js"));
 const inputFilesPlugin_js_1 = __importDefault(require("./inputFilesPlugin.js"));
 const featuresPlugin_js_1 = __importDefault(require("./featuresPlugin.js"));
-exports.default = (config, entryPoints) => {
-    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("web", entryPoints);
-    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { outdir: config.outdir + "/web", alias: {
+exports.default = (config, entryPoints, testName) => {
+    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("web", testName);
+    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { outdir: `testeranto/bundles/web/${testName}`, alias: {
             react: path_1.default.resolve("./node_modules/react"),
         }, metafile: true, external: [
             "path",

package/dist/common/init-docs.js

@@ -1,53 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
 const Init_1 = __importDefault(require("./Init"));
 console.log("Initializing a testeranto project");
-if (!process.argv[2]) {
-    console.log("You didn't pass a config file, so I will create one for you.");
-    fs_1.default.writeFileSync("testeranto.mts", fs_1.default.readFileSync("node_modules/testeranto/src/defaultConfig.ts"));
-    Promise.resolve(`${process.cwd() + "/" + "testeranto.mts"}`).then(s => __importStar(require(s))).then((module) => {
-        (0, Init_1.default)(module.default);
-    });
-}
-else {
-    Promise.resolve(`${process.cwd() + "/" + process.argv[2]}`).then(s => __importStar(require(s))).then((module) => {
-        (0, Init_1.default)(module.default);
-    });
-}
+(0, Init_1.default)();
+console.log("testeranto project initialized");

package/dist/common/lib/abstractBase.js

@@ -24,9 +24,11 @@ class BaseSuite {
     }
     toObj() {
         const givens = Object.keys(this.givens).map((k) => this.givens[k].toObj());
+        const checks = Object.keys(this.checks).map((k) => this.checks[k].toObj());
         return {
             name: this.name,
             givens,
+            checks,
             fails: this.fails,
             features: this.features(),
         };
@@ -42,29 +44,28 @@ class BaseSuite {
     }
     async run(input, testResourceConfiguration, artifactory, tLog, pm) {
         this.testResourceConfiguration = testResourceConfiguration;
-        tLog("test resources: ", JSON.stringify(testResourceConfiguration));
+        // tLog("test resources: ", JSON.stringify(testResourceConfiguration));
         const suiteArtifactory = (fPath, value) => artifactory(`suite-${this.index}-${this.name}/${fPath}`, value);
         // console.log("\nSuite:", this.index, this.name);
         tLog("\nSuite:", this.index, this.name);
         const sNdx = this.index;
         const sName = this.name;
+        const beforeAllProxy = new Proxy(pm, {
+            get(target, prop, receiver) {
+                if (prop === "customScreenShot") {
+                    return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { 
+                        // path: `${filepath}/${opts.path}`,
+                        path: `suite-${sNdx}/beforeAll/${opts.path}` }), p);
+                }
+                if (prop === "writeFileSync") {
+                    return (fp, contents) => target[prop](`suite-${sNdx}/beforeAll/${fp}`, contents);
+                }
+                /* @ts-ignore:next-line */
+                return Reflect.get(...arguments);
+            },
+        });
+        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, beforeAllProxy);
         for (const [gKey, g] of Object.entries(this.givens)) {
-            // console.log("gKey", gKey);
-            const beforeAllProxy = new Proxy(pm, {
-                get(target, prop, receiver) {
-                    if (prop === "customScreenShot") {
-                        return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { 
-                            // path: `${filepath}/${opts.path}`,
-                            path: `suite-${sNdx}/beforeAll/${opts.path}` }), p);
-                    }
-                    if (prop === "writeFileSync") {
-                        return (fp, contents) => target[prop](`suite-${sNdx}/beforeAll/${fp}`, contents);
-                    }
-                    /* @ts-ignore:next-line */
-                    return Reflect.get(...arguments);
-                },
-            });
-            const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, beforeAllProxy);
             const giver = this.givens[gKey];
             try {
                 this.store = await giver.give(subject, gKey, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm, sNdx);
@@ -75,6 +76,9 @@ class BaseSuite {
                 // return this;
             }
         }
+        for (const [ndx, thater] of this.checks.entries()) {
+            await thater.check(subject, thater.name, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm);
+        }
         try {
             this.afterAll(this.store, artifactory, 
             // afterAllProxy
@@ -85,17 +89,6 @@ class BaseSuite {
             // this.fails.push(this);
             // return this;
         }
-        // for (const [ndx, thater] of this.checks.entries()) {
-        //   await thater.check(
-        //     subject,
-        //     thater.name,
-        //     testResourceConfiguration,
-        //     this.assertThat,
-        //     suiteArtifactory,
-        //     tLog,
-        //     pm
-        //   );
-        // }
         // @TODO fix me
         // for (const k of Object.keys(this.givens)) {
         //   const giver = this.givens[k];
@@ -113,9 +106,7 @@ class BaseSuite {
 }
 exports.BaseSuite = BaseSuite;
 class BaseGiven {
-    constructor(name, features, whens, thens, givenCB, initialValues
-    // key: string
-    ) {
+    constructor(name, features, whens, thens, givenCB, initialValues) {
         this.name = name;
         this.features = features;
         this.whens = whens;
@@ -205,7 +196,8 @@ class BaseGiven {
                 afterEachProxy);
             }
             catch (e) {
-                console.error("afterEach failed! no error will be recorded!", e);
+                console.error("afterEach failed!", e);
+                this.error = e.message;
             }
         }
         return this.store;
@@ -225,7 +217,6 @@ class BaseWhen {
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
         tLog(" When:", this.name);
-        const name = this.name;
         const andWhenProxy = new Proxy(pm, {
             get(target, prop, receiver) {
                 if (prop === "customScreenShot") {
@@ -269,7 +260,16 @@ class BaseThen {
         };
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
-        tLog(" Then:", this.name);
+        this.go = async (s) => {
+            tLog(" Then!!!:", this.name);
+            try {
+                await this.thenCB(s);
+            }
+            catch (e) {
+                console.log("test failed", e);
+                this.error = e.message;
+            }
+        };
         try {
             const butThenProxy = new Proxy(pm, {
                 get(target, prop, receiver) {
@@ -283,7 +283,7 @@ class BaseThen {
                     return Reflect.get(...arguments);
                 },
             });
-            return this.butThen(store, this.thenCB, testResourceConfiguration, butThenProxy).catch((e) => {
+            return this.butThen(store, this.go, testResourceConfiguration, butThenProxy).catch((e) => {
                 this.error = true;
                 throw e;
             });
@@ -294,35 +294,41 @@ class BaseThen {
             throw e;
         }
     }
+    check() { }
 }
 exports.BaseThen = BaseThen;
 class BaseCheck {
-    constructor(name, features, checkCB, whens, thens) {
+    constructor(name, features, checker, x, checkCB) {
         this.name = name;
         this.features = features;
         this.checkCB = checkCB;
-        this.whens = whens;
-        this.thens = thens;
+        this.checker = checker;
     }
-    async afterEach(store, key, cb, pm) {
-        return;
+    toObj() {
+        return {
+            key: this.key,
+            name: this.name,
+            functionAsString: this.checkCB.toString(),
+            // thens: this.thens.map((t) => t.toObj()),
+            // error: this.error ? [this.error, this.error.stack] : null,
+            // fail: this.fail ? [this.fail] : false,
+            features: this.features,
+        };
+    }
+    async afterEach(store, key, artifactory, pm) {
+        return store;
+    }
+    beforeAll(store, 
+    // artifactory: ITestArtifactory
+    // subject,
+    initializer, artifactory, testResource, initialValues, pm) {
+        return store;
     }
     async check(subject, key, testResourceConfiguration, tester, artifactory, tLog, pm) {
+        this.key = key;
         tLog(`\n Check: ${this.name}`);
-        const store = await this.checkThat(subject, testResourceConfiguration, artifactory, pm);
-        await this.checkCB(Object.entries(this.whens).reduce((a, [key, when]) => {
-            a[key] = async (payload) => {
-                return await when(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, pm, "x");
-            };
-            return a;
-        }, {}), Object.entries(this.thens).reduce((a, [key, then]) => {
-            a[key] = async (payload) => {
-                const t = await then(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, pm);
-                tester(t);
-            };
-            return a;
-        }, {}));
-        await this.afterEach(store, key, () => { }, pm);
+        this.store = await this.checkThat(subject, testResourceConfiguration, artifactory, this.checkCB, this.initialValues, pm);
+        await this.checker(this.store, pm);
         return;
     }
 }

package/dist/common/lib/basebuilder.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseBuilder = void 0;
 class BaseBuilder {
     constructor(input, suitesOverrides, givenOverides, whenOverides, thenOverides, checkOverides, testResourceRequirement, testSpecification) {
-        this.input = input;
         this.artifacts = [];
         this.artifacts = [];
         this.testResourceRequirement = testResourceRequirement;
@@ -45,7 +44,7 @@ class BaseBuilder {
                     puppetMaster.writeFileSync(`bdd_errors.txt`, numberOfFailures.toString());
                     const o = this.toObj();
                     puppetMaster.writeFileSync(`littleBoard.html`, `
-            <!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -55,15 +54,15 @@ class BaseBuilder {
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="author" content="" />
 
-  <link rel="stylesheet" href="/kokomoBay/docs/TestReport.css" />
-  <script src="/kokomoBay/docs/TestReport.js"></script>
+  <link rel="stylesheet" href="/kokomoBay/testeranto/TestReport.css" />
+  <script src="/kokomoBay/testeranto/TestReport.js"></script>
 
 </head>
 
-  <body>
-    <h1>Test report</h1>
-            <div id="root"/>
-  </body>
+<body>
+  <h1>Test report</h1>
+  <div id="root"/>
+</body>
             `);
                     puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2));
                     return {