testeranto 0.173.0 → 0.177.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testeranto",
   "description": "the AI powered BDD test framework for typescript projects",
-  "version": "0.173.0",
+  "version": "0.177.0",
   "engines": {
     "node": "18.18.0"
   },
@@ -165,7 +165,7 @@
     "@typescript-eslint/parser": "^5.46.0",
     "marked": "^12.0.2",
     "self-import": "*",
-    "testeranto-react": "0.0.5",
+    "testeranto-react": "0.0.8",
     "ts-node": "^10.9.1",
     "typescript": "^5.8.2"
   },

package/src/PM/base.ts

@@ -162,15 +162,12 @@ export abstract class PM_Base {
     return false;
   }
 
-  async writeFileSync(
-    filepath: string,
-    contents: string,
-    testName: string
-  ): Promise<boolean> {
-    console.log("writeFileSync");
-    console.log("filepath", filepath);
-    console.log("contents", contents);
-    console.log("testName", testName);
+  async writeFileSync(...x): Promise<boolean> {
+    const filepath = x[0];
+    const contents = x[1];
+    const testName = x[2];
+
+    console.log("writing file", filepath);
 
     return new Promise<boolean>(async (res) => {
       fs.mkdirSync(path.dirname(filepath), {

package/src/PM/main.ts

@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { ChildProcess, spawn } from "node:child_process";
-
+import ansiColors from "ansi-colors";
 import net from "net";
 import { Page } from "puppeteer-core/lib/esm/puppeteer";
 import fs, { watch } from "fs";
@@ -21,8 +21,8 @@ import { getRunnables } from "../utils";
 import { IBuiltConfig, IRunTime, ITestTypes } from "../Types.js";
 import { Sidecar } from "../lib/Sidecar.js";
 import { Queue } from "../utils/queue.js";
+
 import { PM_WithEslintAndTsc } from "./PM_WithEslintAndTsc.js";
-import ansiColors from "ansi-colors";
 
 type IOutputs = Record<
   string,
@@ -105,13 +105,10 @@ function isValidUrl(string) {
 
 // Wait for file to exist, checks every 2 seconds by default
 async function pollForFile(path, timeout = 2000) {
-  console.log(`pollForFile: ${path}...`);
-
   const intervalObj = setInterval(function () {
     const file = path;
     const fileExists = fs.existsSync(file);
     if (fileExists) {
-      console.log(`metafile found: ${path}!`);
       clearInterval(intervalObj);
     }
   }, timeout);
@@ -1253,17 +1250,6 @@ export class PM_Main extends PM_WithEslintAndTsc {
 
     const d = `${dest}?cacheBust=${Date.now()}`;
 
-    const evaluation = `
-
-    import('${d}').then(async (x) => {
-
-      try {
-        return await (await x.default).receiveTestResourceConfig(${webArgz})
-      } catch (e) {
-        console.log("web run failure", e.toString())
-      }
-    })`;
-
     const ofile = `${reportDest}/logs.txt`;
     const oStream = fs.createWriteStream(ofile);
 
@@ -1304,7 +1290,7 @@ export class PM_Main extends PM_WithEslintAndTsc {
             page.close();
             oStream.close();
           });
-          console.log("ostream is closed");
+
           return;
         };
 
@@ -1355,14 +1341,24 @@ export class PM_Main extends PM_WithEslintAndTsc {
         await page.goto(`file://${`${destFolder}.html`}`, {});
 
         await page
-          .evaluate(evaluation)
+          .evaluate(
+            `
+import('${d}').then(async (x) => {
+  try {
+    return await (await x.default).receiveTestResourceConfig(${webArgz})
+  } catch (e) {
+    console.log("web run failure", e.toString())
+  }
+})
+`
+          )
           .then(async ({ fails, failed, features }: IFinalResults) => {
             statusMessagePretty(fails, src, "web");
             this.bddTestIsNowDone(src, fails);
-            close();
+            // close();
           })
           .catch((e) => {
-            console.log(ansiC.red(ansiC.inverse(e)));
+            console.log(ansiC.red(ansiC.inverse(e.stack)));
 
             console.log(
               ansiC.red(
@@ -1375,6 +1371,7 @@ export class PM_Main extends PM_WithEslintAndTsc {
           })
           .finally(() => {
             // process.exit(-1);
+            close();
           });
 
         return page;

package/src/PM/node.ts

@@ -182,7 +182,12 @@ export class PM_Node extends PM {
     return await this.send("write", ...arguments);
   }
 
-  async writeFileSync([filepath, contents]: [string, string]) {
+  async writeFileSync(x) {
+    const z = arguments["0"];
+
+    const filepath = z[0];
+    const contents = z[1];
+
     return await this.send<boolean>(
       "writeFileSync",
       this.testResourceConfiguration.fs + "/" + filepath,

package/src/PM/pure.ts

@@ -136,7 +136,12 @@ export class PM_Pure extends PM {
     return globalThis["write"](uid, contents);
   }
 
-  writeFileSync(filepath: string, contents: string) {
+  writeFileSync(x) {
+    const z = arguments["0"];
+
+    const filepath = z[0];
+    const contents = z[1];
+
     return globalThis["writeFileSync"](
       this.testResourceConfiguration.fs + "/" + filepath,
       contents,

package/src/PM/web.ts

@@ -135,7 +135,11 @@ export class PM_Web extends PM {
     return window["write"](uid, contents);
   }
 
-  writeFileSync([filepath, contents]: [string, string]) {
+  writeFileSync(x) {
+    const z = arguments["0"];
+
+    const filepath = z[0];
+    const contents = z[1];
     return window["writeFileSync"](
       this.testResourceConfiguration.fs + "/" + filepath,
       contents,

package/src/Pure.test.ts

@@ -105,8 +105,8 @@ const implementation: ITestImplementation<I, O> = {
             ...store,
             pm: {
               ...store.pm,
-              testResourceConfiguration: { name: "test-resource" }
-            }
+              testResourceConfiguration: { name: "test-resource" },
+            },
           };
         default:
           return store;
@@ -116,23 +116,23 @@ const implementation: ITestImplementation<I, O> = {
       console.debug("[DEBUG] Adding artifact");
       return {
         ...store,
-        artifacts: [...(store.artifacts || []), artifact]
+        artifacts: [...(store.artifacts || []), artifact],
       };
     },
     setTestJobs: (jobs: any[]) => (store) => {
       console.debug("[DEBUG] Setting test jobs");
       return {
         ...store,
-        testJobs: jobs
+        testJobs: jobs,
       };
     },
     modifySpecs: (modifier: (specs: any) => any[]) => (store) => {
       console.debug("[DEBUG] Modifying specs");
       return {
         ...store,
-        specs: modifier(store.specs || [])
+        specs: modifier(store.specs || []),
       };
-    }
+    },
   },
 
   thens: {

package/src/Pure.ts

@@ -39,15 +39,9 @@ export class PureTesteranto<
   }
 
   async receiveTestResourceConfig(partialTestResource: string) {
-    console.log(
-      "[DEBUG] receiveTestResourceConfig called with:",
-      partialTestResource
-    );
     const t: ITTestResourceConfiguration = JSON.parse(partialTestResource);
     const pm = new PM_Pure(t);
 
-    // console.log("[DEBUG] Current test jobs:", this.testJobs?.length);
-
     // if (!this.testJobs || this.testJobs.length === 0) {
     //   console.error(
     //     "[ERROR] No test jobs available - checking specs:",
@@ -64,9 +58,7 @@ export class PureTesteranto<
     // }
 
     try {
-      console.log("[DEBUG] Executing test job with PM:", pm);
       const result = await this.testJobs[0].receiveTestResourceConfig(pm);
-      console.log("[DEBUG] Test job completed with result:", result);
       return result;
     } catch (e) {
       console.error("[ERROR] Test job failed:", e);

package/src/ReportServerLib.ts

@@ -133,12 +133,15 @@ process.on("uncaughtException", (err) => {
   console.error("Uncaught exception:", err);
 });
 
-const start = (port: number) =>
-  server.listen(port, () => {
-    console.log(`Server running on http://localhost:${port}`);
-    console.log("Serving files from:", process.cwd());
-  });
+const start = (port: number) => {
+  if (port) {
+    server.listen(port, () => {
+      console.log(`Server running on http://localhost:${port}`);
+      console.log("Serving files from:", process.cwd());
+    });
+  } else {
+    console.log("you need to specify a port");
+  }
+};
 
 export const ReportServerOfPort = (port: number) => start(port);
-
-// export default () => start(process.argv[2]);

package/src/esbuildConfigs/node.ts

@@ -23,7 +23,7 @@ export default (
 
     outdir: `testeranto/bundles/node/${testName}/`,
 
-    // inject: [`./node_modules/testeranto/dist/cjs-shim.js`],
+    inject: [`./node_modules/testeranto/dist/cjs-shim.js`],
     metafile: true,
     supported: {
       "dynamic-import": true,

package/src/lib/BaseSuite.ts

@@ -14,23 +14,24 @@ export abstract class BaseSuite<I extends Ibdd_in_any, O extends Ibdd_out_any> {
   failed: boolean;
   fails: number;
 
+  artifacts: string[] = [];
+
+  addArtifact(path: string) {
+    console.log("Suite addArtifact", path);
+    const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+    this.artifacts.push(normalizedPath);
+  }
+
   constructor(name: string, index: number, givens: IGivens<I> = {}) {
     const suiteName = name || "testSuite"; // Ensure name is never undefined
     if (!suiteName) {
       throw new Error("BaseSuite requires a non-empty name");
     }
-    console.log(
-      "[DEBUG] BaseSuite constructor - name:",
-      suiteName,
-      "index:",
-      index
-    );
+
     this.name = suiteName;
     this.index = index;
     this.givens = givens;
     this.fails = 0;
-    console.log("[DEBUG] BaseSuite initialized:", this.name, this.index);
-    console.log("[DEBUG] BaseSuite givens:", Object.keys(givens).toString());
   }
 
   public features() {
@@ -41,10 +42,9 @@ export abstract class BaseSuite<I extends Ibdd_in_any, O extends Ibdd_out_any> {
         .filter((value, index, array) => {
           return array.indexOf(value) === index;
         });
-      console.debug("[DEBUG] Features extracted:", features.toString());
       return features || [];
     } catch (e) {
-      console.error("[ERROR] Failed to extract features:", e);
+      console.error("[ERROR] Failed to extract features:", JSON.stringify(e));
       return [];
     }
   }
@@ -92,15 +92,14 @@ export abstract class BaseSuite<I extends Ibdd_in_any, O extends Ibdd_out_any> {
       artifactory(`suite-${this.index}-${this.name}/${fPath}`, value);
 
     // console.log("\nSuite:", this.index, this.name);
-    tLog("\nSuite:", this.index, this.name);
+    // tLog("\nSuite:", this.index, this.name);
     const sNdx = this.index;
-    // const sName = this.name;
-
+    const proxiedPm = beforeAllProxy(pm, sNdx.toString(), this);
     const subject = await this.setup(
       input,
       suiteArtifactory,
       testResourceConfiguration,
-      beforeAllProxy(pm, sNdx.toString())
+      proxiedPm
     );
 
     for (const [gKey, g] of Object.entries(this.givens)) {
@@ -119,19 +118,15 @@ export abstract class BaseSuite<I extends Ibdd_in_any, O extends Ibdd_out_any> {
         .catch((e) => {
           this.failed = true;
           this.fails = this.fails + 1;
-          // console.error("Given error 1:", e.toString());
           throw e;
         });
     }
 
     try {
-      this.afterAll(
-        this.store,
-        artifactory,
-        afterAllProxy(pm, sNdx.toString())
-      );
+      const afterAllPm = afterAllProxy(pm, sNdx.toString(), this);
+      this.afterAll(this.store, artifactory, afterAllPm);
     } catch (e) {
-      console.error(e);
+      console.error(JSON.stringify(e));
       // this.fails.push(this);
       // return this;
     }

package/src/lib/abstractBase.ts

@@ -28,11 +28,11 @@ export abstract class BaseGiven<I extends Ibdd_in_any> {
   key: string;
   failed: boolean;
   artifacts: string[] = [];
-  protected addArtifact(path: string) {
-    console.log(`[Artifact] Adding to ${this.constructor.name}:`, path);
-    // console.log("mark111");
-    // process.exit();
-    this.artifacts.push(path);
+
+  addArtifact(path: string) {
+    console.log("Given addArtifact", path);
+    const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+    this.artifacts.push(normalizedPath);
   }
 
   constructor(
@@ -62,7 +62,7 @@ export abstract class BaseGiven<I extends Ibdd_in_any> {
       whens: this.whens.map((w) => {
         if (w && w.toObj) return w.toObj();
 
-        console.error("w is not as expected!", w.toString());
+        console.error("w is not as expected!", JSON.stringify(w));
         return {};
       }),
       thens: this.thens.map((t) => t.toObj()),
@@ -118,9 +118,11 @@ export abstract class BaseGiven<I extends Ibdd_in_any> {
     });
 
     try {
-      const proxiedPm = beforeEachProxy(pm, suiteNdx.toString());
-      console.log(`[Given] Setting currentStep for beforeEach:`, this.name);
-      (proxiedPm as any).currentStep = this;
+      const proxiedPm = beforeEachProxy(
+        pm,
+        suiteNdx.toString(),
+        this.addArtifact.bind(this)
+      );
       this.store = await this.givenThat(
         subject,
         testResourceConfiguration,
@@ -130,9 +132,9 @@ export abstract class BaseGiven<I extends Ibdd_in_any> {
         proxiedPm
       );
     } catch (e) {
-      console.error("Given failure: ", e.toString());
-      this.error = e;
-      throw e;
+      // console.error("Given failure: ", e.stack);
+      this.error = e.stack;
+      // throw e;
     }
 
     try {
@@ -157,9 +159,6 @@ export abstract class BaseGiven<I extends Ibdd_in_any> {
           `suite-${suiteNdx}/given-${key}/then-${thenNdx}`
         );
         tester(t);
-        // ((t) => {
-        //   return tester(t);
-        // })();
       }
     } catch (e) {
       this.failed = true;
@@ -167,21 +166,22 @@ export abstract class BaseGiven<I extends Ibdd_in_any> {
       throw e;
     } finally {
       try {
-        await this.afterEach(
-          this.store,
-          this.key,
-          givenArtifactory,
-
-          afterEachProxy(pm, suiteNdx.toString(), key)
+        const proxiedPm = afterEachProxy(
+          pm,
+          suiteNdx.toString(),
+          key,
+          this.addArtifact.bind(this)
         );
+        // (proxiedPm as any).currentStep = this;
+        await this.afterEach(this.store, this.key, givenArtifactory, proxiedPm);
       } catch (e) {
-        console.error("afterEach failed!", e.toString());
         this.failed = e;
         throw e;
 
         // this.error = e.message;
       }
     }
+
     return this.store;
   }
 }
@@ -190,8 +190,15 @@ export abstract class BaseWhen<I extends Ibdd_in_any> {
   public name: string;
   whenCB: (x: I["iselection"]) => I["then"];
   error: Error;
+
   artifacts: string[] = [];
 
+  addArtifact(path: string) {
+    console.log("When addArtifact", path);
+    const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+    this.artifacts.push(normalizedPath);
+  }
+
   constructor(name: string, whenCB: (xyz: I["iselection"]) => I["then"]) {
     this.name = name;
     this.whenCB = whenCB;
@@ -205,20 +212,18 @@ export abstract class BaseWhen<I extends Ibdd_in_any> {
   ): Promise<any>;
 
   toObj() {
-    console.log("toObj error", this.error);
-
-    if (this.error) {
-      return {
-        name: this.name,
-        error: this.error && this.error.name + this.error.stack,
-        artifacts: this.artifacts,
-      };
-    } else {
-      return {
-        name: this.name,
-        artifacts: this.artifacts,
-      };
-    }
+    const obj = {
+      name: this.name,
+      error: this.error
+        ? `${this.error.name}: ${this.error.message}\n${this.error.stack}`
+        : null,
+      artifacts: this.artifacts || [],
+    };
+    console.log(
+      `[TOOBJ] Serializing ${this.constructor.name} with artifacts:`,
+      obj.artifacts
+    );
+    return obj;
   }
 
   async test(
@@ -229,12 +234,10 @@ export abstract class BaseWhen<I extends Ibdd_in_any> {
     filepath: string
   ) {
     try {
-      tLog(" When:", this.name);
-      console.debug("[DEBUG] Executing When step:", this.name.toString());
+      // tLog(" When:", this.name);
+      const proxiedPm = andWhenProxy(pm, filepath, this.addArtifact.bind(this));
 
-      const proxiedPm = andWhenProxy(pm, filepath);
-      console.log(`[When] Setting currentStep for andWhen:`, this.name);
-      (proxiedPm as any).currentStep = this;
+      // (proxiedPm as any).currentStep = this;
       const result = await this.andWhen(
         store,
         this.whenCB,
@@ -242,9 +245,8 @@ export abstract class BaseWhen<I extends Ibdd_in_any> {
         proxiedPm
       );
 
-      console.debug("[DEBUG] When step completed:", this.name.toString());
       return result;
-    } catch (e: Error) {
+    } catch (e: any) {
       console.error(
         "[ERROR] When step failed:",
         this.name.toString(),
@@ -269,14 +271,22 @@ export abstract class BaseThen<I extends Ibdd_in_any> {
     this.name = name;
     this.thenCB = thenCB;
     this.error = false;
+    this.artifacts = [];
+  }
+
+  addArtifact(path: string) {
+    console.log("Then addArtifact", path);
+    const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+    this.artifacts.push(normalizedPath);
   }
 
   toObj() {
-    return {
+    const obj = {
       name: this.name,
       error: this.error,
       artifacts: this.artifacts,
     };
+    return obj;
   }
 
   abstract butThen(
@@ -294,9 +304,7 @@ export abstract class BaseThen<I extends Ibdd_in_any> {
     pm: IPM,
     filepath: string
   ): Promise<I["then"] | undefined> {
-    const proxiedPm = butThenProxy(pm, filepath);
-    console.log(`[Then] Setting currentStep for butThen:`, this.name);
-    (proxiedPm as any).currentStep = this;
+    const proxiedPm = butThenProxy(pm, filepath, this.addArtifact.bind(this));
     return this.butThen(
       store,
       async (s: I["iselection"]) => {
@@ -307,9 +315,9 @@ export abstract class BaseThen<I extends Ibdd_in_any> {
         }
       },
       testResourceConfiguration,
-      butThenProxy(pm, filepath)
+      proxiedPm
     ).catch((e) => {
-      this.error = e.toString();
+      this.error = e.stack;
       // throw e;
     });
   }

package/src/lib/basebuilder.ts

@@ -72,6 +72,7 @@ export abstract class BaseBuilder<
       const suiteRunner =
         (suite: BaseSuite<I, O>) =>
         async (puppetMaster: IPM, tLog: ITLog): Promise<BaseSuite<I, O>> => {
+          console.log("mark17");
           const x = await suite.run(
             input,
             puppetMaster.testResourceConfiguration,
@@ -85,6 +86,7 @@ export abstract class BaseBuilder<
             tLog,
             puppetMaster
           );
+          console.log("mark18");
 
           return x;
         };
@@ -113,7 +115,9 @@ export abstract class BaseBuilder<
             //
           };
 
+          console.log("mark14");
           const suiteDone: BaseSuite<I, O> = await runner(puppetMaster, tLog);
+          console.log("mark15");
 
           // const logPromise = new Promise(async (res) => {
           //   await puppetMaster.end(access);
@@ -132,6 +136,8 @@ export abstract class BaseBuilder<
             JSON.stringify(this.toObj(), null, 2),
           ]);
 
+          console.log("mark13");
+
           return {
             failed: fails > 0,
             fails,

package/src/lib/core.ts

@@ -90,6 +90,7 @@ export default abstract class TesterantoCore<
           initialValues,
           pm
         ) {
+          console.log("mark800");
           return fullAdapter.beforeEach(
             subject,
             initializer,

package/src/lib/pmProxy.test/adapter.ts

@@ -22,12 +22,12 @@ export const testAdapter: ITestAdapter<I> = {
   },
 
   andWhen: async (store, whenCB, testResource, pm) => {
-    const proxiedPM = andWhenProxy(pm, "some/path");
+    const proxiedPM = andWhenProxy(pm, "some/path", store);
     return whenCB(store, proxiedPM);
   },
 
   butThen: async (store, thenCB, testResource, pm) => {
-    const proxiedPM = butThenProxy(pm, "some/path");
+    const proxiedPM = butThenProxy(pm, "some/path", store);
     return thenCB(store, proxiedPM);
   },
 

package/src/lib/pmProxy.test/implementation.ts

@@ -20,11 +20,11 @@ export const implementation: ITestImplementation<I, O, M> = {
   },
   thens: {
     theButTheProxyReturns:
-      (method: IProxiedFunctions, expectedPath: string) =>
-      (store: { butThenProxy: IProxy }) => {
+      (method: string, expectedPath: string) =>
+      (store: { pathRewriter: PathRewriter }) => {
         const mockPm = new MockPMBase() as unknown as IPM;
         const filepath = "test/path";
-        const proxiedPm = store.butThenProxy(mockPm, filepath);
+        const rewritePath = createPathRewriter(`${filepath}/butThen`);
 
         let actualPath: string;
         let actualContent: any;

package/src/lib/pmProxy.test/types.ts

@@ -8,8 +8,6 @@ export type I = Ibdd_in<
   { butThenProxy: IProxy },
   { proxies: ITestProxies; filepath: string; mockPm: IPM },
   { butThenProxy: IProxy },
-  // { butThenProxy: IProxy },
-
   { proxies: ITestProxies; filepath: string; mockPm: IPM },
   [string, string],
   (