@elench/testkit 0.1.68 → 0.1.69

package/lib/runner/template-steps.mjs

@@ -1,11 +1,13 @@
 import crypto from "crypto";
 import fs from "fs";
+import { createRequire } from "module";
 import path from "path";
 import { build } from "esbuild";
 import { execa, execaCommand } from "execa";
 import { fileURLToPath } from "url";
 import {
   collectConfiguredInputs,
+  isBareModuleSpecifier,
   parseModuleSpecifier,
   resolveConfiguredCwd,
   resolveConfiguredPath,
@@ -181,7 +183,7 @@ async function runConfiguredStep(config, step, env, resolvedToolchain, options =
 
 async function bundleConfiguredModule(productDir, step) {
   const { modulePath } = parseModuleSpecifier(step.specifier);
-  const absoluteModulePath = resolveConfiguredPath(productDir, step.cwd, modulePath);
+  const absoluteModulePath = resolveConfiguredModuleEntry(productDir, step);
   const bundleDir = path.join(productDir, ".testkit", "_template-steps");
   fs.mkdirSync(bundleDir, { recursive: true });
 
@@ -210,6 +212,24 @@ async function bundleConfiguredModule(productDir, step) {
   };
 }
 
+function resolveConfiguredModuleEntry(productDir, step) {
+  const { modulePath } = parseModuleSpecifier(step.specifier);
+  if (modulePath.startsWith("@elench/testkit")) {
+    return resolvePackageSubpath(modulePath);
+  }
+  const candidatePath = resolveConfiguredPath(productDir, step.cwd, modulePath);
+  if (fs.existsSync(candidatePath)) {
+    return candidatePath;
+  }
+  if (!isBareModuleSpecifier(modulePath)) {
+    return candidatePath;
+  }
+
+  const cwd = resolveConfiguredCwd(productDir, step.cwd);
+  const requireFromCwd = createRequire(path.join(cwd, "__testkit__.cjs"));
+  return requireFromCwd.resolve(modulePath);
+}
+
 function buildModuleCacheKey(modulePath) {
   const content = fs.readFileSync(modulePath, "utf8");
   return crypto.createHash("sha256").update(modulePath).update("\0").update(content).digest("hex");

package/lib/shared/build-config.mjs

@@ -117,7 +117,7 @@ export function buildConfigToPrepare(build) {
           kind: "command",
           cmd: build.script,
           cwd: build.cwd || undefined,
-          inputs: [...build.inputs],
+          inputs: [],
         },
       ],
     };
@@ -132,13 +132,13 @@ export function buildConfigToPrepare(build) {
           kind: "module",
           specifier: "@elench/testkit/setup/next-runtime-tsconfig#writeNextRuntimeTsconfig",
           cwd: build.cwd || undefined,
-          inputs,
+          inputs: [],
         },
         {
           kind: "command",
           cmd: "./node_modules/.bin/next build",
           cwd: build.cwd || undefined,
-          inputs,
+          inputs: [],
         },
       ],
     };
@@ -149,15 +149,15 @@ export function buildConfigToPrepare(build) {
   return {
     inputs,
     steps: [
-      {
-        kind: "command",
-        cmd,
-        cwd: build.cwd || undefined,
-        inputs,
-      },
-    ],
-  };
-}
+        {
+          kind: "command",
+          cmd,
+          cwd: build.cwd || undefined,
+          inputs: [],
+        },
+      ],
+    };
+  }
 
 export function compiledEntryFromBuild(build) {
   if (!build || build.kind !== "tsc") return null;

package/lib/shared/build-config.test.mjs

@@ -32,7 +32,7 @@ describe("shared build config helpers", () => {
           kind: "command",
           cmd: './node_modules/.bin/tsc -p tsconfig.json --outDir "{prepareDir}/dist"',
           cwd: undefined,
-          inputs: ["tsconfig.json", "package.json", "src"],
+          inputs: [],
         },
       ],
     });
@@ -118,31 +118,13 @@ describe("shared build config helpers", () => {
           kind: "module",
           specifier: "@elench/testkit/setup/next-runtime-tsconfig#writeNextRuntimeTsconfig",
           cwd: "frontend",
-          inputs: [
-            "frontend/tsconfig.json",
-            "frontend/package.json",
-            "frontend/src",
-            "frontend/app",
-            "frontend/public",
-            "frontend/next.config.js",
-            "frontend/next.config.mjs",
-            "frontend/next.config.ts",
-          ],
+          inputs: [],
         },
         {
           kind: "command",
           cmd: "./node_modules/.bin/next build",
           cwd: "frontend",
-          inputs: [
-            "frontend/tsconfig.json",
-            "frontend/package.json",
-            "frontend/src",
-            "frontend/app",
-            "frontend/public",
-            "frontend/next.config.js",
-            "frontend/next.config.mjs",
-            "frontend/next.config.ts",
-          ],
+          inputs: [],
         },
       ],
     });

package/lib/shared/configured-steps.mjs

@@ -94,6 +94,12 @@ export function parseModuleSpecifier(specifier) {
   };
 }
 
