testeranto 0.79.36 → 0.79.38

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testeranto",
   "description": "teeny tiny tightly-typed typescript tests",
-  "version": "0.79.36",
+  "version": "0.79.38",
   "engines": {
     "node": "18.18.0"
   },

package/src/Project.ts

@@ -6,11 +6,7 @@ import { glob } from "glob";
 
 import esbuildNodeConfiger from "./esbuildConfigs/node.js";
 import esbuildWebConfiger from "./esbuildConfigs/web.js";
-// import esbuildFeaturesConfiger from "./esbuildConfigs/features.js";
-
 import webHtmlFrame from "./web.html.js";
-// import reportHtmlFrame from "./report.html.js";
-
 import { ITestTypes, IBaseConfig, IRunTime } from "./lib/types.js";
 
 var mode: "DEV" | "PROD" = process.argv[2] === "-dev" ? "DEV" : "PROD";
@@ -26,17 +22,9 @@ process.stdin.on("keypress", (str, key) => {
   }
 });
 
-// setInterval(() => {
-//   const memoryUsage = process.memoryUsage();
-//   console.log("Memory usage:", memoryUsage);
-// }, 10000); // Check every 10 seconds
-
 let nodeDone,
   webDone = false;
-const onFeaturesDone = () => {
-  // featuresDone = true;
-  onDone();
-};
+
 const onNodeDone = () => {
   nodeDone = true;
   onDone();
@@ -50,7 +38,6 @@ const onDone = () => {
   console.log(
     JSON.stringify(
       {
-        // featuresDone,
         nodeDone,
         webDone,
         mode,
@@ -71,15 +58,15 @@ export class ITProject {
   config: IBaseConfig;
   mode: `up` | `down` = `up`;
 
-  constructor(config: IBaseConfig) {
-    this.config = config;
+  constructor(configs: IBaseConfig) {
+    this.config = configs;
 
     fs.writeFileSync(
-      `${config.outdir}/testeranto.json`,
+      `${this.config.outdir}/testeranto.json`,
       JSON.stringify(
         {
-          ...config,
-          buildDir: process.cwd() + "/" + config.outdir,
+          ...this.config,
+          buildDir: process.cwd() + "/" + this.config.outdir,
         },
         null,
         2
@@ -99,7 +86,7 @@ export class ITProject {
               .join(".");
 
             const htmlFilePath = path.normalize(
-              `${process.cwd()}/${config.outdir}/web/${sourceDir.join(
+              `${process.cwd()}/${this.config.outdir}/web/${sourceDir.join(
                 "/"
               )}/${sourceFileNameMinusJs}.html`
             );
@@ -146,17 +133,17 @@ export class ITProject {
     //   });
     // });
 
-    glob(`./${config.outdir}/chunk-*.mjs`, { ignore: "node_modules/**" }).then(
-      (chunks) => {
-        chunks.forEach((chunk) => {
-          fs.unlinkSync(chunk);
-        });
-      }
-    );
+    glob(`./${this.config.outdir}/chunk-*.mjs`, {
+      ignore: "node_modules/**",
+    }).then((chunks) => {
+      chunks.forEach((chunk) => {
+        fs.unlinkSync(chunk);
+      });
+    });
 
     Promise.all([
       esbuild
-        .context(esbuildNodeConfiger(config, nodeEntryPoints))
+        .context(esbuildNodeConfiger(this.config, nodeEntryPoints))
         .then(async (nodeContext) => {
           if (mode == "DEV") {
             await nodeContext.watch().then((v) => {
@@ -171,7 +158,7 @@ export class ITProject {
           return nodeContext;
         }),
       esbuild
-        .context(esbuildWebConfiger(config, webEntryPoints))
+        .context(esbuildWebConfiger(this.config, webEntryPoints))
         .then(async (webContext) => {
           if (mode == "DEV") {
             await webContext.watch().then((v) => {

package/src/Puppeteer.ts

@@ -25,23 +25,25 @@ process.stdin.on("keypress", (str, key) => {
   }
 });
 
-export default async (configs) => {
+export default async (partialConfig) => {
+  const config = {
+    ...partialConfig,
+    buildDir: process.cwd() + "/" + partialConfig.outdir,
+  };
+
   fs.writeFileSync(
-    `${configs.outdir}/testeranto.json`,
+    `${config.outdir}/testeranto.json`,
     JSON.stringify(
       {
-        ...configs,
-        buildDir: process.cwd() + "/" + configs.outdir,
+        ...config,
+        buildDir: process.cwd() + "/" + config.outdir,
       },
       null,
       2
     )
   );
-  // const configs = jsonc.parse(
-  //   (await fs.readFileSync("./docs/testeranto.json")).toString()
-  // ) as IBuiltConfig;
 
-  const pm = new PM_Main(configs);
+  const pm = new PM_Main(config);
 
   await pm.startPuppeteer(
     {
@@ -84,25 +86,25 @@ export default async (configs) => {
     "."
   );
 
-  configs.tests.forEach(([test, runtime, tr, sidecars]) => {
+  config.tests.forEach(([test, runtime, tr, sidecars]) => {
     if (runtime === "node") {
-      pm.launchNode(test, destinationOfRuntime(test, "node", configs));
+      pm.launchNode(test, destinationOfRuntime(test, "node", config));
     } else if (runtime === "web") {
-      pm.launchWeb(test, destinationOfRuntime(test, "web", configs), sidecars);
+      pm.launchWeb(test, destinationOfRuntime(test, "web", config), sidecars);
     } else {
       console.error("runtime makes no sense", runtime);
     }
   });
 
-  console.log("ready and watching for changes...", configs.buildDir);
+  console.log("ready and watching for changes...", config.buildDir);
   fs.watch(
-    configs.buildDir,
+    config.buildDir,
     {
       recursive: true,
     },
     (eventType, changedFile) => {
       if (changedFile) {
-        configs.tests.forEach(([test, runtime, tr, sidecars]) => {
+        config.tests.forEach(([test, runtime, tr, sidecars]) => {
           if (eventType === "change" || eventType === "rename") {
             if (
               changedFile ===
@@ -113,7 +115,7 @@ export default async (configs) => {
                 .concat("mjs")
                 .join(".")
             ) {
-              pm.launchNode(test, destinationOfRuntime(test, "node", configs));
+              pm.launchNode(test, destinationOfRuntime(test, "node", config));
             }
 
             if (
@@ -127,7 +129,7 @@ export default async (configs) => {
             ) {
               pm.launchWeb(
                 test,
-                destinationOfRuntime(test, "web", configs),
+                destinationOfRuntime(test, "web", config),
                 sidecars
               );
             }

package/src/TaskManBackEnd.ts

@@ -73,17 +73,15 @@ function listToTree(fileList) {
   return root.children;
 }
 
-export default (config: IBaseConfig) => {
+export default (partialConfig: IBaseConfig) => {
+  const config = {
+    ...partialConfig,
+    buildDir: process.cwd() + "/" + partialConfig.outdir,
+  };
+
   fs.writeFileSync(
     `${config.outdir}/testeranto.json`,
-    JSON.stringify(
-      {
-        ...config,
-        buildDir: process.cwd() + "/" + config.outdir,
-      },
-      null,
-      2
-    )
+    JSON.stringify(config, null, 2)
   );
 
   const app = express();
@@ -137,10 +135,10 @@ export default (config: IBaseConfig) => {
       //   );
       // });
 
-      app.get("/testeranto.json", (req, res) => {
-        res.sendFile(`${process.cwd()}/docs/testeranto.json`);
-        // res.json(config);
-      });
+      // app.get("/testeranto.json", (req, res) => {
+      //   // res.sendFile(`${process.cwd()}/docs/testeranto.json`);
+      //   res.json(config);
+      // });
 
       app.get("/", (req, res) => {
         res.send(`<!DOCTYPE html>
@@ -210,7 +208,7 @@ export default (config: IBaseConfig) => {
         });
       });
 
-      app.use("/docs", express.static(path.join(process.cwd(), "docs")));
+      app.use("/", express.static(path.join(process.cwd())));
 
       app.get("/docGal/fs.json", (req, res) => {
         const directoryPath = "./"; // Replace with the desired directory path