@ontrails/testing 1.0.0-beta.10 → 1.0.0-beta.11

package/src/examples.ts

@@ -11,6 +11,7 @@ import { describe, expect, test } from 'bun:test';
 
 import type {
   FollowFn,
+  ServiceOverrideMap,
   Topo,
   TrailExample,
   Trail,
@@ -29,6 +30,7 @@ import {
   NotFoundError,
   PermissionError,
   RateLimitError,
+  executeTrail,
   Result,
   TimeoutError,
   TrailsError,
@@ -41,9 +43,14 @@ import {
   assertErrorMatch,
   assertFullMatch,
   assertSchemaMatch,
-  expectOk,
 } from './assertions.js';
-import { mergeTestContext } from './context.js';
+import {
+  mergeServiceOverrides,
+  mergeTestContext,
+  normalizeTestExecutionOptions,
+  resolveMockServices,
+} from './context.js';
+import type { TestExecutionOptions } from './context.js';
 
 // ---------------------------------------------------------------------------
 // Error class name -> constructor map
@@ -128,16 +135,19 @@ const runExample = async (
   t: Trail<unknown, unknown>,
   example: TrailExample<unknown, unknown>,
   output: z.ZodType | undefined,
-  testCtx: TrailContext
+  testCtx: TrailContext,
+  services?: ServiceOverrideMap
 ): Promise<void> => {
   const validated = validateInput(t.input, example.input);
 
   if (handleValidationError(validated, example)) {
     return;
   }
-  const validatedInput = expectOk(validated);
 
-  const result = await t.run(validatedInput, testCtx);
+  const result = await executeTrail(t, example.input, {
+    ctx: testCtx,
+    services,
+  });
   assertProgressiveMatch(result, example, output);
 };
 
@@ -156,7 +166,8 @@ const createCoverageFollow = (
   called: Set<string>,
   baseFollow: FollowFn | undefined,
   topo: Topo,
-  ctx: TrailContext
+  ctx: TrailContext,
+  services?: ServiceOverrideMap
 ): FollowFn => {
   const follow = (id: string, input: unknown) => {
     called.add(id);
@@ -167,11 +178,10 @@ const createCoverageFollow = (
 
     const trailDef = topo.get(id);
     if (trailDef !== undefined) {
-      const validated = validateInput(trailDef.input, input);
-      if (validated.isErr()) {
-        return Promise.resolve(validated);
-      }
-      return Promise.resolve(trailDef.run(validated.value, ctx));
+      return executeTrail(trailDef, input, {
+        ctx: { ...ctx, follow },
+        services,
+      });
     }
 
     return Promise.resolve(Result.ok());
@@ -188,19 +198,28 @@ const runCompositionExample = async (
   output: z.ZodType | undefined,
   baseCtx: TrailContext,
   called: Set<string>,
-  topo: Topo
+  topo: Topo,
+  services?: ServiceOverrideMap
 ): Promise<void> => {
   const validated = validateInput(trailDef.input, example.input);
 
   if (handleValidationError(validated, example)) {
     return;
   }
-  const validatedInput = expectOk(validated);
 
-  const follow = createCoverageFollow(called, baseCtx.follow, topo, baseCtx);
+  const follow = createCoverageFollow(
+    called,
+    baseCtx.follow,
+    topo,
+    baseCtx,
+    services
+  );
   const testCtx: TrailContext = { ...baseCtx, follow };
 
-  const result = await trailDef.run(validatedInput, testCtx);
+  const result = await executeTrail(trailDef, example.input, {
+    ctx: testCtx,
+    services,
+  });
   assertProgressiveMatch(result, example, output);
 };
 
@@ -221,9 +240,12 @@ const runCompositionExample = async (
  */
 export const testExamples = (
   app: Topo,
-  ctxOrFactory?: Partial<TrailContext> | (() => Partial<TrailContext>)
+  ctxOrFactory?:
+    | Partial<TrailContext>
+    | TestExecutionOptions
+    | (() => Partial<TrailContext> | TestExecutionOptions)
 ): void => {
-  const resolveCtx =
+  const resolveInput =
     typeof ctxOrFactory === 'function' ? ctxOrFactory : () => ctxOrFactory;
   const allTrails = app.list() as Trail<unknown, unknown>[];
 
@@ -244,8 +266,14 @@ export const testExamples = (
       test.each([...examples])(
         'example: $name',
         async (example: TrailExample<unknown, unknown>) => {
-          const testCtx = mergeTestContext(resolveCtx());
-          await runExample(t, example, output, testCtx);
+          const resolved = normalizeTestExecutionOptions(resolveInput());
+          const services = mergeServiceOverrides(
+            await resolveMockServices(app),
+            resolved.ctx,
+            resolved.services
+          );
+          const testCtx = mergeTestContext(resolved.ctx);
+          await runExample(t, example, output, testCtx, services);
         }
       );
     });
@@ -264,8 +292,22 @@ export const testExamples = (
       test.each([...examples])(
         'example: $name',
         async (example: TrailExample<unknown, unknown>) => {
-          const baseCtx = mergeTestContext(resolveCtx());
-          await runCompositionExample(t, example, output, baseCtx, called, app);
+          const resolved = normalizeTestExecutionOptions(resolveInput());
+          const services = mergeServiceOverrides(
+            await resolveMockServices(app),
+            resolved.ctx,
+            resolved.services
+          );
+          const baseCtx = mergeTestContext(resolved.ctx);
+          await runCompositionExample(
+            t,
+            example,
+            output,
+            baseCtx,
+            called,
+            app,
+            services
+          );
         }
       );
 

package/src/follows.ts

@@ -7,8 +7,14 @@
 
 import { describe, expect, test } from 'bun:test';
 
-import type { AnyTrail, FollowFn, TrailContext } from '@ontrails/core';
+import type {
+  AnyTrail,
+  FollowFn,
+  ServiceOverrideMap,
+  TrailContext,
+} from '@ontrails/core';
 import {
+  executeTrail,
   InternalError,
   Result,
   ValidationError,
@@ -19,9 +25,8 @@ import {
   assertErrorMatch,
   assertFullMatch,
   assertSchemaMatch,
-  expectOk,
 } from './assertions.js';
-import { mergeTestContext } from './context.js';
+import { mergeServiceOverrides, mergeTestContext } from './context.js';
 import type { FollowScenario } from './types.js';
 
 // ---------------------------------------------------------------------------
@@ -33,6 +38,58 @@ interface FollowRecord {
   readonly input: unknown;
 }
 
+const collectDeclaredServices = (
+  trailDef: AnyTrail,
+  trailsMap: ReadonlyMap<string, AnyTrail> | undefined
+): AnyTrail['services'] => {
+  const seenServiceIds = new Set<string>();
+  const seenTrailIds = new Set<string>();
+  const services: AnyTrail['services'][number][] = [];
+
+  const collect = (candidate: AnyTrail): void => {
+    for (const declaredService of candidate.services) {
+      if (seenServiceIds.has(declaredService.id)) {
+        continue;
+      }
+      seenServiceIds.add(declaredService.id);
+      services.push(declaredService);
+    }
+  };
+
+  const visit = (candidate: AnyTrail): void => {
+    if (seenTrailIds.has(candidate.id)) {
+      return;
+    }
+    seenTrailIds.add(candidate.id);
+    collect(candidate);
+    for (const followedId of candidate.follow) {
+      const followedTrail = trailsMap?.get(followedId);
+      if (followedTrail) {
+        visit(followedTrail);
+      }
+    }
+  };
+
+  visit(trailDef);
+  return services;
+};
+
+const resolveMockServices = async (
+  trailDef: AnyTrail,
+  trailsMap: ReadonlyMap<string, AnyTrail> | undefined
+): Promise<ServiceOverrideMap> => {
+  const services: Record<string, unknown> = {};
+
+  for (const declaredService of collectDeclaredServices(trailDef, trailsMap)) {
+    if (!declaredService.mock) {
+      continue;
+    }
+    services[declaredService.id] = await declaredService.mock();
+  }
+
+  return services;
+};
+
 // ---------------------------------------------------------------------------
 // Injection helpers
 // ---------------------------------------------------------------------------
@@ -90,18 +147,20 @@ const executeFromMap = (
   id: string,
   input: unknown,
   trailsMap: ReadonlyMap<string, AnyTrail> | undefined,
-  ctx: TrailContext
+  ctx: TrailContext,
+  services: ServiceOverrideMap | undefined,
+  follow?: FollowFn
 ): Result<unknown, Error> | Promise<Result<unknown, Error>> | undefined => {
   const trailDef = trailsMap?.get(id);
   if (trailDef === undefined) {
     return undefined;
   }
 
-  const validated = validateInput(trailDef.input, input);
-  if (validated.isErr()) {
-    return validated;
-  }
-  return trailDef.run(validated.value, ctx);
+  const nestedCtx = follow ? { ...ctx, follow } : ctx;
+  return executeTrail(trailDef, input, {
+    ctx: nestedCtx,
+    services,
+  });
 };
 
 // ---------------------------------------------------------------------------
@@ -116,7 +175,8 @@ const createRecordingFollow = (
   scenario: FollowScenario,
   trailsMap: ReadonlyMap<string, AnyTrail> | undefined,
   baseFollow: FollowFn | undefined,
-  ctx: TrailContext
+  ctx: TrailContext,
+  services: ServiceOverrideMap | undefined
 ): FollowFn => {
   // The generic O on FollowFn is erased at runtime; the cast is safe
   // because callers narrow via isOk/isErr before accessing the value.
@@ -132,7 +192,14 @@ const createRecordingFollow = (
       return baseFollow(id, input);
     }
 
-    const executed = executeFromMap(id, input, trailsMap, ctx);
+    const executed = executeFromMap(
+      id,
+      input,
+      trailsMap,
+      ctx,
+      services,
+      follow as FollowFn
+    );
     if (executed !== undefined) {
       return Promise.resolve(executed);
     }
@@ -209,7 +276,8 @@ const handleValidationError = (
 const buildTestContext = (
   scenario: FollowScenario,
   ctx: Partial<TrailContext> | undefined,
-  trailsMap: ReadonlyMap<string, AnyTrail> | undefined
+  trailsMap: ReadonlyMap<string, AnyTrail> | undefined,
+  services: ServiceOverrideMap | undefined
 ): { trace: FollowRecord[]; testCtx: TrailContext } => {
   const trace: FollowRecord[] = [];
   const baseCtx = mergeTestContext(ctx);
@@ -218,7 +286,8 @@ const buildTestContext = (
     scenario,
     trailsMap,
     baseCtx.follow,
-    baseCtx
+    baseCtx,
+    services
   );
   return { testCtx: { ...baseCtx, follow }, trace };
 };
@@ -227,15 +296,24 @@ const runScenario = async (
   trailDef: AnyTrail,
   scenario: FollowScenario,
   ctx: Partial<TrailContext> | undefined,
-  trailsMap: ReadonlyMap<string, AnyTrail> | undefined
+  trailsMap: ReadonlyMap<string, AnyTrail> | undefined,
+  services: ServiceOverrideMap | undefined
 ): Promise<void> => {
   const validated = validateInput(trailDef.input, scenario.input);
   if (handleValidationError(validated, scenario)) {
     return;
   }
 
-  const { trace, testCtx } = buildTestContext(scenario, ctx, trailsMap);
-  const result = await trailDef.run(expectOk(validated), testCtx);
+  const { trace, testCtx } = buildTestContext(
+    scenario,
+    ctx,
+    trailsMap,
+    services
+  );
+  const result = await executeTrail(trailDef, scenario.input, {
+    ctx: testCtx,
+    services,
+  });
   assertFollowTrace(trace, scenario);
   assertScenarioResult(result, scenario, trailDef);
 };
@@ -248,6 +326,12 @@ const runScenario = async (
 export interface TestFollowOptions {
   /** Partial context overrides. */
   readonly ctx?: Partial<TrailContext> | undefined;
+  /**
+   * Explicit service overrides merged on top of auto-resolved mocks for every
+   * scenario. Values are passed by reference — provide immutable objects, or
+   * use `mock()` on the service definition to get a fresh instance per run.
+   */
+  readonly services?: ServiceOverrideMap | undefined;
   /** Map of trail ID to trail definition, used for injectFromExample. */
   readonly trails?: ReadonlyMap<string, AnyTrail> | undefined;
 }
@@ -276,7 +360,18 @@ export const testFollows = (
     test.each([...scenarios])(
       '$description',
       async (scenario: FollowScenario) => {
-        await runScenario(trailDef, scenario, options?.ctx, options?.trails);
+        const services = mergeServiceOverrides(
+          await resolveMockServices(trailDef, options?.trails),
+          options?.ctx,
+          options?.services
+        );
+        await runScenario(
+          trailDef,
+          scenario,
+          options?.ctx,
+          options?.trails,
+          services
+        );
       }
     );
   });

package/src/index.ts

@@ -25,6 +25,7 @@ export { createMcpHarness } from './harness-mcp.js';
 
 // Types
 export type { CreateFollowContextOptions } from './context.js';
+export type { TestExecutionOptions } from './context.js';
 export type { TestFollowOptions } from './follows.js';
 
 export type {