testeranto 0.173.0 → 0.177.0

package/dist/module/src/PM/base.js

@@ -112,11 +112,11 @@ export class PM_Base {
         }
         return false;
     }
-    async writeFileSync(filepath, contents, testName) {
-        console.log("writeFileSync");
-        console.log("filepath", filepath);
-        console.log("contents", contents);
-        console.log("testName", testName);
+    async writeFileSync(...x) {
+        const filepath = x[0];
+        const contents = x[1];
+        const testName = x[2];
+        console.log("writing file", filepath);
         return new Promise(async (res) => {
             fs.mkdirSync(path.dirname(filepath), {
                 recursive: true,

package/dist/module/src/PM/main.js

@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { spawn } from "node:child_process";
+import ansiColors from "ansi-colors";
 import net from "net";
 import fs, { watch } from "fs";
 import path from "path";
@@ -12,7 +13,6 @@ import crypto from "node:crypto";
 import { getRunnables } from "../utils";
 import { Queue } from "../utils/queue.js";
 import { PM_WithEslintAndTsc } from "./PM_WithEslintAndTsc.js";
-import ansiColors from "ansi-colors";
 const changes = {};
 const fileHashes = {};
 const files = {};
@@ -69,12 +69,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);
@@ -694,16 +692,6 @@ export class PM_Main extends PM_WithEslintAndTsc {
                 browserWSEndpoint: this.browser.wsEndpoint(),
             });
             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);
             this.browser
@@ -742,7 +730,6 @@ export class PM_Main extends PM_WithEslintAndTsc {
                         page.close();
                         oStream.close();
                     });
-                    console.log("ostream is closed");
                     return;
                 };
                 page.on("pageerror", (err) => {
@@ -781,19 +768,28 @@ 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 }) => {
                     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(ansiC.inverse(`web ! ${src} failed to execute. No "tests.json" file was generated. Check ${reportDest}/logs.txt for more info`)));
                     this.bddTestIsNowDone(src, -1);
                 })
                     .finally(() => {
                     // process.exit(-1);
+                    close();
                 });
                 return page;
             });

package/dist/module/src/PM/node.js

