fixes type issue where Result.Error<E> and Result.Ok<V> is not interchangeable with Result<never, E> and Result<V, never> respectively

Author: everweij

package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "typescript-result",
-  "version": "3.5.2",
+  "version": "3.5.3-beta.1",
   "description": "Supercharge your TypeScript error handling with a powerful Result type that transforms chaotic try-catch blocks into elegant, type-safe code.",
   "keywords": [
     "result",

src/index.ts

@@ -13,8 +13,11 @@ export { NonExhaustiveError } from "./matcher.js";
 export { AsyncResult } from "./result.js";
 
 export namespace Result {
-	export type Error<E> = ResultBase<never, E>;
-	export type Ok<V> = ResultBase<V, never>;
+	type ResultOk<V> = ResultBase<V, never>;
+	type ResultError<E> = ResultBase<never, E>;
+
+	export type Ok<Value> = [Value] extends [never] ? never : ResultOk<Value>;
+	export type Error<E> = [E] extends [never] ? never : ResultError<E>;
 	export type InferError<T> = T extends AsyncResult<any, infer Error>
 		? Error
 		: T extends Result<any, infer Error>
@@ -34,9 +37,6 @@ export namespace Result {
 		: never;
 }
 
-type Ok<Value> = [Value] extends [never] ? never : Result.Ok<Value>;
-type Error<Err> = [Err] extends [never] ? never : Result.Error<Err>;
-
-export type Result<Value, Err> = Ok<Value> | Error<Err>;
+export type Result<Value, Err> = Result.Ok<Value> | Result.Error<Err>;
 
 export const Result: typeof ResultFactory = ResultFactory;

src/result.test.ts

@@ -3785,27 +3785,3 @@ describe("AsyncResult", () => {
 		});
 	});
 });
-
-// function bla() {
-// 	if (Math.random() > 0.5) {
-// 		return Result.ok(42);
-// 	}
-
-// 	if (Math.random() > 0.5) {
-// 		return Result.error(new ErrorB());
-// 	}
-
-// 	return Result.error(new ErrorA());
-// }
-
-// const x = bla().map((val) => val * 2);
-
-// if (x.isOk()) {
-// 	x; //=>
-// 	expectTypeOf(x.value).toBeNumber();
-// 	expectTypeOf(x.error).toBeUndefined();
-// } else {
-// 	x; //=>
-// 	expectTypeOf(x.value).toBeUndefined();
-// 	expectTypeOf(x.error).toEqualTypeOf<ErrorA | ErrorB>();
-// }

src/result.ts

@@ -1640,7 +1640,7 @@ export class ResultFactory {
 	 */
 	static error<const Err extends string>(error: Err): OuterResult.Error<Err>;
 	static error<Err>(error: Err): OuterResult.Error<Err>;
-	static error<Err>(error: Err): OuterResult.Error<Err> {
+	static error<Err>(error: Err) {
 		return new Result(undefined as never, error);
 	}