testeranto 0.90.0 → 0.100.0

package/src/esbuildConfigs/inputFilesPlugin.ts

@@ -1,11 +1,11 @@
 import fs from "fs";
 import path from "path";
 import type { ImportKind, Metafile, Plugin } from "esbuild";
+import { spawn } from "child_process";
 
 const otherInputs: Record<string, Set<string>> = {};
 
 const register = (entrypoint: string, sources: string[]): void => {
-  console.log("register", entrypoint, sources);
   if (!otherInputs[entrypoint]) {
     otherInputs[entrypoint] = new Set();
   }
@@ -13,8 +13,6 @@ const register = (entrypoint: string, sources: string[]): void => {
 };
 
 function tree(meta: Metafile, key: string) {
-  console.log("searching metafile for", key);
-
   const outputKey = Object.keys(meta.outputs).find((k) => {
     return meta.outputs[k].entryPoint === key;
   });
@@ -111,6 +109,12 @@ export default (
                   (t) => `docs/types/${t}.type_errors.txt`
                 );
 
+                const lintPath = path.join(
+                  "./docs/",
+                  platform,
+                  entryPoint.split(".").slice(0, -1).join("."),
+                  `lint_errors.txt`
+                );
                 fs.writeFileSync(
                   promptPath,
                   `
@@ -122,14 +126,11 @@ ${addableFiles
   
 ${typeErrorFiles
   .map((x) => {
-    // const f = `docs/types/${x}.type_errors.txt`;
     return `/read ${x}`;
-    // if (fs.existsSync(f)) {
-    //   return `/read ${f}`;
-    // }
   })
   .join("\n")}
-  
+
+/read ${lintPath}
 /read ${testPaths}
 /read ${stdoutPath}
 /read ${stderrPath}
@@ -138,9 +139,26 @@ ${typeErrorFiles
 
 /code Fix the failing tests described in ${testPaths}. Correct any type signature errors described in the files [${typeErrorFiles.join(
                     ", "
-                  )}]. Implement any method which throws "Function not implemented."
+                  )}]. Implement any method which throws "Function not implemented. Resolve the lint errors described in ${lintPath}"
 `
                 );
+
+                const logContent: string[] = [];
+                const tsc = spawn("eslint", addableFiles);
+
+                tsc.stdout.on("data", (data) => {
+                  const lines = data.toString().split("\n");
+                  logContent.push(...lines);
+                });
+
+                tsc.stderr.on("data", (data) => {
+                  console.error(`stderr: ${data}`);
+                  process.exit(-1);
+                });
+
+                tsc.on("close", (code) => {
+                  fs.writeFileSync(lintPath, logContent.join("\n"));
+                });
               }
             });
           }

package/src/esbuildConfigs/node.ts

@@ -1,6 +1,4 @@
 import { BuildOptions } from "esbuild";
-// import pkg from "esbuild-plugin-markdown";
-// const { markdownPlugin } = pkg;
 
 import { IBaseConfig } from "../lib/types";
 
@@ -16,9 +14,6 @@ export default (
     "node",
     entryPoints
   );
