all error classes refactored

vitaly-t · Aug 27, 2019 · dc4cafa · dc4cafa
1 parent 6f08ff8
commit dc4cafa
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/lib/errors/sequence.js b/lib/errors/sequence.js
@@ -52,37 +52,39 @@ const errorReasons = {
  * @see {@link sequence}
  *
  */
-function SequenceError(e, code, cbName, duration) {
+class SequenceError extends Error {
 
-    // TODO: Replace with ES6 class (like in pg-promise)
+    constructor(e, code, cbName, duration) {
 
-    this.index = e.index;
-    this.duration = duration;
-    this.error = e.error;
-
-    if (this.error instanceof Error) {
-        this.message = this.error.message;
-    } else {
-        this.message = this.error;
-        if (typeof this.message !== 'string') {
-            this.message = npm.u.inspect(this.message);
+        let message;
+        if (e.error instanceof Error) {
+            message = e.error.message;
+        } else {
+            message = e.error;
+            if (typeof message !== 'string') {
+                message = npm.u.inspect(message);
+            }
         }
-    }
 
-    if ('source' in e) {
-        this.source = e.source;
-    } else {
-        this.dest = e.dest;
-    }
+        super(message);
+        this.name = this.constructor.name;
 
-    cbName = cbName ? ('\'' + cbName + '\'') : '<anonymous>';
-    this.reason = npm.u.format(errorReasons[code], cbName, e.index);
+        this.index = e.index;
+        this.duration = duration;
+        this.error = e.error;
 
-    Error.captureStackTrace(this, SequenceError);
-}
+        if ('source' in e) {
+            this.source = e.source;
+        } else {
+            this.dest = e.dest;
+        }
+
+        cbName = cbName ? ('\'' + cbName + '\'') : '<anonymous>';
+        this.reason = npm.u.format(errorReasons[code], cbName, e.index);
 
-npm.u.inherits(SequenceError, Error);
-SequenceError.prototype.name = 'SequenceError';
+        Error.captureStackTrace(this, this.constructor);
+    }
+}
 
 /**
  * @method errors.SequenceError.toString

diff --git a/test/ext/page.spec.js b/test/ext/page.spec.js
@@ -46,7 +46,9 @@ describe('Page - negative', () => {
 
             it('must reject correctly', () => {
                 expect(isError(r)).toBe(true);
+                expect(r instanceof Error).toBe(true);
                 expect(r instanceof PageError).toBe(true);
+                expect(r.name).toBe('PageError');
                 expect(r.index).toBe(0);
                 expect(r.error).toBe(err);
                 expect('source' in r).toBe(true);
@@ -245,8 +247,9 @@ describe('Page - negative', () => {
 
         it('must reject correctly', () => {
             expect(error.index).toBe(2);
-            expect(error.error.name).toBe('BatchError');
+            expect(error.error instanceof Error).toBeTruthy();
             expect(error.error instanceof BatchError).toBeTruthy();
+            expect(error.error.name).toBe('BatchError');
             expect(error.error.data).toEqual([
                 {
                     success: true,

diff --git a/test/ext/sequence.spec.js b/test/ext/sequence.spec.js
@@ -45,6 +45,8 @@ describe('Sequence - negative', () => {
 
             it('must reject correctly', () => {
                 expect(isError(r)).toBe(true);
+                expect(r.name).toBe('SequenceError');
+                expect(r instanceof Error).toBe(true);
                 expect(r instanceof SequenceError).toBe(true);
                 expect(r.index).toBe(0);
                 expect(r.error).toBe(err);