Merge pull request #974 from IanChokS/more-ts

More Conversion
tediousjs · Sep 30, 2019 · c4511cd · c4511cd
2 parents c5eae51 + c119f18
commit c4511cd
Show file tree

Hide file tree

Showing 37 changed files with 169 additions and 101 deletions.
diff --git a/src/bulk-load.ts b/src/bulk-load.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import WritableTrackingBuffer from './tracking-buffer/writable-tracking-buffer';
-import { ConnectionOptions } from './connection';
+import { InternalConnectionOptions } from './connection';
 
 const Transform = require('readable-stream').Transform;
 const TOKEN_TYPE = require('./token/token').TYPE;
@@ -69,7 +69,7 @@ class BulkLoad extends EventEmitter {
   table: string;
   timeout?: number
 
-  options: ConnectionOptions;
+  options: InternalConnectionOptions;
   callback: (err: Error | undefined | null, rowCount: number) => void;
 
   columns: Array<Column>;
@@ -80,7 +80,7 @@ class BulkLoad extends EventEmitter {
 
   bulkOptions: InternalOptions;
 
-  constructor(table: string, connectionOptions: ConnectionOptions, {
+  constructor(table: string, connectionOptions: InternalConnectionOptions, {
     checkConstraints = false,
     fireTriggers = false,
     keepNulls = false,

diff --git a/src/connection.d.ts b/src/connection.d.ts
@@ -2,12 +2,12 @@ import Request from './request';
 import BulkLoad from './bulk-load';
 import { Metadata } from './metadata-parser';
 
-export type ConnectionOptions = {
-  tdsVersion: string,
+export type InternalConnectionOptions = {
   camelCaseColumns: boolean,
+  columnNameReplacer?: (colName: string, index: number, metadata: Metadata) => string,
+  tdsVersion: string,
   useColumnNames: boolean,
   useUTC: boolean,
-  columnNameReplacer?: (colName: string, index: number, metadata: Metadata) => string
 };
 
 declare class Connection {

diff --git a/src/data-type.ts b/src/data-type.ts
@@ -37,7 +37,7 @@ const DateTimeOffset = require('./data-types/datetimeoffset');
 const UDT = require('./data-types/udt');
 const TVP = require('./data-types/tvp');
 const Variant = require('./data-types/sql-variant');
-import { ConnectionOptions } from './connection';
+import { InternalConnectionOptions } from './connection';
 
 export type Parameter = {
   type: DataType,
@@ -67,11 +67,11 @@ export interface DataType {
   name: string,
 
   declaration(parameter: Parameter) : string,
-  writeTypeInfo(buf: any, data: ParameterData, options: ConnectionOptions) : void,
-  writeParameterData(buf: any, data: ParameterData, options: ConnectionOptions, callback: () => void) : void,
+  writeTypeInfo(buf: any, data: ParameterData, options: InternalConnectionOptions) : void,
+  writeParameterData(buf: any, data: ParameterData, options: InternalConnectionOptions, callback: () => void) : void,
   validate(value: any) : any, // TODO: Refactor 'any' and replace with more specific type.
 
-  dataLengthFromScale?: (scale: number) => number,
+  dataLengthFromScale?: (scale: number) => (number | undefined),
   fixedDataLength?: number,
   dataLengthLength?: number,
 

diff --git a/src/data-types/bit.ts b/src/data-types/bit.ts
@@ -1,4 +1,4 @@
-import { DataType, ParameterData } from '../data-type';
+import { DataType } from '../data-type';
 const BitN = require('./bitn');
 
 const Bit: DataType = {
@@ -15,7 +15,7 @@ const Bit: DataType = {
     buffer.writeUInt8(1);
   },
 
-  writeParameterData: function(buffer, parameter: ParameterData<any>, options, cb) {
+  writeParameterData: function(buffer, parameter, options, cb) {
     if (typeof parameter.value === 'undefined' || parameter.value === null) {
       buffer.writeUInt8(0);
     } else {

diff --git a/src/data-types/date.ts b/src/data-types/date.ts
@@ -1,4 +1,4 @@
-import { DataType, ParameterData } from '../data-type';
+import { DataType } from '../data-type';
 
 // globalDate is to be used for JavaScript's global 'Date' object to avoid name clashing with the 'Date' constant below
 const globalDate = global.Date;
@@ -21,7 +21,7 @@ const Date : DataType = {
   },
 
   // ParameterData<any> is temporary solution. TODO: need to understand what type ParameterData<...> can be.
-  writeParameterData: function(buffer, parameter: ParameterData<any>, options, cb) {
+  writeParameterData: function(buffer, parameter, options, cb) {
     if (parameter.value != null) {
       buffer.writeUInt8(3);
       if (options.useUTC) {

diff --git a/src/data-types/datetime.js → src/data-types/datetime.ts b/src/data-types/datetime.js → src/data-types/datetime.ts
@@ -1,9 +1,11 @@
+import { DataType } from '../data-type';
+
 const DateTimeN = require('./datetimen');
 
 const EPOCH_DATE = new Date(1900, 0, 1);
 const UTC_EPOCH_DATE = new Date(Date.UTC(1900, 0, 1));
 
-module.exports = {
+const DateTime: DataType = {
   id: 0x3D,
   type: 'DATETIME',
   name: 'DateTime',
@@ -16,7 +18,7 @@ module.exports = {
     buffer.writeUInt8(DateTimeN.id);
     buffer.writeUInt8(8);
   },
-
+  // ParameterData<any> is temporary solution. TODO: need to understand what type ParameterData<...> can be.
   writeParameterData: function(buffer, parameter, options, cb) {
     if (parameter.value != null) {
       let days, dstDiff, milliseconds, seconds, threeHundredthsOfSecond;
@@ -48,7 +50,8 @@ module.exports = {
     cb();
   },
 
-  validate: function(value) {
+  // TODO: type 'any' needs to be revisited.
+  validate: function(value): null | TypeError | Buffer {
     if (value == null) {
       return null;
     }
@@ -61,3 +64,6 @@ module.exports = {
     return value;
   }
 };
+
+export default DateTime;
+module.exports = DateTime;
diff --git a/src/data-types/datetime2.js → src/data-types/datetime2.ts b/src/data-types/datetime2.js → src/data-types/datetime2.ts
@@ -1,7 +1,9 @@
+import { DataType } from '../data-type';
+
 const YEAR_ONE = new Date(2000, 0, -730118);
 const UTC_YEAR_ONE = Date.UTC(2000, 0, -730118);
 
-module.exports = {
+const DateTime2: DataType & { resolveScale: NonNullable<DataType['resolveScale']> } = {
   id: 0x2A,
   type: 'DATETIME2N',
   name: 'DateTime2',
@@ -53,9 +55,8 @@ module.exports = {
       } else {
         timestamp = ((time.getHours() * 60 + time.getMinutes()) * 60 + time.getSeconds()) * 1000 + time.getMilliseconds();
       }
-
-      timestamp = timestamp * Math.pow(10, parameter.scale - 3);
-      timestamp += (parameter.value.nanosecondDelta != null ? parameter.value.nanosecondDelta : 0) * Math.pow(10, parameter.scale);
+      timestamp = timestamp * Math.pow(10, parameter.scale! - 3);
+      timestamp += (parameter.value.nanosecondDelta != null ? parameter.value.nanosecondDelta : 0) * Math.pow(10, parameter.scale!);
       timestamp = Math.round(timestamp);
 
       switch (parameter.scale) {
@@ -80,7 +81,7 @@ module.exports = {
         buffer.writeUInt24LE(Math.floor((+parameter.value - UTC_YEAR_ONE) / 86400000));
       } else {
         const dstDiff = -(parameter.value.getTimezoneOffset() - YEAR_ONE.getTimezoneOffset()) * 60 * 1000;
-        buffer.writeUInt24LE(Math.floor((+parameter.value - YEAR_ONE + dstDiff) / 86400000));
+        buffer.writeUInt24LE(Math.floor((+parameter.value - +YEAR_ONE + dstDiff) / 86400000));
       }
     } else {
       buffer.writeUInt8(0);
@@ -101,3 +102,6 @@ module.exports = {
     return value;
   }
 };
+
+export default DateTime2;
+module.exports = DateTime2;
diff --git a/src/data-types/datetimen.js → src/data-types/datetimen.ts b/src/data-types/datetimen.js → src/data-types/datetimen.ts
@@ -1,6 +1,9 @@
-module.exports = {
+const DateTimeN = {
   id: 0x6F,
   type: 'DATETIMN',
   name: 'DateTimeN',
   dataLengthLength: 1
 };
+
+export default DateTimeN;
+module.exports = DateTimeN;
diff --git a/src/data-types/datetimeoffset.js → src/data-types/datetimeoffset.ts b/src/data-types/datetimeoffset.js → src/data-types/datetimeoffset.ts
@@ -1,6 +1,8 @@
+import { DataType } from '../data-type';
+
 const UTC_YEAR_ONE = Date.UTC(2000, 0, -730118);
 
-module.exports = {
+const DateTimeOffset: DataType & { resolveScale: NonNullable<DataType['resolveScale']> } = {
   id: 0x2B,
   type: 'DATETIMEOFFSETN',
   name: 'DateTimeOffset',
@@ -44,8 +46,9 @@ module.exports = {
       time.setUTCMonth(0);
       time.setUTCDate(1);
 
-      let timestamp = time * Math.pow(10, parameter.scale - 3);
-      timestamp += (parameter.value.nanosecondDelta != null ? parameter.value.nanosecondDelta : 0) * Math.pow(10, parameter.scale);
+      let timestamp;
+      timestamp = +time * Math.pow(10, parameter.scale! - 3);
+      timestamp += (parameter.value.nanosecondDelta != null ? parameter.value.nanosecondDelta : 0) * Math.pow(10, parameter.scale!);
       timestamp = Math.round(timestamp);
 
       const offset = -parameter.value.getTimezoneOffset();
@@ -87,3 +90,6 @@ module.exports = {
     return value;
   }
 };
+
+export default DateTimeOffset;
+module.exports = DateTimeOffset;
diff --git a/src/data-types/decimal.js → src/data-types/decimal.ts b/src/data-types/decimal.js → src/data-types/decimal.ts
@@ -1,6 +1,8 @@
+import { DataType } from '../data-type';
+
 const DecimalN = require('./decimaln');
 
-module.exports = {
+const Decimal: DataType & { resolvePrecision: NonNullable<DataType['resolvePrecision']>, resolveScale: NonNullable<DataType['resolveScale']> } = {
   id: 0x37,
   type: 'DECIMAL',
   name: 'Decimal',
@@ -31,11 +33,11 @@ module.exports = {
 
   writeTypeInfo: function(buffer, parameter) {
     buffer.writeUInt8(DecimalN.id);
-    if (parameter.precision <= 9) {
+    if (parameter.precision! <= 9) {
       buffer.writeUInt8(5);
-    } else if (parameter.precision <= 19) {
+    } else if (parameter.precision! <= 19) {
       buffer.writeUInt8(9);
-    } else if (parameter.precision <= 28) {
+    } else if (parameter.precision! <= 28) {
       buffer.writeUInt8(13);
     } else {
       buffer.writeUInt8(17);
@@ -47,16 +49,16 @@ module.exports = {
   writeParameterData: function(buffer, parameter, options, cb) {
     if (parameter.value != null) {
       const sign = parameter.value < 0 ? 0 : 1;
-      const value = Math.round(Math.abs(parameter.value * Math.pow(10, parameter.scale)));
-      if (parameter.precision <= 9) {
+      const value = Math.round(Math.abs(parameter.value * Math.pow(10, parameter.scale!)));
+      if (parameter.precision! <= 9) {
         buffer.writeUInt8(5);
         buffer.writeUInt8(sign);
         buffer.writeUInt32LE(value);
-      } else if (parameter.precision <= 19) {
+      } else if (parameter.precision! <= 19) {
         buffer.writeUInt8(9);
         buffer.writeUInt8(sign);
         buffer.writeUInt64LE(value);
-      } else if (parameter.precision <= 28) {
+      } else if (parameter.precision! <= 28) {
         buffer.writeUInt8(13);
         buffer.writeUInt8(sign);
         buffer.writeUInt64LE(value);
@@ -74,7 +76,7 @@ module.exports = {
     cb();
   },
 
-  validate: function(value) {
+  validate: function(value): null | TypeError | Buffer {
     if (value == null) {
       return null;
     }
@@ -85,3 +87,6 @@ module.exports = {
     return value;
   }
 };
+
+export default Decimal;
+module.exports = Decimal;
diff --git a/src/data-types/decimaln.js → src/data-types/decimaln.ts b/src/data-types/decimaln.js → src/data-types/decimaln.ts
@@ -1,8 +1,11 @@
-module.exports = {
+const DecimalN = {
   id: 0x6A,
   type: 'DECIMALN',
   name: 'DecimalN',
   dataLengthLength: 1,
   hasPrecision: true,
   hasScale: true
 };
+
+export default DecimalN;
+module.exports = DecimalN;
diff --git a/src/data-types/float.js → src/data-types/float.ts b/src/data-types/float.js → src/data-types/float.ts
@@ -1,6 +1,8 @@
+import { DataType } from '../data-type';
+
 const FloatN = require('./floatn');
 
-module.exports = {
+const Float: DataType = {
   id: 0x3E,
   type: 'FLT8',
   name: 'Float',
@@ -24,7 +26,7 @@ module.exports = {
     cb();
   },
 
-  validate: function(value) {
+  validate: function(value): null | TypeError | Buffer {
     if (value == null) {
       return null;
     }
@@ -35,3 +37,6 @@ module.exports = {
     return value;
   }
 };
+
+export default Float;
+module.exports = Float;
diff --git a/src/data-types/floatn.js → src/data-types/floatn.ts b/src/data-types/floatn.js → src/data-types/floatn.ts
@@ -1,6 +1,9 @@
-module.exports = {
+const FloatN = {
   id: 0x6D,
   type: 'FLTN',
   name: 'FloatN',
   dataLengthLength: 1
 };
+
+export default FloatN;
+module.exports = FloatN;
diff --git a/src/data-types/image.js → src/data-types/image.ts b/src/data-types/image.js → src/data-types/image.ts
@@ -1,4 +1,6 @@
-module.exports = {
+import { DataType } from '../data-type';
+
+const Image: DataType & { hasTextPointerAndTimestamp: boolean } = {
   id: 0x22,
   type: 'IMAGE',
   name: 'Image',
@@ -12,7 +14,8 @@ module.exports = {
 
   resolveLength: function(parameter) {
     if (parameter.value != null) {
-      return parameter.value.length;
+      const value = parameter.value as any; // TODO: Temporary solution. Replace 'any' more with specific type;
+      return value.length;
     } else {
       return -1;
     }
@@ -33,7 +36,7 @@ module.exports = {
     cb();
   },
 
-  validate: function(value) {
+  validate: function(value): null | TypeError | Buffer {
     if (value == null) {
       return null;
     }
@@ -43,3 +46,6 @@ module.exports = {
     return value;
   }
 };
+
+export default Image;
+module.exports = Image;
diff --git a/src/data-types/int.js → src/data-types/int.ts b/src/data-types/int.js → src/data-types/int.ts
@@ -1,6 +1,8 @@
+import { DataType } from '../data-type';
+
 const IntN = require('./intn');
 
-module.exports = {
+const Int: DataType = {
   id: 0x38,
   type: 'INT4',
   name: 'Int',
@@ -24,7 +26,7 @@ module.exports = {
     cb();
   },
 
-  validate: function(value) {
+  validate: function(value): null | TypeError | Buffer {
     if (value == null) {
       return null;
     }
@@ -38,3 +40,6 @@ module.exports = {
     return value;
   }
 };
+
+export default Int;
+module.exports = Int;
diff --git a/src/data-types/intn.js → src/data-types/intn.ts b/src/data-types/intn.js → src/data-types/intn.ts
@@ -1,6 +1,9 @@
-module.exports = {
+const IntN = {
   id: 0x26,
   type: 'INTN',
   name: 'IntN',
   dataLengthLength: 1
 };
+
+export default IntN;
+module.exports = IntN;