fix PR comments

Author: nikosdouvlis

packages/shared/src/errors/clerkApiError.ts

@@ -1,5 +1,6 @@
 import type { ClerkAPIError as ClerkAPIErrorInterface, ClerkAPIErrorJSON } from '@clerk/types';
 
+import { createErrorTypeGuard } from './createErrorTypeGuard';
 import { parseError } from './parseError';
 
 export type ClerkApiErrorMeta = Record<string, unknown>;
@@ -26,6 +27,4 @@ export class ClerkAPIError<Meta extends ClerkApiErrorMeta = any> implements Cler
 /**
  * Type guard to check if a value is a ClerkApiError instance.
  */
-export function isClerkApiError(error: Error): error is ClerkAPIError {
-  return error instanceof ClerkAPIError;
-}
+export const isClerkApiError = createErrorTypeGuard(ClerkAPIError);

packages/shared/src/errors/clerkError.ts

@@ -1,3 +1,5 @@
+import { createErrorTypeGuard } from './createErrorTypeGuard';
+
 export interface ClerkErrorParams {
   /**
    * A message that describes the error. This is typically intented to be showed to the developers.
@@ -53,6 +55,8 @@ export class ClerkError extends Error {
 
     this.code = opts.code;
     this.docsUrl = opts.docsUrl;
+    this.longMessage = opts.longMessage;
+    this.cause = opts.cause;
   }
 
   public toString() {
@@ -64,5 +68,7 @@ export class ClerkError extends Error {
  * Type guard to check if a value is a ClerkError instance.
  */
 export function isClerkError(val: unknown): val is ClerkError {
-  return !!val && typeof val === 'object' && 'clerkError' in val && val.clerkError === true;
+  const typeguard = createErrorTypeGuard(ClerkError);
+  // Ths is the base error so we're being more defensive about the type guard
+  return typeguard(val) || (!!val && typeof val === 'object' && 'clerkError' in val && val.clerkError === true);
 }

packages/shared/src/errors/createErrorTypeGuard.ts

@@ -1,5 +1,7 @@
 /* eslint-disable jsdoc/require-jsdoc */
 
+type Value = unknown;
+
 /**
  * Creates a type guard function for any error class.
  * The returned function can be called as a standalone function or as a method on an error object.
@@ -16,13 +18,13 @@
  * if (error.isMyError()) { ... }
  * ```
  */
-export function createErrorTypeGuard<T extends new (...args: any[]) => Error>(
+export function createErrorTypeGuard<T extends new (...args: any[]) => Value>(
   ErrorClass: T,
 ): {
-  (error: Error): error is InstanceType<T>;
-  (this: Error): this is InstanceType<T>;
+  (error: Value): error is InstanceType<T>;
+  (this: Value): this is InstanceType<T>;
 } {
-  function typeGuard(this: Error | void, error?: Error): error is InstanceType<T> {
+  function typeGuard(this: Value, error?: Value): error is InstanceType<T> {
     const target = error ?? this;
     if (!target) {
       throw new TypeError(`${ErrorClass.name} type guard requires an error object`);
@@ -31,7 +33,7 @@ export function createErrorTypeGuard<T extends new (...args: any[]) => Error>(
   }
 
   return typeGuard as {
-    (error: Error): error is InstanceType<T>;
-    (this: Error): this is InstanceType<T>;
+    (error: Value): error is InstanceType<T>;
+    (this: Value): this is InstanceType<T>;
   };
 }