@dxos/errors 0.8.4-main.e098934 → 0.8.4-main.e8ec1fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/errors",
-  "version": "0.8.4-main.e098934",
+  "version": "0.8.4-main.e8ec1fe",
   "description": "Error definitions",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",

package/src/base.ts

@@ -28,15 +28,25 @@ export class BaseError<Code extends string = string> extends Error {
    * @param message - Default error message.
    */
   static extend<Code extends string = string>(code: Code, message?: string) {
-    return class extends BaseError<Code> {
+    return class ExtendedError extends BaseError<Code> {
       static code = code;
 
       static is(error: unknown): error is BaseError {
         return typeof error === 'object' && error !== null && 'code' in error && error.code === code;
       }
 
-      static wrap(options?: Omit<BaseErrorOptions, 'cause'>) {
-        return (error: unknown) => new this({ message, ...options, cause: error });
+      static wrap(
+        options?: Omit<BaseErrorOptions, 'cause'> & { ifTypeDiffers?: boolean },
+      ): (error: unknown) => ExtendedError {
+        const wrapFn = (error: unknown) => {
+          if (options?.ifTypeDiffers === true && this.is(error)) {
+            return error as ExtendedError;
+          }
+          const newError: ExtendedError = new this({ message, ...options, cause: error });
+          Error.captureStackTrace(newError, wrapFn); // Position stack-trace to start from the caller of `wrap`.
+          return newError;
+        };
+        return wrapFn;
       }
 
       constructor(options?: BaseErrorOptions) {
@@ -45,19 +55,20 @@ export class BaseError<Code extends string = string> extends Error {
     };
   }
 
-  #code: Code;
-  #context: Record<string, unknown>;
+  // NOTE: Errors go through odd transformations and the private fields seem to break.
+  code: Code;
+  context: Record<string, unknown>;
 
   constructor(code: Code, options?: BaseErrorOptions) {
     super(options?.message, { cause: options?.cause });
 
-    this.#code = code;
-    this.#context = options?.context ?? {};
+    this.code = code;
+    this.context = options?.context ?? {};
     Object.setPrototypeOf(this, new.target.prototype);
   }
 
   override get name() {
-    return this.#code;
+    return this.code;
   }
 
   /** Fallback message. */
@@ -65,16 +76,8 @@ export class BaseError<Code extends string = string> extends Error {
     return this.constructor.name;
   }
 
-  get code(): Code {
-    return this.#code;
-  }
-
   // For effect error matching.
   get _tag(): Code {
-    return this.#code;
-  }
-
-  get context() {
-    return this.#context;
+    return this.code;
   }
 }