@elench/testkit 0.1.46 → 0.1.47

package/lib/runner/runtime-contexts.mjs

@@ -1,12 +1,10 @@
 import fs from "fs";
 import path from "path";
-import { execaCommand } from "execa";
-import { resolveServiceCwd } from "../config/index.mjs";
 import { prepareDatabaseRuntime } from "../database/index.mjs";
 import { taskNeedsLocalRuntime } from "./planning.mjs";
 import { writeGraphMetadata } from "./state.mjs";
 import { startLocalServices, stopLocalServices } from "./services.mjs";
-import { buildExecutionEnv, resolveRuntimeInstanceConfigs } from "./template.mjs";
+import { resolveRuntimeInstanceConfigs } from "./template.mjs";
 
 export function createRuntimeInstanceContext(runtimeId, graph, productDir) {
   const graphDir = path.join(productDir, ".testkit", "_graphs", graph.dirName);
@@ -78,43 +76,6 @@ export async function cleanupRuntimeInstanceContext(context, lifecycle) {
 
 export async function prepareDatabases(runtimeConfigs) {
   for (const config of runtimeConfigs) {
-    await prepareDatabaseRuntime(config, {
-      runMigrate: config.testkit.migrate
-        ? (databaseUrl) => runMigrate(config, databaseUrl)
-        : null,
-      runSeed: config.testkit.seed ? (databaseUrl) => runSeed(config, databaseUrl) : null,
-    });
+    await prepareDatabaseRuntime(config);
   }
 }
-
-async function runMigrate(config, databaseUrl) {
-  const migrate = config.testkit.migrate;
-  if (!migrate) return;
-
-  const env = buildExecutionEnv(config, {}, process.env);
-  if (databaseUrl) env.DATABASE_URL = databaseUrl;
-
-  console.log(`\n── migrate:${config.runtimeLabel}:${config.name} ──`);
-  await execaCommand(migrate.cmd, {
-    cwd: resolveServiceCwd(config.productDir, migrate.cwd),
-    env,
-    stdio: "inherit",
-    shell: true,
-  });
-}
-
-async function runSeed(config, databaseUrl) {
-  const seed = config.testkit.seed;
-  if (!seed) return;
-
-  const env = buildExecutionEnv(config, {}, process.env);
-  if (databaseUrl) env.DATABASE_URL = databaseUrl;
-
-  console.log(`\n── seed:${config.runtimeLabel}:${config.name} ──`);
-  await execaCommand(seed.cmd, {
-    cwd: resolveServiceCwd(config.productDir, seed.cwd),
-    env,
-    stdio: "inherit",
-    shell: true,
-  });
-}

package/lib/runner/template.mjs

@@ -131,28 +131,7 @@ export function resolveRuntimeConfig(
   const database = config.testkit.database
     ? {
         ...config.testkit.database,
-      }
-    : undefined;
-
-  const migrate = config.testkit.migrate
-    ? {
-        ...config.testkit.migrate,
-        cmd: finalizeString(config.testkit.migrate.cmd, context),
-        cwd:
-          config.testkit.migrate.cwd !== undefined
-            ? finalizeString(config.testkit.migrate.cwd, context)
-            : config.testkit.migrate.cwd,
-      }
-    : undefined;
-
-  const seed = config.testkit.seed
-    ? {
-        ...config.testkit.seed,
-        cmd: finalizeString(config.testkit.seed.cmd, context),
-        cwd:
-          config.testkit.seed.cwd !== undefined
-            ? finalizeString(config.testkit.seed.cwd, context)
-            : config.testkit.seed.cwd,
+        template: finalizeDatabaseTemplate(config.testkit.database.template, context),
       }
     : undefined;
 
@@ -179,14 +158,41 @@ export function resolveRuntimeConfig(
     testkit: {
       ...config.testkit,
       database,
-      migrate,
-      seed,
       templateContext: context,
       local,
     },
   };
 }
 
+function finalizeDatabaseTemplate(template, context) {
+  if (!template) {
+    return {
+      inputs: [],
+      migrate: [],
+      seed: [],
+      verify: [],
+    };
+  }
+
+  const finalizeStep = (step) => ({
+    ...step,
+    ...(typeof step.cmd === "string" ? { cmd: finalizeString(step.cmd, context) } : {}),
+    ...(typeof step.cwd === "string" ? { cwd: finalizeString(step.cwd, context) } : {}),
+    ...(typeof step.path === "string" ? { path: finalizeString(step.path, context) } : {}),
+    ...(typeof step.specifier === "string"
+      ? { specifier: finalizeString(step.specifier, context) }
+      : {}),
+    inputs: (step.inputs || []).map((input) => finalizeString(input, context)),
+  });
+
+  return {
+    inputs: (template.inputs || []).map((input) => finalizeString(input, context)),
+    migrate: (template.migrate || []).map(finalizeStep),
+    seed: (template.seed || []).map(finalizeStep),
+    verify: (template.verify || []).map(finalizeStep),
+  };
+}
+
 export function resolveServiceStateDir(runtimeDir, config) {
   return path.join(runtimeDir, "services", config.name);
 }

package/lib/runner/template.test.mjs

@@ -26,8 +26,7 @@ function makeRuntimeConfig(name, local, extras = {}) {
       local,
       serviceEnv: extras.serviceEnv || {},
       databaseFrom: extras.databaseFrom,
-      migrate: extras.migrate,
-      seed: extras.seed,
+      database: extras.database,
       templateContext: extras.templateContext,
     },
   };

package/lib/setup/index.d.ts

@@ -8,17 +8,38 @@ export interface LocalDatabaseConfig {
   reset?: boolean;
   template?: {
     inputs?: string[];
+    migrate?: TemplateLifecycleStepConfig[];
+    seed?: TemplateLifecycleStepConfig[];
+    verify?: TemplateLifecycleStepConfig[];
   };
   user?: string;
 }
 
-export interface LifecycleConfig {
-  cmd: string;
+export interface TemplateStepBaseConfig {
   cwd?: string;
-  testkitCmd?: string;
-  testkitCwd?: string;
+  inputs?: string[];
+}
+
+export interface TemplateCommandStepConfig extends TemplateStepBaseConfig {
+  kind: "command";
+  cmd: string;
+}
+
+export interface TemplateSqlFileStepConfig extends TemplateStepBaseConfig {
+  kind: "sql-file";
+  path: string;
 }
 
+export interface TemplateModuleStepConfig extends TemplateStepBaseConfig {
+  kind: "module";
+  specifier: string;
+}
+
+export type TemplateLifecycleStepConfig =
+  | TemplateCommandStepConfig
+  | TemplateSqlFileStepConfig
+  | TemplateModuleStepConfig;
+
 export interface SkipFileRule {
   path: string;
   reason: string;
@@ -84,8 +105,6 @@ export interface ServiceConfig {
     readyUrl: string;
     start: string;
   };
-  migrate?: LifecycleConfig;
-  seed?: LifecycleConfig;
   runtime?: RuntimeConfig;
   requirements?: ServiceRequirementConfig;
   skip?: SkipConfig;
@@ -113,7 +132,18 @@ export declare function defineTestkitSetup<T extends TestkitSetup>(setup: T): T;
 export declare function defineHttpProfile<T extends HttpSuiteConfig>(profile: T): T;
 export declare function service<T extends ServiceConfig>(config: T): T;
 export declare function localDatabase(options?: Omit<LocalDatabaseConfig, "provider">): LocalDatabaseConfig;
-export declare function lifecycle(cmd: string, options?: Omit<LifecycleConfig, "cmd">): LifecycleConfig;
+export declare function commandStep(
+  cmd: string,
+  options?: Omit<TemplateCommandStepConfig, "kind" | "cmd">
+): TemplateCommandStepConfig;
+export declare function sqlFileStep(
+  filePath: string,
+  options?: Omit<TemplateSqlFileStepConfig, "kind" | "path">
+): TemplateSqlFileStepConfig;
+export declare function moduleStep(
+  specifier: string,
+  options?: Omit<TemplateModuleStepConfig, "kind" | "specifier">
+): TemplateModuleStepConfig;
 export declare function goService(options: ServiceConfig["local"] & {
   command?: string;
   entrypoint?: string;

package/lib/setup/index.mjs

@@ -29,12 +29,30 @@ export function localDatabase(options = {}) {
   };
 }
 
-export function lifecycle(cmd, options = {}) {
+export function commandStep(cmd, options = {}) {
   return {
+    kind: "command",
     cmd,
     cwd: options.cwd,
-    testkitCmd: options.testkitCmd,
-    testkitCwd: options.testkitCwd,
+    inputs: Array.isArray(options.inputs) ? [...options.inputs] : undefined,
+  };
+}
+
+export function sqlFileStep(filePath, options = {}) {
+  return {
+    kind: "sql-file",
+    path: filePath,
+    cwd: options.cwd,
+    inputs: Array.isArray(options.inputs) ? [...options.inputs] : undefined,
+  };
+}
+
+export function moduleStep(specifier, options = {}) {
+  return {
+    kind: "module",
+    specifier,
+    cwd: options.cwd,
+    inputs: Array.isArray(options.inputs) ? [...options.inputs] : undefined,
   };
 }
 

package/package.json

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