testeranto 0.90.0 → 0.100.0

package/src/lib/basebuilder.ts

@@ -82,7 +82,6 @@ export abstract class BaseBuilder<
       this.Check()
     );
 
-    // const f = this.specs[0].features;
     this.testJobs = this.specs.map((suite: BaseSuite<ITestShape>) => {
       const suiteRunner =
         (suite: BaseSuite<ITestShape>) =>
@@ -90,14 +89,6 @@ export abstract class BaseBuilder<
           puppetMaster: PM,
           tLog: ITLog
         ): Promise<BaseSuite<ITestShape>> => {
-          // const puppeteerBrowser = await puppetMaster.startPuppeteer(
-          //   {
-          //     browserWSEndpoint:
-          //       puppetMaster.testResourceConfiguration.browserWSEndpoint,
-          //   },
-          //   puppetMaster.testResourceConfiguration.fs
-          // );
-
           const x = await suite.run(
             input,
             puppetMaster.testResourceConfiguration,
@@ -112,8 +103,6 @@ export abstract class BaseBuilder<
             puppetMaster
           );
 
-          // await puppetMaster.browser.disconnect();
-          // puppeteerBrowser.close();
           return x;
         };
 
@@ -163,7 +152,7 @@ export abstract class BaseBuilder<
             `tests.json`,
             JSON.stringify(this.toObj(), null, 2)
           );
-          console.log(`exiting gracefully with ${numberOfFailures} failures.`);
+          // console.log(`exiting gracefully with ${numberOfFailures} failures.`);
 
           return {
             failed: numberOfFailures,

package/src/lib/classBuilder.ts

@@ -57,8 +57,9 @@ export abstract class ClassBuilder<
       },
       {}
     );
