Update typings

custom-typings/object.d.ts

@@ -0,0 +1,4 @@
+// Node v4+ support Object.assign
+interface ObjectConstructor {
+    assign(target: any, ...sources: any[]): any;
+}

scripts/tsconfig.json

@@ -12,10 +12,13 @@
         "rewriteTsconfig": false
     },
     "filesGlob": [
+        "../custom-typings/**/*.d.ts",
         "../typings/**/*.d.ts",
         "./*.ts"
     ],
     "files": [
+        "../custom-typings/object.d.ts",
+        "../custom-typings/resolve.d.ts",
         "../typings/colors/colors.d.ts",
         "../typings/diff/diff.d.ts",
         "../typings/findup-sync/findup-sync.d.ts",
@@ -24,6 +27,7 @@
         "../typings/minimatch/minimatch.d.ts",
         "../typings/node/node.d.ts",
         "../typings/optimist/optimist.d.ts",
+        "../typings/tsd.d.ts",
         "../typings/underscore.string/underscore.string.d.ts",
         "../typings/underscore/underscore.d.ts",
         "buildDocs.ts"

src/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.6.2",
+    "version": "1.8.10",
     "compilerOptions": {
         "module": "commonjs",
         "noImplicitAny": true,
@@ -22,6 +22,7 @@
         "./test/**/*.ts"
     ],
     "files": [
+        "../custom-typings/object.d.ts",
         "../custom-typings/resolve.d.ts",
         "../typings/colors/colors.d.ts",
         "../typings/diff/diff.d.ts",
@@ -31,6 +32,7 @@
         "../typings/minimatch/minimatch.d.ts",
         "../typings/node/node.d.ts",
         "../typings/optimist/optimist.d.ts",
+        "../typings/tsd.d.ts",
         "../typings/underscore.string/underscore.string.d.ts",
         "../typings/underscore/underscore.d.ts",
         "configuration.ts",
@@ -157,4 +159,4 @@
         "test/parse.ts",
         "test/utils.ts"
     ]
-}
+}

test/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.6.2",
+    "version": "1.8.10",
     "compilerOptions": {
         "module": "commonjs",
         "noImplicitAny": true,
@@ -20,6 +20,7 @@
         "./rule-tester/*.ts"
     ],
     "files": [
+        "../custom-typings/object.d.ts",
         "../custom-typings/resolve.d.ts",
         "../typings/colors/colors.d.ts",
         "../typings/diff/diff.d.ts",
@@ -29,6 +30,7 @@
         "../typings/minimatch/minimatch.d.ts",
         "../typings/node/node.d.ts",
         "../typings/optimist/optimist.d.ts",
+        "../typings/tsd.d.ts",
         "../typings/underscore.string/underscore.string.d.ts",
         "../typings/underscore/underscore.d.ts",
         "typings/chai/chai.d.ts",
@@ -179,4 +181,4 @@
         "rule-tester/testData.ts",
         "rule-tester/utilsTests.ts"
     ]
-}
+}

tsd.json