+export function isBareModuleSpecifier(modulePath) {
+  if (typeof modulePath !== "string" || modulePath.length === 0) return false;
+  if (modulePath.startsWith("./") || modulePath.startsWith("../")) return false;
+  return !path.isAbsolute(modulePath);
+}
+
 export function resolveConfiguredCwd(productDir, stepCwd) {
   return path.resolve(productDir, stepCwd || ".");
 }
@@ -112,7 +118,15 @@ export function collectConfiguredInputs(productDir, { inputs = [], steps = [] }
       collected.add(resolveConfiguredPath(productDir, step.cwd, step.path));
     }
     if (step.kind === "module") {
-      collected.add(resolveConfiguredPath(productDir, step.cwd, parseModuleSpecifier(step.specifier).modulePath));
+      const { modulePath } = parseModuleSpecifier(step.specifier);
+      const candidatePath = resolveConfiguredPath(productDir, step.cwd, modulePath);
+      if (modulePath.startsWith("@elench/testkit") || fs.existsSync(candidatePath)) {
+        if (!modulePath.startsWith("@elench/testkit")) {
+          collected.add(candidatePath);
+        }
+      } else if (!isBareModuleSpecifier(modulePath)) {
+        collected.add(candidatePath);
+      }
     }
     for (const input of step.inputs || []) {
       collected.add(resolveConfiguredPath(productDir, step.cwd, input));
@@ -160,10 +174,15 @@ export function validateConfiguredCollection({ productDir, label, inputs = [], s
       ensureExistingPath(resolveConfiguredPath(productDir, step.cwd, step.path), `${label} sql file`);
     }
     if (step.kind === "module") {
-      ensureExistingPath(
-        resolveConfiguredPath(productDir, step.cwd, parseModuleSpecifier(step.specifier).modulePath),
-        `${label} module`
-      );
+      const { modulePath } = parseModuleSpecifier(step.specifier);
+      const candidatePath = resolveConfiguredPath(productDir, step.cwd, modulePath);
+      if (modulePath.startsWith("@elench/testkit")) {
+        // Internal testkit module steps are resolved by the runtime alias map.
+      } else if (fs.existsSync(candidatePath)) {
+        ensureExistingPath(candidatePath, `${label} module`);
+      } else if (!isBareModuleSpecifier(modulePath)) {
+        ensureExistingPath(candidatePath, `${label} module`);
+      }
     }
     for (const input of step.inputs || []) {
       ensureExistingPath(resolveConfiguredPath(productDir, step.cwd, input), `${label} step input`);

package/lib/shared/configured-steps.test.mjs

@@ -5,6 +5,7 @@ import { afterEach, describe, expect, it } from "vitest";
 import {
   collectConfiguredInputs,
   finalizeConfiguredStep,
+  isBareModuleSpecifier,
   normalizeConfiguredStep,
   parseModuleSpecifier,
   validateConfiguredCollection,
@@ -70,4 +71,32 @@ describe("shared configured steps", () => {
       })
     ).not.toThrow();
   });
+
+  it("treats bare module specifiers as modules, not product-relative file paths", () => {
+    const productDir = fs.mkdtempSync(path.join(os.tmpdir(), "testkit-configured-steps-"));
+    tempDirs.push(productDir);
+    fs.mkdirSync(path.join(productDir, "frontend"), { recursive: true });
+
+    const collection = {
+      inputs: [],
+      steps: [
+        {
+          kind: "module",
+          specifier: "@elench/testkit/setup/next-runtime-tsconfig#writeNextRuntimeTsconfig",
+          cwd: "frontend",
+          inputs: [],
+        },
+      ],
+    };
+
+    expect(isBareModuleSpecifier("@elench/testkit/setup/next-runtime-tsconfig")).toBe(true);
+    expect(collectConfiguredInputs(productDir, collection)).toEqual([]);
+    expect(() =>
+      validateConfiguredCollection({
+        productDir,
+        label: 'Service "frontend" runtime.prepare',
+        ...collection,
+      })
+    ).not.toThrow();
+  });
 });

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

@@ -1,6 +1,6 @@
 {
   "name": "@elench/next-analysis",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "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.68",
+  "version": "0.1.69",
   "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.68"
+    "@elench/testkit-protocol": "0.1.69"
   },
   "private": false
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit-protocol",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "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.68",
+  "version": "0.1.69",
   "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.68",
+  "version": "0.1.69",
   "description": "CLI for discovering and running local HTTP, DAL, and Playwright test suites",
   "type": "module",
   "workspaces": [
@@ -64,10 +64,10 @@
     "vitest": "^3.2.4"
   },
   "dependencies": {
-    "@elench/next-analysis": "0.1.68",
-    "@elench/ts-analysis": "0.1.68",
-    "@elench/testkit-bridge": "0.1.68",
-    "@elench/testkit-protocol": "0.1.68",
+    "@elench/next-analysis": "0.1.69",
+    "@elench/ts-analysis": "0.1.69",
+    "@elench/testkit-bridge": "0.1.69",
+    "@elench/testkit-protocol": "0.1.69",
     "@babel/code-frame": "^7.29.0",
     "@oclif/core": "^4.10.6",
     "esbuild": "^0.25.11",