testeranto 0.79.69 → 0.80.0

package/init-docs.ts

@@ -0,0 +1,5 @@
+import Init from "./src/Init.js";
+
+import Project from "./testeranto.js";
+
+export default Init(Project as any);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testeranto",
   "description": "teeny tiny tightly-typed typescript tests",
-  "version": "0.79.69",
+  "version": "0.80.0",
   "engines": {
     "node": "18.18.0"
   },
@@ -59,15 +59,15 @@
     },
     "./src/SubPackages/react-test-renderer/jsx/index.js": {
       "import": "./dist/module/src/SubPackages/react-test-renderer/jsx/index.js",
-      "require": "./dist/common/SubPackages/react-test-renderer/jsx/index.js"
+      "require": "./dist/common/src/SubPackages/react-test-renderer/jsx/index.js"
     },
     "./src/SubPackages/react-test-renderer/jsx/web.js": {
-      "import": "./dist/module/SubPackages/react-test-renderer/jsx/web.js",
-      "require": "./dist/common/SubPackages/react-test-renderer/jsx/web.js"
+      "import": "./dist/module/src/SubPackages/react-test-renderer/jsx/web.js",
+      "require": "./dist/common/src/SubPackages/react-test-renderer/jsx/web.js"
     },
     "./src/SubPackages/react-test-renderer/jsx/node.js": {
-      "import": "./dist/module/SubPackages/react-test-renderer/jsx/node.js",
-      "require": "./dist/common/SubPackages/react-test-renderer/jsx/node.js"
+      "import": "./dist/module/src/SubPackages/react-test-renderer/jsx/node.js",
+      "require": "./dist/common/src/SubPackages/react-test-renderer/jsx/node.js"
     },
     "./src/SubPackages/react-test-renderer/jsx-promised/index": {
       "import": "./dist/module/SubPackages/react-test-renderer/jsx-promised/index.js",
@@ -121,9 +121,13 @@
       "import": "./dist/module/Features.js",
       "require": "./dist/common/Features.js"
     },
+    "./src/prompt": {
+      "import": "./dist/module/src/prompt.js",
+      "require": "./dist/module/src/prompt.js"
+    },
     "./src/Project": {
-      "import": "./dist/module/Project.js",
-      "require": "./dist/common/Project.js"
+      "import": "./dist/module/src/Project.js",
+      "require": "./dist/module/src/Project.js"
     },
     "./src/Web": {
       "import": "./src/Web.ts",
@@ -133,17 +137,21 @@
       "import": "./src/Node.ts",
       "require": "./src/Node.ts"
     },
+    "./src/Aider": {
+      "import": "./dist/module/src/Aider.js",
+      "require": "./dist/common/src/Aider.js"
+    },
     "./src/Puppeteer": {
-      "import": "./dist/module/Puppeteer.js",
-      "require": "./dist/common/Puppeteer.js"
+      "import": "./dist/module/src/Puppeteer.js",
+      "require": "./dist/common/src/Puppeteer.js"
     },
