@ls-stack/utils 2.0.0 → 2.0.1

package/dist/{chunk-JOBPQAI3.js → chunk-3PXKYWJF.js}

@@ -6,6 +6,21 @@ import {
 function okUnwrapOr() {
   return this.value;
 }
+function okMap(mapFn) {
+  return this.ok ? ok(mapFn(this.value)) : this;
+}
+function errMap(mapFn) {
+  return this.ok ? this : err(mapFn(this.error));
+}
+function mapOkAndErr({
+  ok: mapFn,
+  err: mapErrFn
+}) {
+  return this.ok ? ok(mapFn(this.value)) : err(mapErrFn(this.error));
+}
+function returnResult() {
+  return this;
+}
 function ok(value = void 0) {
   return {
     ok: true,
@@ -13,7 +28,10 @@ function ok(value = void 0) {
     value,
     unwrapOrNull: okUnwrapOr,
     unwrapOr: okUnwrapOr,
-    unwrap: okUnwrapOr
+    unwrap: okUnwrapOr,
+    mapOk: okMap,
+    mapErr: returnResult,
+    mapOkAndErr
   };
 }
 function err(error) {
@@ -29,25 +47,25 @@ function err(error) {
       if (error instanceof Error) {
         throw error;
       }
-      if (Array.isArray(error)) {
-        throw new Error(error.join("\n"), { cause: error });
-      }
-      throw new Error(
-        isObject(error) && "message" in error && error.message ? String(error.message) : "Unwrap failed",
-        { cause: error }
-      );
-    }
+      throw normalizeError(error);
+    },
+    mapOk: returnResult,
+    mapErr: errMap,
+    mapOkAndErr
   };
 }
 function unknownToError(error) {
   return err(normalizeError(error));
 }
