@elench/testkit 0.1.81 → 0.1.82

package/lib/runtime-src/k6/scenario-suite.js

@@ -7,17 +7,22 @@ import {
   startFailureCollection,
 } from "./checks.js";
 import {
-  createHttpClient,
   emitHttpTraceCollectionArtifact,
-  getEnv,
   startHttpTraceCollection,
 } from "./http.js";
 import {
   clearRuntimeContext,
   registerRuntimeContext,
-  resolveHttpProfile,
 } from "../../config-api/runtime.mjs";
 import { createScenarioRuntime } from "./scenario-runtime.js";
+import {
+  buildRuntimeExceptionDetail,
+  createSuiteActors,
+  formatFatalSuiteError,
+  mergeProfileConfig,
+  normalizeSuiteArgs,
+  resolveRuntimeConfig,
+} from "./http-suite-runtime.js";
 
 export function defineScenarioSuite(configOrRun, maybeRun) {
   const { config, run } = normalizeSuiteArgs(configOrRun, maybeRun);
@@ -45,7 +50,8 @@ export function defineScenarioSuite(configOrRun, maybeRun) {
       }
     },
     exec(setupData) {
-      const resolved = resolveRuntimeConfig(config);
+      const resolved = resolveRuntimeConfig(config, setupData);
+      const actorContext = createSuiteActors(setupData, resolved.client, resolved.profileMeta);
       const scenario = createScenarioRuntime({
         seed: resolved.env.rawEnv.TESTKIT_SCENARIO_SEED,
       });
@@ -54,12 +60,11 @@ export function defineScenarioSuite(configOrRun, maybeRun) {
       try {
         registerRuntimeContext({ env: resolved.env, http: resolved.client.rawHttp || null });
         return run({
+          actor: actorContext.actor,
+          actors: actorContext.actors,
           env: resolved.env,
-          req: resolved.client.request,
+          req: resolved.client,
           rawReq: resolved.client.raw,
-          getWithHeaders: resolved.client.getWithHeaders,
-          setupData,
-          session: setupData,
           scenario,
         });
       } catch (error) {
@@ -75,105 +80,3 @@ export function defineScenarioSuite(configOrRun, maybeRun) {
     },
   };
 }
-
-function normalizeSuiteArgs(configOrRun, maybeRun) {
-  if (typeof configOrRun === "function") {
-    return { config: {}, run: configOrRun };
-  }
-  if (typeof maybeRun !== "function") {
-    throw new Error("suite factory requires a run callback");
-  }
-  return { config: configOrRun || {}, run: maybeRun };
-}
-
-function callHeaders(builder, setupData, env) {
-  if (typeof builder !== "function") return {};
-  return builder(setupData, { env }) || {};
-}
-
-function mergeProfileConfig(config) {
-  if (!config?.profile) return config || {};
-
-  const profile = resolveHttpProfile(config.profile) || {};
-  return {
-    ...profile,
-    ...config,
-    auth: config.auth ?? profile.auth ?? null,
-    headers: config.headers ?? profile.headers,
-    rawHeaders: config.rawHeaders ?? profile.rawHeaders,
-    options: config.options ?? profile.options,
-    env: config.env ?? profile.env,
-  };
-}
-
-function resolveRuntimeConfig(config) {
-  const resolvedConfig = mergeProfileConfig(config);
-  const env = {
-    ...(resolvedConfig.env || getEnv()),
-    rawEnv: __ENV,
-  };
-  const auth = resolvedConfig.auth || null;
-  const client = createHttpClient({
-    baseUrl: env.BASE,
-    routeHeaders: env.routeParams,
-    getHeaders(setupData) {
-      return {
-        ...callHeaders(auth?.headers, setupData, env),
-        ...callHeaders(resolvedConfig.headers, setupData, env),
-      };
-    },
-    getRawHeaders(setupData) {
-      return callHeaders(resolvedConfig.rawHeaders, setupData, env);
-    },
-  });
-
-  return {
-    resolvedConfig,
-    env,
-    auth,
-    client,
-  };
-}
-
-function formatFatalSuiteError(phase, error) {
-  if (error instanceof Error) {
-    return `Uncaught testkit suite error during ${phase}: ${error.message}`;
-  }
-  return `Uncaught testkit suite error during ${phase}: ${String(error)}`;
-}
-
-function buildRuntimeExceptionDetail(phase, error) {
-  const message = error instanceof Error ? error.message : String(error);
-  const stack = error instanceof Error && typeof error.stack === "string" ? error.stack : "";
-  const location = extractLocationFromStack(stack);
-  return {
-    kind: "runtime-exception",
-    key: location
-      ? `${location.path}:${location.line}:${location.column}`
-      : `runtime-exception:${phase}:${message}`,
-    title: "Uncaught runtime exception",
-    message: `Uncaught testkit suite error during ${phase}: ${message}`,
-    location,
-    stack,
-  };
-}
-
-function extractLocationFromStack(stack) {
-  if (!stack) return null;
-  const matches = [...String(stack).matchAll(/(file:\/\/[^\s)]+|\/[^\s):]+):(\d+):(\d+)/g)].map(
-    (match) => ({
-      path: normalizeStackPath(match[1]),
-      line: Number(match[2]),
-      column: Number(match[3]),
-    })
-  );
-  return matches[0] || null;
-}
-
-function normalizeStackPath(rawPath) {
-  if (typeof rawPath !== "string") return rawPath;
-  if (rawPath.startsWith("file://")) {
-    return rawPath.slice("file://".length);
-  }
-  return rawPath;
-}