-    "./src/TaskManBackEnd": {
-      "import": "./dist/module/TaskManBackEnd.js",
-      "require": "./dist/common/TaskManBackEnd.js"
+    "./src/TaskMan": {
+      "import": "./dist/module/TaskMan.js",
+      "require": "./dist/common/TaskMan.js"
     },
     "./src/Init": {
-      "import": "./dist/module/Init.js",
-      "require": "./dist/common/Init.js"
+      "import": "./dist/module/src/Init.js",
+      "require": "./dist/common/src/Init.js"
     },
     "./src/preload": {
       "import": "./dist/module/preload.js",
@@ -183,11 +191,14 @@
   "scripts": {
     "commit": "yarn build; git add --all && git commit -m 'stash'",
     "doit": "rm -rf node_modules && yarn install && yarn build",
-    "build": "sh prebuild.sh; cp ./src/cjs-shim.js ./dist/cjs-shim.js; tsc -p tsconfig.module.json; tsc -p tsconfig.common.json; tsc -p tsconfig.types.json; yarn esbuild src/TaskManFrontEnd.tsx --outfile=dist/prebuild/TaskManFrontEnd.js --bundle; yarn esbuild src/TaskManBackEnd.ts --outfile=dist/prebuild/TaskManBackEnd.mjs --bundle --platform=node --format=esm --packages=external; sh postBuild.sh; ",
-    "dev": "cp ./src/cjs-shim.js ./dist/cjs-shim.js && tsc -p tsconfig.module.json --watch & tsc -p tsconfig.common.json --watch & tsc -p tsconfig.types.json --watch & yarn esbuild src/TaskManFrontEnd.tsx --outfile=dist/prebuild/TaskManFrontEnd.js --bundle --watch & yarn esbuild src/TaskManBackEnd.ts --platform=node  --outfile=dist/prebuild/TaskManBackEnd.mjs --bundle --watch --format=esm --packages=external",
+    "build": "sh prebuild.sh; cp ./src/cjs-shim.js ./dist/cjs-shim.js; tsc -p tsconfig.module.json; tsc -p tsconfig.common.json; tsc -p tsconfig.types.json; sh postBuild.sh",
+    "dev": "cp ./src/cjs-shim.js ./dist/cjs-shim.js && tsc -p tsconfig.module.json --watch & tsc -p tsconfig.common.json --watch & tsc -p tsconfig.types.json --watch ",
     "build-module": "tsc -p tsconfig.module.json",
     "build-common": "tsc -p tsconfig.common.json",
-    "build-types": "tsc -p tsconfig.types.json"
+    "build-types": "tsc -p tsconfig.types.json",
+    "build-tests": "ts-node-esm ./project.ts",
+    "run-tests": "ts-node-esm ./run-tests.ts",
+    "init-docs": "ts-node-esm init-docs.ts"
   },
   "peerDependencies": {
     "@hello-pangea/dnd": ">=16",
@@ -217,17 +228,28 @@
   "dependencies": {
     "@asseinfo/react-kanban": "^2.2.0",
     "@caldwell619/react-kanban": "^0.0.12",
+    "@gitgraph/core": "^1.5.0",
+    "@gitgraph/js": "^1.4.0",
+    "@gitgraph/react": "^1.6.0",
     "@hello-pangea/dnd": "^18.0.1",
+    "@octokit/types": "^13.8.0",
+    "@types/express": "^5.0.0",
+    "@types/express-session": "^1.18.1",
+    "@types/uuid": "^10.0.0",
     "@xyflow/react": "^12.4.3",
+    "@zodform/core": "^0.2.0",
     "babel-loader": "^8.2.5",
     "bootstrap": "^5.2.3",
+    "chai": "^5.2.0",
     "dot-prop": "^9.0.0",
     "esbuild": "0.17.5",
     "esbuild-plugin-external-package": "^1.0.0",
     "esbuild-plugin-import-map": "^2.1.0",
     "eslint": "^8.29.0",
     "eslint-plugin-react": "^7.31.11",
+    "eslint-plugin-react-hooks": "^5.1.0",
     "express": "^4.21.2",
+    "express-session": "^1.18.1",
     "fs-extra": "^11.2.0",
     "fs.promises.exists": "^1.1.4",
     "gantt-task-react": "^0.3.9",
@@ -237,14 +259,20 @@
     "graphology-types": "^0.24.5",
     "html": "^1.0.0",
     "ipc": "^0.0.1",
+    "iterm-tab": "^0.4.0",
     "jsonc": "^2.0.0",
     "mongodb": "^6.13.0",
     "mongoose": "^8.10.0",
     "mongoose-auto-number": "2.0.0",
     "mongoose-rest-query": "^0.1.29",
     "npm-watch": "^0.11.0",
+    "octokit": "^4.1.2",
+    "passport": "^0.7.0",
+    "passport-github2": "^0.1.12",
     "puppeteer-core": "^23.6.0",
     "react-bootstrap": "2.10.6",
+    "react-github-login": "^1.0.3",
+    "react-login-github": "^1.0.8",
     "react-router-dom": "6.29.0",
     "react-sigma": "^1.2.35",
     "react-test-renderer": "18.2.0",
@@ -252,6 +280,7 @@
     "selenium-webdriver": "4.27.0",
     "url": "^0.11.4",
     "uuid": "^10.0.0",
-    "ws": "^8.16.0"
+    "ws": "^8.16.0",
+    "zod": "^3.24.2"
   }
-}
+}

package/run-tests.ts

@@ -0,0 +1,9 @@
+import process from "process";
+process.chdir(__dirname);
+
+import Puppeteer from "./src/Puppeteer.js";
+
+console.log(process.argv);
+const Project = await import(process.argv[2]);
+
+export default Puppeteer(Project as any);

package/src/Aider.ts

@@ -0,0 +1,125 @@
+import fs from "fs";
+import { exec, spawn } from "child_process";
+import { features } from "process";
+// import { octokit } from "./src/DELETEME";
+// const itermTab = require("iterm-tab");
+import itermTab from "iterm-tab";
+
+import { Octokit } from "octokit";
+
+export const execCommand = async (command) => {
+  return new Promise<void>((resolve, reject) => {
+    const [cmd, ...args] = command.split(" ");
+    const childProcess = spawn(cmd, args);
+    childProcess.stdout.on("data", (data) => {
+      process.stdout.write(data.toString());
+    });
+    childProcess.stderr.on("data", (data) => {
+      process.stderr.write(data.toString());
+    });
+    childProcess.on("error", (error) => {
+      reject(error);
+    });
+    childProcess.on("exit", (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Command exited with code ${code}.`));
+      }
+    });
+  });
+};
+
+const key = process.argv[2];
+console.log(key);
+const exitcode = fs.readFileSync(`${key}/exitcode`).toString();
+
+console.log("exitcode", exitcode);
+
+// if (exitcode != "0") {
+if (exitcode != "0") {
+  const inputFiles = JSON.parse(
+    fs.readFileSync(`${key}/inputFiles.json`).toString()
+  );
+
+  inputFiles.push(`${key}/tests.json`);
+
+  const features = await (
+    await Promise.all(
+      Array.from(
+        new Set(
+          JSON.parse(fs.readFileSync(`${key}/tests.json`).toString())
+            .givens.reduce((mm: any[], lm: { features: any[] }) => {
+              mm.push(
+                lm.features.reduce((mm2: any[], lm2: any) => {
+                  mm2.push(lm2);
+                  return mm2;
+                }, [])
+              );
+              return mm;
+            }, [])
+            .flat()
+            .flat()
+        )
+      ) as string[]
+    )
+  )
+    .reduce(async (mm, feature) => {
+      const req = await octokit.request(
+        `GET /repos/adamwong246/kokomobay-taskman/contents/Task/${feature}.json`,
+        {
+          owner: "adamwong246",
+          repo: "kokomoBay-taskman",
+          path: `Task/${feature}.json`,
+          headers: {
+            "X-GitHub-Api-Version": "2022-11-28",
+          },
+        }
+      );
+
+      const j = JSON.parse(atob(req.data.content));
+      (await mm).push([
+        feature,
+        JSON.stringify({
+          name: j.name,
+          body: j.body,
+        }),
+      ]);
+
+      return mm;
+    }, Promise.resolve<[string, string][]>([]))
+    .then((z) => {
+      const final = z.reduce((mm, [k, v], ndx) => {
+        mm[k] = v;
+        return mm;
+      }, {});
+
+      const as = JSON.stringify(final);
+
+      fs.writeFile(`./${key}/features.json`, as, () => {
+        inputFiles.push(`./${key}/features.json`);
+
+        const scriptCommand = `aider --model deepseek --api-key deepseek=${
+          process.env.DEEPSEEK_KEY
+        } --message "Fix the failing tests" ${inputFiles.join(" ")}`;
+
+        console.log("scriptCommand", scriptCommand);
+
+        execCommand(scriptCommand);
+        // itermTab(scriptCommand).then(() => console.log("yay"));
+
+        // const child = spawn("xterm -e", scriptCommand.split(" "), {
+        //   detached: true,
+        //   stdio: "ignore",
+        // });
+        // runCommandInITerm(scriptCommand);
+      });
+      //
+    });
+
+  // features.then((x) => {
+  //   console.log("done", x);
+  // });
+} else {
+  console.log("that test is not failing");
+}

package/src/Init.ts

@@ -17,35 +17,4 @@ export default async (partialConfig) => {
       2
     )
   );
-
-  fs.copyFileSync(
-    "./node_modules/testeranto/dist/prebuild/TaskManFrontEnd.js",
-    "./docs/TaskManFrontEnd.js"
-  );
-  fs.copyFileSync(
-    "./node_modules/testeranto/dist/prebuild/TaskManFrontEnd.css",
-    "./docs/TaskManFrontEnd.css"
-  );
-
-  fs.writeFileSync(
-    `${config.outdir}/index.html`,
-    `<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta name="description" content="Webpage description goes here" />
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="author" content="" />
-
-  <title>TaskMan</title>
-
-  <link rel="stylesheet" href="/docs/TaskManFrontEnd.css" />
-  <script type="module" src="/docs/TaskManFrontEnd.js"></script>
-</head>
-
-<body><div id="root">react is loading</div></body>
-
-</html>`
-  );
 };

package/src/PM/index.ts

@@ -17,7 +17,7 @@ export abstract class PM {
   abstract testArtiFactoryfileWriter(tLog: ITLog, callback: (Promise) => void);
   abstract createWriteStream(filepath: string): any;
   abstract writeFileSync(fp: string, contents: string);
-  abstract mkdirSync();
+  abstract mkdirSync(a: string);
   abstract existsSync(fp: string): boolean;
   abstract write(accessObject: { uid: number }, contents: string): boolean;
   abstract end(accessObject: { uid: number }): boolean;

package/src/PM/main.ts

@@ -163,7 +163,7 @@ export class PM_Main extends PM {
   }
 
   async startPuppeteer(options: any, destfolder: string): Promise<any> {
-    this.browser = await puppeteer.launch(options);
+    this.browser = (await puppeteer.launch(options)) as any;
     return this.browser;
   }
 
@@ -706,7 +706,7 @@ export class PM_Main extends PM {
 
           Promise.all(screenshots[testName] || []).then(() => {
             delete screenshots[testName];
-            page.close();
+            // page.close();
           });
 
           // globalThis["writeFileSync"](
@@ -740,9 +740,15 @@ export class PM_Main extends PM {
         );
         await page.goto(`file://${`${dest}.html`}`, {});
 
-        page.evaluate(evaluation).finally(() => {
-          console.log("evaluation failed.", dest);
-        });
+        page
+          .evaluate(evaluation)
+          .catch((e) => {
+            console.log("evaluation failed.", dest);
+            console.log(e);
+          })
+          .finally(() => {
+            console.log("evaluation complete.", dest);
+          });
 
         return page;
       });

package/src/Puppeteer.ts

@@ -4,6 +4,7 @@ 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";
 
@@ -14,7 +15,7 @@ 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("hello Puppeteer", process.env);
 
 console.log("\n Puppeteer is running. Press 'q' to quit\n");
 process.stdin.on("keypress", (str, key) => {
@@ -45,17 +46,23 @@ export default async (partialConfig) => {
 
   await pm.startPuppeteer(
     {
+      // timeout: 1,
       waitForInitialPage: false,
-      executablePath: process.env.CHROMIUM_PATH || "/opt/homebrew/bin/chromium", //"/opt/homebrew/bin/chromium",
+      executablePath:
+        // process.env.CHROMIUM_PATH || "/opt/homebrew/bin/chromium",
+        "/opt/homebrew/bin/chromium",
       headless: true,
-      // dumpio: 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",

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

@@ -14,29 +14,27 @@ import type { IInput, ISelection, IStore } from "./index";
 
 export type ISubject = HTMLElement;
 
+const TesterantoComponent = ({
+  done,
+  innerComp,
+}: {
+  done: (ref: React.MutableRefObject<any>) => any;
+  innerComp: IInput;
+}) => {
+  const myContainer = useRef<any>(null);
+  useEffect(() => {
+    console.log("useEffect called!", myContainer.current);
+    done(myContainer.current);
+  }, []);
+
+  return React.createElement("div", { ref: myContainer }, innerComp());
+};
+
 export default <ITestShape extends IBaseTest>(
   testImplementations: ITestImplementation<ITestShape>,
   testSpecifications: ITestSpecification<ITestShape>,
   testInput: IInput
 ) => {
-  console.log("testInput", testInput);
-  const TesterantoComponent = function ({
-    done,
-    innerComp,
-  }: {
-    done: (ref: React.MutableRefObject<any>) => any;
-    innerComp: IInput;
-  }) {
-    const myContainer = useRef<any>(null);
-    useEffect(() => {
-      console.log("useEffect called!", myContainer.current);
-      done(myContainer.current);
-    }, []);
-
-    // debugger;
-    return React.createElement("div", { ref: myContainer }, innerComp());
-  };
-
   const t = Testeranto<ITestShape>(
     testInput,
     testSpecifications,
@@ -45,6 +43,7 @@ export default <ITestShape extends IBaseTest>(
       beforeAll: async (reactElement, itr): Promise<any> => {
         return await new Promise((resolve, rej) => {
           const htmlElement = document.getElementById("root");
+
           if (htmlElement) {
             const domRoot = ReactDom.createRoot(htmlElement);
 
@@ -79,51 +78,49 @@ export default <ITestShape extends IBaseTest>(
         pm
       ): Promise<IStore> => {
         return new Promise((resolve, rej) => {
-          createPortal(
-            TesterantoComponent({
-              innerComp: () =>
-                testInput({
-                  port: 3003,
-                  address: "some-address",
-                  secretKey: "someSecretKey",
-                  abi: "foo",
-                }),
-              done: (reactElement: any) => {
-                process.nextTick(() => {
-                  resolve(reactElement);
-                });
-              },
-            }),
-            subject.domRoot
-          );
+          resolve(subject);
+          // const tc = TesterantoComponent({
+          //   innerComp: () =>
+          //     testInput({
+          //       port: 3003,
+          //       address: "some-address",
+          //       secretKey: "someSecretKey",
+          //       abi: "foo",
+          //     }),
+          //   done: (reactElement: any) => {
+          //     console.log("mark9");
+          //     resolve(reactElement);
+          //     // process.nextTick(() => {
+          //     //   resolve(reactElement);
+          //     // });
+          //   },
+          // });
+          // console.log("mark9", tc);
+          // createPortal(tc, subject.domRoot);
         });
       },
-      andWhen: function (s: IStore, whenCB): Promise<ISelection> {
+      andWhen: function (s: IStore, whenCB, tr, utils): Promise<ISelection> {
         return new Promise((resolve, rej) => {
-          process.nextTick(() => {
-            resolve(whenCB()(s));
-          });
+          console.log("mark9", s, whenCB);
+          resolve(whenCB(s, utils));
+          // process.nextTick(() => {
+          //   resolve(whenCB()(s));
+          // });
         });
       },
-      butThen: async function (s: IStore): Promise<ISelection> {
+      butThen: async function (s: IStore, thenCB): Promise<ISelection> {
         return new Promise((resolve, rej) => {
-          process.nextTick(() => {
-            resolve(s);
-          });
+          resolve(thenCB(s));
         });
       },
       afterEach: async function (store: IStore, ndx, artificer) {
         return new Promise((resolve, rej) => {
-          process.nextTick(() => {
-            resolve({});
-          });
+          resolve({});
         });
       },
       afterAll: (store: IStore, artificer) => {
         return new Promise((resolve, rej) => {
-          process.nextTick(() => {
-            resolve({});
-          });
+          resolve({});
         });
       },
     }

package/src/Types.ts

@@ -13,6 +13,7 @@ import {
   ITestInterface,
   IWebTestInterface,
 } from "./lib/types.js";
+import { PM } from "./PM/index.js";
 
 export type IPartialInterface<
   I extends IBaseTest<
@@ -112,6 +113,7 @@ export type ITestSpecification<
   },
   Given: {
     [K in keyof ITestShape["givens"]]: (
+      features: string[],
       whens: BaseWhen<ITestShape>[],
       thens: BaseThen<ITestShape>[],
       ...xtrasB: ITestShape["givens"][K]
@@ -159,7 +161,7 @@ export type ITestImplementation<
     whens: {
       [K in keyof ITestShape["whens"]]: (
         ...Iw: ITestShape["whens"][K]
-      ) => (zel: ITestShape["iselection"]) => ITestShape["when"];
+      ) => (zel: ITestShape["iselection"], utils: PM) => ITestShape["when"];
     };
     thens: {
       [K in keyof ITestShape["thens"]]: (

package/src/esbuildConfigs/inputFilesPlugin.ts

@@ -5,12 +5,15 @@ 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,
@@ -24,39 +27,38 @@ export default (
               fs.mkdirSync(dirName, { recursive: true });
             }
 
-            fs.writeFileSync(
-              filePath,
-              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 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;
+                })
             );
+
+            fs.writeFileSync(filePath, jsonContent);
           });
         }
       });