@trenskow/api-error 2.4.7 → 2.4.9

package/.eslintrc.js

@@ -11,7 +11,10 @@ module.exports = {
 	'rules': {
 		'indent': [
 			'error',
-			'tab'
+			'tab',
+			{
+				'SwitchCase': 1
+			}
 		],
 		'linebreak-style': [
 			'error',

package/index.js

@@ -6,15 +6,37 @@ const
 
 class ApiError extends Error {
 
+	static _type(name) {
+		switch (name) {
+			case 'not-authorized': return NotAuthorized;
+			case 'payment-required': return PaymentRequired;
+			case 'forbidden': return Forbidden;
+			case 'not-found': return NotFound;
+			case 'already-exists': return Conflict;
+			case 'method-not-allowed': return MethodNotAllowed;
+			case 'bad-request': return BadRequest;
+			case 'too-many-requests': return TooManyRequests;
+			case 'payload-too-large': return PayloadTooLarge;
+			case 'internal-error': return InternalError;
+			case 'not-implemented': return NotImplemented;
+			case 'service-unavailable': return ServiceUnavailable;
+			case 'aggregated': return Aggregated;
+			default: return ApiError;
+		}
+	}
+
 	static parse(data, statusCode, origin) {
-		let error = new ApiError(merge(true, data, {
+
+		let options = merge(data, {
 			message: data.message,
 			statusCode: statusCode,
-			origin: origin,
-			keyPath: data.keyPath,
-			errors: data.errors?.map((error) => ApiError.parse(error, statusCode, origin))
-		}));
-		return error;
+			origin: origin
+		});
+
+		options.errors = options.errors?.map((error) => ApiError.parse(error, statusCode, origin));
+
+		return new (this._type(data.name || 'bad-request'))(options);
+
 	}
 
 	static _correctArguments(message, options) {
@@ -266,19 +288,27 @@ class Aggregated extends ApiError {
 			statusCode: 400
 		}));
 
-		this._errors = options.errors || [];
-
-		this._errors = this._check(this._errors);
+		this._errors = options.underlying?.errors || options.errors || [];
 
 	}
 
 	_check(errors) {
-		if (Array.isArray(errors) && errors.every((error) => error instanceof ApiError)) return errors;
+
+		if (Array.isArray(errors) && errors.every((error) => {
+			let prototype = Object.getPrototypeOf(error);
+			while (prototype !== null) {
+				if (prototype.constructor.name === 'ApiError') return true;
+				prototype = Object.getPrototypeOf(prototype);
+			}
+			return false;
+		})) return errors;
+
 		throw new TypeError('Error must an array of type `ApiError`.');
+
 	}
 
 	add(error) {
-		this._errors = this._errors.concat(this._check(error));
+		this._errors = this._errors.concat(this._check(Array.isArray(error) ? error : [error]));
 	}
 
 	get errors() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/api-error",
-  "version": "2.4.7",
+  "version": "2.4.9",
   "description": "A small collection of error objects that can be used for REST APIs.",
   "main": "index.js",
   "scripts": {