go-go-try 7.3.0 → 7.4.1

package/dist/index.d.mts

@@ -28,6 +28,38 @@ interface GoTryAllOptions {
 type ErrorConstructor<E> = new (message: string, options?: {
     cause?: unknown;
 }) => E;
+/**
+ * Options for goTryRaw function.
+ * errorClass and systemErrorClass are mutually exclusive - you can only provide one.
+ */
+type GoTryRawOptions<E = Error> = {
+    errorClass: ErrorConstructor<E>;
+    systemErrorClass?: never;
+} | {
+    errorClass?: never;
+    systemErrorClass: ErrorConstructor<E>;
+} | {
+    errorClass?: never;
+    systemErrorClass?: never;
+};
+/**
+ * Options for goTryAllRaw function.
+ * Includes concurrency control and error class options.
+ * errorClass and systemErrorClass are mutually exclusive.
+ */
+type GoTryAllRawOptions<E = Error> = {
+    concurrency?: number;
+    errorClass: ErrorConstructor<E>;
+    systemErrorClass?: never;
+} | {
+    concurrency?: number;
+    errorClass?: never;
+    systemErrorClass: ErrorConstructor<E>;
+} | {
+    concurrency?: number;
+    errorClass?: never;
+    systemErrorClass?: never;
+};
 /**
  * Creates a union type from multiple tagged error classes.
  *
@@ -71,14 +103,44 @@ declare function goTry<T>(promise: Promise<T>): Promise<Result<string, T>>;
 declare function goTry<T>(fn: () => T): Result<string, T>;
 declare function goTry<T>(value: T): Result<string, T>;
 
+/**
+ * Default system error class for errors that aren't already wrapped in a tagged error class.
+ *
+ * @example
+ * // By default, goTryRaw wraps unknown errors in UnknownError
+ * const [err, result] = goTryRaw(() => mightThrow())
+ * if (err) {
+ *   console.log(err._tag) // 'UnknownError'
+ * }
+ *
+ * @example
+ * // Use a custom system error class
+ * const SystemError = taggedError('SystemError')
+ * const [err, result] = goTryRaw(() => mightThrow(), {
+ *   systemErrorClass: SystemError
+ * })
+ */
+declare const UnknownError: {
+    new (message: string, options?: {
+        cause?: unknown;
+    } | undefined): {
+        readonly _tag: "UnknownError";
+        readonly cause?: unknown;
+        name: string;
+        message: string;
+        stack?: string;
+    };
+    isError(error: unknown): error is Error;
+};
+
 /**
  * Executes a function, promise, or value and returns a Result type.
  * If an error occurs, it returns a Failure with the raw error object.
  *
  * @template T The type of the successful result
- * @template E The type of the error, defaults to Error
+ * @template E The type of the error
  * @param {T | Promise<T> | (() => T | Promise<T>)} value - The value, promise, or function to execute
- * @param {ErrorConstructor<E>} [ErrorClass] - Optional error constructor to wrap caught errors
+ * @param {GoTryRawOptions<E>} [options] - Optional options object
  * @returns {Result<E, T> | Promise<Result<E, T>>} A Result type or a Promise of a Result type
  *
  * @example
@@ -94,21 +156,26 @@ declare function goTry<T>(value: T): Result<string, T>;
  * const [err, result] = await goTryRaw(fetch('https://api.example.com/data'));
  *
  * @example
- * // With tagged error for discriminated unions
+ * // With options object - wrap all errors
  * const DatabaseError = taggedError('DatabaseError');
- * const [err, result] = await goTryRaw(fetchData(), DatabaseError);
- * // err is InstanceType<typeof DatabaseError> | undefined
+ * const [err, result] = await goTryRaw(fetchData(), { errorClass: DatabaseError });
+ *
+ * @example
+ * // With options object - systemErrorClass only wraps non-tagged errors
+ * const [err, result] = await goTryRaw(fetchData(), { systemErrorClass: UnknownError });
+ * // Errors thrown as tagged errors pass through
+ * // Other errors are wrapped in UnknownError
  */
-declare function goTryRaw<T, E = Error>(fn: () => never): Result<E, never>;
-declare function goTryRaw<T, E = Error>(fn: () => never, ErrorClass: ErrorConstructor<E>): Result<E, never>;
-declare function goTryRaw<T, E = Error>(fn: () => Promise<T>): Promise<Result<E, T>>;
-declare function goTryRaw<T, E = Error>(fn: () => Promise<T>, ErrorClass: ErrorConstructor<E>): Promise<Result<E, T>>;
-declare function goTryRaw<T, E = Error>(promise: Promise<T>): Promise<Result<E, T>>;
-declare function goTryRaw<T, E = Error>(promise: Promise<T>, ErrorClass: ErrorConstructor<E>): Promise<Result<E, T>>;
-declare function goTryRaw<T, E = Error>(fn: () => T): Result<E, T>;
-declare function goTryRaw<T, E = Error>(fn: () => T, ErrorClass: ErrorConstructor<E>): Result<E, T>;
-declare function goTryRaw<T, E = Error>(value: T): Result<E, T>;
-declare function goTryRaw<T, E = Error>(value: T, ErrorClass: ErrorConstructor<E>): Result<E, T>;
+declare function goTryRaw<T>(fn: () => never): Result<Error, never>;
+declare function goTryRaw<T, E = InstanceType<typeof UnknownError>>(fn: () => never, options: GoTryRawOptions<E>): Result<E, never>;
+declare function goTryRaw<T>(fn: () => Promise<T>): Promise<Result<Error, T>>;
+declare function goTryRaw<T, E = InstanceType<typeof UnknownError>>(fn: () => Promise<T>, options: GoTryRawOptions<E>): Promise<Result<E, T>>;
+declare function goTryRaw<T>(promise: Promise<T>): Promise<Result<Error, T>>;
+declare function goTryRaw<T, E = InstanceType<typeof UnknownError>>(promise: Promise<T>, options: GoTryRawOptions<E>): Promise<Result<E, T>>;
+declare function goTryRaw<T>(fn: () => T): Result<Error, T>;
+declare function goTryRaw<T, E = InstanceType<typeof UnknownError>>(fn: () => T, options: GoTryRawOptions<E>): Result<E, T>;
+declare function goTryRaw<T>(value: T): Result<Error, T>;
+declare function goTryRaw<T, E = InstanceType<typeof UnknownError>>(value: T, options: GoTryRawOptions<E>): Result<E, T>;
 
 /**
  * Executes a function, promise, or value and returns a Result type with a fallback default.
@@ -178,18 +245,25 @@ declare function goTryAll<T extends readonly unknown[]>(items: {
 }]>;
 /**
  * Like `goTryAll`, but returns raw Error objects instead of error messages.
+ * Non-tagged errors are wrapped in `UnknownError` by default (consistent with `goTryRaw`).
+ * Tagged errors pass through unchanged.
+ *
+ * Supports `errorClass` and `systemErrorClass` options (mutually exclusive):
+ * - `errorClass`: Wrap ALL errors in the specified class
+ * - `systemErrorClass`: Only wrap non-tagged errors (defaults to UnknownError)
  *
  * @template T The tuple type of all promise results
+ * @template E The type of the error
  * @param {readonly [...{ [K in keyof T]: Promise<T[K]> | (() => Promise<T[K]>) }]} items - Array of promises or factories
- * @param {GoTryAllOptions} options - Optional configuration
- * @returns {Promise<[{ [K in keyof T]: Error | undefined }, { [K in keyof T]: T[K] | undefined }]>}
+ * @param {GoTryAllRawOptions<E>} options - Optional configuration
+ * @returns {Promise<[{ [K in keyof T]: E | undefined }, { [K in keyof T]: T[K] | undefined }]>}
  *          A tuple where the first element is a tuple of Error objects (or undefined) and
  *          the second element is a tuple of results (or undefined), preserving input order
  */
-declare function goTryAllRaw<T extends readonly unknown[]>(items: {
+declare function goTryAllRaw<T extends readonly unknown[], E = InstanceType<typeof UnknownError>>(items: {
     [K in keyof T]: Promise<T[K]> | (() => Promise<T[K]>);
-}, options?: GoTryAllOptions): Promise<[{
-    [K in keyof T]: Error | undefined;
+}, options?: GoTryAllRawOptions<E>): Promise<[{
+    [K in keyof T]: E | undefined;
 }, {
     [K in keyof T]: T[K] | undefined;
 }]>;
@@ -301,6 +375,6 @@ declare function failure<E>(error: E): Failure<E>;
  */
 declare function assertNever(value: never): never;
 
-export { assert, assertNever, failure, goTry, goTryAll, goTryAllRaw, goTryOr, goTryRaw, isFailure, isSuccess, success, taggedError };
-export type { ErrorConstructor, Failure, GoTryAllOptions, MaybePromise, Result, ResultWithDefault, Success, TaggedError, TaggedUnion };
+export { UnknownError, assert, assertNever, failure, goTry, goTryAll, goTryAllRaw, goTryOr, goTryRaw, isFailure, isSuccess, success, taggedError };
+export type { ErrorConstructor, Failure, GoTryAllOptions, GoTryAllRawOptions, GoTryRawOptions, MaybePromise, Result, ResultWithDefault, Success, TaggedError, TaggedUnion };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sources":["../src/types.ts","../src/goTry.ts","../src/goTryRaw.ts","../src/goTryOr.ts","../src/goTryAll.ts","../src/tagged-error.ts","../src/assert.ts","../src/result-helpers.ts"],"mappings":"AAAA;;;AAIM,KAAM,OAAO;AACb,KAAM,OAAO;AACb,KAAM,MAAM,SAAS,OAAO,MAAM,OAAO;AAEzC,KAAM,iBAAiB;AAEvB,KAAM,YAAY,UAAU,OAAO;AAEzC;;;;AAIM,UAAW,WAAW;;;;;AAMtB,UAAW,eAAe;;;;;;;AAQhC;;;AAGM,KAAM,gBAAgB;;;AAE5B;;;;;;;;;;;;;AAaM,KAAM,WAAW,oBAAoB,gBAAgB;iCAC1B,gBAAgB;;;AC7CjD;;;;;;;;;;;;;;;;;;;;AAoBA,iBAAgB,KAAK,sBAAsB,MAAM;AACjD,iBAAgB,KAAK,cAAc,OAAO,MAAM,OAAO,CAAC,MAAM;AAC9D,iBAAgB,KAAK,aAAa,OAAO,MAAM,OAAO,CAAC,MAAM;AAC7D,iBAAgB,KAAK,kBAAkB,MAAM;AAC7C,iBAAgB,KAAK,eAAe,MAAM;;ACxB1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,iBAAgB,QAAQ,QAAQ,KAAK,oBAAoB,MAAM;AAC/D,iBAAgB,QAAQ,QAAQ,KAAK,+BAA+B,gBAAgB,MAAM,MAAM;AAChG,iBAAgB,QAAQ,QAAQ,KAAK,YACzB,OAAO,MAChB,OAAO,CAAC,MAAM;AACjB,iBAAgB,QAAQ,QAAQ,KAAK,YACzB,OAAO,iBACL,gBAAgB,MAC3B,OAAO,CAAC,MAAM;AACjB,iBAAgB,QAAQ,QAAQ,KAAK,WAC1B,OAAO,MACf,OAAO,CAAC,MAAM;AACjB,iBAAgB,QAAQ,QAAQ,KAAK,WAC1B,OAAO,iBACJ,gBAAgB,MAC3B,OAAO,CAAC,MAAM;AACjB,iBAAgB,QAAQ,QAAQ,KAAK,gBAAgB,MAAM;AAC3D,iBAAgB,QAAQ,QAAQ,KAAK,2BAA2B,gBAAgB,MAAM,MAAM;AAC5F,iBAAgB,QAAQ,QAAQ,KAAK,aAAa,MAAM;AACxD,iBAAgB,QAAQ,QAAQ,KAAK,wBAAwB,gBAAgB,MAAM,MAAM;;AC/CzF;;;;;;;;;;;;;;;;;;;;;AAqBA,iBAAgB,OAAO,mDAAmD,iBAAiB;AAC3F,iBAAgB,OAAO,cACX,OAAO,mCAEhB,OAAO,CAAC,iBAAiB;AAC5B,iBAAgB,OAAO,aACZ,OAAO,mCAEf,OAAO,CAAC,iBAAiB;AAC5B,iBAAgB,OAAO,+CAA+C,iBAAiB;AACvF,iBAAgB,OAAO,4CAA4C,iBAAiB;;ACgBpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,iBAAsB,QAAQ;oBACH,OAAO,gBAAgB,OAAO;aAC7C,eAAe,GACxB,OAAO;;;;;AAoBV;;;;;;;;;;AAUA,iBAAsB,WAAW;oBACN,OAAO,gBAAgB,OAAO;aAC7C,eAAe,GACxB,OAAO;oBAAoB,KAAK;;;;;ACrHnC;;;;;;;;;;;;;;;;;;;;;;;;AAwBA,iBAAgB,WAAW;;;;;;;;;;;;;AC1B3B;;;;;;;;;;;;;;;;;;;;;;AAsBA,iBAAgB,MAAM,4BAA4B,KAAK;AAEvD;;;;;;;;;;;;;;AAcA,iBAAgB,MAAM,WAAW,KAAK;;ACpCtC,iBAAgB,SAAS,eAAe,MAAM,mBAAmB,OAAO;AAIxE,iBAAgB,SAAS,eAAe,MAAM,mBAAmB,OAAO;AAIxE,iBAAgB,OAAO,eAAe,OAAO;AAI7C,iBAAgB,OAAO,eAAe,OAAO;AAI7C;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,iBAAgB,WAAW","names":[]}
+{"version":3,"file":"index.d.mts","sources":["../src/types.ts","../src/goTry.ts","../src/unknown-error.ts","../src/goTryRaw.ts","../src/goTryOr.ts","../src/goTryAll.ts","../src/tagged-error.ts","../src/assert.ts","../src/result-helpers.ts"],"mappings":"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","names":[]}

package/dist/index.mjs

@@ -48,16 +48,46 @@ function goTry(value) {
   }
 }
 
-function goTryRaw(value, ErrorClass) {
+function taggedError(tag) {
+  return class TaggedErrorClass extends Error {
+    constructor(message, options) {
+      super(message);
+      this._tag = tag;
+      this.name = tag;
+      this.cause = options?.cause;
+    }
+  };
+}
+
+const UnknownError = taggedError("UnknownError");
+
+function isTaggedError$1(err) {
+  return isError(err) && "_tag" in err && typeof err._tag === "string";
+}
+function goTryRaw(value, options) {
+  const { errorClass, systemErrorClass } = options || {};
+  const actualSystemErrorClass = systemErrorClass ?? UnknownError;
   const wrapError = (err) => {
-    if (ErrorClass) {
+    if (errorClass) {
+      if (err === void 0) {
+        return new errorClass("undefined");
+      }
+      if (isError(err)) {
+        return new errorClass(err.message, { cause: err });
+      }
+      return new errorClass(String(err));
+    }
+    if (actualSystemErrorClass) {
+      if (isTaggedError$1(err)) {
+        return err;
+      }
       if (err === void 0) {
-        return new ErrorClass("undefined");
+        return new actualSystemErrorClass("undefined");
       }
       if (isError(err)) {
-        return new ErrorClass(err.message, { cause: err });
+        return new actualSystemErrorClass(err.message, { cause: err });
       }
-      return new ErrorClass(String(err));
+      return new actualSystemErrorClass(String(err));
     }
     if (err === void 0) {
       return new Error("undefined");
@@ -87,6 +117,31 @@ function goTryOr(value, defaultValue) {
   }
 }
 
+function isTaggedError(err) {
+  return isError(err) && "_tag" in err && typeof err._tag === "string";
+}
+function wrapError(err, errorClass, systemErrorClass) {
+  if (errorClass) {
+    if (err === void 0) {
+      return new errorClass("undefined");
+    }
+    if (isError(err)) {
+      return new errorClass(err.message, { cause: err });
+    }
+    return new errorClass(String(err));
+  }
+  const actualSystemErrorClass = systemErrorClass ?? UnknownError;
+  if (isTaggedError(err)) {
+    return err;
+  }
+  if (err === void 0) {
+    return new actualSystemErrorClass("undefined");
+  }
+  if (isError(err)) {
+    return new actualSystemErrorClass(err.message, { cause: err });
+  }
+  return new actualSystemErrorClass(String(err));
+}
 async function runWithConcurrency(items, concurrency) {
   if (items.length === 0) {
     return [];
@@ -134,6 +189,7 @@ async function goTryAll(items, options) {
   return [errors, results];
 }
 async function goTryAllRaw(items, options) {
+  const { errorClass, systemErrorClass } = options || {};
   const settled = await runWithConcurrency(items, options?.concurrency ?? 0);
   const errors = [];
   const results = [];
@@ -144,24 +200,13 @@ async function goTryAllRaw(items, options) {
       results[i] = item.value;
     } else {
       const reason = item.reason;
-      errors[i] = isError(reason) ? reason : new Error(String(reason));
+      errors[i] = wrapError(reason, errorClass, systemErrorClass);
       results[i] = void 0;
     }
   }
   return [errors, results];
 }
 
-function taggedError(tag) {
-  return class TaggedErrorClass extends Error {
-    constructor(message, options) {
-      super(message);
-      this._tag = tag;
-      this.name = tag;
-      this.cause = options?.cause;
-    }
-  };
-}
-
 function assert(condition, errorOrClass, message) {
   if (!condition) {
     if (typeof errorOrClass === "string") {
@@ -174,4 +219,4 @@ function assert(condition, errorOrClass, message) {
   }
 }
 
-export { assert, assertNever, failure, goTry, goTryAll, goTryAllRaw, goTryOr, goTryRaw, isFailure, isSuccess, success, taggedError };
+export { UnknownError, assert, assertNever, failure, goTry, goTryAll, goTryAllRaw, goTryOr, goTryRaw, isFailure, isSuccess, success, taggedError };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "go-go-try",
-	"version": "7.3.0",
+	"version": "7.4.1",
 	"description": "Tries to execute a sync/async function, returns a result tuple",
 	"license": "MIT",
 	"repository": "thelinuxlich/go-go-try",
@@ -48,11 +48,11 @@
 	],
 	"devDependencies": {
 		"@ark/attest": "^0.56.0",
-		"@biomejs/biome": "^2.3.14",
+		"@biomejs/biome": "^2.4.2",
 		"@vitest/coverage-v8": "^4.0.18",
 		"husky": "^9.1.7",
 		"lint-staged": "^16.2.7",
-		"pkgroll": "^2.23.0",
+		"pkgroll": "^2.26.2",
 		"tsx": "^4.21.0",
 		"typescript": "^5.9.3",
 		"vitest": "^4.0.18"

package/src/goTryAll.ts

@@ -1,5 +1,43 @@
-import type { GoTryAllOptions } from './types.js'
+import type { GoTryAllOptions, GoTryAllRawOptions, ErrorConstructor } from './types.js'
 import { isError, getErrorMessage, type PromiseFactory } from './internals.js'
+import { UnknownError } from './unknown-error.js'
+
+/**
+ * Checks if a value is a tagged error (has a _tag property).
+ */
+function isTaggedError(err: unknown): err is { _tag: string } {
+  return isError(err) && '_tag' in err && typeof (err as { _tag?: unknown })._tag === 'string'
+}
+
+/**
+ * Wraps an error based on the provided options (errorClass/systemErrorClass).
+ * Consistent with goTryRaw behavior.
+ */
+function wrapError<E>(err: unknown, errorClass: ErrorConstructor<E> | undefined, systemErrorClass: ErrorConstructor<E> | undefined): E {
+  // If errorClass is specified, wrap all errors with it
+  if (errorClass) {
+    if (err === undefined) {
+      return new errorClass('undefined')
+    }
+    if (isError(err)) {
+      return new errorClass(err.message, { cause: err })
+    }
+    return new errorClass(String(err))
+  }
+
+  // If systemErrorClass is specified (or defaulted to UnknownError), only wrap non-tagged errors
+  const actualSystemErrorClass = systemErrorClass ?? UnknownError
+  if (isTaggedError(err)) {
+    return err as unknown as E
+  }
+  if (err === undefined) {
+    return new actualSystemErrorClass('undefined') as unknown as E
+  }
+  if (isError(err)) {
+    return new actualSystemErrorClass(err.message, { cause: err }) as unknown as E
+  }
+  return new actualSystemErrorClass(String(err)) as unknown as E
+}
 
 async function runWithConcurrency<T extends readonly unknown[]>(
   items: { [K in keyof T]: Promise<T[K]> | PromiseFactory<T[K]> },
@@ -106,33 +144,39 @@ export async function goTryAll<T extends readonly unknown[]>(
 
 /**
  * Like `goTryAll`, but returns raw Error objects instead of error messages.
+ * Non-tagged errors are wrapped in `UnknownError` by default (consistent with `goTryRaw`).
+ * Tagged errors pass through unchanged.
+ *
+ * Supports `errorClass` and `systemErrorClass` options (mutually exclusive):
+ * - `errorClass`: Wrap ALL errors in the specified class
+ * - `systemErrorClass`: Only wrap non-tagged errors (defaults to UnknownError)
  *
  * @template T The tuple type of all promise results
+ * @template E The type of the error
  * @param {readonly [...{ [K in keyof T]: Promise<T[K]> | (() => Promise<T[K]>) }]} items - Array of promises or factories
- * @param {GoTryAllOptions} options - Optional configuration
- * @returns {Promise<[{ [K in keyof T]: Error | undefined }, { [K in keyof T]: T[K] | undefined }]>}
+ * @param {GoTryAllRawOptions<E>} options - Optional configuration
+ * @returns {Promise<[{ [K in keyof T]: E | undefined }, { [K in keyof T]: T[K] | undefined }]>}
  *          A tuple where the first element is a tuple of Error objects (or undefined) and
  *          the second element is a tuple of results (or undefined), preserving input order
  */
-export async function goTryAllRaw<T extends readonly unknown[]>(
+export async function goTryAllRaw<T extends readonly unknown[], E = InstanceType<typeof UnknownError>>(
   items: { [K in keyof T]: Promise<T[K]> | (() => Promise<T[K]>) },
-  options?: GoTryAllOptions,
-): Promise<[{ [K in keyof T]: Error | undefined }, { [K in keyof T]: T[K] | undefined }]> {
+  options?: GoTryAllRawOptions<E>,
+): Promise<[{ [K in keyof T]: E | undefined }, { [K in keyof T]: T[K] | undefined }]> {
+  const { errorClass, systemErrorClass } = options || {}
   const settled = await runWithConcurrency(items, options?.concurrency ?? 0)
 
-  const errors = [] as { [K in keyof T]: Error | undefined }
+  const errors = [] as { [K in keyof T]: E | undefined }
   const results = [] as { [K in keyof T]: T[K] | undefined }
 
   for (let i = 0; i < settled.length; i++) {
     const item = settled[i]!
     if (item.status === 'fulfilled') {
-      ;(errors as (Error | undefined)[])[i] = undefined
+      ;(errors as (E | undefined)[])[i] = undefined
       ;(results as unknown[])[i] = (item as PromiseFulfilledResult<T[number]>).value
     } else {
       const reason = (item as PromiseRejectedResult).reason
-      ;(errors as (Error | undefined)[])[i] = isError(reason)
-        ? reason
-        : new Error(String(reason))
+      ;(errors as (E | undefined)[])[i] = wrapError(reason, errorClass, systemErrorClass)
       ;(results as unknown[])[i] = undefined
     }
   }

package/src/goTryRaw.ts

@@ -1,15 +1,23 @@
-import type { Result, ErrorConstructor } from './types.js'
+import type { Result, GoTryRawOptions } from './types.js'
 import { success, failure } from './result-helpers.js'
 import { isPromise, isError } from './internals.js'
+import { UnknownError } from './unknown-error.js'
+
+/**
+ * Checks if a value is a tagged error (has a _tag property).
+ */
+function isTaggedError(err: unknown): err is { _tag: string } {
+  return isError(err) && '_tag' in err && typeof (err as { _tag?: unknown })._tag === 'string'
+}
 
 /**
  * Executes a function, promise, or value and returns a Result type.
  * If an error occurs, it returns a Failure with the raw error object.
  *
  * @template T The type of the successful result
- * @template E The type of the error, defaults to Error
+ * @template E The type of the error
  * @param {T | Promise<T> | (() => T | Promise<T>)} value - The value, promise, or function to execute
- * @param {ErrorConstructor<E>} [ErrorClass] - Optional error constructor to wrap caught errors
+ * @param {GoTryRawOptions<E>} [options] - Optional options object
  * @returns {Result<E, T> | Promise<Result<E, T>>} A Result type or a Promise of a Result type
  *
  * @example
@@ -25,47 +33,76 @@ import { isPromise, isError } from './internals.js'
  * const [err, result] = await goTryRaw(fetch('https://api.example.com/data'));
  *
  * @example
- * // With tagged error for discriminated unions
+ * // With options object - wrap all errors
  * const DatabaseError = taggedError('DatabaseError');
- * const [err, result] = await goTryRaw(fetchData(), DatabaseError);
- * // err is InstanceType<typeof DatabaseError> | undefined
+ * const [err, result] = await goTryRaw(fetchData(), { errorClass: DatabaseError });
+ *
+ * @example
+ * // With options object - systemErrorClass only wraps non-tagged errors
+ * const [err, result] = await goTryRaw(fetchData(), { systemErrorClass: UnknownError });
+ * // Errors thrown as tagged errors pass through
+ * // Other errors are wrapped in UnknownError
  */
-export function goTryRaw<T, E = Error>(fn: () => never): Result<E, never>
-export function goTryRaw<T, E = Error>(fn: () => never, ErrorClass: ErrorConstructor<E>): Result<E, never>
-export function goTryRaw<T, E = Error>(
+export function goTryRaw<T>(fn: () => never): Result<Error, never>
+export function goTryRaw<T, E = InstanceType<typeof UnknownError>>(fn: () => never, options: GoTryRawOptions<E>): Result<E, never>
+export function goTryRaw<T>(
   fn: () => Promise<T>,
-): Promise<Result<E, T>>
-export function goTryRaw<T, E = Error>(
+): Promise<Result<Error, T>>
+export function goTryRaw<T, E = InstanceType<typeof UnknownError>>(
   fn: () => Promise<T>,
-  ErrorClass: ErrorConstructor<E>,
+  options: GoTryRawOptions<E>,
 ): Promise<Result<E, T>>
-export function goTryRaw<T, E = Error>(
+export function goTryRaw<T>(
   promise: Promise<T>,
-): Promise<Result<E, T>>
-export function goTryRaw<T, E = Error>(
+): Promise<Result<Error, T>>
+export function goTryRaw<T, E = InstanceType<typeof UnknownError>>(
   promise: Promise<T>,
-  ErrorClass: ErrorConstructor<E>,
+  options: GoTryRawOptions<E>,
 ): Promise<Result<E, T>>
-export function goTryRaw<T, E = Error>(fn: () => T): Result<E, T>
-export function goTryRaw<T, E = Error>(fn: () => T, ErrorClass: ErrorConstructor<E>): Result<E, T>
-export function goTryRaw<T, E = Error>(value: T): Result<E, T>
-export function goTryRaw<T, E = Error>(value: T, ErrorClass: ErrorConstructor<E>): Result<E, T>
+export function goTryRaw<T>(fn: () => T): Result<Error, T>
+export function goTryRaw<T, E = InstanceType<typeof UnknownError>>(fn: () => T, options: GoTryRawOptions<E>): Result<E, T>
+export function goTryRaw<T>(value: T): Result<Error, T>
+export function goTryRaw<T, E = InstanceType<typeof UnknownError>>(value: T, options: GoTryRawOptions<E>): Result<E, T>
 export function goTryRaw<T, E = Error>(
   value: T | Promise<T> | (() => T | Promise<T>),
-  ErrorClass?: ErrorConstructor<E>,
+  options?: GoTryRawOptions<E>,
 ): Result<E, T> | Promise<Result<E, T>> {
-  // Helper to wrap error in the provided class or return as-is
+  const { errorClass, systemErrorClass } = options || {}
+
+  // Determine the actual system error class to use
+  // Default to UnknownError when systemErrorClass is not specified
+  const actualSystemErrorClass = systemErrorClass ?? UnknownError
+
+  // Helper to wrap error based on the options
   const wrapError = (err: unknown): E => {
-    if (ErrorClass) {
+    // If errorClass is specified, wrap all errors with it
+    if (errorClass) {
       if (err === undefined) {
-        return new ErrorClass('undefined')
+        return new errorClass('undefined')
       }
       if (isError(err)) {
-        return new ErrorClass(err.message, { cause: err })
+        return new errorClass(err.message, { cause: err })
       }
-      return new ErrorClass(String(err))
+      return new errorClass(String(err))
     }
-    // Default behavior: return raw error
+
+    // If actualSystemErrorClass is specified, only wrap non-tagged errors
+    if (actualSystemErrorClass) {
+      if (isTaggedError(err)) {
+        return err as unknown as E
+      }
+
+      // Wrap non-tagged errors with systemErrorClass
+      if (err === undefined) {
+        return new actualSystemErrorClass('undefined') as unknown as E
+      }
+      if (isError(err)) {
+        return new actualSystemErrorClass(err.message, { cause: err }) as unknown as E
+      }
+      return new actualSystemErrorClass(String(err)) as unknown as E
+    }
+
+    // No options - original behavior: return raw error
     if (err === undefined) {
       return new Error('undefined') as unknown as E
     }