update result type to use tags

Author: andreyorst

packages/aidbox-client/src/result.ts

@@ -1,4 +1,5 @@
 type Ok<T> = {
+	ok: true;
 	value: T;
 	isOk: () => this is Ok<T>;
 	isErr: () => this is Err<never>;
@@ -7,7 +8,8 @@ type Ok<T> = {
 };
 
 type Err<E> = {
-	error: E;
+	ok: false;
+	value: E;
 	isOk: () => this is Ok<never>;
 	isErr: () => this is Err<E>;
 	map: <U>(f: (value: never) => U) => Result<never, E>;
@@ -17,6 +19,7 @@ type Err<E> = {
 export type Result<T, E> = Ok<T> | Err<E>;
 
 export const Ok = <T>(value: T): Result<T, never> => ({
+	ok: true,
 	value,
 	isOk: (): this is Ok<T> => true,
 	isErr: (): this is Err<never> => false,
@@ -25,7 +28,8 @@ export const Ok = <T>(value: T): Result<T, never> => ({
 });
 
 export const Err = <E>(error: E): Result<never, E> => ({
-	error,
+	ok: false,
+	value: error,
 	isOk: (): this is Ok<never> => false,
 	isErr: (): this is Err<E> => true,
 	map: <U>(_f: (value: never) => U) => Err(error),

packages/aidbox-client/test/result.test.ts

@@ -39,29 +39,29 @@ describe("Result type", () => {
 			expect(result.isOk()).toBe(false);
 			expect(result.isErr()).toBe(true);
 			if (result.isErr())
-				expect(result.error).toBe(42);
+				expect(result.value).toBe(42);
     });
 		it("should not map", () => {
       const result = Err(26);
 			const newResult = result.map((x) => x + 1);
 			expect(newResult.isOk()).toBe(false);
 			expect(newResult.isErr()).toBe(true);
 			if (newResult.isErr())
-				expect(newResult.error).toBe(26);
+				expect(newResult.value).toBe(26);
 			expect(result.isErr()).toBe(true);
 			if (result.isErr())
-				expect(result.error).toBe(26);
+				expect(result.value).toBe(26);
     });
 		it("should mapErr", () => {
       const result = Err("foo");
 			const newResult = result.mapErr((x) => x + "bar");
 			expect(newResult.isOk()).toBe(false);
 			expect(newResult.isErr()).toBe(true);
 			if (newResult.isErr())
-				expect(newResult.error).toBe("foobar");
+				expect(newResult.value).toBe("foobar");
 			expect(result.isErr()).toBe(true);
 			if (result.isErr())
-				expect(result.error).toBe("foo");
+				expect(result.value).toBe("foo");
     });
   });
 });