option

package.json

@@ -21,6 +21,9 @@
     "test": "node ./dist/test/index.test.mjs",
     "prepare": "npm run build"
   },
+  "dependencies": {
+    "@hazae41/option": "^1.0.0"
+  },
   "devDependencies": {
     "@hazae41/phobos": "^1.0.10",
     "@rollup/plugin-typescript": "^11.0.0",

src/index.test.ts

@@ -1 +1 @@
-export * from "mods/index.test.js";
+export * from "./mods/index.test.js";

src/mods/result/data.ts

@@ -1,50 +1,51 @@
+import { None, Some } from "@hazae41/option"
 import { Promiseable } from "libs/promises/promises.js"
 import { Err } from "./error.js"
 
-export class Ok<D>  {
+export class Ok<T>  {
 
   constructor(
-    readonly inner: D
+    readonly inner: T
   ) { }
 
-  static new<D>(inner: D) {
+  static new<T>(inner: T) {
     return new this(inner)
   }
 
   /**
    * Type guard for Ok
    * @returns 
    */
-  isOk(): this is Ok<D> {
+  isOk(): this is Ok<T> {
     return true
   }
 
   isErr(): false {
     return false
   }
 
-  ok() {
+  unwrap() {
     return this.inner
   }
 
-  err() {
-    return undefined
+  unwrapOr(or: unknown) {
+    return this.inner
   }
 
-  unwrap() {
-    return this.inner
+  ok() {
+    return new Some(this.inner)
   }
 
-  unwrapOr(or: unknown) {
-    return this.inner
+  err() {
+    return new None()
   }
 
   /**
    * Map this data into another, throwing if mapper throws
    * @param mutator 
    * @returns 
    */
-  async map<M>(mapper: (data: D) => Promiseable<M>) {
+  async map<M>(mapper: (inner: T) => Promiseable<M>) {
     return new Ok<M>(await mapper(this.inner))
   }
 
@@ -53,7 +54,7 @@ export class Ok<D>  {
    * @param mapper 
    * @returns 
    */
-  async tryMap<M>(mapper: (data: D) => Promiseable<M>) {
+  async tryMap<M>(mapper: (inner: T) => Promiseable<M>) {
     try {
       return await this.map(mapper)
     } catch (error: unknown) {
@@ -66,7 +67,7 @@ export class Ok<D>  {
    * @param mutator 
    * @returns 
    */
-  mapSync<M>(mapper: (data: D) => M) {
+  mapSync<M>(mapper: (inner: T) => M) {
     return new Ok<M>(mapper(this.inner))
   }
 
@@ -75,7 +76,7 @@ export class Ok<D>  {
    * @param mapper 
    * @returns 
    */
-  tryMapSync<M>(mapper: (data: D) => M) {
+  tryMapSync<M>(mapper: (inner: T) => M) {
     try {
       return this.mapSync(mapper)
     } catch (error: unknown) {

src/mods/result/error.ts

@@ -1,11 +1,12 @@
+import { None, Some } from "@hazae41/option"
 
-export class Err<E = unknown>  {
+export class Err<T = unknown>  {
 
   constructor(
-    readonly inner: E
+    readonly inner: T
   ) { }
 
-  static new<E>(inner: E) {
+  static new<T>(inner: T) {
     return new this(inner)
   }
 
@@ -21,18 +22,10 @@ export class Err<E = unknown>  {
    * Type guard for Err
    * @returns 
    */
-  isErr(): this is Err<E> {
+  isErr(): this is Err<T> {
     return true
   }
 
-  ok() {
-    return undefined
-  }
-
-  err() {
-    return this.inner
-  }
-
   unwrap(): never {
     throw this.inner
   }
@@ -41,6 +34,14 @@ export class Err<E = unknown>  {
     return or
   }
 
+  ok() {
+    return new None()
+  }
+
+  err() {
+    return new Some(this.inner)
+  }
+
   map(mapper: unknown) {
     return this
   }