-async function unwrap(result) {
+async function asyncUnwrap(result) {
   const unwrapped = await result;
   if (unwrapped.ok) {
     return unwrapped.value;
   }
-  throw unwrapped.error;
+  if (unwrapped.error instanceof Error) {
+    throw unwrapped.error;
+  }
+  throw normalizeError(unwrapped.error);
 }
 function asyncMap(resultPromise) {
   return {
@@ -68,29 +86,12 @@ function asyncMap(resultPromise) {
     }
   };
 }
-function syncMap(result) {
-  return {
-    err: (mapFn) => {
-      return result.ok ? ok(result.value) : err(mapFn(result.error));
-    },
-    ok: (mapFn) => {
-      return result.ok ? ok(mapFn(result.value)) : err(result.error);
-    },
-    okAndErr: ({
-      ok: mapFn,
-      err: mapErrFn
-    }) => {
-      return result.ok ? ok(mapFn(result.value)) : err(mapErrFn(result.error));
-    }
-  };
-}
 var Result = {
   ok,
   err,
   unknownToError,
-  unwrap,
-  asyncMap,
-  map: syncMap
+  asyncUnwrap,
+  asyncMap
 };
 function resultify(fn, errorNormalizer) {
   try {
@@ -117,7 +118,7 @@ function normalizeError(error) {
   }
   if (isObject(error)) {
     return new Error(
-      "message" in error && error.message ? String(error.message) : safeJsonStringify(error) ?? "unknown",
+      "message" in error && error.message && typeof error.message === "string" ? error.message : safeJsonStringify(error) ?? "unknown",
       { cause: error }
     );
   }

package/dist/parallelAsyncCalls.cjs

@@ -38,6 +38,21 @@ function isObject(value) {
 function okUnwrapOr() {
   return this.value;
 }
+function okMap(mapFn) {
+  return this.ok ? ok(mapFn(this.value)) : this;
+}
+function errMap(mapFn) {
+  return this.ok ? this : err(mapFn(this.error));
+}
+function mapOkAndErr({
+  ok: mapFn,
+  err: mapErrFn
+}) {
+  return this.ok ? ok(mapFn(this.value)) : err(mapErrFn(this.error));
+}
+function returnResult() {
+  return this;
+}
 function ok(value = void 0) {
   return {
     ok: true,
@@ -45,7 +60,10 @@ function ok(value = void 0) {
     value,
     unwrapOrNull: okUnwrapOr,
     unwrapOr: okUnwrapOr,
-    unwrap: okUnwrapOr
+    unwrap: okUnwrapOr,
+    mapOk: okMap,
+    mapErr: returnResult,
+    mapOkAndErr
   };
 }
 function err(error) {
@@ -61,25 +79,25 @@ function err(error) {
       if (error instanceof Error) {
         throw error;
       }
-      if (Array.isArray(error)) {
-        throw new Error(error.join("\n"), { cause: error });
-      }
-      throw new Error(
-        isObject(error) && "message" in error && error.message ? String(error.message) : "Unwrap failed",
-        { cause: error }
-      );
-    }
+      throw normalizeError(error);
+    },
+    mapOk: returnResult,
+    mapErr: errMap,
+    mapOkAndErr
   };
 }
 function unknownToError(error) {
   return err(normalizeError(error));
 }
-async function unwrap(result) {
+async function asyncUnwrap(result) {
   const unwrapped = await result;
   if (unwrapped.ok) {
     return unwrapped.value;
   }
-  throw unwrapped.error;
+  if (unwrapped.error instanceof Error) {
+    throw unwrapped.error;
+  }
+  throw normalizeError(unwrapped.error);
 }
 function asyncMap(resultPromise) {
   return {
@@ -100,29 +118,12 @@ function asyncMap(resultPromise) {
     }
   };
 }
-function syncMap(result) {
-  return {
-    err: (mapFn) => {
-      return result.ok ? ok(result.value) : err(mapFn(result.error));
-    },
-    ok: (mapFn) => {
-      return result.ok ? ok(mapFn(result.value)) : err(result.error);
-    },
-    okAndErr: ({
-      ok: mapFn,
-      err: mapErrFn
-    }) => {
-      return result.ok ? ok(mapFn(result.value)) : err(mapErrFn(result.error));
-    }
-  };
-}
 var Result = {
   ok,
   err,
   unknownToError,
-  unwrap,
-  asyncMap,
-  map: syncMap
+  asyncUnwrap,
+  asyncMap
 };
 function normalizeError(error) {
   if (error instanceof Error) return error;
@@ -131,7 +132,7 @@ function normalizeError(error) {
   }
   if (isObject(error)) {
     return new Error(
-      "message" in error && error.message ? String(error.message) : safeJsonStringify(error) ?? "unknown",
+      "message" in error && error.message && typeof error.message === "string" ? error.message : safeJsonStringify(error) ?? "unknown",
       { cause: error }
     );
   }

package/dist/parallelAsyncCalls.js

@@ -1,7 +1,7 @@
 import {
   Result,
   normalizeError
-} from "./chunk-JOBPQAI3.js";
+} from "./chunk-3PXKYWJF.js";
 import {
   sleep
 } from "./chunk-5DZT3Z5Z.js";

package/dist/rsResult.cjs

@@ -38,6 +38,21 @@ function isObject(value) {
 function okUnwrapOr() {
   return this.value;
 }
+function okMap(mapFn) {
+  return this.ok ? ok(mapFn(this.value)) : this;
+}
+function errMap(mapFn) {
+  return this.ok ? this : err(mapFn(this.error));
+}
+function mapOkAndErr({
+  ok: mapFn,
+  err: mapErrFn
+}) {
+  return this.ok ? ok(mapFn(this.value)) : err(mapErrFn(this.error));
+}
+function returnResult() {
+  return this;
+}
 function ok(value = void 0) {
   return {
     ok: true,
@@ -45,7 +60,10 @@ function ok(value = void 0) {
     value,
     unwrapOrNull: okUnwrapOr,
     unwrapOr: okUnwrapOr,
-    unwrap: okUnwrapOr
+    unwrap: okUnwrapOr,
+    mapOk: okMap,
+    mapErr: returnResult,
+    mapOkAndErr
   };
 }
 function err(error) {
@@ -61,25 +79,25 @@ function err(error) {
       if (error instanceof Error) {
         throw error;
       }
-      if (Array.isArray(error)) {
-        throw new Error(error.join("\n"), { cause: error });
-      }
-      throw new Error(
-        isObject(error) && "message" in error && error.message ? String(error.message) : "Unwrap failed",
-        { cause: error }
-      );
-    }
+      throw normalizeError(error);
+    },
+    mapOk: returnResult,
+    mapErr: errMap,
+    mapOkAndErr
   };
 }
 function unknownToError(error) {
   return err(normalizeError(error));
 }
-async function unwrap(result) {
+async function asyncUnwrap(result) {
   const unwrapped = await result;
   if (unwrapped.ok) {
     return unwrapped.value;
   }
-  throw unwrapped.error;
+  if (unwrapped.error instanceof Error) {
+    throw unwrapped.error;
+  }
+  throw normalizeError(unwrapped.error);
 }
 function asyncMap(resultPromise) {
   return {
@@ -100,29 +118,12 @@ function asyncMap(resultPromise) {
     }
   };
 }
-function syncMap(result) {
-  return {
-    err: (mapFn) => {
-      return result.ok ? ok(result.value) : err(mapFn(result.error));
-    },
-    ok: (mapFn) => {
-      return result.ok ? ok(mapFn(result.value)) : err(result.error);
-    },
-    okAndErr: ({
-      ok: mapFn,
-      err: mapErrFn
-    }) => {
-      return result.ok ? ok(mapFn(result.value)) : err(mapErrFn(result.error));
-    }
-  };
-}
 var Result = {
   ok,
   err,
   unknownToError,
-  unwrap,
-  asyncMap,
-  map: syncMap
+  asyncUnwrap,
+  asyncMap
 };
 function resultify(fn, errorNormalizer) {
   try {
@@ -149,7 +150,7 @@ function normalizeError(error) {
   }
   if (isObject(error)) {
     return new Error(
-      "message" in error && error.message ? String(error.message) : safeJsonStringify(error) ?? "unknown",
+      "message" in error && error.message && typeof error.message === "string" ? error.message : safeJsonStringify(error) ?? "unknown",
       { cause: error }
     );
   }

package/dist/rsResult.d.cts

@@ -3,20 +3,24 @@ type Ok<T> = {
     error: false;
     value: T;
 };
-type IsExactlyAny<T> = boolean extends (T extends never ? true : false) ? true : false;
 type ResultValidErrors = Error | Record<string, unknown> | unknown[] | true;
 type Err<E extends ResultValidErrors> = {
     ok: false;
     error: E;
     errorResult: () => Result<any, E>;
 };
-type Unwrap<E, T> = IsExactlyAny<E> extends true ? any : E extends Error ? () => T : unknown;
-type ResultMethods<T, E> = {
+type ResultMethods<T, E extends ResultValidErrors> = {
     /** Returns the value if the result is Ok, otherwise returns null */
     unwrapOrNull: () => T | null;
     /** Returns the value if the result is Ok, otherwise returns the provided default value */
     unwrapOr: <R extends T>(defaultValue: R) => T | R;
-    unwrap: Unwrap<E, T>;
+    unwrap: () => T;
+    mapOk: <NewValue>(mapFn: (value: T) => NewValue) => Result<NewValue, E>;
+    mapErr: <NewError extends ResultValidErrors>(mapFn: (error: E) => NewError) => Result<T, NewError>;
+    mapOkAndErr: <NewValue, NewError extends ResultValidErrors>(mapFns: {
+        ok: (value: T) => NewValue;
+        err: (error: E) => NewError;
+    }) => Result<NewValue, NewError>;
 };
 type OkResult<T, E extends ResultValidErrors, M = any> = Ok<T> & ResultMethods<M, E>;
 declare function ok(): OkResult<void, any>;
@@ -25,7 +29,7 @@ type ErrResult<E extends ResultValidErrors, T = any> = Err<E> & ResultMethods<T,
 declare function err<E extends ResultValidErrors>(error: E): ErrResult<E>;
 declare function unknownToError(error: unknown): ErrResult<Error, any>;
 /** Unwraps a promise result */
-declare function unwrap<T>(result: Promise<Result<T, Error>>): Promise<T>;
+declare function asyncUnwrap<T>(result: Promise<Result<T, ResultValidErrors>>): Promise<T>;
 declare function asyncMap<T, E extends ResultValidErrors>(resultPromise: Promise<Result<T, E>>): {
     err: <NewError extends ResultValidErrors>(mapFn: (error: E) => NewError) => Promise<Result<T, NewError>>;
     ok: <NewValue>(mapFn: (value: T) => NewValue) => Promise<Result<NewValue, E>>;
@@ -34,14 +38,6 @@ declare function asyncMap<T, E extends ResultValidErrors>(resultPromise: Promise
         err: (error: E) => NewError;
     }) => Promise<Result<NewValue, NewError>>;
 };
-declare function syncMap<T, E extends ResultValidErrors>(result: Result<T, E>): {
-    err: <NewError extends ResultValidErrors>(mapFn: (error: E) => NewError) => Result<T, NewError>;
-    ok: <NewValue>(mapFn: (value: T) => NewValue) => Result<NewValue, E>;
-    okAndErr: <NewValue, NewError extends ResultValidErrors>({ ok: mapFn, err: mapErrFn, }: {
-        ok: (value: T) => NewValue;
-        err: (error: E) => NewError;
-    }) => Result<NewValue, NewError>;
-};
 /**
  * Util for implementing something similar to Result<T, E> in Rust, for better error handling.
  *
@@ -69,9 +65,8 @@ declare const Result: {
     ok: typeof ok;
     err: typeof err;
     unknownToError: typeof unknownToError;
-    unwrap: typeof unwrap;
+    asyncUnwrap: typeof asyncUnwrap;
     asyncMap: typeof asyncMap;
-    map: typeof syncMap;
 };
 /** transform a function in a result function */
 declare function resultify<T, E extends ResultValidErrors = Error>(fn: () => T, errorNormalizer?: (err: unknown) => E): Result<T, E>;

package/dist/rsResult.d.ts

@@ -3,20 +3,24 @@ type Ok<T> = {
     error: false;
     value: T;
 };
-type IsExactlyAny<T> = boolean extends (T extends never ? true : false) ? true : false;
 type ResultValidErrors = Error | Record<string, unknown> | unknown[] | true;
 type Err<E extends ResultValidErrors> = {
     ok: false;
     error: E;
     errorResult: () => Result<any, E>;
 };
-type Unwrap<E, T> = IsExactlyAny<E> extends true ? any : E extends Error ? () => T : unknown;
-type ResultMethods<T, E> = {
+type ResultMethods<T, E extends ResultValidErrors> = {
     /** Returns the value if the result is Ok, otherwise returns null */
     unwrapOrNull: () => T | null;
     /** Returns the value if the result is Ok, otherwise returns the provided default value */
     unwrapOr: <R extends T>(defaultValue: R) => T | R;
-    unwrap: Unwrap<E, T>;
+    unwrap: () => T;
+    mapOk: <NewValue>(mapFn: (value: T) => NewValue) => Result<NewValue, E>;
+    mapErr: <NewError extends ResultValidErrors>(mapFn: (error: E) => NewError) => Result<T, NewError>;
+    mapOkAndErr: <NewValue, NewError extends ResultValidErrors>(mapFns: {
+        ok: (value: T) => NewValue;
+        err: (error: E) => NewError;
+    }) => Result<NewValue, NewError>;
 };
 type OkResult<T, E extends ResultValidErrors, M = any> = Ok<T> & ResultMethods<M, E>;
 declare function ok(): OkResult<void, any>;
@@ -25,7 +29,7 @@ type ErrResult<E extends ResultValidErrors, T = any> = Err<E> & ResultMethods<T,
 declare function err<E extends ResultValidErrors>(error: E): ErrResult<E>;
 declare function unknownToError(error: unknown): ErrResult<Error, any>;
 /** Unwraps a promise result */
-declare function unwrap<T>(result: Promise<Result<T, Error>>): Promise<T>;
+declare function asyncUnwrap<T>(result: Promise<Result<T, ResultValidErrors>>): Promise<T>;
 declare function asyncMap<T, E extends ResultValidErrors>(resultPromise: Promise<Result<T, E>>): {
     err: <NewError extends ResultValidErrors>(mapFn: (error: E) => NewError) => Promise<Result<T, NewError>>;
     ok: <NewValue>(mapFn: (value: T) => NewValue) => Promise<Result<NewValue, E>>;
@@ -34,14 +38,6 @@ declare function asyncMap<T, E extends ResultValidErrors>(resultPromise: Promise
         err: (error: E) => NewError;
     }) => Promise<Result<NewValue, NewError>>;
 };
-declare function syncMap<T, E extends ResultValidErrors>(result: Result<T, E>): {
-    err: <NewError extends ResultValidErrors>(mapFn: (error: E) => NewError) => Result<T, NewError>;
-    ok: <NewValue>(mapFn: (value: T) => NewValue) => Result<NewValue, E>;
-    okAndErr: <NewValue, NewError extends ResultValidErrors>({ ok: mapFn, err: mapErrFn, }: {
-        ok: (value: T) => NewValue;
-        err: (error: E) => NewError;
-    }) => Result<NewValue, NewError>;
-};
 /**
  * Util for implementing something similar to Result<T, E> in Rust, for better error handling.
  *
@@ -69,9 +65,8 @@ declare const Result: {
     ok: typeof ok;
     err: typeof err;
     unknownToError: typeof unknownToError;
-    unwrap: typeof unwrap;
+    asyncUnwrap: typeof asyncUnwrap;
     asyncMap: typeof asyncMap;
-    map: typeof syncMap;
 };
 /** transform a function in a result function */
 declare function resultify<T, E extends ResultValidErrors = Error>(fn: () => T, errorNormalizer?: (err: unknown) => E): Result<T, E>;

package/dist/rsResult.js

@@ -5,7 +5,7 @@ import {
   normalizeError,
   resultify,
   safeJsonStringify
-} from "./chunk-JOBPQAI3.js";
+} from "./chunk-3PXKYWJF.js";
 import "./chunk-4UGSP3L3.js";
 export {
   Result,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ls-stack/utils",
   "description": "Typescript utils",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT",
   "files": [
     "dist"