testeranto 0.173.0 → 0.189.0

package/src/components/stateful/TestPage.tsx

@@ -1,9 +1,12 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import React, { useEffect, useState } from 'react';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
 
-import { TestPageView } from '../pure/TestPageView';
 import { fetchTestData } from '../../utils/api';
 
+import { TestPageView } from '../pure/TestPageView';
+
+
 export const TestPage = () => {
   const navigate = useNavigate();
   const location = useLocation();
@@ -20,10 +23,10 @@ export const TestPage = () => {
   }, [location.hash]);
 
   const [testName, setTestName] = useState('');
-  const [testData, setTestData] = useState(null);
-  const [logs, setLogs] = useState('');
-  const [typeErrors, setTypeErrors] = useState('');
-  const [lintErrors, setLintErrors] = useState('');
+  // const [testData, setTestData] = useState(null);
+  const [logs, setLogs] = useState<Record<string, string>>({});
+  // const [typeErrors, setTypeErrors] = useState('');
+  // const [lintErrors, setLintErrors] = useState('');
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
   const [testsExist, setTestsExist] = useState(true);
@@ -47,11 +50,21 @@ export const TestPage = () => {
     const fetchData = async () => {
       try {
         const testResponse = await fetchTestData(projectName, testPath, runtime);
-        setTestData(testResponse.testData);
-        setTestsExist(!!testResponse.testData);
-        setLogs(testResponse.logs === null ? undefined : testResponse.logs);
-        setTypeErrors(testResponse.typeErrors);
-        setLintErrors(testResponse.lintErrors);
+        console.log("testResponse", testResponse)
+        // setTestData(testResponse.testData);
+        // setTestsExist(!!testResponse.testData);
+        const receivedLogs = await testResponse.logs;
+        // Ensure tests.json is properly formatted
+        if (receivedLogs['tests.json'] && typeof receivedLogs['tests.json'] === 'string') {
+          try {
+            receivedLogs['tests.json'] = JSON.parse(receivedLogs['tests.json']);
+          } catch (e) {
+            console.error('Failed to parse tests.json:', e);
+          }
+        }
+        setLogs(receivedLogs);
+        // setTypeErrors(testResponse.typeErrors);
+        // setLintErrors(testResponse.lintErrors);
 
         try {
           const summaryResponse = await fetch(`reports/${projectName}/summary.json`);
@@ -84,24 +97,20 @@ export const TestPage = () => {
     fetchData();
   }, []);
 
+  if (!logs) return <div>loading...</div>
+
   return (
     <TestPageView
-      route={route}
+      route={route as 'results' | 'logs' | 'types' | 'lint' | 'coverage'}
       setRoute={setRoute}
       navigate={navigate}
-      projectName={projectName}
+      projectName={projectName as string}
       testName={testName}
       decodedTestPath={decodedTestPath}
       runtime={runtime}
-      testData={testData}
       logs={logs}
-      typeErrors={typeErrors}
-      lintErrors={lintErrors}
-      loading={loading}
-      error={error}
       testsExist={testsExist}
       errorCounts={errorCounts}
-      summary={summary}
     />
   );
 };

package/src/defaultConfig.ts

@@ -12,6 +12,7 @@ const config: ITestconfig = {
   nodePlugins: [],
   webPlugins: [],
   importPlugins: [],
+  webLoaders: {},
 
   featureIngestor: function (s: string): Promise<string> {
     throw new Error("Function not implemented.");

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/esbuildConfigs/web.ts

@@ -9,7 +9,6 @@ import baseEsBuildConfig from "./index.js";
 import inputFilesPlugin from "./inputFilesPlugin.js";
 import featuresPlugin from "./featuresPlugin.js";
 import rebuildPlugin from "./rebuildPlugin.js";
-
 export default (
   config: ITestconfig,
   entryPoints: string[],
@@ -56,6 +55,8 @@ export default (
 
     entryPoints: [...entryPoints],
 
+    loader: config.webLoaders as any,
+
     plugins: [
       featuresPlugin,
       inputFilesPluginFactory,

package/src/lib/BaseSuite.test/mock.ts

@@ -39,19 +39,12 @@ export class MockWhen extends BaseWhen<I> {
     testResource: any,
     pm: IPM
   ): Promise<TestStore> {
-    console.log(
-      "[DEBUG] MockWhen - andWhen - input store:",
-      JSON.stringify(store)
-    );
-
     const newStore = {
       ...store,
       testSelection: true, // Ensure testSelection is set for assertions
     };
 
-    console.log("[DEBUG] MockWhen - andWhen - calling whenCB");
     const result = await whenCB(newStore);
-    console.log("[DEBUG] MockWhen - andWhen - result:", JSON.stringify(result));
 
     return result;
   }
@@ -69,15 +62,6 @@ export class MockThen extends BaseThen<I> {
     testResourceConfiguration: any,
     pm: any
   ): Promise<TestSelection> {
-    console.log(
-      "[DEBUG] MockThen - butThen - input store:",
-      JSON.stringify(store)
-    );
-
-    if (!store) {
-      throw new Error("Store is undefined in butThen");
-    }
-
     // Create test selection with explicit type
     const testSelection: TestSelection = {
       name: store.name,
@@ -86,17 +70,8 @@ export class MockThen extends BaseThen<I> {
       error: store.error ? true : undefined,
     };
 
-    console.log(
-      "[DEBUG] MockThen - passing testSelection:",
-      JSON.stringify(testSelection)
-    );
-
     try {
       const result = await thenCB(testSelection);
-      console.log(
-        "[DEBUG] MockThen - received result:",
-        JSON.stringify(result)
-      );
 
       if (!result || typeof result.testSelection === "undefined") {
         throw new Error(
@@ -117,7 +92,7 @@ export class MockSuite extends BaseSuite<I, O> {
     if (!name) {
       throw new Error("MockSuite requires a non-empty name");
     }
-    console.log("[DEBUG] Creating MockSuite with name:", name, "index:", index);
+
     const suiteName = name || "testSuite"; // Ensure name is never undefined
     super(suiteName, index, {
       testGiven: new MockGiven(
@@ -131,6 +106,5 @@ export class MockSuite extends BaseSuite<I, O> {
         ]
       ),
     });
-    console.log("[DEBUG] MockSuite created:", this.name, this.index);
   }
 }

package/src/lib/BaseSuite.test/test.ts

@@ -125,7 +125,7 @@ export const implementation: ITestImplementation<I, O> = {
   givens: {
     Default: (): MockSuite => {
       const suite = new MockSuite("testSuite", 0);
-      console.log("[DEBUG] Created test suite:", suite.name, suite.index);
+
       return suite;
     },
   },
@@ -155,7 +155,6 @@ export const implementation: ITestImplementation<I, O> = {
     RunSuite:
       (): ((suite: MockSuite) => Promise<MockSuite>) =>
       async (suite: MockSuite) => {
-        console.log("[DEBUG] Running RunSuite");
         const mockConfig: ITTestResourceConfiguration = {
           name: "test",
           fs: "/tmp",
@@ -222,34 +221,28 @@ export const implementation: ITestImplementation<I, O> = {
 
   thens: {
     SuiteNameMatches:
-      (expectedName: string): ((suite: MockSuite) => MockSuite) =>
-      (suite: MockSuite) => {
-        console.log(
-          "[DEBUG] SuiteNameMatches - expected:",
-          expectedName,
-          "actual:",
-          suite?.name
-        );
-        if (!suite?.name) {
+      (expectedName: string): ((selection: TestSelection) => TestSelection) =>
+      (selection) => {
+        if (!selection.name) {
           throw new Error(`Suite name is undefined. Expected: ${expectedName}`);
         }
-        if (suite.name !== expectedName) {
+        if (selection.name !== expectedName) {
           throw new Error(
-            `Expected suite name '${expectedName}', got '${suite.name}'`
+            `Expected suite name '${expectedName}', got '${selection.name}'`
           );
         }
-        return suite;
+        return selection;
       },
 
     SuiteIndexMatches:
-      (expectedIndex: number): ((suite: MockSuite) => MockSuite) =>
-      (suite: MockSuite) => {
-        if (suite.index !== expectedIndex) {
+      (expectedIndex: number): ((selection: TestSelection) => TestSelection) =>
+      (selection) => {
+        if (selection.index !== expectedIndex) {
           throw new Error(
-            `Expected suite index ${expectedIndex}, got ${suite.index}`
+            `Expected suite index ${expectedIndex}, got ${selection.index}`
           );
         }
-        return suite;
+        return selection;
       },
 
     FeaturesIncludes:
@@ -367,17 +360,12 @@ export const testAdapter: ITestAdapter<I> = {
     initialValues: any,
     pm: IPM
   ): Promise<I["istore"]> => {
-    console.log("[DEBUG] Running beforeEach with subject:", subject);
     try {
       const suite = await initializer();
       if (!suite) {
         throw new Error("Initializer returned undefined suite");
       }
-      console.log("[DEBUG] beforeEach result:", {
-        name: suite.name,
-        index: suite.index,
-        store: suite.store,
-      });
+
       return {
         name: suite.name,
         index: suite.index,
@@ -404,25 +392,15 @@ export const testAdapter: ITestAdapter<I> = {
     testResource: ITTestResourceConfiguration,
     pm: IPM
   ): Promise<TestSelection> => {
-    console.log(
-      "[DEBUG] butThen - input store:",
-      JSON.stringify(store, null, 2)
-    );
-
-    // Create test selection from store
     const testSelection: TestSelection = {
       testSelection: store.testSelection || false,
       error: store.error ? true : undefined,
+      name: store.name,
+      index: store.index,
     };
 
-    console.log(
-      "[DEBUG] butThen - created testSelection:",
-      JSON.stringify(testSelection, null, 2)
-    );
-
     try {
       const result = await thenCB(testSelection);
-      console.log("[DEBUG] butThen - result:", JSON.stringify(result, null, 2));
 
       if (!result || typeof result.testSelection === "undefined") {
         throw new Error(

package/src/lib/BaseSuite.ts

@@ -1,4 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
+
+// Do not add logging to this file as it is used by the pure runtime.
+
 import { ITTestResourceConfiguration, ITestArtifactory } from ".";
 import { Ibdd_in_any, Ibdd_out_any } from "../CoreTypes";
 import { IGivens } from "./abstractBase";
@@ -14,23 +17,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 +45,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 +95,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 +121,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/Sidecar.ts

@@ -1,5 +1,7 @@
 import { ITTestResourceConfiguration } from ".";
 
+// Do not add logging to this file as it is used by the pure runtime.
+
 export abstract class Sidecar {
   abstract start(t: ITTestResourceConfiguration);
   abstract stop();

package/src/lib/abstractBase.test/MockGiven.ts

@@ -1,4 +1,4 @@
-import { BaseGiven } from "../abstractBase";
+import { BaseGiven, BaseThen, BaseWhen } from "../abstractBase";
 import { Ibdd_in_any } from "../../CoreTypes";
 
 export class MockGiven<I extends Ibdd_in_any> extends BaseGiven<I> {

package/src/lib/abstractBase.ts

@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+// Do not add logging to this file as it is used by the pure runtime.
+
 import type { Ibdd_in_any } from "../CoreTypes";
 
 import { ITestArtifactory, ITLog, ITTestResourceConfiguration } from ".";
@@ -28,11 +30,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 +64,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 +120,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 +134,10 @@ 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.failed = true;
+      this.error = e.stack;
+      // throw e;
     }
 
     try {
@@ -157,31 +162,30 @@ export abstract class BaseGiven<I extends Ibdd_in_any> {
           `suite-${suiteNdx}/given-${key}/then-${thenNdx}`
         );
         tester(t);
-        // ((t) => {
-        //   return tester(t);
-        // })();
       }
     } catch (e) {
+      this.error = e.stack;
       this.failed = true;
-      tLog(e.stack);
-      throw e;
+      // tLog(e.stack);
+      // 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 +194,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 +216,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 +238,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 +249,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(),
@@ -258,7 +264,7 @@ export abstract class BaseWhen<I extends Ibdd_in_any> {
 
 export abstract class BaseThen<I extends Ibdd_in_any> {
   public name: string;
-  thenCB: (storeState: I["iselection"]) => Promise<I["then"]>;
+  thenCB: (storeState: I["iselection"], pm: IPM) => Promise<I["then"]>;
   error: boolean;
   artifacts: string[] = [];
 
@@ -269,14 +275,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,22 +308,24 @@ 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"]) => {
-        if (typeof this.thenCB === "function") {
-          return await this.thenCB(s, proxiedPm);
-        } else {
-          return this.thenCB;
+        try {
+          if (typeof this.thenCB === "function") {
+            return await this.thenCB(s, proxiedPm);
+          } else {
+            return this.thenCB;
+          }
+        } catch (e) {
+          console.error(e.stack);
         }
       },
       testResourceConfiguration,
-      butThenProxy(pm, filepath)
+      proxiedPm
     ).catch((e) => {
-      this.error = e.toString();
+      this.error = e.stack;
       // throw e;
     });
   }

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

@@ -7,13 +7,7 @@ import { I } from "./baseBuilder.test.types";
 export const testAdapter: ITestAdapter<I> = {
   beforeAll: async (input, testResource, pm) => input,
   beforeEach: async (subject, initializer, testResource, initialValues, pm) => {
-    console.log("Initializing test with:", {
-      subject,
-      initializer,
-      initialValues,
-    });
     const result = initializer();
-    console.log("Initialization result:", result.toString());
     return result;
   },
   andWhen: async (store, whenCB, testResource, utils) => {