package/lib/runtime-src/k6/suite.js

@@ -7,16 +7,21 @@ import {
   startFailureCollection,
 } from "./checks.js";
 import {
-  createHttpClient,
   emitHttpTraceCollectionArtifact,
-  getEnv,
   startHttpTraceCollection,
 } from "./http.js";
 import {
   clearRuntimeContext,
   registerRuntimeContext,
-  resolveHttpProfile,
 } from "../../config-api/runtime.mjs";
+import {
+  buildRuntimeExceptionDetail,
+  createSuiteActors,
+  formatFatalSuiteError,
+  mergeProfileConfig,
+  normalizeSuiteArgs,
+  resolveRuntimeConfig,
+} from "./http-suite-runtime.js";
 
 export function defineHttpSuite(configOrRun, maybeRun) {
   const { config, run } = normalizeSuiteArgs(configOrRun, maybeRun);
@@ -44,18 +49,18 @@ export function defineHttpSuite(configOrRun, maybeRun) {
       }
     },
     exec(setupData) {
-      const resolved = resolveRuntimeConfig(config);
+      const resolved = resolveRuntimeConfig(config, setupData);
+      const actorContext = createSuiteActors(setupData, resolved.client, resolved.profileMeta);
       startFailureCollection("exec");
       startHttpTraceCollection("exec");
       try {
         registerRuntimeContext({ env: resolved.env, http: resolved.client.rawHttp || null });
         return run({
+          actor: actorContext.actor,
+          actors: actorContext.actors,
           env: resolved.env,
-          req: resolved.client.request,
+          req: resolved.client,
           rawReq: resolved.client.raw,
-          getWithHeaders: resolved.client.getWithHeaders,
-          setupData,
-          session: setupData,
         });
       } catch (error) {
         recordFailureDetail(buildRuntimeExceptionDetail("exec", error));
@@ -69,102 +74,3 @@ export function defineHttpSuite(configOrRun, maybeRun) {
     },
   };
 }
