Fix linq 3 definitions

This commit is contained in:
Boris Yankov
2013-08-07 18:34:41 +03:00
parent ea15619251
commit 901591ab9f
+20 -20
View File
@@ -5,7 +5,7 @@
declare module linqjs {
interface IEnumerator {
current(): any;
moveNext(): bool;
moveNext(): boolean;
dispose(): void;
}
@@ -13,7 +13,7 @@ declare module linqjs {
Utils: {
createLambda(expression: any): (...params: any[]) => any;
createEnumerable(getEnumerator: () => IEnumerator): Enumerable;
createEnumerator(initialize: () => void , tryGetNext: () => bool, dispose: () => void ): IEnumerator;
createEnumerator(initialize: () => void , tryGetNext: () => boolean, dispose: () => void ): IEnumerator;
extendTo(type: any): void;
};
choice(...params: any[]): Enumerable;
@@ -55,7 +55,7 @@ declare module linqjs {
selectMany(collectionSelector: (element: any, index: number) => any[], resultSelector?: (outer: any, inner: any) => any): Enumerable;
selectMany(collectionSelector: (element: any, index: number) => Enumerable, resultSelector?: (outer: any, inner: any) => any): Enumerable;
selectMany(collectionSelector: (element: any, index: number) => { length: number;[x: number]: any; }, resultSelector?: (outer: any, inner: any) => any): Enumerable;
where(predicate: (element: any, index: number) => bool): Enumerable;
where(predicate: (element: any, index: number) => boolean): Enumerable;
choose(selector: (element: any, index: number) => any): Enumerable;
ofType(type: any): Enumerable;
zip(second: any[], resultSelector: (first: any, second: any, index: number) => any): Enumerable;
@@ -68,9 +68,9 @@ declare module linqjs {
merge(...params: any[]): Enumerable; // last one is selector
join(inner: Enumerable, outerKeySelector: (outer: any) =>any, innerKeySelector: (inner: any) =>any, resultSelector: (outer: any, inner: any) => any, compareSelector?: (obj: any) => any): Enumerable;
groupJoin(inner: Enumerable, outerKeySelector: (outer: any) =>any, innerKeySelector: (inner: any) =>any, resultSelector: (outer: any, inner: any) => any, compareSelector?: (obj: any) => any): Enumerable;
all(predicate: (element: any) => bool): bool;
any(predicate?: (element: any) => bool): bool;
isEmpty(): bool;
all(predicate: (element: any) => boolean): boolean;
any(predicate?: (element: any) => boolean): boolean;
isEmpty(): boolean;
concat(...sequences: any[]): Enumerable;
insert(index: number, second: any[]): Enumerable;
insert(index: number, second: Enumerable): Enumerable;
@@ -106,7 +106,7 @@ declare module linqjs {
aggregate(func: (prev: any, current: any) => any): any;
aggregate(seed: any, func: (prev: any, current: any) => any, resultSelector?: (last: any) => any): any;
average(selector?: (element: any) => any): number;
count(predicate?: (element: any, index: number) => bool): number;
count(predicate?: (element: any, index: number) => boolean): number;
max(selector?: (element: any) => any): number;
min(selector?: (element: any) => any): number;
maxBy(keySelector: (element: any) => any): any;
@@ -114,22 +114,22 @@ declare module linqjs {
sum(selector?: (element: any) => any): number;
elementAt(index: number): any;
elementAtOrDefault(index: number, defaultValue?: any): any;
first(predicate?: (element: any, index: number) => bool): any;
first(predicate?: (element: any, index: number) => boolean): any;
firstOrDefault(predicate?: (element: any, index: number) => bool, defaultValue?: any): any;
last(predicate?: (element: any, index: number) => bool): any;
last(predicate?: (element: any, index: number) => boolean): any;
lastOrDefault(predicate?: (element: any, index: number) => bool, defaultValue?: any): any;
single(predicate?: (element: any, index: number) => bool): any;
single(predicate?: (element: any, index: number) => boolean): any;
singleOrDefault(predicate?: (element: any, index: number) => bool, defaultValue?: any): any;
skip(count: number): Enumerable;
skipWhile(predicate: (element: any, index: number) => bool): Enumerable;
skipWhile(predicate: (element: any, index: number) => boolean): Enumerable;
take(count: number): Enumerable;
takeWhile(predicate: (element: any, index: number) => bool): Enumerable;
takeWhile(predicate: (element: any, index: number) => boolean): Enumerable;
takeExceptLast(count?: number): Enumerable;
takeFromLast(count: number): Enumerable;
indexOf(item: any): number;
indexOf(predicate: (element: any, index: number) => bool): number;
indexOf(predicate: (element: any, index: number) => boolean): number;
lastIndexOf(item: any): number;
lastIndexOf(predicate: (element: any, index: number) => bool): number;
lastIndexOf(predicate: (element: any, index: number) => boolean): number;
asEnumerable(): Enumerable;
toArray(): any[];
toLookup(keySelector: (element: any) => any, elementSelector?: (element: any) => any, compareSelector?: (element: any) => any): Lookup;
@@ -141,9 +141,9 @@ declare module linqjs {
toJSONString(replacer: any[], space: any): string;
toJoinedString(separator?: string, selector?: (element: any, index: number) => any): string;
doAction(action: (element: any, index: number) => void ): Enumerable;
doAction(action: (element: any, index: number) => bool): Enumerable;
doAction(action: (element: any, index: number) => boolean): Enumerable;
forEach(action: (element: any, index: number) => void ): void;
forEach(action: (element: any, index: number) => bool): void;
forEach(action: (element: any, index: number) => boolean): void;
write(separator?: string, selector?: (element: any) => any): void;
writeLine(selector?: (element: any) => any): void;
force(): void;
@@ -159,7 +159,7 @@ declare module linqjs {
}
interface OrderedEnumerable extends Enumerable {
createOrderedEnumerable(keySelector: (element: any) => any, descending: bool): OrderedEnumerable;
createOrderedEnumerable(keySelector: (element: any) => any, descending: boolean): OrderedEnumerable;
thenBy(keySelector: (element: any) => any): OrderedEnumerable;
thenByDescending(keySelector: (element: any) => any): OrderedEnumerable;
}
@@ -171,8 +171,8 @@ declare module linqjs {
interface Dictionary {
add(key: any, value: any): void;
get(key: any): any;
set(key: any, value: any): bool;
contains(key: any): bool;
set(key: any, value: any): boolean;
contains(key: any): boolean;
clear(): void;
remove(key: any): void;
count(): number;
@@ -182,7 +182,7 @@ declare module linqjs {
interface Lookup {
count(): number;
get(key: any): Enumerable;
contains(key: any): bool;
contains(key: any): boolean;
toEnumerable(): Enumerable; // Enumerable<Groping>
}