testeranto 0.70.0 → 0.73.0

package/src/lib/types.ts

@@ -1,6 +1,6 @@
 import { IBaseTest } from "../Types";
 
-import puppeteer from "puppeteer-core";
+// import puppeteer from "puppeteer-core";
 import {
   IGivens,
   BaseCheck,
@@ -10,10 +10,11 @@ import {
   BaseThen,
 } from "./abstractBase";
 import { ITTestResourceConfiguration, ITestArtificer } from ".";
+import { PM } from "../PM/index";
 
 export type IRunTime = `node` | `web`;
 
-export type ITestTypes = [string, IRunTime, ITestTypes[]];
+export type ITestTypes = [string, IRunTime, { ports: number }, ITestTypes[]];
 
 export type IJsonConfig = {
   outdir: string;
@@ -38,17 +39,6 @@ export type IBaseConfig = {
 
 export type IBuiltConfig = { buildDir: string } & IBaseConfig;
 
-export type INodeUtils = {
-  browser: puppeteer.Browser;
-  ipc: Electron.ParentPort;
-};
-
-export type IWebUtils = {
-  browser: puppeteer.Browser;
-  ipc: Electron.IpcRenderer;
-};
-export type IUtils = INodeUtils | IWebUtils;
-
 export type IWebTestInterface<ITestShape extends IBaseTest> = {
   assertThis: (x: ITestShape["then"]) => void;
 
@@ -66,27 +56,27 @@ export type IWebTestInterface<ITestShape extends IBaseTest> = {
   afterAll: (
     store: ITestShape["istore"],
     artificer: ITestArtificer,
-    browser: IWebUtils
+    utils: PM
   ) => any;
   afterEach: (
     store: ITestShape["istore"],
     key: string,
     artificer: ITestArtificer,
-    utils: IWebUtils
+    utils: PM
   ) => Promise<unknown>;
   beforeAll: (
     input: ITestShape["iinput"],
     testResource: ITTestResourceConfiguration,
     artificer: ITestArtificer,
-    utils: IWebUtils
+    utils: PM
   ) => Promise<ITestShape["isubject"]>;
   beforeEach: (
     subject: ITestShape["isubject"],
     initializer: (c?) => ITestShape["given"],
     artificer: ITestArtificer,
     testResource: ITTestResourceConfiguration,
-    initialValues
-    // utils: IUtils
+    initialValues,
+    utils: PM
   ) => Promise<ITestShape["istore"]>;
 };
 // & ITestInterface<ITestShape>;
@@ -106,19 +96,19 @@ export type INodeTestInterface<ITestShape extends IBaseTest> = {
   afterAll: (
     store: ITestShape["istore"],
     artificer: ITestArtificer,
-    utils: INodeUtils
+    pm: PM
   ) => any;
   afterEach: (
     store: ITestShape["istore"],
     key: string,
     artificer: ITestArtificer,
-    utils: INodeUtils
+    pm: PM
   ) => Promise<unknown>;
   beforeAll: (
     input: ITestShape["iinput"],
     testResource: ITTestResourceConfiguration,
     artificer: ITestArtificer,
-    utils: INodeUtils
+    pm: PM
   ) => Promise<ITestShape["isubject"]>;
   beforeEach: (
     subject: ITestShape["isubject"],
@@ -137,7 +127,8 @@ export type ITestInterface<ITestShape extends IBaseTest> = {
   andWhen: (
     store: ITestShape["istore"],
     whenCB: ITestShape["when"],
-    testResource: ITTestResourceConfiguration
+    testResource: ITTestResourceConfiguration,
+    pm: PM
   ) => Promise<ITestShape["istore"]>;
   butThen: (
     store: ITestShape["istore"],
@@ -148,27 +139,27 @@ export type ITestInterface<ITestShape extends IBaseTest> = {
   afterAll: (
     store: ITestShape["istore"],
     artificer: ITestArtificer,
-    utils: IUtils
+    pm: PM
   ) => any;
   afterEach: (
     store: ITestShape["istore"],
     key: string,
     artificer: ITestArtificer,
-    utils: IUtils
+    pm: PM
   ) => Promise<unknown>;
   beforeAll: (
     input: ITestShape["iinput"],
     testResource: ITTestResourceConfiguration,
     artificer: ITestArtificer,
-    utils: IUtils
+    pm: PM
   ) => Promise<ITestShape["isubject"]>;
   beforeEach: (
     subject: ITestShape["isubject"],
     initializer: (c?) => ITestShape["given"],
     artificer: ITestArtificer,
     testResource: ITTestResourceConfiguration,
-    initialValues
-    // utils: IUtils
+    initialValues,
+    pm: PM
   ) => Promise<ITestShape["istore"]>;
 };
 

package/src/preload.ts

@@ -1,17 +1,17 @@
-import puppeteer from "puppeteer-core";
+// import puppeteer from "puppeteer-core";
 
-import { NodeWriter } from "./NodeWriter";
-import puppeteerConfiger from "./puppeteerConfiger";
+// import { NodeWriter } from "./NodeWriter";
+// import puppeteerConfiger from "./puppeteerConfiger";
 
-(window as any).NodeWriter = NodeWriter;
+// (window as any).NodeWriter = NodeWriter;
 
-(window as any).browser = new Promise(async (res, rej) => {
-  const browser = await puppeteerConfiger("2999").then(async (json) => {
-    const b = await puppeteer.connect({
-      browserWSEndpoint: json.webSocketDebuggerUrl,
-      defaultViewport: null,
-    });
-    console.log("connected!", b.isConnected());
-    return res(b);
-  });
-});
+// (window as any).browser = new Promise(async (res, rej) => {
+//   const browser = await puppeteerConfiger("2999").then(async (json) => {
+//     const b = await puppeteer.connect({
+//       browserWSEndpoint: json.webSocketDebuggerUrl,
+//       defaultViewport: null,
+//     });
+//     console.log("connected!", b.isConnected());
+//     return res(b);
+//   });
+// });

package/dist/common/NodeWriter.js

@@ -1,54 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeWriter = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const fPaths = [];
-exports.NodeWriter = {
-    createWriteStream: (filepath) => fs_1.default.createWriteStream(filepath),
-    writeFileSync: (fp, contents) => fs_1.default.writeFileSync(fp, contents),
-    mkdirSync: async (destFolder) => {
-        if (!fs_1.default.existsSync(destFolder)) {
-            fs_1.default.mkdirSync(destFolder, { recursive: true });
-        }
-    },
-    testArtiFactoryfileWriter: (tLog, callback) => (fPath, value) => {
-        callback(new Promise((res, rej) => {
-            tLog("testArtiFactory =>", fPath);
-            const cleanPath = path_1.default.resolve(fPath);
-            fPaths.push(cleanPath.replace(process.cwd(), ``));
-            const targetDir = cleanPath.split("/").slice(0, -1).join("/");
-            fs_1.default.mkdir(targetDir, { recursive: true }, async (error) => {
-                if (error) {
-                    console.error(`❗️testArtiFactory failed`, targetDir, error);
-                }
-                fs_1.default.writeFileSync(path_1.default.resolve(targetDir.split("/").slice(0, -1).join("/"), "manifest"), fPaths.join(`\n`), {
-                    encoding: "utf-8",
-                });
-                if (Buffer.isBuffer(value)) {
-                    fs_1.default.writeFileSync(fPath, value, "binary");
-                    res();
-                }
-                else if (`string` === typeof value) {
-                    fs_1.default.writeFileSync(fPath, value.toString(), {
-                        encoding: "utf-8",
-                    });
-                    res();
-                }
-                else {
-                    /* @ts-ignore:next-line */
-                    const pipeStream = value;
-                    const myFile = fs_1.default.createWriteStream(fPath);
-                    pipeStream.pipe(myFile);
-                    pipeStream.on("close", () => {
-                        myFile.close();
-                        res();
-                    });
-                }
-            });
-        }));
-    },
-};

package/dist/common/electron.js

@@ -1,266 +0,0 @@
-"use strict";
-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 () => {
-    const configs = jsonc_1.jsonc.parse((await fs_1.default.readFileSync("./docs/testeranto.json")).toString());
-    const loadReport = (configs) => {
-        const win = new electron_1.BrowserWindow({
-            show: true,
-            webPreferences: {
-                offscreen: false,
-                devTools: true,
-            },
-        });
-        win.loadFile(`/${configs.buildDir}/report.html`).then(async (x) => {
-            // pie.connect(app, puppeteer).then(async (browser) => {
-            //   pie.getPage(browser, win).then(async (page) => {
-            //     await page.screenshot({
-            //       path: 'electron-puppeteer-screenshot1.jpg'
-            //     });
-            //   })
-            // })
-        });
-    };
-    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: src,
-            ports: [3333],
-            // fs: path.resolve(configs.buildDir, "web", destFolder + "/"),
-            // fs: destFolder,
-            fs: ".",
-        });
-        // console.log("launchNode", src, dest, " -> ", destFolder, argz);
-        const child = electron_1.utilityProcess.fork(dest + ".mjs", [argz], {
-            cwd: destFolder,
-            stdio: "pipe",
-        });
-        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);
-        });
-        (_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: false,
-            webPreferences: {
-                nodeIntegration: true,
-                nodeIntegrationInWorker: true,
-                contextIsolation: false,
-                preload: path_1.default.join(electron_1.app.getAppPath(), "preload.js"),
-                offscreen: 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, 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"),
-                offscreen: false,
-                devTools: true,
-            },
-        });
-        webChildren[(0, uuid_1.v4)()] = subWin;
-        remoteMain.enable(subWin.webContents);
-        const webArgz = JSON.stringify({
-            name: dest,
-            ports: [].toString(),
-            fs: destFolder,
-        });
-        // console.log("webArgz", webArgz);
-        subWin.loadFile(`${dest}.html`, {
-            query: {
-                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 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.tests.forEach(([test, runtime, secondaryArtifacts]) => {
-                childProcesses[test] = "loaded";
-                if (runtime === "node") {
-                    launchNode(test, destinationOfRuntime(test, "node"));
-                }
-                else if (runtime === "web") {
-                    launchWeb(test, destinationOfRuntime(test, "web"));
-                }
-                else {
-                    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);
-                if (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"));
-                            }
-                            if (changedFile ===
-                                test
-                                    .replace("./", "web/")
-                                    .split(".")
-                                    .slice(0, -1)
-                                    .concat("mjs")
-                                    .join(".")) {
-                                launchWeb(test, destinationOfRuntime(test, "web"));
-                            }
-                        }
-                    });
-                }
-            });
-        });
-    });
-    await puppeteer_in_electron_1.default.connect(electron_1.app, puppeteer_core_1.default);
-};
-main();

