Merge pull request #47 from pontusmelke/1.0-unified-errors

Unified errors and made Neo4jError part of public API

Author: oskarhane

src/v1/internal/error.js renamed to src/v1/error.js

@@ -26,7 +26,6 @@ function newError(message, code="N/A") {
   return new Neo4jError(message, code);
 }
 
-// TODO: This should be moved into public API
 class Neo4jError extends Error {
   constructor( message, code="N/A" ) {
     super( message );

src/v1/index.js

@@ -20,11 +20,12 @@
 import {int, isInt} from './integer';
 import {driver} from './driver';
 import {Node, Relationship, UnboundRelationship, PathSegment, Path} from './graph-types'
-
+import {Neo4jError} from './error';
 export default {
   driver,
   int,
   isInt,
+  Neo4jError,
   auth: {
     basic: (username, password) => {
       return {scheme: "basic", principal: username, credentials: password};

src/v1/integer.js

@@ -21,6 +21,8 @@
 // https://github.com/dcodeIO/Long.js
 // License Apache 2
 
+import {newError} from "./error";
+
 /**
  * Constructs a 64 bit two's-complement integer, given its low and high 32 bit values as *signed* integers.
  *  See the from* functions below for more convenient ways of constructing Integers.
@@ -407,7 +409,7 @@ class Integer {
     if (!Integer.isInteger(divisor))
         divisor = Integer.fromValue(divisor);
     if (divisor.isZero())
-        throw(new Error('division by zero'));
+        throw newError('division by zero');
     if (this.isZero())
         return Integer.ZERO;
     var approx, rem, res;
@@ -666,16 +668,16 @@ Integer.fromBits = function(lowBits, highBits) {
  */
 Integer.fromString = function(str, radix) {
     if (str.length === 0)
-        throw Error('number format error: empty string');
+        throw newError('number format error: empty string');
     if (str === "NaN" || str === "Infinity" || str === "+Infinity" || str === "-Infinity")
         return Integer.ZERO;
     radix = radix || 10;
     if (radix < 2 || 36 < radix)
-        throw Error('radix out of range: ' + radix);
+        throw newError('radix out of range: ' + radix);
 
     var p;
     if ((p = str.indexOf('-')) > 0)
-        throw Error('number format error: interior "-" character: ' + str);
+        throw newError('number format error: interior "-" character: ' + str);
     else if (p === 0)
         return Integer.fromString(str.substring(1), radix).negate();
 

src/v1/internal/buf.js

@@ -22,6 +22,7 @@
   *(via Buffer API).
   */
 
+import {newError} from './../error';
 let _node = require("buffer");
 /**
   * Common base with default implementation for most buffer methods.
@@ -465,7 +466,7 @@ class CombinedBuffer extends BaseBuffer {
     let length = 0;
     for (let i = 0; i < buffers.length; i++) {
       length += buffers[i].length;
-    };
+    }
     super( length );
     this._buffers = buffers;
   }
@@ -480,7 +481,7 @@ class CombinedBuffer extends BaseBuffer {
       } else {
         return buffer.getUInt8(position);
       }
-    };
+    }
   }
 
   getInt8 ( position ) {
@@ -547,10 +548,10 @@ class NodeBuffer extends BaseBuffer {
         this._buffer,
         position,
         val.position,
-        val.position + bytesToCopy )
+        val.position + bytesToCopy );
       val.position += bytesToCopy;
     } else {
-      throw new Error("Copying not yet implemented.");
+      throw newError("Copying not yet implemented.");
     }
   };
 

src/v1/internal/ch-node.js

@@ -23,7 +23,7 @@ import fs from 'fs';
 import path from 'path';
 import {EOL} from 'os';
 import {NodeBuffer} from './buf';
-import {newError} from './error';
+import {newError} from './../error';
 
 let _CONNECTION_IDGEN = 0;
 
@@ -224,7 +224,7 @@ class NodeChannel {
       // console.log( "[Conn#"+this.id+"] SEND: ", buffer.toString() );
       this._conn.write( buffer._buffer );
     } else {
-      throw new Error( "Don't know how to write: " + buffer );
+      throw newError( "Don't know how to write: " + buffer );
     }
   }
 

src/v1/internal/ch-websocket.js

@@ -19,7 +19,7 @@
 
 import {debug} from "./log";
 import {HeapBuffer} from "./buf";
-import {newError} from './error';
+import {newError} from './../error';
 
 /**
  * Create a new WebSocketChannel to be used in web browsers.
@@ -104,7 +104,7 @@ class WebSocketChannel {
     } else if( buffer instanceof HeapBuffer ) {
       this._ws.send( buffer._buffer );
     } else {
-      throw new Error( "Don't know how to send buffer: " + buffer );
+      throw newError( "Don't know how to send buffer: " + buffer );
     }
   }
 

src/v1/internal/connector.js

@@ -25,7 +25,7 @@ import packstream from "./packstream";
 import {alloc, CombinedBuffer} from "./buf";
 import GraphType from '../graph-types';
 import {int, isInt} from '../integer';
-import {newError} from './error';
+import {newError} from './../error';
 
 let Channel;
 if( WebSocketChannel.available ) {
@@ -35,7 +35,7 @@ else if( NodeChannel.available ) {
     Channel = NodeChannel.channel;
 }
 else {
-    throw new Error("Fatal: No compatible transport available. Need to run on a platform with the WebSocket API.");
+    throw newError("Fatal: No compatible transport available. Need to run on a platform with the WebSocket API.");
 }
 
 

src/v1/internal/packstream.js

@@ -21,6 +21,7 @@ import {debug} from "./log";
 import {alloc} from "./buf";
 import utf8 from "./utf8";
 import {Integer, int} from "../integer";
+import {newError} from './../error';
 
 let MAX_CHUNK_SIZE = 16383,
 TINY_STRING = 0x80,
@@ -108,7 +109,7 @@ class Packer {
         this.pack(x[key]);
       }
     } else {
-      throw new Error("Cannot pack this value: " + x);
+      throw newError("Cannot pack this value: " + x);
     }
   }
 
@@ -174,7 +175,7 @@ class Packer {
       this._ch.writeUInt8(size%256);
       this._ch.writeBytes(bytes);
     } else {
-      throw new ProtocolError("UTF-8 strings of size " + size + " are not supported");
+      throw newError("UTF-8 strings of size " + size + " are not supported");
     }
   }
 
@@ -195,7 +196,7 @@ class Packer {
       this._ch.writeUInt8((size/256>>0)%256);
       this._ch.writeUInt8(size%256);
     } else {
-      throw new ProtocolError("Lists of size " + size + " are not supported");
+      throw newError("Lists of size " + size + " are not supported");
     }
   }
 
@@ -216,7 +217,7 @@ class Packer {
       this._ch.writeUInt8((size/256>>0)%256);
       this._ch.writeUInt8(size%256);
     } else {
-      throw new ProtocolError("Maps of size " + size + " are not supported");
+      throw newError("Maps of size " + size + " are not supported");
     }
   }
 
@@ -233,7 +234,7 @@ class Packer {
       this._ch.writeUInt8(size/256>>0);
       this._ch.writeUInt8(size%256);
     } else {
-      throw new ProtocolError("Structures of size " + size + " are not supported");
+      throw newError("Structures of size " + size + " are not supported");
     }
   }
 }
@@ -340,13 +341,13 @@ class Unpacker {
     } else if (markerHigh == 0xB0) {
       return this.unpackStruct(markerLow, buffer);
     } else {
-      throw new ProtocolError("Unknown packed value with marker " + marker.toString(16));
+      throw newError("Unknown packed value with marker " + marker.toString(16));
     }
   }
 }
 
 export default {
   Packer,
   Unpacker,
-  Structure,
+  Structure
 };

src/v1/internal/utf8.js

@@ -22,6 +22,7 @@
 
 import buf from "./buf";
 import {StringDecoder} from 'string_decoder';
+import {newError} from './../error';
 let platformObj = {};
 
 
@@ -52,7 +53,7 @@ try {
         return out;
       } 
       else {
-        throw new Error( "Don't know how to decode strings from `" + buffer + "`.");
+        throw newError( "Don't know how to decode strings from `" + buffer + "`.");
       }
     }
   }

src/v1/record.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import {newError} from "./internal/error";
+import {newError} from "./error";
 
 function generateFieldLookup( keys ) {
   let lookup = {};