testeranto 0.173.0 → 0.189.0

package/dist/common/src/components/stateful/ProjectsPage.js

@@ -0,0 +1,92 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectsPage = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const react_1 = __importStar(require("react"));
+const react_router_dom_1 = require("react-router-dom");
+const ProjectsPageView_1 = require("../pure/ProjectsPageView");
+const ProjectsPage = () => {
+    const [projects, setProjects] = (0, react_1.useState)([]);
+    const [summaries, setSummaries] = (0, react_1.useState)({});
+    const [loading, setLoading] = (0, react_1.useState)(true);
+    const [error, setError] = (0, react_1.useState)(null);
+    const [configs, setConfigs] = (0, react_1.useState)({});
+    const navigate = (0, react_router_dom_1.useNavigate)();
+    (0, react_1.useEffect)(() => {
+        const fetchProjects = async () => {
+            try {
+                const projectsRes = await fetch(`projects.json`);
+                const projectNames = await projectsRes.json();
+                const projectsData = await Promise.all(projectNames.map(async (name) => {
+                    var _a, _b, _c, _d, _e, _f;
+                    const [summaryRes, nodeRes, webRes, pureRes, configRes] = await Promise.all([
+                        fetch(`reports/${name}/summary.json`),
+                        fetch(`bundles/node/${name}/metafile.json`),
+                        fetch(`bundles/web/${name}/metafile.json`),
+                        fetch(`bundles/pure/${name}/metafile.json`),
+                        fetch(`reports/${name}/config.json`),
+                    ]);
+                    const [summary, nodeData, webData, pureData, configData] = await Promise.all([
+                        summaryRes.json(),
+                        nodeRes.ok ? nodeRes.json() : { errors: ["Failed to load node build logs"] },
+                        webRes.ok ? webRes.json() : { errors: ["Failed to load web build logs"] },
+                        pureRes.ok ? pureRes.json() : { errors: ["Failed to load pure build logs"] },
+                        configRes.json(),
+                    ]);
+                    setSummaries(prev => (Object.assign(Object.assign({}, prev), { [name]: summary })));
+                    setConfigs(prev => (Object.assign(Object.assign({}, prev), { [name]: configData })));
+                    return {
+                        name,
+                        testCount: Object.keys(summary).length,
+                        nodeStatus: ((_a = nodeData.errors) === null || _a === void 0 ? void 0 : _a.length) ? 'failed' : ((_b = nodeData.warnings) === null || _b === void 0 ? void 0 : _b.length) ? 'warning' : 'success',
+                        webStatus: ((_c = webData.errors) === null || _c === void 0 ? void 0 : _c.length) ? 'failed' : ((_d = webData.warnings) === null || _d === void 0 ? void 0 : _d.length) ? 'warning' : 'success',
+                        pureStatus: ((_e = pureData.errors) === null || _e === void 0 ? void 0 : _e.length) ? 'failed' : ((_f = pureData.warnings) === null || _f === void 0 ? void 0 : _f.length) ? 'warning' : 'success',
+                    };
+                }));
+                setProjects(projectsData);
+            }
+            catch (err) {
+                setError(err instanceof Error ? err.message : 'Unknown error');
+            }
+            finally {
+                setLoading(false);
+            }
+        };
+        fetchProjects();
+    }, []);
+    return (react_1.default.createElement(ProjectsPageView_1.ProjectsPageView, { projects: projects, summaries: summaries, configs: configs, loading: loading, error: error, navigate: navigate }));
+};
+exports.ProjectsPage = ProjectsPage;

package/dist/common/src/components/stateful/TestPage.js

