testeranto 0.9.21 → 0.10.1

package/README.md

@@ -1,5 +1,7 @@
 # testeranto
 
+![demo](testerantoDemo.gif)
+
 home: [adamwong246.github.io/testeranto](https://adamwong246.github.io/testeranto/)
 
 source: [github.com/adamwong246/testeranto](https://github.com/adamwong246/testeranto)

package/bin/build.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
 
-echo "testeranto build..."
-
-yarn nodemon --config nodemon.json ./node_modules/testeranto/src/build.js ../../../testeranto.config.json
+# yarn nodemon --config nodemon.json ./node_modules/testeranto/src/build.js ../../../testeranto.config.js
+ts-node  --swc  ./node_modules/testeranto/src/build.ts ../../../testeranto.config.ts

package/bin/report.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env sh
 
-# yarn nodemon --config nodemon.json ./node_modules/testeranto/src/build.ts testeranto.config.json
 cp ./node_modules/testeranto/dist/reporter.css ./dist/reporter.css
 cp ./node_modules/testeranto/dist/reporter.js ./dist/reporter.js
 cp ./node_modules/testeranto/dist/reporter.html ./dist/reporter.html

package/bin/watch.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env sh
 
-echo "testeranto watch..."
-
-yarn ts-node --transpile-only ./node_modules/testeranto/src/watch.ts testeranto.config.json
+yarn ts-node --swc ./node_modules/testeranto/src/watch.ts testeranto.config.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testeranto",
   "description": "teeny tiny tightly-typed typescript tests",
-  "version": "0.9.21",
+  "version": "0.10.1",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "repository": "git@github.com:adamwong246/testeranto.git",
@@ -28,26 +28,27 @@
     "tableflip": "yarn clean && yarn bundle:reporter"
   },
   "dependencies": {
-    "@types/react-dom": "^18.0.6",
+    "@swc/core": "^1.3.26",
     "@types/react": "^18.0.21",
-    "babel-loader": "^8.2.5",
-    "eslint-plugin-react": "^7.31.11",
-    "nodemon": "^2.0.20",
-    "react-dom": "^18.2.0",
-    "react-redux": "^8.0.4",
-    "react-test-renderer": "^18.2.0",
-    "react": "18.2.0",
+    "@types/react-dom": "^18.0.6",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
     "@typescript-eslint/parser": "^5.46.0",
+    "babel-loader": "^8.2.5",
     "bootstrap": "^5.2.3",
     "cancelable-promise": "^4.3.1",
-    "esbuild": "^0.16.5",
+    "esbuild": "0.17.5",
     "eslint": "^8.29.0",
+    "eslint-plugin-react": "^7.31.11",
     "fresh-require": "^1.0.3",
+    "graphology": "^0.25.1",
     "graphology-dag": "^0.2.0",
     "graphology-types": "^0.24.5",
-    "graphology": "^0.25.1",
+    "nodemon": "^2.0.20",
+    "react": "18.2.0",
     "react-bootstrap": "^2.7.0",
+    "react-dom": "^18.2.0",
+    "react-redux": "^8.0.4",
+    "react-test-renderer": "^18.2.0",
     "ts-node": "^10.9.1",
     "typescript": "4.8.2"
   }

package/src/Report.tsx

@@ -31,7 +31,7 @@ export function Report() {
 
   const getData = async () => {
 
-    const configs = await (await fetch('testeranto.config.json')).json();
+    const configs = await (await fetch('testeranto.config.js')).json();
     const features = await (await fetch('TesterantoFeatures.json')).json();
     const featureTests = await (await fetch('results/featureTestJoin.json')).json();
     const summaries = await (await fetch('report.json')).json();

package/src/build.ts

@@ -0,0 +1,79 @@
+import * as esbuild from 'esbuild';
+
+import fs from "fs";
+import path from "path";
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const createHash = require("node:crypto").createHash;
+
+console.log("build.sh", process.cwd(), process.argv);
+
+import(process.argv[2]).then(async (testerantoConfigImport) => {
+
+  const testerantoConfig = testerantoConfigImport.default;
+
+  console.log("testerantoConfig", testerantoConfig)
+
+  const entryPoints = [
+    testerantoConfig.features,
+    ...testerantoConfig.tests.map(([key, sourcefile, className]) => {
+      return sourcefile
+    })
+  ];
+
+  console.log("entryPoints", entryPoints)
+
+  let ctx = await esbuild.context({
+    entryPoints,
+    bundle: true,
+    minify: false,
+    format: "esm",
+    target: ["esnext"],
+    write: true,
+    outdir: 'dist/tests',
+    packages: 'external',
+    plugins: [
+
+      {
+        name: 'import-path',
+        setup(build) {
+          build.onResolve({ filter: /^\.{1,2}\// }, args => {
+
+            const importedPath = args.resolveDir + "/" + args.path;
+            const absolutePath = path.resolve(importedPath);
+
+            const absolutePath2 = path.resolve(testerantoConfig.features).split(".ts").slice(0, -1).join('.ts');
+
+            if (absolutePath === absolutePath2) {
+              return {
+                path: process.cwd() + "/dist/tests/testerantoFeatures.test.js",
+                external: true
+              }
+            } else {
+              // return {
+              //   path: path.resolve(importedPath), external: false
+              // }
+            }
+          })
+        },
+      },
+
+      ...testerantoConfig.loaders || [],
+
+    ],
+    external: [
+      testerantoConfig.features
+    ]
+  })
+
+  await ctx.watch()
+
+
+  let { host, port } = await ctx.serve({
+    servedir: 'dist',
+  })
+
+  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+  fs.promises.writeFile("./dist/testeranto.config.js", JSON.stringify(testerantoConfig));
+
+})

package/src/lib/Scheduler.ts

@@ -59,22 +59,29 @@ export class Scheduler {
     }, TIMEOUT);
   }
 
-  public testFileTouched(key, distFile, className, hash) {
-    if (hash !== this.testSrcMd5s[key]) {
-      console.log("running", key);
-      this.testSrcMd5s[key] = hash;
-      this.push(new (fresh(distFile, require)[className])()[0], key);
-    }
+  public async testFileTouched(key, distFile, className) {
+    // if (hash !== this.testSrcMd5s[key]) {
+    //   console.log("running", key);
+    //   this.testSrcMd5s[key] = hash;
+    //   this.push(new (fresh(distFile, require)[className])()[0], key);
+    // }
+    console.log(key, distFile, className)
+
+    const x = await fresh(distFile, require)[className]
+    console.log()
+
+    this.push(new (x)()[0], key);
   }
 
-  public featureFileTouched(distFile, hash) {
-    if (hash !== this.featureSrcMd5) {
-      console.log("running featureSrcMd5");
-      this.featureSrcMd5 = hash;
-      this.setFeatures((fresh(distFile, require)['default']));
-    } else {
-      console.log("feature file changed but md5 hash did not")
-    }
+  public featureFileTouched(distFile) {
+    this.setFeatures((fresh(distFile, require)['default']));
+    // if (hash !== this.featureSrcMd5) {
+    //   console.log("running featureSrcMd5");
+    //   this.featureSrcMd5 = hash;
+    //   this.setFeatures((fresh(distFile, require)['default']));
+    // } else {
+    //   console.log("feature file changed but md5 hash did not")
+    // }
   }
 
   private async setFeatures(testerantoFeatures: TesterantoFeatures) {

package/src/watch.ts

@@ -10,7 +10,8 @@ const configFile = `${process.cwd()}/${process.argv[2]}`;
 
 console.log("watch.ts configFile", configFile);
 
-import(configFile).then((configModule) => {
+import(configFile).then((testerantoConfigImport) => {
+  const configModule = testerantoConfigImport.default;
 
   console.log("build.ts tProject", configModule);
   const tProject = new TesterantoProject(configModule.tests, configModule.features, configModule.ports)
@@ -21,45 +22,54 @@ import(configFile).then((configModule) => {
   (async function () {
     for await (const [ndx, [key, sourcefile, className]] of tProject.tests.entries()) {
       const distFile = process.cwd() + "/dist/" + sourcefile.split(".ts")[0] + ".js";
-      const md5File = process.cwd() + "/dist/" + sourcefile.split(".ts")[0] + ".md5";
+      // const md5File = process.cwd() + "/dist/" + sourcefile.split(".ts")[0] + ".md5";
 
-      fs.readFile(md5File, 'utf-8', (err, firstmd5hash) => {
-        TRM.testFileTouched(key, distFile, className, firstmd5hash);
+      // fs.readFile(md5File, 'utf-8', (err, firstmd5hash) => {
+      //   TRM.testFileTouched(key, distFile, className, firstmd5hash);
 
-        watchFile(md5File, () => {
-          fs.readFile(md5File, 'utf-8', (err, newmd5Hash) => {
-            if (err) {
-              console.error(err)
-              process.exit(-1)
-            }
+      watchFile(distFile, () => {
+        TRM.testFileTouched(key, distFile, className);
 
-            TRM.testFileTouched(key, distFile, className, newmd5Hash);
-          })
-        });
+        // fs.readFile(distFile, 'utf-8', (err, newmd5Hash) => {
+        //   if (err) {
+        //     console.error(err)
+        //     process.exit(-1)
+        //   }
+
+        //   TRM.testFileTouched(key, distFile, className);
+        // })
       });
+      // });
+
+      TRM.testFileTouched(key, distFile, className);
+
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////
 
     const featureFile = tProject.features;
     const distFile = process.cwd() + "/dist/" + featureFile.split(".ts")[0] + ".js";
-    const md5File = process.cwd() + "/dist/" + featureFile.split(".ts")[0] + ".md5";
-
-    fs.readFile(featureFile, 'utf-8', (err, featuresFileContents) => {
-      TRM.featureFileTouched(distFile, featuresFileContents);
-
-      watchFile(md5File, () => {
-        fs.readFile(md5File, 'utf-8', (err, newmd5Hash) => {
-          if (err) {
-            console.error(err)
-            process.exit(-1)
-          }
-
-          TRM.featureFileTouched(distFile, newmd5Hash);
-        })
-      });
+    // const md5File = process.cwd() + "/dist/" + featureFile.split(".ts")[0] + ".md5";
+
+    TRM.featureFileTouched(distFile);
+    // fs.readFile(featureFile, 'utf-8', (err, featuresFileContents) => {
+    //   TRM.featureFileTouched(distFile);
+
+    watchFile(distFile, () => {
+      TRM.featureFileTouched(distFile);
+      // fs.readFile(distFile, 'utf-8', (err, newContents) => {
+      //   if (err) {
+      //     console.error(err)
+      //     process.exit(-1)
+      //   }
+
+      //   TRM.featureFileTouched(distFile);
+      // })
     });
 
+    //   // TRM.featureFileTouched(distFile);
+    // });
+
 
 
     TRM.launch();

package/src/build.js

@@ -1,88 +0,0 @@
-// /* eslint-disable no-undef */
-/* eslint-disable @typescript-eslint/no-var-requires */
-
-const esbuild = require("esbuild");
-const fs = require("fs");
-const path = require("path");
-const createHash = require("node:crypto").createHash;
-
-console.log("hello build.sh", process.cwd(), process.argv);
-
-const testerantoConfig = require(process.argv[2]);
-
-fs.promises.writeFile("./dist/testeranto.config.json", JSON.stringify(testerantoConfig));
-
-esbuild.build({
-  entryPoints: [testerantoConfig.features],
-  bundle: true,
-  minify: false,
-  format: "esm",
-  target: ["esnext"],
-  write: false,
-  packages: 'external',
-}).then((res) => {
-  const text = res.outputFiles[0].text;
-  const hash = createHash('md5').update(text).digest('hex');
-  const jsFile = process.cwd() + "/dist/tests/testerantoFeatures.test.js";
-  const md5File = process.cwd() + "/dist/tests/testerantoFeatures.test.md5";
-
-  fs.promises.mkdir(path.dirname(process.cwd() + "./dist/tests/"), { recursive: true }).then(x => {
-    console.log("build.js feature", hash, jsFile);
-
-    fs.promises.writeFile(jsFile, text);
-    fs.promises.writeFile(md5File, hash)
-  })
-});
-
-/////////////////////////////////////////////////////////////////////////////////
-
-testerantoConfig.tests.forEach(([key, sourcefile, className]) => {
-  esbuild.build({
-    entryPoints: [sourcefile],
-    bundle: true,
-    minify: false,
-    format: "esm",
-    target: ["esnext"],
-    write: false,
-    packages: 'external',
-    plugins: [{
-      name: 'import-path',
-      setup(build) {
-        build.onResolve({ filter: /^\.{1,2}\// }, args => {
-
-          const importedPath = args.resolveDir + "/" + args.path;
-          const absolutePath = path.resolve(importedPath);
-
-          const absolutePath2 = path.resolve(testerantoConfig.features).split(".ts").slice(0, -1).join('.ts');
-
-          if (absolutePath === absolutePath2) {
-            return {
-              path: process.cwd() + "/dist/tests/testerantoFeatures.test.js",
-              external: true
-            }
-          } else {
-            // return {
-            //   path: path.resolve(importedPath), external: false
-            // }
-          }
-        })
-      },
-    }],
-    external: [
-      testerantoConfig.features
-    ],
-  }).then((res) => {
-
-    const text = res.outputFiles[0].text;
-
-    const pp = "./dist/" + (sourcefile.split(process.cwd()).pop()).split(".ts")[0] + '.js';
-    const xx = "./dist/" + (sourcefile.split(process.cwd()).pop()).split(".ts")[0] + `.md5`;
-
-    fs.promises.mkdir(path.dirname(pp), { recursive: true }).then(x => {
-      const hash = createHash('md5').update(text).digest('hex');
-      console.log("build.js test", key, hash);
-      fs.promises.writeFile(pp, text);
-      fs.promises.writeFile(xx, hash);
-    })
-  })
-});