@ontrails/testing 1.0.0-beta.13 → 1.0.0-beta.15

package/dist/types.d.ts

@@ -1,7 +1,9 @@
 /**
  * Shared types for @ontrails/testing.
  */
-import type { Logger, Topo } from '@ontrails/core';
+import type { DeriveCliCommandsOptions } from '@ontrails/cli';
+import type { McpExtra, DeriveMcpToolsOptions } from '@ontrails/mcp';
+import type { AnyTrail, Logger, Topo, TraceFn, TrailContext } from '@ontrails/core';
 import type { LogLevel, LogRecord } from '@ontrails/logging';
 /** A custom test scenario for a single trail. */
 export interface TestScenario {
@@ -45,10 +47,12 @@ export interface TestTrailContextOptions {
     readonly logger?: Logger | undefined;
     readonly requestId?: string | undefined;
     readonly abortSignal?: AbortSignal | undefined;
+    readonly trace?: TraceFn | undefined;
 }
 /** Options for creating a CLI harness. */
-export interface CliHarnessOptions {
-    readonly app: Topo;
+export interface CliHarnessOptions extends Omit<DeriveCliCommandsOptions, 'onResult' | 'presets' | 'resolveInput'> {
+    readonly ctx?: Partial<TrailContext> | undefined;
+    readonly graph: Topo;
 }
 /** A test harness for CLI commands. */
 export interface CliHarness {
@@ -64,8 +68,9 @@ export interface CliHarnessResult {
     readonly stdout: string;
 }
 /** Options for creating an MCP harness. */
-export interface McpHarnessOptions {
-    readonly app: Topo;
+export interface McpHarnessOptions extends DeriveMcpToolsOptions {
+    readonly extra?: Partial<McpExtra> | undefined;
+    readonly graph: Topo;
 }
 /** A test harness for MCP tools. */
 export interface McpHarness {
@@ -77,4 +82,32 @@ export interface McpHarnessResult {
     readonly content: unknown;
     readonly isError: boolean;
 }
+export interface TestAllEstablishedOptions {
+    readonly cli?: Omit<CliHarnessOptions, 'graph'> | undefined;
+    readonly createPermit?: ((trail: {
+        readonly permit?: {
+            readonly scopes: readonly string[];
+        } | 'public' | undefined;
+    }) => {
+        readonly id: string;
+        readonly scopes: readonly string[];
+    } | undefined) | undefined;
+    readonly ctx?: Partial<TrailContext> | undefined;
+    readonly mcp?: Omit<McpHarnessOptions, 'graph'> | undefined;
+    readonly resources?: Record<string, unknown> | undefined;
+    readonly strictPermits?: boolean | undefined;
+}
+/** Marker for cross-step references in scenario inputs. */
+export interface RefToken {
+    readonly __ref: true;
+    readonly path: string;
+}
+/** A single step in a scenario. */
+export interface ScenarioStep {
+    readonly cross: AnyTrail;
+    readonly input: Record<string, unknown>;
+    readonly as?: string | undefined;
+    readonly expected?: unknown | undefined;
+    readonly expectedMatch?: unknown | undefined;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ontrails/testing",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.15",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
@@ -13,11 +13,15 @@
     "lint": "oxlint ./src",
     "clean": "rm -rf dist *.tsbuildinfo"
   },
+  "devDependencies": {
+    "@ontrails/drizzle": "^1.0.0-beta.14",
+    "@ontrails/store": "^1.0.0-beta.14"
+  },
   "peerDependencies": {
-    "@ontrails/cli": "^1.0.0-beta.12",
-    "@ontrails/core": "^1.0.0-beta.12",
-    "@ontrails/logging": "^1.0.0-beta.12",
-    "@ontrails/mcp": "^1.0.0-beta.12",
+    "@ontrails/cli": "^1.0.0-beta.14",
+    "@ontrails/core": "^1.0.0-beta.14",
+    "@ontrails/logging": "^1.0.0-beta.14",
+    "@ontrails/mcp": "^1.0.0-beta.14",
     "zod": "^4.3.5"
   }
 }

package/src/__tests__/all.test.ts

@@ -1,66 +1,254 @@
-import { describe } from 'bun:test';
+import { afterAll, describe, expect, mock, test } from 'bun:test';
+import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
 
-import { Result, provision, trail, topo } from '@ontrails/core';
+import { contour, Result, trail, topo } from '@ontrails/core';
+import { connectDrizzle } from '@ontrails/drizzle';
 import { z } from 'zod';
 
 import { testAll } from '../all.js';
+import { store as defineStore } from '@ontrails/store';
 
-const mockDbProvision = provision('db.mock.all', {
-  create: () => Result.ok({ source: 'factory' }),
-  mock: () => ({ source: 'mock' }),
+const requireContourExample = (
+  contourDef: { examples?: readonly Record<string, unknown>[] },
+  index: number
+) => {
+  const example = contourDef.examples?.[index];
+  expect(example).toBeDefined();
+  if (!example) {
+    throw new Error(`Expected contour example at index ${index}`);
+  }
+  return example;
+};
+
+const dbDefinition = defineStore({
+  entities: {
+    fixtures: [
+      {
+        id: 'seed-1',
+        name: 'Alpha',
+        source: 'mock',
+      },
+    ],
+    generated: ['id'],
+    primaryKey: 'id',
+    schema: z.object({
+      id: z.string(),
+      name: z.string(),
+      source: z.string(),
+    }),
+  },
 });
 
-const mockedTrail = trail('provision.mocked.all', {
-  blaze: (_input, ctx) =>
-    Result.ok({ source: mockDbProvision.from(ctx).source }),
-  description: 'Trail that uses a mocked provision through testAll',
+const createDbResource = (
+  seed?: readonly {
+    readonly id: string;
+    readonly name: string;
+    readonly source: string;
+  }[]
+) =>
+  connectDrizzle(dbDefinition, {
+    id: 'db.mock.all',
+    ...(seed === undefined ? {} : { mockSeed: { entities: seed } }),
+    url: ':memory:',
+  });
+
+const createOverrideStore = () => {
+  const { mock: mockFactory } = createDbResource([
+    {
+      id: 'seed-1',
+      name: 'Override',
+      source: 'override',
+    },
+  ]);
+
+  if (mockFactory === undefined) {
+    throw new Error('Expected drizzle test store to expose a mock factory');
+  }
+
+  const created = mockFactory();
+  if (created instanceof Promise) {
+    throw new TypeError(
+      'Expected drizzle test store mock to resolve synchronously'
+    );
+  }
+
+  return created;
+};
+
+const mockDbResource = createDbResource();
+
+const mockedTrail = trail('resource.mocked.all', {
+  blaze: async (_input, ctx) => {
+    const entity = await mockDbResource.from(ctx).entities.get('seed-1');
+    if (entity === null) {
+      return Result.err(new Error('expected seeded entity to exist'));
+    }
+
+    return Result.ok({ name: entity.name, source: entity.source });
+  },
+  description:
+    'Trail that uses a mocked connector-bound resource through testAll',
   examples: [
     {
-      expected: { source: 'mock' },
+      expected: { name: 'Alpha', source: 'mock' },
       input: {},
-      name: 'Uses auto-resolved provision mock',
+      name: 'Uses auto-resolved resource mock',
     },
   ],
   input: z.object({}),
-  output: z.object({ source: z.string() }),
-  provisions: [mockDbProvision],
+  output: z.object({ name: z.string(), source: z.string() }),
+  resources: [mockDbResource],
 });
 
-const overrideTrail = trail('provision.override.all', {
-  blaze: (_input, ctx) =>
-    Result.ok({ source: mockDbProvision.from(ctx).source }),
+const overrideTrail = trail('resource.override.all', {
+  blaze: async (_input, ctx) => {
+    const entity = await mockDbResource.from(ctx).entities.get('seed-1');
+    if (entity === null) {
+      return Result.err(new Error('expected overridden entity to exist'));
+    }
+
+    return Result.ok({ name: entity.name, source: entity.source });
+  },
   description: 'Trail that prefers explicit overrides over mock factories',
   examples: [
     {
-      expected: { source: 'override' },
+      expected: { name: 'Override', source: 'override' },
       input: {},
-      name: 'Explicit provision override wins',
+      name: 'Explicit resource override wins',
     },
   ],
   input: z.object({}),
-  output: z.object({ source: z.string() }),
-  provisions: [mockDbProvision],
+  output: z.object({ name: z.string(), source: z.string() }),
+  resources: [mockDbResource],
+});
+
+const contourFixture = contour(
+  'allFixture',
+  {
+    id: z.string().uuid(),
+    name: z.string(),
+  },
+  {
+    examples: [
+      {
+        id: 'f46b837e-6c8d-42ec-8539-536f4e6daf0e',
+        name: 'Contour-derived governance fixture',
+      },
+    ],
+    identity: 'id',
+  }
+);
+
+const contourDerivedBlaze = mock(() =>
+  Result.ok(requireContourExample(contourFixture, 0))
+);
+
+const contourDerivedTrail = trail('contour.derived.all', {
+  blaze: () => contourDerivedBlaze(),
+  contours: [contourFixture],
+  description: 'Trail that relies on contour-derived fixtures inside testAll',
+  input: z.object({ id: contourFixture.shape.id }),
+  output: contourFixture,
 });
 
-describe('testAll provision mocks', () => {
+const repoTempDir = (): string =>
+  join(
+    resolve(import.meta.dir, '../..'),
+    '.tmp-tests',
+    `test-all-established-${Date.now()}-${Math.random().toString(36).slice(2)}`
+  );
+
+const runGeneratedGovernanceSuite = (
+  helperName: 'testAll' | 'testAllEstablished'
+): { readonly exitCode: number; readonly output: string } => {
+  const dir = repoTempDir();
+  const testFile = join(dir, `${helperName}.test.ts`);
+
+  mkdirSync(dir, { recursive: true });
+  writeFileSync(
+    testFile,
+    `import { Result, trail, topo } from '@ontrails/core';
+import { ${helperName} } from '../../src/index.ts';
+import { z } from 'zod';
+
+const draftTrail = trail('_draft.entity.prepare', {
+  blaze: async () => Result.ok({ ok: true }),
+  input: z.object({}),
+  output: z.object({ ok: z.boolean() }),
+});
+
+${helperName}(topo('draft-topo', { draftTrail }));
+`
+  );
+
+  try {
+    const proc = Bun.spawnSync({
+      cmd: ['bun', 'test', testFile, '--bail'],
+      cwd: resolve(import.meta.dir, '..', '..', '..'),
+      stderr: 'pipe',
+      stdout: 'pipe',
+    });
+
+    return {
+      exitCode: proc.exitCode,
+      output: `${proc.stdout.toString()}\n${proc.stderr.toString()}`,
+    };
+  } finally {
+    rmSync(dir, { force: true, recursive: true });
+  }
+};
+
+describe('testAll resource mocks', () => {
   // eslint-disable-next-line jest/require-hook
   testAll(
-    topo('test-all-provision-mock-app', {
-      mockDbProvision,
+    topo('test-all-resource-mock-app', {
+      mockDbResource,
       mockedTrail,
     } as Record<string, unknown>)
   );
 });
 
-describe('testAll explicit provision overrides', () => {
+describe('testAll explicit resource overrides', () => {
   // eslint-disable-next-line jest/require-hook
   testAll(
-    topo('test-all-provision-override-app', {
-      mockDbProvision,
+    topo('test-all-resource-override-app', {
+      mockDbResource,
       overrideTrail,
     } as Record<string, unknown>),
-    {
-      provisions: { 'db.mock.all': { source: 'override' } },
-    }
+    () => ({
+      resources: {
+        'db.mock.all': createOverrideStore(),
+      },
+    })
   );
 });
+
+describe('testAll contour-derived fixtures', () => {
+  // eslint-disable-next-line jest/require-hook
+  testAll(
+    topo('test-all-contour-derived-app', {
+      contourDerivedTrail,
+      contourFixture,
+    } as Record<string, unknown>)
+  );
+
+  afterAll(() => {
+    expect(contourDerivedBlaze).toHaveBeenCalledTimes(2);
+  });
+});
+
+describe('testAllEstablished draft hygiene', () => {
+  test('keeps testAll draft-friendly for in-progress graphs', () => {
+    const result = runGeneratedGovernanceSuite('testAll');
+
+    expect(result.exitCode).toBe(0);
+  });
+
+  test('fails draft-contaminated graphs under testAllEstablished', () => {
+    const result = runGeneratedGovernanceSuite('testAllEstablished');
+
+    expect(result.exitCode).toBe(1);
+    expect(result.output).toContain('_draft.entity.prepare');
+  });
+});

package/src/__tests__/context.test.ts

@@ -1,12 +1,12 @@
 import { describe, expect, test } from 'bun:test';
 
-import { Result, provision, topo } from '@ontrails/core';
+import { Result, resource, topo } from '@ontrails/core';
 
 import {
   createCrossContext,
   createTestContext,
   mergeTestContext,
-  resolveMockProvisions,
+  createMockResources,
 } from '../context.js';
 import type { TestLogger } from '../types.js';
 
@@ -22,6 +22,7 @@ describe('createTestContext', () => {
     expect(ctx.abortSignal).toBeDefined();
     expect(ctx.abortSignal.aborted).toBe(false);
     expect(ctx.logger).toBeDefined();
+    expect(ctx.trace).toBeDefined();
     expect(ctx.workspaceRoot).toBe(process.cwd());
   });
 
@@ -66,6 +67,25 @@ describe('createTestContext', () => {
     const env = ctx['env'] as Record<string, string>;
     expect(env).toEqual({ CUSTOM: '1', NODE_ENV: 'test' });
   });
+
+  test('default trace passthrough resolves the callback result', async () => {
+    const ctx = createTestContext();
+    const result = await ctx.trace('test-span', () => Promise.resolve('ok'));
+    expect(result).toBe('ok');
+  });
+
+  test('overrides trace', async () => {
+    const calls: string[] = [];
+    const ctx = createTestContext({
+      trace: async (label, fn) => {
+        calls.push(label);
+        return await fn();
+      },
+    });
+
+    await ctx.trace('custom-span', () => Promise.resolve('done'));
+    expect(calls).toEqual(['custom-span']);
+  });
 });
 
 describe('createCrossContext', () => {
@@ -102,7 +122,7 @@ describe('createCrossContext', () => {
 });
 
 describe('mergeTestContext', () => {
-  test('merges provision overrides into extensions and the provision accessor', () => {
+  test('merges resource overrides into extensions and the resource accessor', () => {
     const ctx = mergeTestContext(
       {
         extensions: { existing: true },
@@ -114,14 +134,14 @@ describe('mergeTestContext', () => {
       'db.main': { source: 'mock' },
       existing: true,
     });
-    expect(ctx.provision<{ source: string }>('db.main').source).toBe('mock');
+    expect(ctx.resource<{ source: string }>('db.main').source).toBe('mock');
   });
 });
 
-describe('resolveMockProvisions', () => {
-  test('creates fresh mock provisions for each invocation', async () => {
+describe('createMockResources', () => {
+  test('creates fresh mock resources for each invocation', async () => {
     let mockCalls = 0;
-    const mockable = provision(`provision.mock.${Bun.randomUUIDv7()}`, {
+    const mockable = resource(`resource.mock.${Bun.randomUUIDv7()}`, {
       create: () => Result.ok({ source: 'factory' }),
       mock: () => {
         mockCalls += 1;
@@ -130,8 +150,8 @@ describe('resolveMockProvisions', () => {
     });
     const app = topo('mock-app', { mockable } as Record<string, unknown>);
 
-    const first = await resolveMockProvisions(app);
-    const second = await resolveMockProvisions(app);
+    const first = await createMockResources(app);
+    const second = await createMockResources(app);
 
     expect(first).toEqual({ [mockable.id]: { source: 'mock' } });
     expect(second).toEqual(first);
@@ -139,12 +159,12 @@ describe('resolveMockProvisions', () => {
     expect(mockCalls).toBe(2);
   });
 
-  test('skips provisions without mock factories', async () => {
-    const plain = provision(`provision.plain.${Bun.randomUUIDv7()}`, {
+  test('skips resources without mock factories', async () => {
+    const plain = resource(`resource.plain.${Bun.randomUUIDv7()}`, {
       create: () => Result.ok({ source: 'factory' }),
     });
     const app = topo('plain-app', { plain } as Record<string, unknown>);
 
-    expect(await resolveMockProvisions(app)).toEqual({});
+    expect(await createMockResources(app)).toEqual({});
   });
 });

package/src/__tests__/contracts.test.ts

@@ -1,10 +1,22 @@
-import { describe, test } from 'bun:test';
+import { afterAll, describe, expect, mock, test } from 'bun:test';
 
-import { Result, provision, trail, topo } from '@ontrails/core';
+import { contour, Result, resource, trail, topo } from '@ontrails/core';
 import { z } from 'zod';
 
 import { testContracts } from '../contracts.js';
 
+const requireContourExample = (
+  contourDef: { examples?: readonly Record<string, unknown>[] },
+  index: number
+) => {
+  const example = contourDef.examples?.[index];
+  expect(example).toBeDefined();
+  if (!example) {
+    throw new Error(`Expected contour example at index ${index}`);
+  }
+  return example;
+};
+
 // ---------------------------------------------------------------------------
 // Test trails
 // ---------------------------------------------------------------------------
@@ -72,46 +84,74 @@ const transformedInputTrail = trail('contract.transformed', {
   output: z.object({ value: z.number() }),
 });
 
-const undeclaredContractDbProvision = provision('db.undeclared.contracts', {
+const undeclaredContractDbResource = resource('db.undeclared.contracts', {
   create: () => Result.ok({ source: 'factory' }),
   mock: () => ({ source: 'mock' }),
 });
 
-const undeclaredContractTrail = trail('provision.undeclared.contracts', {
+const undeclaredContractTrail = trail('resource.undeclared.contracts', {
   blaze: (_input, ctx) =>
     Result.ok({
-      hasInjectedProvision:
-        ctx.extensions?.[undeclaredContractDbProvision.id] !== undefined,
+      hasInjectedResource:
+        ctx.extensions?.[undeclaredContractDbResource.id] !== undefined,
     }),
   examples: [
     {
-      expected: { hasInjectedProvision: false },
+      expected: { hasInjectedResource: false },
       input: {},
-      name: 'Undeclared provisions are not preloaded into contract contexts',
+      name: 'Undeclared resources are not preloaded into contract contexts',
     },
   ],
   input: z.object({}),
-  output: z.object({ hasInjectedProvision: z.literal(false) }),
+  output: z.object({ hasInjectedResource: z.literal(false) }),
 });
 
-const ctxOverrideContractProvision = provision('db.mock.contracts', {
+const ctxOverrideContractResource = resource('db.mock.contracts', {
   create: () => Result.ok({ source: 'factory' }),
   mock: () => ({ source: 'mock' }),
 });
 
-const ctxOverrideContractTrail = trail('provision.ctx.contracts', {
+const ctxOverrideContractTrail = trail('resource.ctx.contracts', {
   blaze: (_input, ctx) =>
-    Result.ok({ source: ctxOverrideContractProvision.from(ctx).source }),
+    Result.ok({ source: ctxOverrideContractResource.from(ctx).source }),
   examples: [
     {
       expected: { source: 'ctx' },
       input: {},
-      name: 'Context extensions beat auto-resolved contract provision mocks',
+      name: 'Context extensions beat auto-resolved contract resource mocks',
     },
   ],
   input: z.object({}),
   output: z.object({ source: z.literal('ctx') }),
-  provisions: [ctxOverrideContractProvision],
+  resources: [ctxOverrideContractResource],
+});
+
+const derivedContractContour = contour(
+  'contractFixture',
+  {
+    id: z.string().uuid(),
+    name: z.string(),
+  },
+  {
+    examples: [
+      {
+        id: '03a5873c-0ca6-43c4-9201-3cb3c07ca6bf',
+        name: 'Contour contract fixture',
+      },
+    ],
+    identity: 'id',
+  }
+);
+
+const derivedContractBlaze = mock(() =>
+  Result.ok(requireContourExample(derivedContractContour, 0))
+);
+
+const derivedContractTrail = trail('contract.derived', {
+  blaze: () => derivedContractBlaze(),
+  contours: [derivedContractContour],
+  input: z.object({ id: derivedContractContour.shape.id }),
+  output: derivedContractContour,
 });
 
 // ---------------------------------------------------------------------------
@@ -163,7 +203,7 @@ describe('testContracts: context extension overrides', () => {
   // eslint-disable-next-line jest/require-hook
   testContracts(
     topo('ctx-contract-app', {
-      ctxOverrideContractProvision,
+      ctxOverrideContractResource,
       ctxOverrideContractTrail,
     } as Record<string, unknown>),
     {
@@ -174,12 +214,26 @@ describe('testContracts: context extension overrides', () => {
   );
 });
 
-describe('testContracts provision declarations', () => {
+describe('testContracts resource declarations', () => {
   // eslint-disable-next-line jest/require-hook
   testContracts(
-    topo('undeclared-contract-provision-app', {
-      undeclaredContractDbProvision,
+    topo('undeclared-contract-resource-app', {
+      undeclaredContractDbResource,
       undeclaredContractTrail,
     } as Record<string, unknown>)
   );
 });
+
+describe('testContracts derives contour examples when trail examples are absent', () => {
+  // eslint-disable-next-line jest/require-hook
+  testContracts(
+    topo('derived-contract-app', {
+      derivedContractContour,
+      derivedContractTrail,
+    } as Record<string, unknown>)
+  );
+
+  afterAll(() => {
+    expect(derivedContractBlaze).toHaveBeenCalledTimes(1);
+  });
+});