Release 1.2.0

CHANGELOG.md

@@ -1,11 +1,11 @@
-1.1.0 / 2016-12-01
+
+1.2.0 / 2016-12-07
 ==================
-  * Added option to show original locations and paths in error (#1, @scf4)
+  * Added option to override message when throwing error (@thebigredgeek)
 
 1.1.0 / 2016-12-01
 ==================
-
-  * Added option to show original locations and paths in error
+  * Added option to show original locations and paths in error (#1, @scf4)
 
 1.0.2 / 2016-11-11
 ==================

README.md

@@ -81,11 +81,11 @@ Witness glorious simplicity:
 
 ## API
 
-### ApolloError ({ [time_thrown: String, data: Object]})
+### ApolloError ({ [time_thrown: String, data: Object, message: String ]})
 
 Creates a new ApolloError object.  Note that `ApolloError` in this context refers
 to an error class created and returned by `createError` documented below.  Error can be
-initialized with a custom `time_thrown` ISODate (default is current ISODate) and `data` object (which will be merged with data specified through `createError`, if it exists).
+initialized with a custom `time_thrown` ISODate (default is current ISODate), `data` object (which will be merged with data specified through `createError`, if it exists), and `message` (which will override the message specified through `createError`).
 
 
 ### createError(name, {message: String, [data: Object, options: Object]}): ApolloError

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-errors",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Machine-readable custom errors for Apollostack's GraphQL server",
   "main": "dist/index.js",
   "scripts": {

src/index.js

@@ -16,6 +16,7 @@ class ApolloError extends ExtendableError {
   }) {
     const t = (arguments[2] && arguments[2].thrown_at) || time_thrown;
     const d = Object.assign({}, data, ((arguments[2] && arguments[2].data) || {}));
+    const m = (arguments[2] && arguments[2].message) || message;
     const opts = Object.assign({}, options, ((arguments[2] && arguments[2].options) || {}));
 
     super(serializeName([
@@ -27,7 +28,7 @@ class ApolloError extends ExtendableError {
     ]));
 
     this._name = name;
-    this._humanized_message = message || '';
+    this._humanized_message = m || '';
     this._time_thrown = t;
     this._data = d;
     this._locations = (opts.showLocations && arguments[2] && arguments[2].locations)

test/spec.js

@@ -18,6 +18,7 @@ describe('createError', () => {
     const iso = new Date().toISOString();
 
     const e = new FooError({
+      message: 'A foo 2.0 error has occurred',
       data: {
         foo: 'bar'
       },
@@ -29,7 +30,7 @@ describe('createError', () => {
 
     const { message, name, time_thrown, data } = e.serialize();
 
-    expect(message).to.equal('A foo error has occurred');
+    expect(message).to.equal('A foo 2.0 error has occurred');
     expect(name).to.equal('FooError');
     expect(time_thrown).to.equal(e._time_thrown);
     expect(data).to.eql({