From f9996b4dda9790d89d5c8ebe5356dab22597f856 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Thu, 14 May 2015 10:14:44 -0500
Subject: [PATCH] Fixed unit tests and naming conventions.

---
 .../stack-trace-tests.ts                              |  0
 .../stack-trace.d.ts                                  |  4 ++--
 .../stacktrace-js-tests.ts                            | 11 +++++------
 .../stacktrace-js.d.ts                                |  8 ++++----
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename node-stack-trace/node-stack-trace.ts => stack-trace/stack-trace-tests.ts (100%)
 rename node-stack-trace/node-stack-trace.d.ts => stack-trace/stack-trace.d.ts (79%)
 rename stacktrace/stacktrace-tests.ts => stacktrace-js/stacktrace-js-tests.ts (52%)
 rename stacktrace/stacktrace.d.ts => stacktrace-js/stacktrace-js.d.ts (86%)

diff --git a/node-stack-trace/node-stack-trace.ts b/stack-trace/stack-trace-tests.ts
similarity index 100%
rename from node-stack-trace/node-stack-trace.ts
rename to stack-trace/stack-trace-tests.ts
diff --git a/node-stack-trace/node-stack-trace.d.ts b/stack-trace/stack-trace.d.ts
similarity index 79%
rename from node-stack-trace/node-stack-trace.d.ts
rename to stack-trace/stack-trace.d.ts
index c3684b3db..21c12f8f2 100644
--- a/node-stack-trace/node-stack-trace.d.ts
+++ b/stack-trace/stack-trace.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for node-stack-trace
 // Project: https://github.com/felixge/node-stack-trace
-// Definitions by: [Exceptionless] <https://github.com/exceptionless>
+// Definitions by: Exceptionless <https://github.com/exceptionless>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare module 'stack-trace' {
@@ -15,6 +15,6 @@ declare module 'stack-trace' {
     isNative():boolean;
   }
 
-  export function get(belowFn:() => void): StackFrame[];
+  export function get(belowFn?:() => void): StackFrame[];
   export function parse(err:Error): StackFrame[];
 }
diff --git a/stacktrace/stacktrace-tests.ts b/stacktrace-js/stacktrace-js-tests.ts
similarity index 52%
rename from stacktrace/stacktrace-tests.ts
rename to stacktrace-js/stacktrace-js-tests.ts
index 39a968d61..c4c9bcf87 100644
--- a/stacktrace/stacktrace-tests.ts
+++ b/stacktrace-js/stacktrace-js-tests.ts
@@ -1,18 +1,17 @@
-import StackTrace = require('StackTrace');
+/// <reference path="stacktrace-js.d.ts" />
 
 function interestingFn() {
     return 'https://github.com/exceptionless/Exceptionless';
 }
 
-var callback = function(stackframes) {
-    var stringifiedStack = stackframes.map(function(sf) {
+var callback = function(stackframes:StackTrace.StackFrame[]) {
+    var stringifiedStack = stackframes.map(function(sf:StackTrace.StackFrame) {
         return sf.toString();
     }).join('\n');
     console.log(stringifiedStack);
 };
 
-var errback = function(err) { console.log(err.message); };
-
+var errorCallback = function(err:Error) { console.log(err.message); };
 
 StackTrace.get();
 
@@ -21,5 +20,5 @@ var error = new Error('BOOM!');
 StackTrace.fromError(error);
 StackTrace.generateArtificially();
 
-StackTrace.instrument(interestingFn, callback, errback);
+StackTrace.instrument(interestingFn, callback, errorCallback);
 StackTrace.deinstrument(interestingFn);
diff --git a/stacktrace/stacktrace.d.ts b/stacktrace-js/stacktrace-js.d.ts
similarity index 86%
rename from stacktrace/stacktrace.d.ts
rename to stacktrace-js/stacktrace-js.d.ts
index b54efe43e..21ad6839e 100644
--- a/stacktrace/stacktrace.d.ts
+++ b/stacktrace-js/stacktrace-js.d.ts
@@ -13,7 +13,7 @@ declare module StackTrace {
   }
 
   export interface StackFrame {
-    constructor(functionName:string, args:any, fileName:string, lineNumber:number, columnNumber:number);
+    constructor(functionName:string, args:any, fileName:string, lineNumber:number, columnNumber:number): StackFrame;
 
     functionName?:string;
     args?:any;
@@ -28,7 +28,7 @@ declare module StackTrace {
    * @param options Options Object
    * @return Array[StackFrame]
    */
-  export function get(options: StackTraceOptions): Promise<StackFrame[]>;
+  export function get(options?: StackTraceOptions): Promise<StackFrame[]>;
 
   /**
    * Given an error object, parse it.
@@ -43,7 +43,7 @@ declare module StackTrace {
    * @param options Object options
    * @returns Array[StackFrame]
    */
-  export function generateArtificially(options: StackTraceOptions): Promise<StackFrame[]>;
+  export function generateArtificially(options?: StackTraceOptions): Promise<StackFrame[]>;
 
   /**
    * Given a function, wrap it such that invocations trigger a callback that
@@ -54,7 +54,7 @@ declare module StackTrace {
    * @param {Function} errorCallback optional function to call with error if unable to get stack trace.
    * @param {Object} thisArg optional context object (e.g. window)
    */
-  export function instrument(fn:() => void, callback:(stackFrames:StackFrame[]) => void, errorCallback:() => void, thisArg:any): void;
+  export function instrument(fn:() => void, callback:(stackFrames:StackFrame[]) => void, errorCallback:(error:Error) => void, thisArg?:any): void;
 
   /**
    * Given a function that has been instrumented,