testeranto 0.74.0 → 0.79.0

package/src/Project.ts

@@ -6,11 +6,7 @@ import { glob } from "glob";
 
 import esbuildNodeConfiger from "./esbuildConfigs/node.js";
 import esbuildWebConfiger from "./esbuildConfigs/web.js";
-import esbuildFeaturesConfiger from "./esbuildConfigs/features.js";
-
 import webHtmlFrame from "./web.html.js";
-import reportHtmlFrame from "./report.html.js";
-
 import { ITestTypes, IBaseConfig, IRunTime } from "./lib/types.js";
 
 var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
@@ -26,18 +22,9 @@ process.stdin.on("keypress", (str, key) => {
   }
 });
 
-// setInterval(() => {
-//   const memoryUsage = process.memoryUsage();
-//   console.log("Memory usage:", memoryUsage);
-// }, 10000); // Check every 10 seconds
-
-let featuresDone,
-  nodeDone,
+let nodeDone,
   webDone = false;
-const onFeaturesDone = () => {
-  featuresDone = true;
-  onDone();
-};
+
 const onNodeDone = () => {
   nodeDone = true;
   onDone();
@@ -51,7 +38,6 @@ const onDone = () => {
   console.log(
     JSON.stringify(
       {
-        featuresDone,
         nodeDone,
         webDone,
         mode,
@@ -60,7 +46,7 @@ const onDone = () => {
       2
     )
   );
-  if (featuresDone && nodeDone && webDone && mode === "PROD") {
+  if (nodeDone && webDone && mode === "PROD") {
     console.log("Testeranto-EsBuild is all done. Goodbye!");
     process.exit();
   } else {
@@ -72,8 +58,20 @@ export class ITProject {
   config: IBaseConfig;
   mode: `up` | `down` = `up`;
 
-  constructor(config: IBaseConfig) {
-    this.config = config;
+  constructor(configs: IBaseConfig) {
+    this.config = configs;
+
+    fs.writeFileSync(
+      `${this.config.outdir}/testeranto.json`,
+      JSON.stringify(
+        {
+          ...this.config,
+          buildDir: process.cwd() + "/" + this.config.outdir,
+        },
+        null,
+        2
+      )
+    );
 
     Promise.resolve(
       Promise.all(
@@ -88,7 +86,7 @@ export class ITProject {
               .join(".");
 
             const htmlFilePath = path.normalize(
-              `${process.cwd()}/${config.outdir}/web/${sourceDir.join(
+              `${process.cwd()}/${this.config.outdir}/web/${sourceDir.join(
                 "/"
               )}/${sourceFileNameMinusJs}.html`
             );
@@ -109,72 +107,22 @@ export class ITProject {
 
     const [nodeEntryPoints, webEntryPoints] = getRunnables(this.config.tests);
 
-    // nodeEntryPoints.forEach((nep) => {
-    //   const f = `${process.cwd()}/${nep}`;
-    //   console.log("nep", f);
-    //   import(f).then((module) => {
-    //     return module.default.then((defaultModule) => {
-    //       console.log("defaultModule", defaultModule);
-    //       // defaultModule
-    //       //   .receiveTestResourceConfig(argz)
-    //       //   .then((x) => {
-    //       //     console.log("then", x);
-    //       //     return x;
-    //       //   })
-    //       //   .catch((e) => {
-    //       //     console.log("catch", e);
-    //       //   });
-    //     });
-    //   });
-    // });
-
-    glob(`./${config.outdir}/chunk-*.mjs`, { ignore: "node_modules/**" }).then(
-      (chunks) => {
-        chunks.forEach((chunk) => {
-          fs.unlinkSync(chunk);
-        });
-      }
-    );
-
-    fs.copyFileSync(
-      "./node_modules/testeranto/dist/prebuild/Report.js",
-      "./docs/Report.js"
-    );
-    fs.copyFileSync(
-      "./node_modules/testeranto/dist/prebuild/Report.css",
-      "./docs/Report.css"
+    console.log(
+      `this.getSecondaryEndpointsPoints("web")`,
+      this.getSecondaryEndpointsPoints("web")
     );
 
-    fs.writeFileSync(`${config.outdir}/report.html`, reportHtmlFrame());
+    glob(`./${this.config.outdir}/chunk-*.mjs`, {
+      ignore: "node_modules/**",
+    }).then((chunks) => {
+      chunks.forEach((chunk) => {
+        fs.unlinkSync(chunk);
+      });
+    });
 
     Promise.all([
-      fs.promises.writeFile(
-        `${config.outdir}/testeranto.json`,
-        JSON.stringify(
-          {
-            ...config,
-            buildDir: process.cwd() + "/" + config.outdir,
-          },
-          null,
-          2
-        )
-      ),
-      esbuild
-        .context(esbuildFeaturesConfiger(config))
-        .then(async (featuresContext) => {
-          if (mode == "DEV") {
-            await featuresContext.watch();
-            onFeaturesDone();
-          } else {
-            featuresContext.rebuild().then((v) => {
-              onFeaturesDone();
-            });
-          }
-
-          return featuresContext;
-        }),
       esbuild
-        .context(esbuildNodeConfiger(config, nodeEntryPoints))
+        .context(esbuildNodeConfiger(this.config, nodeEntryPoints))
         .then(async (nodeContext) => {
           if (mode == "DEV") {
             await nodeContext.watch().then((v) => {
@@ -189,7 +137,7 @@ export class ITProject {
           return nodeContext;
         }),
       esbuild
-        .context(esbuildWebConfiger(config, webEntryPoints))
+        .context(esbuildWebConfiger(this.config, webEntryPoints))
         .then(async (webContext) => {
           if (mode == "DEV") {
             await webContext.watch().then((v) => {
@@ -208,11 +156,12 @@ export class ITProject {
   public getSecondaryEndpointsPoints(runtime?: IRunTime): string[] {
     const meta = (ts: ITestTypes[], st: Set<string>): Set<string> => {
       ts.forEach((t) => {
+        console.log("getSecondaryEndpointsPoints", t);
         if (t[1] === runtime) {
           st.add(t[0]);
         }
-        if (Array.isArray(t[2])) {
-          meta(t[2], st);
+        if (Array.isArray(t[3])) {
+          meta(t[3], st);
         }
       });
       return st;

package/src/Puppeteer.ts

@@ -1,12 +1,10 @@
 import readline from "readline";
 import fs from "fs";
-import path from "path";
-import { jsonc } from "jsonc";
-import { v4 as uuidv4 } from "uuid";
-
-import { IBuiltConfig, IRunTime } from "./lib/types";
+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";
 
 var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
 
@@ -17,6 +15,8 @@ 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") {
@@ -24,30 +24,51 @@ process.stdin.on("keypress", (str, key) => {
   }
 });
 
-const main = async () => {
-  const configs = jsonc.parse(
-    (await fs.readFileSync("./docs/testeranto.json")).toString()
-  ) as IBuiltConfig;
+export default async (partialConfig) => {
+  const config = {
+    ...partialConfig,
+    buildDir: process.cwd() + "/" + partialConfig.outdir,
+  };
+
+  fs.writeFileSync(
+    `${config.outdir}/testeranto.json`,
+    JSON.stringify(
+      {
+        ...config,
+        buildDir: process.cwd() + "/" + config.outdir,
+      },
+      null,
+      2
+    )
+  );
 
-  const pm = new PM_Main(configs);
+  const pm = new PM_Main(config);
 
   await pm.startPuppeteer(
     {
+      // timeout: 1,
       waitForInitialPage: false,
-      executablePath: "/opt/homebrew/bin/chromium",
+      executablePath:
+        // process.env.CHROMIUM_PATH || "/opt/homebrew/bin/chromium",
+        "/opt/homebrew/bin/chromium",
       headless: true,
       dumpio: true,
+      // timeout: 0,
       args: [
+        // "--auto-open-devtools-for-tabs",
+
+        "--disable-features=IsolateOrigins,site-per-process",
+        "--disable-site-isolation-trials",
+        "--allow-insecure-localhost",
         "--allow-file-access-from-files",
         "--allow-running-insecure-content",
-        "--auto-open-devtools-for-tabs",
+
         "--disable-dev-shm-usage",
         "--disable-extensions",
         "--disable-gpu",
         "--disable-setuid-sandbox",
         "--disable-site-isolation-trials",
         "--disable-web-security",
-        "--disable-web-security",
         "--no-first-run",
         "--no-sandbox",
         "--no-startup-window",
@@ -70,62 +91,94 @@ const main = async () => {
     "."
   );
 
-  const destinationOfRuntime = (f: string, r: IRunTime) => {
-    return path
-      .normalize(`${configs.buildDir}/${r}/${f}`)
-      .split(".")
-      .slice(0, -1)
-      .join(".");
-  };
-
-  configs.tests.forEach(([test, runtime, secondaryArtifacts]) => {
+  config.tests.forEach(([test, runtime, tr, sidecars]) => {
     if (runtime === "node") {
-      pm.launchNode(test, destinationOfRuntime(test, "node"));
+      pm.launchNode(test, destinationOfRuntime(test, "node", config));
     } else if (runtime === "web") {
-      pm.launchWeb(test, destinationOfRuntime(test, "web"));
+      pm.launchWeb(test, destinationOfRuntime(test, "web", config), sidecars);
     } else {
       console.error("runtime makes no sense", runtime);
     }
   });
 
-  console.log("ready and watching for changes...", configs.buildDir);
-  fs.watch(
-    configs.buildDir,
-    {
-      recursive: true,
-    },
-    (eventType, changedFile) => {
-      if (changedFile) {
-        configs.tests.forEach(([test, runtime, secondaryArtifacts]) => {
-          if (eventType === "change" || eventType === "rename") {
-            if (
-              changedFile ===
-              test
-                .replace("./", "node/")
-                .split(".")
-                .slice(0, -1)
-                .concat("mjs")
-                .join(".")
-            ) {
-              pm.launchNode(test, destinationOfRuntime(test, "node"));
-            }
-
-            if (
-              changedFile ===
-              test
-                .replace("./", "web/")
-                .split(".")
-                .slice(0, -1)
-                .concat("mjs")
-                .join(".")
-            ) {
-              pm.launchWeb(test, destinationOfRuntime(test, "web"));
-            }
+  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
+            );
           }
-        });
-      }
+        }
+      });
     }
-  );
-};
+  });
 
-main();
+  // does not work on linux
+  // fs.watch(
+  //   config.buildDir,
+  //   {
+  //     recursive: true,
+  //   },
+  //   (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
+  //             );
+  //           }
+  //         }
+  //       });
+  //     }
+  //   }
+  // );
+};

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

@@ -4,6 +4,8 @@ import ReactDom from "react-dom/client";
 import Testeranto from "../../../Web.js";
 import {
   IBaseTest,
+  IPartialInterface,
+  IPartialWebInterface,
   ITestImplementation,
   ITestSpecification,
 } from "../../../Types";
@@ -15,7 +17,7 @@ type ISelection = {
   reactElement: any; //CElement<any, any>;
 };
 
-type IStore = {
+export type IStore = {
   htmlElement: HTMLElement;
   reactElement: any; //CElement<any, any>,
   domRoot: ReactDom.Root;
@@ -30,7 +32,8 @@ type ISubject = {
 export default <ITestShape extends IBaseTest, IWhen, IGiven>(
   testInput: IInput,
   testSpecifications: ITestSpecification<ITestShape>,
-  testImplementations: ITestImplementation<ITestShape, any>
+  testImplementations: ITestImplementation<ITestShape, any>,
+  testInterface?: IPartialWebInterface<any>
 ) => {
   class TesterantoComponent extends testInput {
     done: (t: TesterantoComponent) => void;
@@ -50,7 +53,6 @@ export default <ITestShape extends IBaseTest, IWhen, IGiven>(
     testImplementations,
     {
       beforeAll: async (initialProps, artificer): Promise<ISubject> => {
-        console.log("mark5", initialProps);
         return await new Promise((resolve, rej) => {
           const htmlElement = document.getElementById("root");
           if (htmlElement) {
@@ -113,34 +115,12 @@ export default <ITestShape extends IBaseTest, IWhen, IGiven>(
       butThen: async function (s: IStore, thenCB): Promise<ISelection> {
         return thenCB(s);
       },
-      afterEach: async function (store: IStore, ndx, artificer, utils) {
-        console.log("afterEach", store);
-        utils.writeFileSync("aftereachlog", store.toString());
+      afterEach:
+        testInterface?.afterEach ||
+        async function (store: IStore, ndx, artificer, utils) {
+          return store;
+        },
 
-        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: IStore, artificer, utils) => {
         // setTimeout(() => {
         //   console.log("This will run after 1 second");