@elench/testkit 0.1.37 → 0.1.38

package/lib/config/index.mjs

@@ -101,7 +101,10 @@ function normalizeServiceConfig({
 }) {
   const local = normalizeLocalConfig(name, explicitService, discoveredService, productDir);
   const envFiles = inferEnvFiles(productDir, explicitService, local);
-  const serviceEnv = loadServiceEnv(productDir, envFiles);
+  const serviceEnv = {
+    ...loadServiceEnv(productDir, envFiles),
+    ...(explicitService.env || {}),
+  };
   const database = normalizeDatabaseConfig(explicitService, name);
   const migrate = normalizeLifecycle(explicitService.migrate);
   const seed = normalizeLifecycle(explicitService.seed);
@@ -151,7 +154,10 @@ function normalizeServiceConfig({
 }
 
 function normalizeLocalConfig(name, explicitService, discoveredService, productDir) {
-  if (explicitService.local) {
+  if (Object.prototype.hasOwnProperty.call(explicitService, "local")) {
+    if (explicitService.local === false) {
+      return undefined;
+    }
     return {
       ...explicitService.local,
       cwd: explicitService.local.cwd || ".",

package/lib/runner/state-io.mjs

@@ -5,6 +5,29 @@ export function readDatabaseUrl(stateDir) {
   return readStateValue(path.join(stateDir, "database_url"));
 }
 
+export function readDatabaseInfo(stateDir) {
+  return parseDatabaseUrl(readDatabaseUrl(stateDir));
+}
+
+export function parseDatabaseUrl(databaseUrl) {
+  if (!databaseUrl) return null;
+
+  try {
+    const parsed = new URL(databaseUrl);
+    const port = Number(parsed.port || "5432");
+    return {
+      url: databaseUrl,
+      host: parsed.hostname,
+      port: Number.isInteger(port) && port > 0 ? port : 5432,
+      database: parsed.pathname.replace(/^\//, ""),
+      user: decodeURIComponent(parsed.username || ""),
+      password: decodeURIComponent(parsed.password || ""),
+    };
+  } catch {
+    return null;
+  }
+}
+
 export function readStateValue(filePath) {
   if (!fs.existsSync(filePath)) return null;
   return fs.readFileSync(filePath, "utf8").trim();

package/lib/runner/template.mjs

@@ -1,4 +1,5 @@
 import path from "path";
+import { readDatabaseInfo } from "./state-io.mjs";
 
 const PORT_STRIDE = 100;
 
@@ -6,6 +7,14 @@ export function resolveWorkerRuntimeConfigs(targetConfig, runtimeConfigs, worker
   const portMap = buildPortMap(runtimeConfigs, workerId);
   const baseUrlByService = new Map();
   const readyUrlByService = new Map();
+  const stateDirByService = new Map();
+
+  for (const config of runtimeConfigs) {
+    stateDirByService.set(
+      config.name,
+      resolveServiceStateDir(workerStateDir, targetConfig.name, config)
+    );
+  }
 
   for (const config of runtimeConfigs) {
     if (!config.testkit.local) continue;
@@ -16,6 +25,7 @@ export function resolveWorkerRuntimeConfigs(targetConfig, runtimeConfigs, worker
         portMap,
         baseUrlByService,
         readyUrlByService,
+        stateDirByService,
       })
     );
     readyUrlByService.set(
@@ -25,6 +35,7 @@ export function resolveWorkerRuntimeConfigs(targetConfig, runtimeConfigs, worker
         portMap,
         baseUrlByService,
         readyUrlByService,
+        stateDirByService,
       })
     );
   }
@@ -51,6 +62,7 @@ export function resolveWorkerRuntimeConfigs(targetConfig, runtimeConfigs, worker
       portMap,
       baseUrlByService,
       readyUrlByService,
+      stateDirByService,
       urlMappings
     )
   );
@@ -90,6 +102,7 @@ export function resolveWorkerConfig(
   portMap,
   baseUrlByService,
   readyUrlByService,
+  stateDirByService,
   urlMappings
 ) {
   const stateDir = resolveServiceStateDir(workerStateDir, targetConfig.name, config);
@@ -101,6 +114,7 @@ export function resolveWorkerConfig(
     portMap,
     baseUrlByService,
     readyUrlByService,
+    stateDirByService,
     urlMappings,
   };
 
@@ -143,12 +157,7 @@ export function resolveWorkerConfig(
         port: portMap.get(config.name) || config.testkit.local.port,
         baseUrl: baseUrlByService.get(config.name),
         readyUrl: readyUrlByService.get(config.name),
-        env: Object.fromEntries(
-          Object.entries(config.testkit.local.env || {}).map(([key, value]) => [
-            key,
-            finalizeString(String(value), context),
-          ])
-        ),
+        env: { ...(config.testkit.local.env || {}) },
       }
     : undefined;
 
@@ -163,6 +172,7 @@ export function resolveWorkerConfig(
       database,
       migrate,
       seed,
+      templateContext: context,
       local,
     },
   };
@@ -182,10 +192,11 @@ export function getWorkerServiceStateDir(workerStateDir, targetName, serviceName
 
 export function buildExecutionEnv(config, extraEnv = {}, processEnv = process.env) {
   const inheritedEnv = { ...processEnv };
+  const templateContext = config.testkit?.templateContext;
   const env = {
     ...inheritedEnv,
-    ...(config.testkit.serviceEnv || {}),
-    ...extraEnv,
+    ...resolveEnvTemplates(config.testkit.serviceEnv || {}, templateContext),
+    ...resolveEnvTemplates(extraEnv, templateContext),
     TESTKIT_ACTIVE: "1",
     ...(config.workerId ? { TESTKIT_WORKER_ID: String(config.workerId) } : {}),
   };
@@ -266,12 +277,61 @@ export function resolveTemplateString(value, context) {
         }
         return readyUrl;
       }
+      case "dbUrl":
+      case "dbHost":
+      case "dbPort":
+      case "dbName":
+      case "dbUser":
+      case "dbPassword": {
+        const serviceName = arg || context.serviceName;
+        return resolveDatabaseTemplateValue(token, serviceName, context);
+      }
       default:
         throw new Error(`Unsupported template token "{${token}${arg ? `:${arg}` : ""}}"`);
     }
   });
 }
 
+function resolveEnvTemplates(values, templateContext) {
+  return Object.fromEntries(
+    Object.entries(values || {}).map(([key, value]) => [
+      key,
+      typeof value === "string" && templateContext ? finalizeString(value, templateContext) : value,
+    ])
+  );
+}
+
+function resolveDatabaseTemplateValue(token, serviceName, context) {
+  const stateDir = context.stateDirByService?.get(serviceName);
+  if (!stateDir) {
+    throw new Error(`Unknown database placeholder for service "${serviceName}"`);
+  }
+
+  const info = readDatabaseInfo(stateDir);
+  if (!info) {
+    throw new Error(
+      `Database placeholder "{${token}:${serviceName}}" is unavailable before "${serviceName}" database preparation`
+    );
+  }
+
+  switch (token) {
+    case "dbUrl":
+      return info.url;
+    case "dbHost":
+      return info.host;
+    case "dbPort":
+      return String(info.port);
+    case "dbName":
+      return info.database;
+    case "dbUser":
+      return info.user;
+    case "dbPassword":
+      return info.password;
+    default:
+      throw new Error(`Unsupported database placeholder "{${token}:${serviceName}}"`);
+  }
+}
+
 export function rewriteUrlPort(rawUrl, port) {
   try {
     const original = new URL(rawUrl);

package/lib/runner/template.test.mjs

@@ -1,3 +1,6 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
 import { describe, expect, it } from "vitest";
 import {
   buildExecutionEnv,
@@ -51,6 +54,14 @@ describe("runner-template", () => {
   });
 
   it("resolves template strings and URL rewrites", () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "testkit-template-"));
+    const apiStateDir = path.join(tmpDir, "api");
+    fs.mkdirSync(apiStateDir, { recursive: true });
+    fs.writeFileSync(
+      path.join(apiStateDir, "database_url"),
+      "postgres://testkit:testkit@127.0.0.1:55432/onix_db"
+    );
+
     const context = {
       workerId: 2,
       targetName: "frontend",
@@ -62,11 +73,15 @@ describe("runner-template", () => {
       ]),
       baseUrlByService: new Map([["api", "http://127.0.0.1:3100"]]),
       readyUrlByService: new Map([["api", "http://127.0.0.1:3100/health"]]),
+      stateDirByService: new Map([["api", apiStateDir]]),
       urlMappings: [["http://api:3000", "http://127.0.0.1:3100"]],
     };
 
     expect(resolveTemplateString("{worker}:{target}:{service}", context)).toBe("2:frontend:frontend");
     expect(resolveTemplateString("{baseUrl:api}", context)).toBe("http://127.0.0.1:3100");
+    expect(resolveTemplateString("{dbHost:api}:{dbPort:api}/{dbName:api}", context)).toBe(
+      "127.0.0.1:55432/onix_db"
+    );
     expect(finalizeString("API={baseUrl:api} OLD=http://api:3000", context)).toBe(
       "API=http://127.0.0.1:3100 OLD=http://127.0.0.1:3100"
     );
@@ -76,6 +91,7 @@ describe("runner-template", () => {
   });
 
   it("builds worker runtime configs and execution env", () => {
+    const workerStateDir = fs.mkdtempSync(path.join(os.tmpdir(), "testkit-worker-"));
     const api = makeRuntimeConfig("api", {
       cwd: ".",
       start: "npm run api",
@@ -98,26 +114,29 @@ describe("runner-template", () => {
       readyUrl: "http://127.0.0.1:{port}",
       env: {
         NEXT_PUBLIC_API_URL: "{baseUrl:api}",
+        ONIX_DB_HOST: "{dbHost:api}",
       },
     });
 
-    const resolved = resolveWorkerRuntimeConfigs(frontend, [api, frontend], 2, "/tmp/w2");
+    const resolved = resolveWorkerRuntimeConfigs(frontend, [api, frontend], 2, workerStateDir);
     expect(resolved[0].testkit.local.port).toBe(3100);
-    expect(resolved[1].testkit.local.env.NEXT_PUBLIC_API_URL).toBe("http://127.0.0.1:3100");
-    expect(resolveServiceStateDir("/tmp/w2", "frontend", api)).toBe("/tmp/w2/deps/api");
-    expect(getWorkerServiceStateDir("/tmp/w2", "frontend", "frontend")).toBe("/tmp/w2");
+    expect(resolved[1].testkit.local.env.NEXT_PUBLIC_API_URL).toBe("{baseUrl:api}");
+    expect(resolveServiceStateDir(workerStateDir, "frontend", api)).toBe(
+      `${workerStateDir}/deps/api`
+    );
+    expect(getWorkerServiceStateDir(workerStateDir, "frontend", "frontend")).toBe(workerStateDir);
+
+    fs.mkdirSync(path.join(workerStateDir, "deps", "api"), { recursive: true });
+    fs.writeFileSync(
+      path.join(workerStateDir, "deps", "api", "database_url"),
+      "postgres://testkit:testkit@127.0.0.1:55432/onix_db"
+    );
 
     expect(
       buildExecutionEnv(
+        resolved[1],
         {
-          workerId: 2,
-          testkit: {
-            serviceEnv: {
-              API_KEY: "secret",
-            },
-          },
-        },
-        {
+          ...resolved[1].testkit.local.env,
           DATABASE_URL: "gone",
         },
         {
@@ -126,7 +145,8 @@ describe("runner-template", () => {
       )
     ).toEqual({
       PATH: "/usr/bin",
-      API_KEY: "secret",
+      NEXT_PUBLIC_API_URL: "http://127.0.0.1:3100",
+      ONIX_DB_HOST: "127.0.0.1",
       TESTKIT_ACTIVE: "1",
       TESTKIT_WORKER_ID: "2",
     });

package/lib/setup/index.d.ts

@@ -40,9 +40,10 @@ export interface ServiceConfig {
   discovery?: {
     roots?: string[];
   };
+  env?: Record<string, string>;
   envFile?: string;
   envFiles?: string[];
-  local?: {
+  local?: false | {
     baseUrl: string;
     cwd?: string;
     env?: Record<string, string>;

package/package.json

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