Fix for typescript 0.9.7.

This commit is contained in:
satoru kimura 2014-02-26 14:13:17 +09:00
parent e4206fbea2
commit bb9cf5d3c3
2 changed files with 67 additions and 68 deletions

View File

@ -106,6 +106,8 @@ declare module CryptoJS{
interface Cipher extends ICipher<Object>{}
interface IStreamCipher<C> extends ICipher<C>{
drop?: number;
createEncryptor(key: WordArray, cfg?: C): IStreamCipher<C>
createDecryptor(key: WordArray, cfg?: C): IStreamCipher<C>
@ -338,10 +340,7 @@ declare module CryptoJS{
interface PBKDF2 extends EvpKDF{} //PBKDF2 is same as EvpKDF
interface RC4Drop extends RC4, lib.ICipher<IRC4DropCfg>{}
interface IRC4DropCfg{
drop?: number //default 192
}
interface RC4Drop extends RC4 { }
}
module mode{
@ -438,7 +437,7 @@ declare module CryptoJS{
RabbitLegacy: CryptoJS.lib.CipherHelper
Rabbit: CryptoJS.lib.CipherHelper
RC4: CryptoJS.lib.CipherHelper
RC4Drop: CryptoJS.lib.ICipherHelper<CryptoJS.algo.IRC4DropCfg>
RC4Drop: CryptoJS.lib.ICipherHelper<Object>
MD5: CryptoJS.lib.HasherHelper
HmacMD5: CryptoJS.lib.IHasherHmacHelper

126
lodash/lodash.d.ts vendored
View File

@ -321,7 +321,7 @@ declare module _ {
/**
* @see _.findIndex
**/
findIndex<W, T extends W>(
findIndex<W, T>(
array: List<T>,
whereDictionary: W): number;
}
@ -404,7 +404,7 @@ declare module _ {
* @see _.first
* @param whereValue "_.where" style callback value
**/
first<W, T extends W>(
first<W, T>(
array: List<T>,
whereValue: W): T[];
@ -438,7 +438,7 @@ declare module _ {
/**
* @see _.first
**/
head<W, T extends W>(
head<W, T>(
array: List<T>,
whereValue: W): T[];
@ -472,7 +472,7 @@ declare module _ {
/**
* @see _.first
**/
take<W, T extends W>(
take<W, T>(
array: List<T>,
whereValue: W): T[];
}
@ -507,12 +507,12 @@ declare module _ {
callback: ListIterator<any, T>,
thisArg?: any): T[];
flatten<W, T extends W>(
flatten<W, T>(
array: List<any>,
isShallow: boolean,
whereValue: W): T[];
flatten<W, T extends W>(
flatten<W, T>(
array: List<any>,
whereValue: W): T[];
@ -548,11 +548,11 @@ declare module _ {
flatten<Flat>(
pluckValue: string): LoDashArrayWrapper<Flat>;
flatten<Flat, W extends Flat>(
flatten<Flat, W>(
isShallow: boolean,
whereValue: W): LoDashArrayWrapper<Flat>;
flatten<Flat, W extends Flat>(
flatten<Flat, W>(
whereValue: W): LoDashArrayWrapper<Flat>;
}
@ -638,7 +638,7 @@ declare module _ {
* @see _.initial
* @param whereValue _.where style callback
**/
initial<W, T extends W>(
initial<W, T>(
array: List<T>,
whereValue: W): T[];
}
@ -700,7 +700,7 @@ declare module _ {
* @see _.last
* @param whereValue _.where style callback
**/
last<W, T extends W>(
last<W, T>(
array: List<T>,
whereValue: W): T[];
}
@ -848,7 +848,7 @@ declare module _ {
/**
* @see _.rest
**/
rest<W, T extends W>(
rest<W, T>(
array: List<T>,
whereValue: W): T[];
@ -882,7 +882,7 @@ declare module _ {
/**
* @see _.rest
**/
drop<W, T extends W>(
drop<W, T>(
array: List<T>,
whereValue: W): T[];
@ -916,7 +916,7 @@ declare module _ {
/**
* @see _.rest
**/
tail<W, T extends W>(
tail<W, T>(
array: List<T>,
whereValue: W): T[];
}
@ -958,7 +958,7 @@ declare module _ {
* @see _.sortedIndex
* @param pluckValue the _.where style callback
**/
sortedIndex<W, T extends W>(
sortedIndex<W, T>(
array: List<T>,
value: T,
whereValue: W): number;
@ -1028,12 +1028,12 @@ declare module _ {
* @see _.uniq
* @param whereValue _.where style callback
**/
uniq<W, T extends W>(
uniq<W, T>(
array: List<T>,
isSorted: boolean,
whereValue: W): T[];
uniq<W, T extends W>(
uniq<W, T>(
array: List<T>,
whereValue: W): T[];
@ -1073,11 +1073,11 @@ declare module _ {
* @see _.uniq
* @param whereValue _.where style callback
**/
unique<W, T extends W>(
unique<W, T>(
array: List<T>,
whereValue?: W): T[];
unique<W, T extends W>(
unique<W, T>(
array: List<T>,
isSorted: boolean,
whereValue?: W): T[];
@ -1315,7 +1315,7 @@ declare module _ {
* @see _.every
* @param whereValue _.where style callback
**/
every<W, T extends W>(
every<W, T>(
collection: Collection<T>,
whereValue: W): boolean;
@ -1339,7 +1339,7 @@ declare module _ {
* @see _.every
* @param whereValue _.where style callback
**/
all<W, T extends W>(
all<W, T>(
collection: Collection<T>,
whereValue: W): boolean;
}
@ -1378,7 +1378,7 @@ declare module _ {
* @see _.filter
* @param pluckValue _.pluck style callback
**/
filter<W, T extends W>(
filter<W, T>(
collection: Collection<T>,
whereValue: W): T[];
@ -1402,7 +1402,7 @@ declare module _ {
* @see _.filter
* @param pluckValue _.pluck style callback
**/
select<W, T extends W>(
select<W, T>(
collection: Collection<T>,
whereValue: W): T[];
}
@ -1426,7 +1426,7 @@ declare module _ {
* @see _.filter
* @param pluckValue _.pluck style callback
**/
filter<W, T extends W>(
filter<W, T>(
whereValue: W): LoDashArrayWrapper<T>;
/**
@ -1447,7 +1447,7 @@ declare module _ {
* @see _.filter
* @param pluckValue _.pluck style callback
**/
select<W, T extends W>(
select<W, T>(
whereValue: W): LoDashArrayWrapper<T>;
}
@ -1477,7 +1477,7 @@ declare module _ {
* @see _.find
* @param _.pluck style callback
**/
find<W, T extends W>(
find<W, T>(
collection: Collection<T>,
whereValue: W): T;
@ -1501,7 +1501,7 @@ declare module _ {
* @see _.find
* @param _.pluck style callback
**/
detect<W, T extends W>(
detect<W, T>(
collection: Collection<T>,
whereValue: W): T;
@ -1525,7 +1525,7 @@ declare module _ {
* @see _.find
* @param _.pluck style callback
**/
findWhere<W, T extends W>(
findWhere<W, T>(
collection: Collection<T>,
whereValue: W): T;
@ -1557,7 +1557,7 @@ declare module _ {
* @see _.find
* @param _.pluck style callback
**/
findLast<W, T extends W>(
findLast<W, T>(
collection: Collection<T>,
whereValue: W): T;
@ -1756,12 +1756,12 @@ declare module _ {
* @see _.groupBy
* @param whereValue _.where style callback
**/
groupBy<W, T extends W>(
groupBy<W, T>(
collection: List<T>,
whereValue: W): Dictionary<T[]>;
}
interface LoDashArrayWrapper {
interface LoDashArrayWrapper<T> {
/**
* @see _.groupBy
**/
@ -1778,7 +1778,7 @@ declare module _ {
/**
* @see _.groupBy
**/
groupBy<W, T extends W>(
groupBy<W, T>(
whereValue: W): _.LoDashObjectWrapper<Dictionary<T[]>>;
}
@ -1817,7 +1817,7 @@ declare module _ {
* @see _.indexBy
* @param whereValue _.where style callback
**/
indexBy<W, T extends W>(
indexBy<W, T>(
collection: List<T>,
whereValue: W): Dictionary<T>;
}
@ -1993,7 +1993,7 @@ declare module _ {
* @see _.max
* @param whereValue _.where style callback
**/
max<W, T extends W>(
max<W, T>(
collection: Collection<T>,
whereValue: W): T;
}
@ -2033,7 +2033,7 @@ declare module _ {
* @see _.min
* @param whereValue _.where style callback
**/
min<W, T extends W>(
min<W, T>(
collection: Collection<T>,
whereValue: W): T;
}
@ -2190,7 +2190,7 @@ declare module _ {
* @see _.reject
* @param whereValue _.where style callback
**/
reject<W, T extends W>(
reject<W, T>(
collection: Collection<T>,
whereValue: W): T[];
}
@ -2281,7 +2281,7 @@ declare module _ {
* @see _.some
* @param whereValue _.where style callback
**/
some<W, T extends W>(
some<W, T>(
collection: Collection<T>,
whereValue: W): boolean;
@ -2305,7 +2305,7 @@ declare module _ {
* @see _.some
* @param whereValue _.where style callback
**/
any<W, T extends W>(
any<W, T>(
collection: Collection<T>,
whereValue: W): boolean;
}
@ -2345,7 +2345,7 @@ declare module _ {
* @see _.sortBy
* @param whereValue _.where style callback
**/
sortBy<W, T extends W>(
sortBy<W, T>(
collection: List<T>,
whereValue: W): T[];
}
@ -2784,7 +2784,7 @@ declare module _ {
* @param thisArg The this binding of callback.
* @return The destination object.
**/
assign<P, T extends P, S1 extends P, Value, Result extends P>(
assign<P, T, S1, Value, Result>(
object: T,
s1: S1,
callback?: (objectValue: Value, sourceValue: Value) => Value,
@ -2793,7 +2793,7 @@ declare module _ {
/**
* @see _.assign
**/
assign<P, T extends P, S1 extends P, S2 extends P, Value, Result extends P>(
assign<P, T, S1, S2, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -2803,7 +2803,7 @@ declare module _ {
/**
* @see _.assign
**/
assign<P, T extends P, S1 extends P, S2 extends P, S3 extends P, Value, Result extends P>(
assign<P, T, S1, S2, S3, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -2814,7 +2814,7 @@ declare module _ {
/**
* @see _.assign
**/
assign<P, T extends P, S1 extends P, S2 extends P, S3 extends P, S4 extends P, Value, Result extends P>(
assign<P, T, S1, S2, S3, S4, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -2826,7 +2826,7 @@ declare module _ {
/**
* @see _.assign
**/
extend<P, T extends P, S1 extends P, Value, Result extends P>(
extend<P, T, S1, Value, Result>(
object: T,
s1: S1,
callback?: (objectValue: Value, sourceValue: Value) => Value,
@ -2835,7 +2835,7 @@ declare module _ {
/**
* @see _.assign
**/
extend<P, T extends P, S1 extends P, S2 extends P, Value, Result extends P>(
extend<P, T, S1, S2, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -2845,7 +2845,7 @@ declare module _ {
/**
* @see _.assign
**/
extend<P, T extends P, S1 extends P, S2 extends P, S3 extends P, Value, Result extends P>(
extend<P, T, S1, S2, S3, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -2856,7 +2856,7 @@ declare module _ {
/**
* @see _.assign
**/
extend<P, T extends P, S1 extends P, S2 extends P, S3 extends P, S4 extends P, Value, Result extends P>(
extend<P, T, S1, S2, S3, S4, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -3054,7 +3054,7 @@ declare module _ {
* @see _.findKey
* @param whereValue _.where style callback
**/
findKey<W extends Dictionary<any>, T extends W>(
findKey<W extends Dictionary<any>, T>(
object: T,
whereValue: W): string;
}
@ -3085,7 +3085,7 @@ declare module _ {
* @see _.findLastKey
* @param whereValue _.where style callback
**/
findLastKey<W extends Dictionary<any>, T extends W>(
findLastKey<W extends Dictionary<any>, T>(
object: T,
whereValue: W): string;
}
@ -3107,7 +3107,7 @@ declare module _ {
thisArg?: any): Dictionary<T>;
}
interface LoDashObjectWrapper {
interface LoDashObjectWrapper<T> {
/**
* @see _.forIn
**/
@ -3132,7 +3132,7 @@ declare module _ {
thisArg?: any): Dictionary<T>;
}
interface LoDashObjectWrapper {
interface LoDashObjectWrapper<T> {
/**
* @see _.forInRight
**/
@ -3158,7 +3158,7 @@ declare module _ {
thisArg?: any): Dictionary<T>;
}
interface LoDashObjectWrapper {
interface LoDashObjectWrapper<T> {
/**
* @see _.forOwn
**/
@ -3183,7 +3183,7 @@ declare module _ {
thisArg?: any): Dictionary<T>;
}
interface LoDashObjectWrapper {
interface LoDashObjectWrapper<T> {
/**
* @see _.forOwnRight
**/
@ -3208,7 +3208,7 @@ declare module _ {
methods(object: any): string[];
}
interface LoDashObjectWrapper {
interface LoDashObjectWrapper<T> {
/**
* @see _.functions
**/
@ -3472,7 +3472,7 @@ declare module _ {
* @param thisArg The this binding of callback.
* @return The destination object.
**/
merge<P, T extends P, S1 extends P, Value, Result extends P>(
merge<P, T, S1, Value, Result>(
object: T,
s1: S1,
callback?: (objectValue: Value, sourceValue: Value) => Value,
@ -3481,7 +3481,7 @@ declare module _ {
/**
* @see _.merge
**/
merge<P, T extends P, S1 extends P, S2 extends P, Value, Result extends P>(
merge<P, T, S1, S2, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -3491,7 +3491,7 @@ declare module _ {
/**
* @see _.merge
**/
merge<P, T extends P, S1 extends P, S2 extends P, S3 extends P, Value, Result extends P>(
merge<P, T, S1, S2, S3, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -3502,7 +3502,7 @@ declare module _ {
/**
* @see _.merge
**/
merge<P, T extends P, S1 extends P, S2 extends P, S3 extends P, S4 extends P, Value, Result extends P>(
merge<P, T, S1, S2, S3, S4, Value, Result>(
object: T,
s1: S1,
s2: S2,
@ -3524,21 +3524,21 @@ declare module _ {
* @param keys The properties to omit.
* @return An object without the omitted properties.
**/
omit<Omitted, T extends Omitted>(
omit<Omitted, T>(
object: T,
...keys: string[]): Omitted;
/**
* @see _.omit
**/
omit<Omitted, T extends Omitted>(
omit<Omitted, T>(
object: T,
keys: string[]): Omitted;
/**
* @see _.omit
**/
omit<Omitted, T extends Omitted>(
omit<Omitted, T>(
object: T,
callback: ObjectIterator<any, boolean>,
thisArg?: any): Omitted;
@ -3567,21 +3567,21 @@ declare module _ {
* @param keys Property names to pick
* @return An object composed of the picked properties.
**/
pick<Picked, T extends Picked>(
pick<Picked, T>(
object: T,
...keys: string[]): Picked;
/**
* @see _.pick
**/
pick<Picked, T extends Picked>(
pick<Picked, T>(
object: T,
keys: string[]): Picked;
/**
* @see _.pick
**/
pick<Picked, T extends Picked>(
pick<Picked, T>(
object: T,
callback: ObjectIterator<any, boolean>,
thisArg?: any): Picked;