tedious 6.4.0 → 6.6.2

package/lib/rpcrequest-payload.js

@@ -1,14 +1,21 @@
 "use strict";
 
-const WritableTrackingBuffer = require('./tracking-buffer/writable-tracking-buffer');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
 
-const writeAllHeaders = require('./all-headers').writeToTrackingBuffer; // const OPTION = {
+var _writableTrackingBuffer = _interopRequireDefault(require("./tracking-buffer/writable-tracking-buffer"));
+
+var _allHeaders = require("./all-headers");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// const OPTION = {
 //   WITH_RECOMPILE: 0x01,
 //   NO_METADATA: 0x02,
 //   REUSE_METADATA: 0x04
 // };
-
-
 const STATUS = {
   BY_REF_VALUE: 0x01,
   DEFAULT_VALUE: 0x02
@@ -17,7 +24,7 @@ const STATUS = {
   s2.2.6.5
  */
 
-module.exports = class RpcRequestPayload {
+class RpcRequestPayload {
   constructor(request, txnDescriptor, options) {
     this.request = request;
     this.procedure = this.request.sqlTextOrProcedure;
@@ -26,11 +33,11 @@ module.exports = class RpcRequestPayload {
   }
 
   getData(cb) {
-    const buffer = new WritableTrackingBuffer(500);
+    const buffer = new _writableTrackingBuffer.default(500);
 
     if (this.options.tdsVersion >= '7_2') {
       const outstandingRequestCount = 1;
-      writeAllHeaders(buffer, this.txnDescriptor, outstandingRequestCount);
+      (0, _allHeaders.writeToTrackingBuffer)(buffer, this.txnDescriptor, outstandingRequestCount);
     }
 
     if (typeof this.procedure === 'string') {
@@ -60,8 +67,7 @@ module.exports = class RpcRequestPayload {
     writeNext(0);
   }
 
-  toString(indent) {
-    indent || (indent = '');
+  toString(indent = '') {
     return indent + ('RPC Request - ' + this.procedure);
   }
 
@@ -87,20 +93,16 @@ module.exports = class RpcRequestPayload {
       }
     }
 
-    if (type.hasPrecision) {
-      if (parameter.precision) {
-        param.precision = parameter.precision;
-      } else if (type.resolvePrecision) {
-        param.precision = type.resolvePrecision(parameter);
-      }
+    if (parameter.precision) {
+      param.precision = parameter.precision;
+    } else if (type.resolvePrecision) {
+      param.precision = type.resolvePrecision(parameter);
     }
 
-    if (type.hasScale) {
-      if (parameter.scale) {
-        param.scale = parameter.scale;
-      } else if (type.resolveScale) {
-        param.scale = type.resolveScale(parameter);
-      }
+    if (parameter.scale) {
+      param.scale = parameter.scale;
+    } else if (type.resolveScale) {
+      param.scale = type.resolveScale(parameter);
     }
 
     type.writeTypeInfo(buffer, param, this.options);
@@ -109,4 +111,8 @@ module.exports = class RpcRequestPayload {
     });
   }
 
-};
+}
+
+var _default = RpcRequestPayload;
+exports.default = _default;
+module.exports = RpcRequestPayload;

package/lib/sender.js

@@ -1,12 +1,23 @@
 "use strict";
 
-const dgram = require('dgram');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Sender = exports.ParallelSendStrategy = void 0;
 
-const dns = require('dns');
+var _dgram = _interopRequireDefault(require("dgram"));
 
-const net = require('net');
+var _dns = _interopRequireDefault(require("dns"));
 
-const punycode = require('punycode');
+var _net = _interopRequireDefault(require("net"));
+
+var punycode = _interopRequireWildcard(require("punycode"));
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class ParallelSendStrategy {
   constructor(addresses, port, request) {
@@ -55,7 +66,8 @@ class ParallelSendStrategy {
     };
 
     const createDgramSocket = (udpType, onError, onMessage) => {
-      const socket = dgram.createSocket(udpType);
+      const socket = _dgram.default.createSocket(udpType);
+
       socket.on('error', onError);
       socket.on('message', onMessage);
       return socket;
@@ -64,7 +76,7 @@ class ParallelSendStrategy {
     for (let j = 0; j < this.addresses.length; j++) {
       const udpTypeV4 = 'udp4';
       const udpTypeV6 = 'udp6';
-      const udpType = net.isIPv4(this.addresses[j].address) ? udpTypeV4 : udpTypeV6;
+      const udpType = this.addresses[j].family === 6 ? udpTypeV6 : udpTypeV4;
       let socket;
 
       if (udpType === udpTypeV4) {
@@ -94,6 +106,8 @@ class ParallelSendStrategy {
 
 }
 
+exports.ParallelSendStrategy = ParallelSendStrategy;
+
 class Sender {
   constructor(host, port, request) {
     this.host = host;
@@ -103,7 +117,7 @@ class Sender {
   }
 
   execute(cb) {
-    if (net.isIP(this.host)) {
+    if (_net.default.isIP(this.host)) {
       this.executeForIP(cb);
     } else {
       this.executeForHostname(cb);
@@ -112,13 +126,14 @@ class Sender {
 
   executeForIP(cb) {
     this.executeForAddresses([{
-      address: this.host
+      address: this.host,
+      family: _net.default.isIPv6(this.host) ? 6 : 4
     }], cb);
   } // Wrapper for stubbing. Sinon does not have support for stubbing module functions.
 
 
   invokeLookupAll(host, cb) {
-    dns.lookup(punycode.toASCII(host), {
+    _dns.default.lookup(punycode.toASCII(host), {
       all: true
     }, cb);
   }
@@ -152,5 +167,4 @@ class Sender {
 
 }
 
-module.exports.Sender = Sender;
-module.exports.ParallelSendStrategy = ParallelSendStrategy;
+exports.Sender = Sender;

package/lib/special-stored-procedure.js

@@ -1,6 +1,10 @@
 "use strict";
 
-module.exports = {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+const procedures = {
   Sp_Cursor: 1,
   Sp_CursorOpen: 2,
   Sp_CursorPrepare: 3,
@@ -16,4 +20,7 @@ module.exports = {
   Sp_PrepExec: 13,
   Sp_PrepExecRpc: 14,
   Sp_Unprepare: 15
-};
+};
+var _default = procedures;
+exports.default = _default;
+module.exports = procedures;

package/lib/tds-versions.js

@@ -1,13 +1,19 @@
 "use strict";
 
-const versions = module.exports.versions = {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.versionsByValue = exports.versions = void 0;
+const versions = {
   '7_1': 0x71000001,
   '7_2': 0x72090002,
   '7_3_A': 0x730A0003,
   '7_3_B': 0x730B0003,
   '7_4': 0x74000004
 };
-const versionsByValue = module.exports.versionsByValue = {};
+exports.versions = versions;
+const versionsByValue = {};
+exports.versionsByValue = versionsByValue;
 
 for (const name in versions) {
   versionsByValue[versions[name]] = name;

package/lib/tedious.js

@@ -1,11 +1,77 @@
 "use strict";
 
-module.exports.BulkLoad = require('./bulk-load');
-module.exports.Connection = require('./connection');
-module.exports.Request = require('./request');
-module.exports.library = require('./library');
-module.exports.ConnectionError = require('./errors').ConnectionError;
-module.exports.RequestError = require('./errors').RequestError;
-module.exports.TYPES = require('./data-type').typeByName;
-module.exports.ISOLATION_LEVEL = require('./transaction').ISOLATION_LEVEL;
-module.exports.TDS_VERSION = require('./tds-versions').versions;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BulkLoad", {
+  enumerable: true,
+  get: function get() {
+    return _bulkLoad.default;
+  }
+});
+Object.defineProperty(exports, "Connection", {
+  enumerable: true,
+  get: function get() {
+    return _connection.default;
+  }
+});
+Object.defineProperty(exports, "Request", {
+  enumerable: true,
+  get: function get() {
+    return _request.default;
+  }
+});
+Object.defineProperty(exports, "ConnectionError", {
+  enumerable: true,
+  get: function get() {
+    return _errors.ConnectionError;
+  }
+});
+Object.defineProperty(exports, "RequestError", {
+  enumerable: true,
+  get: function get() {
+    return _errors.RequestError;
+  }
+});
+Object.defineProperty(exports, "TYPES", {
+  enumerable: true,
+  get: function get() {
+    return _dataType.typeByName;
+  }
+});
+Object.defineProperty(exports, "ISOLATION_LEVEL", {
+  enumerable: true,
+  get: function get() {
+    return _transaction.ISOLATION_LEVEL;
+  }
+});
+Object.defineProperty(exports, "TDS_VERSION", {
+  enumerable: true,
+  get: function get() {
+    return _tdsVersions.versions;
+  }
+});
+exports.library = void 0;
+
+var _bulkLoad = _interopRequireDefault(require("./bulk-load"));
+
+var _connection = _interopRequireDefault(require("./connection"));
+
+var _request = _interopRequireDefault(require("./request"));
+
+var _library = require("./library");
+
+var _errors = require("./errors");
+
+var _dataType = require("./data-type");
+
+var _transaction = require("./transaction");
+
+var _tdsVersions = require("./tds-versions");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const library = {
+  name: _library.name
+};
+exports.library = library;

package/lib/token/colmetadata-token-parser.js

@@ -1,6 +1,15 @@
 "use strict";
 
-const metadataParse = require('../metadata-parser');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _metadataParser = _interopRequireDefault(require("../metadata-parser"));
+
+var _token = require("./token");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function readTableName(parser, options, metadata, callback) {
   if (metadata.type.hasTableName) {
@@ -48,19 +57,20 @@ function readColumnName(parser, options, index, metadata, callback) {
 }
 
 function readColumn(parser, options, index, callback) {
-  metadataParse(parser, options, metadata => {
+  (0, _metadataParser.default)(parser, options, metadata => {
     readTableName(parser, options, metadata, tableName => {
       readColumnName(parser, options, index, metadata, colName => {
         callback({
           userType: metadata.userType,
           flags: metadata.flags,
           type: metadata.type,
-          colName: colName,
           collation: metadata.collation,
           precision: metadata.precision,
           scale: metadata.scale,
           udtInfo: metadata.udtInfo,
           dataLength: metadata.dataLength,
+          schema: metadata.schema,
+          colName: colName,
           tableName: tableName
         });
       });
@@ -68,7 +78,7 @@ function readColumn(parser, options, index, callback) {
   });
 }
 
-module.exports = function (parser, colMetadata, options, callback) {
+function colMetadataParser(parser, _colMetadata, options, callback) {
   parser.readUInt16LE(columnCount => {
     const columns = [];
     let i = 0;
@@ -86,11 +96,11 @@ module.exports = function (parser, colMetadata, options, callback) {
     }
 
     next(() => {
-      callback({
-        name: 'COLMETADATA',
-        event: 'columnMetadata',
-        columns: columns
-      });
+      callback(new _token.ColMetadataToken(columns));
     });
   });
-};
+}
+
+var _default = colMetadataParser;
+exports.default = _default;
+module.exports = colMetadataParser;

package/lib/token/done-token-parser.js

@@ -1,5 +1,18 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.doneParser = doneParser;
+exports.doneInProcParser = doneInProcParser;
+exports.doneProcParser = doneProcParser;
+
+var _jsbi = _interopRequireDefault(require("jsbi"));
+
+var _token = require("./token");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 // s2.2.7.5/6/7
 const STATUS = {
   MORE: 0x0001,
@@ -19,10 +32,8 @@ function parseToken(parser, options, callback) {
     const attention = !!(status & STATUS.ATTN);
     const serverError = !!(status & STATUS.SRVERROR);
     parser.readUInt16LE(curCmd => {
-      (options.tdsVersion < '7_2' ? parser.readUInt32LE : parser.readUInt64LE).call(parser, rowCount => {
+      const next = rowCount => {
         callback({
-          name: 'DONE',
-          event: 'done',
           more: more,
           sqlError: sqlError,
           attention: attention,
@@ -30,37 +41,33 @@ function parseToken(parser, options, callback) {
           rowCount: rowCountValid ? rowCount : undefined,
           curCmd: curCmd
         });
-      });
+      };
+
+      if (options.tdsVersion < '7_2') {
+        parser.readUInt32LE(next);
+      } else {
+        parser.readBigUInt64LE(rowCount => {
+          next(_jsbi.default.toNumber(rowCount));
+        });
+      }
     });
   });
 }
 
-module.exports.doneParser = doneParser;
-
-function doneParser(parser, colMetadata, options, callback) {
-  parseToken(parser, options, token => {
-    token.name = 'DONE';
-    token.event = 'done';
-    callback(token);
+function doneParser(parser, _colMetadata, options, callback) {
+  parseToken(parser, options, data => {
+    callback(new _token.DoneToken(data));
   });
 }
 
-module.exports.doneInProcParser = doneInProcParser;
-
-function doneInProcParser(parser, colMetadata, options, callback) {
-  parseToken(parser, options, token => {
-    token.name = 'DONEINPROC';
-    token.event = 'doneInProc';
-    callback(token);
+function doneInProcParser(parser, _colMetadata, options, callback) {
+  parseToken(parser, options, data => {
+    callback(new _token.DoneInProcToken(data));
   });
 }
 
-module.exports.doneProcParser = doneProcParser;
-
-function doneProcParser(parser, colMetadata, options, callback) {
-  parseToken(parser, options, token => {
-    token.name = 'DONEPROC';
-    token.event = 'doneProc';
-    callback(token);
+function doneProcParser(parser, _colMetadata, options, callback) {
+  parseToken(parser, options, data => {
+    callback(new _token.DoneProcToken(data));
   });
 }

package/lib/token/env-change-token-parser.js

@@ -1,5 +1,12 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
 const types = {
   1: {
     name: 'DATABASE',
@@ -59,10 +66,21 @@ function readNewAndOldValue(parser, length, type, callback) {
     case 'DATABASE_MIRRORING_PARTNER':
       return parser.readBVarChar(newValue => {
         parser.readBVarChar(oldValue => {
-          if (type.name === 'PACKET_SIZE') {
-            callback(parseInt(newValue), parseInt(oldValue));
-          } else {
-            callback(newValue, oldValue);
+          switch (type.name) {
+            case 'PACKET_SIZE':
+              return callback(new _token.PacketSizeEnvChangeToken(parseInt(newValue), parseInt(oldValue)));
+
+            case 'DATABASE':
+              return callback(new _token.DatabaseEnvChangeToken(newValue, oldValue));
+
+            case 'LANGUAGE':
+              return callback(new _token.LanguageEnvChangeToken(newValue, oldValue));
+
+            case 'CHARSET':
+              return callback(new _token.CharsetEnvChangeToken(newValue, oldValue));
+
+            case 'DATABASE_MIRRORING_PARTNER':
+              return callback(new _token.DatabaseMirroringPartnerEnvChangeToken(newValue, oldValue));
           }
         });
       });
@@ -74,12 +92,27 @@ function readNewAndOldValue(parser, length, type, callback) {
     case 'RESET_CONNECTION':
       return parser.readBVarByte(newValue => {
         parser.readBVarByte(oldValue => {
-          callback(newValue, oldValue);
+          switch (type.name) {
+            case 'SQL_COLLATION':
+              return callback(new _token.CollationChangeToken(newValue, oldValue));
+
+            case 'BEGIN_TXN':
+              return callback(new _token.BeginTransactionEnvChangeToken(newValue, oldValue));
+
+            case 'COMMIT_TXN':
+              return callback(new _token.CommitTransactionEnvChangeToken(newValue, oldValue));
+
+            case 'ROLLBACK_TXN':
+              return callback(new _token.RollbackTransactionEnvChangeToken(newValue, oldValue));
+
+            case 'RESET_CONNECTION':
+              return callback(new _token.ResetConnectionEnvChangeToken(newValue, oldValue));
+          }
         });
       });
 
     case 'ROUTING_CHANGE':
-      parser.readUInt16LE(valueLength => {
+      return parser.readUInt16LE(valueLength => {
         // Routing Change:
         // Byte 1: Protocol (must be 0)
         // Bytes 2-3 (USHORT): Port number
@@ -103,23 +136,22 @@ function readNewAndOldValue(parser, length, type, callback) {
           };
           parser.readUInt16LE(oldValueLength => {
             parser.readBuffer(oldValueLength, oldValue => {
-              callback(newValue, oldValue);
+              callback(new _token.RoutingEnvChangeToken(newValue, oldValue));
             });
           });
         });
       });
-      break;
 
     default:
       console.error('Tedious > Unsupported ENVCHANGE type ' + type.name); // skip unknown bytes
 
       parser.readBuffer(length - 1, () => {
-        callback(undefined, undefined);
+        callback(undefined);
       });
   }
 }
 
-module.exports = function (parser, colMetadata, options, callback) {
+function envChangeParser(parser, _colMetadata, _options, callback) {
   parser.readUInt16LE(length => {
     parser.readUInt8(typeNumber => {
       const type = types[typeNumber];
@@ -128,19 +160,17 @@ module.exports = function (parser, colMetadata, options, callback) {
         console.error('Tedious > Unsupported ENVCHANGE type ' + typeNumber); // skip unknown bytes
 
         return parser.readBuffer(length - 1, () => {
-          callback();
+          callback(undefined);
         });
       }
 
-      readNewAndOldValue(parser, length, type, (newValue, oldValue) => {
-        callback({
-          name: 'ENVCHANGE',
-          type: type.name,
-          event: type.event,
-          oldValue: oldValue,
-          newValue: newValue
-        });
+      readNewAndOldValue(parser, length, type, token => {
+        callback(token);
       });
     });
   });
-};
+}
+
+var _default = envChangeParser;
+exports.default = _default;
+module.exports = envChangeParser;

package/lib/token/feature-ext-ack-parser.js

@@ -1,5 +1,12 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
 const FEATURE_ID = {
   SESSIONRECOVERY: 0x01,
   FEDAUTH: 0x02,
@@ -9,32 +16,30 @@ const FEATURE_ID = {
   TERMINATOR: 0xFF
 };
 
-module.exports = function featureExtAckParser(parser, colMetadata, options, callback) {
-  const token = {
-    'name': 'FEATUREEXTACK',
-    'event': 'featureExtAck',
-    'fedAuth': undefined
-  };
+function featureExtAckParser(parser, _colMetadata, _options, callback) {
+  let fedAuth;
 
-  function next(done) {
+  function next() {
     parser.readUInt8(featureId => {
       if (featureId === FEATURE_ID.TERMINATOR) {
-        return done();
+        return callback(new _token.FeatureExtAckToken(fedAuth));
       }
 
       parser.readUInt32LE(featureAckDataLen => {
         parser.readBuffer(featureAckDataLen, featureData => {
           if (featureId === FEATURE_ID.FEDAUTH) {
-            token.fedAuth = featureData;
+            fedAuth = featureData;
           }
 
-          next(done);
+          next();
         });
       });
     });
   }
 
-  next(() => {
-    callback(token);
-  });
-};
+  next();
+}
+
+var _default = featureExtAckParser;
+exports.default = _default;
+module.exports = featureExtAckParser;