refactor(std): more methods

kwaa · kwaa · commit cafb1ab57727 · 2025-07-09T16:32:26.000+08:00
diff --git a/packages/std/src/option/and.ts b/packages/std/src/option/and.ts
@@ -0,0 +1,19 @@
+import type { Option, Some } from './core'
+
+import { isNone, isSome } from './is'
+
+export const and = <T1, T2>(o: Option<T1>, fallback: Option<T2>): Option<T2> =>
+  isNone(o)
+    ? o
+    : fallback
+
+export const andThen = <T1, T2>(o: Option<T1>, onSome: (s: Some<T1>) => Option<T2>): Option<T2> =>
+  isSome(o)
+    ? onSome(o)
+    : o
+
+// eslint-disable-next-line sonarjs/no-identical-functions
+export const andThenAsync = async <T1, T2>(o: Option<T1>, onSome: (s: Some<T1>) => Promise<Option<T2>>): Promise<Option<T2>> =>
+  isSome(o)
+    ? onSome(o)
+    : o
diff --git a/packages/std/src/option/extract.ts b/packages/std/src/option/extract.ts
@@ -0,0 +1,9 @@
+import type { Option } from './core'
+
+import { isSome } from './is'
+
+/** @experimental */
+export const extract = <T>(o: Option<T>): T | undefined =>
+  isSome(o)
+    ? o.value
+    : undefined
diff --git a/packages/std/src/option/index.ts b/packages/std/src/option/index.ts
@@ -1,2 +1,9 @@
+export * from './and'
+export * from './is'
 export * from './core'
