testeranto 0.90.0 → 0.94.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testeranto",
   "description": "the AI powered BDD test framework for typescript projects",
-  "version": "0.90.0",
+  "version": "0.94.0",
   "engines": {
     "node": "18.18.0"
   },
@@ -25,16 +25,16 @@
       "require": "./dist/common/SubPackages/puppeteer.js"
     },
     "./src/SubPackages/react/jsx/index": {
-      "import": "./dist/module/SubPackages/react/jsx/index.js",
-      "require": "./dist/common/SubPackages/react/jsx/index.js"
+      "import": "./dist/module/src/SubPackages/react/jsx/index.js",
+      "require": "./dist/common/src/SubPackages/react/jsx/index.js"
     },
     "./src/SubPackages/react/jsx/web": {
       "import": "./src/SubPackages/react/jsx/web.ts",
       "require": "./src/SubPackages/react/jsx/web.ts"
     },
     "./src/SubPackages/react/jsx/node": {
-      "import": "./dist/module/SubPackages/react/jsx/node.js",
-      "require": "./dist/common/SubPackages/react/jsx/node.js"
+      "import": "./dist/module/src/SubPackages/react/jsx/node.js",
+      "require": "./dist/common/src/SubPackages/react/jsx/node.js"
     },
     "./src/SubPackages/react/component/index": {
       "import": "./dist/module/SubPackages/react/component/index.js",
@@ -57,12 +57,12 @@
       "require": "./src/SubPackages/react-test-renderer/component/index.ts"
     },
     "./src/SubPackages/react-test-renderer/component/web": {
-      "import": "./dist/module/SubPackages/react-test-renderer/component/web.js",
-      "require": "./dist/common/SubPackages/react-test-renderer/component/web.js"
+      "import": "./dist/module/src/SubPackages/react-test-renderer/component/web.js",
+      "require": "./dist/common/src/SubPackages/react-test-renderer/component/web.js"
     },
     "./src/SubPackages/react-test-renderer/component/node": {
-      "import": "./dist/module/SubPackages/react-test-renderer/component/node.js",
-      "require": "./dist/common/SubPackages/react-test-renderer/component/node.js"
+      "import": "./dist/module/src/SubPackages/react-test-renderer/component/node.js",
+      "require": "./dist/common/src/SubPackages/react-test-renderer/component/node.js"
     },
     "./src/SubPackages/react-test-renderer/jsx/index.js": {
       "import": "./dist/module/src/SubPackages/react-test-renderer/jsx/index.js",
@@ -109,12 +109,12 @@
       "require": "./dist/common/SubPackages/react-dom/jsx/index.js"
     },
     "./src/SubPackages/react-dom/component/web": {
-      "import": "./dist/module/SubPackages/react-dom/component/web.js",
-      "require": "./dist/common/SubPackages/react-dom/component/web.js"
+      "import": "./dist/module/src/SubPackages/react-dom/component/web.js",
+      "require": "./dist/common/src/SubPackages/react-dom/component/web.js"
     },
     "./src/SubPackages/react-dom/component/node": {
-      "import": "./dist/module/SubPackages/react-dom/component/node.js",
-      "require": "./dist/common/SubPackages/react-dom/component/node.js"
+      "import": "./dist/module/src/SubPackages/react-dom/component/node.js",
+      "require": "./dist/common/src/SubPackages/react-dom/component/node.js"
     },
     "./src/Types": {
       "import": "./src/Types.ts",

package/src/Node.ts

@@ -40,7 +40,10 @@ export class NodeTesteranto<
       testSpecification,
       testImplementation,
       testResourceRequirement,
-      testInterface
+      testInterface,
+      () => {
+        // no-op
+      }
     );
   }
 
@@ -49,8 +52,8 @@ export class NodeTesteranto<
     const pm = new PM_Node(t);
     const { failed, artifacts, logPromise, features } =
       await this.testJobs[0].receiveTestResourceConfig(pm);
-    pm.customclose();
-    return features;
+    // pm.customclose();
+    return { features, failed };
   }
 }
 

package/src/PM/main.ts

