@elench/testkit 0.1.27 → 0.1.28

package/README.md

@@ -109,11 +109,12 @@ const suite = defineHttpSuite(({ rawReq }) => {
   rawReq("GET", "/health");
 });
 
-export const options = suite.options;
-export const setup = suite.setup;
-export default suite.exec;
+export default suite;
 ```
 
+`testkit` suite files should default-export the suite object returned by
+`defineHttpSuite(...)` or `defineDalSuite(...)`.
+
 Named HTTP profiles live in `testkit.setup.ts` and can be referenced by name:
 
 ```ts
@@ -132,6 +133,8 @@ import { defineDalSuite } from "@elench/testkit";
 const suite = defineDalSuite(({ db }) => {
   db.query("select 1");
 });
+
+export default suite;
 ```
 
 Low-level runtime primitives remain available:

package/lib/bundler/index.mjs

@@ -119,8 +119,37 @@ registerRepoSetup(null);
 import { registerRepoSetup } from "@elench/testkit/setup";
 import * as suiteModule from ${sourceImport};
 ${setupRegistration}
-export const options = suiteModule.options;
-export const setup = suiteModule.setup;
-export default suiteModule.default;
+const suite = normalizeTestkitSuite(suiteModule);
+export const options = suite.options;
+export function setup(...args) {
+  return suite.setup(...args);
+}
+export default function exec(...args) {
+  return suite.exec(...args);
+}
+
+function normalizeTestkitSuite(module) {
+  const candidate = module?.default;
+  if (!candidate || typeof candidate !== "object") {
+    throw new Error(
+      "testkit suite files must default-export the suite object returned by defineHttpSuite(...) or defineDalSuite(...). Example: export default defineHttpSuite(...) or const suite = defineHttpSuite(...); export default suite;"
+    );
+  }
+  if (typeof candidate.exec !== "function") {
+    throw new Error(
+      "testkit suite default export must expose an exec(setupData) function"
+    );
+  }
+
+  const setupFn = typeof candidate["setup"] === "function"
+    ? (...args) => candidate.setup(...args)
+    : () => null;
+
+  return {
+    options: candidate["options"],
+    setup: setupFn,
+    exec: (...args) => candidate.exec(...args),
+  };
+}
 `;
 }

package/lib/bundler/index.test.mjs

@@ -1,6 +1,7 @@
 import fs from "fs";
 import os from "os";
 import path from "path";
+import { pathToFileURL } from "url";
 import { afterEach, describe, expect, it } from "vitest";
 import { bundleK6File } from "./index.mjs";
 
@@ -29,9 +30,7 @@ describe("runtime bundler", () => {
         '    "has status": (body) => typeof body.status === "string",',
         "  });",
         "});",
-        "export const options = suite.options;",
-        "export const setup = suite.setup;",
-        "export default suite.exec;",
+        "export default suite;",
         "",
       ].join("\n")
     );
@@ -60,9 +59,7 @@ describe("runtime bundler", () => {
         "const suite = defineDalSuite(({ db }) => {",
         '  db.query("SELECT 1");',
         "});",
-        "export const options = suite.options;",
-        "export const setup = suite.setup;",
-        "export default suite.exec;",
+        "export default suite;",
         "",
       ].join("\n")
     );
@@ -77,4 +74,62 @@ describe("runtime bundler", () => {
     expect(bundled).toContain("defineDalSuite");
     expect(bundled).toContain('import sql from "k6/x/sql"');
   });
+
+  it("normalizes a default-exported suite object with no setup override", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "testkit-bundle-"));
+    cleanups.push(() => fs.rmSync(tmpDir, { force: true, recursive: true }));
+
+    const sourceFile = path.join(tmpDir, "no-setup.js");
+    fs.writeFileSync(
+      sourceFile,
+      [
+        "const suite = {",
+        "  options: { vus: 1, iterations: 1 },",
+        "  exec() {",
+        "    return 'ok';",
+        "  },",
+        "};",
+        "export default suite;",
+        "",
+      ].join("\n")
+    );
+
+    const bundledFile = await bundleK6File({
+      productDir: tmpDir,
+      serviceName: "api",
+      sourceFile,
+    });
+
+    const bundled = await import(`${pathToFileURL(bundledFile).href}?v=${Date.now()}`);
+    expect(typeof bundled.setup).toBe("function");
+    expect(bundled.setup()).toBeNull();
+    expect(typeof bundled.default).toBe("function");
+    expect(bundled.default()).toBe("ok");
+  });
+
+  it("throws a clear error when the default export is not a suite object", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "testkit-bundle-"));
+    cleanups.push(() => fs.rmSync(tmpDir, { force: true, recursive: true }));
+
+    const sourceFile = path.join(tmpDir, "legacy-shape.js");
+    fs.writeFileSync(
+      sourceFile,
+      [
+        "export default function exec() {",
+        "  return 'legacy';",
+        "}",
+        "",
+      ].join("\n")
+    );
+
+    const bundledFile = await bundleK6File({
+      productDir: tmpDir,
+      serviceName: "api",
+      sourceFile,
+    });
+
+    await expect(
+      import(`${pathToFileURL(bundledFile).href}?v=${Date.now()}`)
+    ).rejects.toThrow(/default-export the suite object/);
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "CLI for discovering and running local HTTP, DAL, and Playwright test suites",
   "type": "module",
   "types": "./lib/index.d.ts",