testeranto 0.49.9 → 0.62.0

package/package.json

@@ -1,102 +1,118 @@
 {
   "name": "testeranto",
   "description": "teeny tiny tightly-typed typescript tests",
-  "version": "0.49.9",
+  "version": "0.62.0",
   "type": "module",
   "types": "./dist/index.d.mts",
   "module": "dist/module/index.js",
   "exports": {
-    "./src/subPackages/react/jsx/index": {
-      "import": "./dist/module/subPackages/react/jsx/index.js",
-      "require": "./dist/common/subPackages/react/jsx/index.js"
+    "./src/cjs-shim.ts": {
+      "import": "./dist/cjs-shim.js",
+      "require": "./dist/cjs-shim.js"
     },
-    "./src/subPackages/react/jsx/web": {
-      "import": "./dist/module/subPackages/react/jsx/web.js",
-      "require": "./dist/common/subPackages/react/jsx/web.js"
+    "./src/SubPackages/puppeteer": {
+      "import": "./dist/module/SubPackages/puppeteer.js",
+      "require": "./dist/common/SubPackages/puppeteer.js"
     },
-    "./src/subPackages/react/jsx/node": {
-      "import": "./dist/module/subPackages/react/jsx/node.js",
-      "require": "./dist/common/subPackages/react/jsx/node.js"
+    "./src/SubPackages/react/jsx/index": {
+      "import": "./dist/module/SubPackages/react/jsx/index.js",
+      "require": "./dist/common/SubPackages/react/jsx/index.js"
     },
-    "./src/subPackages/react/component/index": {
-      "import": "./dist/module/subPackages/react/component/index.js",
-      "require": "./dist/common/subPackages/react/component/index.js"
+    "./src/SubPackages/react/jsx/web": {
+      "import": "./src/SubPackages/react/jsx/web.ts",
+      "require": "./src/SubPackages/react/jsx/web.ts"
     },
-    "./src/subPackages/react/component/web": {
-      "import": "./dist/module/subPackages/react/component/web.js",
-      "require": "./dist/common/subPackages/react/component/web.js"
+    "./src/SubPackages/react/jsx/node": {
+      "import": "./dist/module/SubPackages/react/jsx/node.js",
+      "require": "./dist/common/SubPackages/react/jsx/node.js"
     },
-    "./src/subPackages/react/component/node": {
-      "import": "./dist/module/subPackages/react/component/node.js",
-      "require": "./dist/common/subPackages/react/component/node.js"
+    "./src/SubPackages/react/component/index": {
+      "import": "./dist/module/SubPackages/react/component/index.js",
+      "require": "./dist/common/SubPackages/react/component/index.js"
     },
-    "./src/subPackages/react-test-renderer/component/index": {
-      "import": "./dist/module/subPackages/react-test-renderer/component/index.js",
-      "require": "./dist/common/subPackages/react-test-renderer/component/index.js"
+    "./src/SubPackages/react/component/web": {
+      "import": "./dist/module/SubPackages/react/component/web.js",
+      "require": "./dist/common/SubPackages/react/component/web.js"
     },
-    "./src/subPackages/react-test-renderer/component/web": {
-      "import": "./dist/module/subPackages/react-test-renderer/component/web.js",
-      "require": "./dist/common/subPackages/react-test-renderer/component/web.js"
+    "./src/SubPackages/react/component/node": {
+      "import": "./dist/module/SubPackages/react/component/node.js",
+      "require": "./dist/common/SubPackages/react/component/node.js"
     },
-    "./src/subPackages/react-test-renderer/component/node": {
-      "import": "./dist/module/subPackages/react-test-renderer/component/node.js",
-      "require": "./dist/common/subPackages/react-test-renderer/component/node.js"
+    "./src/SubPackages/react-test-renderer/component/index.ts": {
+      "import": "./src/SubPackages/react-test-renderer/component/index.ts",
+      "require": "./src/SubPackages/react-test-renderer/component/index.ts"
     },
-    "./src/subPackages/react-test-renderer/jsx/index": {
-      "import": "./dist/module/subPackages/react-test-renderer/jsx/index.js",
-      "require": "./dist/common/subPackages/react-test-renderer/jsx/index.js"
+    "./src/SubPackages/react-test-renderer/component/index": {
+      "import": "./src/SubPackages/react-test-renderer/component/index.ts",
+      "require": "./src/SubPackages/react-test-renderer/component/index.ts"
     },
-    "./src/subPackages/react-test-renderer/jsx/web": {
-      "import": "./dist/module/subPackages/react-test-renderer/jsx/web.js",
-      "require": "./dist/common/subPackages/react-test-renderer/jsx/web.js"
+    "./src/SubPackages/react-test-renderer/component/web": {
+      "import": "./dist/module/SubPackages/react-test-renderer/component/web.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/component/web.js"
     },
-    "./src/subPackages/react-test-renderer/jsx/node": {
-      "import": "./dist/module/subPackages/react-test-renderer/jsx/node.js",
-      "require": "./dist/common/subPackages/react-test-renderer/jsx/node.js"
+    "./src/SubPackages/react-test-renderer/component/node": {
+      "import": "./dist/module/SubPackages/react-test-renderer/component/node.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/component/node.js"
     },
-    "./src/subPackages/react-test-renderer/jsx-promised/index": {
-      "import": "./dist/module/subPackages/react-test-renderer/jsx-promised/index.js",
-      "require": "./dist/common/subPackages/react-test-renderer/jsx-promised/index.js"
+    "./src/SubPackages/react-test-renderer/jsx/index.js": {
+      "import": "./dist/module/src/SubPackages/react-test-renderer/jsx/index.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/jsx/index.js"
     },
-    "./src/subPackages/react-test-renderer/jsx-promised/web": {
-      "import": "./dist/module/subPackages/react-test-renderer/jsx-promised/web.js",
-      "require": "./dist/common/subPackages/react-test-renderer/jsx-promised/web.js"
+    "./src/SubPackages/react-test-renderer/jsx/web.js": {
+      "import": "./dist/module/SubPackages/react-test-renderer/jsx/web.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/jsx/web.js"
     },
-    "./src/subPackages/react-test-renderer/jsx-promised/node": {
-      "import": "./dist/module/subPackages/react-test-renderer/jsx-promised/node.js",
-      "require": "./dist/common/subPackages/react-test-renderer/jsx-promised/node.js"
+    "./src/SubPackages/react-test-renderer/jsx/node.js": {
+      "import": "./dist/module/SubPackages/react-test-renderer/jsx/node.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/jsx/node.js"
     },
-    "./src/subPackages/react-test-renderer/fc/node": {
-      "import": "./dist/module/subPackages/react-test-renderer/fc/node.js",
-      "require": "./dist/common/subPackages/react-test-renderer/fc/node.js"
+    "./src/SubPackages/react-test-renderer/jsx-promised/index": {
+      "import": "./dist/module/SubPackages/react-test-renderer/jsx-promised/index.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/jsx-promised/index.js"
     },
-    "./src/subPackages/react-test-renderer/MemoExoticComponent/node": {
-      "import": "./dist/module/subPackages/react-test-renderer/MemoExoticComponent/node.js",
-      "require": "./dist/common/subPackages/react-test-renderer/MemoExoticComponent/node.js"
+    "./src/SubPackages/react-test-renderer/jsx-promised/web": {
+      "import": "./dist/module/SubPackages/react-test-renderer/jsx-promised/web.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/jsx-promised/web.js"
     },
-    "./src/subPackages/react-dom/jsx/web": {
-      "import": "./dist/module/subPackages/react-dom/jsx/web.js",
-      "require": "./dist/common/subPackages/react-dom/jsx/web.js"
+    "./src/SubPackages/react-test-renderer/jsx-promised/node": {
+      "import": "./dist/module/SubPackages/react-test-renderer/jsx-promised/node.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/jsx-promised/node.js"
     },
-    "./src/subPackages/react-dom/jsx/node": {
-      "import": "./dist/module/subPackages/react-dom/jsx/node.js",
-      "require": "./dist/common/subPackages/react-dom/jsx/node.js"
+    "./src/SubPackages/react-test-renderer/fc/node": {
+      "import": "./dist/module/SubPackages/react-test-renderer/fc/node.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/fc/node.js"
     },
-    "./src/subPackages/react-dom/jsx/index": {
-      "import": "./dist/module/subPackages/react-dom/jsx/index.js",
-      "require": "./dist/common/subPackages/react-dom/jsx/index.js"
+    "./src/SubPackages/react-test-renderer/MemoExoticComponent/node": {
+      "import": "./dist/module/SubPackages/react-test-renderer/MemoExoticComponent/node.js",
+      "require": "./dist/common/SubPackages/react-test-renderer/MemoExoticComponent/node.js"
     },
-    "./src/subPackages/react-dom/component/web": {
-      "import": "./dist/module/subPackages/react-dom/component/web.js",
-      "require": "./dist/common/subPackages/react-dom/component/web.js"
+    "./src/SubPackages/react-dom/jsx/web": {
+      "import": "./dist/module/SubPackages/react-dom/jsx/web.js",
+      "require": "./dist/common/SubPackages/react-dom/jsx/web.js"
     },
-    "./src/subPackages/react-dom/component/node": {
-      "import": "./dist/module/subPackages/react-dom/component/node.js",
-      "require": "./dist/common/subPackages/react-dom/component/node.js"
+    "./src/SubPackages/react-dom/jsx/node": {
+      "import": "./dist/module/SubPackages/react-dom/jsx/node.js",
+      "require": "./dist/common/SubPackages/react-dom/jsx/node.js"
+    },
+    "./src/SubPackages/react-dom/jsx/index": {
+      "import": "./dist/module/SubPackages/react-dom/jsx/index.js",
+      "require": "./dist/common/SubPackages/react-dom/jsx/index.js"
+    },
+    "./src/SubPackages/react-dom/component/web": {
+      "import": "./dist/module/SubPackages/react-dom/component/web.js",
+      "require": "./dist/common/SubPackages/react-dom/component/web.js"
+    },
+    "./src/SubPackages/react-dom/component/node": {
+      "import": "./dist/module/SubPackages/react-dom/component/node.js",
+      "require": "./dist/common/SubPackages/react-dom/component/node.js"
     },
     "./src/Types": {
-      "import": "./dist/module/Types.js",
-      "require": "./dist/common/Types.js"
+      "import": "./src/Types.ts",
+      "require": "./src/Types.ts"
+    },
+    "./src/lib": {
+      "import": "./src/lib.ts",
+      "require": "./src/lib.ts"
     },
     "./src/Features": {
       "import": "./dist/module/Features.js",
@@ -115,24 +131,32 @@
       "require": "./dist/common/Web.js"
     },
     "./src/Node": {
-      "import": "./dist/module/Node.js",
-      "require": "./dist/common/Node.js"
+      "import": "./src/Node.ts",
+      "require": "./src/Node.ts"
     },
     "./src/electron": {
       "import": "./dist/module/electron.js",
       "require": "./dist/common/electron.js"
     },
-    "./src/core": {
-      "import": "./dist/module/core.js",
-      "require": "./dist/common/core.js"
-    },
     "./src/preload": {
       "import": "./dist/module/preload.js",
       "require": "./dist/common/preload.js"
     },
-    "./dist/module/core": {
-      "import": "./dist/module/core.js",
-      "require": "./dist/common/core.js"
+    "./dist/module/lib/core": {
+      "import": "./dist/module/lib/core.js",
+      "require": "./dist/common/lib/core.js"
+    },
+    "./dist/module/lib/abstractBase": {
+      "import": "./dist/module/lib/abstractBase.js",
+      "require": "./dist/common/lib/abstractBase.js"
+    },
+    "./dist/module/lib/baseBuilder": {
+      "import": "./dist/module/lib/baseBuilder.js",
+      "require": "./dist/common/lib/baseBuilder.js"
+    },
+    "./dist/module/lib/classBuilder": {
+      "import": "./dist/module/lib/classBuilder.js",
+      "require": "./dist/common/lib/classBuilder.js"
     },
     "./dist/module/NodeWriter": {
       "import": "./dist/module/NodeWriter.js",
@@ -150,8 +174,14 @@
     "ATDD"
   ],
   "scripts": {
-    "build": "sh prebuild.sh; tsc -p tsconfig.module.json; tsc -p tsconfig.common.json; tsc -p tsconfig.types.json; sh postBuild.sh",
-    "dev": "tsc -p tsconfig.module.json --watch & tsc -p tsconfig.common.json --watch & tsc -p tsconfig.types.json --watch"
+    "doit": "rm -rf node_modules && yarn install && yarn build",
+    "build": "sh prebuild.sh; cp ./src/cjs-shim.js ./dist/cjs-shim.js; tsc -p tsconfig.module.json; tsc -p tsconfig.common.json; tsc -p tsconfig.types.json; yarn esbuild src/Report.tsx --outfile=dist/prebuild/Report.js --bundle --external:testeranto.json --external:features.test.js --external:tests.json; sh postBuild.sh; ",
+    "commit": "yarn build; git add --all && git commit -m 'stash'",
+    "dev": "cp ./src/cjs-shim.js ./dist/cjs-shim.js && tsc -p tsconfig.module.json --watch & tsc -p tsconfig.common.json --watch & tsc -p tsconfig.types.json --watch & yarn esbuild src/Report.tsx --outfile=dist/prebuild/Report.js --bundle --external:testeranto.json --external:features.test.js --external:tests.json --watch",
+    "build-module": "tsc -p tsconfig.module.json",
+    "build-common": "tsc -p tsconfig.common.json",
+    "build-types": "tsc -p tsconfig.types.json",
+    "build-electron": "ts-node-esm electronBuild.ts"
   },
   "peerDependencies": {
     "@types/react": "^18.2.66",
@@ -164,7 +194,7 @@
   },
   "devDependencies": {
     "@swc/core": "^1.3.26",
-    "@types/node": "^18.14.0",
+    "@types/node": "^22.7.5",
     "@types/react": "18.2.55",
     "@types/react-bootstrap": "^0.32.32",
     "@types/react-dom": "18.2.23",
@@ -178,9 +208,10 @@
     "typescript": "4.8.2"
   },
   "dependencies": {
+    "@electron/remote": "^2.1.2",
     "babel-loader": "^8.2.5",
     "bootstrap": "^5.2.3",
-    "electron": "^24.2.0",
+    "electron": "28.0.0",
     "esbuild": "0.17.5",
     "esbuild-plugin-external-package": "^1.0.0",
     "esbuild-plugin-import-map": "^2.1.0",
@@ -194,12 +225,16 @@
     "graphology-types": "^0.24.5",
     "html": "^1.0.0",
     "ipc": "^0.0.1",
+    "jsonc": "^2.0.0",
     "npm-watch": "^0.11.0",
-    "pm2": "^5.2.2",
-    "puppeteer": "18.1.0",
+    "puppeteer": "19.2.2",
+    "puppeteer-core": "19.2.2",
+    "puppeteer-in-electron": "^3.0.5",
     "react-bootstrap": "^2.7.0",
     "react-sigma": "^1.2.35",
     "react-test-renderer": "18.2.0",
+    "selenium-webdriver": "^4.25.0",
+    "url": "^0.11.4",
     "ws": "^8.16.0"
   }
-}
+}

package/src/Features.ts

@@ -1,8 +1,6 @@
-import Graph from "graphology";
-import pkg from "graphology";
+import Graph from "graphology/dist/graphology.umd.js";
 
-/* @ts-ignore:next-line */
-const { DirectedGraph, UndirectedGraph } = pkg;
+const { DirectedGraph, UndirectedGraph } = Graph;
 
 abstract class TesterantoGraph {
   name: string;

package/src/Node.ts

@@ -1,174 +1,128 @@
+import http from "http";
+import puppeteer from "puppeteer-core";
+
+import Testeranto from "./lib/core.js";
 import {
+  defaultTestResourceRequirement,
+  ITestJob,
   ITTestResourceConfiguration,
   ITTestResourceRequest,
-  ITTestShape,
-  ITestArtificer,
-  ITestJob,
-  ITestSpecification,
-  defaultTestResourceRequirement,
-} from "./core.js";
-import TesterantoLevelTwo from "./core.js";
+} from "./lib/index.js";
 import { NodeWriter } from "./NodeWriter.js";
+import type {
+  IBaseTest,
+  INodeTestInterface,
+  ITestImplementation,
+  ITestInterface,
+  ITestSpecification,
+} from "./Types.js";
 
-const receiveTestResourceConfigUnscheduled = async (t, testresource) => {
-  const {
-    failed,
-    artifacts,
-    logPromise
-  } = await t.receiveTestResourceConfig(testresource);
-
-  Promise.all([...artifacts, logPromise]).then(async () => {
-    process.exit(await failed ? 1 : 0);
-  })
-}
-
-const receiveTestResourceConfigScheduled = async (t, testresource) => {
-  const {
-    failed,
-    artifacts,
-    logPromise
-  } = await t.receiveTestResourceConfig(testresource);
-
-  /* @ts-ignore:next-line */
-  process.send(
-    {
-      type: "testeranto:adios",
-      data: {
-        failed,
-        testResourceConfiguration:
-          t.test.testResourceConfiguration,
-        results: t.toObj(),
-      },
-    },
-    async (err) => {
-      if (!err) {
-        Promise.all([...artifacts, logPromise]).then(async () => {
-          process.exit(await failed ? 1 : 0);
-        })
-      } else {
-        console.error(err);
-        process.exit(1);
-      }
-    });
-}
-
-export default async <
-  TestShape extends ITTestShape,
-  IInput,
-  ISubject,
-  IStore,
-  ISelection,
-  IWhenShape,
-  IThenShape,
-  IState
->(
-  input: IInput,
-  testSpecification: ITestSpecification<
-    TestShape,
-    ISubject,
-    IStore,
-    ISelection,
-    IThenShape
-  >,
-  testImplementation,
-  testInterface: {
-    actionHandler?: (b: (...any) => any) => any;
-    andWhen: (
-      store: IStore,
-      actioner,
-      testResource: ITTestResourceConfiguration
-    ) => Promise<ISelection>;
-    butThen?: (
-      store: IStore,
-      callback,
-      testResource: ITTestResourceConfiguration
-    ) => Promise<ISelection>;
-    assertioner?: (t: IThenShape) => any;
-
-    afterAll?: (store: IStore, artificer: ITestArtificer) => any;
-    afterEach?: (
-      store: IStore,
-      key: string,
-      artificer: ITestArtificer
-    ) => Promise<unknown>;
-    beforeAll?: (input: IInput, artificer: ITestArtificer) => Promise<ISubject>;
-    beforeEach?: (
-      subject: ISubject,
-      initialValues,
-      testResource: ITTestResourceConfiguration,
-      artificer: ITestArtificer
-    ) => Promise<IStore>;
-  },
-  testResourceRequirement: ITTestResourceRequest = defaultTestResourceRequirement,
-) => {
+import {
+  TBrowser,
+} from "./Types.js";
 
-  const mrt = new TesterantoLevelTwo(
-    input,
-    testSpecification,
-    testImplementation,
-    testInterface,
-    testResourceRequirement,
-    testInterface.assertioner || (async (t) => t as any),
-    testInterface.beforeEach || async function (subject: ISubject, initialValues: any, testResource: any) {
-      return subject as any;
-    },
-    testInterface.afterEach || (async (s) => s),
-    testInterface.afterAll || ((store: IStore) => undefined),
-    testInterface.butThen || (async (a) => a as any),
-    testInterface.andWhen,
-    testInterface.actionHandler ||
-    function (b: (...any: any[]) => any) {
-      return b;
+
+const readJson = async (port: string): Promise<any> => new Promise((resolve, reject) => {
+  let json = "";
+  const request = http.request(
+    {
+      host: "127.0.0.1",
+      path: "/json/version",
+      port,
     },
-    NodeWriter
+    (response) => {
+      response.on("error", reject);
+      response.on("data", (chunk: Buffer) => {
+        json += chunk.toString();
+      });
+      response.on("end", () => {
+        resolve(JSON.parse(json))
+      });
+    }
   );
+  request.on("error", reject);
+  request.end();
+});
 
-  const tl2: TesterantoLevelTwo<any, any, any, any, any, any, any, any> = mrt;
-  const t: ITestJob = tl2.testJobs[0];
-  const testResourceArg = process.argv[2] || `{}`;
-
-  try {
-    const partialTestResource = JSON.parse(
-      testResourceArg
-    ) as ITTestResourceConfiguration;
-
-    if (partialTestResource.scheduled) {
-      console.log("test is scheduled", partialTestResource);
-
-      console.log(
-        "requesting test resources via IPC ...",
-        testResourceRequirement
-      );
-      /* @ts-ignore:next-line */
-      process.send({
-        type: "testeranto:hola",
-        data: {
-          requirement: {
-            ...testResourceRequirement,
-            name: partialTestResource.name
-          }
-        },
-      });
+class NodeTesteranto<TestShape extends IBaseTest> extends Testeranto<TestShape> {
+  constructor(
+    input: TestShape["iinput"],
+    testSpecification: ITestSpecification<TestShape>,
+    testImplementation: ITestImplementation<TestShape, object>,
+    testResourceRequirement: ITTestResourceRequest,
+    testInterface: Partial<ITestInterface<TestShape>>,
+  ) {
+    super(
+      input,
+      testSpecification,
+      testImplementation,
+      testResourceRequirement,
+      NodeWriter,
+      testInterface,
+
+    );
+
+    if (process.argv[2]) {
+      const testResourceArg = process.argv[2];
+
+      try {
+        const partialTestResource = JSON.parse(
+          testResourceArg
+        ) as ITTestResourceConfiguration;
+
+        this.receiveTestResourceConfig(this.testJobs[0], partialTestResource);
 
-      console.log("awaiting test resources via IPC...");
-      process.on(
-        "message",
-        async function (packet: { data: { testResourceConfiguration } }) {
-          const resourcesFromPm2 = packet.data.testResourceConfiguration;
-          const secondTestResource = {
-            fs: ".",
-            ...JSON.parse(JSON.stringify(partialTestResource)),
-            ...JSON.parse(JSON.stringify(resourcesFromPm2)),
-          } as ITTestResourceConfiguration;
-          receiveTestResourceConfigScheduled(t, secondTestResource);
-
-        }
-      );
+      } catch (e) {
+        console.error(e);
+        // process.exit(-1);
+      }
     } else {
-      receiveTestResourceConfigUnscheduled(t, partialTestResource);
+      // no-op
     }
-  } catch (e) {
-    console.error(e);
-    process.exit(-1);
   }
+
+  async receiveTestResourceConfig(
+    t: ITestJob,
+    partialTestResource: ITTestResourceConfiguration
+  ) {
+
+    const browser = await readJson("2999").then(async (json) => {
+      const b = await puppeteer.connect({
+        browserWSEndpoint: json.webSocketDebuggerUrl,
+        defaultViewport: null,
+      });
+      console.log("connected!", b.isConnected());
+      return b
+    })
+
+    const {
+      failed,
+      artifacts,
+      logPromise
+    } = await t.receiveTestResourceConfig(
+      partialTestResource,
+      new TBrowser(browser)
+    );
+
+    Promise.all([...artifacts, logPromise]).then(async () => {
+      // process.exit(await failed ? 1 : 0);
+    })
+  }
+
+};
+
+export default async <ITestShape extends IBaseTest>(
+  input: ITestShape['iinput'],
+  testSpecification: ITestSpecification<ITestShape>,
+  testImplementation: ITestImplementation<ITestShape, object>,
+  testInterface: Partial<INodeTestInterface<ITestShape>>,
+  testResourceRequirement: ITTestResourceRequest = defaultTestResourceRequirement,
+): Promise<Testeranto<ITestShape>> => {
+  return new NodeTesteranto<ITestShape>(
+    input,
+    testSpecification,
+    testImplementation,
+    testResourceRequirement,
+    testInterface,
+  )
 };

package/src/NodeWriter.ts

@@ -2,10 +2,7 @@ import fs from "fs";
 import path from "path";
 import { PassThrough } from "stream";
 
-import {
-  ILogWriter,
-  ITLog
-} from "./core";
+import { ILogWriter, ITLog } from "./lib/index.js";
 
 type IFPaths = string[];
 const fPaths: IFPaths = [];