testeranto 0.134.0 → 0.140.0

package/src/Node.ts

@@ -4,23 +4,23 @@ import {
   ITTestResourceConfiguration,
   ITTestResourceRequest,
 } from "./lib/index.js";
-import type {
-  INodeTestInterface,
-  IT,
+import { PM_Node } from "./PM/node.js";
+import {
+  ITestSpecification,
   ITestImplementation,
   ITestInterface,
-  ITestSpecification,
-  OT,
-} from "./Types.js";
-import { PM_Node } from "./PM/node.js";
+  Ibdd_in_any,
+  Ibdd_out_any,
+  Ibdd_out,
+} from "./CoreTypes.js";
 
 let ipcfile;
 
-export class NodeTesteranto<I extends IT, O extends OT, M> extends Testeranto<
-  I,
-  O,
+export class NodeTesteranto<
+  I extends Ibdd_in_any,
+  O extends Ibdd_out_any,
   M
-> {
+> extends Testeranto<I, O, M> {
   constructor(
     input: I["iinput"],
     testSpecification: ITestSpecification<I, O>,
@@ -51,7 +51,7 @@ export class NodeTesteranto<I extends IT, O extends OT, M> extends Testeranto<
   }
 }
 
-const testeranto = async <I extends IT, O extends OT, M>(
+const testeranto = async <I extends Ibdd_in_any, O extends Ibdd_out, M>(
   input: I["iinput"],
   testSpecification: ITestSpecification<I, O>,
   testImplementation: ITestImplementation<I, O, M>,
@@ -94,7 +94,7 @@ const testeranto = async <I extends IT, O extends OT, M>(
     // });
   }
 
-  return t;
+  // return t;
 };
 
 export default testeranto;

package/src/PM/PM_WithEslintAndTsc.ts

@@ -145,8 +145,8 @@ export abstract class PM_WithEslintAndTsc extends PM_Base {
       "testeranto",
       "reports",
       this.name,
-      platform,
       entryPoint.split(".").slice(0, -1).join("."),
+      platform,
       `tests.json`
     );
 
@@ -159,6 +159,42 @@ export abstract class PM_WithEslintAndTsc extends PM_Base {
       `featurePrompt.txt`
     );
 
+    const logPath = path.join(
+      "testeranto",
+      "reports",
+      this.name,
+      entryPoint.split(".").slice(0, -1).join("."),
+      platform,
+      `console_log.txt`
+    );
+
+    const lintPath = path.join(
+      "testeranto",
+      "reports",
+      this.name,
+      entryPoint.split(".").slice(0, -1).join("."),
+      platform,
+      `lint_errors.json`
+    );
+
+    const typePath = path.join(
+      "testeranto",
+      "reports",
+      this.name,
+      entryPoint.split(".").slice(0, -1).join("."),
+      platform,
+      `type_errors.txt`
+    );
+
+    const messagePath = path.join(
+      "testeranto",
+      "reports",
+      this.name,
+      entryPoint.split(".").slice(0, -1).join("."),
+      platform,
+      `message`
+    );
+
     fs.writeFileSync(
       promptPath,
       `
@@ -168,23 +204,18 @@ ${addableFiles
   })
   .join("\n")}
 
-/read ${lintPather(entryPoint, platform, this.name)}
-/read ${tscPather(entryPoint, platform, this.name)}
 /read ${testPaths}
+/read ${logPath}
+/read ${typePath}
+/read ${lintPath}
+`
+    );
 
-/load ${featuresPath}
-
-/code Fix the failing tests described in ${testPaths}. Correct any type signature errors described in the files ${tscPather(
-        entryPoint,
-        platform,
-        this.name
-      )}. Implement any method which throws "Function not implemented. Resolve the lint errors described in ${lintPather(
-        entryPoint,
-        platform,
-        this.name
-      )}"
-          `
+    fs.writeFileSync(
+      messagePath,
+      `Fix the failing tests described in ${testPaths} and ${logPath}. DO NOT refactor beyond what is necessary. Always prefer minimal changes, focusing mostly on keeping the BDD tests passing`
     );
+
     this.summary[
       entryPoint
     ].prompt = `aider --model deepseek/deepseek-chat --load testeranto/${

package/src/PM/__tests__/nodeSidecar.testeranto.ts

@@ -3,23 +3,11 @@ import { ITTestResourceConfiguration } from "../../lib";
 import { PM_Node_Sidecar } from "../nodeSidecar";
 import Testeranto from "../../Node";
 import {
+  Ibdd_in_any,
   Ibdd_out,
-  ITestSpecification,
-  IT,
   ITestImplementation,
-  Ibdd_in,
-  IPartialNodeInterface,
-} from "../../Types";
-
-type I = Ibdd_in<
-  PM_Node_Sidecar,
-  PM_Node_Sidecar,
-  unknown,
-  unknown,
-  unknown,
-  unknown,
-  unknown
->;
+  ITestSpecification,
+} from "../../CoreTypes";
 
 type O = Ibdd_out<
   {
@@ -41,7 +29,12 @@ type O = Ibdd_out<
   }
 >;
 
