testeranto 0.219.12 → 0.219.13

package/package.json

@@ -2,7 +2,7 @@
   "name": "testeranto",
   "displayName": "Testeranto",
   "description": "the Dockerized, AI powered, BDD test framework for polyglot projects",
-  "version": "0.219.12",
+  "version": "0.219.13",
   "engines": {
     "node": ">=20.19.0",
     "vscode": "^1.60.0"

package/src/Types.ts

@@ -1,9 +1,9 @@
-import { Ibdd_in_any, Ibdd_out_any } from "./CoreTypes";
 import { ITestResourceConfiguration } from "./lib/tiposkripto";
-import { IGivens, BaseGiven } from "./lib/tiposkripto/BaseGiven";
+import { BaseGiven, IGivens } from "./lib/tiposkripto/BaseGiven";
 import { BaseSuite } from "./lib/tiposkripto/BaseSuite";
 import { BaseThen } from "./lib/tiposkripto/BaseThen";
 import { BaseWhen } from "./lib/tiposkripto/BaseWhen";
+import { Ibdd_in_any, Ibdd_out_any } from "./lib/tiposkripto/CoreTypes";
 
 export type IChecks = ((x: any) => string)[];
 
@@ -175,76 +175,139 @@ export type ITestTypes = [string, IRunTime, { ports: number }, ITestTypes[]];
 
 export type IDockerSteps = "RUN" | "WORKDIR" | "COPY";
 
-export type ITestconfig = {
-  httpPort: number;
+export type IBaseTestConfig = {
+  runtime: string;
+  tests: string[];
+  dockerfile: string;
+  buildOptions: string,
+  checks: IChecks;
+}
 
-  featureIngestor: (s: string) => Promise<string>;
-  importPlugins: IPluginFactory[];
-  ports: string[];
-  src: string;
-  check: string;
-
-
-  java: {
-    plugins: any[];
-    tests: Record<string, { ports: number }>;
-    loaders: Record<string, string>;
-    checks: IChecks;
-    dockerfile: string;
-  };
-
-
-  rust: {
-    plugins: any[];
-    tests: Record<string, { ports: number }>;
-    loaders: Record<string, string>;
-    checks: IChecks;
-    dockerfile: string;
-  };
-
-  ruby: {
-    plugins: any[];
-    tests: Record<string, { ports: number }>;
-    loaders: Record<string, string>;
-    checks: IChecks;
-    dockerfile: string;
-  };
-
-  golang: {
-    plugins: any[];
-    tests: Record<string, { ports: number }>;
-    loaders: Record<string, string>;
-    checks: IChecks;
-    dockerfile: string;
-  };
-
-  python: {
-    plugins: any[];
-    tests: Record<string, { ports: number }>;
-    loaders: Record<string, string>;
-    checks: IChecks;
-    dockerfile: string;
-  };
+export type ITestconfigV2Node = IBaseTestConfig & { plugins: any[] }
 
-  node: {
-    plugins: any[];
-    tests: Record<string, { ports: number }>;
-    loaders: Record<string, string>;
-    externals: string[];
-    checks: IChecks;
-    dockerfile: string;
-  };
+export type ITestconfigV2 = {
+  featureIngestor: (s: string) => Promise<string>;
 
-  web: {
-    plugins: any[];
-    tests: Record<string, { ports: number }>;
-    loaders: Record<string, string>;
-    externals: string[];
-    checks: IChecks;
-    dockerfile: string;
-  };
+  runtimes: Record<string, IBaseTestConfig>
+
+  // java?: IBaseTestConfig;
+
+
+  // rust?: IBaseTestConfig;
+
+  // ruby: {
+  //   plugins: any[];
+  //   tests: Record<string, { ports: number }>;
+  //   loaders: Record<string, string>;
+  //   checks: IChecks;
+  //   dockerfile: string;
+  // };
+
+  // golang: {
+  //   plugins: any[];
+  //   tests: Record<string, { ports: number }>;
+  //   loaders: Record<string, string>;
+  //   checks: IChecks;
+  //   dockerfile: string;
+  // };
+
+  // python: {
+  //   plugins: any[];
+  //   tests: Record<string, { ports: number }>;
+  //   loaders: Record<string, string>;
+  //   checks: IChecks;
+  //   dockerfile: string;
+  // };
+
+  // node: {
+  //   plugins: any[];
+  //   tests: Record<string, { ports: number }>;
+  //   loaders: Record<string, string>;
+  //   externals: string[];
+  //   checks: IChecks;
+  //   dockerfile: string;
+  // };
+
+  // web: {
+  //   plugins: any[];
+  //   tests: Record<string, { ports: number }>;
+  //   loaders: Record<string, string>;
+  //   externals: string[];
+  //   checks: IChecks;
+  //   dockerfile: string;
+  // };
 };
 
-export type IBuiltConfig = { buildDir: string } & ITestconfig;
+// export type ITestconfig = {
+//   httpPort: number;
+
+//   featureIngestor: (s: string) => Promise<string>;
+//   importPlugins: IPluginFactory[];
+//   ports: string[];
+//   src: string;
+//   check: string;
+
+
+//   java: {
+//     plugins: any[];
+//     tests: Record<string, { ports: number }>;
+//     loaders: Record<string, string>;
+//     checks: IChecks;
+//     dockerfile: string;
+//   };
+
+
+//   rust: {
+//     plugins: any[];
+//     tests: Record<string, { ports: number }>;
+//     loaders: Record<string, string>;
+//     checks: IChecks;
+//     dockerfile: string;
+//   };
+
+//   ruby: {
+//     plugins: any[];
+//     tests: Record<string, { ports: number }>;
+//     loaders: Record<string, string>;
+//     checks: IChecks;
+//     dockerfile: string;
+//   };
+
+//   golang: {
+//     plugins: any[];
+//     tests: Record<string, { ports: number }>;
+//     loaders: Record<string, string>;
+//     checks: IChecks;
+//     dockerfile: string;
+//   };
+
+//   python: {
+//     plugins: any[];
+//     tests: Record<string, { ports: number }>;
+//     loaders: Record<string, string>;
+//     checks: IChecks;
+//     dockerfile: string;
+//   };
+
+//   node: {
+//     plugins: any[];
+//     tests: Record<string, { ports: number }>;
+//     loaders: Record<string, string>;
+//     externals: string[];
+//     checks: IChecks;
+//     dockerfile: string;
+//   };
+
+//   web: {
+//     plugins: any[];
+//     tests: Record<string, { ports: number }>;
+//     loaders: Record<string, string>;
+//     externals: string[];
+//     checks: IChecks;
+//     dockerfile: string;
+//   };
+// };
+
+// export type IBuiltConfig = { buildDir: string } & ITestconfig;
 
-export type IConfig = Map<string, [IRunTime, string, string, { tests: string[] }]>
+// export type IConfig = Map<string, [IRunTime, string, string, { tests: string[] }]>

package/src/esbuildConfigs/index.ts

@@ -1,7 +1,8 @@
 import { BuildOptions } from "esbuild";
-import { ITestconfig } from "../Types";
+import { ITestconfigV2Node } from "../Types";
+// import { ITestconfig } from "../Types";
 
-export default (config: ITestconfig): BuildOptions => {
+export default (config: object): BuildOptions => {
   return {
     // packages: "external",
     target: "esnext",
@@ -11,7 +12,7 @@ export default (config: ITestconfig): BuildOptions => {
     outbase: ".",
     jsx: "transform",
     bundle: true,
-    minify: config.minify === true,
+    // minify: config.minify === true,
     write: true,
     loader: {
       ".js": "jsx",

package/src/lib/pitono/pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "websockets>=12.0",
 ]
 authors = [
-    { name = "Testeranto Team" }
+    { name = "ADam Wong" }
 ]
 classifiers = [
     "Development Status :: 3 - Alpha",

package/src/server/runtimes/golang/docker.ts

@@ -1,6 +1,6 @@
-import { IBuiltConfig, IConfig } from "../../../Types";
+import { ITestconfigV2 } from "../../../Types";
 
-export const golangDockerComposeFile = (config: IConfig, container_name: string): object => {
+export const golangDockerComposeFile = (config: ITestconfigV2, container_name: string): object => {
 
   return {
     build: {

package/src/server/runtimes/node/docker.ts

@@ -1,6 +1,8 @@
-import { IConfig } from "../../../Types";
+import { ITestconfigV2 } from "../../../Types";
 
-export const nodeDockerComposeFile = (config: IConfig, container_name: string, fpath: string) => {
+export const nodeDockerComposeFile = (
+  config: ITestconfigV2, container_name: string, projectConfigPath: string, nodeConfigPath: string, testName: string
+) => {
   return {
     build: {
       context: process.cwd(),
@@ -18,24 +20,25 @@ export const nodeDockerComposeFile = (config: IConfig, container_name: string, f
       `${process.cwd()}/dist:/workspace/dist`,
       `${process.cwd()}/testeranto:/workspace/testeranto`,
     ],
-    command: nodeBuildCommand(fpath),
+    command: nodeBuildCommand(projectConfigPath, nodeConfigPath, testName),
   }
 
 };
 
 const externalTests = true;
 
-export const nodeBuildCommand = (fpath: string) => {
+export const nodeBuildCommand = (projectConfigPath: string, nodeConfigPath: string, testName: string) => {
 
   if (externalTests) {
-    console.log("external tests", process.cwd())
+    console.log("external tests", testName)
     // return `cat node_modules/testeranto/src/server/runtimes/node/esbuild.ts`
-    return `yarn tsx node_modules/testeranto/src/server/runtimes/node/node.ts ${fpath} testeranto/testeranto.yml`;
+    return `yarn tsx node_modules/testeranto/src/server/runtimes/node/node.ts /workspace/testeranto/testeranto.ts ${nodeConfigPath} ${testName}`;
     // return `cat node_modules/testeranto/src/server/runtimes/node/node.ts`
     // return ["sh", "-c", "cd /workspace && javac -cp \".:lib/*\" src/server/runtimes/java/main.java && java -cp \"src/server/runtimes/java:.\" main"]
   } else {
     console.log("not external tests")
-    return `yarn tsx src/server/runtimes/node/node.ts /workspace/${fpath}`;
+    // return `yarn tsx src/server/runtimes/node/node.ts /workspace/${fpath}`;
+    return `yarn tsx src/server/runtimes/node/node.ts /workspace/testeranto/testeranto.ts  /workspace/${nodeConfigPath} ${testName}`;
   }
 
 }

package/src/server/runtimes/node/esbuild.ts

@@ -3,30 +3,32 @@ import featuresPlugin from "../../../esbuildConfigs/featuresPlugin.js";
 import baseEsBuildConfig from "../../../esbuildConfigs/index.js";
 import inputFilesPlugin from "../../../esbuildConfigs/inputFilesPlugin.js";
 import rebuildPlugin from "../../../esbuildConfigs/rebuildPlugin.js";
-import { ITestconfig } from "../../../Types.js";
+import { ITestconfigV2, } from "../../../Types.js";
 
-const absoluteBundlesDir = (c: ITestconfig): string => {
+const absoluteBundlesDir = (): string => {
   return "./testeranto/bundles/allTests/node/";
 };
 
 export default (
-  projectConfig: ITestconfig,
-  testName: string
+  nodeConfig: object,
+  testName: string,
+  projectConfig: ITestconfigV2
 ): BuildOptions => {
 
-  console.log("mark77", projectConfig)
+  console.log("esbuild", testName, projectConfig)
 
+  const entryPoints = projectConfig.runtimes[testName].tests;
   // Get entry points from config, or use a default
-  let entrypoints: string[] = [];
-  if (projectConfig.node?.tests) {
-    entrypoints = Object.keys(projectConfig.node.tests);
-  } else {
-    // console.log(projectConfig)
-    throw "projectConfig.node.tests should exist"
-    // Fallback to a reasonable default
-    // entrypoints = ["./example/Calculator.test.ts"];
-    // console.warn(`No node.tests found in config, using default entry point: ${entrypoints[0]}`);
-  }
+  // let entrypoints: string[] = [];
+  // if (nodeConfig) {
+  //   entrypoints = (projectConfig.tests);
+  // } else {
+  //   // console.log(projectConfig)
+  //   throw "projectConfig.node.tests should exist"
+  //   // Fallback to a reasonable default
+  //   // entrypoints = ["./example/Calculator.test.ts"];
+  //   // console.warn(`No node.tests found in config, using default entry point: ${entrypoints[0]}`);
+  // }
 
   const { inputFilesPluginFactory, register } = inputFilesPlugin(
     "node",
@@ -34,9 +36,9 @@ export default (
   );
 
   return {
-    ...baseEsBuildConfig(projectConfig),
+    ...baseEsBuildConfig(nodeConfig),
 
-    outdir: absoluteBundlesDir(projectConfig),
+    outdir: absoluteBundlesDir(),
     outbase: ".", // Preserve directory structure relative to outdir
     metafile: true,
     supported: {
@@ -56,12 +58,12 @@ export default (
 
     packages: "external",
 
-    entryPoints: entrypoints,
+    entryPoints,
     plugins: [
       featuresPlugin,
       inputFilesPluginFactory,
       rebuildPlugin("node"),
-      ...(projectConfig.node?.plugins?.map((p) => p(register, entrypoints)) || []),
+      ...(nodeConfig.plugins?.map((p) => p(register, entryPoints)) || []),
     ],
   };
 };

package/src/server/runtimes/node/node.ts

@@ -1,32 +1,35 @@
 
 import esbuild from "esbuild";
-import { IBuiltConfig, ITestconfig } from "../../../Types";
-import nodeConfiger from "./esbuild";
+import { ITestconfigV2, ITestconfigV2Node } from "../../../Types";
 import {
   processMetafile
 } from "../common";
+import nodeConfiger from "./esbuild";
 
 console.log(`[NODE BUILDER] hello:  ${process.argv}`);
 
-const nodeConfigPath = process.argv[2];
-const projectConfigPath = process.argv[3];
-const testName = 'idk'
+const projectConfigPath = process.argv[2];
+const nodeConfigPath = process.argv[3];
+const testName = process.argv[4];
 
+console.log(`[NODE BUILDER] projectConfigPath:  ${projectConfigPath}`);
 console.log(`[NODE BUILDER] nodeConfig:  ${nodeConfigPath}`);
+console.log(`[NODE BUILDER] testName:  ${testName}`);
 
 // run esbuild in watch mode using esbuildConfigs. Write to fs the bundle and metafile
 async function startBundling(
-  config: IBuiltConfig
+  nodeConfigs: any,
+  projectConfig: ITestconfigV2
 ) {
   console.log(`[NODE BUILDER] is now bundling:  ${testName}`);
-  const n = nodeConfiger(config, testName);
+  const n = nodeConfiger(nodeConfigs, testName, projectConfig);
 
   const buildResult = await esbuild.build(n);
 
   // const metafilesDir =
   //   process.env.METAFILES_DIR || "/workspace/testeranto/metafiles/node";
   if (buildResult.metafile) {
-    await processMetafile(config, buildResult.metafile, 'node');
+    await processMetafile(projectConfig, buildResult.metafile, 'node');
 
   } else {
     console.warn("No metafile generated by esbuild");
@@ -36,8 +39,9 @@ async function startBundling(
 
 async function main() {
   try {
-    const config = (await import(nodeConfigPath)).default;
-    await startBundling(config);
+    const nodeConfigs = (await import(nodeConfigPath)).default;
+    const projectConfigs = (await import(projectConfigPath)).default;
+    await startBundling(nodeConfigs, projectConfigs);
   } catch (error) {
     console.error("NODE BUILDER: Error importing config:", nodeConfigPath, error);
     console.error(error);

package/src/server/serverClasees/Server.ts

@@ -1,8 +1,9 @@
 import fs from "fs";
 import readline from "readline";
-import { IBuiltConfig, IConfig } from "../../Types";
+
 import { IMode } from "../types";
 import { Server_Docker } from "./Server_Docker";
+import { ITestconfigV2 } from "../../Types";
 
 console.log("hello server")
 
@@ -10,7 +11,7 @@ readline.emitKeypressEvents(process.stdin);
 if (process.stdin.isTTY) process.stdin.setRawMode(true);
 
 export class Server extends Server_Docker {
-  constructor(configs: IConfig, mode: IMode) {
+  constructor(configs: ITestconfigV2, mode: IMode) {
     super(configs, mode);
     console.log(("[Server] Press 'q' to initiate a graceful shutdown."));
     console.log(("[Server] Press 'CTRL + c' to quit forcefully."));

package/src/server/serverClasees/Server_Base.ts

@@ -1,26 +1,27 @@
-import { IBuiltConfig, IConfig } from "../../Types";
+
+import { ITestconfigV2 } from "../../Types";
 import { IMode } from "../types";
 
 export abstract class Server_Base {
   mode: IMode;
-  configs: IConfig;
+  configs: ITestconfigV2;
 
 
-  constructor(configs: IConfig, mode: IMode) {
+  constructor(configs: ITestconfigV2, mode: IMode) {
     this.configs = configs;
     this.mode = mode;
 
+    console.log(`[Base] ${this.configs}`)
+
   }
 
   async start() {
-    console.log(`[Server_Base] start()`)
-
+    // console.log(`[Server_Base] start()`)
   }
 
   async stop() {
     console.log(`[Server_Base] stop()`)
     process.exit()
-
   }