TypeScript improvements and tslib dep (#2808)

Resolves "Module not found: Can't resolve 'tslib' in '...@aspnet\signalr\dist\esm'"

Author: BrennanConroy

.vscode/launch.json

@@ -1,6 +1,7 @@
 {
     "version": "0.2.0",
     "configurations": [
+
         {
             "type": "node",
             "request": "launch",
@@ -17,6 +18,18 @@
             "address": "localhost",
             "port": 5858,
             "outFiles": []
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Jest - Current File",
+            "program": "${workspaceFolder}/clients/ts/common/node_modules/jest/bin/jest",
+            "cwd": "${workspaceFolder}/clients/ts",
+            "args": [
+                "${relativeFile}"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
         }
     ]
 }

build/repo.targets

@@ -15,7 +15,7 @@
   </PropertyGroup>
   <Target Name="RestoreNpm" Condition="'$(PreflightRestore)' != 'True'">
     <Message Text="Restoring NPM modules" Importance="high" />
-    <Exec Command="npm install --no-optional" WorkingDirectory="$(RepositoryRoot)clients/ts" />
+    <Exec Command="npm install --no-optional" WorkingDirectory="$(RepositoryRoot)clients/ts/common" />
     <Exec Command="npm install --no-optional" WorkingDirectory="$(RepositoryRoot)clients/ts/FunctionalTests" />
     <Exec Command="npm install --no-optional" WorkingDirectory="$(RepositoryRoot)clients/ts/signalr" />
     <Exec Command="npm install --no-optional" WorkingDirectory="$(RepositoryRoot)clients/ts/signalr-protocol-msgpack" />

clients/ts/FunctionalTests/package-lock.json

@@ -17,13 +17,14 @@
     "jasmine": "^3.1.0",
     "tap-parser": "^7.0.0",
     "tee": "^0.2.0",
-    "ts-node": "^4.1.0"
+    "ts-node": "^4.1.0",
+    "typescript": "^3.0.1"
   },
   "scripts": {
-    "clean": "node ../node_modules/rimraf/bin.js ./wwwroot/dist ./obj/js",
+    "clean": "node ../common/node_modules/rimraf/bin.js ./wwwroot/dist ./obj/js",
     "build": "npm run clean && npm run build:lint && npm run build:webpack",
-    "build:lint": "node ../node_modules/tslint/bin/tslint -c ../tslint.json -p ./tsconfig.json",
-    "build:webpack": "node ../node_modules/webpack-cli/bin/cli.js",
+    "build:lint": "node ../common/node_modules/tslint/bin/tslint -c ../tslint.json -p ./tsconfig.json",
+    "build:webpack": "node ../common/node_modules/webpack-cli/bin/cli.js",
     "pretest": "npm run build",
     "test": "dotnet build && npm run test-only",
     "test-only": "ts-node --project ./selenium/tsconfig-selenium.json ./selenium/run-tests.ts",

clients/ts/FunctionalTests/package.json

@@ -1,7 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-import { HttpTransportType, IHttpConnectionOptions, LogLevel, TransferFormat } from "@aspnet/signalr";
+// This code uses a lot of `.then` instead of `await` and TSLint doesn't like it.
+// tslint:disable:no-floating-promises
+
+import { HttpTransportType, IHttpConnectionOptions, TransferFormat } from "@aspnet/signalr";
 import { eachTransport, ECHOENDPOINT_URL } from "./Common";
 import { TestLogger } from "./TestLogger";
 
@@ -23,15 +26,13 @@ describe("connection", () => {
             ...commonOptions,
         });
 
-        let received = "";
-        connection.onreceive = (data) => {
-            received += data;
+        connection.onreceive = async (data: any) => {
             if (data === message) {
                 connection.stop();
             }
         };
 
-        connection.onclose = (error) => {
+        connection.onclose = (error: any) => {
             expect(error).toBeUndefined();
             done();
         };
@@ -55,22 +56,20 @@ describe("connection", () => {
                     transport: transportType,
                 });
 
-                let received = "";
-                connection.onreceive = (data) => {
-                    received += data;
+                connection.onreceive = (data: any) => {
                     if (data === message) {
                         connection.stop();
                     }
                 };
 
-                connection.onclose = (error) => {
+                connection.onclose = (error: any) => {
                     expect(error).toBeUndefined();
                     done();
                 };
 
                 connection.start(TransferFormat.Text).then(() => {
                     connection.send(message);
-                }).catch((e) => {
+                }).catch((e: any) => {
                     fail(e);
                     done();
                 });
@@ -85,15 +84,17 @@ describe("connection", () => {
                     transport: transportType,
                 });
 
-                connection.onreceive = (data) => {
+                connection.onreceive = (data: any) => {
                     if (data === message) {
                         connection.stop();
                     }
                 };
 
+                // @ts-ignore: We don't use the error parameter intentionally.
                 connection.onclose = (error) => {
                     // Search the logs for the message content
                     expect(TestLogger.instance.currentLog.messages.length).toBeGreaterThan(0);
+                    // @ts-ignore: We don't use the _ or __ parameters intentionally.
                     for (const [_, __, logMessage] of TestLogger.instance.currentLog.messages) {
                         expect(logMessage).not.toContain(message);
                     }
@@ -118,16 +119,18 @@ describe("connection", () => {
                     transport: transportType,
                 });
 
-                connection.onreceive = (data) => {
+                connection.onreceive = (data: any) => {
                     if (data === message) {
                         connection.stop();
                     }
                 };
 
+                // @ts-ignore: We don't use the error parameter intentionally.
                 connection.onclose = (error) => {
                     // Search the logs for the message content
                     let matches = 0;
                     expect(TestLogger.instance.currentLog.messages.length).toBeGreaterThan(0);
+                    // @ts-ignore: We don't use the _ or __ parameters intentionally.
                     for (const [_, __, logMessage] of TestLogger.instance.currentLog.messages) {
                         if (logMessage.indexOf(message) !== -1) {
                             matches += 1;
@@ -141,7 +144,7 @@ describe("connection", () => {
 
                 connection.start(TransferFormat.Text).then(() => {
                     connection.send(message);
-                }).catch((e) => {
+                }).catch((e: any) => {
                     fail(e);
                     done();
                 });

clients/ts/FunctionalTests/ts/ConnectionTests.ts

@@ -1,7 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-import { DefaultHttpClient, HttpClient, HttpRequest, HttpResponse, HttpTransportType, HubConnection, HubConnectionBuilder, IHttpConnectionOptions, IStreamSubscriber, JsonHubProtocol, LogLevel } from "@aspnet/signalr";
+// This code uses a lot of `.then` instead of `await` and TSLint doesn't like it.
+// tslint:disable:no-floating-promises
+
+import { DefaultHttpClient, HttpClient, HttpRequest, HttpResponse, HttpTransportType, HubConnectionBuilder, IHttpConnectionOptions, JsonHubProtocol } from "@aspnet/signalr";
 import { MessagePackHubProtocol } from "@aspnet/signalr-protocol-msgpack";
 
 import { eachTransport, eachTransportAndProtocol } from "./Common";
@@ -221,7 +224,7 @@ describe("hubConnection", () => {
                             hubConnection.stop();
                             done();
                         },
-                        next(item) {
+                        next() {
                             hubConnection.stop();
                             fail();
                         },
@@ -248,7 +251,7 @@ describe("hubConnection", () => {
                             hubConnection.stop();
                             done();
                         },
-                        next(item) {
+                        next() {
                             hubConnection.stop();
                             fail();
                         },

clients/ts/FunctionalTests/ts/HubConnectionTests.ts

@@ -39,6 +39,7 @@ class WebDriverReporter implements jasmine.CustomReporter {
         this.taplog(`1..${suiteInfo.totalSpecsDefined}`);
     }
 
+    // @ts-ignore: We don't use the result parameter
     public specStarted(result: jasmine.CustomReporterResult): void {
         this.concurrentSpecCount += 1;
         if (this.concurrentSpecCount > 1) {
@@ -90,6 +91,7 @@ class WebDriverReporter implements jasmine.CustomReporter {
         this.specCounter += 1;
     }
 
+    // @ts-ignore: We don't use the result parameter
     public jasmineDone(runDetails: jasmine.RunDetails): void {
         this.element.setAttribute("data-done", "1");
     }

clients/ts/FunctionalTests/ts/WebDriverReporter.ts

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 const path = require("path");
-const webpack = require("webpack");
+const webpack = require("../common/node_modules/webpack");
 
 module.exports = {
     entry: path.resolve(__dirname, "ts", "index.ts"),
@@ -24,6 +24,10 @@ module.exports = {
             }
         ]
     },
+    resolveLoader: {
+        // Special resolution rules for loaders (which are in the 'common' directory)
+        modules: [ path.resolve(__dirname, "..", "common", "node_modules") ],
+    },
     resolve: {
         extensions: [".ts", ".js"]
     },