testeranto 0.219.16 → 0.219.17

package/bundle.js

@@ -1,5 +1,6 @@
-import * as fs from 'fs';
-import * as path from 'path';
+
+import fs from "fs"
+import path from "path"
 import * as esbuild from 'esbuild'
 
 // Build main application

package/dist/prebuild/testeranto.mjs

@@ -98,14 +98,14 @@ var externalTests = true;
 var nodeBuildCommand = (projectConfigPath, nodeConfigPath, testName) => {
   if (externalTests) {
     console.log("external tests", testName);
-    return `yarn tsx node_modules/testeranto/src/server/runtimes/node/node.ts /workspace/testeranto/testeranto.ts ${nodeConfigPath} ${testName}`;
+    return `yarn tsx node_modules/testeranto/src/server/runtimes/node/node.ts /workspace/testeranto/testeranto.ts /workspace/${nodeConfigPath} ${testName}`;
   } else {
     console.log("not external tests");
     return `yarn tsx src/server/runtimes/node/node.ts /workspace/testeranto/testeranto.ts  /workspace/${nodeConfigPath} ${testName}`;
   }
 };
-var nodeBddCommand = (fpath) => {
-  return `node ${fpath.split(".").slice(0, -1).concat("mjs").join(".")} /workspace/node.js`;
+var nodeBddCommand = (fpath, nodeConfigPath) => {
+  return `node ${fpath.split(".").slice(0, -1).concat("mjs").join(".")} /workspace/${nodeConfigPath}`;
 };
 
 // src/server/runtimes/python/docker.ts
@@ -1046,8 +1046,8 @@ var Server_Docker = class extends Server_WS {
               const uid = `${runtimeTestsName.toLowerCase()}-${cleanTestName}`;
               const bddCommandFunc = runTimeToCompose[runtime][2];
               const filePath = `testeranto/bundles/allTests/${runtime}/${tName}`;
-              const command = bddCommandFunc(filePath);
-              console.log("wtf command", command);
+              const command = bddCommandFunc(filePath, this.configs.runtimes[runtimeTestsName].buildOptions);
+              console.log("[Server_Docker] BDD command", command);
               services[`${uid}-bdd`] = this.bddTestDockerComposeFile(runtime, `${uid}-bdd`, command);
               services[`${uid}-aider`] = this.aiderDockerComposeFile(`${uid}-aider`);
             }
@@ -1686,7 +1686,6 @@ if (mode !== "once" && mode !== "dev") {
 }
 var main = async () => {
   const config = (await import(process.cwd() + "/testeranto/testeranto.ts")).default;
-  console.log("mark123", config);
   await new Server(config, mode).start();
 };
 main();

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.16",
+  "version": "0.219.17",
   "engines": {
     "node": ">=20.19.0",
     "vscode": "^1.60.0"
@@ -145,25 +145,31 @@
     ]
   },
   "scripts": {
+    "buildV3": "sh prebuild.sh; cp ./src/cjs-shim.js ./dist/cjs-shim.js; sh postBuild.sh; yarn bundle",
+    "summarizeLicenses": "yarn licenses list > ALL_LICENSES.txt; yarn license-checker >> ALL_LICENSES.txt; yarn license-checker --summary >> ALL_LICENSES.txt",
+    "compile-docs": "node scripts/compile-docs.js",
+    "prepublish": "self-import",
+    "type-check": "yarn tsc --noEmit > tsc.log",
+    "type-fix": "aider --model deepseek/deepseek-chat --load type-fix.txt",
+    "vscode:prepublish": "yarn run bundle",
+    "compile": "yarn run bundle",
+    "watch": "yarn run bundle --watch",
+    "package": "npx vsce package",
+    "package:full": "node scripts/package-extension.js",
+    "build-module": "tsc -p tsconfig.module.json",
+    "build-common": "tsc -p tsconfig.common.json",
+    "build-types": "tsc -p tsconfig.types.json",
+    "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; sh postBuild.sh; yarn bundle",
+    "bundle": "node bundle.js",
     "mothership": "node dist/prebuild/mothership/index.mjs",
     "build-hard": "rm -rf testeranto/** && yarn build && yarn type-check; yarn t-init; cp dist/prebuild/App.*  testeranto; yarn t-build core once; yarn t-run core once",
-    "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; sh postBuild.sh; yarn bundle",
     "build3": "yarn bundle; tsc -p tsconfig.types.json",
     "dev": "sh prebuild.sh;  cp ./src/cjs-shim.js ./dist/cjs-shim.js; sh postBuild.sh; tsc -p tsconfig.module.json --watch & tsc -p tsconfig.common.json --watch  ",
-    "bundle": "node bundle.js",
-    "build-module": "tsc -p tsconfig.module.json",
-    "build-common": "tsc -p tsconfig.common.json",
-    "build-types": "tsc -p tsconfig.types.json",
-    "type-check": "yarn tsc --noEmit > tsc.log",
-    "type-fix": "aider --model deepseek/deepseek-chat --load type-fix.txt",
     "t-build": "tsx src/build.ts",
     "t-run": "tsx src/run.ts",
     "testeranto": "tsx src/testeranto.ts",
     "t-init": "tsx dist/prebuild/init-docs.mjs",
     "t-report": "tsx dist/prebuild/ReportServer.mjs",
-    "compile-docs": "node scripts/compile-docs.js",
-    "prepublish": "self-import",
-    "summarizeLicenses": "yarn licenses list > ALL_LICENSES.txt; yarn license-checker >> ALL_LICENSES.txt; yarn license-checker --summary >> ALL_LICENSES.txt",
     "buildV2": "node bundle.js",
     "devV2": "rm -rf testeranto; yarn t-init; cp ./dist/prebuild/App.* testeranto; cd example && go mod tidy && cd .. && tsx scripts/build-example.ts && yarn testeranto core dev",
     "build:example": "tsx scripts/build-example.ts",
@@ -180,12 +186,7 @@
     "devV2:full": "rm -rf testeranto && npm run build:all && npm run t-init && cp ./dist/prebuild/App.* testeranto && cd example && go mod tidy && cd .. && npm run build:example && npm run testeranto core dev",
     "devV3": "rm -rf testeranto && yarn run t-init && npm run setup:example && npm run build:example && npm run testeranto core dev",
     "devV4": "rm -rf testeranto/bundles/** testeranto/reports/** testeranto/metafiles/** ; yarn bundle && yarn run testeranto allTests.ts once",
-    "devV5": "yarn bundle && yarn run testeranto allTests.ts once",
-    "vscode:prepublish": "yarn run bundle",
-    "compile": "yarn run bundle",
-    "watch": "yarn run bundle --watch",
-    "package": "npx vsce package",
-    "package:full": "node scripts/package-extension.js"
+    "devV5": "yarn bundle && yarn run testeranto allTests.ts once"
   },
   "exports": {
     "./src/cjs-shim.ts": {
@@ -414,4 +415,4 @@
     "cucumber",
     "ATDD"
   ]
-}
+}

