diff --git a/lazy.js/lazy.js-tests.ts b/lazy.js/lazy.js-tests.ts index 7689bcaf78..f719a90a90 100644 --- a/lazy.js/lazy.js-tests.ts +++ b/lazy.js/lazy.js-tests.ts @@ -3,10 +3,10 @@ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - interface Foo { - foo(): string; + foo(): string; } interface Bar { - bar(): string; + bar(): string; } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -51,38 +51,38 @@ function fnValueCallback(value: Foo): void { } function fnGetKeyCallback(value: Foo): string { - return str; + return str; } function fnTestCallback(value: Foo): boolean { - return bool; + return bool; } function fnMapCallback(value: Foo): Bar { - return bar; + return bar; } function fnMapStringCallback(value: string): string { - return str; + return str; } function fnNumberCallback(value: Foo): number { - return num; + return num; } function fnMemoCallback(memo: Bar, value: Foo): Bar { - return bar; + return bar; } function fnGeneratorCallback(index: number): Foo { - return foo; + return foo; } // Lazy fooArraySeq = Lazy(fooArr); -fooObjectSeq = Lazy({a:foo, b:foo}); -anyObjectSeq = Lazy({a:num, b:str}); +fooObjectSeq = Lazy({a: foo, b: foo}); +anyObjectSeq = Lazy({a: num, b: str}); stringSeq = Lazy(str); // Strict diff --git a/lazy.js/lazy.js.d.ts b/lazy.js/lazy.js.d.ts index ca19aed983..0470929d6d 100644 --- a/lazy.js/lazy.js.d.ts +++ b/lazy.js/lazy.js.d.ts @@ -5,243 +5,244 @@ declare module LazyJS { - interface LazyStatic { + interface LazyStatic { - (value: string):StringLikeSequence; - (value: T[]):ArrayLikeSequence; - (value: any[]):ArrayLikeSequence; - (value: Object):ObjectLikeSequence; - (value: Object):ObjectLikeSequence; + (value: string): StringLikeSequence; + (value: T[]): ArrayLikeSequence; + (value: any[]): ArrayLikeSequence; + (value: Object): ObjectLikeSequence; + (value: Object): ObjectLikeSequence; - strict():LazyStatic; + strict(): LazyStatic; - generate(generatorFn: GeneratorCallback, length?: number):GeneratedSequence; + generate(generatorFn: GeneratorCallback, length?: number): GeneratedSequence; - range(to: number):GeneratedSequence; - range(from: number, to: number, step?: number):GeneratedSequence; + range(to: number): GeneratedSequence; + range(from: number, to: number, step?: number): GeneratedSequence; - repeat(value: T, count?: number):GeneratedSequence; + repeat(value: T, count?: number): GeneratedSequence; - on(eventType: string):Sequence; + on(eventType: string): Sequence; - readFile(path: string):StringLikeSequence; - makeHttpRequest(path: string):StringLikeSequence; - } + readFile(path: string): StringLikeSequence; + makeHttpRequest(path: string): StringLikeSequence; + } - interface ArrayLike { - length:number; - [index:number]:T; - } + interface ArrayLike { + length: number; + [index: number]: T; + } - interface Callback { - ():void; - } + interface Callback { + (): void; + } - interface ErrorCallback { - (error: any):void; - } + interface ErrorCallback { + (error: any): void; + } - interface ValueCallback { - (value: T):void; - } + interface ValueCallback { + (value: T): void; + } - interface GetKeyCallback { - (value: T):string; - } + interface GetKeyCallback { + (value: T): string; + } - interface TestCallback { - (value: T):boolean; - } + interface TestCallback { + (value: T): boolean; + } - interface MapCallback { - (value: T):U; - } + interface MapCallback { + (value: T): U; + } - interface MapStringCallback { - (value: string):string; - } + interface MapStringCallback { + (value: string): string; + } - interface NumberCallback { - (value: T):number; - } + interface NumberCallback { + (value: T): number; + } - interface MemoCallback { - (memo: U, value: T):U; - } + interface MemoCallback { + (memo: U, value: T): U; + } - interface GeneratorCallback { - (index: number):T; - } + interface GeneratorCallback { + (index: number): T; + } - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - interface Iterator { - new (sequence: Sequence):Iterator; - current():T; - moveNext():boolean; - } + interface Iterator { + new (sequence: Sequence): Iterator; + current(): T; + moveNext(): boolean; + } - interface GeneratedSequence extends Sequence { - new(generatorFn: GeneratorCallback, length: number):GeneratedSequence; - length():number; - } + interface GeneratedSequence extends Sequence { + new(generatorFn: GeneratorCallback, length: number): GeneratedSequence; + length(): number; + } - interface AsyncSequence extends SequenceBase { - each(callback: ValueCallback):AsyncHandle; - } + interface AsyncSequence extends SequenceBase { + each(callback: ValueCallback): AsyncHandle; + } - interface AsyncHandle { - cancel():void; - onComplete(callback: Callback):void; - onError(callback: ErrorCallback):void; - } + interface AsyncHandle { + cancel(): void; + onComplete(callback: Callback): void; + onError(callback: ErrorCallback): void; + } - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - module Sequence { - function define(methodName: string[], overrides: Object): Function; - } + module Sequence { + function define(methodName: string[], overrides: Object): Function; + } - interface Sequence extends SequenceBase { - each(eachFn: ValueCallback):Sequence; - } + interface Sequence extends SequenceBase { + each(eachFn: ValueCallback): Sequence; + } - interface SequenceBase extends SequenceBaser { - first():any; - first(count: number):Sequence; - indexOf(value: any, startIndex?: number):Sequence; + interface SequenceBase extends SequenceBaser { + first(): any; + first(count: number): Sequence; + indexOf(value: any, startIndex?: number): Sequence; - last():any; - last(count: number):Sequence; - lastIndexOf(value: any):Sequence; + last(): any; + last(count: number): Sequence; + lastIndexOf(value: any): Sequence; - reverse():Sequence; - } + reverse(): Sequence; + } - interface SequenceBaser { - // TODO improve define() (needs ugly overload) - async(interval: number):AsyncSequence; - chunk(size: number):Sequence; - compact():Sequence; - concat(var_args: T[]):Sequence; - consecutive(length: number):Sequence; - contains(value: T):boolean; - countBy(keyFn: GetKeyCallback): ObjectLikeSequence; - countBy(propertyName: string): ObjectLikeSequence; - dropWhile(predicateFn: TestCallback): Sequence; - every(predicateFn: TestCallback): boolean; - filter(predicateFn: TestCallback): Sequence; - find(predicateFn: TestCallback): Sequence; - findWhere(properties: Object): Sequence; + interface SequenceBaser { + // TODO improve define() (needs ugly overload) + async(interval: number): AsyncSequence; + chunk(size: number): Sequence; + compact(): Sequence; + concat(var_args: T[]): Sequence; + consecutive(length: number): Sequence; + contains(value: T): boolean; + countBy(keyFn: GetKeyCallback): ObjectLikeSequence; + countBy(propertyName: string): ObjectLikeSequence; + dropWhile(predicateFn: TestCallback): Sequence; + every(predicateFn: TestCallback): boolean; + filter(predicateFn: TestCallback): Sequence; + find(predicateFn: TestCallback): Sequence; + findWhere(properties: Object): Sequence; - flatten(): Sequence; - groupBy(keyFn: GetKeyCallback): ObjectLikeSequence; - initial(count?: number): Sequence; - intersection(var_args: T[]): Sequence; - invoke(methodName: string): Sequence; - isEmpty(): boolean; - join(delimiter?: string): string; - map(mapFn: MapCallback): Sequence; + flatten(): Sequence; + groupBy(keyFn: GetKeyCallback): ObjectLikeSequence; + initial(count?: number): Sequence; + intersection(var_args: T[]): Sequence; + invoke(methodName: string): Sequence; + isEmpty(): boolean; + join(delimiter?: string): string; + map(mapFn: MapCallback): Sequence; - max(valueFn?: NumberCallback): T; - min(valueFn?: NumberCallback): T; - pluck(propertyName: string): Sequence; - reduce(aggregatorFn: MemoCallback, memo?: U): U; - reduceRight(aggregatorFn: MemoCallback, memo: U): U; - reject(predicateFn: TestCallback): Sequence; - rest(count?: number): Sequence; - shuffle(): Sequence; - some(predicateFn?: TestCallback): boolean; - sortBy(sortFn: NumberCallback): Sequence; - sortedIndex(value: T): Sequence; - sum(valueFn?: NumberCallback): Sequence; - takeWhile(predicateFn: TestCallback): Sequence; - union(var_args: T[]): Sequence; - uniq(): Sequence; - where(properties: Object): Sequence; - without(var_args: T[]): Sequence; - zip(var_args: T[]): Sequence; + max(valueFn?: NumberCallback): T; + min(valueFn?: NumberCallback): T; + pluck(propertyName: string): Sequence; + reduce(aggregatorFn: MemoCallback, memo?: U): U; + reduceRight(aggregatorFn: MemoCallback, memo: U): U; + reject(predicateFn: TestCallback): Sequence; + rest(count?: number): Sequence; + shuffle(): Sequence; + some(predicateFn?: TestCallback): boolean; + sortBy(sortFn: NumberCallback): Sequence; + sortedIndex(value: T): Sequence; + size(): number; + sum(valueFn?: NumberCallback): Sequence; + takeWhile(predicateFn: TestCallback): Sequence; + union(var_args: T[]): Sequence; + uniq(): Sequence; + where(properties: Object): Sequence; + without(var_args: T[]): Sequence; + zip(var_args: T[]): Sequence; - toArray(): T[]; - toObject(): Object; - } + toArray(): T[]; + toObject(): Object; + } - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - module ArrayLikeSequence { - function define(methodName: string[], overrides: Object): Function; - } + module ArrayLikeSequence { + function define(methodName: string[], overrides: Object): Function; + } - interface ArrayLikeSequence extends Sequence { - // define()X; - concat(): ArrayLikeSequence; - first(count?: number): ArrayLikeSequence; - get(index: number): T; - length(): number; - map(mapFn: MapCallback): ArrayLikeSequence; - pop(): ArrayLikeSequence; - rest(count?: number): ArrayLikeSequence; - reverse(): ArrayLikeSequence; - shift(): ArrayLikeSequence; - slice(begin: number, end?: number): ArrayLikeSequence; - } + interface ArrayLikeSequence extends Sequence { + // define()X; + concat(): ArrayLikeSequence; + first(count?: number): ArrayLikeSequence; + get(index: number): T; + length(): number; + map(mapFn: MapCallback): ArrayLikeSequence; + pop(): ArrayLikeSequence; + rest(count?: number): ArrayLikeSequence; + reverse(): ArrayLikeSequence; + shift(): ArrayLikeSequence; + slice(begin: number, end?: number): ArrayLikeSequence; + } - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - module ObjectLikeSequence { - function define(methodName: string[], overrides: Object): Function; - } + module ObjectLikeSequence { + function define(methodName: string[], overrides: Object): Function; + } - interface ObjectLikeSequence extends Sequence { - assign(other: Object): ObjectLikeSequence; - // throws error - //async(): X; - defaults(defaults: Object): ObjectLikeSequence; - functions(): Sequence; - get(property: string): ObjectLikeSequence; - invert(): ObjectLikeSequence; - keys(): Sequence; - omit(properties: string[]): ObjectLikeSequence; - pairs(): Sequence; - pick(properties: string[]): ObjectLikeSequence; - toArray(): T[]; - toObject(): Object; - values(): Sequence; - } + interface ObjectLikeSequence extends Sequence { + assign(other: Object): ObjectLikeSequence; + // throws error + //async(): X; + defaults(defaults: Object): ObjectLikeSequence; + functions(): Sequence; + get(property: string): ObjectLikeSequence; + invert(): ObjectLikeSequence; + keys(): Sequence; + omit(properties: string[]): ObjectLikeSequence; + pairs(): Sequence; + pick(properties: string[]): ObjectLikeSequence; + toArray(): T[]; + toObject(): Object; + values(): Sequence; + } - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - module StringLikeSequence { - function define(methodName: string[], overrides: Object): Function; - } + module StringLikeSequence { + function define(methodName: string[], overrides: Object): Function; + } - interface StringLikeSequence extends SequenceBaser { - charAt(index: number): string; - charCodeAt(index: number): number; - contains(value: string): boolean; - endsWith(suffix: string): boolean; + interface StringLikeSequence extends SequenceBaser { + charAt(index: number): string; + charCodeAt(index: number): number; + contains(value: string): boolean; + endsWith(suffix: string): boolean; - first(): string; - first(count: number): StringLikeSequence; + first(): string; + first(count: number): StringLikeSequence; - indexOf(substring: string, startIndex?: number): number; + indexOf(substring: string, startIndex?: number): number; - last(): string; - last(count: number): StringLikeSequence; + last(): string; + last(count: number): StringLikeSequence; - lastIndexOf(substring: string, startIndex?: number): number; - mapString(mapFn: MapStringCallback): StringLikeSequence; - match(pattern: RegExp): StringLikeSequence; - reverse(): StringLikeSequence; + lastIndexOf(substring: string, startIndex?: number): number; + mapString(mapFn: MapStringCallback): StringLikeSequence; + match(pattern: RegExp): StringLikeSequence; + reverse(): StringLikeSequence; - split(delimiter: string): StringLikeSequence; - split(delimiter: RegExp): StringLikeSequence; + split(delimiter: string): StringLikeSequence; + split(delimiter: RegExp): StringLikeSequence; - startsWith(prefix: string): boolean; - substring(start: number, stop?: number): StringLikeSequence; - toLowerCase(): StringLikeSequence; - toUpperCase(): StringLikeSequence; - } + startsWith(prefix: string): boolean; + substring(start: number, stop?: number): StringLikeSequence; + toLowerCase(): StringLikeSequence; + toUpperCase(): StringLikeSequence; + } } declare var Lazy: LazyJS.LazyStatic;