testeranto 0.80.0 → 0.81.1

package/dist/common/src/Project.js

@@ -12,44 +12,52 @@ const glob_1 = require("glob");
 const node_js_1 = __importDefault(require("./esbuildConfigs/node.js"));
 const web_js_1 = __importDefault(require("./esbuildConfigs/web.js"));
 const web_html_js_1 = __importDefault(require("./web.html.js"));
-var mode = process.argv[2] === "-dev" ? "DEV" : "PROD";
+// var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
 readline_1.default.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY)
     process.stdin.setRawMode(true);
-process.stdin.on("keypress", (str, key) => {
-    if (key.name === "q") {
-        console.log("Testeranto-EsBuild is shutting down...");
-        mode = "PROD";
-        onDone();
-    }
-});
-let nodeDone, webDone = false;
-const onNodeDone = () => {
-    nodeDone = true;
-    onDone();
-};
-const onWebDone = () => {
-    webDone = true;
-    onDone();
-};
-const onDone = () => {
-    console.log(JSON.stringify({
-        nodeDone,
-        webDone,
-        mode,
-    }, null, 2));
-    if (nodeDone && webDone && mode === "PROD") {
-        console.log("Testeranto-EsBuild is all done. Goodbye!");
-        process.exit();
-    }
-    else {
-        console.log("Testeranto-EsBuild is still working...");
-    }
-};
 class ITProject {
     constructor(configs) {
-        this.mode = `up`;
+        this.nodeDone = false;
+        this.webDone = false;
+        this.onNodeDone = () => {
+            this.nodeDone = true;
+            this.onDone();
+        };
+        this.onWebDone = () => {
+            this.webDone = true;
+            this.onDone();
+        };
+        this.onDone = () => {
+            // console.log(this.nodeDone && this.webDone && this.mode === "PROD");
+            if (this.nodeDone && this.webDone && this.mode === "PROD") {
+                console.log("Testeranto-EsBuild is all done. Goodbye!");
+                process.exit();
+            }
+            else {
+                if (this.mode === "PROD") {
+                    console.log("waiting for tests to finish");
+                    console.log(JSON.stringify({
+                        nodeDone: this.nodeDone,
+                        webDone: this.webDone,
+                        mode: this.mode,
+                    }, null, 2));
+                }
+                else {
+                    console.log("waiting for tests to change");
+                }
+                console.log("press 'q' to quit");
+            }
+        };
         this.config = configs;
+        this.mode = this.config.devMode ? "DEV" : "PROD";
+        process.stdin.on("keypress", (str, key) => {
+            if (key.name === "q") {
+                console.log("Testeranto-EsBuild is shutting down...");
+                this.mode = "PROD";
+                this.onDone();
+            }
+        });
         fs_1.default.writeFileSync(`${this.config.outdir}/testeranto.json`, JSON.stringify(Object.assign(Object.assign({}, this.config), { buildDir: process.cwd() + "/" + this.config.outdir }), null, 2));
         Promise.resolve(Promise.all([...this.getSecondaryEndpointsPoints("web")].map(async (sourceFilePath) => {
             const sourceFileSplit = sourceFilePath.split("/");
@@ -78,14 +86,14 @@ class ITProject {
             esbuild_1.default
                 .context((0, node_js_1.default)(this.config, nodeEntryPoints))
                 .then(async (nodeContext) => {
-                if (mode == "DEV") {
+                if (this.config.devMode) {
                     await nodeContext.watch().then((v) => {
-                        onNodeDone();
+                        this.onNodeDone();
                     });
                 }
                 else {
                     nodeContext.rebuild().then((v) => {
-                        onNodeDone();
+                        this.onNodeDone();
                     });
                 }
                 return nodeContext;
@@ -93,14 +101,14 @@ class ITProject {
             esbuild_1.default
                 .context((0, web_js_1.default)(this.config, webEntryPoints))
                 .then(async (webContext) => {
-                if (mode == "DEV") {
+                if (this.config.devMode) {
                     await webContext.watch().then((v) => {
-                        onWebDone();
+                        this.onWebDone();
                     });
                 }
                 else {
                     webContext.rebuild().then((v) => {
-                        onWebDone();
+                        this.onWebDone();
                     });
                 }
                 return webContext;

package/dist/common/src/Puppeteer.js

@@ -8,20 +8,14 @@ const fs_1 = __importDefault(require("fs"));
 const recursive_watch_1 = __importDefault(require("recursive-watch"));
 const main_js_1 = require("./PM/main.js");
 const utils_js_1 = require("./utils.js");
-var mode = process.argv[2] === "-dev" ? "DEV" : "PROD";
-const node2web = {};
-const web2node = {};
-const childProcesses = {};
+// var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
+// const node2web: Record<string, string[]> = {};
+// const web2node: Record<string, string[]> = {};
+// const childProcesses: Record<string, "loaded" | "running" | "done"> = {};
 readline_1.default.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY)
     process.stdin.setRawMode(true);
-// console.log("hello Puppeteer", process.env);
-console.log("\n Puppeteer is running. Press 'q' to quit\n");
-process.stdin.on("keypress", (str, key) => {
-    if (key.name === "q") {
-        process.exit();
-    }
-});
+// let shutDownMode = false;
 exports.default = async (partialConfig) => {
     const config = Object.assign(Object.assign({}, partialConfig), { buildDir: process.cwd() + "/" + partialConfig.outdir });
     fs_1.default.writeFileSync(`${config.outdir}/testeranto.json`, JSON.stringify(Object.assign(Object.assign({}, config), { buildDir: process.cwd() + "/" + config.outdir }), null, 2));
@@ -66,6 +60,13 @@ exports.default = async (partialConfig) => {
             // "--start-maximized",
         ],
     }, ".");
+    console.log("\n Puppeteer is running. Press 'q' to quit\n");
+    process.stdin.on("keypress", (str, key) => {
+        if (key.name === "q") {
+            pm.shutDown();
+            // process.exit();
+        }
+    });
     config.tests.forEach(([test, runtime, tr, sidecars]) => {
         if (runtime === "node") {
             pm.launchNode(test, (0, utils_js_1.destinationOfRuntime)(test, "node", config));
@@ -77,33 +78,39 @@ exports.default = async (partialConfig) => {
             console.error("runtime makes no sense", runtime);
         }
     });
-    console.log("ready and watching for changes...", config.buildDir);
-    (0, recursive_watch_1.default)(config.buildDir, (eventType, changedFile) => {
-        if (changedFile) {
-            config.tests.forEach(([test, runtime, tr, sidecars]) => {
-                if (eventType === "change" || eventType === "rename") {
-                    if (changedFile ===
-                        test
-                            .replace("./", "node/")
-                            .split(".")
-                            .slice(0, -1)
-                            .concat("mjs")
-                            .join(".")) {
-                        pm.launchNode(test, (0, utils_js_1.destinationOfRuntime)(test, "node", config));
-                    }
-                    if (changedFile ===
-                        test
-                            .replace("./", "web/")
-                            .split(".")
-                            .slice(0, -1)
-                            .concat("mjs")
-                            .join(".")) {
-                        pm.launchWeb(test, (0, utils_js_1.destinationOfRuntime)(test, "web", config), sidecars);
+    if (config.devMode) {
+        console.log("ready and watching for changes...", config.buildDir);
+        (0, recursive_watch_1.default)(config.buildDir, (eventType, changedFile) => {
+            if (changedFile) {
+                config.tests.forEach(([test, runtime, tr, sidecars]) => {
+                    if (eventType === "change" || eventType === "rename") {
+                        if (changedFile ===
+                            test
+                                .replace("./", "node/")
+                                .split(".")
+                                .slice(0, -1)
+                                .concat("mjs")
+                                .join(".")) {
+                            pm.launchNode(test, (0, utils_js_1.destinationOfRuntime)(test, "node", config));
+                        }
+                        if (changedFile ===
+                            test
+                                .replace("./", "web/")
+                                .split(".")
+                                .slice(0, -1)
+                                .concat("mjs")
+                                .join(".")) {
+                            pm.launchWeb(test, (0, utils_js_1.destinationOfRuntime)(test, "web", config), sidecars);
+                        }
                     }
-                }
-            });
-        }
-    });
+                });
+            }
+        });
+    }
+    else {
+        pm.shutDown();
+    }
+    // pm.browser.close();
     // does not work on linux
     // fs.watch(
     //   config.buildDir,

package/dist/common/src/SubPackages/react-test-renderer/jsx/index.js

@@ -29,15 +29,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.testInterface = void 0;
 const react_1 = __importDefault(require("react"));
 const react_test_renderer_1 = __importStar(require("react-test-renderer"));
+const Context = react_1.default.createContext({});
+const AppContext = react_1.default.createContext({});
+const contextValue = {
+    ingredients: ["flour", "sugar", "eggs"],
+    temperature: "200",
+};
 exports.testInterface = {
     butThen: async function (s, thenCB, tr) {
-        console.log("butThen", thenCB.toString());
+        // console.log("butThen", thenCB.toString());
         return thenCB(s);
     },
     beforeEach: function (CComponent, props) {
         let component;
         (0, react_test_renderer_1.act)(() => {
-            component = react_test_renderer_1.default.create(react_1.default.createElement(CComponent, props, []));
+            // component = renderer.create(
+            //   React.createElement(
+            //     AppContext.Provider,
+            //     { value: contextValue },
+            //     React.createElement(AppContext.Consumer, null, (context) =>
+            //       React.createElement(CComponent, Object.assign({}, context, {}))
+            //     )
+            //   )
+            // );
+            component = react_test_renderer_1.default.create(react_1.default.createElement(CComponent, props, react_1.default.createElement(CComponent, props, [])));
         });
         return component;
     },

package/dist/common/src/esbuildConfigs/inputFilesPlugin.js

@@ -6,20 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 exports.default = (platform, entryPoints) => {
-    console.log("mark3", platform);
     return {
         name: "metafileWriter",
         setup(build) {
             build.onEnd((result) => {
                 if (result.errors.length === 0) {
                     entryPoints.forEach((entryPoint) => {
-                        console.log("mark1", entryPoint);
                         const filePath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `inputFiles.json`);
+                        const promptPath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `prompt.txt`);
+                        const testPaths = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `tests.json`);
                         const dirName = path_1.default.dirname(filePath);
                         if (!fs_1.default.existsSync(dirName)) {
                             fs_1.default.mkdirSync(dirName, { recursive: true });
                         }
-                        const jsonContent = JSON.stringify(Object.keys(Object.keys(result.metafile.outputs)
+                        const j = Object.keys(Object.keys(result.metafile.outputs)
                             .filter((s) => {
                             if (!result.metafile.outputs[s].entryPoint) {
                                 return false;
@@ -30,20 +30,47 @@ exports.default = (platform, entryPoints) => {
                             .reduce((mm, el) => {
                             mm.push(result.metafile.outputs[el].inputs);
                             return mm;
-                        }, [])[0])
-                            .filter((f) => {
+                        }, [])[0]).filter((f) => {
                             const regex = /^src\/.*/g;
                             const matches = f.match(regex);
                             const passes = (matches === null || matches === void 0 ? void 0 : matches.length) === 1;
                             return passes;
-                        })
-                            .filter((f) => {
-                            const regex = /.*\.test\..*/g;
-                            const matches = f.match(regex);
-                            const passes = (matches === null || matches === void 0 ? void 0 : matches.length) === 1;
-                            return !passes;
-                        }));
+                        });
+                        // .filter((f: string) => {
+                        //   const regex = /.*\.test\..*/g;
+                        //   const matches = f.match(regex);
+                        //   const passes = matches?.length === 1;
+                        //   return !passes;
+                        // })
+                        const jsonContent = JSON.stringify(j);
                         fs_1.default.writeFileSync(filePath, jsonContent);
+                        fs_1.default.writeFileSync(promptPath, `
+${j
+                            .map((x) => {
+                            return `/add ${x}`;
+                        })
+                            .join("\n")}
+/read ${testPaths}
+  
+/code fix the failing tests described in ${filePath}.
+`);
+                        //             fs.writeFileSync(
+                        //               promptPath,
+                        //               `
+                        // from aider.coders import Coder
+                        // from aider.models import Model
+                        // import os
+                        // model = Model("deepseek")
+                        // coder = Coder.create(main_model=model)
+                        // coder.run("/read-only", "${testPaths}")
+                        // ${j
+                        //   .map((x) => {
+                        //     return `coder.run("/add", "${x}")`;
+                        //   })
+                        //   .join("\n")}
+                        // coder.run("fix the failing tests described in ${filePath}.")
+                        // `
+                        //             );
                     });
                 }
             });

package/dist/common/src/esbuildConfigs/web.js

@@ -16,10 +16,10 @@ exports.default = (config, entryPoints) => {
         outdir: config.outdir + "/web", alias: {
             react: path_1.default.resolve("./node_modules/react"),
         }, metafile: true, external: [
-            "testeranto.json",
-            "features.test.ts",
+            // "testeranto.json",
+            // "features.test.ts",
             // "url",
-            "react",
+            // "react",
             "path",
             "fs",
             "stream",

package/dist/common/src/lib/abstractBase.js

@@ -10,10 +10,22 @@ class BaseSuite {
         this.fails = [];
     }
     toObj() {
+        const givens = Object.keys(this.givens).map((k) => this.givens[k].toObj());
+        const features = Object.keys(this.givens)
+            .map((k) => this.givens[k].features)
+            .flat()
+            .filter((value, index, array) => {
+            return array.indexOf(value) === index;
+        })
+            .reduce((mm, lm) => {
+            mm[lm] = lm;
+            return mm;
+        }, {});
         return {
             name: this.name,
-            givens: Object.keys(this.givens).map((k) => this.givens[k].toObj()),
+            givens,
             fails: this.fails,
+            features,
         };
     }
     setup(s, artifactory, tr, pm) {
@@ -230,7 +242,7 @@ class BaseGiven {
                 },
             });
             this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, beforeEachProxy);
-            console.log("mark6", this.store);
+            // console.log("mark6", this.store);
             for (const [whenNdx, whenStep] of this.whens.entries()) {
                 await whenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${key}/when/${whenNdx}`);
             }
@@ -329,7 +341,7 @@ class BaseGiven {
                         return Reflect.get(...arguments);
                     },
                 });
-                console.log("mark5", this.store, key);
+                // console.log("mark5", this.store, key);
                 await this.afterEach(this.store, key, givenArtifactory, afterEachProxy);
             }
             catch (e) {
@@ -448,13 +460,21 @@ class BaseWhen {
                 return Reflect.get(...arguments);
             },
         });
-        try {
-            return await this.andWhen(store, this.whenCB, testResourceConfiguration, andWhenProxy);
-        }
-        catch (e) {
+        return this.andWhen(store, this.whenCB, testResourceConfiguration, andWhenProxy).catch((e) => {
             this.error = true;
-            throw e;
-        }
+            // throw e;
+        });
+        // try {
+        //   return await this.andWhen(
+        //     store,
+        //     this.whenCB,
+        //     testResourceConfiguration,
+        //     andWhenProxy
+        //   );
+        // } catch (e) {
+        //   this.error = true;
+        //   throw e;
+        // }
     }
 }
 exports.BaseWhen = BaseWhen;
@@ -535,10 +555,18 @@ class BaseThen {
                     return Reflect.get(...arguments);
                 },
             });
-            const x = await this.butThen(store, this.thenCB, testResourceConfiguration, butThenProxy
-            // pm
-            );
-            return x;
+            // const x = await this.butThen(
+            //   store,
+            //   this.thenCB,
+            //   testResourceConfiguration,
+            //   butThenProxy
+            // );
+            // return x;
+            return this.butThen(store, this.thenCB, testResourceConfiguration, butThenProxy).catch((e) => {
+                console.log("mar123");
+                this.error = true;
+                throw e;
+            });
         }
         catch (e) {
             console.log("test failed", e);

package/dist/common/src/lib/basebuilder.js

@@ -16,12 +16,15 @@ class BaseBuilder {
         this.specs = testSpecification(this.Suites(), this.Given(), this.When(), this.Then(), this.Check());
         this.testJobs = this.specs.map((suite) => {
             const suiteRunner = (suite) => async (puppetMaster, tLog) => {
-                await puppetMaster.startPuppeteer({
+                const puppeteerBrowser = await puppetMaster.startPuppeteer({
                     browserWSEndpoint: puppetMaster.testResourceConfiguration.browserWSEndpoint,
                 }, puppetMaster.testResourceConfiguration.fs);
-                return await suite.run(input, puppetMaster.testResourceConfiguration, (fPath, value) => puppetMaster.testArtiFactoryfileWriter(tLog, (p) => {
+                const x = await suite.run(input, puppetMaster.testResourceConfiguration, (fPath, value) => puppetMaster.testArtiFactoryfileWriter(tLog, (p) => {
                     this.artifacts.push(p);
                 })(puppetMaster.testResourceConfiguration.fs + "/" + fPath, value), tLog, puppetMaster);
+                // await puppetMaster.browser.disconnect();
+                // puppeteerBrowser.close();
+                return x;
             };
             const runner = suiteRunner(suite);
             return {
@@ -31,7 +34,7 @@ class BaseBuilder {
                 },
                 runner,
                 receiveTestResourceConfig: async function (puppetMaster) {
-                    await puppetMaster.mkdirSync();
+                    // await puppetMaster.mkdirSync();
                     const logFilePath = "log.txt";
                     const access = await puppetMaster.createWriteStream(logFilePath);
                     const tLog = (...l) => {

package/dist/common/src/lib/core.js

@@ -48,11 +48,55 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
             }
         }, class When extends abstractBase_js_1.BaseWhen {
             async andWhen(store, whenCB, testResource, pm) {
-                return await fullTestInterface.andWhen(store, whenCB, testResource, pm);
+                try {
+                    return await fullTestInterface.andWhen(store, whenCB, testResource, pm);
+                }
+                catch (e) {
+                    throw e;
+                }
+                // return fullTestInterface
+                //   .andWhen(store, whenCB, testResource, pm)
+                //   .catch((e) => {
+                //     throw e;
+                //   });
+                // return new Promise((res, rej) => {
+                //   fullTestInterface.andWhen(store, whenCB, testResource, pm);
+                // });
+                // return await fullTestInterface.andWhen(
+                //   store,
+                //   whenCB,
+                //   testResource,
+                //   pm
+                // );
             }
         }, class Then extends abstractBase_js_1.BaseThen {
-            async butThen(store, thenCB, testResourceConfiguration, pm) {
-                return await fullTestInterface.butThen(store, thenCB, testResourceConfiguration, pm);
+            async butThen(store, thenCB, testResource, pm) {
+                return fullTestInterface
+                    .butThen(store, thenCB, testResource, pm)
+                    .then((v) => {
+                    return v;
+                }, (e) => {
+                    console.log(" ERROR ", e);
+                    throw e;
+                });
+                // try {
+                //   console.log("mark 4");
+                //   return await fullTestInterface.butThen(
+                //     store,
+                //     thenCB,
+                //     testResource,
+                //     pm
+                //   );
+                // } catch (e) {
+                //   console.log("mar123");
+                //   throw e;
+                // }
+                // return await fullTestInterface.butThen(
+                //   store,
+                //   thenCB,
+                //   testResourceConfiguration,
+                //   pm
+                // );
             }
         }, class Check extends abstractBase_js_1.BaseCheck {
             constructor(name, features, checkCallback, whens, thens, initialValues) {