testeranto 0.73.0 → 0.74.0

package/dist/common/Node.js

@@ -10,18 +10,11 @@ class NodeTesteranto extends core_js_1.default {
     constructor(input, testSpecification, testImplementation, testResourceRequirement, testInterface) {
         super(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
     }
-    async receiveTestResourceConfig(
-    // t: ITestJob,
-    partialTestResource) {
-        console.log("receiveTestResourceConfig!!", this.testJobs[0].receiveTestResourceConfig);
+    async receiveTestResourceConfig(partialTestResource) {
         const t = JSON.parse(partialTestResource);
         const pm = new node_js_1.PM_Node(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 () => {
-        //   // process.exit((await failed) ? 1 : 0);
-        // });
     }
 }
 exports.default = async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = index_js_1.defaultTestResourceRequirement) => {

package/dist/common/PM/main.js

@@ -33,17 +33,13 @@ const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
 const index_js_1 = require("./index.js");
 const fPaths = [];
 const fileStreams3 = [];
-const screenshots3 = [];
-const doneFileStream3 = [];
+const files = {}; // = new Set<string>();
+const screenshots = {};
 class PM_Main extends index_js_1.PM {
-    // testResourceConfiguration: ITTestResourceConfiguration;
-    constructor(configs
-    // testResourceConfig: ITTestResourceConfiguration
-    ) {
+    constructor(configs) {
         super();
         this.launchNode = async (src, dest) => {
             console.log("launchNode", src);
-            // childProcesses[src] = "running";
             const destFolder = dest.replace(".mjs", "");
             let argz = "";
             const testConfig = this.configs.tests.find((t) => {
@@ -54,7 +50,6 @@ class PM_Main extends index_js_1.PM {
                 process.exit(-1);
             }
             const testConfigResource = testConfig[2];
-            console.log("mark22 testConfigResource", testConfigResource);
             let portsToUse = [];
             if (testConfigResource.ports === 0) {
                 argz = JSON.stringify({
@@ -110,8 +105,6 @@ class PM_Main extends index_js_1.PM {
         };
         this.launchWeb = (t, dest) => {
             console.log("launchWeb", t, dest);
-            const testResourceConfiguration = this.testResourceConfiguration;
-            // childProcesses[t] = "running";
             const destFolder = dest.replace(".mjs", "");
             const webArgz = JSON.stringify({
                 name: dest,
@@ -128,54 +121,49 @@ class PM_Main extends index_js_1.PM {
       }
     })`;
             const fileStreams2 = [];
-            const screenshots2 = [];
+            // const screenshots2: Promise<any>[] = [];
             const doneFileStream2 = [];
             this.browser
                 .newPage()
                 .then((page) => {
-                page.exposeFunction("custom-screenshot", async (ssOpts) => {
+                page.exposeFunction("custom-screenshot", async (ssOpts, testName) => {
+                    console.log("main.ts browser custom-screenshot", testName);
                     const p = ssOpts.path;
-                    console.log("custom-screenshot", ssOpts);
                     const dir = path_1.default.dirname(p);
-                    console.log("dir", dir);
                     fs_1.default.mkdirSync(dir, {
                         recursive: true,
                     });
-                    return page.screenshot(Object.assign(Object.assign({}, ssOpts), { path: p }));
-                    // screenshots.push(
-                    //   page.screenshot({
-                    //     ...ssOpts,
-                    //     path: ssOpts.path,
-                    //   })
-                    // );
-                    // const sPromise = page.screenshot({
-                    //   ...ssOpts,
-                    //   path: p,
-                    // });
-                    // await sPromise;
+                    files[testName].add(ssOpts.path);
+                    const sPromise = page.screenshot(Object.assign(Object.assign({}, ssOpts), { path: p }));
+                    if (!screenshots[testName]) {
+                        screenshots[testName] = [];
+                    }
+                    screenshots[testName].push(sPromise);
+                    // sPromise.then(())
+                    await sPromise;
+                    return sPromise;
                     // page.evaluate(`window["screenshot done"]`);
                 });
-                page.exposeFunction("writeFileSync", (fp, contents) => {
-                    console.log("writeFileSync", fp);
-                    // Create directories if they don't exist
+                page.exposeFunction("writeFileSync", (fp, contents, testName) => {
                     const dir = path_1.default.dirname(fp);
-                    console.log("dir", dir);
                     fs_1.default.mkdirSync(dir, {
                         recursive: true,
                     });
-                    // return fs.writeFileSync(fp, contents);
                     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;
                 });
                 page.exposeFunction("existsSync", (fp, contents) => {
                     return fs_1.default.existsSync(fp);
                 });
                 page.exposeFunction("mkdirSync", (fp) => {
-                    console.log("mkdirsync", fp);
                     if (!fs_1.default.existsSync(fp)) {
                         return fs_1.default.mkdirSync(fp, {
                             recursive: true,
@@ -183,8 +171,12 @@ class PM_Main extends index_js_1.PM {
                     }
                     return false;
                 });
-                page.exposeFunction("createWriteStream", (fp) => {
+                page.exposeFunction("createWriteStream", (fp, testName) => {
                     const f = fs_1.default.createWriteStream(fp);
+                    if (!files[testName]) {
+                        files[testName] = new Set();
+                    }
+                    files[testName].add(fp);
                     const p = new Promise((res, rej) => {
                         res(fp);
                     });
@@ -201,13 +193,23 @@ class PM_Main extends index_js_1.PM {
                 page.exposeFunction("end", async (uid) => {
                     return fileStreams2[uid].end();
                 });
-                page.exposeFunction("customclose", () => {
-                    console.log("closing doneFileStream2", doneFileStream2);
-                    // console.log("closing doneFileStream2", doneFileStream2);
-                    Promise.all([...doneFileStream2, ...screenshots2]).then(() => {
+                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.close();
+                    // 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();
                     // });
@@ -220,22 +222,13 @@ class PM_Main extends index_js_1.PM {
                 return page;
             })
                 .then(async (page) => {
-                await page.goto(`file://${`${dest}.html`}`, {
-                // waitUntil: "load",
-                // timeout: 0,
-                });
+                await page.goto(`file://${`${dest}.html`}`, {});
                 page.evaluate(evaluation).finally(() => {
                     console.log("evaluation failed.", dest);
                 });
                 return page;
-            })
-                .then((page) => {
-                // console.log("qwe", page);
-                // page.close();
             });
         };
-        // this.testResourceConfiguration = testResourceConfig;
-        // console.log("mkdirsync4", testResourceConfig);
         this.server = {};
         this.configs = configs;
         this.ports = {};
@@ -250,29 +243,45 @@ class PM_Main extends index_js_1.PM {
             }
             return false;
         };
-        globalThis["writeFileSync"] = (fp, contents) => {
+        globalThis["writeFileSync"] = (filepath, contents, testName) => {
             // Create directories if they don't exist
-            const dir = path_1.default.dirname(fp.split("/").slice(0, -1).join("/"));
-            console.log("dir", dir);
+            const dir = path_1.default.dirname(filepath.split("/").slice(0, -1).join("/"));
             fs_1.default.mkdirSync(dir, {
                 recursive: true,
             });
-            return fs_1.default.writeFileSync(fp, contents);
+            if (!files[testName]) {
+                files[testName] = new Set();
+            }
+            files[testName].add(filepath);
+            return fs_1.default.writeFileSync(filepath, contents);
         };
-        globalThis["createWriteStream"] = (filepath) => {
+        globalThis["createWriteStream"] = (filepath, testName) => {
             const f = fs_1.default.createWriteStream(filepath);
             fileStreams3.push(f);
+            // files.add(filepath);
+            if (!files[testName]) {
+                files[testName] = new Set();
+            }
+            files[testName].add(filepath);
             return Object.assign(Object.assign({}, JSON.parse(JSON.stringify(f))), { uid: fileStreams3.length - 1 });
         };
         globalThis["write"] = (uid, contents) => {
-            console.log("write", uid, contents);
-            // process.exit();
             fileStreams3[uid].write(contents);
         };
         globalThis["end"] = (uid) => {
             fileStreams3[uid].end();
         };
-        globalThis["customclose"] = () => {
+        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["writeFileSync"](
+            //   p + "/manifest.json",
+            //   // files.entries()
+            //   JSON.stringify(Array.from(files[testName]))
+            // );
             // fileStreams3[uid].end();
         };
         // page.exposeFunction("customclose", () => {

package/dist/common/PM/node.js

@@ -3,59 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PM_Node = exports.addPageBinding = void 0;
-// import puppeteer from "puppeteer";
+exports.PM_Node = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-// import puppeteer from "puppeteer-core/lib/esm/puppeteer/puppeteer-core";
 const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
 const index_js_1 = require("./index.js");
 const fPaths = [];
-function addPageBinding(type, name, prefix) {
-    // Depending on the frame loading state either Runtime.evaluate or
-    // Page.addScriptToEvaluateOnNewDocument might succeed. Let's check that we
-    // don't re-wrap Puppeteer's binding.
-    if (globalThis[name]) {
-        return;
-    }
-    // We replace the CDP binding with a Puppeteer binding.
-    Object.assign(globalThis, {
-        [name](...args) {
-            var _a, _b, _c;
-            // This is the Puppeteer binding.
-            const callPuppeteer = globalThis[name];
-            (_a = callPuppeteer.args) !== null && _a !== void 0 ? _a : (callPuppeteer.args = new Map());
-            (_b = callPuppeteer.callbacks) !== null && _b !== void 0 ? _b : (callPuppeteer.callbacks = new Map());
-            const seq = ((_c = callPuppeteer.lastSeq) !== null && _c !== void 0 ? _c : 0) + 1;
-            callPuppeteer.lastSeq = seq;
-            callPuppeteer.args.set(seq, args);
-            // Needs to be the same as CDP_BINDING_PREFIX.
-            globalThis[prefix + name](JSON.stringify({
-                type,
-                name,
-                seq,
-                args,
-                isTrivial: !args.some((value) => {
-                    return value instanceof Node;
-                }),
-            }));
-            return new Promise((resolve, reject) => {
-                callPuppeteer.callbacks.set(seq, {
-                    resolve(value) {
-                        callPuppeteer.args.delete(seq);
-                        resolve(value);
-                    },
-                    reject(value) {
-                        callPuppeteer.args.delete(seq);
-                        reject(value);
-                    },
-                });
-            });
-        },
-    });
-}
-exports.addPageBinding = addPageBinding;
-const files = new Set();
 class PM_Node extends index_js_1.PM {
     constructor(t) {
         super();
@@ -72,44 +25,17 @@ class PM_Node extends index_js_1.PM {
         return globalThis["write"](writeObject.uid, contents);
     }
     writeFileSync(filepath, contents) {
-        files.add(filepath);
-        return globalThis["writeFileSync"](this.testResourceConfiguration.fs + "/" + filepath, contents);
+        return globalThis["writeFileSync"](this.testResourceConfiguration.fs + "/" + filepath, contents, this.testResourceConfiguration.name);
     }
     createWriteStream(filepath) {
-        files.add(filepath);
-        return globalThis["createWriteStream"](this.testResourceConfiguration.fs + "/" + filepath);
+        return globalThis["createWriteStream"](this.testResourceConfiguration.fs + "/" + filepath, this.testResourceConfiguration.name);
     }
     end(writeObject) {
         return globalThis["end"](writeObject.uid);
     }
     customclose() {
-        console.log("node-customclose");
-        // globalThis["writeFileSync"](
-        //   this.testResourceConfiguration.fs + "/manifest.json",
-        //   // files.entries()
-        //   JSON.stringify(Array.from(files))
-        // ).then(() => {
-        //   globalThis["customclose"]();
-        // });
+        globalThis["customclose"](this.testResourceConfiguration.fs, this.testResourceConfiguration.name);
     }
-    // write(accessObject: { uid: number; }, contents: string): boolean {
-    //   throw new Error("Method not implemented.");
-    // }
-    // existsSync(destFolder: string): boolean {
-    //   return fs.existsSync(destFolder);
-    // }
-    // async mkdirSync(destFolder: string) {
-    //   if (!fs.existsSync(destFolder)) {
-    //     return fs.mkdirSync(destFolder, { recursive: true });
-    //   }
-    //   return false;
-    // }
-    // writeFileSync(fp: string, contents: string) {
-    //   fs.writeFileSync(fp, contents);
-    // }
-    // createWriteStream(filepath: string): fs.WriteStream {
-    //   return fs.createWriteStream(filepath);
-    // }
     testArtiFactoryfileWriter(tLog, callback) {
         return (fPath, value) => {
             callback(new Promise((res, rej) => {
@@ -150,27 +76,9 @@ class PM_Node extends index_js_1.PM {
     }
     // launch(options?: PuppeteerLaunchOptions): Promise<Browser>;
     startPuppeteer(options) {
-        console.log("start1");
         return puppeteer_core_1.default.connect(options).then((b) => {
             this.browser = b;
         });
-        // return new Promise<Browser>((res, rej) => {
-        //   // this.browser = await puppeteer.connect(options);
-        //   // console.log("start2", this.browser);
-        //   // console.log("mark5", this.browser);
-        //   // res(this.browser);
-        // });
     }
 }
 exports.PM_Node = PM_Node;
-// class PuppetMasterServer extends AbstractPuppetMaster {
-//   // constructor(...z: []) {
-//   //   super(...z);
-//   // }
-//   // // pages(): Promise<Page[]>;
-//   // pages(): Promise<Page[]> {
-//   //   return new Promise<Page[]>((res, rej) => {
-//   //     res(super.pages());
-//   //   });
-//   // }
-// }

package/dist/common/PM/web.js

@@ -4,20 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PM_Web = void 0;
-const index_js_1 = require("./index.js");
 const puppeteer_core_browser_js_1 = __importDefault(require("puppeteer-core/lib/esm/puppeteer/puppeteer-core-browser.js"));
-function waitForFunctionCall() {
-    return new Promise((resolve) => {
-        window["myFunction"] = () => {
-            // Do something when myFunction is called
-            console.log("myFunction was called!");
-            resolve(); // Resolve the promise
-        };
-    });
-}
-const files = new Set();
+const index_js_1 = require("./index.js");
 class PM_Web extends index_js_1.PM {
-    // testResourceConfiguration: ITTestResourceConfiguration;
     constructor(t) {
         super();
         this.server = {};
@@ -33,23 +22,16 @@ class PM_Web extends index_js_1.PM {
         return window["write"](writeObject.uid, contents);
     }
     writeFileSync(filepath, contents) {
-        console.log("WEB writeFileSync", filepath);
-        files.add(filepath);
-        return window["writeFileSync"](this.testResourceConfiguration.fs + "/" + filepath, contents);
+        return window["writeFileSync"](this.testResourceConfiguration.fs + "/" + filepath, contents, this.testResourceConfiguration.name);
     }
     createWriteStream(filepath) {
-        files.add(filepath);
-        return window["createWriteStream"](this.testResourceConfiguration.fs + "/" + filepath);
+        return window["createWriteStream"](this.testResourceConfiguration.fs + "/" + filepath, this.testResourceConfiguration.name);
     }
     end(writeObject) {
         return window["end"](writeObject.uid);
     }
     customclose() {
-        window["writeFileSync"](this.testResourceConfiguration.fs + "/manifest.json", 
-        // files.entries()
-        JSON.stringify(Array.from(files))).then(() => {
-            window["customclose"]();
-        });
+        window["customclose"](this.testResourceConfiguration.fs, this.testResourceConfiguration.name);
     }
     testArtiFactoryfileWriter(tLog, callback) {
         return (fPath, value) => {
@@ -95,12 +77,12 @@ class PM_Web extends index_js_1.PM {
         };
     }
     startPuppeteer(options, destFolder) {
+        const name = this.testResourceConfiguration.name;
         return fetch(`http://localhost:3234/json/version`)
             .then((v) => {
             return v.json();
         })
             .then((json) => {
-            console.log("found endpoint", json.webSocketDebuggerUrl);
             return puppeteer_core_browser_js_1.default
                 .connect({
                 browserWSEndpoint: json.webSocketDebuggerUrl,
@@ -111,10 +93,9 @@ class PM_Web extends index_js_1.PM {
                     get(target, prop, receiver) {
                         if (prop === "screenshot") {
                             return async (x) => {
-                                // debugger;
-                                files.add(x.path);
-                                console.log("aloha", files);
-                                return await window["custom-screenshot"](Object.assign(Object.assign({}, x), { path: destFolder + "/" + x.path }));
+                                return await window["custom-screenshot"](Object.assign(Object.assign({}, x), { 
+                                    // path: destFolder + "/" + x.path,
+                                    path: x.path }), name);
                             };
                         }
                         else if (prop === "mainFrame") {
@@ -143,32 +124,6 @@ class PM_Web extends index_js_1.PM {
                 this.browser = proxy3;
             });
         });
-        // console.log("connecting to ws://localhost:3234/devtools/browser/RANDOM");
-        // return puppeteer
-        //   .connect({
-        //     ...options,
-        //   })
-        //   .finally(() => {
-        //     console.log("idk");
-        //   });
-        // return new Promise<Browser>(async (res, rej) => {
-        //   console.log("connecting with options", options);
-        //   this.browser = await puppeteer.connect({
-        //     ...options,
-        //   });
-        //   res(this.browser);
-        // });
     }
 }
 exports.PM_Web = PM_Web;
-// class PuppetMasterServer extends AbstractPuppetMaster {
-//   // constructor(...z: []) {
-//   //   super(...z);
-//   // }
-//   // // pages(): Promise<Page[]>;
-//   // pages(): Promise<Page[]> {
-//   //   return new Promise<Page[]>((res, rej) => {
-//   //     res(super.pages());
-//   //   });
-//   // }
-// }

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

@@ -1,10 +1,22 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testInterface = void 0;
+const react_1 = __importDefault(require("react"));
 exports.testInterface = {
-    beforeEach: async (x, ndx, testRsource, artificer) => {
+    // beforeAll: async (proto, testResource, artificer, pm): Promise<IStore> => {
+    //   return React.createElement(proto);
+    //   // return new Promise((resolve, rej) => {
+    //   //   resolve(x());
+    //   // });
+    // },
+    beforeEach: async (subject, initializer, artificer) => {
         return new Promise((resolve, rej) => {
-            resolve(x());
+            const x = react_1.default.createElement(subject);
+            console.log("react-element", x);
+            resolve(x);
         });
     },
     andWhen: function (s, whenCB) {

package/dist/common/Web.js

@@ -14,7 +14,6 @@ class WebTesteranto extends core_js_1.default {
         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");

package/dist/common/lib/abstractBase.js

@@ -218,7 +218,7 @@ class BaseGiven {
                                                                     //   "custom-screenshot-MARK-afterEachProxy",
                                                                     //   window["custom-screenshot"].toString()
                                                                     // );
-                                                                    return await window["custom-screenshot"](Object.assign(Object.assign({}, x), { path: `${testResourceConfiguration.fs}/suite-${suiteNdx}/given-${key}/afterEach` +
+                                                                    return await pTarget[pProp](Object.assign(Object.assign({}, x), { path: `${testResourceConfiguration.fs}/suite-${suiteNdx}/given-${key}/afterEach` +
                                                                             "/" +
                                                                             x.path }));
                                                                 };