testeranto 0.62.0 → 0.73.0

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

@@ -7,54 +7,107 @@ const react_1 = require("react");
 const client_1 = __importDefault(require("react-dom/client"));
 const Web_js_1 = __importDefault(require("../../../Web.js"));
 exports.default = (testInput, testSpecifications, testImplementations) => {
+    class TesterantoComponent extends testInput {
+        constructor(props) {
+            super(props);
+            this.done = props.done;
+        }
+        componentDidMount() {
+            super.componentDidMount && super.componentDidMount();
+            return this.done(this);
+        }
+    }
+    const t = (0, Web_js_1.default)(testInput, testSpecifications, testImplementations, {
+        beforeAll: async (initialProps, artificer) => {
+            console.log("mark5", initialProps);
+            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 });
+                }
+            });
+        },
+        // 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,
+        //     //         });
+        //     //       },
+        //     //     },
+        //     //     []
+        //     //   )
+        //     // );
+        //   });
+        // },
+        andWhen: function (s, whenCB) {
+            return whenCB(s);
+        },
+        butThen: async function (s, thenCB) {
+            return thenCB(s);
+        },
+        afterEach: async function (store, ndx, artificer, utils) {
+            console.log("afterEach", store);
+            utils.writeFileSync("aftereachlog", store.toString());
+            const page = (await utils.browser.pages()).filter((x) => {
+                const parsedUrl = new URL(x.url());
+                parsedUrl.search = "";
+                const strippedUrl = parsedUrl.toString();
+                return (strippedUrl ===
+                    "file:///Users/adam/Code/kokomoBay/docs/web/src/ClassicalComponent/react-dom/client.web.test.html");
+                // return true;
+            })[0];
+            const x = await page.screenshot({
+                path: "afterEachLog.jpg",
+            });
+            console.log("x", x);
+            // debugger;
+            // const div_root = document.getElementById("root");
+            // store.domRoot && store.domRoot.unmount(); //React 18
+            //  store.remove();
+            // store.htmlElement.remove();
+            // store.htmlElement = document.createElement("root");
+            return store;
+        },
+        afterAll: async (store, artificer, utils) => {
+            // setTimeout(() => {
+            //   console.log("This will run after 1 second");
+            // }, 1000); // 1000 milliseconds = 1 second
+            // store.htmlElement.remove();
+            // store.htmlElement = document.createElement("root");
+            return store;
+        },
+    });
     document.addEventListener("DOMContentLoaded", function () {
         const elem = document.getElementById("root");
         if (elem) {
-            class TesterantoComponent extends testInput {
-                constructor(props) {
-                    super(props);
-                    this.done = props.done;
-                }
-                componentDidMount() {
-                    super.componentDidMount && super.componentDidMount();
-                    return this.done(this);
-                }
-            }
-            return (0, Web_js_1.default)(testInput, testSpecifications, testImplementations, {
-                beforeAll: async (initialProps, artificer) => {
-                    console.log("mark5", initialProps);
-                    return await new Promise((resolve, rej) => {
-                        const elem = document.getElementById("root");
-                        if (elem) {
-                            resolve({ htmlElement: elem });
-                        }
-                    });
-                },
-                beforeEach: async ({ htmlElement }, initializer, testResource, artificer, initialValues) => {
-                    return new Promise((resolve, rej) => {
-                        // console.log("beforeEach" + JSON.stringify(initializer) + JSON.stringify(initialValues));
-                        // Ignore these type errors
-                        client_1.default.createRoot(htmlElement).render((0, react_1.createElement)(TesterantoComponent, Object.assign(Object.assign({}, initializer.props), { done: (reactElement) => {
-                                resolve({
-                                    htmlElement,
-                                    reactElement,
-                                });
-                            } }), []));
-                    });
-                },
-                andWhen: function (s, whenCB) {
-                    return whenCB(s);
-                },
-                butThen: async function (s) {
-                    return s;
-                },
-                afterEach: async function (store, ndx, artificer) {
-                    return {};
-                },
-                afterAll: (store, artificer) => {
-                    return;
-                },
-            });
+            return t;
         }
     });
