tedious 6.4.0 → 6.6.2

package/lib/token/fedauth-info-parser.js

@@ -1,19 +1,21 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
 const FEDAUTHINFOID = {
   STSURL: 0x01,
   SPN: 0x02
 };
 
-module.exports = function fedAuthInfoParser(parser, colMetadata, options, callback) {
+function fedAuthInfoParser(parser, _colMetadata, _options, callback) {
   parser.readUInt32LE(tokenLength => {
     parser.readBuffer(tokenLength, data => {
-      const token = {
-        'name': 'FEDAUTHINFO',
-        'event': 'fedAuthInfo',
-        'spn': undefined,
-        'stsurl': undefined
-      };
+      let spn, stsurl;
       let offset = 0;
       const countOfInfoIDs = data.readUInt32LE(offset);
       offset += 4;
@@ -28,11 +30,11 @@ module.exports = function fedAuthInfoParser(parser, colMetadata, options, callba
 
         switch (fedauthInfoID) {
           case FEDAUTHINFOID.SPN:
-            token.spn = data.toString('ucs2', fedAuthInfoDataOffset, fedAuthInfoDataOffset + fedAuthInfoDataLen);
+            spn = data.toString('ucs2', fedAuthInfoDataOffset, fedAuthInfoDataOffset + fedAuthInfoDataLen);
             break;
 
           case FEDAUTHINFOID.STSURL:
-            token.stsurl = data.toString('ucs2', fedAuthInfoDataOffset, fedAuthInfoDataOffset + fedAuthInfoDataLen);
+            stsurl = data.toString('ucs2', fedAuthInfoDataOffset, fedAuthInfoDataOffset + fedAuthInfoDataLen);
             break;
           // ignoring unknown fedauthinfo options
 
@@ -41,7 +43,11 @@ module.exports = function fedAuthInfoParser(parser, colMetadata, options, callba
         }
       }
 
-      callback(token);
+      callback(new _token.FedAuthInfoToken(spn, stsurl));
     });
   });
-};
+}
+
+var _default = fedAuthInfoParser;
+exports.default = _default;
+module.exports = fedAuthInfoParser;

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

@@ -1,5 +1,13 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.infoParser = infoParser;
+exports.errorParser = errorParser;
+
+var _token = require("./token");
+
 function parseToken(parser, options, callback) {
   // length
   parser.readUInt16LE(() => {
@@ -29,22 +37,14 @@ function parseToken(parser, options, callback) {
   });
 }
 
-module.exports.infoParser = infoParser;
-
-function infoParser(parser, colMetadata, options, callback) {
-  parseToken(parser, options, token => {
-    token.name = 'INFO';
-    token.event = 'infoMessage';
-    callback(token);
+function infoParser(parser, _colMetadata, options, callback) {
+  parseToken(parser, options, data => {
+    callback(new _token.InfoMessageToken(data));
   });
 }
 
-module.exports.errorParser = errorParser;
-
-function errorParser(parser, colMetadata, options, callback) {
-  parseToken(parser, options, token => {
-    token.name = 'ERROR';
-    token.event = 'errorMessage';
-    callback(token);
+function errorParser(parser, _colMetadata, options, callback) {
+  parseToken(parser, options, data => {
+    callback(new _token.ErrorMessageToken(data));
   });
 }

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

@@ -1,37 +1,42 @@
 "use strict";
 
-const versions = require('../tds-versions').versionsByValue;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
+var _tdsVersions = require("../tds-versions");
 
 const interfaceTypes = {
   0: 'SQL_DFLT',
   1: 'SQL_TSQL'
 };
 
-module.exports = function (parser, colMetadata, options, callback) {
+function loginAckParser(parser, _colMetadata, _options, callback) {
   // length
   parser.readUInt16LE(() => {
     parser.readUInt8(interfaceNumber => {
       const interfaceType = interfaceTypes[interfaceNumber];
       parser.readUInt32BE(tdsVersionNumber => {
-        const tdsVersion = versions[tdsVersionNumber];
+        const tdsVersion = _tdsVersions.versionsByValue[tdsVersionNumber];
         parser.readBVarChar(progName => {
           parser.readUInt8(major => {
             parser.readUInt8(minor => {
               parser.readUInt8(buildNumHi => {
                 parser.readUInt8(buildNumLow => {
-                  callback({
-                    'name': 'LOGINACK',
-                    'event': 'loginack',
-                    'interface': interfaceType,
-                    'tdsVersion': tdsVersion,
-                    'progName': progName,
-                    'progVersion': {
+                  callback(new _token.LoginAckToken({
+                    interface: interfaceType,
+                    tdsVersion: tdsVersion,
+                    progName: progName,
+                    progVersion: {
                       major: major,
                       minor: minor,
                       buildNumHi: buildNumHi,
                       buildNumLow: buildNumLow
                     }
-                  });
+                  }));
                 });
               });
             });
@@ -40,4 +45,8 @@ module.exports = function (parser, colMetadata, options, callback) {
       });
     });
   });
-};
+}
+
+var _default = loginAckParser;
+exports.default = _default;
+module.exports = loginAckParser;

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

@@ -1,13 +1,22 @@
 "use strict";
 
-// s2.2.7.13 (introduced in TDS 7.3.B)
-const valueParse = require('../value-parser');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
+var _valueParser = _interopRequireDefault(require("../value-parser"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function nullHandler(parser, columnMetaData, options, callback) {
+// s2.2.7.13 (introduced in TDS 7.3.B)
+function nullHandler(_parser, _columnMetadata, _options, callback) {
   callback(null);
 }
 
-module.exports = function (parser, columnsMetaData, options, callback) {
+function nbcRowParser(parser, columnsMetaData, options, callback) {
   const length = Math.ceil(columnsMetaData.length / 8);
   parser.readBuffer(length, bytes => {
     const bitmap = [];
@@ -20,7 +29,7 @@ module.exports = function (parser, columnsMetaData, options, callback) {
       }
     }
 
-    const columns = options.useColumnNames ? {} : [];
+    const columns = [];
     const len = columnsMetaData.length;
     let i = 0;
 
@@ -30,31 +39,34 @@ module.exports = function (parser, columnsMetaData, options, callback) {
       }
 
       const columnMetaData = columnsMetaData[i];
-      (bitmap[i] ? nullHandler : valueParse)(parser, columnMetaData, options, value => {
-        const column = {
+      (bitmap[i] ? nullHandler : _valueParser.default)(parser, columnMetaData, options, value => {
+        columns.push({
           value: value,
           metadata: columnMetaData
-        };
-
-        if (options.useColumnNames) {
-          if (columns[columnMetaData.colName] == null) {
-            columns[columnMetaData.colName] = column;
-          }
-        } else {
-          columns.push(column);
-        }
-
+        });
         i++;
         next(done);
       });
     }
 
     next(() => {
-      callback({
-        name: 'NBCROW',
-        event: 'row',
-        columns: columns
-      });
+      if (options.useColumnNames) {
+        const columnsMap = {};
+        columns.forEach(column => {
+          const colName = column.metadata.colName;
+
+          if (columnsMap[colName] == null) {
+            columnsMap[colName] = column;
+          }
+        });
+        callback(new _token.NBCRowToken(columnsMap));
+      } else {
+        callback(new _token.NBCRowToken(columns));
+      }
     });
   });
-};
+}
+
+var _default = nbcRowParser;
+exports.default = _default;
+module.exports = nbcRowParser;

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

@@ -1,7 +1,14 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
 // s2.2.7.14
-module.exports = function (parser, colMetadata, options, callback) {
+function orderParser(parser, _colMetadata, _options, callback) {
   parser.readUInt16LE(length => {
     const columnCount = length / 2;
     const orderColumns = [];
@@ -20,11 +27,11 @@ module.exports = function (parser, colMetadata, options, callback) {
     }
 
     next(() => {
-      callback({
-        name: 'ORDER',
-        event: 'order',
-        orderColumns: orderColumns
-      });
+      callback(new _token.OrderToken(orderColumns));
     });
   });
-};
+}
+
+var _default = orderParser;
+exports.default = _default;
+module.exports = orderParser;

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

@@ -1,12 +1,19 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
 // s2.2.7.16
-module.exports = function (parser, colMetadata, options, callback) {
+function returnStatusParser(parser, _colMetadata, _options, callback) {
   parser.readInt32LE(value => {
-    callback({
-      name: 'RETURNSTATUS',
-      event: 'returnStatus',
-      value: value
-    });
+    callback(new _token.ReturnStatusToken(value));
   });
-};
+}
+
+var _default = returnStatusParser;
+exports.default = _default;
+module.exports = returnStatusParser;

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

@@ -1,11 +1,20 @@
 "use strict";
 
-// s2.2.7.16
-const metadataParse = require('../metadata-parser');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
+var _metadataParser = _interopRequireDefault(require("../metadata-parser"));
 
-const valueParse = require('../value-parser');
+var _valueParser = _interopRequireDefault(require("../value-parser"));
 
-module.exports = function (parser, colMetadata, options, callback) {
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// s2.2.7.16
+function returnParser(parser, _colMetadata, options, callback) {
   parser.readUInt16LE(paramOrdinal => {
     parser.readBVarChar(paramName => {
       if (paramName.charAt(0) === '@') {
@@ -14,19 +23,21 @@ module.exports = function (parser, colMetadata, options, callback) {
 
 
       parser.readUInt8(() => {
-        metadataParse(parser, options, metadata => {
-          valueParse(parser, metadata, options, value => {
-            callback({
-              name: 'RETURNVALUE',
-              event: 'returnValue',
+        (0, _metadataParser.default)(parser, options, metadata => {
+          (0, _valueParser.default)(parser, metadata, options, value => {
+            callback(new _token.ReturnValueToken({
               paramOrdinal: paramOrdinal,
               paramName: paramName,
               metadata: metadata,
               value: value
-            });
+            }));
           });
         });
       });
     });
   });
-};
+}
+
+var _default = returnParser;
+exports.default = _default;
+module.exports = returnParser;

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

@@ -1,10 +1,19 @@
 "use strict";
 
-// s2.2.7.17
-const valueParse = require('../value-parser');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
+var _valueParser = _interopRequireDefault(require("../value-parser"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-module.exports = function (parser, colMetadata, options, callback) {
-  const columns = options.useColumnNames ? {} : [];
+// s2.2.7.17
+function rowParser(parser, colMetadata, options, callback) {
+  const columns = [];
   const len = colMetadata.length;
   let i = 0;
 
@@ -14,30 +23,33 @@ module.exports = function (parser, colMetadata, options, callback) {
     }
 
     const columnMetaData = colMetadata[i];
-    valueParse(parser, columnMetaData, options, value => {
-      const column = {
+    (0, _valueParser.default)(parser, columnMetaData, options, value => {
+      columns.push({
         value: value,
         metadata: columnMetaData
-      };
-
-      if (options.useColumnNames) {
-        if (columns[columnMetaData.colName] == null) {
-          columns[columnMetaData.colName] = column;
-        }
-      } else {
-        columns.push(column);
-      }
-
+      });
       i++;
       next(done);
     });
   }
 
   next(() => {
-    callback({
-      name: 'ROW',
-      event: 'row',
-      columns: columns
-    });
+    if (options.useColumnNames) {
+      const columnsMap = {};
+      columns.forEach(column => {
+        const colName = column.metadata.colName;
+
+        if (columnsMap[colName] == null) {
+          columnsMap[colName] = column;
+        }
+      });
+      callback(new _token.RowToken(columnsMap));
+    } else {
+      callback(new _token.RowToken(columns));
+    }
   });
-};
+}
+
+var _default = rowParser;
+exports.default = _default;
+module.exports = rowParser;

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

@@ -1,5 +1,12 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = require("./token");
+
 function parseChallenge(buffer) {
   const challenge = {};
   challenge.magic = buffer.slice(0, 8).toString('utf8');
@@ -19,13 +26,12 @@ function parseChallenge(buffer) {
   return challenge;
 }
 
-module.exports = function (parser, colMetadata, options, callback) {
+function sspiParser(parser, _colMetadata, _options, callback) {
   parser.readUsVarByte(buffer => {
-    callback({
-      name: 'SSPICHALLENGE',
-      event: 'sspichallenge',
-      ntlmpacket: parseChallenge(buffer),
-      ntlmpacketBuffer: buffer
-    });
+    callback(new _token.SSPIToken(parseChallenge(buffer), buffer));
   });
-};
+}
+
+var _default = sspiParser;
+exports.default = _default;
+module.exports = sspiParser;

package/lib/token/stream-parser.js

@@ -1,27 +1,66 @@
 "use strict";
 
-const Transform = require('readable-stream').Transform;
-
-const TYPE = require('./token').TYPE;
-
-const tokenParsers = {};
-tokenParsers[TYPE.COLMETADATA] = require('./colmetadata-token-parser');
-tokenParsers[TYPE.DONE] = require('./done-token-parser').doneParser;
-tokenParsers[TYPE.DONEINPROC] = require('./done-token-parser').doneInProcParser;
-tokenParsers[TYPE.DONEPROC] = require('./done-token-parser').doneProcParser;
-tokenParsers[TYPE.ENVCHANGE] = require('./env-change-token-parser');
-tokenParsers[TYPE.ERROR] = require('./infoerror-token-parser').errorParser;
-tokenParsers[TYPE.FEDAUTHINFO] = require('./fedauth-info-parser');
-tokenParsers[TYPE.FEATUREEXTACK] = require('./feature-ext-ack-parser');
-tokenParsers[TYPE.INFO] = require('./infoerror-token-parser').infoParser;
-tokenParsers[TYPE.LOGINACK] = require('./loginack-token-parser');
-tokenParsers[TYPE.ORDER] = require('./order-token-parser');
-tokenParsers[TYPE.RETURNSTATUS] = require('./returnstatus-token-parser');
-tokenParsers[TYPE.RETURNVALUE] = require('./returnvalue-token-parser');
-tokenParsers[TYPE.ROW] = require('./row-token-parser');
-tokenParsers[TYPE.NBCROW] = require('./nbcrow-token-parser');
-tokenParsers[TYPE.SSPI] = require('./sspi-token-parser');
-module.exports = class Parser extends Transform {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _jsbi = _interopRequireDefault(require("jsbi"));
+
+var _readableStream = require("readable-stream");
+
+var _token = require("./token");
+
+var _colmetadataTokenParser = _interopRequireDefault(require("./colmetadata-token-parser"));
+
+var _doneTokenParser = require("./done-token-parser");
+
+var _envChangeTokenParser = _interopRequireDefault(require("./env-change-token-parser"));
+
+var _infoerrorTokenParser = require("./infoerror-token-parser");
+
+var _fedauthInfoParser = _interopRequireDefault(require("./fedauth-info-parser"));
+
+var _featureExtAckParser = _interopRequireDefault(require("./feature-ext-ack-parser"));
+
+var _loginackTokenParser = _interopRequireDefault(require("./loginack-token-parser"));
+
+var _orderTokenParser = _interopRequireDefault(require("./order-token-parser"));
+
+var _returnstatusTokenParser = _interopRequireDefault(require("./returnstatus-token-parser"));
+
+var _returnvalueTokenParser = _interopRequireDefault(require("./returnvalue-token-parser"));
+
+var _rowTokenParser = _interopRequireDefault(require("./row-token-parser"));
+
+var _nbcrowTokenParser = _interopRequireDefault(require("./nbcrow-token-parser"));
+
+var _sspiTokenParser = _interopRequireDefault(require("./sspi-token-parser"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const tokenParsers = {
+  [_token.TYPE.COLMETADATA]: _colmetadataTokenParser.default,
+  [_token.TYPE.DONE]: _doneTokenParser.doneParser,
+  [_token.TYPE.DONEINPROC]: _doneTokenParser.doneInProcParser,
+  [_token.TYPE.DONEPROC]: _doneTokenParser.doneProcParser,
+  [_token.TYPE.ENVCHANGE]: _envChangeTokenParser.default,
+  [_token.TYPE.ERROR]: _infoerrorTokenParser.errorParser,
+  [_token.TYPE.FEDAUTHINFO]: _fedauthInfoParser.default,
+  [_token.TYPE.FEATUREEXTACK]: _featureExtAckParser.default,
+  [_token.TYPE.INFO]: _infoerrorTokenParser.infoParser,
+  [_token.TYPE.LOGINACK]: _loginackTokenParser.default,
+  [_token.TYPE.ORDER]: _orderTokenParser.default,
+  [_token.TYPE.RETURNSTATUS]: _returnstatusTokenParser.default,
+  [_token.TYPE.RETURNVALUE]: _returnvalueTokenParser.default,
+  [_token.TYPE.ROW]: _rowTokenParser.default,
+  [_token.TYPE.NBCROW]: _nbcrowTokenParser.default,
+  [_token.TYPE.SSPI]: _sspiTokenParser.default
+};
+
+class EndOfMessageMarker {}
+
+class Parser extends _readableStream.Transform {
   constructor(debug, colMetadata, options) {
     super({
       objectMode: true
@@ -29,21 +68,16 @@ module.exports = class Parser extends Transform {
     this.debug = debug;
     this.colMetadata = colMetadata;
     this.options = options;
-    this.endOfMessageMarker = {};
+    this.endOfMessageMarker = new EndOfMessageMarker();
     this.buffer = Buffer.alloc(0);
     this.position = 0;
     this.suspended = false;
     this.next = undefined;
   }
 
-  _transform(input, encoding, done) {
-    if (input === this.endOfMessageMarker) {
-      done(null, {
-        // generate endOfMessage pseudo token
-        name: 'EOM',
-        event: 'endOfMessage'
-      });
-      return;
+  _transform(input, _encoding, done) {
+    if (input instanceof EndOfMessageMarker) {
+      return done(undefined, new _token.EndOfMessageToken());
     }
 
     if (this.position === this.buffer.length) {
@@ -57,7 +91,8 @@ module.exports = class Parser extends Transform {
     if (this.suspended) {
       // Unsuspend and continue from where ever we left off.
       this.suspended = false;
-      this.next.call(null);
+      const next = this.next;
+      next();
     } // If we're no longer suspended, parse new tokens
 
 
@@ -72,9 +107,8 @@ module.exports = class Parser extends Transform {
   parseTokens() {
     const doneParsing = token => {
       if (token) {
-        switch (token.name) {
-          case 'COLMETADATA':
-            this.colMetadata = token.columns;
+        if (token instanceof _token.ColMetadataToken) {
+          this.colMetadata = token.columns;
         }
 
         this.push(token);
@@ -188,6 +222,16 @@ module.exports = class Parser extends Transform {
     });
   }
 
+  readBigInt64LE(callback) {
+    this.awaitData(8, () => {
+      const result = _jsbi.default.add(_jsbi.default.leftShift(_jsbi.default.BigInt(this.buffer[this.position + 4] + this.buffer[this.position + 5] * Math.pow(2, 8) + this.buffer[this.position + 6] * Math.pow(2, 16) + (this.buffer[this.position + 7] << 24) // Overflow
+      ), _jsbi.default.BigInt(32)), _jsbi.default.BigInt(this.buffer[this.position] + this.buffer[this.position + 1] * Math.pow(2, 8) + this.buffer[this.position + 2] * Math.pow(2, 16) + this.buffer[this.position + 3] * Math.pow(2, 24)));
+
+      this.position += 8;
+      callback(result);
+    });
+  }
+
   readInt64LE(callback) {
     this.awaitData(8, () => {
       const data = Math.pow(2, 32) * this.buffer.readInt32LE(this.position + 4) + ((this.buffer[this.position + 4] & 0x80) === 0x80 ? 1 : -1) * this.buffer.readUInt32LE(this.position);
@@ -204,6 +248,17 @@ module.exports = class Parser extends Transform {
     });
   }
 
+  readBigUInt64LE(callback) {
+    this.awaitData(8, () => {
+      const low = _jsbi.default.BigInt(this.buffer.readUInt32LE(this.position));
+
+      const high = _jsbi.default.BigInt(this.buffer.readUInt32LE(this.position + 4));
+
+      this.position += 8;
+      callback(_jsbi.default.add(low, _jsbi.default.leftShift(high, _jsbi.default.BigInt(32))));
+    });
+  }
+
   readUInt64LE(callback) {
     this.awaitData(8, () => {
       const data = Math.pow(2, 32) * this.buffer.readUInt32LE(this.position + 4) + this.buffer.readUInt32LE(this.position);
@@ -341,4 +396,8 @@ module.exports = class Parser extends Transform {
     });
   }
 
-};
+}
+
+var _default = Parser;
+exports.default = _default;
+module.exports = Parser;