testeranto 0.62.0 → 0.70.0

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

@@ -12,5 +12,5 @@ export const testInterface = {
     andWhen: async function (renderer, whenCB) {
         await act(() => whenCB()(renderer));
         return renderer;
-    }
+    },
 };

package/dist/module/Types.js

@@ -1,30 +1,3 @@
-// export class TPage extends Page {
-//   // screenshot(options?: puppeteer.ScreenshotOptions) {
-//   //   return super.screenshot({
-//   //     ...options,
-//   //     path: "dist/" + (options ? options : { path: "" }).path,
-//   //   });
-//   // }
-// }
-export 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;
-            }));
-        });
-    }
-}
+export {};
+// export type ITTestShape = {
+// };

package/dist/module/Web.js

@@ -1,24 +1,23 @@
 import Testeranto from "./lib/core.js";
-import { defaultTestResourceRequirement } from "./lib/index.js";
-const remote = require('@electron/remote');
+import { defaultTestResourceRequirement, } from "./lib/index.js";
+// 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 Testeranto {
     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 {
@@ -31,17 +30,25 @@ class WebTesteranto extends Testeranto {
                 // 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();
         });
     }
 }
-;
 export default async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = defaultTestResourceRequirement) => {
     return new WebTesteranto(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
 };

package/dist/module/electron.js

@@ -1,9 +1,54 @@
-import { app, BrowserWindow, utilityProcess } from "electron";
+import readline from "readline";
+import { app, BrowserWindow, utilityProcess, ipcMain } from "electron";
 import pie from "puppeteer-in-electron";
 import puppeteer from "puppeteer-core";
 import fs from "fs";
 import path from "path";
-import { jsonc } from 'jsonc';
+import { jsonc } from "jsonc";
+import { v4 as uuidv4 } from "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.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 () => {
@@ -14,7 +59,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) => {
@@ -26,135 +71,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.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 = 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 = utilityProcess.fork(dest + ".mjs", [argz], {
+            cwd: destFolder,
+            stdio: "pipe",
         });
-        child.on('exit', (data) => {
-            console.log("node process ended with: ", data);
-            fileStream.close();
+        const nodeGuid = uuidv4();
+        nodeChildren[nodeGuid] = child;
+        if (!fs.existsSync(destFolder)) {
+            fs.mkdirSync(destFolder, { recursive: true });
+        }
+        fs.rmSync(`${destFolder}/stdout.log`, { force: true });
+        fs.rmSync(`${destFolder}/stderr.log`, { force: true });
+        const stdout = fs.createWriteStream(`${destFolder}/stdout.log`);
+        const stderr = fs.createWriteStream(`${destFolder}/stderr.log`);
+        child
+            .on("message", (data) => {
+            console.log("from child", JSON.stringify(data));
+            if (data.launchWeb) {
+                const guid = uuidv4();
+                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.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 BrowserWindow({
-            show: true,
+            show: false,
             webPreferences: {
                 nodeIntegration: true,
                 nodeIntegrationInWorker: true,
                 contextIsolation: false,
-                preload: path.join(app.getAppPath(), 'preload.js'),
+                preload: path.join(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 BrowserWindow({
             show: true,
             webPreferences: {
                 nodeIntegration: true,
                 nodeIntegrationInWorker: true,
                 contextIsolation: false,
-                preload: path.join(app.getAppPath(), 'preload.js'),
+                preload: path.join(app.getAppPath(), "preload.js"),
                 offscreen: false,
                 devTools: true,
-            }
+            },
         });
+        webChildren[uuidv4()] = 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.resolve(configs.buildDir, "web", t),
-                }))
-            }
+                requesting: encodeURIComponent(webArgz),
+            },
+        });
+        if (!fs.existsSync(destFolder)) {
+            fs.mkdirSync(destFolder, { recursive: true });
+        }
+        const stdout = fs.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);
+        });
+        ipcMain.on("message", (message, data) => {
+            console.log("ipcMain message: " + JSON.stringify(data));
+            // process.exit();
         });
     };
-    const watcher = (test, runtime) => {
-        return path.normalize(`${configs.buildDir}/${runtime}/${test.split('.').slice(0, -1).concat('mjs').join('.')}`);
-    };
-    const changer = (f) => {
-        return path.normalize(`${configs.buildDir}/${f}`);
-    };
-    const changer2 = (f, r) => {
-        return path.normalize(`${configs.buildDir}/${r}/${f}`);
+    const destinationOfRuntime = (f, r) => {
+        return path
+            .normalize(`${configs.buildDir}/${r}/${f}`)
+            .split(".")
+            .slice(0, -1)
+            .join(".");
     };
     pie.initialize(app, 2999).then(async () => {
         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.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"));
                             }
                         }
                     });