+    return t;
 };

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,11 +32,9 @@ 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) {
-        console.log("ASDASDx");
         let component;
         (0, react_test_renderer_1.act)(() => {
             component = react_test_renderer_1.default.create(react_1.default.createElement(CComponent, props, []));
@@ -46,5 +44,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

@@ -3,50 +3,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const web_1 = require("./PM/web");
 const core_js_1 = __importDefault(require("./lib/core.js"));
 const index_js_1 = require("./lib/index.js");
-const remote = 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);
-            }
-        }
-        else {
-            // no-op
-        }
-        const requesting = new URLSearchParams(location.search).get('requesting');
-        if (requesting) {
-            const testResourceArg = decodeURIComponent(requesting);
-            try {
-                const partialTestResource = JSON.parse(testResourceArg);
-                console.log("initial test resource", partialTestResource);
-                this.receiveTestResourceConfig(this.testJobs[0], partialTestResource);
-            }
-            catch (e) {
-                console.error(e);
-                // process.exit(-1);
-            }
-        }
-        // const t: ITestJob = this.testJobs[0];
+        super(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
     }
-    async receiveTestResourceConfig(t, partialTestResource) {
-        const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource, remote);
-        Promise.all([...artifacts, logPromise]).then(async () => {
-            var window = remote.getCurrentWindow();
-            // window.close();
-        });
+    async receiveTestResourceConfig(partialTestResource) {
+        const t = partialTestResource; //JSON.parse(partialTestResource);
+        const pm = new web_1.PM_Web(t);
+        const { failed, artifacts, logPromise } = await this.testJobs[0].receiveTestResourceConfig(pm);
+        console.log("test is done, awaiting test result write to fs");
+        pm.customclose();
+        // 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.default = async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = index_js_1.defaultTestResourceRequirement) => {
     return new WebTesteranto(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
 };

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",
         },
     };
 };

package/dist/common/esbuildConfigs/node.js

@@ -4,32 +4,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("./index.js"));
-// const jsonConfig = jsonc.parse((await fs.readFileSync("./testeranto.json")).toString()) as IJsonConfig;
 exports.default = (config, entryPoints) => {
-    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { outdir: config.outdir + "/node", inject: [`./node_modules/testeranto/dist/cjs-shim.js`], supported: {
-            "dynamic-import": true
+    return Object.assign(Object.assign({}, (0, index_js_1.default)(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/common/esbuildConfigs/report.js

@@ -1,48 +1,13 @@
 "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"
-//   //   ]
-//   // }
-// }
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.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/common/esbuildConfigs/tests.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// const jsonConfig = jsonc.parse((await fs.readFileSync("./testeranto.json")).toString()) as IJsonConfig;
 exports.default = (config) => {
     return {
         bundle: true,

package/dist/common/esbuildConfigs/web.js

@@ -5,21 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const index_js_1 = __importDefault(require("./index.js"));
-// const jsonConfig = jsonc.parse((await fs.readFileSync("./testeranto.json")).toString()) as IJsonConfig;
 exports.default = (config, entryPoints) => {
     return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { 
-        // inject: ['./node_modules/testeranto/dist/cjs-shim.js'],
+        // inject: ["./node_modules/testeranto/dist/cjs-shim.js"],
         // banner: {
-        //   js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
+        //   js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`,
         // },
+        // splitting: true,
         outdir: config.outdir + "/web", alias: {
-            react: path_1.default.resolve("./node_modules/react")
+            react: path_1.default.resolve("./node_modules/react"),
         }, external: [
             "testeranto.json",
             "features.test.ts",
-            // "url", 
+            // "url",
             "react",
-            "electron",
             "path",
             "fs",
             "stream",
@@ -33,18 +32,24 @@ exports.default = (config, entryPoints) => {
             "readline",
             "zlib",
             "crypto",
-            "https"
+            "https",
+            "util",
+            "process",
+            "dns",
         ], platform: "browser", entryPoints: [...entryPoints], plugins: [
             ...(config.webPlugins || []),
             {
-                name: 'rebuild-notify',
+                name: "rebuild-notify",
                 setup(build) {
-                    build.onEnd(result => {
+                    build.onEnd((result) => {
                         console.log(`web 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);
                     });
-                }
+                },
             },
         ] });
 };