Merge branch 'master' into transforms

scripts/tsd.json

@@ -1,12 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "typings",
-  "bundle": "typings/tsd.d.ts",
-  "installed": {
-    "node/node.d.ts": {
-      "commit": "5f480287834a2615274eea31574b713e64decf17"
-    }
-  }
-}

scripts/tslint/noTypeAssertionWhitespaceRule.ts

@@ -0,0 +1,25 @@
+import * as Lint from "tslint/lib/lint";
+import * as ts from "typescript";
+
+
+export class Rule extends Lint.Rules.AbstractRule {
+    public static TRAILING_FAILURE_STRING = "Excess trailing whitespace found around type assertion.";
+
+    public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+        return this.applyWithWalker(new TypeAssertionWhitespaceWalker(sourceFile, this.getOptions()));
+    }
+}
+
+class TypeAssertionWhitespaceWalker extends Lint.RuleWalker {
+    public visitNode(node: ts.Node) {
+        if (node.kind === ts.SyntaxKind.TypeAssertionExpression) {
+            const refined = node as ts.TypeAssertion;
+            const leftSideWhitespaceStart = refined.type.getEnd() + 1;
+            const rightSideWhitespaceEnd = refined.expression.getStart();
+            if (leftSideWhitespaceStart !== rightSideWhitespaceEnd) {
+                this.addFailure(this.createFailure(leftSideWhitespaceStart, rightSideWhitespaceEnd, Rule.TRAILING_FAILURE_STRING));
+            }
+        }
+        super.visitNode(node);
+    }
+}

scripts/types/ambient.d.ts

@@ -19,4 +19,6 @@ declare module "into-stream" {
         export function obj(content: any): NodeJS.ReadableStream
     }
     export = IntoStream;
-}
+}
+
+declare module "sorcery";