From f5191cdd42ae706ef1704940fde976aa7d9b3759 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Fri, 10 Apr 2015 10:48:47 +0200
Subject: [PATCH] Better error classes.

---
 packages/xo-collection/package.json |  2 +-
 packages/xo-collection/src/index.js | 50 +++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/packages/xo-collection/package.json b/packages/xo-collection/package.json
index a677e4c4c..156ecb5af 100644
--- a/packages/xo-collection/package.json
+++ b/packages/xo-collection/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "babel-runtime": "^5",
     "lodash.foreach": "^3.0.2",
-    "make-error": "^0.3.0"
+    "make-error": "^1.0.0"
   },
   "devDependencies": {
     "babel": "^5",
diff --git a/packages/xo-collection/src/index.js b/packages/xo-collection/src/index.js
index b048f3b9f..dc18a07a5 100644
--- a/packages/xo-collection/src/index.js
+++ b/packages/xo-collection/src/index.js
@@ -1,12 +1,8 @@
 import forEach from 'lodash.foreach'
-import makeError from 'make-error'
+import makeError, {BaseError} from 'make-error'
 import {EventEmitter} from 'events'
 
-export const BufferAlreadyFlushed = makeError('BufferAlreadyFlushed')
-export const DuplicateItem = makeError('DuplicateItem')
-export const IllegalAdd = makeError('IllegalAdd')
-export const IllegalTouch = makeError('IllegalTouch')
-export const NoSuchItem = makeError('NoSuchItem')
+// ===================================================================
 
 function isNotEmpty (map) {
   /* eslint no-unused-vars: 0*/
@@ -17,6 +13,40 @@ function isNotEmpty (map) {
   return false
 }
 
+// ===================================================================
+
+export class BufferAlreadyFlushed extends BaseError {
+  constructor () {
+    super('buffer flush already requested')
+  }
+}
+
+export class DuplicateItem extends BaseError {
+  constructor (key) {
+    super('there is already a item with the key ' + key)
+  }
+}
+
+export class IllegalTouch extends BaseError {
+  constructor (value) {
+    super('only an object value can be touched (found a ' + typeof value + ')')
+  }
+}
+
+export class InvalidKey extends BaseError {
+  constructor (key) {
+    super('invalid key of type ' + typeof key)
+  }
+}
+
+export class NoSuchItem extends BaseError {
+  constructor (key) {
+    super('there is no item with the key ' + key)
+  }
+}
+
+// -------------------------------------------------------------------
+
 export default class Collection extends EventEmitter {
   constructor () {
     super()
@@ -33,7 +63,7 @@ export default class Collection extends EventEmitter {
     let called = false
     return () => {
       if (called) {
-        throw new BufferAlreadyFlushed('Buffer flush already requested')
+        throw new BufferAlreadyFlushed()
       }
       called = true
 
@@ -113,13 +143,13 @@ export default class Collection extends EventEmitter {
 
   _assertHas (key) {
     if (!this.has(key)) {
-      throw new NoSuchItem('No ' + key + ' item')
+      throw new NoSuchItem(key)
     }
   }
 
   _assertHasNot (key) {
     if (this.has(key)) {
-      throw new DuplicateItem('Attempt to duplicate ' + key + ' item')
+      throw new DuplicateItem(key)
     }
   }
 
@@ -169,7 +199,7 @@ export default class Collection extends EventEmitter {
     this._assertHas(key)
     const value = this.get(key)
     if (typeof value !== 'object' || value === null) {
-      throw new IllegalTouch('Touching a scalar. Not an object')
+      throw new IllegalTouch(value)
     }
 
     this._touch('update', key)