-export * from './methods'
+export * from './extract'
+export * from './map'
+export * from './match'
+export * from './ok'
+export * from './or'
+export * from './unwrap'
diff --git a/packages/std/src/option/is.ts b/packages/std/src/option/is.ts
@@ -0,0 +1,28 @@
+import type { None, Option, Some } from './core'
+
+export const isNone = <T>(o: Option<T>): o is None =>
+  o.__mo === 'none'
+
+export const isNoneOr = <T>(o: Option<T>, onSomeValue: (v: T) => boolean): boolean =>
+  isNone(o)
+    ? true
+    : onSomeValue(o.value)
+
+export const isNoneOrAsync = async <T>(o: Option<T>, onSomeValue: (v: T) => Promise<boolean>): Promise<boolean> =>
+  isNone(o)
+    ? true
+    : await onSomeValue(o.value)
+
+export const isSome = <T>(o: Option<T>): o is Some<T> =>
+  o.__mo === 'some'
+
+export const isSomeAnd = <T>(o: Option<T>, onSomeValue: (v: T) => boolean): boolean =>
+  isSome(o)
+    ? onSomeValue(o.value)
+    : false
+
+export const isSomeAndAsync = async <T>(o: Option<T>, onSomeValue: (v: T) => Promise<boolean>): Promise<boolean> =>
+  isSome(o)
+    ? await onSomeValue(o.value)
+    : false
+
diff --git a/packages/std/src/option/map.ts b/packages/std/src/option/map.ts
@@ -0,0 +1,34 @@
+import type { Option } from './core'
+
+import { some } from './core'
+import { isSome } from './is'
+
+export const map = <T1, T2>(o: Option<T1>, onSomeValue: (v: T1) => T2): Option<T2> =>
+  isSome(o)
+    ? some(onSomeValue(o.value))
+    : o
+
+export const mapAsync = async <T1, T2>(o: Option<T1>, onSomeValue: (v: T1) => Promise<T2>): Promise<Option<T2>> =>
+  isSome(o)
+    ? some(await onSomeValue(o.value))
+    : o
+
+export const mapOr = <T1, T2>(o: Option<T1>, onSomeValue: (v: T1) => T2, fallback: T2): T2 =>
+    isSome(o)
+      ? onSomeValue(o.value)
+      : fallback
+
+export const mapOrAsync = async <T1, T2>(o: Option<T1>, onSomeValue: (v: T1) => Promise<T2>, fallback: T2): Promise<T2> =>
+    isSome(o)
+      ? await onSomeValue(o.value)
+      : fallback
+
+export const mapOrElse = <T1, T2>(o: Option<T1>, onSomeValue: (v: T1) => T2, onNone: () => T2): T2 =>
+  isSome(o)
+    ? onSomeValue(o.value)
+    : onNone()
+
+export const mapOrElseAsync = async <T1, T2>(o: Option<T1>, onSomeValue: (v: T1) => Promise<T2>, onNone: () => Promise<T2>): Promise<T2> =>
+  isSome(o)
+    ? await onSomeValue(o.value)
+    : await onNone()
diff --git a/packages/std/src/option/match.ts b/packages/std/src/option/match.ts
@@ -0,0 +1,8 @@
+import type { Option, Some } from './core'
+
+import { isSome } from './is'
+
+export const match = <T1, T2>(o: Option<T1>, onSome: (s: Some<T1>) => T2, onNone: () => T2): T2 =>
+  isSome(o)
+    ? onSome(o)
+    : onNone()
diff --git a/packages/std/src/option/methods.ts b/packages/std/src/option/methods.ts
diff --git a/packages/std/src/option/ok.ts b/packages/std/src/option/ok.ts
@@ -0,0 +1,15 @@
+import type { Result } from '../result/core'
+import type { Option } from './core'
+
+import { err, ok } from '../result/core'
+import { isSome } from './is'
+
+export const okOr = <T, E>(o: Option<T>, error: E): Result<T, E> =>
+  isSome(o)
+    ? ok(o.value)
+    : err(error)
+
+export const okOrElse = <T, E>(o: Option<T>, onNone: () => E): Result<T, E> =>
+  isSome(o)
+    ? ok(o.value)
+    : err(onNone())
diff --git a/packages/std/src/option/or.ts b/packages/std/src/option/or.ts
@@ -0,0 +1,18 @@
+import type { Option } from './core'
+
+import { isSome } from './is'
+
+export const or = <T>(o: Option<T>, fallback: Option<T>): Option<T> =>
+  isSome(o)
+    ? o
+    : fallback
+
+export const orElse = <T>(o: Option<T>, onNone: () => Option<T>): Option<T> =>
+  isSome(o)
+    ? o
+    : onNone()
+
+export const orElseAsync = async <T>(o: Option<T>, onNone: () => Promise<Option<T>>): Promise<Option<T>> =>
+  isSome(o)
+    ? o
+    : await onNone()
diff --git a/packages/std/src/option/unwrap.ts b/packages/std/src/option/unwrap.ts
@@ -0,0 +1,25 @@
+import type { Option } from './core'
+
+import { isSome } from './is'
+
+export const unwrap = <T>(o: Option<T>): T => {
+  if (isSome(o))
+    return o.value
+  else
+    throw new Error('called `option.unwrap()` on a `None` value')
+}
+
+export const unwrapOr = <T>(o: Option<T>, fallback: T): T =>
+  isSome(o)
+    ? o.value
+    : fallback
+
+export const unwrapOrElse = <T>(o: Option<T>, onNone: () => T): T =>
+  isSome(o)
+    ? o.value
+    : onNone()
+
+export const unwrapOrElseAsync = async <T>(o: Option<T>, onNone: () => Promise<T>): Promise<T> =>
+  isSome(o)
+    ? o.value
+    : await onNone()
diff --git a/packages/std/src/result/and.ts b/packages/std/src/result/and.ts
@@ -0,0 +1,19 @@
+import type { Ok, Result } from './core'
+
+import { isOk } from './is'
+
+export const and = <T, E>(r: Result<T, E>, fallback: Result<T, E>): Result<T, E> =>
+  isOk(r)
+    ? r
+    : fallback
+
+export const andThen = <T1, T2, E>(r: Result<T1, E>, onOk: (o: Ok<T1>) => Result<T2, E>): Result<T2, E> =>
+  isOk(r)
+    ? onOk(r)
+    : r
+
+// eslint-disable-next-line sonarjs/no-identical-functions
+export const andThenAsync = async <T1, T2, E>(r: Result<T1, E>, onOk: (o: Ok<T1>) => Promise<Result<T2, E>>): Promise<Result<T2, E>> =>
+  isOk(r)
+    ? onOk(r)
+    : r
diff --git a/packages/std/src/result/expect.ts b/packages/std/src/result/expect.ts
@@ -0,0 +1,18 @@
+import type { Result } from './core'
+
+import { isOk, isErr } from './is'
+
+export const expect = <T, E>(r: Result<T, E>, msg: string): T => {
+  if (isOk(r))
+    return r.value
+  else
+    throw new Error(msg, { cause: r.error })
+}
+
+export const expectErr = <T, E>(r: Result<T, E>, msg: string): E => {
+  if (isErr(r))
+    return r.error
+  else
+    throw new Error(msg, { cause: r.value })
+}
+
diff --git a/packages/std/src/result/extract.ts b/packages/std/src/result/extract.ts
@@ -0,0 +1,9 @@
+import type { Result } from './core'
+
+import { isOk } from './is'
+
+/** @experimental */
+export const extract = <T, E>(r: Result<T, E>): E | T =>
+  isOk(r)
+    ? r.value
+    : r.error
diff --git a/packages/std/src/result/index.ts b/packages/std/src/result/index.ts
@@ -1,2 +1,10 @@
+export * from './and'
 export * from './core'
