Migrate to grunt build

.gitignore

@@ -161,3 +161,10 @@ $RECYCLE.BIN/
 
 # Visual studio 2015 user specific files
 JavaScript/.vs
+
+# Temp directories
+bundle/
+node_modules/
+
+# Grunt
+.tscache

.npmignore

@@ -8,6 +8,6 @@
 !/bower.json
 !/README.md
 !/API-reference.md
-!/JavaScript/JavaScriptSDK.Module/AppInsightsModule.js
+!/bundle/ai.module.*
 !/dist/ai.js
 !/dist/ai.0.js

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    // Use Typescript from node_modules instead of builtin to VSCode
+    "typescript.tsdk": "./node_modules/typescript/lib",
+    "files.exclude": {
+        "**/dist": true,
+        "**/.tscache": true
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,30 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "0.1.0",
+    "command": "grunt",
+    "isShellCommand": true,
+    "showOutput": "always",
+    "tasks": [
+        {
+            "taskName": "default",
+            "args": [],
+            "isBuildCommand": true,
+            "problemMatcher": [
+                "$lessCompile",
+                "$tsc",
+                "$jshint"
+            ]
+        },
+        {
+            "taskName": "module",
+            "args": [],
+            "isBuildCommand": true,
+            "problemMatcher": [
+                "$lessCompile",
+                "$tsc",
+                "$jshint"
+            ]
+        }
+    ]
+}

JavaScript/.baseDir.ts

@@ -0,0 +1 @@
+// Ignore this file. See https://github.com/grunt-ts/grunt-ts/issues/77

JavaScript/JavaScriptSDK.Interfaces/ITelemetryContext.ts

@@ -55,10 +55,13 @@ module Microsoft.ApplicationInsights {
         session: Context.ISession;
 
         /**
-        * Adds telemetry initializer to the collection. Telemetry initializers will be called one by one
-        * before telemetry item is pushed for sending and in the order they were added.
+        * Adds a telemetry initializer to the collection. Telemetry initializers will be called one by one, 
+        * in the order they were added, before the telemetry item is pushed for sending. 
+        * If one of the telemetry initializers returns false or throws an error then the telemetry item will not be sent. 
+        * If it returns true or doesn't return any value the event will be passed to the next telemetry initializer and
+        * send to the cloud (if not rejected by other initializers). 
         */
-        addTelemetryInitializer(telemetryInitializer: (envelope: Microsoft.ApplicationInsights.IEnvelope) => boolean);
+        addTelemetryInitializer(telemetryInitializer: (envelope: Microsoft.ApplicationInsights.IEnvelope) => boolean | void);
 
          /**
          * Tracks telemetry object.

JavaScript/JavaScriptSDK.Interfaces/Telemetry/IEnvelope.ts

@@ -21,4 +21,4 @@ module Microsoft.ApplicationInsights {
         tags: { [name: string]: any };
         data: any;
     }
-}
+}

JavaScript/JavaScriptSDK.Interfaces/Telemetry/ISerializable.ts

@@ -1,14 +1,13 @@
-
-module Microsoft.ApplicationInsights {
+module Microsoft.ApplicationInsights {
 
     "use strict";
 
     export interface ISerializable {
         /**
-         * The set of fields for a serializeable object. 
+         * The set of fields for a serializable object. 
          * This defines the serialization order and a value of true/false
          * for each field defines whether the field is required or not.
          */
         aiDataContract: any;
     }
-}
+}

JavaScript/JavaScriptSDK.Tests/CheckinTests/Context/User.tests.ts

@@ -64,11 +64,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(true, expiration.substr(0, "expires=".length) === "expires=", "ai_user cookie expiration part should start with expires=");
                 var expirationDate = new Date(expiration.substr("expires=".length));
                 Assert.equal(true, expirationDate > (new Date), "ai_user cookie expiration should be in the future");
-
-                // cleanup
-
-
-
             }
         });
 
@@ -102,11 +97,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(true, expiration.substr(0, "expires=".length) === "expires=", "ai_user cookie expiration part should start with expires=");
                 var expirationDate = new Date(expiration.substr("expires=".length));
                 Assert.equal(true, expirationDate > (new Date), "ai_user cookie expiration should be in the future");
-
-                // cleanup
-
-
-
             }
         });
 
@@ -126,7 +116,6 @@ class UserContextTests extends TestClass {
                 // verify
                 Assert.equal(authId, user.authenticatedId, "user auth id was set from cookie");
                 Assert.equal(accountId, user.accountId, "user account id was not set from cookie");
-
             }
         });
 
