@ontrails/core 1.0.0-beta.0 → 1.0.0-beta.2

package/.turbo/turbo-lint.log

@@ -1,3 +1,3 @@
 $ oxlint ./src
 Found 0 warnings and 0 errors.
-Finished in 101ms on 60 files with 93 rules using 24 threads.
+Finished in 27ms on 60 files with 93 rules using 24 threads.

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @ontrails/core
 
+## 1.0.0-beta.2
+
+### Patch Changes
+
+- Fix workspace dependency resolution in published packages. Now using bun publish
+  which correctly replaces workspace:^ with actual version numbers.
+
+## 1.0.0-beta.1
+
+### Patch Changes
+
+- Fix two blocking bugs from real-world migration:
+  - Published packages now resolve correctly (workspace:^ instead of workspace:\*)
+  - Error forwarding works across different success types (Err no longer carries phantom T)
+
 ## 1.0.0-beta.0
 
 ### Minor Changes

package/README.md

@@ -1,35 +1,31 @@
 # @ontrails/core
 
-The foundation of Trails. Result type, error taxonomy, trail/hike/event definitions, topo, validation, patterns, redaction, branded types, and collection utilities. One external dependency: `zod`.
+The foundation. Define trails, compose them into topos, return typed Results, and let the framework derive everything else.
 
-## Installation
-
-```bash
-bun add @ontrails/core
-```
-
-## Quick Start
+## Usage
 
 ```typescript
-import { trail, hike, topo, Result } from '@ontrails/core';
+import { trail, topo, Result } from '@ontrails/core';
 import { z } from 'zod';
 
-// Define a trail -- the atomic unit of work
-const show = trail('entity.show', {
-  input: z.object({ name: z.string().describe('Entity name') }),
-  output: z.object({ name: z.string(), type: z.string() }),
+const greet = trail('greet', {
+  input: z.object({ name: z.string().describe('Who to greet') }),
+  output: z.object({ message: z.string() }),
   readOnly: true,
   examples: [
-    {
-      name: 'Show an entity',
-      input: { name: 'Alpha' },
-      expected: { name: 'Alpha', type: 'concept' },
-    },
+    { name: 'Hello', input: { name: 'World' }, expected: { message: 'Hello, World!' } },
   ],
-  implementation: (input) => Result.ok({ name: input.name, type: 'concept' }),
+  implementation: (input) => Result.ok({ message: `Hello, ${input.name}!` }),
 });
 
-// Define a hike -- a composite that follows other trails
+const app = topo('myapp', { greet });
+```
+
+Hikes compose trails through `ctx.follow()`:
+
+```typescript
+import { hike } from '@ontrails/core';
+
 const onboard = hike('entity.onboard', {
   follows: ['entity.add', 'entity.relate'],
   input: z.object({ name: z.string(), type: z.string() }),
@@ -39,141 +35,73 @@ const onboard = hike('entity.onboard', {
     return Result.ok({ entity: added.value });
   },
 });
-
-// Collect into an app
-import * as entity from './trails/entity';
-const app = topo('myapp', entity);
 ```
 
-Pure trails can return `Result` directly. Hikes and other I/O-bound trails can stay `async`; core normalizes both forms to one awaitable runtime shape before layers and surfaces execute them.
-
-## API Overview
-
-### Trail Primitives
-
-- **`trail(id, spec)`** -- Define an atomic unit of work. Typed input via Zod, returns `Result`. Authoring may be sync or async.
-- **`hike(id, spec)`** -- Define a composite that follows multiple trails via `ctx.follow()`. Declares dependencies with `follows: string[]`.
-- **`event(id, spec)`** -- Define a server-originated push with a typed data schema.
-- **`topo(name, ...modules)`** -- Collect trail modules into an app. Scans exports for `Trail` shapes and builds the topo.
-
-### Result Type
-
-Built-in `Result<T, E>` with no external dependency.
-
-```typescript
-Result.ok(value); // Create a success
-Result.err(error); // Create a failure
-Result.combine(results); // Collect Result<T>[] into Result<T[]>
-
-result.isOk(); // Type guard for Ok
-result.isErr(); // Type guard for Err
-result.map(fn); // Transform success value
-result.flatMap(fn); // Chain Result-returning functions
-result.match({ ok, err }); // Pattern match
-result.unwrapOr(fallback); // Value or fallback
-```
-
-Implementations return `Result`, never `throw`.
-
-### Error Taxonomy
+## API
 