-export * from './methods'
+export * from './expect'
+export * from './extract'
+export * from './is'
+export * from './map'
+export * from './match'
+export * from './option'
+export * from './or'
+export * from './unwrap'
diff --git a/packages/std/src/result/is.ts b/packages/std/src/result/is.ts
@@ -0,0 +1,28 @@
+import type { Err, Ok, Result } from './core'
+
+export const isOk = <T, E>(r: Result<T, E>): r is Ok<T> =>
+  r.__mr === 'ok'
+
+export const isOkAnd = <T, E>(r: Result<T, E>, onOk: (v: T) => boolean): boolean =>
+  isOk(r)
+    ? onOk(r.value)
+    : false
+
+export const isOkAndAsync = async <T, E>(r: Result<T, E>, onOk: (v: T) => Promise<boolean>): Promise<boolean> =>
+  isOk(r)
+    ? await onOk(r.value)
+    : false
+
+export const isErr = <T, E>(r: Result<T, E>): r is Err<E> =>
+  r.__mr === 'err'
+
+export const isErrAnd = <T, E>(r: Result<T, E>, onErr: (e: E) => boolean): boolean =>
+  isErr(r)
+    ? onErr(r.error)
+    : false
+
+export const isErrAndAsync = async <T, E>(r: Result<T, E>, onErr: (e: E) => Promise<boolean>): Promise<boolean> =>
+  isErr(r)
+    ? await onErr(r.error)
+    : false
+
diff --git a/packages/std/src/result/map.ts b/packages/std/src/result/map.ts
@@ -0,0 +1,45 @@
+import type { Result } from './core'
+
+import { err, ok } from './core'
+
+import { isOk, isErr } from './is'
+
+export const map = <T1, T2, E>(r: Result<T1, E>, onOkValue: (v: T1) => T2): Result<T2, E> =>
+  isOk(r)
+    ? ok(onOkValue(r.value))
+    : r
+
+export const mapAsync = async <T1, T2, E>(r: Result<T1, E>, onOkValue: (v: T1) => Promise<T2>): Promise<Result<T2, E>> =>
+  isOk(r)
+    ? ok(await onOkValue(r.value))
+    : r
+
+export const mapErr = <T, E1, E2>(r: Result<T, E1>, onErrValue: (v: E1) => E2): Result<T, E2> =>
+  isErr(r)
+    ? err(onErrValue(r.error))
+    : r
+
+export const mapErrAsync = async <T, E1, E2>(r: Result<T, E1>, onErrValue: (v: E1) => Promise<E2>): Promise<Result<T, E2>> =>
+  isErr(r)
+    ? err(await onErrValue(r.error))
+    : r
+
+export const mapOr = <T1, T2, E>(r: Result<T1, E>, onOkValue: (v: T1) => T2, fallback: T2): T2 =>
+  isOk(r)
+    ? onOkValue(r.value)
+    : fallback
+
+export const mapOrAsync = async <T1, T2, E>(r: Result<T1, E>, onOkValue: (v: T1) => Promise<T2>, fallback: T2): Promise<T2> =>
+  isOk(r)
+    ? await onOkValue(r.value)
+    : fallback
+
+export const mapOrElse = <T1, T2, E>(r: Result<T1, E>, onOkValue: (v: T1) => T2, onErrValue: (e: E) => T2): T2 =>
+  isOk(r)
+    ? onOkValue(r.value)
+    : onErrValue(r.error)
+
+export const mapOrElseAsync = async <T1, T2, E>(r: Result<T1, E>, onOkValue: (v: T1) => Promise<T2>, onErrValue: (e: E) => Promise<T2>): Promise<T2> =>
+  isOk(r)
+    ? await onOkValue(r.value)
+    : await onErrValue(r.error)
diff --git a/packages/std/src/result/match.ts b/packages/std/src/result/match.ts
@@ -0,0 +1,8 @@
+import type { Err, Ok, Result } from './core'
+
+import { isOk } from './is'
+
+export const match = <T1, T2, E>(r: Result<T1, E>, onOk: (o: Ok<T1>) => T2, onErr: (e: Err<E>) => T2): T2 =>
+  isOk(r)
+    ? onOk(r)
+    : onErr(r)
diff --git a/packages/std/src/result/methods.ts b/packages/std/src/result/methods.ts
diff --git a/packages/std/src/result/option.ts b/packages/std/src/result/option.ts
diff --git a/packages/std/src/result/or.ts b/packages/std/src/result/or.ts
diff --git a/packages/std/src/result/unwrap.ts b/packages/std/src/result/unwrap.ts