@@ -142,7 +131,6 @@ class UserContextTests extends TestClass {
 
                 // verify
                 Assert.equal(authId, user.authenticatedId, "user auth id was set from cookie");
-
             }
         });
 
@@ -158,7 +146,6 @@ class UserContextTests extends TestClass {
                 // verify
                 Assert.equal(undefined, user.authenticatedId, "user auth id was not set");
                 Assert.equal(undefined, user.accountId, "user account id was not set");
-
             }
         });
 
@@ -176,7 +163,6 @@ class UserContextTests extends TestClass {
 
                 // verify
                 Assert.equal(config.accountId(), user.accountId, "user account id was set from back compat");
-
             }
         });
 
@@ -194,7 +180,6 @@ class UserContextTests extends TestClass {
                 // verify
                 Assert.equal(authAndAccountId[0], user.authenticatedId, "user auth id was set");
                 Assert.equal(cookieStub.calledWithExactly('ai_authUser', encodeURI(authAndAccountId.join('|')), null), true, "user auth id and account id cookie was set");
-
             }
         });
 
@@ -212,7 +197,6 @@ class UserContextTests extends TestClass {
                 // verify
                 Assert.equal(authAndAccountId[0], user.authenticatedId, "user auth id was set");
                 Assert.equal(cookieStub.calledWithExactly('ai_authUser', encodeURI(authAndAccountId.join('|')), null), true, "user auth id cookie was set");
-
             }
         });
 
@@ -231,7 +215,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(authAndAccountId[0], user.authenticatedId, "user auth id was set");
                 Assert.equal(null, user.accountId, "user account id was not set");
                 Assert.equal(cookieStub.calledWithExactly('ai_authUser', encodeURI(authAndAccountId[0]), null), true, "user auth id cookie was set");
-
             }
         });
 
@@ -243,6 +226,7 @@ class UserContextTests extends TestClass {
                 var user = new Microsoft.ApplicationInsights.Context.User(this.getEmptyConfig());
                 var loggingStub = this.sandbox.stub(Microsoft.ApplicationInsights._InternalLogging, "throwInternal");
                 cookieStub.reset();
+                loggingStub.reset();
 
                 // act
                 user.setAuthenticatedUserContext(null);
@@ -252,8 +236,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(undefined, user.accountId, "user account id was not set");
                 Assert.equal(cookieStub.notCalled, true, "cookie was not set");
                 Assert.equal(loggingStub.calledOnce, true, "Warning was logged");
-
-
             }
         });
 
@@ -264,6 +246,8 @@ class UserContextTests extends TestClass {
                 var cookieStub = this.sandbox.stub(Microsoft.ApplicationInsights.Util, "setCookie");
                 var user = new Microsoft.ApplicationInsights.Context.User(this.getEmptyConfig());
                 var loggingStub = this.sandbox.stub(Microsoft.ApplicationInsights._InternalLogging, "throwInternal");
+                cookieStub.reset();
+                loggingStub.reset();
 
                 // act
                 user.setAuthenticatedUserContext(undefined, undefined);
@@ -273,8 +257,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(undefined, user.accountId, "user account id was not set");
                 Assert.equal(cookieStub.notCalled, true, "cookie was not set");
                 Assert.equal(loggingStub.calledOnce, true, "Warning was logged");
-
-
             }
         });
 
@@ -285,6 +267,8 @@ class UserContextTests extends TestClass {
                 var cookieStub = this.sandbox.stub(Microsoft.ApplicationInsights.Util, "setCookie");
                 var user = new Microsoft.ApplicationInsights.Context.User(this.getEmptyConfig());
                 var loggingStub = this.sandbox.stub(Microsoft.ApplicationInsights._InternalLogging, "throwInternal");
+                cookieStub.reset();
+                loggingStub.reset();
 
                 // act
                 user.setAuthenticatedUserContext(undefined, '1234');
@@ -294,8 +278,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(undefined, user.accountId, "user account id was not set");
                 Assert.equal(cookieStub.notCalled, true, "cookie was not set");
                 Assert.equal(loggingStub.calledOnce, true, "Warning was logged");
-
-
             }
         });
 
@@ -316,8 +298,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(undefined, user.accountId, "user account id was not set");
                 Assert.equal(cookieStub.notCalled, true, "cookie was not set");
                 Assert.equal(loggingStub.calledOnce, true, "Warning was logged");
-
-
             }
         });
 
@@ -339,8 +319,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(undefined, user.accountId, "user account id was not set");
                 Assert.equal(cookieStub.notCalled, true, "cookie was not set");
                 Assert.equal(loggingStub.calledOnce, true, "Warning was logged");
