testeranto 0.80.0 → 0.81.1

package/src/Project.ts

@@ -9,58 +9,30 @@ import esbuildWebConfiger from "./esbuildConfigs/web.js";
 import webHtmlFrame from "./web.html.js";
 import { ITestTypes, IBaseConfig, IRunTime } from "./lib/types.js";
 
-var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
+// var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
 
 readline.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY) process.stdin.setRawMode(true);
 
-process.stdin.on("keypress", (str, key) => {
-  if (key.name === "q") {
-    console.log("Testeranto-EsBuild is shutting down...");
-    mode = "PROD";
-    onDone();
-  }
-});
-
-let nodeDone,
-  webDone = false;
-
-const onNodeDone = () => {
-  nodeDone = true;
-  onDone();
-};
-const onWebDone = () => {
-  webDone = true;
-  onDone();
-};
-
-const onDone = () => {
-  console.log(
-    JSON.stringify(
-      {
-        nodeDone,
-        webDone,
-        mode,
-      },
-      null,
-      2
-    )
-  );
-  if (nodeDone && webDone && mode === "PROD") {
-    console.log("Testeranto-EsBuild is all done. Goodbye!");
-    process.exit();
-  } else {
-    console.log("Testeranto-EsBuild is still working...");
-  }
-};
-
 export class ITProject {
   config: IBaseConfig;
-  mode: `up` | `down` = `up`;
+  mode: `DEV` | `PROD`;
+  nodeDone: boolean = false;
+  webDone: boolean = false;
 
   constructor(configs: IBaseConfig) {
     this.config = configs;
 
+    this.mode = this.config.devMode ? "DEV" : "PROD";
+
+    process.stdin.on("keypress", (str, key) => {
+      if (key.name === "q") {
+        console.log("Testeranto-EsBuild is shutting down...");
+        this.mode = "PROD";
+        this.onDone();
+      }
+    });
+
     fs.writeFileSync(
       `${this.config.outdir}/testeranto.json`,
       JSON.stringify(
@@ -124,13 +96,13 @@ export class ITProject {
       esbuild
         .context(esbuildNodeConfiger(this.config, nodeEntryPoints))
         .then(async (nodeContext) => {
-          if (mode == "DEV") {
+          if (this.config.devMode) {
             await nodeContext.watch().then((v) => {
-              onNodeDone();
+              this.onNodeDone();
             });
           } else {
             nodeContext.rebuild().then((v) => {
-              onNodeDone();
+              this.onNodeDone();
             });
           }
 
@@ -139,13 +111,13 @@ export class ITProject {
       esbuild
         .context(esbuildWebConfiger(this.config, webEntryPoints))
         .then(async (webContext) => {
-          if (mode == "DEV") {
+          if (this.config.devMode) {
             await webContext.watch().then((v) => {
-              onWebDone();
+              this.onWebDone();
             });
           } else {
             webContext.rebuild().then((v) => {
-              onWebDone();
+              this.onWebDone();
             });
           }
           return webContext;
@@ -153,6 +125,41 @@ export class ITProject {
     ]);
   }
 
+  onNodeDone = () => {
+    this.nodeDone = true;
+    this.onDone();
+  };
+  onWebDone = () => {
+    this.webDone = true;
+    this.onDone();
+  };
+
+  onDone = () => {
+    // console.log(this.nodeDone && this.webDone && this.mode === "PROD");
+    if (this.nodeDone && this.webDone && this.mode === "PROD") {
+      console.log("Testeranto-EsBuild is all done. Goodbye!");
+      process.exit();
+    } else {
+      if (this.mode === "PROD") {
+        console.log("waiting for tests to finish");
+        console.log(
+          JSON.stringify(
+            {
+              nodeDone: this.nodeDone,
+              webDone: this.webDone,
+              mode: this.mode,
+            },
+            null,
+            2
+          )
+        );
+      } else {
+        console.log("waiting for tests to change");
+      }
+      console.log("press 'q' to quit");
+    }
+  };
+
   public getSecondaryEndpointsPoints(runtime?: IRunTime): string[] {
     const meta = (ts: ITestTypes[], st: Set<string>): Set<string> => {
       ts.forEach((t) => {

package/src/Puppeteer.ts

@@ -5,27 +5,21 @@ import watch from "recursive-watch";
 import { PM_Main } from "./PM/main.js";
 import { destinationOfRuntime } from "./utils.js";
 import { timeout } from "puppeteer-core/lib/esm/puppeteer/index.js";
+import { IBaseConfig, IBuiltConfig } from "./lib/types.js";
 
-var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
+// var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
 
-const node2web: Record<string, string[]> = {};
-const web2node: Record<string, string[]> = {};
-const childProcesses: Record<string, "loaded" | "running" | "done"> = {};
+// const node2web: Record<string, string[]> = {};
+// const web2node: Record<string, string[]> = {};
+// const childProcesses: Record<string, "loaded" | "running" | "done"> = {};
 
 readline.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY) process.stdin.setRawMode(true);
 
-// console.log("hello Puppeteer", process.env);
-
-console.log("\n Puppeteer is running. Press 'q' to quit\n");
-process.stdin.on("keypress", (str, key) => {
-  if (key.name === "q") {
-    process.exit();
-  }
-});
+// let shutDownMode = false;
 
 export default async (partialConfig) => {
-  const config = {
+  const config: IBuiltConfig = {
     ...partialConfig,
     buildDir: process.cwd() + "/" + partialConfig.outdir,
   };
@@ -91,6 +85,14 @@ export default async (partialConfig) => {
     "."
   );
 
+  console.log("\n Puppeteer is running. Press 'q' to quit\n");
+  process.stdin.on("keypress", (str, key) => {
+    if (key.name === "q") {
+      pm.shutDown();
+      // process.exit();
+    }
+  });
+
   config.tests.forEach(([test, runtime, tr, sidecars]) => {
     if (runtime === "node") {
       pm.launchNode(test, destinationOfRuntime(test, "node", config));
@@ -101,43 +103,48 @@ export default async (partialConfig) => {
     }
   });
 
-  console.log("ready and watching for changes...", config.buildDir);
-
-  watch(config.buildDir, (eventType, changedFile) => {
-    if (changedFile) {
-      config.tests.forEach(([test, runtime, tr, sidecars]) => {
-        if (eventType === "change" || eventType === "rename") {
-          if (
-            changedFile ===
-            test
-              .replace("./", "node/")
-              .split(".")
-              .slice(0, -1)
-              .concat("mjs")
-              .join(".")
-          ) {
-            pm.launchNode(test, destinationOfRuntime(test, "node", config));
+  if (config.devMode) {
+    console.log("ready and watching for changes...", config.buildDir);
+
+    watch(config.buildDir, (eventType, changedFile) => {
+      if (changedFile) {
+        config.tests.forEach(([test, runtime, tr, sidecars]) => {
+          if (eventType === "change" || eventType === "rename") {
+            if (
+              changedFile ===
+              test
+                .replace("./", "node/")
+                .split(".")
+                .slice(0, -1)
+                .concat("mjs")
+                .join(".")
+            ) {
+              pm.launchNode(test, destinationOfRuntime(test, "node", config));
+            }
+
+            if (
+              changedFile ===
+              test
+                .replace("./", "web/")
+                .split(".")
+                .slice(0, -1)
+                .concat("mjs")
+                .join(".")
+            ) {
+              pm.launchWeb(
+                test,
+                destinationOfRuntime(test, "web", config),
+                sidecars
+              );
+            }
           }
-
-          if (
-            changedFile ===
-            test
-              .replace("./", "web/")
-              .split(".")
-              .slice(0, -1)
-              .concat("mjs")
-              .join(".")
-          ) {
-            pm.launchWeb(
-              test,
-              destinationOfRuntime(test, "web", config),
-              sidecars
-            );
-          }
-        }
-      });
-    }
-  });
+        });
+      }
+    });
+  } else {
+    pm.shutDown();
+  }
+  // pm.browser.close();
 
   // does not work on linux
   // fs.watch(

package/src/SubPackages/react-test-renderer/jsx/index.ts

@@ -23,9 +23,17 @@ export type ITestImpl<ITestShape extends IBaseTest> = ITestImplementation<
 export type ITestSpec<ITestShape extends IBaseTest> =
   ITestSpecification<ITestShape>;
 
+const Context = React.createContext({});
+
+const AppContext = React.createContext({});
+const contextValue = {
+  ingredients: ["flour", "sugar", "eggs"],
+  temperature: "200",
+};
+
 export const testInterface = {
   butThen: async function (s: IStore, thenCB, tr): Promise<ISelection> {
-    console.log("butThen", thenCB.toString());
+    // console.log("butThen", thenCB.toString());
     return thenCB(s);
   },
   beforeEach: function (
@@ -34,7 +42,22 @@ export const testInterface = {
   ): Promise<renderer.ReactTestRenderer> {
     let component;
     act(() => {
-      component = renderer.create(React.createElement(CComponent, props, []));
+      // component = renderer.create(
+      //   React.createElement(
+      //     AppContext.Provider,
+      //     { value: contextValue },
+      //     React.createElement(AppContext.Consumer, null, (context) =>
+      //       React.createElement(CComponent, Object.assign({}, context, {}))
+      //     )
+      //   )
+      // );
+      component = renderer.create(
+        React.createElement(
+          CComponent,
+          props,
+          React.createElement(CComponent, props, [])
+        )
+      );
     });
     return component;
   },

package/src/esbuildConfigs/inputFilesPlugin.ts

@@ -5,21 +5,30 @@ export default (
   platform: "web" | "node",
   entryPoints: Set<string> | string[]
 ) => {
-  console.log("mark3", platform);
-
   return {
     name: "metafileWriter",
     setup(build) {
       build.onEnd((result) => {
         if (result.errors.length === 0) {
           entryPoints.forEach((entryPoint) => {
-            console.log("mark1", entryPoint);
             const filePath = path.join(
               "./docs/",
               platform,
               entryPoint.split(".").slice(0, -1).join("."),
               `inputFiles.json`
             );
+            const promptPath = path.join(
+              "./docs/",
+              platform,
+              entryPoint.split(".").slice(0, -1).join("."),
+              `prompt.txt`
+            );
+            const testPaths = path.join(
+              "./docs/",
+              platform,
+              entryPoint.split(".").slice(0, -1).join("."),
+              `tests.json`
+            );
 
             const dirName = path.dirname(filePath);
 
@@ -27,38 +36,74 @@ export default (
               fs.mkdirSync(dirName, { recursive: true });
             }
 
-            const jsonContent = JSON.stringify(
-              Object.keys(
-                Object.keys(result.metafile.outputs)
-                  .filter((s: string) => {
-                    if (!result.metafile.outputs[s].entryPoint) {
-                      return false;
-                    }
-                    return (
-                      path.resolve(result.metafile.outputs[s].entryPoint) ===
-                      path.resolve(entryPoint)
-                    );
-                  })
-                  .reduce((mm: string[], el) => {
-                    mm.push(result.metafile.outputs[el].inputs);
-                    return mm;
-                  }, [])[0]
-              )
-                .filter((f: string) => {
-                  const regex = /^src\/.*/g;
-                  const matches = f.match(regex);
-                  const passes = matches?.length === 1;
-                  return passes;
-                })
-                .filter((f: string) => {
-                  const regex = /.*\.test\..*/g;
-                  const matches = f.match(regex);
-                  const passes = matches?.length === 1;
-                  return !passes;
+            const j = Object.keys(
+              Object.keys(result.metafile.outputs)
+                .filter((s: string) => {
+                  if (!result.metafile.outputs[s].entryPoint) {
+                    return false;
+                  }
+                  return (
+                    path.resolve(result.metafile.outputs[s].entryPoint) ===
+                    path.resolve(entryPoint)
+                  );
                 })
-            );
+                .reduce((mm: string[], el) => {
+                  mm.push(result.metafile.outputs[el].inputs);
+                  return mm;
+                }, [])[0]
+            ).filter((f: string) => {
+              const regex = /^src\/.*/g;
+              const matches = f.match(regex);
+              const passes = matches?.length === 1;
+              return passes;
+            });
+            // .filter((f: string) => {
+            //   const regex = /.*\.test\..*/g;
+            //   const matches = f.match(regex);
+            //   const passes = matches?.length === 1;
+            //   return !passes;
+            // })
+
+            const jsonContent = JSON.stringify(j);
 
             fs.writeFileSync(filePath, jsonContent);
+
+            fs.writeFileSync(
+              promptPath,
+              `
+${j
+  .map((x) => {
+    return `/add ${x}`;
+  })
+  .join("\n")}
+/read ${testPaths}
+  
+/code fix the failing tests described in ${filePath}.
+`
+            );
+
+            //             fs.writeFileSync(
+            //               promptPath,
+            //               `
+            // from aider.coders import Coder
+            // from aider.models import Model
+            // import os
+
+            // model = Model("deepseek")
+
+            // coder = Coder.create(main_model=model)
+
+            // coder.run("/read-only", "${testPaths}")
+
+            // ${j
+            //   .map((x) => {
+            //     return `coder.run("/add", "${x}")`;
+            //   })
+            //   .join("\n")}
+
+            // coder.run("fix the failing tests described in ${filePath}.")
+            // `
+            //             );
           });
         }
       });

package/src/esbuildConfigs/web.ts

@@ -29,10 +29,10 @@ export default (
     metafile: true,
 
     external: [
-      "testeranto.json",
-      "features.test.ts",
+      // "testeranto.json",
+      // "features.test.ts",
       // "url",
-      "react",
+      // "react",
 
       "path",
       "fs",

package/src/lib/abstractBase.ts

@@ -58,10 +58,22 @@ export abstract class BaseSuite<
   }
 
   public toObj() {
+    const givens = Object.keys(this.givens).map((k) => this.givens[k].toObj());
+    const features = Object.keys(this.givens)
+      .map((k) => this.givens[k].features)
+      .flat()
+      .filter((value, index, array) => {
+        return array.indexOf(value) === index;
+      })
+      .reduce((mm, lm) => {
+        mm[lm] = lm;
+        return mm;
+      }, {});
     return {
       name: this.name,
-      givens: Object.keys(this.givens).map((k) => this.givens[k].toObj()),
+      givens,
       fails: this.fails,
+      features,
     };
   }
 
@@ -406,7 +418,7 @@ export abstract class BaseGiven<
         this.givenCB,
         beforeEachProxy
       );
-      console.log("mark6", this.store);
+      // console.log("mark6", this.store);
 
       for (const [whenNdx, whenStep] of this.whens.entries()) {
         await whenStep.test(
@@ -535,7 +547,7 @@ export abstract class BaseGiven<
           },
         });
 
-        console.log("mark5", this.store, key);
+        // console.log("mark5", this.store, key);
         await this.afterEach(this.store, key, givenArtifactory, afterEachProxy);
       } catch (e) {
         console.error("afterEach failed! no error will be recorded!", e);
@@ -684,17 +696,26 @@ export abstract class BaseWhen<ITestShape extends IBaseTest> {
       },
     });
 
-    try {
-      return await this.andWhen(
-        store,
-        this.whenCB,
-        testResourceConfiguration,
-        andWhenProxy
-      );
-    } catch (e) {
+    return this.andWhen(
+      store,
+      this.whenCB,
+      testResourceConfiguration,
+      andWhenProxy
+    ).catch((e) => {
       this.error = true;
-      throw e;
-    }
+      // throw e;
+    });
+    // try {
+    //   return await this.andWhen(
+    //     store,
+    //     this.whenCB,
+    //     testResourceConfiguration,
+    //     andWhenProxy
+    //   );
+    // } catch (e) {
+    //   this.error = true;
+    //   throw e;
+    // }
   }
 }
 
@@ -818,14 +839,24 @@ export abstract class BaseThen<
         },
       });
 
-      const x = await this.butThen(
+      // const x = await this.butThen(
+      //   store,
+      //   this.thenCB,
+      //   testResourceConfiguration,
+      //   butThenProxy
+      // );
+      // return x;
+
+      return this.butThen(
         store,
         this.thenCB,
         testResourceConfiguration,
         butThenProxy
-        // pm
-      );
-      return x;
+      ).catch((e) => {
+        console.log("mar123");
+        this.error = true;
+        throw e;
+      });
     } catch (e) {
       console.log("test failed", e);
       this.error = e.message;

package/src/lib/basebuilder.ts

@@ -89,7 +89,7 @@ export abstract class BaseBuilder<
           puppetMaster: PM,
           tLog: ITLog
         ): Promise<BaseSuite<ITestShape>> => {
-          await puppetMaster.startPuppeteer(
+          const puppeteerBrowser = await puppetMaster.startPuppeteer(
             {
               browserWSEndpoint:
                 puppetMaster.testResourceConfiguration.browserWSEndpoint,
@@ -97,7 +97,7 @@ export abstract class BaseBuilder<
             puppetMaster.testResourceConfiguration.fs
           );
 
-          return await suite.run(
+          const x = await suite.run(
             input,
             puppetMaster.testResourceConfiguration,
             (fPath: string, value: string | Buffer | PassThrough) =>
@@ -110,6 +110,10 @@ export abstract class BaseBuilder<
             tLog,
             puppetMaster
           );
+
+          // await puppetMaster.browser.disconnect();
+          // puppeteerBrowser.close();
+          return x;
         };
 
       const runner = suiteRunner(suite);
@@ -124,7 +128,7 @@ export abstract class BaseBuilder<
         runner,
 
         receiveTestResourceConfig: async function (puppetMaster: PM) {
-          await puppetMaster.mkdirSync();
+          // await puppetMaster.mkdirSync();
 
           const logFilePath = "log.txt";
           const access = await puppetMaster.createWriteStream(logFilePath);
@@ -161,6 +165,7 @@ export abstract class BaseBuilder<
             JSON.stringify(this.toObj(), null, 2)
           );
           console.log(`exiting gracefully with ${numberOfFailures} failures.`);
+
           return {
             failed: numberOfFailures,
             artifacts: this.artifacts || [],