-  // const inputFilesPluginFactory = inputFilesPlugin("node", entryPoints);
-  // const register = (x) => x;
-
   return {
     ...baseEsBuildConfig(config),
 
@@ -53,7 +48,7 @@ export default (
     entryPoints: [...entryPoints],
     plugins: [
       featuresPlugin,
-      // markdownPlugin({}),
+
       ...(config.nodePlugins.map((p) => p(register, entryPoints)) || []),
 
       inputFilesPluginFactory,
@@ -63,7 +58,9 @@ export default (
         name: "rebuild-notify",
         setup(build) {
           build.onEnd((result) => {
-            console.log(`node build ended with ${result.errors.length} errors`);
+            console.log(
+              `> node build ended with ${result.errors.length} errors`
+            );
             if (result.errors.length > 0) {
               console.log(result);
             }

package/src/esbuildConfigs/web.ts

@@ -1,8 +1,7 @@
 import { BuildOptions } from "esbuild";
 import path from "path";
 
-// import pkg from "esbuild-plugin-markdown";
-// const { markdownPlugin } = pkg;
+import pkg from "esbuild-plugin-markdown";
 
 import { IBaseConfig } from "../lib/types.js";
 
@@ -77,7 +76,9 @@ export default (
         name: "rebuild-notify",
         setup(build) {
           build.onEnd((result) => {
-            console.log(`web build ended with ${result.errors.length} errors`);
+            console.log(
+              `> web build ended with ${result.errors.length} errors`
+            );
             if (result.errors.length > 0) {
               console.log(result);
             }

package/src/lib/abstractBase.ts

@@ -112,21 +112,25 @@ export abstract class BaseSuite<
     const suiteArtifactory = (fPath: string, value: unknown) =>
       artifactory(`suite-${this.index}-${this.name}/${fPath}`, value);
 
-    console.log("\nSuite:", this.index, this.name);
+    // console.log("\nSuite:", this.index, this.name);
     tLog("\nSuite:", this.index, this.name);
     const sNdx = this.index;
     const sName = this.name;
 
-    for (const [gNdx, g] of Object.entries(this.givens)) {
+    for (const [gKey, g] of Object.entries(this.givens)) {
+      // console.log("gKey", gKey);
       const beforeAllProxy = new Proxy(pm, {
         get(target, prop, receiver) {
           if (prop === "customScreenShot") {
-            return (opts) =>
-              target.customScreenShot({
-                ...opts,
-                // path: `${filepath}/${opts.path}`,
-                path: `suite-${sNdx}/beforeAll/${opts.path}`,
-              });
+            return (opts, p) =>
+              target.customScreenShot(
+                {
+                  ...opts,
+                  // path: `${filepath}/${opts.path}`,
+                  path: `suite-${sNdx}/beforeAll/${opts.path}`,
+                },
+                p
+              );
           }
 
           if (prop === "writeFileSync") {
@@ -134,60 +138,6 @@ export abstract class BaseSuite<
               target[prop](`suite-${sNdx}/beforeAll/${fp}`, contents);
           }
 
-          // if (prop === "browser") {
-          //   return new Proxy(target[prop], {
-          //     get(bTarget, bProp, bReceiver) {
-          //       if (bProp === "pages") {
-          //         return async () => {
-          //           return bTarget.pages().then((pages) => {
-          //             return pages.map((page) => {
-          //               return new Proxy(page, {
-          //                 get(pTarget, pProp, pReciever) {
-          //                   if (pProp === "screenshot") {
-          //                     return async (x) => {
-          //                       return pm.customScreenShot(
-          //                         {
-          //                           ...x,
-          //                           path:
-          //                             `${testResourceConfiguration.fs}/suite-${sNdx}/beforeAll` +
-          //                             "/" +
-          //                             x.path,
-          //                         },
-          //                         page
-          //                       );
-          //                       // return await window["custom-screenshot"]({
-          //                       //   ...x,
-          //                       //   path:
-          //                       //     `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-          //                       //     "/" +
-          //                       //     x.path,
-          //                       // });
-          //                     };
-          //                   } else if (pProp === "mainFrame") {
-          //                     return () => pTarget[pProp]();
-          //                   } else if (pProp === "close") {
-          //                     return () => pTarget[pProp]();
-          //                   }
-
-          //                   // else if (pProp === "mainFrame") {
-          //                   //   return () => target[pProp](...arguments);
-          //                   // }
-          //                   else {
-          //                     return Reflect.get(...arguments);
-          //                   }
-          //                 },
-          //               });
-          //             });
-          //           });
-          //           // return (await target.pages()).map((page) => {
-          //           //   return new Proxy(page, handler2);
-          //           // });
-          //         };
-          //       }
-          //     },
-          //   });
-          // }
-
           return Reflect.get(...arguments);
         },
       });
@@ -199,11 +149,11 @@ export abstract class BaseSuite<
         beforeAllProxy
       );
 
-      const giver = this.givens[gNdx];
+      const giver = this.givens[gKey];
       try {
         this.store = await giver.give(
           subject,
-          gNdx,
+          gKey,
           testResourceConfiguration,
           this.assertThat,
           suiteArtifactory,
@@ -218,68 +168,6 @@ export abstract class BaseSuite<
       }
     }
 
-    // const afterAllProxy = new Proxy(pm, {
-    //   get(target, prop, receiver) {
-    //     if (prop === "writeFileSync") {
-    //       return (fp, contents) =>
-    //         target[prop](`suite-${sNdx}/afterAll/${fp}`, contents);
-    //     }
-
-    //     if (prop === "browser") {
-    //       return new Proxy(target[prop], {
-    //         get(bTarget, bProp, bReceiver) {
-    //           if (bProp === "pages") {
-    //             return async () => {
-    //               return bTarget.pages().then((pages) => {
-    //                 return pages.map((page) => {
-    //                   return new Proxy(page, {
-    //                     get(pTarget, pProp, pReciever) {
-    //                       if (pProp === "screenshot") {
-    //                         return async (x) => {
-    //                           return pm.customScreenShot({
-    //                             ...x,
-    //                             path:
-    //                               `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-    //                               "/" +
-    //                               x.path,
-    //                           });
-    //                           // return await window["custom-screenshot"]({
-    //                           //   ...x,
-    //                           //   path:
-    //                           //     `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-    //                           //     "/" +
-    //                           //     x.path,
-    //                           // });
-    //                         };
-    //                       } else if (pProp === "mainFrame") {
-    //                         return () => pTarget[pProp]();
-    //                       } else if (pProp === "close") {
-    //                         return () => pTarget[pProp]();
-    //                       }
-
-    //                       // else if (pProp === "mainFrame") {
-    //                       //   return () => target[pProp](...arguments);
-    //                       // }
-    //                       else {
-    //                         return Reflect.get(...arguments);
-    //                       }
-    //                     },
-    //                   });
-    //                 });
-    //               });
-    //               // return (await target.pages()).map((page) => {
-    //               //   return new Proxy(page, handler2);
-    //               // });
-    //             };
-    //           }
-    //         },
-    //       });
-    //     }
-
-    //     return Reflect.get(...arguments);
-    //   },
-    // });
-
     try {
       this.afterAll(
         this.store,
@@ -349,6 +237,7 @@ export abstract class BaseGiven<
   recommendedFsPath: string;
   givenCB: ITestShape["given"];
   initialValues: any;
+  key: string;
 
   constructor(
     name: string,
@@ -357,6 +246,7 @@ export abstract class BaseGiven<
     thens: BaseThen<ITestShape>[],
     givenCB: ITestShape["given"],
     initialValues: any
+    // key: string
   ) {
     this.name = name;
     this.features = features;
@@ -366,12 +256,22 @@ export abstract class BaseGiven<
     this.initialValues = initialValues;
   }
 
-  beforeAll(store: ITestShape["istore"], artifactory: ITestArtifactory) {
+  beforeAll(
+    store: ITestShape["istore"],
+    // artifactory: ITestArtifactory
+    // subject,
+    initializer,
+    artifactory,
+    testResource,
+    initialValues,
+    pm
+  ) {
     return store;
   }
 
   toObj() {
     return {
+      key: this.key,
       name: this.name,
       whens: this.whens.map((w) => w.toObj()),
       thens: this.thens.map((t) => t.toObj()),
@@ -386,6 +286,7 @@ export abstract class BaseGiven<
     testResourceConfiguration,
     artifactory: ITestArtifactory,
     givenCB: ITestShape["given"],
+    initialValues: any,
     pm: PM
   ): Promise<ITestShape["istore"]>;
 
@@ -398,6 +299,8 @@ export abstract class BaseGiven<
     return store;
   }
 
+  abstract uberCatcher(e);
+
   async give(
     subject: ITestShape["isubject"],
     key: string,
@@ -408,6 +311,9 @@ export abstract class BaseGiven<
     pm: PM,
     suiteNdx: number
   ) {
+    this.key = key;
+
+    tLog(`\n ${this.key}`);
     tLog(`\n Given: ${this.name}`);
 
     const givenArtifactory = (fPath: string, value: unknown) =>
@@ -426,26 +332,45 @@ export abstract class BaseGiven<
           }
 
           if (prop === "customScreenShot") {
-            return (opts) =>
-              target.customScreenShot({
-                ...opts,
-                // path: `${filepath}/${opts.path}`,
-                path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
-              });
+            return (opts, p) =>
+              target.customScreenShot(
+                {
+                  ...opts,
+                  path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
+                },
+                p
+              );
+          }
+
+          if (prop === "screencast") {
+            return (opts, p) =>
+              target.screencast(
+                {
+                  ...opts,
+                  path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
+                },
+                p
+              );
           }
 
           return Reflect.get(...arguments);
         },
       });
 
+      this.uberCatcher((e) => {
+        console.error(e);
+        this.error = e.error;
+        tLog(e.stack);
+      });
+
       this.store = await this.givenThat(
         subject,
         testResourceConfiguration,
         givenArtifactory,
         this.givenCB,
+        this.initialValues,
         beforeEachProxy
       );
-      // console.log("mark6", this.store);
 
       for (const [whenNdx, whenStep] of this.whens.entries()) {
         await whenStep.test(
@@ -479,11 +404,14 @@ export abstract class BaseGiven<
         const afterEachProxy = new Proxy(pm, {
           get(target, prop, receiver) {
             if (prop === "customScreenShot") {
-              return (opts) =>
-                target.customScreenShot({
-                  ...opts,
-                  path: `suite-${suiteNdx}/given-${key}/afterEach/${opts.path}`,
-                });
+              return (opts, p) =>
+                target.customScreenShot(
+                  {
+                    ...opts,
+                    path: `suite-${suiteNdx}/given-${key}/afterEach/${opts.path}`,
+                  },
+                  p
+                );
             }
 
             if (prop === "writeFileSync") {
@@ -500,7 +428,7 @@ export abstract class BaseGiven<
 
         await this.afterEach(
           this.store,
-          key,
+          this.key,
           givenArtifactory,
           // pm
           afterEachProxy
@@ -553,101 +481,20 @@ export abstract class BaseWhen<ITestShape extends IBaseTest> {
     const andWhenProxy = new Proxy(pm, {
       get(target, prop, receiver) {
         if (prop === "customScreenShot") {
-          return (opts) =>
-            target.customScreenShot({
-              ...opts,
-              path: `${filepath}/${opts.path}`,
-            });
+          return (opts, p) =>
+            target.customScreenShot(
+              {
+                ...opts,
+                path: `${filepath}/${opts.path}`,
+              },
+              p
+            );
         }
         if (prop === "writeFileSync") {
           return (fp, contents) =>
             target[prop](`${filepath}/andWhen/${fp}`, contents);
         }
 
-        /////////////////////
-
-        // if (prop === "browser") {
-        //   return new Proxy(target[prop], {
-        //     get(bTarget, bProp, bReceiver) {
-        //       if (bProp === "pages") {
-        //         return async () => {
-        //           return bTarget.pages().then((pages) => {
-        //             return pages.map((page) => {
-        //               return new Proxy(page, {
-        //                 get(pTarget, pProp, pReciever) {
-        //                   // console.log("mark get", pTarget, pProp, pReciever);
-        //                   if (pProp === "screenshot") {
-        //                     return async (x) => {
-        //                       return pm.customScreenShot(
-        //                         {
-        //                           ...x,
-        //                           path:
-        //                             `${testResourceConfiguration.fs}/${key}/afterEach` +
-        //                             "/" +
-        //                             x.path,
-        //                         },
-        //                         page
-        //                       );
-        //                     };
-        //                   } else if (pProp === "mainFrame") {
-        //                     return () => pTarget[pProp]();
-        //                     // return target[pProp];
-        //                     // return Reflect.get(...arguments);
-        //                   } else if (pProp === "exposeFunction") {
-        //                     // return Reflect.get(target, prop, receiver);
-        //                     return pTarget[pProp].bind(pTarget);
-        //                     // return target[pProp];
-        //                   } else if (pProp === "removeExposedFunction") {
-        //                     // return Reflect.get(target, prop, receiver);
-        //                     return pTarget[pProp].bind(pTarget);
-        //                     // return target[pProp];
-        //                   } else if (pProp === "click") {
-        //                     // console.log("mark12", arguments);
-        //                     // return Reflect.get(target, prop, receiver);
-        //                     // return pTarget[pProp].bind(pTarget);
-        //                     // return target[pProp];
-        //                     return (selector, options) => {
-        //                       pTarget[pProp](selector, options);
-        //                     };
-        //                   } else if (pProp === "$eval") {
-        //                     // return pTarget[pProp].bind(pTarget);
-        //                     return (selector, options) => {
-        //                       pTarget[pProp](selector, options);
-        //                     };
-        //                   } else if (pProp === "$") {
-        //                     return Reflect.get(...arguments);
-        //                     // return Reflect.get(target, prop, receiver);
-        //                     // return pTarget[pProp].bind(pTarget);
-        //                     // return target[pProp];
-        //                     // return pTarget[pProp].bind(pTarget);
-
-        //                     // return async (s) => {
-        //                     //   console.log("mark17", s);
-        //                     //   console.log("pTarget", pTarget);
-        //                     //   console.log("pProp", pProp);
-        //                     //   console.log("pReciever", pReciever);
-        //                     //   // return "XXX";
-        //                     //   // debugger;
-        //                     //   return await pTarget[pProp](s);
-        //                     // };
-        //                   } else {
-        //                     return Reflect.get(...arguments);
-        //                   }
-        //                 },
-        //               });
-        //             });
-        //           });
-        //           // return (await target.pages()).map((page) => {
-        //           //   return new Proxy(page, handler2);
-        //           // });
-        //         };
-        //       }
-        //     },
-        //   });
-        // }
-
-        ///////////////////////
-
         return Reflect.get(...arguments);
       },
     });
@@ -730,11 +577,14 @@ export abstract class BaseThen<
       const butThenProxy = new Proxy(pm, {
         get(target, prop, receiver) {
           if (prop === "customScreenShot") {
-            return (opts) =>
-              target.customScreenShot({
-                ...opts,
-                path: `${filepath}/${opts.path}`,
-              });
+            return (opts, p) =>
+              target.customScreenShot(
+                {
+                  ...opts,
+                  path: `${filepath}/${opts.path}`,
+                },
+                p
+              );
           }
 
           if (prop === "writeFileSync") {
@@ -742,63 +592,6 @@ export abstract class BaseThen<
               target[prop](`${filepath}/${fp}`, contents);
           }
 
-          // if (prop === "browser") {
-          //   return new Proxy(target[prop], {
-          //     get(bTarget, bProp, bReceiver) {
-          //       if (bProp === "pages") {
-          //         return async () => {
-          //           return bTarget.pages().then((pages) => {
-          //             return pages.map((page) => {
-          //               return new Proxy(page, {
-          //                 get(pTarget, pProp, pReciever) {
-          //                   if (pProp === "screenshot") {
-          //                     return async (x) => {
-          //                       return pm.customScreenShot(
-          //                         {
-          //                           ...x,
-          //                           path:
-          //                             `${testResourceConfiguration.fs}/${filepath}/butThen` +
-          //                             "/" +
-          //                             x.path,
-          //                         },
-          //                         page
-          //                       );
-          //                       // return await window["custom-screenshot"]({
-          //                       //   ...x,
-          //                       //   path:
-          //                       //     `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-          //                       //     "/" +
-          //                       //     x.path,
-          //                       // });
-          //                     };
-          //                   } else if (pProp === "close") {
-          //                     return () => pTarget[pProp]();
-          //                   } else if (pProp === "mainFrame") {
-          //                     return () => pTarget[pProp]();
-          //                   } else if (pProp === "exposeFunction") {
-          //                     // return Reflect.get(target, prop, receiver);
-          //                     return (...a) => pTarget[pProp](...a);
-          //                     // return target[pProp];
-          //                   } else if (pProp === "removeExposedFunction") {
-          //                     // return Reflect.get(target, prop, receiver);
-          //                     return pTarget[pProp].bind(pTarget);
-          //                     // return target[pProp];
-          //                   } else {
-          //                     return Reflect.get(...arguments);
-          //                   }
-          //                 },
-          //               });
-          //             });
-          //           });
-          //           // return (await target.pages()).map((page) => {
-          //           //   return new Proxy(page, handler2);
-          //           // });
-          //         };
-          //       }
-          //     },
-          //   });
-          // }
-
           return Reflect.get(...arguments);
         },
       });