testeranto 0.62.0 → 0.70.0

package/dist/common/SubPackages/react-dom/jsx/web.js

@@ -33,13 +33,13 @@ exports.default = (testImplementations, testSpecifications, testInput) => {
     document.addEventListener("DOMContentLoaded", function () {
         const rootElement = document.getElementById("root");
         if (rootElement) {
-            const TesterantoComponent = function ({ done, innerComp }) {
+            const TesterantoComponent = function ({ done, innerComp, }) {
                 const myContainer = (0, react_1.useRef)(null);
                 (0, react_1.useEffect)(() => {
                     console.log("useEffect called", myContainer.current);
                     done(myContainer.current);
                 }, []);
-                return react_1.default.createElement('div', { ref: myContainer }, innerComp());
+                return react_1.default.createElement("div", { ref: myContainer }, innerComp());
             };
             (0, Web_js_1.default)(testInput, testSpecifications, testImplementations, {
                 beforeAll: async (input, artificer) => {
@@ -55,28 +55,36 @@ exports.default = (testImplementations, testSpecifications, testInput) => {
                                 process.nextTick(() => {
                                     resolve(reactElement);
                                 });
-                            }
+                            },
                         }), rootElement);
                     });
                 },
                 andWhen: function (s, whenCB) {
                     return new Promise((resolve, rej) => {
-                        process.nextTick(() => { resolve(whenCB()(s)); });
+                        process.nextTick(() => {
+                            resolve(whenCB()(s));
+                        });
                     });
                 },
                 butThen: async function (s) {
                     return new Promise((resolve, rej) => {
-                        process.nextTick(() => { resolve(s); });
+                        process.nextTick(() => {
+                            resolve(s);
+                        });
                     });
                 },
                 afterEach: async function (store, ndx, artificer) {
                     return new Promise((resolve, rej) => {
-                        process.nextTick(() => { resolve({}); });
+                        process.nextTick(() => {
+                            resolve({});
+                        });
                     });
                 },
                 afterAll: (store, artificer) => {
                     return new Promise((resolve, rej) => {
-                        process.nextTick(() => { resolve({}); });
+                        process.nextTick(() => {
+                            resolve({});
+                        });
                     });
                 },
             });

package/dist/common/SubPackages/react-test-renderer/MemoExoticComponent/node.js

@@ -26,9 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Node_1 = __importDefault(require("../../../Node"));
 const react_1 = __importDefault(require("react"));
 const react_test_renderer_1 = __importStar(require("react-test-renderer"));
