tedious 2.2.0 → 2.2.4

package/lib/request.js

@@ -26,6 +26,9 @@ var EventEmitter = require('events').EventEmitter;
 var TYPES = require('./data-type').typeByName;
 var RequestError = require('./errors').RequestError;
 
+// TODO: Figure out how to type the `rows` parameter here.
+
+
 module.exports = function (_EventEmitter) {
   (0, _inherits3.default)(Request, _EventEmitter);
 
@@ -37,21 +40,36 @@ module.exports = function (_EventEmitter) {
     _this.sqlTextOrProcedure = sqlTextOrProcedure;
     _this.parameters = [];
     _this.parametersByName = {};
+    _this.originalParameters = [];
+    _this.preparing = false;
+    _this.handle = undefined;
     _this.canceled = false;
     _this.paused = false;
+    _this.error = undefined;
+    _this.connection = undefined;
     _this.userCallback = callback;
-    _this.callback = function () {
+    _this.callback = function (err) {
       if (this.preparing) {
-        this.emit('prepared');
-        return this.preparing = false;
+        this.preparing = false;
+        if (err) {
+          this.emit('error', err);
+        } else {
+          this.emit('prepared');
+        }
       } else {
         this.userCallback.apply(this, arguments);
-        return this.emit('requestCompleted');
+        this.emit('requestCompleted');
       }
     };
     return _this;
   }
 
+  // TODO: `type` must be a valid TDS value type
+  // TODO: This should be `Connection`, not `any`.
+
+  // TODO: Figure out the type here.
+
+
   (0, _createClass3.default)(Request, [{
     key: 'addParameter',
     value: function addParameter(name, type, value, options) {
@@ -69,8 +87,11 @@ module.exports = function (_EventEmitter) {
         scale: options.scale
       };
       this.parameters.push(parameter);
-      return this.parametersByName[name] = parameter;
+      this.parametersByName[name] = parameter;
     }
+
+    // TODO: `type` must be a valid TDS value type
+
   }, {
     key: 'addOutputParameter',
     value: function addOutputParameter(name, type, value, options) {
@@ -78,7 +99,7 @@ module.exports = function (_EventEmitter) {
         options = {};
       }
       options.output = true;
-      return this.addParameter(name, type, value, options);
+      this.addParameter(name, type, value, options);
     }
   }, {
     key: 'makeParamsParameter',
@@ -115,7 +136,7 @@ module.exports = function (_EventEmitter) {
         var parameter = this.originalParameters[i];
         this.parameters.push(parameter);
       }
-      return this.sqlTextOrProcedure = 'sp_executesql';
+      this.sqlTextOrProcedure = 'sp_executesql';
     }
   }, {
     key: 'transformIntoPrepareRpc',
@@ -129,11 +150,11 @@ module.exports = function (_EventEmitter) {
       this.addParameter('stmt', TYPES.NVarChar, this.sqlTextOrProcedure);
       this.sqlTextOrProcedure = 'sp_prepare';
       this.preparing = true;
-      return this.on('returnValue', function (name, value) {
+      this.on('returnValue', function (name, value) {
         if (name === 'handle') {
-          return _this2.handle = value;
+          _this2.handle = value;
         } else {
-          return _this2.error = RequestError('Tedious > Unexpected output parameter ' + name + ' from sp_prepare');
+          _this2.error = RequestError(`Tedious > Unexpected output parameter ${name} from sp_prepare`);
         }
       });
     }
@@ -142,7 +163,7 @@ module.exports = function (_EventEmitter) {
     value: function transformIntoUnprepareRpc() {
       this.parameters = [];
       this.addParameter('handle', TYPES.Int, this.handle);
-      return this.sqlTextOrProcedure = 'sp_unprepare';
+      this.sqlTextOrProcedure = 'sp_unprepare';
     }
   }, {
     key: 'transformIntoExecuteRpc',
@@ -160,18 +181,18 @@ module.exports = function (_EventEmitter) {
         return;
       }
 
-      return this.sqlTextOrProcedure = 'sp_execute';
+      this.sqlTextOrProcedure = 'sp_execute';
     }
   }, {
     key: 'validateParameters',
     value: function validateParameters() {
       for (var i = 0, len = this.parameters.length; i < len; i++) {
         var parameter = this.parameters[i];
-        var value = parameter.type.validate(parameter.value);
-        if (value instanceof TypeError) {
-          return this.error = new RequestError('Validation failed for parameter \'' + parameter.name + '\'. ' + value.message, 'EPARAM');
+        var _value = parameter.type.validate(parameter.value);
+        if (_value instanceof TypeError) {
+          return this.error = new RequestError('Validation failed for parameter \'' + parameter.name + '\'. ' + _value.message, 'EPARAM');
         }
-        parameter.value = value;
+        parameter.value = _value;
       }
       return null;
     }

package/lib/tracking-buffer/bigint.js

@@ -70,7 +70,7 @@ function numberToInt64LE(num) {
   var hi = Math.abs(num);
   var lo = hi % 0x100000000;
   hi = hi / 0x100000000 | 0;
-  var buf = new Buffer(8);
+  var buf = new Buffer(8).fill(0);
   for (var i = 0; i <= 7; i++) {
     buf[i] = lo & 0xff;
     lo = i === 3 ? hi : lo >>> 8;

package/lib/tracking-buffer/writable-tracking-buffer.js

@@ -28,21 +28,23 @@ module.exports = function () {
     (0, _classCallCheck3.default)(this, WritableTrackingBuffer);
 
     this.initialSize = initialSize;
-    this.encoding = encoding;
-    this.doubleSizeGrowth = doubleSizeGrowth;
-    this.doubleSizeGrowth || (this.doubleSizeGrowth = false);
-    this.encoding || (this.encoding = 'ucs2');
-    this.buffer = new Buffer(this.initialSize);
+    this.encoding = encoding || 'ucs2';
+    this.doubleSizeGrowth = doubleSizeGrowth || false;
+    this.buffer = new Buffer(this.initialSize).fill(0);
+    this.compositeBuffer = new Buffer(0);
     this.position = 0;
   }
 
+  // $FlowFixMe: Flow does not like getter/setters that have side-effects.
+
+
   (0, _createClass3.default)(WritableTrackingBuffer, [{
     key: 'copyFrom',
     value: function copyFrom(buffer) {
       var length = buffer.length;
       this.makeRoomFor(length);
       buffer.copy(this.buffer, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'makeRoomFor',
@@ -53,9 +55,9 @@ module.exports = function () {
           while (size < requiredLength) {
             size *= 2;
           }
-          return this.newBuffer(size);
+          this.newBuffer(size);
         } else {
-          return this.newBuffer(requiredLength);
+          this.newBuffer(requiredLength);
         }
       }
     }
@@ -63,13 +65,9 @@ module.exports = function () {
     key: 'newBuffer',
     value: function newBuffer(size) {
       var buffer = this.buffer.slice(0, this.position);
-      if (this.compositeBuffer) {
-        this.compositeBuffer = Buffer.concat([this.compositeBuffer, buffer]);
-      } else {
-        this.compositeBuffer = buffer;
-      }
-      this.buffer = size === 0 ? ZERO_LENGTH_BUFFER : new Buffer(size);
-      return this.position = 0;
+      this.compositeBuffer = Buffer.concat([this.compositeBuffer, buffer]);
+      this.buffer = size === 0 ? ZERO_LENGTH_BUFFER : new Buffer(size).fill(0);
+      this.position = 0;
     }
   }, {
     key: 'writeUInt8',
@@ -77,7 +75,7 @@ module.exports = function () {
       var length = 1;
       this.makeRoomFor(length);
       this.buffer.writeUInt8(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeUInt16LE',
@@ -85,12 +83,12 @@ module.exports = function () {
       var length = 2;
       this.makeRoomFor(length);
       this.buffer.writeUInt16LE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeUShort',
     value: function writeUShort(value) {
-      return this.writeUInt16LE(value);
+      this.writeUInt16LE(value);
     }
   }, {
     key: 'writeUInt16BE',
@@ -98,7 +96,7 @@ module.exports = function () {
       var length = 2;
       this.makeRoomFor(length);
       this.buffer.writeUInt16BE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeUInt24LE',
@@ -108,7 +106,7 @@ module.exports = function () {
       this.buffer[this.position + 2] = value >>> 16 & 0xff;
       this.buffer[this.position + 1] = value >>> 8 & 0xff;
       this.buffer[this.position] = value & 0xff;
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeUInt32LE',
@@ -116,13 +114,13 @@ module.exports = function () {
       var length = 4;
       this.makeRoomFor(length);
       this.buffer.writeUInt32LE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeInt64LE',
     value: function writeInt64LE(value) {
       var buf = bigint.numberToInt64LE(value);
-      return this.copyFrom(buf);
+      this.copyFrom(buf);
     }
   }, {
     key: 'writeUInt32BE',
@@ -130,20 +128,20 @@ module.exports = function () {
       var length = 4;
       this.makeRoomFor(length);
       this.buffer.writeUInt32BE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeUInt40LE',
     value: function writeUInt40LE(value) {
       // inspired by https://github.com/dpw/node-buffer-more-ints
       this.writeInt32LE(value & -1);
-      return this.writeUInt8(Math.floor(value * SHIFT_RIGHT_32));
+      this.writeUInt8(Math.floor(value * SHIFT_RIGHT_32));
     }
   }, {
     key: 'writeUInt64LE',
     value: function writeUInt64LE(value) {
       this.writeInt32LE(value & -1);
-      return this.writeUInt32LE(Math.floor(value * SHIFT_RIGHT_32));
+      this.writeUInt32LE(Math.floor(value * SHIFT_RIGHT_32));
     }
   }, {
     key: 'writeInt8',
@@ -151,7 +149,7 @@ module.exports = function () {
       var length = 1;
       this.makeRoomFor(length);
       this.buffer.writeInt8(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeInt16LE',
@@ -159,7 +157,7 @@ module.exports = function () {
       var length = 2;
       this.makeRoomFor(length);
       this.buffer.writeInt16LE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeInt16BE',
@@ -167,7 +165,7 @@ module.exports = function () {
       var length = 2;
       this.makeRoomFor(length);
       this.buffer.writeInt16BE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeInt32LE',
@@ -175,7 +173,7 @@ module.exports = function () {
       var length = 4;
       this.makeRoomFor(length);
       this.buffer.writeInt32LE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeInt32BE',
@@ -183,7 +181,7 @@ module.exports = function () {
       var length = 4;
       this.makeRoomFor(length);
       this.buffer.writeInt32BE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeFloatLE',
@@ -191,7 +189,7 @@ module.exports = function () {
       var length = 4;
       this.makeRoomFor(length);
       this.buffer.writeFloatLE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeDoubleLE',
@@ -199,42 +197,46 @@ module.exports = function () {
       var length = 8;
       this.makeRoomFor(length);
       this.buffer.writeDoubleLE(value, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeString',
     value: function writeString(value, encoding) {
-      encoding || (encoding = this.encoding);
+      if (encoding == undefined) {
+        encoding = this.encoding;
+      }
 
       var length = Buffer.byteLength(value, encoding);
       this.makeRoomFor(length);
 
-      var bytesWritten = this.buffer.write(value, this.position, encoding);
+      // $FlowFixMe https://github.com/facebook/flow/pull/5398
+      this.buffer.write(value, this.position, encoding);
       this.position += length;
-
-      return bytesWritten;
     }
   }, {
     key: 'writeBVarchar',
     value: function writeBVarchar(value, encoding) {
       this.writeUInt8(value.length);
-      return this.writeString(value, encoding);
+      this.writeString(value, encoding);
     }
   }, {
     key: 'writeUsVarchar',
     value: function writeUsVarchar(value, encoding) {
       this.writeUInt16LE(value.length);
-      return this.writeString(value, encoding);
+      this.writeString(value, encoding);
     }
+
+    // TODO: Figure out what types are passed in other than `Buffer`
+
   }, {
     key: 'writeUsVarbyte',
     value: function writeUsVarbyte(value, encoding) {
-      if (encoding == null) {
+      if (encoding == undefined) {
         encoding = this.encoding;
       }
 
       var length = void 0;
-      if (Buffer.isBuffer(value)) {
+      if (value instanceof Buffer) {
         length = value.length;
       } else {
         value = value.toString();
@@ -242,12 +244,13 @@ module.exports = function () {
       }
       this.writeUInt16LE(length);
 
-      if (Buffer.isBuffer(value)) {
-        return this.writeBuffer(value);
+      if (value instanceof Buffer) {
+        this.writeBuffer(value);
       } else {
         this.makeRoomFor(length);
+        // $FlowFixMe https://github.com/facebook/flow/pull/5398
         this.buffer.write(value, this.position, encoding);
-        return this.position += length;
+        this.position += length;
       }
     }
   }, {
@@ -258,7 +261,7 @@ module.exports = function () {
       }
 
       var length = void 0;
-      if (Buffer.isBuffer(value)) {
+      if (value instanceof Buffer) {
         length = value.length;
       } else {
         value = value.toString();
@@ -274,17 +277,18 @@ module.exports = function () {
       if (length > 0) {
         // One chunk.
         this.writeUInt32LE(length);
-        if (Buffer.isBuffer(value)) {
+        if (value instanceof Buffer) {
           this.writeBuffer(value);
         } else {
           this.makeRoomFor(length);
+          // $FlowFixMe https://github.com/facebook/flow/pull/5398
           this.buffer.write(value, this.position, encoding);
           this.position += length;
         }
       }
 
       // PLP_TERMINATOR (no more chunks).
-      return this.writeUInt32LE(0);
+      this.writeUInt32LE(0);
     }
   }, {
     key: 'writeBuffer',
@@ -292,13 +296,13 @@ module.exports = function () {
       var length = value.length;
       this.makeRoomFor(length);
       value.copy(this.buffer, this.position);
-      return this.position += length;
+      this.position += length;
     }
   }, {
     key: 'writeMoney',
     value: function writeMoney(value) {
       this.writeInt32LE(Math.floor(value * SHIFT_RIGHT_32));
-      return this.writeInt32LE(value & -1);
+      this.writeInt32LE(value & -1);
     }
   }, {
     key: 'data',

package/lib/value-parser.js

@@ -185,7 +185,7 @@ function valueParse(parser, metaData, options, callback) {
           if (metaData.dataLength === MAX) {
             return readMaxChars(parser, codepage, callback);
           } else {
-            return readChars(parser, dataLength, codepage, callback);
+            return readChars(parser, dataLength, codepage, NULL, callback);
           }
 
         case 'NVarChar':
@@ -193,7 +193,7 @@ function valueParse(parser, metaData, options, callback) {
           if (metaData.dataLength === MAX) {
             return readMaxNChars(parser, callback);
           } else {
-            return readNChars(parser, dataLength, callback);
+            return readNChars(parser, dataLength, NULL, callback);
           }
 
         case 'VarBinary':
@@ -201,28 +201,28 @@ function valueParse(parser, metaData, options, callback) {
           if (metaData.dataLength === MAX) {
             return readMaxBinary(parser, callback);
           } else {
-            return readBinary(parser, dataLength, callback);
+            return readBinary(parser, dataLength, NULL, callback);
           }
 
         case 'Text':
           if (textPointerNull) {
             return callback(null);
           } else {
-            return readChars(parser, dataLength, metaData.collation.codepage, callback);
+            return readChars(parser, dataLength, metaData.collation.codepage, PLP_NULL, callback);
           }
 
         case 'NText':
           if (textPointerNull) {
             return callback(null);
           } else {
-            return readNChars(parser, dataLength, callback);
+            return readNChars(parser, dataLength, PLP_NULL, callback);
           }
 
         case 'Image':
           if (textPointerNull) {
             return callback(null);
           } else {
-            return readBinary(parser, dataLength, callback);
+            return readBinary(parser, dataLength, PLP_NULL, callback);
           }
 
         case 'Xml':
@@ -359,20 +359,20 @@ function valueParse(parser, metaData, options, callback) {
   });
 }
 
-function readBinary(parser, dataLength, callback) {
-  if (dataLength === NULL) {
+function readBinary(parser, dataLength, nullValue, callback) {
+  if (dataLength === nullValue) {
     return callback(null);
   } else {
     return parser.readBuffer(dataLength, callback);
   }
 }
 
-function readChars(parser, dataLength, codepage, callback) {
+function readChars(parser, dataLength, codepage, nullValue, callback) {
   if (codepage == null) {
     codepage = DEFAULT_ENCODING;
   }
 
-  if (dataLength === NULL) {
+  if (dataLength === nullValue) {
     return callback(null);
   } else {
     return parser.readBuffer(dataLength, function (data) {
@@ -381,8 +381,8 @@ function readChars(parser, dataLength, codepage, callback) {
   }
 }
 
-function readNChars(parser, dataLength, callback) {
-  if (dataLength === NULL) {
+function readNChars(parser, dataLength, nullValue, callback) {
+  if (dataLength === nullValue) {
     return callback(null);
   } else {
     return parser.readBuffer(dataLength, function (data) {
@@ -440,7 +440,7 @@ function readMax(parser, callback) {
 }
 
 function readMaxKnownLength(parser, totalLength, callback) {
-  var data = new Buffer(totalLength);
+  var data = new Buffer(totalLength).fill(0);
 
   var offset = 0;
   function next(done) {

package/package.json

@@ -27,7 +27,7 @@
   "homepage": "https://github.com/tediousjs/tedious",
   "bugs": "https://github.com/tediousjs/tedious/issues",
   "license": "MIT",
-  "version": "2.2.0",
+  "version": "2.2.4",
   "main": "./lib/tedious.js",
   "repository": {
     "type": "git",