@@ -8,7 +8,7 @@ import puppeteer, {
 import { PassThrough } from "stream";
 import crypto from "crypto";
 
-import { IBuiltConfig, ITestTypes } from "../lib/types";
+import { IBuiltConfig, IFinalResults, ITestTypes } from "../lib/types";
 
 import { PM } from "./index.js";
 import { destinationOfRuntime } from "../utils.js";
@@ -57,14 +57,19 @@ export class PM_Main extends PM {
       contents: string,
       testName: string
     ) => {
-      // console.log("globalThis-writeFileSync", filepath);
+      // console.log(testName, "writeFileSync", filepath, testName);
 
       // Create directories if they don't exist
-      const dir = path.dirname(filepath.split("/").slice(0, -1).join("/"));
+      const dir = path.dirname(filepath);
+
+      // console.log(testName, "mkdirSync", dir);
 
       fs.mkdirSync(dir, {
         recursive: true,
       });
+
+      // console.log(testName, "mkdirSync2");
+
       if (!files[testName]) {
         files[testName] = new Set();
       }
@@ -122,17 +127,17 @@ export class PM_Main extends PM {
       return sPromise;
     };
 
-    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];
-    };
+    // 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: string): boolean {
@@ -340,14 +345,18 @@ export class PM_Main extends PM {
 
     const builtfile = dest + ".mjs";
 
+    const webSideCares: Page[] = [];
+
     await Promise.all(
-      testConfig[3].map((sidecar) => {
+      testConfig[3].map(async (sidecar) => {
         if (sidecar[1] === "web") {
-          return this.launchWebSideCar(
+          const s = await this.launchWebSideCar(
             sidecar[0],
             destinationOfRuntime(sidecar[0], "web", this.configs),
             sidecar
           );
+          webSideCares.push(s);
+          return s;
         }
 
         if (sidecar[1] === "node") {
@@ -366,13 +375,15 @@ export class PM_Main extends PM {
       return module.default.then((defaultModule) => {
         defaultModule
           .receiveTestResourceConfig(argz)
-          .then(async (features: string[]) => {
+          .then(async ({ features, failed }: IFinalResults) => {
             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);
           });
       });
@@ -390,23 +401,16 @@ export class PM_Main extends PM {
     src: string,
     dest: string,
     testConfig: ITestTypes
-  ) => {
+  ): Promise<Page> => {
     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: fs.WriteStream[] = [];
     const doneFileStream2: Promise<any>[] = [];
@@ -520,18 +524,18 @@ export class PM_Main extends PM {
             return fileStreams2[uid].end();
           });
 
-          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();
-            });
-          });
+          // 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;
         })
@@ -737,23 +741,24 @@ export class PM_Main extends PM {
         page.exposeFunction(
           "writeFileSync",
           (fp: string, contents: string, testName: string) => {
-            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;
+            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;
           }
         );
 
@@ -803,45 +808,44 @@ export class PM_Main extends PM {
           return fileStreams2[uid].end();
         });
 
-        page.exposeFunction("customclose", (p: string, testName: string) => {
-          // console.log("closing", p);
-
-          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];
-            // page.close();
-            // console.log("\t GOODBYE");
-            // whyIsNodeRunning();
-          });
+        // page.exposeFunction("customclose", (p: string, testName: string) => {
+        //   // console.log("closing", p);
 
-          // globalThis["writeFileSync"](
-          //   p + "/manifest.json",
-          //   // files.entries()
-          //   JSON.stringify(Array.from(files[testName]))
-          // );
+        //   console.log("\t GOODBYE customclose");
 
-          // console.log("closing doneFileStream2", doneFileStream2);
-          // console.log("closing doneFileStream2", doneFileStream2);
-          // Promise.all([...doneFileStream2, ...screenshots2]).then(() => {
-          //   page.close();
-          // });
+        //   fs.writeFileSync(
+        //     p + "/manifest.json",
+        //     JSON.stringify(Array.from(files[testName]))
+        //   );
+        //   delete files[testName];
 
-          // Promise.all(screenshots).then(() => {
-          //   page.close();
-          // });
-          // setTimeout(() => {
-          //   console.log("Delayed for 1 second.");
-          //   page.close();
-          // }, 5000);
+        //   // console.log("screenshots[testName]", screenshots[testName]);
+        //   Promise.all(screenshots[testName] || []).then(() => {
+        //     delete screenshots[testName];
+        //   });
 
-          // return 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();
+        //   // });
+        //   // setTimeout(() => {
+        //   //   console.log("Delayed for 1 second.");
+        //   //   page.close();
+        //   // }, 5000);
+
+        //   // return page.close();
+        // });
 
         page.exposeFunction("page", () => {
           return page.mainFrame()._id;
@@ -895,13 +899,25 @@ export class PM_Main extends PM {
       })
       .then(async (page) => {
         const close = () => {
-          console.log("evaluation complete.", dest);
-          page.off("pageerror");
-          page.close();
+          if (!files[t]) {
+            files[t] = new Set();
+          }
+          // files[t].add(filepath);
+
+          fs.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();
+            this.deregister(t);
+            stderrStream.close();
+            stdoutStream.close();
+          });
         };
 
         page.on("pageerror", (err: Error) => {
@@ -936,20 +952,15 @@ export class PM_Main extends PM {
 
         await page
           .evaluate(evaluation)
-          .then(async (features: string[]) => {
+          .then(async ({ failed, features }: IFinalResults) => {
             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;
@@ -957,7 +968,6 @@ export class PM_Main extends PM {
   };
 
   receiveFeatures = (features: string[], destFolder: string) => {
-    console.log("this.receiveFeatures", features);
     features
       .reduce(async (mm, featureStringKey) => {
         const accum = await mm;

package/src/Project.ts

@@ -89,18 +89,19 @@ const compile = () => {
     const tsc = 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}`);
@@ -143,8 +144,6 @@ export class ITProject {
       )
     );
 
-    compile();
-
     Promise.resolve(
       Promise.all(
         [...this.getSecondaryEndpointsPoints("web")].map(
@@ -188,6 +187,8 @@ export class ITProject {
     });
 
     Promise.all([
+      compile(),
+
       esbuild
         .context(esbuildNodeConfiger(this.config, nodeEntryPoints))
         .then(async (nodeContext) => {

package/src/Puppeteer.ts

@@ -36,7 +36,7 @@ export 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,
@@ -83,10 +83,8 @@ export 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/src/SubPackages/puppeteer.ts

@@ -29,7 +29,7 @@ export default <ITestShape extends IBaseTest>(
     testSpecifications,
     testImplementations,
     {
-      beforeAll(x) {
+      beforeAll: (x) => {
         // process.parentPort.postMessage(
         //   `/docs/web/src/ClassicalComponent/test.html`
         // );

package/src/SubPackages/react/jsx/index.ts

@@ -1,4 +1,5 @@
 import { CElement } from "react";
+import React from "react";
 
 import {
   IBaseTest,
@@ -6,7 +7,6 @@ import {
   ITestImplementation,
   ITestSpecification,
 } from "../../../Types";
-import React from "react";
 
 export type IWhenShape = any;
 export type IThenShape = any;
@@ -29,14 +29,22 @@ export const testInterface: IPartialInterface<any> = {
   //   //   resolve(x());
   //   // });
   // },
-  beforeEach: async (subject, initializer, artificer): Promise<IStore> => {
+  // beforeEach: async (subject, initializer, artificer): Promise<IStore> => {
+  //   return new Promise((resolve, rej) => {
+  //     resolve(React.createElement(subject));
+  //   });
+  // },
+  andWhen: async (s: IStore, whenCB): Promise<IStore> => {
+    await whenCB(s());
     return new Promise((resolve, rej) => {
-      const x = React.createElement(subject);
-      console.log("react-element", x);
-      resolve(x);
+      resolve(React.createElement(s));
     });
+    // return whenCB(s);
   },
-  andWhen: function (s: IStore, whenCB): Promise<ISelection> {
-    return whenCB(s);
+  butThen: async (subject, thenCB) => {
+    await thenCB(subject());
+    return new Promise((resolve, rej) => {
+      resolve(React.createElement(subject));
+    });
   },
 };

package/src/SubPackages/react/jsx/node.ts

@@ -12,15 +12,16 @@ export default <ITestShape extends IBaseTest>(
   testImplementations: ITestImpl<ITestShape>,
   testSpecifications: ITestSpec<ITestShape>,
   testInput: IInput,
-  testInterface: IPartialInterface<ITestShape>
+  testInterface: IPartialInterface<ITestShape> = baseInterface
 ) => {
   return Testeranto<ITestShape>(
     testInput,
     testSpecifications,
     testImplementations,
-    {
-      ...baseInterface,
-      ...testInterface,
-    }
+    testInterface
+    // {
+    //   ...baseInterface,
+    //   ...testInterface,
+    // }
   );
 };

package/src/SubPackages/react-dom/component/web.ts

@@ -25,7 +25,7 @@ export type IStore = {
 
 type ISubject = {
   htmlElement: HTMLElement;
-  reactElement: any; //CElement<any, any>,
+  // reactElement: any; //CElement<any, any>,
   domRoot: ReactDom.Root;
 };
 
@@ -52,63 +52,40 @@ export default <ITestShape extends IBaseTest, IWhen, IGiven>(
     testSpecifications,
     testImplementations,
     {
-      beforeAll: async (initialProps, artificer): Promise<ISubject> => {
+      beforeAll: async (subject, artificer): Promise<ISubject> => {
         return await new Promise((resolve, rej) => {
           const htmlElement = document.getElementById("root");
           if (htmlElement) {
             const domRoot = ReactDom.createRoot(htmlElement);
-            // Ignore these type errors
-            domRoot.render(
-              createElement(
-                TesterantoComponent,
-                {
-                  ...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
+      ): Promise<IStore> => {
+        return new Promise(async (resolve, rej) => {
+          domRoot.render(
+            createElement(
+              TesterantoComponent,
+              {
+                ...initialValues,
+                done: (reactElement) => {
+                  resolve({
+                    htmlElement,
+                    reactElement,
+                    domRoot,
+                  });
+                },
+              },
+              []
+            )
+          );
+        });
+      },
       andWhen: function (s: IStore, whenCB): Promise<ISelection> {
         return whenCB(s);
       },