testeranto 0.43.1 → 0.45.0

package/dist/common/Node.js

@@ -13,13 +13,15 @@ exports.default = async (input, testSpecification, testImplementation, testInter
         function (b) {
             return b;
         }, NodeWriter_js_1.NodeWriter);
-    const t = mrt[0];
+    const t = mrt.testJobs[0];
     const testResourceArg = process.argv[2] || `{}`;
     try {
         const partialTestResource = JSON.parse(testResourceArg);
         if (testResourceRequirement.ports == 0) {
-            const failed = await t.receiveTestResourceConfig(partialTestResource);
-            // process.exit(failed ? 1 : 0);
+            const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
+            Promise.all([...artifacts, logPromise]).then(async () => {
+                process.exit(await failed ? 1 : 0);
+            });
         }
         else {
             console.log("test configuration is incomplete", partialTestResource);
@@ -38,7 +40,7 @@ exports.default = async (input, testSpecification, testImplementation, testInter
                     const resourcesFromPm2 = packet.data.testResourceConfiguration;
                     const secondTestResource = Object.assign(Object.assign({ fs: "." }, JSON.parse(JSON.stringify(partialTestResource))), JSON.parse(JSON.stringify(resourcesFromPm2)));
                     console.log("secondTestResource", secondTestResource);
-                    const failed = await t.receiveTestResourceConfig(secondTestResource);
+                    const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
                     /* @ts-ignore:next-line */
                     process.send({
                         type: "testeranto:adios",
@@ -46,13 +48,15 @@ exports.default = async (input, testSpecification, testImplementation, testInter
                             testResourceConfiguration: t.test.testResourceConfiguration,
                             results: t.toObj(),
                         },
-                    }, (err) => {
+                    }, async (err) => {
                         if (!err) {
-                            // process.exit(failed ? 1 : 0);
+                            Promise.all([...artifacts, logPromise]).then(async () => {
+                                process.exit(await failed ? 1 : 0);
+                            });
                         }
                         else {
                             console.error(err);
-                            // process.exit(1);
+                            process.exit(1);
                         }
                     });
                 });

package/dist/common/NodeWriter.js

@@ -17,35 +17,40 @@ exports.NodeWriter = {
     mkdirSync: async (fp) => {
         await fs_1.default.mkdirSync(fp, { recursive: true });
     },
-    testArtiFactoryfileWriter: (tLog) => (fPath, value) => {
-        tLog("testArtiFactory =>", fPath);
-        const cleanPath = path_1.default.resolve(fPath);
-        fPaths.push(cleanPath.replace(process.cwd(), ``));
-        const targetDir = cleanPath.split("/").slice(0, -1).join("/");
-        fs_1.default.mkdir(targetDir, { recursive: true }, async (error) => {
-            if (error) {
-                console.error(`❗️testArtiFactory failed`, targetDir, error);
-            }
-            fs_1.default.writeFileSync(path_1.default.resolve(targetDir.split("/").slice(0, -1).join("/"), "manifest"), fPaths.join(`\n`), {
-                encoding: "utf-8",
-            });
-            if (Buffer.isBuffer(value)) {
-                fs_1.default.writeFileSync(fPath, value, "binary");
-            }
-            else if (`string` === typeof value) {
-                fs_1.default.writeFileSync(fPath, value.toString(), {
+    testArtiFactoryfileWriter: (tLog, callback) => (fPath, value) => {
+        callback(new Promise((res, rej) => {
+            tLog("testArtiFactory =>", fPath);
+            const cleanPath = path_1.default.resolve(fPath);
+            fPaths.push(cleanPath.replace(process.cwd(), ``));
+            const targetDir = cleanPath.split("/").slice(0, -1).join("/");
+            fs_1.default.mkdir(targetDir, { recursive: true }, async (error) => {
+                if (error) {
+                    console.error(`❗️testArtiFactory failed`, targetDir, error);
+                }
+                fs_1.default.writeFileSync(path_1.default.resolve(targetDir.split("/").slice(0, -1).join("/"), "manifest"), fPaths.join(`\n`), {
                     encoding: "utf-8",
                 });
-            }
-            else {
-                /* @ts-ignore:next-line */
-                const pipeStream = value;
-                const myFile = fs_1.default.createWriteStream(fPath);
-                pipeStream.pipe(myFile);
-                pipeStream.on("close", () => {
-                    myFile.close();
-                });
-            }
-        });
+                if (Buffer.isBuffer(value)) {
+                    fs_1.default.writeFileSync(fPath, value, "binary");
+                    res();
+                }
+                else if (`string` === typeof value) {
+                    fs_1.default.writeFileSync(fPath, value.toString(), {
+                        encoding: "utf-8",
+                    });
+                    res();
+                }
+                else {
+                    /* @ts-ignore:next-line */
+                    const pipeStream = value;
+                    const myFile = fs_1.default.createWriteStream(fPath);
+                    pipeStream.pipe(myFile);
+                    pipeStream.on("close", () => {
+                        myFile.close();
+                        res();
+                    });
+                }
+            });
+        }));
     }
 };

package/dist/common/Project.js

@@ -82,7 +82,7 @@ class ITProject {
                     if (!this.devMode && this.mode === "up") {
                         this.initiateShutdown("resource request queue is empty");
                     }
-                    if (this.mode === "down" && procsTable.every((p) => p.pid === 0)) {
+                    if (this.mode === "down" && procsTable.every((p) => p.pid === 0 || p.pid === undefined)) {
                         this.shutdown();
                     }
                 }
@@ -139,31 +139,6 @@ class ITProject {
             this.tests = tests.default;
             Promise.resolve().then(() => __importStar(require(featurePath))).then((features) => {
                 this.features = features.default;
-                const [nodeEntryPoints, webEntryPoints] = getRunnables(this.tests);
-                const esbuildConfigNode = {
-                    packages: "external",
-                    external: ["tests.test.js", "features.test.js"],
-                    platform: "node",
-                    outbase: config.outbase,
-                    outdir: config.outdir,
-                    jsx: `transform`,
-                    entryPoints: [...nodeEntryPoints],
-                    bundle: true,
-                    minify: config.minify === true,
-                    write: true,
-                    plugins: [
-                        ...(config.loaders || []),
-                        {
-                            name: 'rebuild-notify',
-                            setup(build) {
-                                build.onEnd(result => {
-                                    console.log(`node build ended with ${result.errors.length} errors`);
-                                    // HERE: somehow restart the server from here, e.g., by sending a signal that you trap and react to inside the server.
-                                });
-                            }
-                        },
-                    ],
-                };
                 Promise.resolve(Promise.all([
                     ...this.getSecondaryEndpointsPoints("web")
                 ]
@@ -173,7 +148,7 @@ class ITProject {
                     const sourceFileName = sourceFileSplit[sourceFileSplit.length - 1];
                     const sourceFileNameMinusJs = sourceFileName.split(".").slice(0, -1).join(".");
                     const htmlFilePath = path_1.default.normalize(`${process.cwd()}/${config.outdir}/${sourceDir.join("/")}/${sourceFileNameMinusJs}.html`);
-                    const jsfilePath = `./${sourceFileNameMinusJs}.js`;
+                    const jsfilePath = `./${sourceFileNameMinusJs}.mjs`;
                     return fs_1.default.promises.mkdir(path_1.default.dirname(htmlFilePath), { recursive: true }).then(x => fs_1.default.writeFileSync(htmlFilePath, `
 <!DOCTYPE html>
 <html lang="en">
@@ -193,13 +168,57 @@ class ITProject {
 </html>
 `));
                 })));
+                const [nodeEntryPoints, webEntryPoints] = getRunnables(this.tests);
+                const esbuildConfigNode = {
+                    define: {
+                        "process.env.FLUENTFFMPEG_COV": "0"
+                    },
+                    absWorkingDir: process.cwd(),
+                    banner: {
+                        js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
+                    },
+                    target: "esnext",
+                    // packages: "external",
+                    format: "esm",
+                    splitting: true,
+                    outExtension: { '.js': '.mjs' },
+                    platform: "node",
+                    external: ["tests.test.js", "features.test.js"],
+                    outbase: config.outbase,
+                    outdir: config.outdir,
+                    jsx: 'transform',
+                    entryPoints: [...nodeEntryPoints],
+                    bundle: true,
+                    minify: config.minify === true,
+                    write: true,
+                    loader: {
+                        '.js': 'jsx',
+                        '.png': 'binary',
+                        '.jpg': 'binary',
+                    },
+                    plugins: [
+                        ...(config.plugins || []),
+                        {
+                            name: 'rebuild-notify',
+                            setup(build) {
+                                build.onEnd(result => {
+                                    console.log(`node build ended with ${result.errors.length} errors`);
+                                    // HERE: somehow restart the server from here, e.g., by sending a signal that you trap and react to inside the server.
+                                });
+                            }
+                        },
+                    ],
+                };
                 const esbuildConfigWeb = {
+                    // packages: "external",
+                    format: "esm",
+                    splitting: true,
+                    outExtension: { '.js': '.mjs' },
                     external: ["stream", "tests.test.js", "features.test.js"],
                     platform: "browser",
-                    format: "esm",
                     outbase: config.outbase,
                     outdir: config.outdir,
-                    jsx: `transform`,
+                    jsx: 'transform',
                     entryPoints: [
                         ...webEntryPoints,
                         testPath,
@@ -208,9 +227,13 @@ class ITProject {
                     bundle: true,
                     minify: config.minify === true,
                     write: true,
-                    splitting: true,
+                    loader: {
+                        '.js': 'jsx',
+                        '.png': 'binary',
+                        '.jpg': 'binary',
+                    },
                     plugins: [
-                        ...(config.loaders || []),
+                        ...(config.plugins || []),
                         {
                             name: 'rebuild-notify',
                             setup(build) {
@@ -220,21 +243,6 @@ class ITProject {
                                 });
                             }
                         },
-                        // {
-                        //   name: "testeranto-redirect",
-                        //   setup(build) {
-                        //     build.onResolve({ filter: /^.*\/testeranto\/$/ }, (args) => {
-                        //       return {
-                        //         path: path.join(
-                        //           process.cwd(),
-                        //           `..`,
-                        //           "node_modules",
-                        //           `testeranto`
-                        //         ),
-                        //       };
-                        //     });
-                        //   },
-                        // },
                     ],
                 };
                 esbuild_1.default.build({
@@ -332,15 +340,13 @@ class ITProject {
                             }
                         });
                     });
-                    const makePath = (fPath) => {
-                        const ext = path_1.default.extname(fPath);
-                        const x = "./" + config.outdir + "/" + fPath.replace(ext, "") + ".js";
-                        return path_1.default.resolve(x);
+                    const makePath = (fPath, rt) => {
+                        return path_1.default.resolve("./" + config.outdir + "/" + fPath.replace(path_1.default.extname(fPath), "") + ".mjs");
                     };
                     const bootInterval = setInterval(async () => {
                         const filesToLookup = this.tests
                             .map(([p, rt]) => {
-                            const filepath = makePath(p);
+                            const filepath = makePath(p, rt);
                             return {
                                 filepath,
                                 exists: (0, fs_promises_exists_1.default)(filepath),
@@ -368,7 +374,7 @@ class ITProject {
                             this
                                 .tests
                                 .reduce((m, [inputFilePath, runtime]) => {
-                                const script = makePath(inputFilePath);
+                                const script = makePath(inputFilePath, runtime);
                                 const partialTestResourceByCommandLineArg = `${script} '${JSON.stringify({
                                     name: inputFilePath,
                                     ports: [],
@@ -380,7 +386,7 @@ class ITProject {
                                     const fname = fileAsList[fileAsList.length - 1];
                                     const fnameOnly = fname.split(".").slice(0, -1).join(".");
                                     const htmlFile = [config.outdir, ...fileListHead, `${fnameOnly}.html`].join("/");
-                                    const jsFile = htmlFile.split(".html")[0] + ".js";
+                                    const jsFile = htmlFile.split(".html")[0] + ".mjs";
                                     console.log("watching", jsFile);
                                     pm2_1.default.start({
                                         script: `yarn electron node_modules/testeranto/dist/common/electron.js ${htmlFile} '${JSON.stringify({

package/dist/common/Web.js

@@ -14,13 +14,19 @@ exports.default = async (input, testSpecification, testImplementation, testInter
         function (b) {
             return b;
         }, window.NodeWriter);
-    const t = mrt[0];
+    const tl2 = mrt;
+    const t = tl2.testJobs[0];
     const testResourceArg = decodeURIComponent(new URLSearchParams(location.search).get('requesting') || '');
     try {
         const partialTestResource = JSON.parse(testResourceArg);
         if (partialTestResource.fs && partialTestResource.ports) {
-            const failed = await t.receiveTestResourceConfig(partialTestResource);
-            window.exit(failed);
+            // const failed = await t.receiveTestResourceConfig(partialTestResource);
+            // (window as any).exit(failed)
+            const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
+            Promise.all([...artifacts, logPromise]).then(async () => {
+                // process.exit(await failed ? 1 : 0);
+                window.exit(failed);
+            });
         }
         else {
             console.log("test configuration is incomplete", partialTestResource);
@@ -42,7 +48,11 @@ exports.default = async (input, testSpecification, testImplementation, testInter
                     const resourcesFromPm2 = msg.data.testResourceConfiguration;
                     const secondTestResource = Object.assign(Object.assign({ fs: "." }, JSON.parse(JSON.stringify(partialTestResource))), JSON.parse(JSON.stringify(resourcesFromPm2)));
                     console.log("secondTestResource", secondTestResource);
-                    const failed = await t.receiveTestResourceConfig(partialTestResource);
+                    const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource);
+                    Promise.all([...artifacts, logPromise]).then(async () => {
+                        // process.exit(await failed ? 1 : 0);
+                        window.exit(failed);
+                    });
                     webSocket.send(JSON.stringify({
                         type: "testeranto:adios",
                         data: {
@@ -59,6 +69,6 @@ exports.default = async (input, testSpecification, testImplementation, testInter
     }
     catch (e) {
         console.error(e);
-        process.exit(-1);
+        // process.exit(-1);
     }
 };

package/dist/common/core.js

@@ -245,6 +245,7 @@ class TesterantoLevelZero {
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 class TesterantoLevelOne {
     constructor(testImplementation, testSpecification, input, suiteKlasser, givenKlasser, whenKlasser, thenKlasser, checkKlasser, testResourceRequirement, logWriter) {
+        this.artifacts = [];
         const classySuites = Object.entries(testImplementation.Suites).reduce((a, [key], index) => {
             a[key] = (somestring, givens, checks) => {
                 return new suiteKlasser.prototype.constructor(somestring, index, givens, checks);
@@ -282,10 +283,12 @@ class TesterantoLevelOne {
         /* @ts-ignore:next-line */
         classyTesteranto.Suites(), classyTesteranto.Given(), classyTesteranto.When(), classyTesteranto.Then(), classyTesteranto.Check(), logWriter);
         const suiteRunner = (suite) => async (testResourceConfiguration, tLog) => {
-            return await suite.run(input, testResourceConfiguration, (fPath, value) => logWriter.testArtiFactoryfileWriter(tLog)(testResourceConfiguration.fs + "/" + fPath, value), tLog);
+            return await suite.run(input, testResourceConfiguration, (fPath, value) => logWriter.testArtiFactoryfileWriter(tLog, (p) => {
+                artifacts.push(p);
+            })(testResourceConfiguration.fs + "/" + fPath, value), tLog);
         };
-        /* @ts-ignore:next-line */
-        const toReturn = suites.map((suite) => {
+        const artifacts = this.artifacts;
+        this.testJobs = suites.map((suite) => {
             const runner = suiteRunner(suite);
             return {
                 test: suite,
@@ -306,21 +309,23 @@ class TesterantoLevelOne {
                     const suiteDone = await runner(testResourceConfiguration, tLog);
                     const resultsFilePath = (`${testResourceConfiguration.fs}/results.json`);
                     logWriter.writeFileSync(resultsFilePath, JSON.stringify(suiteDone.toObj(), null, 2));
-                    // logWriter.writeFileSync(
-                    //   `${testResourceConfiguration.fs}/results2.json`,
-                    //   JSON.stringify(suiteDone.givens, null, 2)
-                    // );
-                    access.close();
+                    const logPromise = new Promise((res, rej) => {
+                        access.on("finish", () => { res(true); });
+                    });
+                    access.end();
                     const numberOfFailures = Object.keys(suiteDone.givens).filter((k) => {
                         // console.log(`suiteDone.givens[k].error`, suiteDone.givens[k].error);
                         return suiteDone.givens[k].error;
                     }).length;
                     console.log(`exiting gracefully with ${numberOfFailures} failures.`);
-                    return numberOfFailures !== 0;
+                    return {
+                        failed: numberOfFailures,
+                        artifacts,
+                        logPromise
+                    };
                 },
             };
         });
-        return toReturn;
     }
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////

package/dist/common/electron.js

@@ -31,10 +31,10 @@ function createWindow() {
     });
     console.log("loading", u);
     win.loadURL(u);
-    win.webContents.openDevTools();
+    // win.webContents.openDevTools()
 }
 electron_1.app.on("ready", createWindow);
 electron_1.ipcMain.handle('quit-app', (x, failed) => {
     console.log("quit-app", failed);
-    electron_1.app.exit(failed ? 1 : 0);
+    electron_1.app.exit(failed);
 });