JS driver v1.1.1: Checking in transpiled files for bower

Author: Neo Technology Build Agent

lib/browser/neo4j-web.js

@@ -1,60 +1,68 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WRITE = exports.READ = exports.Driver = undefined;
 
-var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
+var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
 
-var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+var _possibleConstructorReturn2 = require("babel-runtime/helpers/possibleConstructorReturn");
 
 var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
 
-var _get2 = require('babel-runtime/helpers/get');
+var _get2 = require("babel-runtime/helpers/get");
 
 var _get3 = _interopRequireDefault(_get2);
 
-var _inherits2 = require('babel-runtime/helpers/inherits');
+var _inherits2 = require("babel-runtime/helpers/inherits");
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _promise = require('babel-runtime/core-js/promise');
+var _promise = require("babel-runtime/core-js/promise");
 
 var _promise2 = _interopRequireDefault(_promise);
 
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
 
-var _createClass2 = require('babel-runtime/helpers/createClass');
+var _createClass2 = require("babel-runtime/helpers/createClass");
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _session = require('./session');
+var _session = require("./session");
 
 var _session2 = _interopRequireDefault(_session);
 
-var _pool = require('./internal/pool');
+var _pool = require("./internal/pool");
 
 var _pool2 = _interopRequireDefault(_pool);
 
-var _integer = require('./integer');
+var _connector = require("./internal/connector");
 
-var _integer2 = _interopRequireDefault(_integer);
-
-var _connector = require('./internal/connector');
-
-var _streamObserver = require('./internal/stream-observer');
+var _streamObserver = require("./internal/stream-observer");
 
 var _streamObserver2 = _interopRequireDefault(_streamObserver);
 
-var _error = require('./error');
+var _error = require("./error");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var READ = 'READ',
+    WRITE = 'WRITE';
+/**
+ * A driver maintains one or more {@link Session sessions} with a remote
+ * Neo4j instance. Through the {@link Session sessions} you can send statements
+ * and retrieve results from the database.
+ *
+ * Drivers are reasonably expensive to create - you should strive to keep one
+ * driver instance around per Neo4j Instance you connect to.
+ *
+ * @access public
+ */
 /**
  * Copyright (c) 2002-2017 "Neo Technology,","
  * Network Engine for Objects in Lund AB [http://neotechnology.com]
@@ -74,19 +82,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * limitations under the License.
  */
 
-var READ = 'READ',
-    WRITE = 'WRITE';
-/**
- * A driver maintains one or more {@link Session sessions} with a remote
- * Neo4j instance. Through the {@link Session sessions} you can send statements
- * and retrieve results from the database.
- *
- * Drivers are reasonably expensive to create - you should strive to keep one
- * driver instance around per Neo4j Instance you connect to.
- *
- * @access public
- */
-
 var Driver = function () {
   /**
    * You should not be calling this directly, instead use {@link driver}.
@@ -119,7 +114,7 @@ var Driver = function () {
 
 
   (0, _createClass3.default)(Driver, [{
-    key: '_createConnection',
+    key: "_createConnection",
     value: function _createConnection(url, release) {
       var sessionId = this._sessionIdGenerator++;
       var conn = (0, _connector.connect)(url, this._config);
@@ -141,7 +136,7 @@ var Driver = function () {
      **/
 
   }, {
-    key: '_destroyConnection',
+    key: "_destroyConnection",
 
 
     /**
@@ -170,56 +165,62 @@ var Driver = function () {
      */
 
   }, {
-    key: 'session',
+    key: "session",
     value: function session(mode) {
       var _this = this;
 
-      var connectionPromise = this._acquireConnection(mode);
+      var sessionMode = Driver._validateSessionMode(mode);
+      var connectionPromise = this._acquireConnection(sessionMode);
       connectionPromise.catch(function (err) {
         if (_this.onError && err.code === _error.SERVICE_UNAVAILABLE) {
           _this.onError(err);
         } else {
           //we don't need to tell the driver about this error
         }
       });
-      return this._createSession(connectionPromise, function (cb) {
-        // This gets called on Session#close(), and is where we return
-        // the pooled 'connection' instance.
-
-        // We don't pool Session instances, to avoid users using the Session
-        // after they've called close. The `Session` object is just a thin
-        // wrapper around Connection anyway, so it makes little difference.
+      return this._createSession(connectionPromise, this._releaseConnection(connectionPromise));
+    }
 
-        // Queue up a 'reset', to ensure the next user gets a clean
-        // session to work with.
+    /**
+     * The returned function gets called on Session#close(), and is where we return the pooled 'connection' instance.
+     * We don't pool Session instances, to avoid users using the Session after they've called close.
+     * The `Session` object is just a thin wrapper around Connection anyway, so it makes little difference.
+     * @param {Promise} connectionPromise - promise resolved with the connection.
+     * @return {function(callback: function)} - function that releases the connection and then executes an optional callback.
+     * @protected
+     */
 
+  }, {
+    key: "_releaseConnection",
+    value: function _releaseConnection(connectionPromise) {
+      return function (userDefinedCallback) {
         connectionPromise.then(function (conn) {
+          // Queue up a 'reset', to ensure the next user gets a clean session to work with.
           conn.reset();
           conn.sync();
 
           // Return connection to the pool
           conn._release();
-        }).catch(function () {/*ignore errors here*/});
+        }).catch(function (ignoredError) {});
 
-        // Call user callback
-        if (cb) {
-          cb();
+        if (userDefinedCallback) {
+          userDefinedCallback();
         }
-      });
+      };
     }