-const specification: ITestSpecification<IT, O> = (Suite, Given, When, Then) => {
+const specification: ITestSpecification<Ibdd_in_any, O> = (
+  Suite,
+  Given,
+  When,
+  Then
+) => {
   return [
     Suite.SidecarInitialized(
       "Sidecar message passing works correctly",
@@ -84,7 +77,7 @@ const implementation: ITestImplementation<I, O> = {
             callbackFn = callback;
             callback(
               JSON.stringify({
-                key: "mock-key", 
+                key: "mock-key",
                 payload: message,
               })
             );
@@ -92,9 +85,9 @@ const implementation: ITestImplementation<I, O> = {
           return mockProcess;
         },
         addListener: () => mockProcess,
-        removeListener: () => mockProcess
+        removeListener: () => mockProcess,
       } as unknown as NodeJS.Process;
-      
+
       process = mockProcess;
 
       let writeCalled = false;
@@ -118,7 +111,7 @@ const implementation: ITestImplementation<I, O> = {
         removeListener: () => {
           removeListenerCalled = true;
           return mockProcess;
-        }
+        },
       } as unknown as NodeJS.Process;
       process = mockProcess;
 

package/src/PM/__tests__/pureSidecar.testeranto.ts

@@ -5,21 +5,9 @@ import Testeranto from "../../Node";
 import {
   Ibdd_out,
   ITestSpecification,
-  IT,
   ITestImplementation,
-  Ibdd_in,
-  IPartialNodeInterface,
-} from "../../Types";
-
-type I = Ibdd_in<
-  PM_Pure_Sidecar,
-  PM_Pure_Sidecar,
-  unknown,
-  unknown,
-  unknown,
-  unknown,
-  unknown
->;
+  Ibdd_in_any,
+} from "../../CoreTypes";
 
 type O = Ibdd_out<
   {
@@ -41,7 +29,12 @@ type O = Ibdd_out<
   }
 >;
 
-const specification: ITestSpecification<IT, O> = (Suite, Given, When, Then) => {
+const specification: ITestSpecification<Ibdd_in_any, O> = (
+  Suite,
+  Given,
+  When,
+  Then
+) => {
   return [
     Suite.SidecarInitialized(
       "Pure Sidecar message passing works correctly",

package/src/PM/__tests__/webSidecar.testeranto.ts

@@ -5,21 +5,9 @@ import Testeranto from "../../Node";
 import {
   Ibdd_out,
   ITestSpecification,
-  IT,
   ITestImplementation,
-  Ibdd_in,
-  IPartialNodeInterface,
-} from "../../Types";
-
-type I = Ibdd_in<
-  PM_Web_Sidecar,
-  PM_Web_Sidecar,
-  unknown,
-  unknown,
-  unknown,
-  unknown,
-  unknown
->;
+  Ibdd_in_any,
+} from "../../CoreTypes";
 
 type O = Ibdd_out<
   {
@@ -41,7 +29,12 @@ type O = Ibdd_out<
   }
 >;
 
-const specification: ITestSpecification<IT, O> = (Suite, Given, When, Then) => {
+const specification: ITestSpecification<Ibdd_in_any, O> = (
+  Suite,
+  Given,
+  When,
+  Then
+) => {
   return [
     Suite.SidecarInitialized(
       "Web Sidecar message passing works correctly",

package/src/PM/index.ts

@@ -37,7 +37,7 @@ export abstract class PM {
   abstract typeInto(selector: string, value: string): any;
   abstract waitForSelector(p, sel: string);
   abstract write(uid: number, contents: string): Promise<boolean>;
-  abstract writeFileSync(f: string, c: string, t: string): Promise<boolean>;
+  abstract writeFileSync(f: string, c: string): Promise<boolean>;
 
   abstract launchSideCar(
     n: number

package/src/PM/main.ts

@@ -238,7 +238,7 @@ export class PM_Main extends PM_WithEslintAndTsc {
         waitForInitialPage: false,
         executablePath,
 
-        headless: false,
+        headless: true,
 
         dumpio: false,
         devtools: false,
@@ -703,9 +703,14 @@ export class PM_Main extends PM_WithEslintAndTsc {
     let haltReturns = false;
 
     const ipcfile = "/tmp/tpipe_" + Math.random();
-    const child = spawn("node", [builtfile, testResources, ipcfile], {
-      stdio: ["pipe", "pipe", "pipe", "ipc"],
-    });
+    const child = spawn(
+      "node",
+      // "node --inspect-brk ",
+      [builtfile, testResources, ipcfile],
+      {
+        stdio: ["pipe", "pipe", "pipe", "ipc"],
+      }
+    );
 
     let buffer: Buffer<ArrayBufferLike> = new Buffer("");
 
@@ -770,7 +775,6 @@ export class PM_Main extends PM_WithEslintAndTsc {
         oStream.write(`stdout > ${data}`);
       });
       child.on("close", (code) => {
-        console.log("close");
         oStream.close();
         server.close();
 
@@ -790,7 +794,6 @@ export class PM_Main extends PM_WithEslintAndTsc {
         haltReturns = true;
       });
       child.on("exit", (code) => {
-        console.log("exit");
         haltReturns = true;
 
         for (let i = 0; i <= portsToUse.length; i++) {
@@ -798,8 +801,6 @@ export class PM_Main extends PM_WithEslintAndTsc {
             this.ports[portsToUse[i]] = true; //port is open again
           }
         }
-
-        console.log("exitthis.ports", this.ports);
       });
       child.on("error", (e) => {
         console.log("error");
@@ -852,10 +853,10 @@ export class PM_Main extends PM_WithEslintAndTsc {
             }
             // files[t].add(filepath);
 
-            fs.writeFileSync(
-              destFolder + "/manifest.json",
-              JSON.stringify(Array.from(files[src]))
-            );
+            // fs.writeFileSync(
+            //   destFolder + "/manifest.json",
+            //   JSON.stringify(Array.from(files[src]))
+            // );
             delete files[src];
 
             Promise.all(screenshots[src] || []).then(() => {
@@ -1254,10 +1255,10 @@ export class PM_Main extends PM_WithEslintAndTsc {
           }
           // files[t].add(filepath);
 
-          fs.writeFileSync(
-            destFolder + "/manifest.json",
-            JSON.stringify(Array.from(files[src]))
-          );
+          // fs.writeFileSync(
+          //   destFolder + "/manifest.json",
+          //   JSON.stringify(Array.from(files[src]))
+          // );
           delete files[src];
 
           Promise.all(screenshots[src] || []).then(() => {

package/src/PM/node.ts

@@ -241,16 +241,16 @@ export class PM_Node extends PM {
               console.error(`❗️testArtiFactory failed`, targetDir, error);
             }
 
-            fs.writeFileSync(
-              path.resolve(
-                targetDir.split("/").slice(0, -1).join("/"),
-                "manifest"
-              ),
-              fPaths.join(`\n`),
-              {
-                encoding: "utf-8",
-              }
-            );
+            // fs.writeFileSync(
+            //   path.resolve(
+            //     targetDir.split("/").slice(0, -1).join("/"),
+            //     "manifest"
+            //   ),
+            //   fPaths.join(`\n`),
+            //   {
+            //     encoding: "utf-8",
+            //   }
+            // );
 
             if (Buffer.isBuffer(value)) {
               fs.writeFileSync(fPath, value, "binary");

package/src/PM/nodeSidecar.ts

@@ -3,9 +3,10 @@
 /* eslint-disable prefer-rest-params */
 import net from "net";
 
-import { ITTestResourceConfiguration } from "../lib";
+import { ITLog, ITTestResourceConfiguration } from "../lib";
 
 import { PM_sidecar } from "./sidecar";
+import { PassThrough } from "stream";
 
 type IFPaths = string[];
 const fPaths: IFPaths = [];
@@ -13,7 +14,6 @@ const fPaths: IFPaths = [];
 export class PM_Node_Sidecar extends PM_sidecar {
   testResourceConfiguration: ITTestResourceConfiguration;
   client: net.Socket;
-  mockListener?: jest.Mock;
 
   constructor(t: ITTestResourceConfiguration) {
     super();

package/src/PM/pure.ts

@@ -1,12 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-// import fs from "fs";
-// import path from "path";
-
 import { ScreencastOptions } from "puppeteer-core";
 import { CdpPage } from "puppeteer-core/lib/esm/puppeteer";
-import { PassThrough } from "stream";
 
 import { ITLog, ITTestResourceConfiguration } from "../lib";