-13 error classes across 10 categories, all extending `TrailsError`. Each maps to CLI exit codes, HTTP status codes, JSON-RPC codes, and retryability.
+### Trail primitives
 
-| Category | Classes | Exit | HTTP | Retryable |
-| --- | --- | --- | --- | --- |
-| `validation` | `ValidationError`, `AmbiguousError`, `AssertionError` | 1 | 400 | No |
-| `not_found` | `NotFoundError` | 2 | 404 | No |
-| `conflict` | `AlreadyExistsError`, `ConflictError` | 3 | 409 | No |
-| `permission` | `PermissionError` | 4 | 403 | No |
-| `timeout` | `TimeoutError` | 5 | 504 | Yes |
-| `rate_limit` | `RateLimitError` | 6 | 429 | Yes |
-| `network` | `NetworkError` | 7 | 502 | Yes |
-| `internal` | `InternalError` | 8 | 500 | No |
-| `auth` | `AuthError` | 9 | 401 | No |
-| `cancelled` | `CancelledError` | 130 | 499 | No |
-
-All extend `TrailsError` directly (class inheritance, no factory pattern). Pattern matching via `instanceof` or `error.category`.
-
-### Patterns (`@ontrails/core/patterns`)
-
-Reusable Zod schemas for common input/output shapes:
-
-- **Pagination** -- `paginationInput`, `paginationOutput` (cursor-based)
-- **Bulk operations** -- `bulkInput`, `bulkOutput` (batch with per-item results)
-- **Timestamps** -- `timestamps` (`createdAt`/`updatedAt`)
-- **Date ranges** -- `dateRangeInput` (`since`/`until`)
-- **Sorting** -- `sortInput` (`sortBy`/`sortOrder`)
-- **Status** -- `statusField` (lifecycle state)
-- **Change tracking** -- `changeOutput` (before/after snapshots)
-- **Progress** -- `progressOutput` (completion reporting)
-
-### Redaction (`@ontrails/core/redaction`)
+| Export | What it does |
+| --- | --- |
+| `trail(id, spec)` | Define an atomic unit of work with typed input and `Result` output |
+| `hike(id, spec)` | Define a composition that follows other trails via `ctx.follow()` |
+| `event(id, spec)` | Define a server-originated push with a typed data schema |
+| `topo(name, ...modules)` | Collect trail modules into a queryable topology |
+| `validateTopo(topo)` | Structural validation: follows exist, no cycles, examples parse, output schemas present |
 
-Strip sensitive data from logs and outputs.
+### Result
 
 ```typescript
-import {
-  createRedactor,
-  DEFAULT_PATTERNS,
-  DEFAULT_SENSITIVE_KEYS,
-} from '@ontrails/core/redaction';
-
-const redactor = createRedactor({
-  patterns: DEFAULT_PATTERNS,
-  sensitiveKeys: DEFAULT_SENSITIVE_KEYS,
-});
+Result.ok(value);            // Success
+Result.err(error);           // Failure
+Result.combine(results);     // Result<T>[] → Result<T[]>
+Result.fromJson(json);       // Parse JSON string into Result
+Result.toJson(value);        // Serialize to JSON string as Result
+Result.fromFetch(response);  // Convert fetch Response to Result
+
+result.isOk();               // Type guard
+result.isErr();              // Type guard
+result.map(fn);              // Transform success
+result.flatMap(fn);          // Chain Result-returning functions
+result.match({ ok, err });   // Pattern match
+result.unwrapOr(fallback);   // Value or fallback
 ```
 
