diff --git a/linq/linq.d.ts b/linq/linq.d.ts index 3650ef028..7c8027f04 100644 --- a/linq/linq.d.ts +++ b/linq/linq.d.ts @@ -9,26 +9,29 @@ declare module linq { interface EnumerableStatic { - Choice(...contents: any[]): Enumerable; - Choice(contents: any[]): Enumerable; - Cycle(...contents: any[]): Enumerable; - Cycle(contents: any[]): Enumerable; - Empty(): Enumerable; - From(obj: any[]): Enumerable; - From(obj: any): Enumerable; - Return(element: any): Enumerable; - Matches(input: string, pattern: RegExp): Enumerable; - Matches(input: string, pattern: string, flags?: string): Enumerable; - Range(start: number, count: number, step?: number): Enumerable; - RangeDown(start: number, count: number, step?: number): Enumerable; - RangeTo(start: number, to: number, step?: number): Enumerable; - Repeat(obj: any, count?: number): Enumerable; - RepeatWithFinalize(initializer: () => any, finalizer: (resource: any) =>void ): Enumerable; - Generate(func: () => any, count?: number): Enumerable; + Choice(...contents: T[]): Enumerable; + Choice(contents: T[]): Enumerable; + Cycle(...contents: T[]): Enumerable; + Cycle(contents: T[]): Enumerable; + Empty(): Enumerable; + From(obj: T[]): Enumerable; + From(obj: number): Enumerable; // input number returns single number + From(obj: string): Enumerable; // input string returns sequence of characters + From(obj: NodeList): Enumerable; // node list returns sequence of nodes + From(obj: Object): Enumerable>; // object returns sequence of key/value pairs + Return(element: T): Enumerable; + Matches(input: string, pattern: RegExp): Enumerable; + Matches(input: string, pattern: string, flags?: string): Enumerable; + Range(start: number, count: number, step?: number): Enumerable; + RangeDown(start: number, count: number, step?: number): Enumerable; + RangeTo(start: number, to: number, step?: number): Enumerable; + Repeat(obj: any, count?: number): Enumerable; + RepeatWithFinalize(initializer: () => T, finalizer: (resource: T) => void): Enumerable; + Generate(func: () => T, count?: number): Enumerable; Generate(func: string, count?: number): Enumerable; - ToInfinity(start?: number, step?: number): Enumerable; - ToNegativeInfinity(start?: number, step?: number): Enumerable; - Unfold(seed, func: ($) => any): Enumerable; + ToInfinity(start?: number, step?: number): Enumerable; + ToNegativeInfinity(start?: number, step?: number): Enumerable; + Unfold(seed, func: ($) => T): Enumerable; Unfold(seed, func: string): Enumerable; } @@ -218,6 +221,11 @@ declare module linq { Count(): number; ToEnumerable(): Enumerable; } + + interface KeyValuePair { + Key: TKey; + Value: TValue; + } } declare var Enumerable: linq.EnumerableStatic;