testeranto 0.90.0 → 0.94.0

package/dist/common/src/Node.js

@@ -9,14 +9,16 @@ const index_js_1 = require("./lib/index.js");
 const node_js_1 = require("./PM/node.js");
 class NodeTesteranto extends core_js_1.default {
     constructor(input, testSpecification, testImplementation, testResourceRequirement, testInterface) {
-        super(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
+        super(input, testSpecification, testImplementation, testResourceRequirement, testInterface, () => {
+            // no-op
+        });
     }
     async receiveTestResourceConfig(partialTestResource) {
         const t = JSON.parse(partialTestResource);
         const pm = new node_js_1.PM_Node(t);
         const { failed, artifacts, logPromise, features } = await this.testJobs[0].receiveTestResourceConfig(pm);
-        pm.customclose();
-        return features;
+        // pm.customclose();
+        return { features, failed };
     }
 }
 exports.NodeTesteranto = NodeTesteranto;

package/dist/common/src/PM/main.js

@@ -110,9 +110,12 @@ class PM_Main extends index_js_1.PM {
                 process.exit(-1);
             }
             const builtfile = dest + ".mjs";
-            await Promise.all(testConfig[3].map((sidecar) => {
+            const webSideCares = [];
+            await Promise.all(testConfig[3].map(async (sidecar) => {
                 if (sidecar[1] === "web") {
-                    return this.launchWebSideCar(sidecar[0], (0, utils_js_1.destinationOfRuntime)(sidecar[0], "web", this.configs), sidecar);
+                    const s = await this.launchWebSideCar(sidecar[0], (0, utils_js_1.destinationOfRuntime)(sidecar[0], "web", this.configs), sidecar);
+                    webSideCares.push(s);
+                    return s;
                 }
                 if (sidecar[1] === "node") {
                     return this.launchNodeSideCar(sidecar[0], (0, utils_js_1.destinationOfRuntime)(sidecar[0], "node", this.configs), sidecar);
@@ -122,13 +125,15 @@ class PM_Main extends index_js_1.PM {
                 return module.default.then((defaultModule) => {
                     defaultModule
                         .receiveTestResourceConfig(argz)
-                        .then(async (features) => {
+                        .then(async ({ features, failed }) => {
                         this.receiveFeatures(features, destFolder);
+                        console.log(`${src} completed with ${failed} errors`);
                     })
                         .catch((e) => {
-                        console.log("catch", e);
+                        console.log(`${src} errored with`, e);
                     })
                         .finally(() => {
+                        webSideCares.forEach((webSideCar) => webSideCar.close());
                         this.deregister(src);
                     });
                 });
@@ -144,18 +149,12 @@ class PM_Main extends index_js_1.PM {
             const d = dest + ".mjs";
             console.log("launchWebSideCar", src, dest, d);
             const destFolder = dest.replace(".mjs", "");
-            const webArgz = JSON.stringify({
-                name: dest,
-                ports: [].toString(),
-                fs: destFolder,
-                browserWSEndpoint: this.browser.wsEndpoint(),
-            });
-            // files[src] = new Set();
-            // const evaluation = `
-            // console.log("importing ${dest}.mjs");
-            // import('${dest}.mjs').then(async (x) => {
-            //   console.log("imported", x.default);
-            // })`;
+            // const webArgz = JSON.stringify({
+            //   name: dest,
+            //   ports: [].toString(),
+            //   fs: destFolder,
+            //   browserWSEndpoint: this.browser.wsEndpoint(),
+            // });
             const fileStreams2 = [];
             const doneFileStream2 = [];
             return new Promise((res, rej) => {
@@ -234,14 +233,17 @@ class PM_Main extends index_js_1.PM {
                     page.exposeFunction("end", async (uid) => {
                         return fileStreams2[uid].end();
                     });
-                    page.exposeFunction("customclose", (p, testName) => {
-                        fs_1.default.writeFileSync(p + "/manifest.json", JSON.stringify(Array.from(files[testName])));
-                        delete files[testName];
-                        Promise.all(screenshots[testName] || []).then(() => {
-                            delete screenshots[testName];
-                            // page.close();
-                        });
-                    });
+                    // page.exposeFunction("customclose", (p: string, testName: string) => {
+                    //   fs.writeFileSync(
+                    //     p + "/manifest.json",
+                    //     JSON.stringify(Array.from(files[testName]))
+                    //   );
+                    //   delete files[testName];
+                    //   Promise.all(screenshots[testName] || []).then(() => {
+                    //     delete screenshots[testName];
+                    //     // page.close();
+                    //   });
+                    // });
                     return page;
                 })
                     .then(async (page) => {
@@ -397,20 +399,21 @@ class PM_Main extends index_js_1.PM {
                     // page.evaluate(`window["screenshot done"]`);
                 });
                 page.exposeFunction("writeFileSync", (fp, contents, testName) => {
-                    const dir = path_1.default.dirname(fp);
-                    fs_1.default.mkdirSync(dir, {
-                        recursive: true,
-                    });
-                    const p = new Promise(async (res, rej) => {
-                        fs_1.default.writeFileSync(fp, contents);
-                        res(fp);
-                    });
-                    doneFileStream2.push(p);
-                    if (!files[testName]) {
-                        files[testName] = new Set();
-                    }
-                    files[testName].add(fp);
-                    return p;
+                    return globalThis["writeFileSync"](fp, contents, testName);
+                    // const dir = path.dirname(fp);
+                    // fs.mkdirSync(dir, {
+                    //   recursive: true,
+                    // });
+                    // const p = new Promise<string>(async (res, rej) => {
+                    //   fs.writeFileSync(fp, contents);
+                    //   res(fp);
+                    // });
+                    // doneFileStream2.push(p);
+                    // if (!files[testName]) {
+                    //   files[testName] = new Set();
+                    // }
+                    // files[testName].add(fp);
+                    // return p;
                 });
                 page.exposeFunction("existsSync", (fp, contents) => {
                     return fs_1.default.existsSync(fp);
@@ -445,36 +448,37 @@ class PM_Main extends index_js_1.PM {
                 page.exposeFunction("end", async (uid) => {
                     return fileStreams2[uid].end();
                 });
-                page.exposeFunction("customclose", (p, testName) => {
-                    // console.log("closing", p);
-                    fs_1.default.writeFileSync(p + "/manifest.json", JSON.stringify(Array.from(files[testName])));
-                    delete files[testName];
-                    // console.log("screenshots[testName]", screenshots[testName]);
-                    Promise.all(screenshots[testName] || []).then(() => {
-                        delete screenshots[testName];
-                        // page.close();
-                        // console.log("\t GOODBYE");
-                        // whyIsNodeRunning();
-                    });
-                    // globalThis["writeFileSync"](
-                    //   p + "/manifest.json",
-                    //   // files.entries()
-                    //   JSON.stringify(Array.from(files[testName]))
-                    // );
-                    // console.log("closing doneFileStream2", doneFileStream2);
-                    // console.log("closing doneFileStream2", doneFileStream2);
-                    // Promise.all([...doneFileStream2, ...screenshots2]).then(() => {
-                    //   page.close();
-                    // });
-                    // Promise.all(screenshots).then(() => {
-                    //   page.close();
-                    // });
-                    // setTimeout(() => {
-                    //   console.log("Delayed for 1 second.");
-                    //   page.close();
-                    // }, 5000);
-                    // return page.close();
-                });
+                // page.exposeFunction("customclose", (p: string, testName: string) => {
+                //   // console.log("closing", p);
+                //   console.log("\t GOODBYE customclose");
+                //   fs.writeFileSync(
+                //     p + "/manifest.json",
+                //     JSON.stringify(Array.from(files[testName]))
+                //   );
+                //   delete files[testName];
+                //   // console.log("screenshots[testName]", screenshots[testName]);
+                //   Promise.all(screenshots[testName] || []).then(() => {
+                //     delete screenshots[testName];
+                //   });
+                //   // globalThis["writeFileSync"](
+                //   //   p + "/manifest.json",
+                //   //   // files.entries()
+                //   //   JSON.stringify(Array.from(files[testName]))
+                //   // );
+                //   // console.log("closing doneFileStream2", doneFileStream2);
+                //   // console.log("closing doneFileStream2", doneFileStream2);
+                //   // Promise.all([...doneFileStream2, ...screenshots2]).then(() => {
+                //   //   page.close();
+                //   // });
+                //   // Promise.all(screenshots).then(() => {
+                //   //   page.close();
+                //   // });
+                //   // setTimeout(() => {
+                //   //   console.log("Delayed for 1 second.");
+                //   //   page.close();
+                //   // }, 5000);
+                //   // return page.close();
+                // });
                 page.exposeFunction("page", () => {
                     return page.mainFrame()._id;
                 });
@@ -507,12 +511,19 @@ class PM_Main extends index_js_1.PM {
             })
                 .then(async (page) => {
                 const close = () => {
-                    console.log("evaluation complete.", dest);
-                    page.off("pageerror");
-                    page.close();
-                    this.deregister(t);
-                    stderrStream.close();
-                    stdoutStream.close();
+                    if (!files[t]) {
+                        files[t] = new Set();
+                    }
+                    // files[t].add(filepath);
+                    fs_1.default.writeFileSync(dest + "/manifest.json", JSON.stringify(Array.from(files[t])));
+                    delete files[t];
+                    Promise.all(screenshots[t] || []).then(() => {
+                        delete screenshots[t];
+                        page.close();
+                        this.deregister(t);
+                        stderrStream.close();
+                        stdoutStream.close();
+                    });
                 };
                 page.on("pageerror", (err) => {
                     console.debug(`Error from ${t}: [${err.name}] `);
@@ -542,26 +553,20 @@ class PM_Main extends index_js_1.PM {
                 await page.goto(`file://${`${dest}.html`}`, {});
                 await page
                     .evaluate(evaluation)
-                    .then(async (features) => {
+                    .then(async ({ failed, features }) => {
                     this.receiveFeatures(features, destFolder);
+                    console.log(`${t} completed with ${failed} errors`);
                 })
                     .catch((e) => {
-                    console.log("evaluation failed.", dest);
-                    console.log(e);
+                    console.log(`${t} errored with`, e);
                 })
                     .finally(() => {
                     close();
-                    // console.log("evaluation complete.", dest);
-                    // page.close();
-                    // this.deregister(t);
-                    // stderrStream.close();
-                    // stdoutStream.close();
                 });
                 return page;
             });
         };
         this.receiveFeatures = (features, destFolder) => {
-            console.log("this.receiveFeatures", features);
             features
                 .reduce(async (mm, featureStringKey) => {
                 const accum = await mm;
@@ -628,12 +633,14 @@ class PM_Main extends index_js_1.PM {
             return false;
         };
         globalThis["writeFileSync"] = (filepath, contents, testName) => {
-            // console.log("globalThis-writeFileSync", filepath);
+            // console.log(testName, "writeFileSync", filepath, testName);
             // Create directories if they don't exist
-            const dir = path_1.default.dirname(filepath.split("/").slice(0, -1).join("/"));
+            const dir = path_1.default.dirname(filepath);
+            // console.log(testName, "mkdirSync", dir);
             fs_1.default.mkdirSync(dir, {
                 recursive: true,
             });
+            // console.log(testName, "mkdirSync2");
             if (!files[testName]) {
                 files[testName] = new Set();
             }
@@ -674,13 +681,16 @@ class PM_Main extends index_js_1.PM {
             await sPromise;
             return sPromise;
         };
-        globalThis["customclose"] = (p, testName) => {
-            if (!files[testName]) {
-                files[testName] = new Set();
-            }
-            fs_1.default.writeFileSync(p + "/manifest.json", JSON.stringify(Array.from(files[testName])));
-            delete files[testName];
-        };
+        // globalThis["customclose"] = (p: string, testName: string) => {
+        //   if (!files[testName]) {
+        //     files[testName] = new Set();
+        //   }
+        //   fs.writeFileSync(
+        //     p + "/manifest.json",
+        //     JSON.stringify(Array.from(files[testName]))
+        //   );
+        //   delete files[testName];
+        // };
     }
     $(selector) {
         throw new Error("Method not implemented.");

package/dist/common/src/Project.js

@@ -75,15 +75,17 @@ const compile = () => {
     return new Promise((resolve, reject) => {
         const tsc = (0, child_process_1.spawn)("tsc", ["-noEmit"]);
         tsc.stdout.on("data", (data) => {
-            // console.log(`stdout: ${data}`);
+            // console.log(`tsc stdout: ${data}`);
             const lines = data.toString().split("\n");
             logContent.push(...lines);
         });
         tsc.stderr.on("data", (data) => {
-            // console.error(`stderr: ${data}`);
+            console.error(`stderr: ${data}`);
+            process.exit(-1);
         });
         tsc.on("close", (code) => {
             parseTsErrors();
+            console.log("tsc done");
             resolve(`tsc process exited with code ${code}`);
             // if (code !== 0) {
             //   resolve(`tsc process exited with code ${code}`);
@@ -137,7 +139,6 @@ class ITProject {
             }
         });
         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));
-        compile();
         Promise.resolve(Promise.all([...this.getSecondaryEndpointsPoints("web")].map(async (sourceFilePath) => {
             const sourceFileSplit = sourceFilePath.split("/");
             const sourceDir = sourceFileSplit.slice(0, -1);
@@ -161,6 +162,7 @@ class ITProject {
             });
         });
         Promise.all([
+            compile(),
             esbuild_1.default
                 .context((0, node_js_1.default)(this.config, nodeEntryPoints))
                 .then(async (nodeContext) => {

package/dist/common/src/Puppeteer.js

@@ -21,7 +21,7 @@ exports.default = async (partialConfig) => {
         executablePath: 
         // process.env.CHROMIUM_PATH || "/opt/homebrew/bin/chromium",
         "/opt/homebrew/bin/chromium",
-        headless: false,
+        headless: true,
         dumpio: true,
         // timeout: 0,
         devtools: true,
@@ -60,10 +60,8 @@ exports.default = async (partialConfig) => {
     process.stdin.on("keypress", (str, key) => {
         if (key.name === "q") {
             pm.shutDown();
-            // process.exit();
         }
         if (key.name === "x") {
-            // pm.shutDown();
             process.exit(-1);
         }
     });

package/dist/common/src/SubPackages/puppeteer.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const Node_js_1 = __importDefault(require("../Node.js"));
 exports.default = (testInput, testSpecifications, testImplementations, testInterface) => {
-    return (0, Node_js_1.default)(testInput, testSpecifications, testImplementations, Object.assign({ beforeAll(x) {
+    return (0, Node_js_1.default)(testInput, testSpecifications, testImplementations, Object.assign({ beforeAll: (x) => {
             // process.parentPort.postMessage(
             //   `/docs/web/src/ClassicalComponent/test.html`
             // );

package/dist/common/src/SubPackages/react/jsx/index.js

@@ -12,14 +12,22 @@ exports.testInterface = {
     //   //   resolve(x());
     //   // });
     // },
-    beforeEach: async (subject, initializer, artificer) => {
+    // beforeEach: async (subject, initializer, artificer): Promise<IStore> => {
+    //   return new Promise((resolve, rej) => {
+    //     resolve(React.createElement(subject));
+    //   });
+    // },
+    andWhen: async (s, whenCB) => {
+        await whenCB(s());
         return new Promise((resolve, rej) => {
-            const x = react_1.default.createElement(subject);
-            console.log("react-element", x);
-            resolve(x);
+            resolve(react_1.default.createElement(s));
         });
+        // return whenCB(s);
     },
-    andWhen: function (s, whenCB) {
-        return whenCB(s);
+    butThen: async (subject, thenCB) => {
+        await thenCB(subject());
+        return new Promise((resolve, rej) => {
+            resolve(react_1.default.createElement(subject));
+        });
     },
 };

package/dist/common/src/SubPackages/react/jsx/node.js

@@ -5,6 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Node_js_1 = __importDefault(require("../../../Node.js"));
 const index_js_1 = require("./index.js");
-exports.default = (testImplementations, testSpecifications, testInput, testInterface) => {
-    return (0, Node_js_1.default)(testInput, testSpecifications, testImplementations, Object.assign(Object.assign({}, index_js_1.testInterface), testInterface));
+exports.default = (testImplementations, testSpecifications, testInput, testInterface = index_js_1.testInterface) => {
+    return (0, Node_js_1.default)(testInput, testSpecifications, testImplementations, testInterface
+    // {
+    //   ...baseInterface,
+    //   ...testInterface,
+    // }
+    );
 };

package/dist/common/src/SubPackages/react-dom/component/web.js

@@ -18,52 +18,26 @@ exports.default = (testInput, testSpecifications, testImplementations, testInter
         }
     }
     const t = (0, Web_js_1.default)(testInput, testSpecifications, testImplementations, {
-        beforeAll: async (initialProps, artificer) => {
+        beforeAll: async (subject, artificer) => {
             return await new Promise((resolve, rej) => {
                 const htmlElement = document.getElementById("root");
                 if (htmlElement) {
                     const domRoot = client_1.default.createRoot(htmlElement);
-                    // Ignore these type errors
-                    domRoot.render((0, react_1.createElement)(TesterantoComponent, Object.assign(Object.assign({}, initialProps), { done: (reactElement) => {
-                            resolve({
-                                htmlElement,
-                                reactElement,
-                                domRoot,
-                            });
-                        } }), []));
-                    // resolve({ htmlElement });
+                    resolve({ domRoot, htmlElement });
                 }
             });
         },
-        // beforeEach: async (
-        //   s,
-        //   initializer,
-        //   testResource,
-        //   artificer,
-        //   initialValues
-        // ): Promise<IStore> => {
-        //   return new Promise((resolve, rej) => {
-        //     console.log("beforeEach" + TesterantoComponent);
-        //     // const domRoot = ReactDom.createRoot(htmlElement);
-        //     // // Ignore these type errors
-        //     // domRoot.render(
-        //     //   createElement(
-        //     //     TesterantoComponent,
-        //     //     {
-        //     //       ...initializer,
-        //     //       done: (reactElement) => {
-        //     //         resolve({
-        //     //           htmlElement,
-        //     //           reactElement,
-        //     //           domRoot,
-        //     //         });
-        //     //       },
-        //     //     },
-        //     //     []
-        //     //   )
-        //     // );
-        //   });
-        // },
+        beforeEach: async ({ domRoot, htmlElement }, initialValues, testResource, artificer) => {
+            return new Promise(async (resolve, rej) => {
+                domRoot.render((0, react_1.createElement)(TesterantoComponent, Object.assign(Object.assign({}, initialValues), { done: (reactElement) => {
+                        resolve({
+                            htmlElement,
+                            reactElement,
+                            domRoot,
+                        });
+                    } }), []));
+            });
+        },
         andWhen: function (s, whenCB) {
             return whenCB(s);
         },

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

@@ -31,22 +31,17 @@ const react_1 = __importDefault(require("react"));
 const react_test_renderer_1 = __importStar(require("react-test-renderer"));
 exports.testInterface = {
     beforeEach: function (CComponent, propsAndChildren) {
-        function Link(props) {
-            const p = props.props;
-            const c = props.children;
-            return react_1.default.createElement(CComponent, p, c);
+        function Link(proper) {
+            return react_1.default.createElement(CComponent, proper(), []);
         }
         return new Promise((res, rej) => {
             (0, react_test_renderer_1.act)(async () => {
-                const p = propsAndChildren;
-                const y = new CComponent(p.props);
                 const testRenderer = await react_test_renderer_1.default.create(Link(propsAndChildren));
                 res(testRenderer);
             });
         });
     },
     andWhen: async function (renderer, whenCB) {
-        // console.log("andWhen", whenCB)
         await (0, react_test_renderer_1.act)(() => whenCB(renderer));
         return renderer;
     },
@@ -54,15 +49,12 @@ exports.testInterface = {
     //   return whenCB()(s);
     // },
     butThen: async function (s, thenCB, tr) {
-        console.log("butThen", thenCB.toString());
         return thenCB(s);
     },
     afterEach: async function (store, ndx, artificer) {
-        // console.log("afterEach", store);
         return {};
     },
     afterAll: (store, artificer) => {
-        // console.log("afterAll", store);
         return;
     },
 };

package/dist/common/src/Web.js

@@ -7,36 +7,40 @@ exports.WebTesteranto = void 0;
 const web_1 = require("./PM/web");
 const core_js_1 = __importDefault(require("./lib/core.js"));
 const index_js_1 = require("./lib/index.js");
+let errorCallback = (e) => { };
+let unhandledrejectionCallback = (event) => {
+    console.log("window.addEventListener unhandledrejection", event);
+    // cb({ error: event.reason.message });
+    // throw event;
+};
 class WebTesteranto extends core_js_1.default {
     constructor(input, testSpecification, testImplementation, testResourceRequirement, testInterface) {
-        super(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
+        super(input, testSpecification, testImplementation, testResourceRequirement, testInterface, (cb) => {
+            window.removeEventListener("error", errorCallback);
+            errorCallback = (e) => {
+                console.log("window.addEventListener error", e);
+                cb(e);
+                // throw e;
+            };
+            window.addEventListener("error", errorCallback);
+            window.removeEventListener("unhandledrejection", unhandledrejectionCallback);
+            /////////////////////
+            window.removeEventListener("unhandledrejection", unhandledrejectionCallback);
+            unhandledrejectionCallback = (event) => {
+                console.log("window.addEventListener unhandledrejection", event);
+                cb({ error: event.reason.message });
+                // throw event;
+            };
+            window.addEventListener("unhandledrejection", unhandledrejectionCallback);
+        });
     }
     async receiveTestResourceConfig(partialTestResource) {
         const t = partialTestResource; //JSON.parse(partialTestResource);
         const pm = new web_1.PM_Web(t);
         const { failed, artifacts, logPromise, features } = await this.testJobs[0].receiveTestResourceConfig(pm);
-        pm.customclose();
         return new Promise((res, rej) => {
-            res(features);
+            res({ features, failed });
         });
-        // return features;
-        // Promise.all([...artifacts, logPromise]).then(async () => {
-        //   console.log("hello world");
-        //   pm.customclose();
-        //   // 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();
-        //   // window.close();
-        //   // var customWindow = window.open("", "_blank", "");
-        //   // customWindow.close();
-        //   // this.puppetMaster.browser.page
-        //   // window["customclose"]();
-        //   // console.log("goodbye", window["customclose"]());
-        // });
     }
 }
 exports.WebTesteranto = WebTesteranto;

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

@@ -7,14 +7,12 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const otherInputs = {};
 const register = (entrypoint, sources) => {
-    console.log("register", entrypoint, sources);
     if (!otherInputs[entrypoint]) {
         otherInputs[entrypoint] = new Set();
     }
     sources.forEach((s) => otherInputs[entrypoint].add(s));
 };
 function tree(meta, key) {
-    console.log("searching metafile for", key);
     const outputKey = Object.keys(meta.outputs).find((k) => {
         return meta.outputs[k].entryPoint === key;
     });