-### Validation
-
-- **`validateInput(schema, data)`** -- Validate data against a Zod schema, returning `Result`.
-- **`formatZodIssues(issues)`** -- Format Zod issues into human-readable strings.
-- **`zodToJsonSchema(schema)`** -- Convert a Zod schema to JSON Schema for MCP/HTTP surfaces.
+### Error taxonomy
 
-### Branded Types
+13 error classes across 10 categories. Each maps deterministically to exit codes, HTTP status, and JSON-RPC codes on every surface.
 
-Nominal typing for IDs and domain-specific strings that should not be interchangeable.
-
-```typescript
-import { uuid, email, nonEmptyString, positiveInt } from '@ontrails/core';
+| Category | Classes | HTTP | Retryable |
+| --- | --- | --- | --- |
+| `validation` | `ValidationError`, `AmbiguousError`, `AssertionError` | 400 | No |
+| `not_found` | `NotFoundError` | 404 | No |
+| `conflict` | `AlreadyExistsError`, `ConflictError` | 409 | No |
+| `permission` | `PermissionError` | 403 | No |
+| `timeout` | `TimeoutError` | 504 | Yes |
+| `rate_limit` | `RateLimitError` | 429 | Yes |
+| `network` | `NetworkError` | 502 | Yes |
+| `internal` | `InternalError` | 500 | No |
+| `auth` | `AuthError` | 401 | No |
+| `cancelled` | `CancelledError` | 499 | No |
 
-const id = uuid('550e8400-e29b-41d4-a716-446655440000');
-const addr = email('user@example.com');
-```
+The developer returns `Result.err(new NotFoundError(...))`. The framework maps it to the right code on every surface.
 
-### Collections and Guards
+### Other exports
 
-- **Collections** -- `chunk`, `dedupe`, `groupBy`, `sortBy`, `isNonEmptyArray`
-- **Guards** -- `isDefined`, `isNonEmptyString`, `isPlainObject`, `hasProperty`, `assertNever`
+- **Schema derivation** -- `deriveFields(schema)` extracts field metadata from Zod for prompts and forms
+- **Validation** -- `validateInput`, `formatZodIssues`, `zodToJsonSchema`
 - **Resilience** -- `retry`, `withTimeout`, `shouldRetry`, `getBackoffDelay`
-- **Serialization** -- `serializeError`, `deserializeError`, `Result.fromJson`, `Result.toJson`
-- **Path Security** -- `securePath`, `isPathSafe`, `resolveSafePath`
-- **Workspace** -- `findWorkspaceRoot`, `isInsideWorkspace`, `getRelativePath`
+- **Serialization** -- `serializeError`, `deserializeError`
+- **Branded types** -- `uuid`, `email`, `nonEmptyString`, `positiveInt`
+- **Layers** -- cross-cutting middleware via `composeLayers`
+- **Guards and collections** -- `isDefined`, `chunk`, `dedupe`, `groupBy`, `sortBy`
+- **Patterns** (`@ontrails/core/patterns`) -- reusable Zod schemas for pagination, bulk ops, timestamps, sorting
+- **Redaction** (`@ontrails/core/redaction`) -- strip sensitive data before logging
 
-### Layers
+See the [API Reference](../../docs/api-reference.md) for the full list.
 
-Cross-cutting concerns that wrap trail execution:
+## Installation
 
