@elench/testkit 0.1.21 → 0.1.23

package/lib/config/model.mjs

@@ -213,23 +213,9 @@ export function validateServiceConfig(name, service, configPath) {
   }
 
   if (service.discovery !== undefined) {
-    if (!isObject(service.discovery)) {
-      throw new Error(`Service "${name}" discovery must be an object`);
-    }
-    if (
-      service.discovery.include !== undefined &&
-      (!Array.isArray(service.discovery.include) ||
-        service.discovery.include.some((value) => typeof value !== "string" || value.length === 0))
-    ) {
-      throw new Error(`Service "${name}" discovery.include must be an array of glob strings`);
-    }
-    if (
-      service.discovery.exclude !== undefined &&
-      (!Array.isArray(service.discovery.exclude) ||
-        service.discovery.exclude.some((value) => typeof value !== "string" || value.length === 0))
-    ) {
-      throw new Error(`Service "${name}" discovery.exclude must be an array of glob strings`);
-    }
+    throw new Error(
+      `Service "${name}" cannot define discovery. Testkit discovers *.testkit.ts files from the filesystem automatically.`
+    );
   }
 }
 

package/lib/config/model.test.mjs

@@ -95,11 +95,9 @@ QUX='zap'
 
     expect(() =>
       validateServiceConfig("api", {
-        discovery: {
-          include: "tests/**/*.int.testkit.ts",
-        },
+        discovery: {},
       }, "testkit.config.json")
-    ).toThrow("discovery.include must be an array of glob strings");
+    ).toThrow("cannot define discovery");
 
     expect(() =>
       validateTelemetryConfig(

package/lib/index.mjs

@@ -1 +1,13 @@
-export * from "./k6/index.mjs";
+export {
+  defineDalSuite,
+} from "./runtime-src/k6/dal-suite.js";
+export {
+  defineHttpSuite,
+} from "./runtime-src/k6/suite.js";
+
+export function createAuthAdapter({ setup, headers } = {}) {
+  return {
+    setup,
+    headers,
+  };
+}

package/lib/runner/index.mjs

@@ -535,11 +535,11 @@ async function startLocalService(config) {
 async function runHttpK6Batch(targetConfig, batch) {
   const baseUrl = targetConfig.testkit.local?.baseUrl;
   if (!baseUrl) {
-    throw new Error(`Service "${targetConfig.name}" requires local.baseUrl for HTTP k6 suites`);
+    throw new Error(`Service "${targetConfig.name}" requires local.baseUrl for HTTP suites`);
   }
 
   console.log(
-    `\n── ${targetConfig.workerLabel} ${batch.type}:${batch.tasks[0].suiteName} (${batch.framework}, ${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"}) ──`
+    `\n── ${targetConfig.workerLabel} ${batch.type}:${batch.tasks[0].suiteName}${formatBatchDescriptor(batch)} ──`
   );
 
   return Promise.all(
@@ -586,7 +586,7 @@ async function runDalBatch(targetConfig, batch) {
   }
 
   console.log(
-    `\n── ${targetConfig.workerLabel} ${batch.type}:${batch.tasks[0].suiteName} (${batch.framework}, ${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"}) ──`
+    `\n── ${targetConfig.workerLabel} ${batch.type}:${batch.tasks[0].suiteName}${formatBatchDescriptor(batch)} ──`
   );
 
   return Promise.all(
@@ -866,7 +866,7 @@ function printRunSummary(results, durationMs) {
         const fileDetail =
           suite.failedFiles.length > 0 ? `  (${suite.failedFiles.join(", ")})` : "";
         console.log(
-          `  - ${suite.type}:${suite.name} [${suite.framework}]${fileDetail} · ${formatDuration(suite.durationMs)}`
+          `  - ${suite.type}:${suite.name}${formatSuiteFramework(suite.framework)}${fileDetail} · ${formatDuration(suite.durationMs)}`
         );
         if (suite.error) {
           console.log(`    ${suite.error}`);
@@ -911,6 +911,22 @@ function longestServiceName(results) {
   return longestServiceNameModel(results);
 }
 
+function formatBatchDescriptor(batch) {
+  const fileLabel = `${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"}`;
+  const frameworkLabel = formatFrameworkLabel(batch.framework);
+  return frameworkLabel ? ` (${frameworkLabel}, ${fileLabel})` : ` (${fileLabel})`;
+}
+
+function formatFrameworkLabel(framework) {
+  if (!framework || framework === "k6") return "";
+  return framework;
+}
+
+function formatSuiteFramework(framework) {
+  const label = formatFrameworkLabel(framework);
+  return label ? ` [${label}]` : "";
+}
+
 function buildRunArtifact({
   productDir,
   results,

package/lib/runner/results.mjs

@@ -177,7 +177,7 @@ export function finalizeServiceResult(tracker, startedAt, finishedAt) {
     suites: suites.map((suite) => ({
       name: suite.name,
       type: suite.type,
-      framework: suite.framework,
+      framework: formatFrameworkForArtifact(suite.framework),
       failed: suite.failedFiles.length > 0,
       fileCount: suite.fileCount,
       failedFiles: suite.failedFiles,
@@ -212,7 +212,6 @@ export function buildStatusArtifact({
         tests.push({
           service: result.name,
           type: suite.type,
-          framework: suite.framework,
           path: file.path,
           status: file.status,
         });
@@ -301,7 +300,7 @@ export function buildRunArtifact({
       suiteType,
       suiteNames,
       fileNames,
-      framework,
+      framework: formatFrameworkForArtifact(framework),
       shard,
       serviceFilter,
       testkitVersion: metadata.testkitVersion,
@@ -360,8 +359,8 @@ export function formatServiceSummary(result) {
 }
 
 export function formatError(error) {
-  if (error instanceof Error) return error.message;
-  return String(error);
+  if (error instanceof Error) return sanitizeErrorMessage(error.message);
+  return sanitizeErrorMessage(String(error));
 }
 
 export function longestServiceName(results) {
@@ -371,3 +370,15 @@ export function longestServiceName(results) {
 function normalizePathSeparators(filePath) {
   return filePath.split(path.sep).join("/");
 }
+
+function formatFrameworkForArtifact(framework) {
+  if (framework === "k6") return "default";
+  return framework;
+}
+
+function sanitizeErrorMessage(message) {
+  return message
+    .replace(/Command failed with exit code (\d+): .*?[\\/]vendor[\\/]k6 run\b/g, "Default runtime failed with exit code $1:")
+    .replace(/Command failed with exit code (\d+): k6 run\b/g, "Default runtime failed with exit code $1:")
+    .replace(/[\\/]vendor[\\/]k6\b/g, "default-runtime");
+}

package/lib/runner/results.test.mjs

@@ -65,6 +65,7 @@ describe("runner-results", () => {
     expect(result.failed).toBe(true);
     expect(result.failedSuiteCount).toBe(1);
     expect(result.errors).toEqual(["worker failed", "graph failed"]);
+    expect(result.suites[0].framework).toBe("default");
     expect(result.suites[0].files).toEqual([
       {
         path: "tests/health.js",
@@ -169,7 +170,7 @@ describe("runner-results", () => {
       suiteType: "int",
       suiteNames: ["health"],
       fileNames: ["tests/api/integration/b.int.testkit.ts"],
-      framework: "k6",
+      framework: "default",
       shard: null,
       serviceFilter: "api",
       metadata: {
@@ -210,14 +211,12 @@ describe("runner-results", () => {
         {
           service: "api",
           type: "integration",
-          framework: "k6",
           path: "tests/api/integration/a.int.testkit.ts",
           status: "passed",
         },
         {
           service: "api",
           type: "integration",
-          framework: "k6",
           path: "tests/api/integration/b.int.testkit.ts",
           status: "failed",
         },

package/lib/runtime/index.mjs

@@ -1,190 +1,31 @@
-import crypto from "crypto";
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const TESTKIT_CONFIG = "testkit.config.json";
-const DEFAULT_RUNTIME_DIR = path.join("tests", "_testkit");
-const METADATA_FILE = ".runtime-manifest.json";
-const RUNTIME_FORMAT = 1;
-
-export function installRuntime(options = {}) {
-  const productDir = resolveProductDir(process.cwd(), options.dir);
-  const runtimeDir = resolveRuntimeDir(productDir, options.path);
-  const sourceFiles = readBundledRuntimeFiles();
-
-  fs.mkdirSync(runtimeDir, { recursive: true });
-
-  for (const file of sourceFiles) {
-    const targetPath = path.join(runtimeDir, file.path);
-    fs.mkdirSync(path.dirname(targetPath), { recursive: true });
-    fs.writeFileSync(targetPath, file.content);
-  }
-
-  const metadata = {
-    format: RUNTIME_FORMAT,
-    package: "@elench/testkit",
-    version: readPackageVersion(),
-    files: sourceFiles.map((file) => ({
-      path: file.path,
-      sha256: hashContent(file.content),
-    })),
-  };
-  fs.writeFileSync(
-    path.join(runtimeDir, METADATA_FILE),
-    `${JSON.stringify(metadata, null, 2)}\n`
-  );
-
-  return {
-    productDir,
-    runtimeDir,
-    relativeRuntimeDir: relativeToProduct(productDir, runtimeDir),
-    files: metadata.files,
-  };
-}
-
-export function getRuntimeStatus(options = {}) {
-  const productDir = resolveProductDir(process.cwd(), options.dir);
-  const runtimeDir = resolveRuntimeDir(productDir, options.path);
-  const sourceFiles = readBundledRuntimeFiles();
-  const metadataPath = path.join(runtimeDir, METADATA_FILE);
-
-  if (!fs.existsSync(runtimeDir) || !fs.existsSync(metadataPath)) {
-    return {
-      status: "missing",
-      productDir,
-      runtimeDir,
-      relativeRuntimeDir: relativeToProduct(productDir, runtimeDir),
-      missingFiles: sourceFiles.map((file) => file.path),
-      driftedFiles: [],
-    };
-  }
-
-  const missingFiles = [];
-  const driftedFiles = [];
-
-  for (const file of sourceFiles) {
-    const targetPath = path.join(runtimeDir, file.path);
-    if (!fs.existsSync(targetPath)) {
-      missingFiles.push(file.path);
-      continue;
-    }
-
-    const installed = fs.readFileSync(targetPath, "utf8");
-    if (installed !== file.content) {
-      driftedFiles.push(file.path);
-    }
-  }
-
-  const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf8"));
-  const versionMatches = metadata.version === readPackageVersion();
-
-  return {
-    status:
-      missingFiles.length === 0 && driftedFiles.length === 0 && versionMatches
-        ? "installed"
-        : "drifted",
-    productDir,
-    runtimeDir,
-    relativeRuntimeDir: relativeToProduct(productDir, runtimeDir),
-    versionMatches,
-    missingFiles,
-    driftedFiles,
-  };
-}
-
-export function formatRuntimeStatus(result) {
-  if (result.status === "missing") {
-    return `Runtime not installed at ${result.relativeRuntimeDir}`;
-  }
-
-  if (result.status === "installed") {
-    return `Runtime at ${result.relativeRuntimeDir} is up to date`;
-  }
-
-  const problems = [];
-  if (result.missingFiles.length > 0) {
-    problems.push(`missing: ${result.missingFiles.join(", ")}`);
-  }
-  if (result.driftedFiles.length > 0) {
-    problems.push(`drifted: ${result.driftedFiles.join(", ")}`);
-  }
-  if (result.versionMatches === false) {
-    problems.push("version drift");
-  }
-
-  return `Runtime at ${result.relativeRuntimeDir} is drifted (${problems.join("; ")})`;
-}
-
-function resolveProductDir(cwd, explicitDir) {
-  const dir = explicitDir ? path.resolve(cwd, explicitDir) : cwd;
-  ensureProductFiles(dir);
-  return dir;
-}
-
-function ensureProductFiles(dir) {
-  const missing = [TESTKIT_CONFIG].filter(
-    (file) => !fs.existsSync(path.join(dir, file))
-  );
-
-  if (missing.length > 0) {
-    throw new Error(
-      `Expected ${missing.join(" and ")} in ${dir}. Either cd into a product directory or use --dir.`
-    );
-  }
-}
-
-function resolveRuntimeDir(productDir, explicitPath) {
-  return path.resolve(productDir, explicitPath || DEFAULT_RUNTIME_DIR);
-}
-
-function relativeToProduct(productDir, targetPath) {
-  return path.relative(productDir, targetPath) || ".";
-}
-
-function readBundledRuntimeFiles() {
-  const sourceDir = path.resolve(
-    path.dirname(fileURLToPath(import.meta.url)),
-    "..",
-    "runtime-src"
-  );
-
-  return walkRuntimeFiles(sourceDir);
-}
-
-function walkRuntimeFiles(rootDir, relativeDir = "") {
-  const entries = fs.readdirSync(path.join(rootDir, relativeDir), {
-    withFileTypes: true,
-  });
-  const files = [];
-
-  for (const entry of entries) {
-    const nextRelative = path.join(relativeDir, entry.name);
-    if (entry.isDirectory()) {
-      files.push(...walkRuntimeFiles(rootDir, nextRelative));
-      continue;
-    }
-
-    const absolute = path.join(rootDir, nextRelative);
-    files.push({
-      path: nextRelative.split(path.sep).join("/"),
-      content: fs.readFileSync(absolute, "utf8"),
-    });
-  }
-
-  return files.sort((left, right) => left.path.localeCompare(right.path));
-}
-
-function readPackageVersion() {
-  const packagePath = path.resolve(
-    path.dirname(fileURLToPath(import.meta.url)),
-    "..",
-    "..",
-    "package.json"
-  );
-  return JSON.parse(fs.readFileSync(packagePath, "utf8")).version;
-}
-
-function hashContent(content) {
-  return crypto.createHash("sha256").update(content).digest("hex");
-}
+import rawHttp from "k6/http";
+import { check, fail, group, sleep } from "k6";
+
+export { check, fail, group, sleep };
+export const http = rawHttp;
+
+export function file(data, filename, contentType) {
+  return rawHttp.file(data, filename, contentType);
+}
+
+export {
+  allMatch,
+  contains,
+  defaultOptions,
+  isSorted,
+  json,
+  singleIterationOptions,
+} from "../runtime-src/k6/checks.js";
+export {
+  createDalContext,
+  openDb,
+  truncate,
+} from "../runtime-src/k6/dal.js";
+export {
+  createHttpClient,
+  defaultOptions as httpDefaultOptions,
+  getEnv,
+  makeGetWithHeaders,
+  makeRawReq,
+  makeReq,
+} from "../runtime-src/k6/http.js";

package/lib/runtime-manager/index.mjs

@@ -0,0 +1,190 @@
+import crypto from "crypto";
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const TESTKIT_CONFIG = "testkit.config.json";
+const DEFAULT_RUNTIME_DIR = path.join("tests", "_testkit");
+const METADATA_FILE = ".runtime-manifest.json";
+const RUNTIME_FORMAT = 1;
+
+export function installRuntime(options = {}) {
+  const productDir = resolveProductDir(process.cwd(), options.dir);
+  const runtimeDir = resolveRuntimeDir(productDir, options.path);
+  const sourceFiles = readBundledRuntimeFiles();
+
+  fs.mkdirSync(runtimeDir, { recursive: true });
+
+  for (const file of sourceFiles) {
+    const targetPath = path.join(runtimeDir, file.path);
+    fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+    fs.writeFileSync(targetPath, file.content);
+  }
+
+  const metadata = {
+    format: RUNTIME_FORMAT,
+    package: "@elench/testkit",
+    version: readPackageVersion(),
+    files: sourceFiles.map((file) => ({
+      path: file.path,
+      sha256: hashContent(file.content),
+    })),
+  };
+  fs.writeFileSync(
+    path.join(runtimeDir, METADATA_FILE),
+    `${JSON.stringify(metadata, null, 2)}\n`
+  );
+
+  return {
+    productDir,
+    runtimeDir,
+    relativeRuntimeDir: relativeToProduct(productDir, runtimeDir),
+    files: metadata.files,
+  };
+}
+
+export function getRuntimeStatus(options = {}) {
+  const productDir = resolveProductDir(process.cwd(), options.dir);
+  const runtimeDir = resolveRuntimeDir(productDir, options.path);
+  const sourceFiles = readBundledRuntimeFiles();
+  const metadataPath = path.join(runtimeDir, METADATA_FILE);
+
+  if (!fs.existsSync(runtimeDir) || !fs.existsSync(metadataPath)) {
+    return {
+      status: "missing",
+      productDir,
+      runtimeDir,
+      relativeRuntimeDir: relativeToProduct(productDir, runtimeDir),
+      missingFiles: sourceFiles.map((file) => file.path),
+      driftedFiles: [],
+    };
+  }
+
+  const missingFiles = [];
+  const driftedFiles = [];
+
+  for (const file of sourceFiles) {
+    const targetPath = path.join(runtimeDir, file.path);
+    if (!fs.existsSync(targetPath)) {
+      missingFiles.push(file.path);
+      continue;
+    }
+
+    const installed = fs.readFileSync(targetPath, "utf8");
+    if (installed !== file.content) {
+      driftedFiles.push(file.path);
+    }
+  }
+
+  const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf8"));
+  const versionMatches = metadata.version === readPackageVersion();
+
+  return {
+    status:
+      missingFiles.length === 0 && driftedFiles.length === 0 && versionMatches
+        ? "installed"
+        : "drifted",
+    productDir,
+    runtimeDir,
+    relativeRuntimeDir: relativeToProduct(productDir, runtimeDir),
+    versionMatches,
+    missingFiles,
+    driftedFiles,
+  };
+}
+
+export function formatRuntimeStatus(result) {
+  if (result.status === "missing") {
+    return `Runtime not installed at ${result.relativeRuntimeDir}`;
+  }
+
+  if (result.status === "installed") {
+    return `Runtime at ${result.relativeRuntimeDir} is up to date`;
+  }
+
+  const problems = [];
+  if (result.missingFiles.length > 0) {
+    problems.push(`missing: ${result.missingFiles.join(", ")}`);
+  }
+  if (result.driftedFiles.length > 0) {
+    problems.push(`drifted: ${result.driftedFiles.join(", ")}`);
+  }
+  if (result.versionMatches === false) {
+    problems.push("version drift");
+  }
+
+  return `Runtime at ${result.relativeRuntimeDir} is drifted (${problems.join("; ")})`;
+}
+
+function resolveProductDir(cwd, explicitDir) {
+  const dir = explicitDir ? path.resolve(cwd, explicitDir) : cwd;
+  ensureProductFiles(dir);
+  return dir;
+}
+
+function ensureProductFiles(dir) {
+  const missing = [TESTKIT_CONFIG].filter(
+    (file) => !fs.existsSync(path.join(dir, file))
+  );
+
+  if (missing.length > 0) {
+    throw new Error(
+      `Expected ${missing.join(" and ")} in ${dir}. Either cd into a product directory or use --dir.`
+    );
+  }
+}
+
+function resolveRuntimeDir(productDir, explicitPath) {
+  return path.resolve(productDir, explicitPath || DEFAULT_RUNTIME_DIR);
+}
+
+function relativeToProduct(productDir, targetPath) {
+  return path.relative(productDir, targetPath) || ".";
+}
+
+function readBundledRuntimeFiles() {
+  const sourceDir = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    "..",
+    "runtime-src"
+  );
+
+  return walkRuntimeFiles(sourceDir);
+}
+
+function walkRuntimeFiles(rootDir, relativeDir = "") {
+  const entries = fs.readdirSync(path.join(rootDir, relativeDir), {
+    withFileTypes: true,
+  });
+  const files = [];
+
+  for (const entry of entries) {
+    const nextRelative = path.join(relativeDir, entry.name);
+    if (entry.isDirectory()) {
+      files.push(...walkRuntimeFiles(rootDir, nextRelative));
+      continue;
+    }
+
+    const absolute = path.join(rootDir, nextRelative);
+    files.push({
+      path: nextRelative.split(path.sep).join("/"),
+      content: fs.readFileSync(absolute, "utf8"),
+    });
+  }
+
+  return files.sort((left, right) => left.path.localeCompare(right.path));
+}
+
+function readPackageVersion() {
+  const packagePath = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    "..",
+    "..",
+    "package.json"
+  );
+  return JSON.parse(fs.readFileSync(packagePath, "utf8")).version;
+}
+
+function hashContent(content) {
+  return crypto.createHash("sha256").update(content).digest("hex");
+}

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.21",
-  "description": "CLI for discovering and running local test suites across k6 and Playwright",
+  "version": "0.1.23",
+  "description": "CLI for discovering and running local HTTP, DAL, and Playwright test suites",
   "type": "module",
   "exports": {
     ".": "./lib/index.mjs",
-    "./k6": "./lib/k6/index.mjs",
-    "./k6/*": "./lib/k6/*.mjs",
+    "./runtime": "./lib/runtime/index.mjs",
     "./package.json": "./package.json"
   },
   "bin": {

package/lib/k6/checks.mjs

@@ -1 +0,0 @@
-export * from "../runtime-src/k6/checks.js";

package/lib/k6/dal-suite.mjs

@@ -1 +0,0 @@
-export * from "../runtime-src/k6/dal-suite.js";

package/lib/k6/dal.mjs

@@ -1 +0,0 @@
-export * from "../runtime-src/k6/dal.js";

package/lib/k6/http.mjs

@@ -1 +0,0 @@
-export * from "../runtime-src/k6/http.js";

package/lib/k6/index.mjs

@@ -1,30 +0,0 @@
-export {
-  allMatch,
-  contains,
-  defaultOptions,
-  isSorted,
-  json,
-  singleIterationOptions,
-} from "../runtime-src/k6/checks.js";
-export {
-  createDalContext,
-  openDb,
-  truncate,
-} from "../runtime-src/k6/dal.js";
-export { defineDalSuite } from "../runtime-src/k6/dal-suite.js";
-export {
-  createHttpClient,
-  defaultOptions as httpDefaultOptions,
-  getEnv,
-  makeGetWithHeaders,
-  makeRawReq,
-  makeReq,
-} from "../runtime-src/k6/http.js";
-export { defineHttpSuite } from "../runtime-src/k6/suite.js";
-
-export function createAuthAdapter({ setup, headers } = {}) {
-  return {
-    setup,
-    headers,
-  };
-}

package/lib/k6/suite.mjs

@@ -1 +0,0 @@
-export * from "../runtime-src/k6/suite.js";