@@ -6,34 +6,34 @@
   "bundle": "typings/tsd.d.ts",
   "installed": {
     "colors/colors.d.ts": {
-      "commit": "78ba6e41543e5ababbd1dda19797601be3c1f304"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "diff/diff.d.ts": {
-      "commit": "78ba6e41543e5ababbd1dda19797601be3c1f304"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "findup-sync/findup-sync.d.ts": {
-      "commit": "98d3168c2c570352a3a7393788e2ec9fbb08ade6"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "glob/glob.d.ts": {
-      "commit": "fb2b3b1e068c9ff7d8f9b0851c08d37d96c95c38"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "js-yaml/js-yaml.d.ts": {
-      "commit": "8ea42cd8bb11863ed6f242d67c502288ebc45a7b"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "minimatch/minimatch.d.ts": {
-      "commit": "98d3168c2c570352a3a7393788e2ec9fbb08ade6"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "node/node.d.ts": {
-      "commit": "98d3168c2c570352a3a7393788e2ec9fbb08ade6"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "optimist/optimist.d.ts": {
-      "commit": "e8f8e7471b8ca92ca417f8c878f64ae4d1067972"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "underscore.string/underscore.string.d.ts": {
-      "commit": "98d3168c2c570352a3a7393788e2ec9fbb08ade6"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     },
     "underscore/underscore.d.ts": {
-      "commit": "98d3168c2c570352a3a7393788e2ec9fbb08ade6"
+      "commit": "e623c6b3164bb8c6da508f84f7865eaaa97e1a0f"
     }
   }
 }

typings/colors/colors.d.ts

@@ -1,12 +1,15 @@
 // Type definitions for Colors.js 0.6.0-1
 // Project: https://github.com/Marak/colors.js
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "colors" {
     interface Color {
         (text: string): string;
 
+        strip: Color;
+        stripColors: Color;
+
         black: Color;
         red: Color;
         green: Color;
@@ -41,11 +44,17 @@ declare module "colors" {
         america: Color;
         trap: Color;
         random: Color;
+        zalgo: Color;
     }
 
-    module e {
+    namespace e {
         export function setTheme(theme:any): void;
 
+        export var enabled: boolean;
+
+        export var strip: Color;
+        export var stripColors: Color;
+
         export var black: Color;
         export var red: Color;
         export var green: Color;
@@ -80,12 +89,16 @@ declare module "colors" {
         export var america: Color;
         export var trap: Color;
         export var random: Color;
+        export var zalgo: Color;
     }
 
     export = e;
 }
 
 interface String {
+    strip: string;
+    stripColors: string;
+
     black: string;
     red: string;
     green: string;
@@ -120,4 +133,5 @@ interface String {
     america: string;
     trap: string;
     random: string;
+    zalgo: string;
 }

typings/diff/diff.d.ts

@@ -1,11 +1,12 @@
 // Type definitions for diff
 // Project: https://github.com/kpdecker/jsdiff
 // Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module JsDiff {
+declare namespace JsDiff {
     interface IDiffResult {
         value: string;
+        count?: number;
         added?: boolean;
         removed?: boolean;
     }
@@ -15,6 +16,22 @@ declare module JsDiff {
         componenets: IDiffResult[];
     }
 
+    interface IHunk {
+        oldStart: number;
+        oldLines: number;
+        newStart: number;
+        newLines: number;
+        lines: string[];
+    }
+
+    interface IUniDiff {
+        oldFileName: string;
+        newFileName: string;
+        oldHeader: string;
+        newHeader: string;
+        hunks: IHunk[];
+    }
+
     class Diff {
         ignoreWhitespace:boolean;
 
@@ -45,9 +62,21 @@ declare module JsDiff {
 
     function diffCss(oldStr:string, newStr:string):IDiffResult[];
 
-    function createPatch(fileName:string, oldStr:string, newStr:string, oldHeader:string, newHeader:string):string;
+    function createPatch(fileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
+
+    function createTwoFilesPatch(oldFileName: string, newFileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
+
+    function structuredPatch(oldFileName: string, newFileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): IUniDiff;
+
+    function applyPatch(oldStr: string, uniDiff: string | IUniDiff | IUniDiff[]): string;
+
+    function applyPatches(uniDiff: IUniDiff[], options: {
+        loadFile: (index: number, callback: (err: Error, data: string) => void) => void,
+        patched: (index: number, content: string) => void,
+        complete: (err?: Error) => void
+    }): void;
 
-    function applyPatch(oldStr:string, uniDiff:string):string;
+    function parsePatch(diffStr: string, options?: {strict: boolean}): IUniDiff[];
 
     function convertChangesToXML(changes:IDiffResult[]):string;
 

typings/findup-sync/findup-sync.d.ts

@@ -1,7 +1,7 @@
 // Type definitions for findup-sync v0.3.0
 // Project: https://github.com/cowboy/node-findup-sync
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Nathan Brown <https://github.com/ngbrown>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../minimatch/minimatch.d.ts" />
 

typings/glob/glob.d.ts

@@ -1,7 +1,7 @@
 // Type definitions for Glob 5.0.10
 // Project: https://github.com/isaacs/node-glob
 // Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
 /// <reference path="../minimatch/minimatch.d.ts" />
@@ -15,7 +15,7 @@ declare module "glob" {
 	function G(pattern: string, cb: (err: Error, matches: string[]) => void): void;
 	function G(pattern: string, options: G.IOptions, cb: (err: Error, matches: string[]) => void): void;
 
-	module G {
+	namespace G {
 		function sync(pattern: string, options?: IOptions): string[];
 
 		function hasMagic(pattern: string, options?: IOptions): boolean;

typings/js-yaml/js-yaml.d.ts

@@ -1,17 +1,26 @@
-// Type definitions for js-yaml 3.0.2
+// Type definitions for js-yaml 3.5.2
 // Project: https://github.com/nodeca/js-yaml
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Sebastian Clausen <https://github.com/sclausen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module jsyaml {
+declare namespace jsyaml {
 	export function safeLoad(str: string, opts?: LoadOptions): any;
 	export function load(str: string, opts?: LoadOptions): any;
 
+	export class Type implements TypeConstructorOptions {
+			constructor(tag: string, opts?: TypeConstructorOptions);
+			tag: string;
+	}
+	export class Schema {
+		constructor(definition: SchemaDefinition);
+		public static create(args: any[]): Schema;
+	}
+
 	export function safeLoadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
 	export function loadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): any;
 
 	export function safeDump(obj: any, opts?: DumpOptions): string;
-	export function dump(obj: any, opts?: DumpOptions): string
+	export function dump(obj: any, opts?: DumpOptions): string;
 
 	export interface LoadOptions {
 		// string to be used as a file path in error/warning messages.
@@ -29,12 +38,29 @@ declare module jsyaml {
 		skipInvalid?: boolean;
 		// specifies level of nesting, when to switch from block to flow style for collections. -1 means block style everwhere
 		flowLevel?: number;
-		// Each tag may have own set of styles.  - "tag" => "style" map.
+		// Each tag may have own set of styles.	- "tag" => "style" map.
 		styles?: Object;
 		// specifies a schema to use.
 		schema?: any;
 	}
 
+	export interface TypeConstructorOptions {
+		kind?: string;
+		resolve?: Function;
+		construct?: Function;
+		instanceOf?: Object;
+		predicate?: string;
+		represent?: Function;
+		defaultStyle?: string;
+		styleAliases?: Object;
+	}
+
+	export interface SchemaDefinition {
+		implicit?: any[];
+		explicit?: any[];
+		include?: any[];
+	}
+
 	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
 	export var FAILSAFE_SCHEMA: any;
 	// only strings, arrays and plain objects: http://www.yaml.org/spec/1.2/spec.html#id2802346
@@ -45,6 +71,13 @@ declare module jsyaml {
 	export var DEFAULT_SAFE_SCHEMA: any;
 	// all supported YAML types.
 	export var DEFAULT_FULL_SCHEMA: any;
+	export var MINIMAL_SCHEMA: any;
+	export var SAFE_SCHEMA: any;
+
+	export class YAMLException extends Error {
+		constructor(reason?: any, mark?: any);
+		toString(compact?: boolean): string;
+	}
 }
 
 declare module 'js-yaml' {

typings/minimatch/minimatch.d.ts

@@ -1,19 +1,19 @@
 // Type definitions for Minimatch 2.0.8
 // Project: https://github.com/isaacs/minimatch
 // Definitions by: vvakame <https://github.com/vvakame/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "minimatch" {
 
 	function M(target: string, pattern: string, options?: M.IOptions): boolean;
 
-	module M {
+	namespace M {
 		function match(list: string[], pattern: string, options?: IOptions): string[];
 		function filter(pattern: string, options?: IOptions): (element: string, indexed: number, array: string[]) => boolean;
 		function makeRe(pattern: string, options?: IOptions): RegExp;
 
 		var Minimatch: IMinimatchStatic;
-		
+
 		interface IOptions {
 			debug?: boolean;
 			nobrace?: boolean;