-
-
             }
         });
 
@@ -361,8 +339,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(authAndAccountId[1], user.accountId, "user account id was set");
                 Assert.equal(cookieStub.calledWithExactly('ai_authUser', encodeURI(authAndAccountId.join('|')), null), true, "user auth id cookie was set");
                 Assert.equal(loggingStub.notCalled, true, "No warnings");
-
-
             }
         });
 
@@ -381,7 +357,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(undefined, user.authenticatedId, "user auth id was cleared");
                 Assert.equal(undefined, user.accountId, "user account id was cleared");
                 Assert.equal(cookieStub.calledWithExactly('ai_authUser'), true, "cookie was deleted");
-
             }
         });
 
@@ -399,7 +374,6 @@ class UserContextTests extends TestClass {
                 Assert.equal(undefined, user.authenticatedId, "user auth id was cleared");
                 Assert.equal(undefined, user.accountId, "user account id was cleared");
                 Assert.equal(cookieStub.calledWithExactly('ai_authUser'), true, "cookie was deleted");
-
             }
         });
     }

JavaScript/JavaScriptSDK.Tests/CheckinTests/Sender.tests.ts

@@ -1111,6 +1111,10 @@ class SenderTests extends TestClass {
         this.testCase({
             name: "SenderTests: send() is using BeaconAPI sender if the BeaconAPI is enabled",
             test: () => {
+                if (!(<any>navigator).sendBeacon) {
+                    (<any>navigator)['sendBeacon'] = (url: any, data: any) => {};
+                }
+
                 // enable beacon API and mock sender
                 var config = this.getDefaultConfig();
                 config.isBeaconApiDisabled = () => false;
@@ -1134,6 +1138,10 @@ class SenderTests extends TestClass {
         this.testCase({
             name: "SenderTests: send() is not using BeaconAPI sender if the BeaconAPI is disabled",
             test: () => {
+                if (!(<any>navigator).sendBeacon) {
+                    (<any>navigator)['sendBeacon'] = (url: any, data: any) => {};
+                }
+
                 // enable beacon API and mock sender
                 var config = this.getDefaultConfig();
                 config.isBeaconApiDisabled = () => true;

JavaScript/JavaScriptSDK.Tests/CheckinTests/SplitTest.tests.ts

@@ -18,27 +18,28 @@ class SplitTestTests extends TestClass {
             name: "SplitTestTests: ",
             test: () => {
                 var sut = new Microsoft.ApplicationInsights.SplitTest();
-                var guids = getGuids(10000);                
+                var guids = getGuids(10000);
                 var enabledPercent = 20;
                 var acceptedErrorPercent = 2;
 
                 // Act
                 var totalCount = guids.length;
                 var enabledCount = 0;
                 guids.forEach((guid) => {
-                    console.log(guid);
                     if (sut.isEnabled(guid, enabledPercent))
                         ++enabledCount;
                 });
 
+                // Assert.ok(false);
+
                 // Validate
                 var actualEnabledPercent = (enabledCount / totalCount) * 100;
                 Assert.ok(
                     (actualEnabledPercent < enabledPercent + acceptedErrorPercent) &&
                     (actualEnabledPercent > enabledPercent - acceptedErrorPercent),
                     "Enabled percent does not fall into expected range (" + enabledPercent + " +- " + acceptedErrorPercent + "): " + actualEnabledPercent);
-                    
-                }        
+
+            }
         });
     }
 

JavaScript/JavaScriptSDK.Tests/CheckinTests/Telemetry/Exception.tests.ts

@@ -191,13 +191,7 @@ Error: testmessage2\n\
                 Assert.equal(expectedTypeName, actual.exceptions[0].typeName);
                 Assert.equal(expectedDetails, actual.exceptions[0].stack);
                 Assert.equal(true, actual.exceptions[0].hasFullStack);
-
-                Assert.equal(0, actual.exceptions[0].parsedStack[0].level);
-                Assert.equal(expectedAssembly, actual.exceptions[0].parsedStack[0].assembly);
-                Assert.equal(expectedFileName, actual.exceptions[0].parsedStack[0].fileName);
-                Assert.equal(expectedLineNumber, actual.exceptions[0].parsedStack[0].line);
-                Assert.equal("unknown", actual.exceptions[0].parsedStack[0].method);
-
+                Assert.equal(undefined, actual.exceptions[0].parsedStack);
                 Assert.equal(expectedHandledAt, actual.handledAt);
             }
         });