From bb9cf5d3c326267c01c1c83dc14dd9d8b35e9ee7 Mon Sep 17 00:00:00 2001 From: satoru kimura Date: Wed, 26 Feb 2014 14:13:17 +0900 Subject: [PATCH] Fix for typescript 0.9.7. --- cryptojs/cryptojs.d.ts | 9 ++- lodash/lodash.d.ts | 126 ++++++++++++++++++++--------------------- 2 files changed, 67 insertions(+), 68 deletions(-) diff --git a/cryptojs/cryptojs.d.ts b/cryptojs/cryptojs.d.ts index a12ef69e7..d9c77dbe9 100644 --- a/cryptojs/cryptojs.d.ts +++ b/cryptojs/cryptojs.d.ts @@ -106,6 +106,8 @@ declare module CryptoJS{ interface Cipher extends ICipher{} interface IStreamCipher extends ICipher{ + drop?: number; + createEncryptor(key: WordArray, cfg?: C): IStreamCipher createDecryptor(key: WordArray, cfg?: C): IStreamCipher @@ -338,10 +340,7 @@ declare module CryptoJS{ interface PBKDF2 extends EvpKDF{} //PBKDF2 is same as EvpKDF - interface RC4Drop extends RC4, lib.ICipher{} - 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 + RC4Drop: CryptoJS.lib.ICipherHelper MD5: CryptoJS.lib.HasherHelper HmacMD5: CryptoJS.lib.IHasherHmacHelper diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts index 0afd19370..b48f7e603 100644 --- a/lodash/lodash.d.ts +++ b/lodash/lodash.d.ts @@ -321,7 +321,7 @@ declare module _ { /** * @see _.findIndex **/ - findIndex( + findIndex( array: List, whereDictionary: W): number; } @@ -404,7 +404,7 @@ declare module _ { * @see _.first * @param whereValue "_.where" style callback value **/ - first( + first( array: List, whereValue: W): T[]; @@ -438,7 +438,7 @@ declare module _ { /** * @see _.first **/ - head( + head( array: List, whereValue: W): T[]; @@ -472,7 +472,7 @@ declare module _ { /** * @see _.first **/ - take( + take( array: List, whereValue: W): T[]; } @@ -507,12 +507,12 @@ declare module _ { callback: ListIterator, thisArg?: any): T[]; - flatten( + flatten( array: List, isShallow: boolean, whereValue: W): T[]; - flatten( + flatten( array: List, whereValue: W): T[]; @@ -548,11 +548,11 @@ declare module _ { flatten( pluckValue: string): LoDashArrayWrapper; - flatten( + flatten( isShallow: boolean, whereValue: W): LoDashArrayWrapper; - flatten( + flatten( whereValue: W): LoDashArrayWrapper; } @@ -638,7 +638,7 @@ declare module _ { * @see _.initial * @param whereValue _.where style callback **/ - initial( + initial( array: List, whereValue: W): T[]; } @@ -700,7 +700,7 @@ declare module _ { * @see _.last * @param whereValue _.where style callback **/ - last( + last( array: List, whereValue: W): T[]; } @@ -848,7 +848,7 @@ declare module _ { /** * @see _.rest **/ - rest( + rest( array: List, whereValue: W): T[]; @@ -882,7 +882,7 @@ declare module _ { /** * @see _.rest **/ - drop( + drop( array: List, whereValue: W): T[]; @@ -916,7 +916,7 @@ declare module _ { /** * @see _.rest **/ - tail( + tail( array: List, whereValue: W): T[]; } @@ -958,7 +958,7 @@ declare module _ { * @see _.sortedIndex * @param pluckValue the _.where style callback **/ - sortedIndex( + sortedIndex( array: List, value: T, whereValue: W): number; @@ -1028,12 +1028,12 @@ declare module _ { * @see _.uniq * @param whereValue _.where style callback **/ - uniq( + uniq( array: List, isSorted: boolean, whereValue: W): T[]; - uniq( + uniq( array: List, whereValue: W): T[]; @@ -1073,11 +1073,11 @@ declare module _ { * @see _.uniq * @param whereValue _.where style callback **/ - unique( + unique( array: List, whereValue?: W): T[]; - unique( + unique( array: List, isSorted: boolean, whereValue?: W): T[]; @@ -1315,7 +1315,7 @@ declare module _ { * @see _.every * @param whereValue _.where style callback **/ - every( + every( collection: Collection, whereValue: W): boolean; @@ -1339,7 +1339,7 @@ declare module _ { * @see _.every * @param whereValue _.where style callback **/ - all( + all( collection: Collection, whereValue: W): boolean; } @@ -1378,7 +1378,7 @@ declare module _ { * @see _.filter * @param pluckValue _.pluck style callback **/ - filter( + filter( collection: Collection, whereValue: W): T[]; @@ -1402,7 +1402,7 @@ declare module _ { * @see _.filter * @param pluckValue _.pluck style callback **/ - select( + select( collection: Collection, whereValue: W): T[]; } @@ -1426,7 +1426,7 @@ declare module _ { * @see _.filter * @param pluckValue _.pluck style callback **/ - filter( + filter( whereValue: W): LoDashArrayWrapper; /** @@ -1447,7 +1447,7 @@ declare module _ { * @see _.filter * @param pluckValue _.pluck style callback **/ - select( + select( whereValue: W): LoDashArrayWrapper; } @@ -1477,7 +1477,7 @@ declare module _ { * @see _.find * @param _.pluck style callback **/ - find( + find( collection: Collection, whereValue: W): T; @@ -1501,7 +1501,7 @@ declare module _ { * @see _.find * @param _.pluck style callback **/ - detect( + detect( collection: Collection, whereValue: W): T; @@ -1525,7 +1525,7 @@ declare module _ { * @see _.find * @param _.pluck style callback **/ - findWhere( + findWhere( collection: Collection, whereValue: W): T; @@ -1557,7 +1557,7 @@ declare module _ { * @see _.find * @param _.pluck style callback **/ - findLast( + findLast( collection: Collection, whereValue: W): T; @@ -1756,12 +1756,12 @@ declare module _ { * @see _.groupBy * @param whereValue _.where style callback **/ - groupBy( + groupBy( collection: List, whereValue: W): Dictionary; } - interface LoDashArrayWrapper { + interface LoDashArrayWrapper { /** * @see _.groupBy **/ @@ -1778,7 +1778,7 @@ declare module _ { /** * @see _.groupBy **/ - groupBy( + groupBy( whereValue: W): _.LoDashObjectWrapper>; } @@ -1817,7 +1817,7 @@ declare module _ { * @see _.indexBy * @param whereValue _.where style callback **/ - indexBy( + indexBy( collection: List, whereValue: W): Dictionary; } @@ -1993,7 +1993,7 @@ declare module _ { * @see _.max * @param whereValue _.where style callback **/ - max( + max( collection: Collection, whereValue: W): T; } @@ -2033,7 +2033,7 @@ declare module _ { * @see _.min * @param whereValue _.where style callback **/ - min( + min( collection: Collection, whereValue: W): T; } @@ -2190,7 +2190,7 @@ declare module _ { * @see _.reject * @param whereValue _.where style callback **/ - reject( + reject( collection: Collection, whereValue: W): T[]; } @@ -2281,7 +2281,7 @@ declare module _ { * @see _.some * @param whereValue _.where style callback **/ - some( + some( collection: Collection, whereValue: W): boolean; @@ -2305,7 +2305,7 @@ declare module _ { * @see _.some * @param whereValue _.where style callback **/ - any( + any( collection: Collection, whereValue: W): boolean; } @@ -2345,7 +2345,7 @@ declare module _ { * @see _.sortBy * @param whereValue _.where style callback **/ - sortBy( + sortBy( collection: List, whereValue: W): T[]; } @@ -2784,7 +2784,7 @@ declare module _ { * @param thisArg The this binding of callback. * @return The destination object. **/ - assign( + assign( object: T, s1: S1, callback?: (objectValue: Value, sourceValue: Value) => Value, @@ -2793,7 +2793,7 @@ declare module _ { /** * @see _.assign **/ - assign( + assign( object: T, s1: S1, s2: S2, @@ -2803,7 +2803,7 @@ declare module _ { /** * @see _.assign **/ - assign( + assign( object: T, s1: S1, s2: S2, @@ -2814,7 +2814,7 @@ declare module _ { /** * @see _.assign **/ - assign( + assign( object: T, s1: S1, s2: S2, @@ -2826,7 +2826,7 @@ declare module _ { /** * @see _.assign **/ - extend( + extend( object: T, s1: S1, callback?: (objectValue: Value, sourceValue: Value) => Value, @@ -2835,7 +2835,7 @@ declare module _ { /** * @see _.assign **/ - extend( + extend( object: T, s1: S1, s2: S2, @@ -2845,7 +2845,7 @@ declare module _ { /** * @see _.assign **/ - extend( + extend( object: T, s1: S1, s2: S2, @@ -2856,7 +2856,7 @@ declare module _ { /** * @see _.assign **/ - extend( + extend( object: T, s1: S1, s2: S2, @@ -3054,7 +3054,7 @@ declare module _ { * @see _.findKey * @param whereValue _.where style callback **/ - findKey, T extends W>( + findKey, T>( object: T, whereValue: W): string; } @@ -3085,7 +3085,7 @@ declare module _ { * @see _.findLastKey * @param whereValue _.where style callback **/ - findLastKey, T extends W>( + findLastKey, T>( object: T, whereValue: W): string; } @@ -3107,7 +3107,7 @@ declare module _ { thisArg?: any): Dictionary; } - interface LoDashObjectWrapper { + interface LoDashObjectWrapper { /** * @see _.forIn **/ @@ -3132,7 +3132,7 @@ declare module _ { thisArg?: any): Dictionary; } - interface LoDashObjectWrapper { + interface LoDashObjectWrapper { /** * @see _.forInRight **/ @@ -3158,7 +3158,7 @@ declare module _ { thisArg?: any): Dictionary; } - interface LoDashObjectWrapper { + interface LoDashObjectWrapper { /** * @see _.forOwn **/ @@ -3183,7 +3183,7 @@ declare module _ { thisArg?: any): Dictionary; } - interface LoDashObjectWrapper { + interface LoDashObjectWrapper { /** * @see _.forOwnRight **/ @@ -3208,7 +3208,7 @@ declare module _ { methods(object: any): string[]; } - interface LoDashObjectWrapper { + interface LoDashObjectWrapper { /** * @see _.functions **/ @@ -3472,7 +3472,7 @@ declare module _ { * @param thisArg The this binding of callback. * @return The destination object. **/ - merge( + merge( object: T, s1: S1, callback?: (objectValue: Value, sourceValue: Value) => Value, @@ -3481,7 +3481,7 @@ declare module _ { /** * @see _.merge **/ - merge( + merge( object: T, s1: S1, s2: S2, @@ -3491,7 +3491,7 @@ declare module _ { /** * @see _.merge **/ - merge( + merge( object: T, s1: S1, s2: S2, @@ -3502,7 +3502,7 @@ declare module _ { /** * @see _.merge **/ - merge( + merge( 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( + omit( object: T, ...keys: string[]): Omitted; /** * @see _.omit **/ - omit( + omit( object: T, keys: string[]): Omitted; /** * @see _.omit **/ - omit( + omit( object: T, callback: ObjectIterator, thisArg?: any): Omitted; @@ -3567,21 +3567,21 @@ declare module _ { * @param keys Property names to pick * @return An object composed of the picked properties. **/ - pick( + pick( object: T, ...keys: string[]): Picked; /** * @see _.pick **/ - pick( + pick( object: T, keys: string[]): Picked; /** * @see _.pick **/ - pick( + pick( object: T, callback: ObjectIterator, thisArg?: any): Picked;