testeranto 0.82.0 → 0.85.0

package/dist/common/src/Puppeteer.js

@@ -8,14 +8,9 @@ const fs_1 = __importDefault(require("fs"));
 const recursive_watch_1 = __importDefault(require("recursive-watch"));
 const main_js_1 = require("./PM/main.js");
 const utils_js_1 = require("./utils.js");
-// var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
-// const node2web: Record<string, string[]> = {};
-// const web2node: Record<string, string[]> = {};
-// const childProcesses: Record<string, "loaded" | "running" | "done"> = {};
 readline_1.default.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY)
     process.stdin.setRawMode(true);
-// let shutDownMode = false;
 exports.default = async (partialConfig) => {
     const config = Object.assign(Object.assign({}, partialConfig), { buildDir: process.cwd() + "/" + partialConfig.outdir });
     fs_1.default.writeFileSync(`${config.outdir}/testeranto.json`, JSON.stringify(Object.assign(Object.assign({}, config), { buildDir: process.cwd() + "/" + config.outdir }), null, 2));
@@ -29,9 +24,11 @@ exports.default = async (partialConfig) => {
         headless: true,
         dumpio: true,
         // timeout: 0,
+        devtools: true,
         args: [
-            // "--auto-open-devtools-for-tabs",
-            "--disable-features=IsolateOrigins,site-per-process",
+            "--auto-open-devtools-for-tabs",
+            `--remote-debugging-port=3234`,
+            // "--disable-features=IsolateOrigins,site-per-process",
             "--disable-site-isolation-trials",
             "--allow-insecure-localhost",
             "--allow-file-access-from-files",
@@ -54,18 +51,21 @@ exports.default = async (partialConfig) => {
             // "--single-process",
             // "--unsafely-treat-insecure-origin-as-secure",
             // "--unsafely-treat-insecure-origin-as-secure=ws://192.168.0.101:3234",
-            `--remote-debugging-port=3234`,
             // "--disk-cache-dir=/dev/null",
             // "--disk-cache-size=1",
             // "--start-maximized",
         ],
     }, ".");
-    console.log("\n Puppeteer is running. Press 'q' to quit\n");
+    console.log("\n Puppeteer is running. Press 'q' to shutdown softly. Press 'x' to shutdown forcefully.\n");
     process.stdin.on("keypress", (str, key) => {
         if (key.name === "q") {
             pm.shutDown();
             // process.exit();
         }
+        if (key.name === "x") {
+            // pm.shutDown();
+            process.exit(-1);
+        }
     });
     config.tests.forEach(([test, runtime, tr, sidecars]) => {
         if (runtime === "node") {
@@ -110,46 +110,4 @@ exports.default = async (partialConfig) => {
     else {
         pm.shutDown();
     }
-    // pm.browser.close();
-    // does not work on linux
-    // fs.watch(
-    //   config.buildDir,
-    //   {
-    //     recursive: true,
-    //   },
-    //   (eventType, changedFile) => {
-    //     if (changedFile) {
-    //       config.tests.forEach(([test, runtime, tr, sidecars]) => {
-    //         if (eventType === "change" || eventType === "rename") {
-    //           if (
-    //             changedFile ===
-    //             test
-    //               .replace("./", "node/")
-    //               .split(".")
-    //               .slice(0, -1)
-    //               .concat("mjs")
-    //               .join(".")
-    //           ) {
-    //             pm.launchNode(test, destinationOfRuntime(test, "node", config));
-    //           }
-    //           if (
-    //             changedFile ===
-    //             test
-    //               .replace("./", "web/")
-    //               .split(".")
-    //               .slice(0, -1)
-    //               .concat("mjs")
-    //               .join(".")
-    //           ) {
-    //             pm.launchWeb(
-    //               test,
-    //               destinationOfRuntime(test, "web", config),
-    //               sidecars
-    //             );
-    //           }
-    //         }
-    //       });
-    //     }
-    //   }
-    // );
 };

package/dist/common/src/SubPackages/react-dom/jsx/web.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
 const react_2 = require("react");
-const client_1 = __importDefault(require("react-dom/client"));
+const react_dom_1 = __importDefault(require("react-dom"));
 const Web_js_1 = __importDefault(require("../../../Web.js"));
 const TesterantoComponent = ({ done, innerComp, }) => {
     const myContainer = (0, react_1.useRef)(null);
@@ -44,7 +44,7 @@ exports.default = (testImplementations, testSpecifications, testInput) => {
             return await new Promise((resolve, rej) => {
                 const htmlElement = document.getElementById("root");
                 if (htmlElement) {
-                    const domRoot = client_1.default.createRoot(htmlElement);
+                    const domRoot = react_dom_1.default.createRoot(htmlElement);
                     domRoot.render((0, react_2.createElement)(TesterantoComponent, {
                         // ...initialProps,
                         innerComp: reactElement,
@@ -84,17 +84,17 @@ exports.default = (testImplementations, testSpecifications, testInput) => {
             });
         },
         andWhen: function (s, whenCB, tr, utils) {
-            return new Promise((resolve, rej) => {
-                console.log("mark9", s, whenCB);
-                resolve(whenCB(s, utils));
-                // process.nextTick(() => {
-                //   resolve(whenCB()(s));
-                // });
-            });
+            return whenCB(s, utils);
+            // return new Promise(async (resolve, rej) => {
+            //   // resolve(await whenCB(s, utils));
+            //   // process.nextTick(() => {
+            //   //   resolve(whenCB()(s));
+            //   // });
+            // });
         },
-        butThen: async function (s, thenCB) {
+        butThen: async function (s, thenCB, tr, utils) {
             return new Promise((resolve, rej) => {
-                resolve(thenCB(s));
+                resolve(thenCB(s, utils));
             });
         },
         afterEach: async function (store, ndx, artificer) {

package/dist/common/src/Web.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebTesteranto = void 0;
 const web_1 = require("./PM/web");
 const core_js_1 = __importDefault(require("./lib/core.js"));
 const index_js_1 = require("./lib/index.js");
@@ -38,6 +39,7 @@ class WebTesteranto extends core_js_1.default {
         // });
     }
 }
+exports.WebTesteranto = WebTesteranto;
 exports.default = async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = index_js_1.defaultTestResourceRequirement) => {
     return new WebTesteranto(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
 };

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

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+exports.default = {
+    name: "feature-markdown",
+    setup(build) {
+        build.onResolve({ filter: /\.md$/ }, (args) => {
+            if (args.resolveDir === "")
+                return;
+            return {
+                path: path_1.default.isAbsolute(args.path)
+                    ? args.path
+                    : path_1.default.join(args.resolveDir, args.path),
+                namespace: "feature-markdown",
+            };
+        });
+        build.onLoad({ filter: /.*/, namespace: "feature-markdown" }, async (args) => {
+            // const markdownContent = new TextDecoder().decode(
+            //   await fs.readFileSync(args.path)
+            // );
+            // markdownHTML = marked(markdownContent, options?.markedOptions);
+            return {
+                contents: `file://${args.path}`,
+                loader: "text",
+                // contents: JSON.stringify({ path: args.path }),
+                // loader: "json",
+                // contents: JSON.stringify({
+                //   // html: markdownHTML,
+                //   raw: markdownContent,
+                //   filename: args.path, //path.basename(args.path),
+                // }),
+                // loader: "json",
+            };
+        });
+    },
+};

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

@@ -5,52 +5,73 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const otherInputs = {};
+const register = (entrypoint, sources) => {
+    console.log("register", entrypoint, sources);
+    if (!otherInputs[entrypoint]) {
+        otherInputs[entrypoint] = new Set();
+    }
+    sources.forEach((s) => otherInputs[entrypoint].add(s));
+};
+function tree(meta, key) {
+    return [
+        key,
+        ...meta.inputs[key].imports
+            .filter((x) => x.external !== true)
+            .filter((x) => x.path.split("/")[0] !== "node_modules")
+            .map((f) => f.path),
+    ];
+}
 exports.default = (platform, entryPoints) => {
     return {
-        name: "metafileWriter",
-        setup(build) {
-            build.onEnd((result) => {
-                if (result.errors.length === 0) {
-                    entryPoints.forEach((entryPoint) => {
-                        const filePath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `inputFiles.json`);
-                        const promptPath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `prompt.txt`);
-                        const testPaths = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `tests.json`);
-                        const featuresPath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `features.json`);
-                        const dirName = path_1.default.dirname(filePath);
-                        if (!fs_1.default.existsSync(dirName)) {
-                            fs_1.default.mkdirSync(dirName, { recursive: true });
-                        }
-                        const j = Object.keys(Object.keys(result.metafile.outputs)
-                            .filter((s) => {
-                            if (!result.metafile.outputs[s].entryPoint) {
-                                return false;
+        register,
+        inputFilesPluginFactory: {
+            name: "metafileWriter",
+            setup(build) {
+                build.onEnd((result) => {
+                    fs_1.default.writeFileSync(`docs/${platform}/metafile.json`, JSON.stringify(result, null, 2));
+                    if (result.errors.length === 0) {
+                        entryPoints.forEach((entryPoint) => {
+                            const filePath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `inputFiles.json`);
+                            const dirName = path_1.default.dirname(filePath);
+                            if (!fs_1.default.existsSync(dirName)) {
+                                fs_1.default.mkdirSync(dirName, { recursive: true });
                             }
-                            return (path_1.default.resolve(result.metafile.outputs[s].entryPoint) ===
-                                path_1.default.resolve(entryPoint));
-                        })
-                            .reduce((mm, el) => {
-                            mm.push(result.metafile.outputs[el].inputs);
-                            return mm;
-                        }, [])[0]).filter((f) => {
-                            const regex = /^src\/.*/g;
-                            const matches = f.match(regex);
-                            const passes = (matches === null || matches === void 0 ? void 0 : matches.length) === 1;
-                            return passes;
-                        });
-                        fs_1.default.writeFileSync(filePath, JSON.stringify(j));
-                        fs_1.default.writeFileSync(promptPath, `
-${j
-                            .map((x) => {
-                            return `/add ${x}`;
-                        })
-                            .join("\n")}
+                            const promptPath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `prompt.txt`);
+                            const testPaths = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `tests.json`);
+                            const featuresPath = path_1.default.join("./docs/", platform, entryPoint.split(".").slice(0, -1).join("."), `featurePrompt.txt`); // /read ${featuresPath}
+                            if (result.metafile) {
+                                const addableFiles = tree(result.metafile, entryPoint.split("/").slice(1).join("/"))
+                                    .map((y) => {
+                                    if (otherInputs[y]) {
+                                        return Array.from(otherInputs[y]);
+                                    }
+                                    return y;
+                                })
+                                    .flat();
+                                fs_1.default.writeFileSync(promptPath, `
+${[...addableFiles]
+                                    .map((x) => {
+                                    return `/add ${x}`;
+                                })
+                                    .join("\n")}
+${[...addableFiles]
+                                    .map((x) => {
+                                    const f = `docs/ts/${x}.type_errors.txt`;
+                                    if (fs_1.default.existsSync(f)) {
+                                        return `/read ${f}`;
+                                    }
+                                })
+                                    .join("\n")}
 /read ${testPaths}
-/read ${featuresPath}
-/code fix the failing tests described in ${testPaths}.
+/load ${featuresPath}
+/code Fix the failing tests described in ${testPaths}. Correct any type signature errors. Implement any method which throws "Function not implemented."
 `);
-                    });
-                }
-            });
+                            }
+                        });
+                    }
+                });
+            },
         },
     };
 };

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

@@ -5,7 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = __importDefault(require("./index.js"));
 const inputFilesPlugin_js_1 = __importDefault(require("./inputFilesPlugin.js"));
+const featuresPlugin_1 = __importDefault(require("./featuresPlugin"));
 exports.default = (config, entryPoints) => {
+    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("node", entryPoints);
+    // const inputFilesPluginFactory = inputFilesPlugin("node", entryPoints);
+    // const register = (x) => x;
     return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { splitting: true, outdir: config.outdir + "/node", 
         // inject: [`./node_modules/testeranto/dist/cjs-shim.js`],
         metafile: true, supported: {
@@ -17,13 +21,16 @@ exports.default = (config, entryPoints) => {
         }, platform: "node", external: [
             // "testeranto.json",
             // "features.test.js",
-            // "react",
+            "react",
             // "events",
             // "ganache"
             ...config.externals,
         ], entryPoints: [...entryPoints], plugins: [
-            ...(config.nodePlugins || []),
-            (0, inputFilesPlugin_js_1.default)("node", entryPoints),
+            featuresPlugin_1.default,
+            // markdownPlugin({}),
+            ...(config.nodePlugins.map((p) => p(register, entryPoints)) || []),
+            inputFilesPluginFactory,
+            // inputFilesPlugin("node", entryPoints),
             {
                 name: "rebuild-notify",
                 setup(build) {

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

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const index_js_1 = __importDefault(require("./index.js"));
 const inputFilesPlugin_js_1 = __importDefault(require("./inputFilesPlugin.js"));
+const featuresPlugin_js_1 = __importDefault(require("./featuresPlugin.js"));
 exports.default = (config, entryPoints) => {
+    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("web", entryPoints);
     return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { 
         // inject: ["./node_modules/testeranto/dist/cjs-shim.js"],
         // banner: {
@@ -38,8 +40,10 @@ exports.default = (config, entryPoints) => {
             "process",
             "dns",
         ], platform: "browser", entryPoints: [...entryPoints], plugins: [
-            ...(config.webPlugins || []),
-            (0, inputFilesPlugin_js_1.default)("web", entryPoints),
+            featuresPlugin_js_1.default,
+            // markdownPlugin({}),
+            ...(config.nodePlugins.map((p) => p(register, entryPoints)) || []),
+            inputFilesPluginFactory,
             {
                 name: "rebuild-notify",
                 setup(build) {