+  }, {
+    key: "_acquireConnection",
 
-    //Extension point
 
-  }, {
-    key: '_acquireConnection',
+    //Extension point
     value: function _acquireConnection(mode) {
       return _promise2.default.resolve(this._pool.acquire(this._url));
     }
 
     //Extension point
 
   }, {
-    key: '_createSession',
+    key: "_createSession",
     value: function _createSession(connectionPromise, cb) {
       return new _session2.default(connectionPromise, cb);
     }
@@ -231,7 +232,7 @@ var Driver = function () {
      */
 
   }, {
-    key: 'close',
+    key: "close",
     value: function close() {
       for (var sessionId in this._openSessions) {
         if (this._openSessions.hasOwnProperty(sessionId)) {
@@ -241,10 +242,19 @@ var Driver = function () {
       }
     }
   }], [{
-    key: '_validateConnection',
+    key: "_validateConnection",
     value: function _validateConnection(conn) {
       return conn.isOpen();
     }
+  }, {
+    key: "_validateSessionMode",
+    value: function _validateSessionMode(rawMode) {
+      var mode = rawMode || WRITE;
+      if (mode !== READ && mode !== WRITE) {
+        throw (0, _error.newError)('Illegal session mode ' + mode);
+      }
+      return mode;
+    }
   }]);
   return Driver;
 }();
@@ -267,18 +277,18 @@ var _ConnectionStreamObserver = function (_StreamObserver) {
   }
 
   (0, _createClass3.default)(_ConnectionStreamObserver, [{
-    key: 'onError',
+    key: "onError",
     value: function onError(error) {
       if (!this._hasFailed) {
-        (0, _get3.default)(_ConnectionStreamObserver.prototype.__proto__ || (0, _getPrototypeOf2.default)(_ConnectionStreamObserver.prototype), 'onError', this).call(this, error);
+        (0, _get3.default)(_ConnectionStreamObserver.prototype.__proto__ || (0, _getPrototypeOf2.default)(_ConnectionStreamObserver.prototype), "onError", this).call(this, error);
         if (this._driver.onError) {
           this._driver.onError(error);
         }
         this._hasFailed = true;
       }
     }
   }, {
-    key: 'onCompleted',
+    key: "onCompleted",
     value: function onCompleted(message) {
       if (this._driver.onCompleted) {
         this._driver.onCompleted(message);

lib/browser/neo4j-web.min.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SESSION_EXPIRED = exports.SERVICE_UNAVAILABLE = exports.Neo4jError = exports.newError = undefined;
+exports.PROTOCOL_ERROR = exports.SESSION_EXPIRED = exports.SERVICE_UNAVAILABLE = exports.Neo4jError = exports.newError = undefined;
 
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
@@ -47,6 +47,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var SERVICE_UNAVAILABLE = 'ServiceUnavailable';
 var SESSION_EXPIRED = 'SessionExpired';
+var PROTOCOL_ERROR = 'ProtocolError';
+
 function newError(message) {
   var code = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "N/A";
 
@@ -75,4 +77,5 @@ var Neo4jError = function (_Error) {
 exports.newError = newError;
 exports.Neo4jError = Neo4jError;
 exports.SERVICE_UNAVAILABLE = SERVICE_UNAVAILABLE;
-exports.SESSION_EXPIRED = SESSION_EXPIRED;
+exports.SESSION_EXPIRED = SESSION_EXPIRED;
+exports.PROTOCOL_ERROR = PROTOCOL_ERROR;

lib/browser/neo4j-web.test.js

@@ -35,26 +35,9 @@ var _version2 = _interopRequireDefault(_version);
 
 var _connector = require('./internal/connector');
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _util = require('./internal/util');
 
-/**
- * Copyright (c) 2002-2017 "Neo Technology,","
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var auth = {
   basic: function basic(username, password) {
@@ -76,7 +59,25 @@ var auth = {
       return { scheme: scheme, principal: principal, credentials: credentials, realm: realm };
     }
   }
-};
+}; /**
+    * Copyright (c) 2002-2017 "Neo Technology,","
+    * Network Engine for Objects in Lund AB [http://neotechnology.com]
+    *
+    * This file is part of Neo4j.
+    *
+    * Licensed under the Apache License, Version 2.0 (the "License");
+    * you may not use this file except in compliance with the License.
+    * You may obtain a copy of the License at
+    *
+    *     http://www.apache.org/licenses/LICENSE-2.0
+    *
+    * Unless required by applicable law or agreed to in writing, software
+    * distributed under the License is distributed on an "AS IS" BASIS,
+    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    * See the License for the specific language governing permissions and
+    * limitations under the License.
+    */
+
 var USER_AGENT = "neo4j-javascript/" + _version2.default;
 
 /**
@@ -140,6 +141,7 @@ var USER_AGENT = "neo4j-javascript/" + _version2.default;
 function driver(url, authToken) {
   var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
+  (0, _util.assertString)(url, 'Bolt URL');
   var scheme = (0, _connector.parseScheme)(url);
   if (scheme === "bolt+routing://") {
     return new _routingDriver2.default((0, _connector.parseUrl)(url), USER_AGENT, authToken, config);
@@ -167,7 +169,8 @@ var session = {
 };
 var error = {
   SERVICE_UNAVAILABLE: _error.SERVICE_UNAVAILABLE,
-  SESSION_EXPIRED: _error.SESSION_EXPIRED
+  SESSION_EXPIRED: _error.SESSION_EXPIRED,
+  PROTOCOL_ERROR: _error.PROTOCOL_ERROR
 };
 var integer = {
   toNumber: _integer.toNumber,