@elench/testkit 0.1.71 → 0.1.73

package/lib/app/typecheck.mjs

@@ -2,6 +2,7 @@ import fs from "fs";
 import path from "path";
 import { spawn } from "child_process";
 import { fileURLToPath } from "url";
+import ts from "typescript";
 import { loadConfigContext } from "../config/index.mjs";
 import { detectNextApp } from "../config/runtime.mjs";
 
@@ -68,15 +69,11 @@ function writeRootTypecheckConfig({ productDir, configFile, outputDir }) {
   const extendsPath = findExistingTsconfig(productDir) || null;
   const config = {
     ...(extendsPath ? { extends: relativeJsonPath(tsconfigPath, extendsPath) } : {}),
-    compilerOptions: {
-      baseUrl: ".",
-      module: "ESNext",
-      moduleResolution: "Bundler",
-      noEmit: true,
-      paths: packageTypePaths(tsconfigPath),
+    compilerOptions: buildTypecheckCompilerOptions({
+      tsconfigPath,
+      extendsPath,
       rootDir: relativeJsonPath(tsconfigPath, productDir),
-      target: "ES2022",
-    },
+    }),
     include: [
       configFile ? relativeJsonPath(tsconfigPath, configFile) : "testkit.config.ts",
       "**/*.int.testkit.ts",
@@ -101,18 +98,16 @@ function writeNextServiceTypecheckConfig({ productDir, cwd, outputDir, serviceNa
     null;
   const config = {
     ...(extendsPath ? { extends: relativeJsonPath(tsconfigPath, extendsPath) } : {}),
-    compilerOptions: {
-      baseUrl: ".",
-      module: "ESNext",
-      moduleResolution: "Bundler",
-      noEmit: true,
-      paths: packageTypePaths(tsconfigPath),
-      target: "ES2022",
-    },
+    compilerOptions: buildTypecheckCompilerOptions({
+      tsconfigPath,
+      extendsPath,
+    }),
     include: [
       serviceExists(serviceDir, "next-env.d.ts") ? relativeJsonPath(tsconfigPath, path.join(serviceDir, "next-env.d.ts")) : undefined,
       relativeGlob(tsconfigPath, serviceDir, "src/**/*.pw.testkit.ts"),
-      relativeGlob(tsconfigPath, serviceDir, "tests/**/*.ts"),
+      relativeGlob(tsconfigPath, serviceDir, "tests/playwright-fixtures/**/*.ts"),
+      relativeGlob(tsconfigPath, serviceDir, "tests/playwright-fixtures/**/*.tsx"),
+      relativeGlob(tsconfigPath, serviceDir, "tests/playwright-fixtures/**/*.mts"),
       relativeGlob(tsconfigPath, serviceDir, ".next/types/**/*.ts"),
       relativeGlob(tsconfigPath, serviceDir, ".next/dev/types/**/*.ts"),
       relativeGlob(tsconfigPath, serviceDir, ".next-testkit/**/dist/types/**/*.ts"),
@@ -205,3 +200,42 @@ function packageTypePaths(tsconfigPath) {
     "@elench/testkit/vitest": [relativeJsonPath(tsconfigPath, path.join(PACKAGE_ROOT, "lib", "vitest", "index.d.ts"))],
   };
 }
+
+export function buildTypecheckCompilerOptions({ tsconfigPath, extendsPath, rootDir }) {
+  const inheritedPaths = extendsPath ? resolveInheritedPathMappings({ tsconfigPath, extendsPath }) : {};
+  const paths = {
+    ...inheritedPaths,
+    ...packageTypePaths(tsconfigPath),
+  };
+
+  return {
+    baseUrl: ".",
+    module: "ESNext",
+    moduleResolution: "Bundler",
+    noEmit: true,
+    ...(rootDir ? { rootDir } : {}),
+    target: "ES2022",
+    ...(Object.keys(paths).length > 0 ? { paths } : {}),
+  };
+}
+
+function resolveInheritedPathMappings({ tsconfigPath, extendsPath }) {
+  const parsed = ts.getParsedCommandLineOfConfigFile(extendsPath, {}, {
+    ...ts.sys,
+    onUnRecoverableConfigFileDiagnostic: () => {},
+  });
+  const compilerPaths = parsed?.options?.paths;
+  if (!compilerPaths || Object.keys(compilerPaths).length === 0) {
+    return {};
+  }
+
+  const baseDir = parsed?.options?.baseUrl || path.dirname(extendsPath);
+  const mappedEntries = Object.entries(compilerPaths).map(([alias, targets]) => {
+    const normalizedTargets = Array.isArray(targets)
+      ? targets.map((target) => relativeJsonPath(tsconfigPath, path.resolve(baseDir, target)))
+      : [];
+    return [alias, normalizedTargets];
+  });
+
+  return Object.fromEntries(mappedEntries);
+}

package/lib/app/typecheck.test.mjs

@@ -0,0 +1,24 @@
+import path from "path";
+import { describe, expect, it } from "vitest";
+import { buildTypecheckCompilerOptions } from "./typecheck.mjs";
+
+describe("typecheck app helpers", () => {
+  it("preserves inherited service alias paths when generating next-service configs", () => {
+    const fixtureRoot = "/home/georgedlr/workspace/elench/bourne";
+    const extendsPath = path.join(fixtureRoot, "frontend", "tsconfig.json");
+    const generatedTsconfig = path.join(fixtureRoot, ".testkit", "_typecheck", "frontend.tsconfig.json");
+
+    const compilerOptions = buildTypecheckCompilerOptions({
+      tsconfigPath: generatedTsconfig,
+      extendsPath,
+    });
+
+    expect(compilerOptions.paths?.["@/*"]).toEqual(["../../frontend/src/*"]);
+    expect(compilerOptions.paths?.["@playwright-fixtures/*"]).toEqual([
+      "../../frontend/tests/playwright-fixtures/*",
+    ]);
+    expect(compilerOptions.paths?.["@elench/testkit/config"]?.[0]).toMatch(
+      /(?:\.\.\/)+(?:node_modules\/@elench\/testkit|testkit)\/lib\/config-api\/index\.d\.ts$/
+    );
+  });
+});

package/lib/runner/template-steps.mjs

@@ -29,7 +29,12 @@ const CONFIG_NEXT_TSCONFIG_ENTRY = path.join(
   "config-api",
   "next-runtime-tsconfig.mjs"
 );
+const DRIZZLE_ENTRY = path.join(PACKAGE_ROOT, "lib", "drizzle", "index.mjs");
+const ENV_ENTRY = path.join(PACKAGE_ROOT, "lib", "env", "index.mjs");
+const PLAYWRIGHT_ENTRY = path.join(PACKAGE_ROOT, "lib", "playwright", "index.mjs");
 const RUNTIME_ENTRY = path.join(PACKAGE_ROOT, "lib", "runtime", "index.mjs");
+const VITEST_ENTRY = path.join(PACKAGE_ROOT, "lib", "vitest", "index.mjs");
+const DISCOVERY_ENTRY = path.join(PACKAGE_ROOT, "lib", "discovery", "index.mjs");
 const KNOWN_FAILURES_ENTRY = path.join(PACKAGE_ROOT, "lib", "known-failures", "index.mjs");
 const MODULE_RUNNER_ENTRY = path.join(
   PACKAGE_ROOT,
@@ -252,7 +257,12 @@ function resolvePackageSubpath(specifier) {
   if (!subpath) return ROOT_ENTRY;
   if (subpath === "/config") return CONFIG_ENTRY;
   if (subpath === "/config/next-runtime-tsconfig") return CONFIG_NEXT_TSCONFIG_ENTRY;
+  if (subpath === "/drizzle") return DRIZZLE_ENTRY;
+  if (subpath === "/env") return ENV_ENTRY;
+  if (subpath === "/playwright") return PLAYWRIGHT_ENTRY;
   if (subpath === "/runtime") return RUNTIME_ENTRY;
+  if (subpath === "/vitest") return VITEST_ENTRY;
+  if (subpath === "/discovery") return DISCOVERY_ENTRY;
   if (subpath === "/known-failures") return KNOWN_FAILURES_ENTRY;
 
   throw new Error(`Unsupported @elench/testkit import "${specifier}" while loading template step`);

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

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

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

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