-
-function normalizeSuiteArgs(configOrRun, maybeRun) {
-  if (typeof configOrRun === "function") {
-    return { config: {}, run: configOrRun };
-  }
-  if (typeof maybeRun !== "function") {
-    throw new Error("suite factory requires a run callback");
-  }
-  return { config: configOrRun || {}, run: maybeRun };
-}
-
-function callHeaders(builder, setupData, env) {
-  if (typeof builder !== "function") return {};
-  return builder(setupData, { env }) || {};
-}
-
-function mergeProfileConfig(config) {
-  if (!config?.profile) return config || {};
-
-  const profile = resolveHttpProfile(config.profile) || {};
-  return {
-    ...profile,
-    ...config,
-    auth: config.auth ?? profile.auth ?? null,
-    headers: config.headers ?? profile.headers,
-    rawHeaders: config.rawHeaders ?? profile.rawHeaders,
-    options: config.options ?? profile.options,
-    env: config.env ?? profile.env,
-  };
-}
-
-function resolveRuntimeConfig(config) {
-  const resolvedConfig = mergeProfileConfig(config);
-  const env = {
-    ...(resolvedConfig.env || getEnv()),
-    rawEnv: __ENV,
-  };
-  const auth = resolvedConfig.auth || null;
-  const client = createHttpClient({
-    baseUrl: env.BASE,
-    routeHeaders: env.routeParams,
-    getHeaders(setupData) {
-      return {
-        ...callHeaders(auth?.headers, setupData, env),
-        ...callHeaders(resolvedConfig.headers, setupData, env),
-      };
-    },
-    getRawHeaders(setupData) {
-      return callHeaders(resolvedConfig.rawHeaders, setupData, env);
-    },
-  });
-
-  return {
-    resolvedConfig,
-    env,
-    auth,
-    client,
-  };
-}
-
-function formatFatalSuiteError(phase, error) {
-  if (error instanceof Error) {
-    return `Uncaught testkit suite error during ${phase}: ${error.message}`;
-  }
-  return `Uncaught testkit suite error during ${phase}: ${String(error)}`;
-}
-
-function buildRuntimeExceptionDetail(phase, error) {
-  const message =
-    error instanceof Error ? error.message : String(error);
-  const stack = error instanceof Error && typeof error.stack === "string" ? error.stack : "";
-  const location = extractLocationFromStack(stack);
-  return {
-    kind: "runtime-exception",
-    key: location ? `${location.path}:${location.line}:${location.column}` : `runtime-exception:${phase}:${message}`,
-    title: "Uncaught runtime exception",
-    message: `Uncaught testkit suite error during ${phase}: ${message}`,
-    location,
-    stack,
-  };
-}
-
-function extractLocationFromStack(stack) {
-  if (!stack) return null;
-  const matches = [...String(stack).matchAll(/(file:\/\/[^\s)]+|\/[^\s):]+):(\d+):(\d+)/g)].map((match) => ({
-    path: normalizeStackPath(match[1]),
-    line: Number(match[2]),
-    column: Number(match[3]),
-  }));
-  return matches[0] || null;
-}
-
-function normalizeStackPath(rawPath) {
-  if (typeof rawPath !== "string") return rawPath;
-  if (rawPath.startsWith("file://")) {
-    return rawPath.slice("file://".length);
-  }
-  return rawPath;
-}

package/node_modules/@elench/next-analysis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/next-analysis",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "SWC-backed Next.js source analysis primitives for Erench tools",
   "type": "module",
   "exports": {

package/node_modules/@elench/testkit-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-bridge",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "Browser bridge helpers for testkit",
   "type": "module",
   "main": "./dist/index.js",
@@ -22,7 +22,7 @@
     "typecheck": "tsc -p tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@elench/testkit-protocol": "0.1.81"
+    "@elench/testkit-protocol": "0.1.82"
   },
   "private": false
 }

package/node_modules/@elench/testkit-protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-protocol",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "Shared browser protocol for testkit bridge and extension consumers",
   "type": "module",
   "main": "./dist/index.js",

package/node_modules/@elench/ts-analysis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/ts-analysis",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "TypeScript compiler-backed source analysis primitives for Erench tools",
   "type": "module",
   "exports": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "CLI for discovering and running local HTTP, DAL, and Playwright test suites",
   "type": "module",
   "workspaces": [
@@ -81,10 +81,10 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.29.0",
-    "@elench/next-analysis": "0.1.81",
-    "@elench/testkit-bridge": "0.1.81",
-    "@elench/testkit-protocol": "0.1.81",
-    "@elench/ts-analysis": "0.1.81",
+    "@elench/next-analysis": "0.1.82",
+    "@elench/testkit-bridge": "0.1.82",
+    "@elench/testkit-protocol": "0.1.82",
+    "@elench/ts-analysis": "0.1.82",
     "@oclif/core": "^4.10.6",
     "esbuild": "^0.25.11",
     "execa": "^9.5.0",