Fix BaseError.normalize() bug

Author: ehmicky

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 7.1.3
+
+## Bug fixes
+
+- Fix
+  [`BaseError.normalize(error, NewErrorClass)](README.md#errorclassnormalizeerror-newerrorclass).
+  `error` is converted to `NewErrorClass` if it was an instance of a
+  `BaseError`'s subclass. However, `error` was not converted when it was an
+  instance of `BaseError` itself, which was incorrect.
+
 # 7.1.2
 
 ## Bug fixes

README.md

@@ -638,9 +638,10 @@ _Return value_: `Error`
 
 Normalizes [invalid errors](#invalid-errors).
 
-If the `error`'s class is a subclass of `ErrorClass`, it is left as is.
-Otherwise, it is [converted to `NewErrorClass`](#normalizing-unknown-errors),
-which defaults to `ErrorClass` itself.
+If `error` is an instance of `ErrorClass` (or one of its subclasses), it is left
+as is. Otherwise, it is
+[converted to `NewErrorClass`](#normalizing-unknown-errors), which defaults to
+`ErrorClass` itself.
 
 # Modules
 

src/subclass/create.d.ts

@@ -111,9 +111,9 @@ interface ErrorSubclassCore<
   /**
    * Normalizes invalid errors.
    *
-   * If the `error`'s class is a subclass of `ErrorClass`, it is left as is.
-   * Otherwise, it is converted to `NewErrorClass`, which defaults to
-   * `ErrorClass` itself.
+   * If `error` is an instance of `ErrorClass` (or one of its subclasses), it is
+   * left as is. Otherwise, it is converted to `NewErrorClass`, which defaults
+   * to `ErrorClass` itself.
    *
    * @example
    * ```js

src/subclass/normalize.js

@@ -73,5 +73,4 @@ const normalizeAggregateErrors = ({
 }
 
 const shouldKeepClass = (error, ErrorClass, UnknownError) =>
-  error?.constructor === UnknownError ||
-  (error instanceof ErrorClass && error.constructor !== ErrorClass)
+  error?.constructor === UnknownError || error instanceof ErrorClass

src/subclass/normalize.test.js

@@ -70,10 +70,10 @@ each(ErrorClasses, ({ title }, ErrorClass) => {
     t.true(ErrorClass.normalize(error) instanceof ErrorClass)
   })
 
-  test(`ErrorClass.normalize(error, TestError) changes error class if same class as ErrorClass | ${title}`, (t) => {
+  test(`ErrorClass.normalize(error, TestError) keeps error class if same class as ErrorClass | ${title}`, (t) => {
     const TestError = ErrorClass.subclass('TestError')
     const error = new ErrorClass('test')
-    t.true(ErrorClass.normalize(error, TestError) instanceof TestError)
+    t.false(ErrorClass.normalize(error, TestError) instanceof TestError)
   })
 
   test(`ErrorClass.normalize(error, TestError) keeps error class if same class as TestError | ${title}`, (t) => {