@@ -165,27 +259,3 @@ const main = async () => {
     await pie.connect(app, puppeteer);
 };
 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/module/esbuildConfigs/index.js

@@ -3,16 +3,16 @@ export 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",
         },
     };
 };

package/dist/module/esbuildConfigs/node.js

@@ -1,30 +1,32 @@
 import baseEsBuildConfig from "./index.js";
-// const jsonConfig = jsonc.parse((await fs.readFileSync("./testeranto.json")).toString()) as IJsonConfig;
 export default (config, entryPoints) => {
-    return Object.assign(Object.assign({}, baseEsBuildConfig(config)), { outdir: config.outdir + "/node", inject: [`./node_modules/testeranto/dist/cjs-shim.js`], supported: {
-            "dynamic-import": true
+    return Object.assign(Object.assign({}, baseEsBuildConfig(config)), { splitting: true, outdir: config.outdir + "/node", inject: [`./node_modules/testeranto/dist/cjs-shim.js`], supported: {
+            "dynamic-import": true,
         }, define: {
-            "process.env.FLUENTFFMPEG_COV": "0"
+            "process.env.FLUENTFFMPEG_COV": "0",
         }, absWorkingDir: process.cwd(), banner: {
-            js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
+            js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`,
         }, platform: "node", external: [
-            "testeranto.json",
-            "features.test.js",
-            "react",
-            "events",
+            // "testeranto.json",
+            // "features.test.js",
+            // "react",
+            // "events",
             // "ganache"
-            ...config.externals
+            ...config.externals,
         ], entryPoints: [...entryPoints], plugins: [
             ...(config.nodePlugins || []),
             {
-                name: 'rebuild-notify',
+                name: "rebuild-notify",
                 setup(build) {
-                    build.onEnd(result => {
+                    build.onEnd((result) => {
                         console.log(`node build ended with ${result.errors.length} errors`);
-                        console.log(result);
-                        result.errors.length !== 0 && process.exit(-1);
+                        if (result.errors.length > 0) {
+                            console.log(result);
+                        }
+                        // console.log(result);
+                        // result.errors.length !== 0 && process.exit(-1);
                     });
-                }
+                },
             },
         ] });
 };

package/dist/module/esbuildConfigs/report.js

@@ -1,48 +1,11 @@
-"use strict";
-// import { jsonc } from "jsonc";
-// import { IBaseConfig, IJsonConfig } from "../Types";
-// import baseEsBuildConfig from "./index.js";
-// import fs from "fs"
-// import { BuildOptions } from "esbuild";
-// // import { CssModulesPlugin } from 'esbuild-css-modules-plugin';
-// const jsonConfig = jsonc.parse((await fs.readFileSync("./testeranto.json")).toString()) as IJsonConfig;
-// export default (config: IBaseConfig): BuildOptions => {
-//   return {
-//     bundle: true,
-//     entryPoints: ["./node_modules/testeranto/dist/module/report.js"],
-//     minify: config.minify === true,
-//     outbase: config.outbase,
-//     write: true,
-//     outfile: `${jsonConfig.outdir}/report.js`,
-//     external: [
-//       "tests.json",
-//       "features.test.js"
-//     ],
-//     // plugins: [
-//     //   CssModulesPlugin({
-//     //     // @see https://github.com/indooorsman/esbuild-css-modules-plugin/blob/main/index.d.ts for more details
-//     //     force: true,
-//     //     emitDeclarationFile: true,
-//     //     localsConvention: 'camelCaseOnly',
-//     //     namedExports: true,
-//     //     inject: false
-//     //   })
-//     // ]
-//   }
-//   // return {
-//   //   bundle: true,
-//   //   entryPoints: [
-//   //     "./node_modules/testeranto/dist/module/Report.js",
-//   //     jsonConfig.features
-//   //   ],
-//   //   minify: config.minify === true,
-//   //   outbase: ".",
-//   //   outdir: 'docs',
-//   //   write: true,
-//   //   // outfile: `${jsonConfig.outdir}/Report.js`,
-//   //   external: [
-//   //     "features.test.js",
-//   //     "testeranto.json"
-//   //   ]
-//   // }
-// }
+export default (config) => {
+    return {
+        bundle: true,
+        entryPoints: ["./node_modules/testeranto/dist/module/report.js"],
+        minify: config.minify === true,
+        outbase: config.outbase,
+        write: true,
+        outfile: `${config.outdir}/report.js`,
+        external: ["tests.json", "features.test.js"],
+    };
+};

package/dist/module/esbuildConfigs/tests.js

@@ -1,4 +1,3 @@
-// const jsonConfig = jsonc.parse((await fs.readFileSync("./testeranto.json")).toString()) as IJsonConfig;
 export default (config) => {
     return {
         bundle: true,