-```typescript
-const loggingLayer: Layer = {
-  name: 'logging',
-  wrap: (next, trail) => async (input, ctx) => {
-    ctx.logger.info(`Executing ${trail.id}`);
-    return next(input, ctx);
-  },
-};
+```bash
+bun add @ontrails/core zod
 ```
-
-## Subpath Exports
-
-| Export | Contents |
-| --- | --- |
-| `@ontrails/core` | trail, hike, event, topo, Result, errors, types, validation, guards, collections, layers |
-| `@ontrails/core/patterns` | Reusable Zod schema patterns |
-| `@ontrails/core/redaction` | Redactor, default patterns and keys |
-
-## Further Reading
-
-- [Getting Started](../../docs/getting-started.md)
-- [Architecture](../../docs/architecture.md)
-- [Vocabulary](../../docs/vocabulary.md)

package/dist/result.d.ts

@@ -6,7 +6,7 @@ declare class Ok<T, E> {
     readonly value: T;
     constructor(value: T);
     isOk(): this is Ok<T, E>;
-    isErr(): this is Err<T, E>;
+    isErr(): this is Err<E>;
     map<U>(fn: (value: T) => U): Result<U, E>;
     flatMap<U, F = E>(fn: (value: T) => Result<U, F>): Result<U, E | F>;
     mapErr<F>(_fn: (error: E) => F): Result<T, F>;
@@ -17,25 +17,25 @@ declare class Ok<T, E> {
     unwrap(): T;
     unwrapOr(_fallback: T): T;
 }
-declare class Err<T, E> {
+declare class Err<E> {
     readonly error: E;
     constructor(error: E);
-    isOk(): this is Ok<T, E>;
-    isErr(): this is Err<T, E>;
-    map<U>(_fn: (value: T) => U): Result<U, E>;
-    flatMap<U, F = E>(_fn: (value: T) => Result<U, F>): Result<U, E | F>;
-    mapErr<F>(fn: (error: E) => F): Result<T, F>;
+    isOk(): this is Ok<never, E>;
+    isErr(): this is Err<E>;
+    map<U>(_fn: (value: never) => U): Result<U, E>;
+    flatMap<U, F = E>(_fn: (value: never) => Result<U, F>): Result<U, E | F>;
+    mapErr<F>(fn: (error: E) => F): Result<never, F>;
     match<U>(handlers: {
-        ok: (value: T) => U;
+        ok: (value: never) => U;
         err: (error: E) => U;
     }): U;
     unwrap(): never;
-    unwrapOr(fallback: T): T;
+    unwrapOr<T>(fallback: T): T;
 }
-export type Result<T, E = Error> = Ok<T, E> | Err<T, E>;
+export type Result<T, E = Error> = Ok<T, E> | Err<E>;
 export declare const Result: {
     readonly combine: <T, E>(results: readonly Result<T, E>[]) => Result<T[], E>;
-    readonly err: <E>(error: E) => Result<never, E>;
+    readonly err: <E>(error: E) => Err<E>;
     /**
      * Wrap a fetch call in a Result, mapping failures to TrailsError subclasses.
      *

package/dist/result.d.ts.map

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

package/dist/result.js.map

@@ -1 +1 @@
-{"version":3,"file":"result.js","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,MAAM,EAAE;IACG,KAAK,CAAI;IAElB,YAAY,KAAQ;QAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,+FAA+F;IAC/F,IAAI;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,+FAA+F;IAC/F,KAAK;QACH,OAAO,KAAK,CAAC;IACf,CAAC;IAED,GAAG,CAAI,EAAmB;QACxB,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,CAAW,EAA8B;QAC9C,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,CAAI,GAAoB;QAC5B,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAI,QAAuD;QAC9D,OAAO,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,QAAQ,CAAC,SAAY;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF;AAED,+FAA+F;AAC/F,MAAM,GAAG;IACE,KAAK,CAAI;IAElB,YAAY,KAAQ;QAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,+FAA+F;IAC/F,IAAI;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,+FAA+F;IAC/F,KAAK;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAI,GAAoB;QACzB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,CAAW,GAA+B;QAC/C,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAI,EAAmB;QAC3B,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAI,QAAuD;QAC9D,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IAED,MAAM;QACJ,MAAM,IAAI,CAAC,KAAK,YAAY,KAAK;YAC/B,CAAC,CAAC,IAAI,CAAC,KAAK;YACZ,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,oFAAoF;IACpF,QAAQ,CAAC,QAAW;QAClB,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAID,2DAA2D;AAC3D,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,OAAO,CAAO,OAAgC;QAC5C,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBACnB,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAED,GAAG,CAAI,KAAQ;QACb,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,SAAS,CACb,KAA6B,EAC7B,IAAkB;QAElB,qEAAqE;QACrE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5D,OAAO,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC;YACH,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAY,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,GAAG,CACZ,IAAI,eAAe,CAAC,cAAc,EAAE;gBAClC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;aACvC,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAED,EAAE,CAAW,KAAS;QACpB,OAAO,IAAI,EAAE,CAAC,KAAU,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAc;QACnB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAY,EAAE,EAAE;gBACxD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;oBAC5C,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;wBAClB,OAAO,YAAY,CAAC;oBACtB,CAAC;oBACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAChB,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CAAC;YACH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,OAAO,IAAI,GAAG,CACZ,IAAI,aAAa,CAAC,gCAAgC,EAAE;oBAClD,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,KAAK,EAAE;iBAChC,CAAC,CACH,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,GAAG,CACZ,IAAI,aAAa,CAAC,2BAA2B,EAAE;gBAC7C,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACjE,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;CACO,CAAC"}
+{"version":3,"file":"result.js","sourceRoot":"","sources":["../src/result.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ontrails/core",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
@@ -16,6 +16,6 @@
     "clean": "rm -rf dist *.tsbuildinfo"
   },
   "peerDependencies": {
-    "zod": "catalog:"
+    "zod": "^4.3.5"
   }
 }

package/src/result.ts

@@ -17,7 +17,7 @@ class Ok<T, E> {
   }
 
   // oxlint-disable-next-line class-methods-use-this -- type guard for Result discriminated union
-  isErr(): this is Err<T, E> {
+  isErr(): this is Err<E> {
     return false;
   }
 
@@ -47,7 +47,7 @@ class Ok<T, E> {
 }
 
 // oxlint-disable-next-line max-classes-per-file -- Result monad requires paired Ok/Err classes
-class Err<T, E> {
+class Err<E> {
   readonly error: E;
 
   constructor(error: E) {
@@ -55,28 +55,28 @@ class Err<T, E> {
   }
 
   // oxlint-disable-next-line class-methods-use-this -- type guard for Result discriminated union
-  isOk(): this is Ok<T, E> {
+  isOk(): this is Ok<never, E> {
     return false;
   }
 
   // oxlint-disable-next-line class-methods-use-this -- type guard for Result discriminated union
-  isErr(): this is Err<T, E> {
+  isErr(): this is Err<E> {
     return true;
   }
 
-  map<U>(_fn: (value: T) => U): Result<U, E> {
+  map<U>(_fn: (value: never) => U): Result<U, E> {
     return new Err(this.error);
   }
 
-  flatMap<U, F = E>(_fn: (value: T) => Result<U, F>): Result<U, E | F> {
+  flatMap<U, F = E>(_fn: (value: never) => Result<U, F>): Result<U, E | F> {
     return new Err(this.error);
   }
 
-  mapErr<F>(fn: (error: E) => F): Result<T, F> {
+  mapErr<F>(fn: (error: E) => F): Result<never, F> {
     return new Err(fn(this.error));
   }
 
-  match<U>(handlers: { ok: (value: T) => U; err: (error: E) => U }): U {
+  match<U>(handlers: { ok: (value: never) => U; err: (error: E) => U }): U {
     return handlers.err(this.error);
   }
 
@@ -87,12 +87,12 @@ class Err<T, E> {
   }
 
   // oxlint-disable-next-line class-methods-use-this -- symmetric API with Ok.unwrapOr
-  unwrapOr(fallback: T): T {
+  unwrapOr<T>(fallback: T): T {
     return fallback;
   }
 }
 
-export type Result<T, E = Error> = Ok<T, E> | Err<T, E>;
+export type Result<T, E = Error> = Ok<T, E> | Err<E>;
 
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export const Result = {
@@ -107,7 +107,7 @@ export const Result = {
     return new Ok(values);
   },
 
-  err<E>(error: E): Result<never, E> {
+  err<E>(error: E): Err<E> {
     return new Err(error);
   },