Merge branch 'master' into fix-config-validation-when-using-connector…

…-factory-method

src/always-encrypted/aead-aes-256-cbc-hmac-algorithm.ts

@@ -1,7 +1,7 @@
 // This code is based on the `mssql-jdbc` library published under the conditions of MIT license.
 // Copyright (c) 2019 Microsoft Corporation
 
-import { EncryptionAlgorithm, SQLServerEncryptionType } from './types';
+import { type EncryptionAlgorithm, SQLServerEncryptionType } from './types';
 import { createHmac, randomBytes, createCipheriv, createDecipheriv } from 'crypto';
 import { AeadAes256CbcHmac256EncryptionKey, keySize } from './aead-aes-256-cbc-hmac-encryption-key';
 

src/always-encrypted/cek-entry.ts

@@ -1,7 +1,7 @@
 // This code is based on the `mssql-jdbc` library published under the conditions of MIT license.
 // Copyright (c) 2019 Microsoft Corporation
 
-import { EncryptionKeyInfo } from './types';
+import { type EncryptionKeyInfo } from './types';
 
 export class CEKEntry {
   columnEncryptionKeyValues: EncryptionKeyInfo[];

src/always-encrypted/get-parameter-encryption-metadata.ts

@@ -1,10 +1,10 @@
 // This code is based on the `mssql-jdbc` library published under the conditions of MIT license.
 // Copyright (c) 2019 Microsoft Corporation
 
-import { SQLServerEncryptionType, CryptoMetadata, DescribeParameterEncryptionResultSet1, DescribeParameterEncryptionResultSet2 } from './types';
+import { SQLServerEncryptionType, type CryptoMetadata, DescribeParameterEncryptionResultSet1, DescribeParameterEncryptionResultSet2 } from './types';
 import { CEKEntry } from './cek-entry';
 import { decryptSymmetricKey } from './key-crypto';
-import { typeByName as TYPES, Parameter } from '../data-type';
+import { typeByName as TYPES, type Parameter } from '../data-type';
 import Request from '../request';
 import Connection from '../connection';
 import RpcRequestPayload from '../rpcrequest-payload';

src/always-encrypted/key-crypto.ts

@@ -1,8 +1,8 @@
 // This code is based on the `mssql-jdbc` library published under the conditions of MIT license.
 // Copyright (c) 2019 Microsoft Corporation
 
-import { CryptoMetadata, EncryptionKeyInfo } from './types';
-import { InternalConnectionOptions as ConnectionOptions } from '../connection';
+import { type CryptoMetadata, type EncryptionKeyInfo } from './types';
+import { type InternalConnectionOptions as ConnectionOptions } from '../connection';
 import SymmetricKey from './symmetric-key';
 import { getKey } from './symmetric-key-cache';
 import { AeadAes256CbcHmac256Algorithm, algorithmName } from './aead-aes-256-cbc-hmac-algorithm';

src/always-encrypted/keystore-provider-azure-key-vault.ts

@@ -2,7 +2,7 @@
 // Copyright (c) 2019 Microsoft Corporation
 
 import { ClientSecretCredential } from '@azure/identity';
-import { CryptographyClient, KeyWrapAlgorithm, KeyClient, KeyVaultKey } from '@azure/keyvault-keys';
+import { CryptographyClient, type KeyWrapAlgorithm, KeyClient, type KeyVaultKey } from '@azure/keyvault-keys';
 import { createHash } from 'crypto';
 import { parse } from 'url';
 

src/always-encrypted/symmetric-key-cache.ts

@@ -1,9 +1,9 @@
 // This code is based on the `mssql-jdbc` library published under the conditions of MIT license.
 // Copyright (c) 2019 Microsoft Corporation
 
-import { EncryptionKeyInfo } from './types';
+import { type EncryptionKeyInfo } from './types';
 import SymmetricKey from './symmetric-key';
-import { InternalConnectionOptions as ConnectionOptions } from '../connection';
+import { type InternalConnectionOptions as ConnectionOptions } from '../connection';
 import LRU from 'lru-cache';
 
 const cache = new LRU<string, SymmetricKey>(0);

src/always-encrypted/types.ts

@@ -2,7 +2,7 @@
 // Copyright (c) 2019 Microsoft Corporation
 
 import { CEKEntry } from './cek-entry';
-import { BaseMetadata } from '../metadata-parser';
+import { type BaseMetadata } from '../metadata-parser';
 
 export interface EncryptionKeyInfo {
   encryptedKey: Buffer;

src/bulk-load.ts

@@ -1,11 +1,11 @@
 import { EventEmitter } from 'events';
 import WritableTrackingBuffer from './tracking-buffer/writable-tracking-buffer';
-import Connection, { InternalConnectionOptions } from './connection';
+import Connection, { type InternalConnectionOptions } from './connection';
 
 import { Transform } from 'stream';
 import { TYPE as TOKEN_TYPE } from './token/token';
 
-import { DataType, Parameter } from './data-type';
+import { type DataType, type Parameter } from './data-type';
 import { Collation } from './collation';
 
 /**

src/connection.ts

@@ -5,7 +5,7 @@ import * as net from 'net';
 import dns from 'dns';
 
 import constants from 'constants';
-import { SecureContextOptions } from 'tls';
+import { type SecureContextOptions } from 'tls';
 
 import { Readable } from 'stream';
 
@@ -16,7 +16,7 @@ import {
   UsernamePasswordCredential,
 } from '@azure/identity';
 
-import BulkLoad, { Options as BulkLoadOptions, Callback as BulkLoadCallback } from './bulk-load';
+import BulkLoad, { type Options as BulkLoadOptions, type Callback as BulkLoadCallback } from './bulk-load';
 import Debug from './debug';
 import { EventEmitter, once } from 'events';
 import { instanceLookup } from './instance-lookup';
@@ -36,12 +36,12 @@ import { connectInParallel, connectInSequence } from './connector';
 import { name as libraryName } from './library';
 import { versions } from './tds-versions';
 import Message from './message';
-import { Metadata } from './metadata-parser';
+import { type Metadata } from './metadata-parser';
 import { createNTLMRequest } from './ntlm';
 import { ColumnEncryptionAzureKeyVaultProvider } from './always-encrypted/keystore-provider-azure-key-vault';
 
 import { AbortController, AbortSignal } from 'node-abort-controller';
-import { Parameter, TYPES } from './data-type';
+import { type Parameter, TYPES } from './data-type';
 import { BulkLoadPayload } from './bulk-load-payload';
 import { Collation } from './collation';
 import Procedures from './special-stored-procedure';

src/connector.ts

@@ -1,5 +1,5 @@
 import net from 'net';
-import dns, { LookupAddress } from 'dns';
+import dns, { type LookupAddress } from 'dns';
 
 import * as punycode from 'punycode';
 import { AbortSignal } from 'node-abort-controller';

src/data-type.ts

@@ -37,9 +37,9 @@ import DateTimeOffset from './data-types/datetimeoffset';
 import UDT from './data-types/udt';
 import TVP from './data-types/tvp';
 import Variant from './data-types/sql-variant';
-import { CryptoMetadata } from './always-encrypted/types';
+import { type CryptoMetadata } from './always-encrypted/types';
 
-import { InternalConnectionOptions } from './connection';
+import { type InternalConnectionOptions } from './connection';
 import { Collation } from './collation';
 
 export interface Parameter {

src/data-types/bigint.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import IntN from './intn';
 import WritableTrackingBuffer from '../tracking-buffer/writable-tracking-buffer';
 

src/data-types/binary.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const NULL_LENGTH = Buffer.from([0xFF, 0xFF]);
 

src/data-types/bit.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import BitN from './bitn';
 
 const DATA_LENGTH = Buffer.from([0x01]);

src/data-types/bitn.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const BitN: DataType = {
   id: 0x68,

src/data-types/char.ts

@@ -1,5 +1,5 @@
 import iconv from 'iconv-lite';
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const NULL_LENGTH = Buffer.from([0xFF, 0xFF]);
 

src/data-types/date.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import { ChronoUnit, LocalDate } from '@js-joda/core';
 
 // globalDate is to be used for JavaScript's global 'Date' object to avoid name clashing with the 'Date' constant below

src/data-types/datetime.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import DateTimeN from './datetimen';
 import { ChronoUnit, LocalDate } from '@js-joda/core';
 

src/data-types/datetime2.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import { ChronoUnit, LocalDate } from '@js-joda/core';
 import WritableTrackingBuffer from '../tracking-buffer/writable-tracking-buffer';
 

src/data-types/datetimen.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const DateTimeN: DataType = {
   id: 0x6F,

src/data-types/datetimeoffset.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import { ChronoUnit, LocalDate } from '@js-joda/core';
 import WritableTrackingBuffer from '../tracking-buffer/writable-tracking-buffer';
 

src/data-types/decimal.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import DecimalN from './decimaln';
 import WritableTrackingBuffer from '../tracking-buffer/writable-tracking-buffer';
 

src/data-types/decimaln.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const DecimalN: DataType = {
   id: 0x6A,

src/data-types/float.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import FloatN from './floatn';
 
 const NULL_LENGTH = Buffer.from([0x00]);

src/data-types/floatn.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const FloatN: DataType = {
   id: 0x6D,

src/data-types/image.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const NULL_LENGTH = Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]);
 

src/data-types/int.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import IntN from './intn';
 
 const NULL_LENGTH = Buffer.from([0x00]);

src/data-types/intn.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const IntN: DataType = {
   id: 0x26,

src/data-types/money.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import MoneyN from './moneyn';
 
 const SHIFT_LEFT_32 = (1 << 16) * (1 << 16);

src/data-types/moneyn.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const MoneyN: DataType = {
   id: 0x6E,

src/data-types/nchar.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const NULL_LENGTH = Buffer.from([0xFF, 0xFF]);
 

src/data-types/ntext.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const NULL_LENGTH = Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]);
 

src/data-types/null.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const Null: DataType = {
   id: 0x1F,

src/data-types/numeric.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import NumericN from './numericn';
 import WritableTrackingBuffer from '../tracking-buffer/writable-tracking-buffer';
 

src/data-types/numericn.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const NumericN: DataType = {
   id: 0x6C,

src/data-types/nvarchar.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const MAX = (1 << 16) - 1;
 const UNKNOWN_PLP_LEN = Buffer.from([0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);

src/data-types/real.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import FloatN from './floatn';
 
 const NULL_LENGTH = Buffer.from([0x00]);

src/data-types/smalldatetime.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import DateTimeN from './datetimen';
 
 const EPOCH_DATE = new Date(1900, 0, 1);

src/data-types/smallint.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import IntN from './intn';
 
 const DATA_LENGTH = Buffer.from([0x02]);

src/data-types/smallmoney.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import MoneyN from './moneyn';
 
 const DATA_LENGTH = Buffer.from([0x04]);

src/data-types/sql-variant.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const Variant: DataType = {
   id: 0x62,

src/data-types/text.ts

@@ -1,6 +1,6 @@
 import iconv from 'iconv-lite';
 
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const NULL_LENGTH = Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]);
 

src/data-types/time.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import WritableTrackingBuffer from '../tracking-buffer/writable-tracking-buffer';
 
 const NULL_LENGTH = Buffer.from([0x00]);

src/data-types/tinyint.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import IntN from './intn';
 
 const DATA_LENGTH = Buffer.from([0x01]);

src/data-types/tvp.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import WritableTrackingBuffer from '../tracking-buffer/writable-tracking-buffer';
 
 const TVP_ROW_TOKEN = Buffer.from([0x01]);

src/data-types/udt.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const UDT: DataType = {
   id: 0xF0,

src/data-types/uniqueidentifier.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 import { guidToArray } from '../guid-parser';
 
 const NULL_LENGTH = Buffer.from([0x00]);

src/data-types/varbinary.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const MAX = (1 << 16) - 1;
 const UNKNOWN_PLP_LEN = Buffer.from([0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);

src/data-types/varchar.ts

@@ -1,6 +1,6 @@
 import iconv from 'iconv-lite';
 
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const MAX = (1 << 16) - 1;
 const UNKNOWN_PLP_LEN = Buffer.from([0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);

src/data-types/xml.ts

@@ -1,4 +1,4 @@
-import { DataType } from '../data-type';
+import { type DataType } from '../data-type';
 
 const XML: DataType = {
   id: 0xF1,

src/metadata-parser.ts

@@ -1,7 +1,7 @@
 import { Collation } from './collation';
-import Parser, { ParserOptions } from './token/stream-parser';
-import { TYPE, DataType } from './data-type';
-import { CryptoMetadata } from './always-encrypted/types';
+import Parser, { type ParserOptions } from './token/stream-parser';
+import { TYPE, type DataType } from './data-type';
+import { type CryptoMetadata } from './always-encrypted/types';
 
 import { sprintf } from 'sprintf-js';