package/src/Types.ts

@@ -1,37 +1,18 @@
-import { ITestResourceConfiguration } from "./lib/tiposkripto";
-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";
+import { BaseGiven } from "./lib/tiposkripto/src/BaseGiven";
+import { BaseThen } from "./lib/tiposkripto/src/BaseThen";
+import { BaseWhen } from "./lib/tiposkripto/src/BaseWhen";
+import { Ibdd_in_any, Ibdd_out_any } from "./lib/tiposkripto/src/CoreTypes";
+import { ITestResourceConfiguration } from "./lib/tiposkripto/src/types";
 
 export type IChecks = ((x: any) => string)[];
 
-export type ISummary = Record<
-  string,
-  {
-    runTimeTests: number | "?" | undefined;
-    runTimeErrors: number | "?" | undefined;
-    typeErrors: number | "?" | undefined;
-    staticErrors: number | "?" | undefined;
-    prompt: string | "?" | undefined;
-    failingFeatures: object | undefined;
-  }
-> & {
-  nodeLogs?: string;
-  webLogs?: string;
-  pureLogs?: string;
-};
-
-export type SuiteSpecification<
-  I extends Ibdd_in_any,
-  O extends Ibdd_out_any
-> = {
-    [K in keyof O["suites"]]: (
-      name: string,
-      givens: IGivens<I>
-    ) => BaseSuite<I, O>;
-  };
+export type IBaseTestConfig = {
+  runtime: string;
+  tests: string[];
+  dockerfile: string;
+  buildOptions: string,
+  checks: IChecks;
+}
 
 // Simplified test result summary
 export type TestSummary = {
@@ -172,142 +153,3 @@ export type IPluginFactory = (
 export type IRunTime = `node` | `web` | `golang` | `python` | `ruby` | `java` | `rust`;
 
 export type ITestTypes = [string, IRunTime, { ports: number }, ITestTypes[]];
-
-export type IDockerSteps = "RUN" | "WORKDIR" | "COPY";
-
-export type IBaseTestConfig = {
-  runtime: string;
-  tests: string[];
-  dockerfile: string;
-  buildOptions: string,
-  checks: IChecks;
-}
-
-export type ITestconfigV2Node = IBaseTestConfig & { plugins: any[] }
-
-export type ITestconfigV2 = {
-  featureIngestor: (s: string) => Promise<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 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[] }]>

package/src/lib/tiposkripto/bundle.js

@@ -0,0 +1,26 @@
+
+import * as esbuild from 'esbuild'
+
+await esbuild.build({
+  outExtension: { '.js': '.mjs' },
+  entryPoints: [
+    'src/index.mts',
+  ],
+  bundle: true,
+  format: "esm",
+  splitting: true,
+  platform: "node",
+  target: "node20",
+  outdir: "dist/prebuild",
+  packages: "external",
+  supported: {
+    "dynamic-import": true,
+  },
+  external: [
+    "fs", "path", "child_process", "util", "os", "events", "stream",
+    "http", "https", "zlib", "crypto", "buffer", "net", "dns", "tls",
+    "assert", "querystring", "punycode", "readline", "repl", "vm",
+    "perf_hooks", "async_hooks", "timers", "console", "module", "process",
+    "vscode"
+  ],
+})

package/src/lib/tiposkripto/cjs-shim.js

@@ -0,0 +1,14 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable no-undef */
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import url from 'node:url';
+
+// globalThis.require = createRequire(import.meta.url);
+globalThis.__filename = url.fileURLToPath(import.meta.url);
+globalThis.__dirname = path.dirname(__filename);
+
+// const p = `${import.meta.url}/..`;
+// globalThis.require = createRequire(`${import.meta.url}/..`);
+// globalThis.__filename = url.fileURLToPath(`${import.meta.url}/..`);
+// globalThis.__dirname = path.dirname(`${__filename}/..`);

package/{dist/common/src/lib/tiposkripto → src/lib/tiposkripto/dist/common/lib/tiposkripto/src}/BaseTiposkripto.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const index_mjs_1 = require("./index.mjs");
 const BaseGiven_1 = require("./BaseGiven");
 const BaseSuite_1 = require("./BaseSuite");
-const BaseThen_js_1 = require("./BaseThen.js");
-const BaseWhen_js_1 = require("./BaseWhen.js");
-const index_js_1 = require("./index.js");
+const BaseThen_1 = require("./BaseThen");
+const BaseWhen_1 = require("./BaseWhen");
+const types_js_1 = require("./types.js");
 class BaseTiposkripto {
-    constructor(webOrNode, input, testSpecification, testImplementation, testResourceRequirement = index_js_1.defaultTestResourceRequirement, testAdapter = {}, testResourceConfiguration, wsPort = "3456", wsHost = "localhost") {
+    constructor(webOrNode, input, testSpecification, testImplementation, testResourceRequirement = types_js_1.defaultTestResourceRequirement, testAdapter = {}, testResourceConfiguration, wsPort = "3456", wsHost = "localhost") {
         this.totalTests = 0;
         this.artifacts = [];
         this.testResourceConfiguration = testResourceConfiguration;
-        const fullAdapter = (0, index_js_1.DefaultAdapter)(testAdapter);
+        const fullAdapter = (0, index_mjs_1.DefaultAdapter)(testAdapter);
         if (!testImplementation.suites ||
             typeof testImplementation.suites !== "object") {
             throw new Error(`testImplementation.suites must be an object, got ${typeof testImplementation.suites}: ${JSON.stringify(testImplementation.suites)}`);
@@ -52,7 +53,7 @@ class BaseTiposkripto {
         }, {});
         const classyWhens = Object.entries(testImplementation.whens).reduce((a, [key, whEn]) => {
             a[key] = (...payload) => {
-                const whenInstance = new (class extends BaseWhen_js_1.BaseWhen {
+                const whenInstance = new (class extends BaseWhen_1.BaseWhen {
                     async andWhen(store, whenCB, testResource) {
                         return await fullAdapter.andWhen(store, whenCB, testResource);
                     }
@@ -63,7 +64,7 @@ class BaseTiposkripto {
         }, {});
         const classyThens = Object.entries(testImplementation.thens).reduce((a, [key, thEn]) => {
             a[key] = (...args) => {
-                const thenInstance = new (class extends BaseThen_js_1.BaseThen {
+                const thenInstance = new (class extends BaseThen_1.BaseThen {
                     async butThen(store, thenCB, testResource) {
                         return await fullAdapter.butThen(store, thenCB, testResource);
                     }

package/{dist/common/src/lib/tiposkripto → src/lib/tiposkripto/dist/common/lib/tiposkripto/src}/Node.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeTiposkripto = void 0;
 const fs_1 = __importDefault(require("fs"));
-const BaseTiposkripto_js_1 = __importDefault(require("./BaseTiposkripto.js"));
-const index_js_1 = require("./index.js");
+const BaseTiposkripto_1 = __importDefault(require("./BaseTiposkripto"));
+const types_1 = require("./types");
 console.log(`[NodeTiposkripto] ${process.argv}`);
 const config = { ports: [1111], fs: 'testeranto/reports/allTests/example/Calculator.test/node' };
-class NodeTiposkripto extends BaseTiposkripto_js_1.default {
+class NodeTiposkripto extends BaseTiposkripto_1.default {
     constructor(input, testSpecification, testImplementation, testResourceRequirement, testAdapter) {
         // console.log(`[NodeTiposkripto] constructor ${process.argv[3]}`);
         // const config = JSON.parse(process.argv[3])
@@ -26,7 +26,7 @@ class NodeTiposkripto extends BaseTiposkripto_js_1.default {
     }
 }
 exports.NodeTiposkripto = NodeTiposkripto;
-const tiposkripto = async (input, testSpecification, testImplementation, testAdapter, testResourceRequirement = index_js_1.defaultTestResourceRequirement) => {
+const tiposkripto = async (input, testSpecification, testImplementation, testAdapter, testResourceRequirement = types_1.defaultTestResourceRequirement) => {
     try {
         const t = new NodeTiposkripto(input, testSpecification, testImplementation, testResourceRequirement, testAdapter);
         return t;

package/{dist/common/src/lib/tiposkripto → src/lib/tiposkripto/dist/common/lib/tiposkripto/src}/Web.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebTiposkripto = void 0;
 const BaseTiposkripto_js_1 = __importDefault(require("./BaseTiposkripto.js"));
-const index_js_1 = require("./index.js");
+const types_js_1 = require("./types.js");
 const config = {
     name: 'web',
     fs: 'testeranto/reports/allTests/example/Calculator.test/web',
@@ -50,7 +50,7 @@ class WebTiposkripto extends BaseTiposkripto_js_1.default {
     }
 }
 exports.WebTiposkripto = WebTiposkripto;
-const tiposkripto = async (input, testSpecification, testImplementation, testAdapter, testResourceRequirement = index_js_1.defaultTestResourceRequirement) => {
+const tiposkripto = async (input, testSpecification, testImplementation, testAdapter, testResourceRequirement = types_js_1.defaultTestResourceRequirement) => {
     try {
         const t = new WebTiposkripto(input, testSpecification, testImplementation, testResourceRequirement, testAdapter);
         // const data = navigator.storage.

package/src/lib/tiposkripto/dist/common/lib/tiposkripto/src/index.mjs

@@ -0,0 +1,48 @@
+"use strict";
+import { defaultTestResourceRequirement } from "./types";
+// let tpskrt;
+// // Use esbuild define to distinguish environments
+// declare const ENV: "node" | "web";
+// if (ENV === "node") {
+//   tpskrt = await import("./Node");
+// } else if (ENV === "web") {
+//   tpskrt = await import("./Web");
+// } else {
+//   throw `Unknown ENV ${ENV}`;
+// }
+let tpskrt;
+const tpskrtNode = await import("./Node");
+const tpskrtWeb = await import("./Web");
+if (ENV === "node") {
+    tpskrt = tpskrtNode;
+}
+else if (ENV === "web") {
+    tpskrt = tpskrtWeb;
+}
+else {
+    throw `Unknown ENV ${ENV}`;
+}
+export default async (input, testSpecification, testImplementation, testAdapter, testResourceRequirement = defaultTestResourceRequirement, testResourceConfiguration) => {
+    return (await tpskrt.default)(input, testSpecification, testImplementation, testResourceRequirement, testAdapter, testResourceConfiguration);
+};
+export const BaseAdapter = () => ({
+    beforeAll: async (input, testResource) => {
+        return input;
+    },
+    beforeEach: async function (subject, initializer, testResource, initialValues) {
+        return subject;
+    },
+    afterEach: async (store, key) => Promise.resolve(store),
+    afterAll: (store) => undefined,
+    butThen: async (store, thenCb, testResource) => {
+        return thenCb(store);
+    },
+    andWhen: async (store, whenCB, testResource) => {
+        return whenCB(store);
+    },
+    assertThis: (x) => x,
+});
+export const DefaultAdapter = (p) => {
+    const base = BaseAdapter();
+    return Object.assign(Object.assign({}, base), p);
+};

package/src/lib/tiposkripto/dist/common/lib/tiposkripto/src/types.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultTestResourceRequirement = void 0;
+exports.defaultTestResourceRequirement = {
+    ports: 0,
+};

package/{dist/common/src/lib/tiposkripto → src/lib/tiposkripto/dist/common/lib/tiposkripto/tests}/abstractBase.test/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Tiposkripto_1 = __importDefault(require("../Tiposkripto"));
+const Tiposkripto_1 = __importDefault(require("../../src/Tiposkripto"));
 const adapter_1 = require("./adapter");
 const implementation_1 = require("./implementation");
 const MockGiven_1 = require("./MockGiven");

package/src/lib/tiposkripto/dist/common/package.json

@@ -0,0 +1,3 @@
+{
+    "type": "commonjs"
+}