@@ -0,0 +1,133 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestPage = void 0;
+/* eslint-disable @typescript-eslint/no-unused-vars */
+const react_1 = __importStar(require("react"));
+const react_router_dom_1 = require("react-router-dom");
+const api_1 = require("../../utils/api");
+const TestPageView_1 = require("../pure/TestPageView");
+const TestPage = () => {
+    const navigate = (0, react_router_dom_1.useNavigate)();
+    const location = (0, react_router_dom_1.useLocation)();
+    const [route, setRoute] = (0, react_1.useState)('results');
+    // Sync route with hash changes
+    (0, react_1.useEffect)(() => {
+        const hash = location.hash.replace('#', '');
+        if (hash && ['results', 'logs', 'types', 'lint', 'coverage'].includes(hash)) {
+            setRoute(hash);
+        }
+        else {
+            setRoute('results');
+        }
+    }, [location.hash]);
+    const [testName, setTestName] = (0, react_1.useState)('');
+    // const [testData, setTestData] = useState(null);
+    const [logs, setLogs] = (0, react_1.useState)({});
+    // const [typeErrors, setTypeErrors] = useState('');
+    // const [lintErrors, setLintErrors] = useState('');
+    const [loading, setLoading] = (0, react_1.useState)(true);
+    const [error, setError] = (0, react_1.useState)(null);
+    const [testsExist, setTestsExist] = (0, react_1.useState)(true);
+    const [errorCounts, setErrorCounts] = (0, react_1.useState)({
+        typeErrors: 0,
+        staticErrors: 0,
+        runTimeErrors: 0
+    });
+    const [summary, setSummary] = (0, react_1.useState)(null);
+    const { projectName, '*': splat } = (0, react_router_dom_1.useParams)();
+    const pathParts = splat ? splat.split('/') : [];
+    const runtime = pathParts.pop() || '';
+    const testPath = pathParts.join('/');
+    const decodedTestPath = testPath ? decodeURIComponent(testPath) : '';
+    (0, react_1.useEffect)(() => {
+        if (!projectName || !testPath || !runtime)
+            return;
+        setTestName(testPath);
+        const fetchData = async () => {
+            try {
+                const testResponse = await (0, api_1.fetchTestData)(projectName, testPath, runtime);
+                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`);
+                    if (!summaryResponse.ok)
+                        throw new Error('Failed to fetch summary');
+                    const allSummaries = await summaryResponse.json();
+                    const testSummary = allSummaries[testPath];
+                    if (testSummary) {
+                        const counts = {
+                            typeErrors: Number(testSummary.typeErrors) || 0,
+                            staticErrors: Number(testSummary.staticErrors) || 0,
+                            runTimeErrors: Number(testSummary.runTimeErrors) || 0
+                        };
+                        setSummary(testSummary);
+                        setErrorCounts(counts);
+                        setTestsExist(testSummary.testsExist !== false);
+                    }
+                }
+                catch (err) {
+                    console.error('Failed to load summary:', err);
+                }
+            }
+            catch (err) {
+                setError(err instanceof Error ? err.message : 'Unknown error');
+                setTestsExist(false);
+            }
+            finally {
+                setLoading(false);
+            }
+        };
+        fetchData();
+    }, []);
+    if (!logs)
+        return react_1.default.createElement("div", null, "loading...");
+    return (react_1.default.createElement(TestPageView_1.TestPageView, { route: route, setRoute: setRoute, navigate: navigate, projectName: projectName, testName: testName, decodedTestPath: decodedTestPath, runtime: runtime, logs: logs, testsExist: testsExist, errorCounts: errorCounts }));
+};
+exports.TestPage = TestPage;

package/dist/common/src/defaultConfig.js

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

package/dist/common/src/esbuildConfigs/node.js

@@ -9,9 +9,7 @@ const featuresPlugin_1 = __importDefault(require("./featuresPlugin"));
 const rebuildPlugin_js_1 = __importDefault(require("./rebuildPlugin.js"));
 exports.default = (config, entryPoints, testName) => {
     const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("node", testName);
-    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { splitting: true, outdir: `testeranto/bundles/node/${testName}/`, 
-        // inject: [`./node_modules/testeranto/dist/cjs-shim.js`],
-        metafile: true, supported: {
+    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { splitting: true, outdir: `testeranto/bundles/node/${testName}/`, inject: [`./node_modules/testeranto/dist/cjs-shim.js`], metafile: true, supported: {
             "dynamic-import": true,
         }, define: {
             "process.env.FLUENTFFMPEG_COV": "0",

package/dist/common/src/esbuildConfigs/web.js

@@ -31,7 +31,7 @@ exports.default = (config, entryPoints, testName) => {
             "util",
             "process",
             "dns",
-        ], platform: "browser", entryPoints: [...entryPoints], plugins: [
+        ], platform: "browser", entryPoints: [...entryPoints], loader: config.webLoaders, plugins: [
             featuresPlugin_js_1.default,
             inputFilesPluginFactory,
             (0, esbuild_plugin_polyfill_node_1.polyfillNode)({

package/dist/common/src/lib/BaseSuite.js

@@ -1,20 +1,24 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-unused-vars */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseSuite = void 0;
 const pmProxy_1 = require("./pmProxy");
 class BaseSuite {
+    addArtifact(path) {
+        console.log("Suite addArtifact", path);
+        const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+        this.artifacts.push(normalizedPath);
+    }
     constructor(name, index, givens = {}) {
+        this.artifacts = [];
         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());
     }
     features() {
         try {
@@ -24,11 +28,10 @@ class BaseSuite {
                 .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 [];
         }
     }
@@ -56,10 +59,10 @@ class BaseSuite {
         // tLog("test resources: ", JSON.stringify(testResourceConfiguration));
         const suiteArtifactory = (fPath, value) => 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 subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, (0, pmProxy_1.beforeAllProxy)(pm, sNdx.toString()));
+        const proxiedPm = (0, pmProxy_1.beforeAllProxy)(pm, sNdx.toString(), this);
+        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, proxiedPm);
         for (const [gKey, g] of Object.entries(this.givens)) {
             const giver = this.givens[gKey];
             this.store = await giver
@@ -67,15 +70,15 @@ class BaseSuite {
                 .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, (0, pmProxy_1.afterAllProxy)(pm, sNdx.toString()));
+            const afterAllPm = (0, pmProxy_1.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/dist/common/src/lib/BaseSuite.test/mock.js

@@ -21,11 +21,8 @@ class MockGiven extends abstractBase_1.BaseGiven {
 exports.MockGiven = MockGiven;
 class MockWhen extends abstractBase_1.BaseWhen {
     async andWhen(store, whenCB, testResource, pm) {
-        console.log("[DEBUG] MockWhen - andWhen - input store:", JSON.stringify(store));
         const newStore = Object.assign(Object.assign({}, store), { testSelection: true });
-        console.log("[DEBUG] MockWhen - andWhen - calling whenCB");
         const result = await whenCB(newStore);
-        console.log("[DEBUG] MockWhen - andWhen - result:", JSON.stringify(result));
         return result;
     }
     addArtifact(name, content) {
@@ -36,10 +33,6 @@ class MockWhen extends abstractBase_1.BaseWhen {
 exports.MockWhen = MockWhen;
 class MockThen extends abstractBase_1.BaseThen {
     async butThen(store, thenCB, testResourceConfiguration, pm) {
-        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 = {
             name: store.name,
@@ -47,10 +40,8 @@ class MockThen extends abstractBase_1.BaseThen {
             testSelection: store.testSelection || false,
             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(`Invalid test selection result: ${JSON.stringify(result)}`);
             }
@@ -68,14 +59,12 @@ class MockSuite extends BaseSuite_1.BaseSuite {
         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("testGiven", ["testFeature"], [new MockWhen("testWhen", () => Promise.resolve({ testStore: true }))], [
                 new MockThen("testThen", async () => Promise.resolve({ testSelection: true })),
             ]),
         });
-        console.log("[DEBUG] MockSuite created:", this.name, this.index);
     }
 }
 exports.MockSuite = MockSuite;

package/dist/common/src/lib/BaseSuite.test/test.js

@@ -56,7 +56,6 @@ exports.implementation = {
     givens: {
         Default: () => {
             const suite = new mock_1.MockSuite("testSuite", 0);
-            console.log("[DEBUG] Created test suite:", suite.name, suite.index);
             return suite;
         },
     },
@@ -74,7 +73,6 @@ exports.implementation = {
             return suite;
         },
         RunSuite: () => async (suite) => {
-            console.log("[DEBUG] Running RunSuite");
             const mockConfig = {
                 name: "test",
                 fs: "/tmp",
@@ -119,21 +117,20 @@ exports.implementation = {
         },
     },
     thens: {
-        SuiteNameMatches: (expectedName) => (suite) => {
-            console.log("[DEBUG] SuiteNameMatches - expected:", expectedName, "actual:", suite === null || suite === void 0 ? void 0 : suite.name);
-            if (!(suite === null || suite === void 0 ? void 0 : suite.name)) {
+        SuiteNameMatches: (expectedName) => (selection) => {
+            if (!selection.name) {
                 throw new Error(`Suite name is undefined. Expected: ${expectedName}`);
             }
-            if (suite.name !== expectedName) {
-                throw new Error(`Expected suite name '${expectedName}', got '${suite.name}'`);
+            if (selection.name !== expectedName) {
+                throw new Error(`Expected suite name '${expectedName}', got '${selection.name}'`);
             }
-            return suite;
+            return selection;
         },
-        SuiteIndexMatches: (expectedIndex) => (suite) => {
-            if (suite.index !== expectedIndex) {
-                throw new Error(`Expected suite index ${expectedIndex}, got ${suite.index}`);
+        SuiteIndexMatches: (expectedIndex) => (selection) => {
+            if (selection.index !== expectedIndex) {
+                throw new Error(`Expected suite index ${expectedIndex}, got ${selection.index}`);
             }
-            return suite;
+            return selection;
         },
         FeaturesIncludes: (feature) => (suite) => {
             if (!suite.features().includes(feature)) {
@@ -214,17 +211,11 @@ exports.implementation = {
 // 5. Fully typed Test Adapter
 exports.testAdapter = {
     beforeEach: async (subject, initializer, testResource, initialValues, pm) => {
-        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 Object.assign({ name: suite.name, index: suite.index, testStore: true, testSelection: false }, (suite.store || {}));
         }
         catch (e) {
@@ -234,16 +225,14 @@ exports.testAdapter = {
     },
     andWhen: async (store, whenCB, testResource, pm) => whenCB(store, pm),
     butThen: async (store, thenCB, testResource, pm) => {
-        console.log("[DEBUG] butThen - input store:", JSON.stringify(store, null, 2));
-        // Create test selection from store
         const 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(`Invalid test selection result: ${JSON.stringify(result)}`);
             }

package/dist/common/src/lib/Sidecar.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sidecar = void 0;
+// Do not add logging to this file as it is used by the pure runtime.
 class Sidecar {
 }
 exports.Sidecar = Sidecar;

package/dist/common/src/lib/abstractBase.js

@@ -6,10 +6,9 @@ exports.BaseThen = exports.BaseWhen = exports.BaseGiven = void 0;
 const pmProxy_js_1 = require("./pmProxy.js");
 class BaseGiven {
     addArtifact(path) {
-        console.log(`[Artifact] Adding to ${this.constructor.name}:`, path);
-        // console.log("mark111");
-        // process.exit();
-        this.artifacts.push(path);
+        console.log("Given addArtifact", path);
+        const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+        this.artifacts.push(normalizedPath);
     }
     constructor(name, features, whens, thens, givenCB, initialValues) {
         this.artifacts = [];
@@ -30,7 +29,7 @@ class BaseGiven {
             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()),
@@ -54,15 +53,14 @@ class BaseGiven {
             tLog(e.stack);
         });
         try {
-            const proxiedPm = (0, pmProxy_js_1.beforeEachProxy)(pm, suiteNdx.toString());
-            console.log(`[Given] Setting currentStep for beforeEach:`, this.name);
-            proxiedPm.currentStep = this;
+            const proxiedPm = (0, pmProxy_js_1.beforeEachProxy)(pm, suiteNdx.toString(), this.addArtifact.bind(this));
             this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, this.initialValues, 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 {
             // tLog(`\n Given this.store`, this.store);
@@ -72,22 +70,21 @@ class BaseGiven {
             for (const [thenNdx, thenStep] of this.thens.entries()) {
                 const t = await thenStep.test(this.store, testResourceConfiguration, tLog, pm, `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, (0, pmProxy_js_1.afterEachProxy)(pm, suiteNdx.toString(), key));
+                const proxiedPm = (0, pmProxy_js_1.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;
@@ -98,36 +95,33 @@ class BaseGiven {
 }
 exports.BaseGiven = BaseGiven;
 class BaseWhen {
+    addArtifact(path) {
+        console.log("When addArtifact", path);
+        const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+        this.artifacts.push(normalizedPath);
+    }
     constructor(name, whenCB) {
         this.artifacts = [];
         this.name = name;
         this.whenCB = whenCB;
     }
     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(store, testResourceConfiguration, tLog, pm, filepath) {
         try {
-            tLog(" When:", this.name);
-            console.debug("[DEBUG] Executing When step:", this.name.toString());
-            const proxiedPm = (0, pmProxy_js_1.andWhenProxy)(pm, filepath);
-            console.log(`[When] Setting currentStep for andWhen:`, this.name);
-            proxiedPm.currentStep = this;
+            // tLog(" When:", this.name);
+            const proxiedPm = (0, pmProxy_js_1.andWhenProxy)(pm, filepath, this.addArtifact.bind(this));
+            // (proxiedPm as any).currentStep = this;
             const result = await this.andWhen(store, this.whenCB, testResourceConfiguration, proxiedPm);
-            console.debug("[DEBUG] When step completed:", this.name.toString());
             return result;
         }
         catch (e) {
@@ -144,27 +138,37 @@ class BaseThen {
         this.name = name;
         this.thenCB = thenCB;
         this.error = false;
+        this.artifacts = [];
+    }
+    addArtifact(path) {
+        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;
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
-        const proxiedPm = (0, pmProxy_js_1.butThenProxy)(pm, filepath);
-        console.log(`[Then] Setting currentStep for butThen:`, this.name);
-        proxiedPm.currentStep = this;
+        const proxiedPm = (0, pmProxy_js_1.butThenProxy)(pm, filepath, this.addArtifact.bind(this));
         return this.butThen(store, async (s) => {
-            if (typeof this.thenCB === "function") {
-                return await this.thenCB(s, proxiedPm);
+            try {
+                if (typeof this.thenCB === "function") {
+                    return await this.thenCB(s, proxiedPm);
+                }
+                else {
+                    return this.thenCB;
+                }
             }
-            else {
-                return this.thenCB;
+            catch (e) {
+                console.error(e.stack);
             }
-        }, testResourceConfiguration, (0, pmProxy_js_1.butThenProxy)(pm, filepath)).catch((e) => {
-            this.error = e.toString();
+        }, testResourceConfiguration, proxiedPm).catch((e) => {
+            this.error = e.stack;
             // throw e;
         });
     }

package/dist/common/src/lib/baseBuilder.test/baseBuilder.test.adapter.js

@@ -4,13 +4,7 @@ exports.testAdapter = void 0;
 exports.testAdapter = {
     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) => {