+const Node_1 = __importDefault(require("../../../Node"));
 exports.default = (testImplementations, testSpecifications, testInput) => (0, Node_1.default)(testInput, testSpecifications, testImplementations, {
     beforeEach: function (CComponent, props) {
         let component;

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

@@ -75,7 +75,6 @@ exports.testInterface = {
     // },
     butThen: async function (s, thenCB, tr) {
         console.log("butThen", thenCB.toString());
-        // debugger
         return thenCB(s);
     },
     afterEach: async function (store, ndx, artificer) {

package/dist/common/SubPackages/react-test-renderer/fc/web.js

@@ -26,9 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Web_js_1 = __importDefault(require("../../../Web.js"));
 const react_1 = __importDefault(require("react"));
 const react_test_renderer_1 = __importStar(require("react-test-renderer"));
+const Web_js_1 = __importDefault(require("../../../Web.js"));
 exports.default = (testImplementations, testSpecifications, testInput) => (0, Web_js_1.default)(testInput, testSpecifications, testImplementations, {
     beforeEach: function (CComponent, props) {
         return new Promise((res, rej) => {

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

@@ -32,7 +32,6 @@ const react_test_renderer_1 = __importStar(require("react-test-renderer"));
 exports.testInterface = {
     butThen: async function (s, thenCB, tr) {
         console.log("butThen", thenCB.toString());
-        // debugger
         return thenCB(s);
     },
     beforeEach: function (CComponent, props) {
@@ -46,5 +45,5 @@ exports.testInterface = {
     andWhen: async function (renderer, whenCB) {
         await (0, react_test_renderer_1.act)(() => whenCB(renderer));
         return renderer;
-    }
+    },
 };

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

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_js_1 = require("./index.js");
 const Web_js_1 = __importDefault(require("../../../Web.js"));
+const index_js_1 = require("./index.js");
 exports.default = (testImplementations, testSpecifications, testInput, testInterface2 = index_js_1.testInterface) => {
     return (0, Web_js_1.default)(testInput, testSpecifications, testImplementations, testInterface2);
 };

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

@@ -38,5 +38,5 @@ exports.testInterface = {
     andWhen: async function (renderer, whenCB) {
         await (0, react_test_renderer_1.act)(() => whenCB()(renderer));
         return renderer;
-    }
+    },
 };

package/dist/common/Types.js

@@ -1,34 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TBrowser = void 0;
-// export class TPage extends Page {
-//   // screenshot(options?: puppeteer.ScreenshotOptions) {
-//   //   return super.screenshot({
-//   //     ...options,
-//   //     path: "dist/" + (options ? options : { path: "" }).path,
-//   //   });
-//   // }
-// }
-class TBrowser {
-    constructor(browser) {
-        this.browser = browser;
-    }
-    pages() {
-        return new Promise(async (res, rej) => {
-            res((await this.browser.pages()).map((p) => {
-                // const handler = {
-                //   apply: function (target, thisArg, argumentsList) {
-                //     console.log('screenshot was called with ' + JSON.stringify(argumentsList));
-                //     const x: ScreenshotOptions = argumentsList[0]
-                //     x.path = "./dist/" + x.path;
-                //     console.log('x.path' + x.path, target, thisArg);
-                //     return target(...argumentsList);
-                //   }
-                // };
-                // p.screenshot = new Proxy(p.screenshot, handler);
-                return p;
-            }));
-        });
-    }
-}
-exports.TBrowser = TBrowser;
+// export type ITTestShape = {
+// };

package/dist/common/Web.js

@@ -5,25 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_js_1 = __importDefault(require("./lib/core.js"));
 const index_js_1 = require("./lib/index.js");
-const remote = require('@electron/remote');
+// const remote = require("@electron/remote");
+// import remote from "@electron/remote";
+// const electron = require("electron");
+// const remote =
+//   process.type === "browser" ? electron : require("@electron/remote");
 class WebTesteranto extends core_js_1.default {
     constructor(input, testSpecification, testImplementation, testResourceRequirement, testInterface) {
         super(input, testSpecification, testImplementation, testResourceRequirement, window.NodeWriter, testInterface);
-        if (process.argv[2]) {
-            const testResourceArg = decodeURIComponent(new URLSearchParams(location.search).get('requesting') || '');
-            try {
-                const partialTestResource = JSON.parse(testResourceArg);
-                this.receiveTestResourceConfig(this.testJobs[0], partialTestResource);
-            }
-            catch (e) {
-                console.error(e);
-                // process.exit(-1);
-            }
+        const testResourceArg = decodeURIComponent(new URLSearchParams(location.search).get("requesting") || "");
+        try {
+            const partialTestResource = JSON.parse(testResourceArg);
+            this.receiveTestResourceConfig(this.testJobs[0], partialTestResource);
         }
-        else {
-            // no-op
+        catch (e) {
+            console.error(e);
+            // process.exit(-1);
         }
-        const requesting = new URLSearchParams(location.search).get('requesting');
+        const requesting = new URLSearchParams(location.search).get("requesting");
         if (requesting) {
             const testResourceArg = decodeURIComponent(requesting);
             try {
@@ -36,17 +35,25 @@ class WebTesteranto extends core_js_1.default {
                 // process.exit(-1);
             }
         }
-        // const t: ITestJob = this.testJobs[0];
     }
     async receiveTestResourceConfig(t, partialTestResource) {
-        const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource, remote);
+        const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource, {
+            browser: await window.browser,
+            ipc: window.ipcRenderer,
+        });
+        console.log("test is done, awaiting test result write to fs");
         Promise.all([...artifacts, logPromise]).then(async () => {
-            var window = remote.getCurrentWindow();
+            // we can't close the window becuase we might be taking a screenshot
             // window.close();
+            // console.log(
+            //   "(window as any).browser",
+            //   JSON.stringify(await (window as any).browser)
+            // );
+            // var currentWindow = (await (window as any).browser).getCurrentWindow();
+            // currentWindow.close();
         });
     }
 }
-;
 exports.default = async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = index_js_1.defaultTestResourceRequirement) => {
     return new WebTesteranto(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
 };

package/dist/common/electron.js

@@ -3,12 +3,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const readline_1 = __importDefault(require("readline"));
 const electron_1 = require("electron");
 const puppeteer_in_electron_1 = __importDefault(require("puppeteer-in-electron"));
 const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const jsonc_1 = require("jsonc");
+const uuid_1 = require("uuid");
+var mode = process.argv[2] === "-dev" ? "DEV" : "PROD";
+console.log("hello electron", mode);
+const nodeChildren = {};
+const webChildren = {};
+const node2web = {};
+const web2node = {};
+const childProcesses = {};
+readline_1.default.emitKeypressEvents(process.stdin);
+if (process.stdin.isTTY)
+    process.stdin.setRawMode(true);
+console.log("\n Electron is running. Press 'q' to quit\n");
+process.stdin.on("keypress", (str, key) => {
+    if (key.name === "q") {
+        mode = "PROD";
+        // process.exit();
+        console.log("Switching to prod mode. Begin shutdown sequence...");
+        // process.exit(-1);
+        const allDone = Object.values(childProcesses).every((v) => v === "done");
+        if (allDone && mode === "PROD") {
+            console.log("Goodbye Testeranto by manual shutdown");
+            process.exit();
+        }
+        else {
+            console.log(childProcesses);
+        }
+    }
+});
+const onDone = (test) => {
+    console.log("onDone", test);
+    childProcesses[test] = "done";
+    const allDone = Object.values(childProcesses).every((v) => v === "done");
+    if (allDone && mode === "PROD") {
+        console.log("Goodbye Testeranto by auto shutdown");
+        process.exit();
+    }
+    else {
+        console.log(childProcesses);
+    }
+};
+process.on("message", function (message) {
+    console.log("message: " + message);
+    process.exit();
+});
 const remoteMain = require("@electron/remote/main");
 remoteMain.initialize();
 const main = async () => {
@@ -19,7 +64,7 @@ const main = async () => {
             webPreferences: {
                 offscreen: false,
                 devTools: true,
-            }
+            },
         });
         win.loadFile(`/${configs.buildDir}/report.html`).then(async (x) => {
             // pie.connect(app, puppeteer).then(async (browser) => {
@@ -31,135 +76,184 @@ const main = async () => {
             // })
         });
     };
-    const launchNode = (t, x) => {
-        var _a;
-        const f = x.replace(".ts", ".mjs");
-        const a = JSON.stringify({
+    const launchNode = (src, dest) => {
+        var _a, _b;
+        console.log("launchNode", src);
+        childProcesses[src] = "running";
+        const destFolder = dest.replace(".mjs", "");
+        const argz = JSON.stringify({
             scheduled: true,
-            name: x,
-            ports: [],
-            fs: path_1.default.resolve(configs.buildDir, "node", t),
+            name: src,
+            ports: [3333],
+            // fs: path.resolve(configs.buildDir, "web", destFolder + "/"),
+            // fs: destFolder,
+            fs: ".",
         });
-        console.log("launchNode", f, a);
-        const child = electron_1.utilityProcess.fork(f, [a], {});
-        child.postMessage({ message: 'hello' });
-        child.on('message', (data) => {
-            console.log("from child", data);
-            launchWebSecondary(process.cwd() + data);
+        // console.log("launchNode", src, dest, " -> ", destFolder, argz);
+        const child = electron_1.utilityProcess.fork(dest + ".mjs", [argz], {
+            cwd: destFolder,
+            stdio: "pipe",
         });
-        child.on('exit', (data) => {
-            console.log("node process ended with: ", data);
-            fileStream.close();
+        const nodeGuid = (0, uuid_1.v4)();
+        nodeChildren[nodeGuid] = child;
+        if (!fs_1.default.existsSync(destFolder)) {
+            fs_1.default.mkdirSync(destFolder, { recursive: true });
+        }
+        fs_1.default.rmSync(`${destFolder}/stdout.log`, { force: true });
+        fs_1.default.rmSync(`${destFolder}/stderr.log`, { force: true });
+        const stdout = fs_1.default.createWriteStream(`${destFolder}/stdout.log`);
+        const stderr = fs_1.default.createWriteStream(`${destFolder}/stderr.log`);
+        child
+            .on("message", (data) => {
+            console.log("from child", JSON.stringify(data));
+            if (data.launchWeb) {
+                const guid = (0, uuid_1.v4)();
+                const webChild = launchWebSecondary(process.cwd() + data.launchWeb);
+                // child.postMessage({ webLaunched: guid });
+                webChild.webContents.on("did-finish-load", () => {
+                    // webChild.webContents.send("message", "hello world");
+                    child.postMessage({ webLaunched: guid });
+                    webChildren[guid] = webChild;
+                    node2web[nodeGuid] = [...(node2web[nodeGuid] || []), guid];
+                });
+            }
+            if (data.teardown) {
+                webChildren[data.teardown].close();
+                delete webChildren[data.teardown];
+                node2web[nodeGuid] = node2web[nodeGuid].filter((x) => x !== data.teardown);
+            }
+        })
+            .on("exit", (data) => {
+            stdout.close();
+            stderr.close();
+            console.log(`ending node ${src}`);
+            onDone(src);
         });
-        // child.stdout
-        // child..on("", (data) => {
-        //   console.log("from child", data) // hello world!
-        //   launchWebSecondary(process.cwd() + data);
-        // })
-        // Create a write stream for the file
-        const fileStream = fs_1.default.createWriteStream('errors.txt');
-        // Pipe the child process's stdout to the file
-        (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.pipe(fileStream);
-        // // Handle errors
-        // child.on('error', (err) => {
-        //   console.error('Error spawning child process:', err);
-        // });
-        // fileStream.on('error', (err) => {
-        //   console.error('Error writing to file:', err);
-        // });
-        // // Log a message when the child process exits
-        // child.on('close', (code) => {
-        //   console.log(`Child process exited with code ${code}`);
-        // });
-        // console.log("child", child);
-        // child.stdout?.on("data", (x) => {
-        //   console.log("x", x)
-        // })
+        (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.pipe(stdout);
+        (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.pipe(stderr);
     };
     const launchWebSecondary = (htmlFile) => {
         console.log("launchWebSecondary", htmlFile);
         const subWin = new electron_1.BrowserWindow({
-            show: true,
+            show: false,
             webPreferences: {
                 nodeIntegration: true,
                 nodeIntegrationInWorker: true,
                 contextIsolation: false,
-                preload: path_1.default.join(electron_1.app.getAppPath(), 'preload.js'),
+                preload: path_1.default.join(electron_1.app.getAppPath(), "preload.js"),
                 offscreen: false,
-                devTools: false,
-            }
+                devTools: true,
+            },
         });
         remoteMain.enable(subWin.webContents);
         subWin.webContents.openDevTools();
         subWin.loadFile(htmlFile);
+        return subWin;
+        // const uuid = uuidv4();
+        // windows[uuid] = subWin;
+        // return uuid;
     };
-    const launchWeb = (t, changedFile) => {
-        console.log("launchWeb", changedFile);
+    const launchWeb = (t, dest) => {
+        console.log("launchWeb", t);
+        childProcesses[t] = "running";
+        const destFolder = dest.replace(".mjs", "");
         const subWin = new electron_1.BrowserWindow({
             show: true,
             webPreferences: {
                 nodeIntegration: true,
                 nodeIntegrationInWorker: true,
                 contextIsolation: false,
-                preload: path_1.default.join(electron_1.app.getAppPath(), 'preload.js'),
+                preload: path_1.default.join(electron_1.app.getAppPath(), "preload.js"),
                 offscreen: false,
                 devTools: true,
-            }
+            },
         });
+        webChildren[(0, uuid_1.v4)()] = subWin;
         remoteMain.enable(subWin.webContents);
-        // subWin.webContents.openDevTools()
-        const htmlFile = changedFile.split(".").slice(0, -1).concat("html").join(".");
-        subWin.loadFile(htmlFile, {
+        const webArgz = JSON.stringify({
+            name: dest,
+            ports: [].toString(),
+            fs: destFolder,
+        });
+        // console.log("webArgz", webArgz);
+        subWin.loadFile(`${dest}.html`, {
             query: {
-                requesting: encodeURIComponent(JSON.stringify({
-                    name: changedFile,
-                    ports: [].toString(),
-                    fs: path_1.default.resolve(configs.buildDir, "web", t),
-                }))
-            }
+                requesting: encodeURIComponent(webArgz),
+            },
+        });
+        if (!fs_1.default.existsSync(destFolder)) {
+            fs_1.default.mkdirSync(destFolder, { recursive: true });
+        }
+        const stdout = fs_1.default.createWriteStream(`${destFolder}/stdout.log`);
+        subWin.webContents.on("console-message", (event, level, message, line, sourceId) => {
+            stdout.write(JSON.stringify({
+                event,
+                level,
+                message: JSON.stringify(message),
+                line,
+                sourceId,
+            }, null, 2));
+            stdout.write("\n");
+        });
+        subWin.on("closed", () => {
+            stdout.close();
+            console.log(`ending web ${t}`);
+            // childProcesses[t] = "done";
+            onDone(t);
+        });
+        electron_1.ipcMain.on("message", (message, data) => {
+            console.log("ipcMain message: " + JSON.stringify(data));
+            // process.exit();
         });
     };
-    const watcher = (test, runtime) => {
-        return path_1.default.normalize(`${configs.buildDir}/${runtime}/${test.split('.').slice(0, -1).concat('mjs').join('.')}`);
-    };
-    const changer = (f) => {
-        return path_1.default.normalize(`${configs.buildDir}/${f}`);
-    };
-    const changer2 = (f, r) => {
-        return path_1.default.normalize(`${configs.buildDir}/${r}/${f}`);
+    const destinationOfRuntime = (f, r) => {
+        return path_1.default
+            .normalize(`${configs.buildDir}/${r}/${f}`)
+            .split(".")
+            .slice(0, -1)
+            .join(".");
     };
     puppeteer_in_electron_1.default.initialize(electron_1.app, 2999).then(async () => {
         electron_1.app.on("ready", () => {
             loadReport(configs);
             console.log("running all the tests once initially");
-            ;
-            configs.modules.forEach((t) => {
-                if (t.runtime === "node") {
-                    launchNode(t.test, changer2(t.test, "node"));
+            configs.tests.forEach(([test, runtime, secondaryArtifacts]) => {
+                childProcesses[test] = "loaded";
+                if (runtime === "node") {
+                    launchNode(test, destinationOfRuntime(test, "node"));
                 }
-                else if (t.runtime === "web") {
-                    launchWeb(t.test, changer2(t.test, "web"));
+                else if (runtime === "web") {
+                    launchWeb(test, destinationOfRuntime(test, "web"));
                 }
                 else {
-                    console.error("runtime makes no sense", t.runtime);
+                    console.error("runtime makes no sense", runtime);
                 }
             });
             console.log("ready and watching for changes...", configs.buildDir);
             fs_1.default.watch(configs.buildDir, {
                 recursive: true,
             }, (eventType, changedFile) => {
-                console.log(eventType, changedFile);
+                // console.log(eventType);
                 if (changedFile) {
-                    configs.modules.forEach((t) => {
-                        if (watcher(t.test, t.runtime) === changer(changedFile)) {
-                            if (t.runtime === "node") {
-                                launchNode(t.test, changer(changedFile));
-                            }
-                            else if (t.runtime === "web") {
-                                launchWeb(t.test, changer(changedFile));
+                    configs.tests.forEach(([test, runtime, secondaryArtifacts]) => {
+                        if (eventType === "change" || eventType === "rename") {
+                            if (changedFile ===
+                                test
+                                    .replace("./", "node/")
+                                    .split(".")
+                                    .slice(0, -1)
+                                    .concat("mjs")
+                                    .join(".")) {
+                                launchNode(test, destinationOfRuntime(test, "node"));
                             }
-                            else {
-                                console.error("runtime makes no sense", t.runtime);
+                            if (changedFile ===
+                                test
+                                    .replace("./", "web/")
+                                    .split(".")
+                                    .slice(0, -1)
+                                    .concat("mjs")
+                                    .join(".")) {
+                                launchWeb(test, destinationOfRuntime(test, "web"));
                             }
                         }
                     });
@@ -170,27 +264,3 @@ const main = async () => {
     await puppeteer_in_electron_1.default.connect(electron_1.app, puppeteer_core_1.default);
 };
 main();
-// ipcMain.handle('web-log', (x, message: string) => {
-//   console.log("web-log)", message);
-// });
-// ipcMain.handle('web-error', (x, message: string) => {
-//   console.log("web-error)", message);
-// });
-// ipcMain.handle('web-warn', (x, message: string) => {
-//   console.log("web-warn)", message);
-// });
-// ipcMain.handle('web-info', (x, message: string) => {
-//   console.log("web-info)", message);
-// });
-// ipcMain.handle('quit-app', (x, failed: number) => {
-//   console.log("quit-app", failed);
-//   app.exit(failed);
-// });
-// process.stdin.on("data", (configTests) => {
-//   main(JSON.parse(configTests.toString()) as ITestTypes[]);
-// });
-// const watchables = (tests: ITestTypes[]) => {
-//   return tests.map((t) => {
-//     return [t[1], `dist/${t[1]}/${t[0].replace(".mts", ".mjs")}`]
-//   })
-// }

package/dist/common/esbuildConfigs/index.js

@@ -5,16 +5,16 @@ exports.default = (config) => {
         target: "esnext",
         format: "esm",
         splitting: true,
-        outExtension: { '.js': '.mjs' },
+        outExtension: { ".js": ".mjs" },
         outbase: config.outbase,
-        jsx: 'transform',
+        jsx: "transform",
         bundle: true,
         minify: config.minify === true,
         write: true,
         loader: {
-            '.js': 'jsx',
-            '.png': 'binary',
-            '.jpg': 'binary',
+            ".js": "jsx",
+            ".png": "binary",
+            ".jpg": "binary",
         },
     };
 };