@@ -108,7 +108,10 @@ export class PM_Node extends PM {
     async write(uid, contents) {
         return await this.send("write", ...arguments);
     }
-    async writeFileSync([filepath, contents]) {
+    async writeFileSync(x) {
+        const z = arguments["0"];
+        const filepath = z[0];
+        const contents = z[1];
         return await this.send("writeFileSync", this.testResourceConfiguration.fs + "/" + filepath, contents, this.testResourceConfiguration.name);
     }
     async createWriteStream(filepath) {

package/dist/module/src/PM/pure.js

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

package/dist/module/src/PM/web.js

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

package/dist/module/src/Pure.js

@@ -8,10 +8,8 @@ export class PureTesteranto extends Testeranto {
         });
     }
     async receiveTestResourceConfig(partialTestResource) {
-        console.log("[DEBUG] receiveTestResourceConfig called with:", partialTestResource);
         const t = 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:",
@@ -27,9 +25,7 @@ export class PureTesteranto extends Testeranto {
         //   };
         // }
         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) {

package/dist/module/src/Pure.test.js

@@ -48,7 +48,7 @@ const implementation = {
         modifySpecs: (modifier) => (store) => {
             console.debug("[DEBUG] Modifying specs");
             return Object.assign(Object.assign({}, store), { specs: modifier(store.specs || []) });
-        }
+        },
     },
     thens: {
         initializedProperly: () => (store) => {

package/dist/module/src/ReportServerLib.js

@@ -120,9 +120,15 @@ server.on("error", (err) => {
 process.on("uncaughtException", (err) => {
     console.error("Uncaught exception:", err);
 });
-const start = (port) => server.listen(port, () => {
-    console.log(`Server running on http://localhost:${port}`);
-    console.log("Serving files from:", process.cwd());
-});
+const start = (port) => {
+    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) => start(port);
-// export default () => start(process.argv[2]);

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

@@ -4,9 +4,7 @@ import featuresPlugin from "./featuresPlugin";
 import rebuildPlugin from "./rebuildPlugin.js";
 export default (config, entryPoints, testName) => {
     const { inputFilesPluginFactory, register } = inputFilesPlugin("node", testName);
-    return Object.assign(Object.assign({}, baseEsBuildConfig(config)), { splitting: true, outdir: `testeranto/bundles/node/${testName}/`, 
-        // inject: [`./node_modules/testeranto/dist/cjs-shim.js`],
-        metafile: true, supported: {
+    return Object.assign(Object.assign({}, baseEsBuildConfig(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/module/src/lib/BaseSuite.js

@@ -1,17 +1,20 @@
 import { beforeAllProxy, afterAllProxy } from "./pmProxy";
 export 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 {
@@ -21,11 +24,10 @@ export 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 [];
         }
     }
@@ -53,10 +55,10 @@ export 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, beforeAllProxy(pm, sNdx.toString()));
+        const proxiedPm = 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
@@ -64,15 +66,15 @@ export 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, 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/dist/module/src/lib/abstractBase.js

@@ -3,10 +3,9 @@
 import { afterEachProxy, andWhenProxy, beforeEachProxy, butThenProxy, } from "./pmProxy.js";
 export 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 = [];
@@ -27,7 +26,7 @@ export 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()),
@@ -51,15 +50,13 @@ export class BaseGiven {
             tLog(e.stack);
         });
         try {
-            const proxiedPm = beforeEachProxy(pm, suiteNdx.toString());
-            console.log(`[Given] Setting currentStep for beforeEach:`, this.name);
-            proxiedPm.currentStep = this;
+            const proxiedPm = 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.error = e.stack;
+            // throw e;
         }
         try {
             // tLog(`\n Given this.store`, this.store);
@@ -69,9 +66,6 @@ export 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) {
@@ -81,10 +75,11 @@ export class BaseGiven {
         }
         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;
@@ -94,36 +89,33 @@ export class BaseGiven {
     }
 }
 export 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 = andWhenProxy(pm, filepath);
-            console.log(`[When] Setting currentStep for andWhen:`, this.name);
-            proxiedPm.currentStep = this;
+            // tLog(" When:", this.name);
+            const proxiedPm = 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) {
@@ -139,18 +131,23 @@ export 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 = butThenProxy(pm, filepath);
-        console.log(`[Then] Setting currentStep for butThen:`, this.name);
-        proxiedPm.currentStep = this;
+        const proxiedPm = butThenProxy(pm, filepath, this.addArtifact.bind(this));
         return this.butThen(store, async (s) => {
             if (typeof this.thenCB === "function") {
                 return await this.thenCB(s, proxiedPm);
@@ -158,8 +155,8 @@ export class BaseThen {
             else {
                 return this.thenCB;
             }
-        }, testResourceConfiguration, butThenProxy(pm, filepath)).catch((e) => {
-            this.error = e.toString();
+        }, testResourceConfiguration, proxiedPm).catch((e) => {
+            this.error = e.stack;
             // throw e;
         });
     }

package/dist/module/src/lib/basebuilder.js

@@ -15,9 +15,11 @@ export class BaseBuilder {
         this.specs = testSpecification(this.Suites(), this.Given(), this.When(), this.Then());
         this.testJobs = this.specs.map((suite) => {
             const suiteRunner = (suite) => async (puppetMaster, tLog) => {
+                console.log("mark17");
                 const x = await suite.run(input, puppetMaster.testResourceConfiguration, (fPath, value) => puppetMaster.testArtiFactoryfileWriter(tLog, (p) => {
                     this.artifacts.push(p);
                 })(puppetMaster.testResourceConfiguration.fs + "/" + fPath, value), tLog, puppetMaster);
+                console.log("mark18");
                 return x;
             };
             const runner = suiteRunner(suite);
@@ -36,7 +38,9 @@ export class BaseBuilder {
                     const tLog = async (...l) => {
                         //
                     };
+                    console.log("mark14");
                     const suiteDone = await runner(puppetMaster, tLog);
+                    console.log("mark15");
                     // const logPromise = new Promise(async (res) => {
                     //   await puppetMaster.end(access);
                     //   res(true);
@@ -50,6 +54,7 @@ export class BaseBuilder {
                         `tests.json`,
                         JSON.stringify(this.toObj(), null, 2),
                     ]);
+                    console.log("mark13");
                     return {
                         failed: fails > 0,
                         fails,

package/dist/module/src/lib/core.js

@@ -26,6 +26,7 @@ export default class TesterantoCore extends ClassBuilder {
                 this.uberCatcher = uberCatcher;
             }
             async givenThat(subject, testResource, artifactory, initializer, initialValues, pm) {
+                console.log("mark800");
                 return fullAdapter.beforeEach(subject, initializer, testResource, initialValues, pm);
             }
             afterEach(store, key, artifactory, pm) {