package/dist/module/NodeWriter.js

@@ -1,48 +0,0 @@
-import fs from "fs";
-import path from "path";
-const fPaths = [];
-export const NodeWriter = {
-    createWriteStream: (filepath) => fs.createWriteStream(filepath),
-    writeFileSync: (fp, contents) => fs.writeFileSync(fp, contents),
-    mkdirSync: async (destFolder) => {
-        if (!fs.existsSync(destFolder)) {
-            fs.mkdirSync(destFolder, { recursive: true });
-        }
-    },
-    testArtiFactoryfileWriter: (tLog, callback) => (fPath, value) => {
-        callback(new Promise((res, rej) => {
-            tLog("testArtiFactory =>", fPath);
-            const cleanPath = path.resolve(fPath);
-            fPaths.push(cleanPath.replace(process.cwd(), ``));
-            const targetDir = cleanPath.split("/").slice(0, -1).join("/");
-            fs.mkdir(targetDir, { recursive: true }, async (error) => {
-                if (error) {
-                    console.error(`❗️testArtiFactory failed`, targetDir, error);
-                }
-                fs.writeFileSync(path.resolve(targetDir.split("/").slice(0, -1).join("/"), "manifest"), fPaths.join(`\n`), {
-                    encoding: "utf-8",
-                });
-                if (Buffer.isBuffer(value)) {
-                    fs.writeFileSync(fPath, value, "binary");
-                    res();
-                }
-                else if (`string` === typeof value) {
-                    fs.writeFileSync(fPath, value.toString(), {
-                        encoding: "utf-8",
-                    });
-                    res();
-                }
-                else {
-                    /* @ts-ignore:next-line */
-                    const pipeStream = value;
-                    const myFile = fs.createWriteStream(fPath);
-                    pipeStream.pipe(myFile);
-                    pipeStream.on("close", () => {
-                        myFile.close();
-                        res();
-                    });
-                }
-            });
-        }));
-    },
-};