+
     const classyGivens = Object.entries(testImplementation.givens).reduce(
-      (a, [key, givEn]) => {
+      (a, [key, g]) => {
         a[key] = (features, whens, thens, givEn) => {
           return new givenKlasser.prototype.constructor(
             key,

package/src/lib/core.ts

@@ -5,7 +5,7 @@ import {
   ITestImplementation,
 } from "../Types.js";
 
-import { ITestInterface } from "./types.js";
+import { IFinalResults, ITestInterface } from "./types.js";
 import {
   DefaultTestInterface,
   ITTestResourceRequest,
@@ -43,9 +43,11 @@ export default abstract class Testeranto<
     testSpecification: ITestSpecification<ITestShape>,
     testImplementation: ITestImplementation<ITestShape>,
     testResourceRequirement: ITTestResourceRequest = defaultTestResourceRequirement,
-    testInterface: Partial<ITestInterface<ITestShape>>
+    testInterface: Partial<ITestInterface<ITestShape>>,
+    uberCatcher: (cb) => void
   ) {
     const fullTestInterface = DefaultTestInterface(testInterface);
+
     super(
       testImplementation,
       testSpecification,
@@ -53,26 +55,6 @@ export default abstract class Testeranto<
 
       class extends BaseSuite<ITestShape> {
         afterAll(store: IStore, artifactory: ITestArtifactory, pm: PM) {
-          // const pagesHandler = {
-          //   get(target, prop) {
-          //     console.log(`Getting pages property ${prop}`);
-          //     return target[prop];
-          //   },
-          // };
-
-          // const browserHandler = {
-          //   get(target, prop) {
-          //     console.log(`Getting browser property ${prop}`);
-          //     if (prop === "pages") {
-          //       // return target[prop];
-          //       return new Proxy(target[prop], pagesHandler);
-          //     } else {
-          //       return target[prop];
-          //     }
-          //   },
-          // };
-          // const proxy = new Proxy(utils.browser, browserHandler);
-
           return fullTestInterface.afterAll(
             store,
             (fPath: string, value: unknown) =>
@@ -107,15 +89,22 @@ export default abstract class Testeranto<
       } as any,
 
       class Given extends BaseGiven<ITestShape> {
-        async givenThat(subject, testResource, artifactory, initializer, pm) {
+        uberCatcher = uberCatcher;
+
+        async givenThat(
+          subject,
+          testResource,
+          artifactory,
+          initializer,
+          initialValues,
+          pm
+        ) {
           return fullTestInterface.beforeEach(
             subject,
             initializer,
-            // (fPath: string, value: unknown) =>
-            //   // TODO does not work?
-            //   artifactory(`beforeEach/${fPath}`, value),
+            artifactory,
             testResource,
-            this.initialValues,
+            initialValues,
             pm
           );
         }
@@ -258,11 +247,10 @@ export default abstract class Testeranto<
       } as any,
 
       testResourceRequirement
-      // puppetMaster
     );
   }
 
   abstract receiveTestResourceConfig(
     partialTestResource: string
-  ): Promise<string[]>;
+  ): Promise<IFinalResults>;
 }

package/src/lib/types.ts

@@ -1,4 +1,4 @@
-import { IBaseTest } from "../Types";
+// import { IBaseTest } from "../Types";
 
 import type { Plugin } from "esbuild";
 import {
@@ -9,8 +9,9 @@ import {
   BaseWhen,
   BaseThen,
 } from "./abstractBase";
-import { ITTestResourceConfiguration, ITestArtificer } from ".";
-import { PM } from "../PM/index";
+import { IBaseTest } from "../Types";
+
+export type IFinalResults = { features: string[]; failed: number };
 
 export type IRunTime = `node` | `web`;
 
@@ -28,6 +29,7 @@ export type IPlugin = (
 ) => Plugin;
 
 export type IBaseConfig = {
+  src: string;
   clearScreen: boolean;
   debugger: boolean;
   devMode: boolean;
@@ -46,180 +48,6 @@ export type IBaseConfig = {
 
 export type IBuiltConfig = { buildDir: string } & IBaseConfig;
 
-export type IWebTestInterface<
-  ITestShape extends IBaseTest<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>
-  >
-> = {
-  assertThis: (x: ITestShape["then"]) => void;
-
-  andWhen: (
-    store: ITestShape["istore"],
-    whenCB: ITestShape["when"],
-    testResource: ITTestResourceConfiguration,
-    utils: PM
-  ) => Promise<ITestShape["istore"]>;
-  butThen: (
-    store: ITestShape["istore"],
-    thenCB,
-    testResource: ITTestResourceConfiguration,
-    utils: PM
-  ) => Promise<ITestShape["iselection"]>;
-
-  afterAll: (
-    store: ITestShape["istore"],
-    artificer: ITestArtificer,
-    utils: PM
-  ) => any;
-  afterEach: (
-    store: ITestShape["istore"],
-    key: string,
-    artificer: ITestArtificer,
-    utils: PM
-  ) => Promise<unknown>;
-  beforeAll: (
-    input: ITestShape["iinput"],
-    testResource: ITTestResourceConfiguration,
-    artificer: ITestArtificer,
-    utils: PM
-  ) => Promise<ITestShape["isubject"]>;
-  beforeEach: (
-    subject: ITestShape["isubject"],
-    initializer: (c?) => ITestShape["given"],
-    artificer: ITestArtificer,
-    testResource: ITTestResourceConfiguration,
-    initialValues,
-    utils: PM
-  ) => Promise<ITestShape["istore"]>;
-};
-// & ITestInterface<ITestShape>;
-
-export type INodeTestInterface<
-  ITestShape extends IBaseTest<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>
-  >
-> = {
-  assertThis: (x: ITestShape["then"]) => void;
-  andWhen: (
-    store: ITestShape["istore"],
-    whenCB: ITestShape["when"],
-    testResource: ITTestResourceConfiguration,
-    utils: PM
-  ) => Promise<ITestShape["istore"]>;
-  butThen: (
-    store: ITestShape["istore"],
-    thenCB,
-    testResource: ITTestResourceConfiguration,
-    utils: PM
-  ) => Promise<ITestShape["iselection"]>;
-  afterAll: (
-    store: ITestShape["istore"],
-    artificer: ITestArtificer,
-    pm: PM
-  ) => any;
-  afterEach: (
-    store: ITestShape["istore"],
-    key: string,
-    artificer: ITestArtificer,
-    pm: PM
-  ) => Promise<unknown>;
-  beforeAll: (
-    input: ITestShape["iinput"],
-    testResource: ITTestResourceConfiguration,
-    artificer: ITestArtificer,
-    pm: PM
-  ) => Promise<ITestShape["isubject"]>;
-  beforeEach: (
-    subject: ITestShape["isubject"],
-    initializer: (c?) => ITestShape["given"],
-    artificer: ITestArtificer,
-    testResource: ITTestResourceConfiguration,
-    initialValues,
-    pm: PM
-  ) => Promise<ITestShape["istore"]>;
-};
-// & ITestInterface<ITestShape>;
-
-export type ITestInterface<
-  ITestShape extends IBaseTest<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>
-  >
-> = {
-  assertThis: (x: ITestShape["then"]) => void;
-
-  andWhen: (
-    store: ITestShape["istore"],
-    whenCB: ITestShape["when"],
-    testResource: ITTestResourceConfiguration,
-    pm: PM
-  ) => Promise<ITestShape["istore"]>;
-  butThen: (
-    store: ITestShape["istore"],
-    thenCB,
-    testResource: ITTestResourceConfiguration,
-    pm: PM
-  ) => Promise<ITestShape["iselection"]>;
-
-  afterAll: (
-    store: ITestShape["istore"],
-    artificer: ITestArtificer,
-    pm: PM
-  ) => any;
-  afterEach: (
-    store: ITestShape["istore"],
-    key: string,
-    artificer: ITestArtificer,
-    pm: PM
-  ) => Promise<unknown>;
-  beforeAll: (
-    input: ITestShape["iinput"],
-    testResource: ITTestResourceConfiguration,
-    artificer: ITestArtificer,
-    pm: PM
-  ) => Promise<ITestShape["isubject"]>;
-  beforeEach: (
-    subject: ITestShape["isubject"],
-    initializer: (c?) => ITestShape["given"],
-    // artificer: ITestArtificer,
-    testResource: ITTestResourceConfiguration,
-    initialValues,
-    pm: PM
-  ) => Promise<ITestShape["istore"]>;
-};
-
 export type ISuiteKlasser<
   ITestShape extends IBaseTest<
     unknown,

package/dist/common/src/Aider.js

@@ -1,143 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execCommand = void 0;
-const fs_1 = __importDefault(require("fs"));
-const child_process_1 = require("child_process");
-const execCommand = async (command) => {
-    const ls = (0, child_process_1.spawn)(command.split(" ")[0], command.split(" ").slice(1, -1));
-    process.stdin.pipe(ls.stdin);
-    ls.stdout.pipe(process.stdout);
-    ls.stderr.pipe(process.stdout);
-    // ls.stdout.on("data", function (data) {
-    //   console.log("stdout: " + data.toString());
-    // });
-    // ls.stderr.on("data", function (data) {
-    //   console.log("stderr: " + data.toString());
-    // });
-    ls.on("exit", function (code) {
-        console.log("child process exited with code " + (code === null || code === void 0 ? void 0 : code.toString()) || -1);
-    });
-    // return new Promise<void>((resolve, reject) => {
-    //   const [cmd, ...args] = command.split(" ");
-    //   const childProcess = spawn(cmd, args);
-    //   childProcess.stdout.on("data", (data) => {
-    //     process.stdout.write(data.toString());
-    //   });
-    //   childProcess.stderr.on("data", (data) => {
-    //     process.stderr.write(data.toString());
-    //   });
-    //   childProcess.on("error", (error) => {
-    //     reject(error);
-    //   });
-    //   childProcess.on("exit", (code) => {
-    //     if (code === 0) {
-    //       resolve();
-    //     } else {
-    //       reject(new Error(`Command exited with code ${code}.`));
-    //     }
-    //   });
-    // });
-};
-exports.execCommand = execCommand;
-const key = process.argv[2];
-console.log(key);
-const exitcode = fs_1.default.readFileSync(`${key}/exitcode`).toString();
-console.log("exitcode", exitcode);
-// if (exitcode != "0") {
-if (exitcode != "0") {
-    const inputFiles = JSON.parse(fs_1.default.readFileSync(`${key}/inputFiles.json`).toString());
-    inputFiles.push(`${key}/tests.json`);
-    // const features = await await Promise.all(
-    //   Array.from(
-    //     new Set(
-    //       JSON.parse(fs.readFileSync(`${key}/tests.json`).toString())
-    //         .givens.reduce((mm: any[], lm: { features: any[] }) => {
-    //           mm.push(
-    //             lm.features.reduce((mm2: any[], lm2: any) => {
-    //               mm2.push(lm2);
-    //               return mm2;
-    //             }, [])
-    //           );
-    //           return mm;
-    //         }, [])
-    //         .flat()
-    //         .flat()
-    //     )
-    //   ) as string[]
-    // );
-    // const final = features.reduce((mm, [k, v], ndx) => {
-    //   mm[k] = v;
-    //   return mm;
-    // }, {});
-    // const as = JSON.stringify(final);
-    // const scriptCommand = `aider --model deepseek --api-key deepseek=${
-    //   process.env.DEEPSEEK_KEY
-    // } --message "Fix the failing tests" --read ${key}/inputFiles.json ${inputFiles
-    //   .map((i) => `--file ${i}`)
-    //   .join(" ")}`;
-    const scriptCommand = `aider --message "Fix the failing tests" --model deepseek --api-key deepseek=${process.env.DEEPSEEK_KEY} --file ./${inputFiles.join(" ./")}`;
-    console.log("scriptCommand", scriptCommand);
-    (0, exports.execCommand)(scriptCommand);
-    // fs.writeFile(`./${key}/features.json`, as, () => {
-    //   inputFiles.push(`./${key}/features.json`);
-    //   // itermTab(scriptCommand).then(() => console.log("yay"));
-    //   // const child = spawn("xterm -e", scriptCommand.split(" "), {
-    //   //   detached: true,
-    //   //   stdio: "ignore",
-    //   // });
-    //   // runCommandInITerm(scriptCommand);
-    // });
-    // .reduce(async (mm, feature) => {
-    //   const req = await octokit.request(
-    //     `GET /repos/adamwong246/kokomobay-taskman/contents/Task/${feature}.json`,
-    //     {
-    //       owner: "adamwong246",
-    //       repo: "kokomoBay-taskman",
-    //       path: `Task/${feature}.json`,
-    //       headers: {
-    //         "X-GitHub-Api-Version": "2022-11-28",
-    //       },
-    //     }
-    //   );
-    //   const j = JSON.parse(atob(req.data.content));
-    //   (await mm).push([
-    //     feature,
-    //     JSON.stringify({
-    //       name: j.name,
-    //       body: j.body,
-    //     }),
-    //   ]);
-    //   return mm;
-    // }, Promise.resolve<[string, string][]>([]))
-    // .then((z) => {
-    //   const final = z.reduce((mm, [k, v], ndx) => {
-    //     mm[k] = v;
-    //     return mm;
-    //   }, {});
-    //   const as = JSON.stringify(final);
-    //   fs.writeFile(`./${key}/features.json`, as, () => {
-    //     inputFiles.push(`./${key}/features.json`);
-    //     const scriptCommand = `aider --model deepseek --api-key deepseek=${
-    //       process.env.DEEPSEEK_KEY
-    //     } --message "Fix the failing tests" ${inputFiles.join(" ")}`;
-    //     console.log("scriptCommand", scriptCommand);
-    //     execCommand(scriptCommand);
-    //     // itermTab(scriptCommand).then(() => console.log("yay"));
-    //     // const child = spawn("xterm -e", scriptCommand.split(" "), {
-    //     //   detached: true,
-    //     //   stdio: "ignore",
-    //     // });
-    //     // runCommandInITerm(scriptCommand);
-    //   });
-    //   //
-    // });
-    // features.then((x) => {
-    //   console.log("done", x);
-    // });
-}
-else {
-    console.log("that test is not failing");
-}