diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts index 5c2b3d573..d0d3c94aa 100644 --- a/lodash/lodash-tests.ts +++ b/lodash/lodash-tests.ts @@ -5291,8 +5291,8 @@ module TestSortByAll { } } -// _.sortByOrder -module TestSortByOrder { +// _.orderBy +module TestorderBy { type SampleObject = {a: number; b: string; c: boolean}; let array: SampleObject[]; @@ -5305,79 +5305,79 @@ module TestSortByOrder { let iteratees: (value: string) => any|((value: string) => any)[]; let result: string[]; - result = _.sortByOrder('acbd', iteratees); - result = _.sortByOrder('acbd', iteratees, orders); + result = _.orderBy('acbd', iteratees); + result = _.orderBy('acbd', iteratees, orders); } { let iteratees: (value: SampleObject) => any|string|{a: number}|((value: SampleObject) => any|string|{a: number})[]; let result: SampleObject[]; - result = _.sortByOrder<{a: number}, SampleObject>(array, iteratees); - result = _.sortByOrder<{a: number}, SampleObject>(array, iteratees, orders); - result = _.sortByOrder(array, iteratees); - result = _.sortByOrder(array, iteratees, orders); + result = _.orderBy<{a: number}, SampleObject>(array, iteratees); + result = _.orderBy<{a: number}, SampleObject>(array, iteratees, orders); + result = _.orderBy(array, iteratees); + result = _.orderBy(array, iteratees, orders); - result = _.sortByOrder<{a: number}, SampleObject>(list, iteratees); - result = _.sortByOrder<{a: number}, SampleObject>(list, iteratees, orders); - result = _.sortByOrder(list, iteratees); - result = _.sortByOrder(list, iteratees, orders); + result = _.orderBy<{a: number}, SampleObject>(list, iteratees); + result = _.orderBy<{a: number}, SampleObject>(list, iteratees, orders); + result = _.orderBy(list, iteratees); + result = _.orderBy(list, iteratees, orders); - result = _.sortByOrder<{a: number}, SampleObject>(numericDictionary, iteratees); - result = _.sortByOrder<{a: number}, SampleObject>(numericDictionary, iteratees, orders); - result = _.sortByOrder(numericDictionary, iteratees); - result = _.sortByOrder(numericDictionary, iteratees, orders); + result = _.orderBy<{a: number}, SampleObject>(numericDictionary, iteratees); + result = _.orderBy<{a: number}, SampleObject>(numericDictionary, iteratees, orders); + result = _.orderBy(numericDictionary, iteratees); + result = _.orderBy(numericDictionary, iteratees, orders); - result = _.sortByOrder<{a: number}, SampleObject>(dictionary, iteratees); - result = _.sortByOrder<{a: number}, SampleObject>(dictionary, iteratees, orders); - result = _.sortByOrder(dictionary, iteratees); - result = _.sortByOrder(dictionary, iteratees, orders); + result = _.orderBy<{a: number}, SampleObject>(dictionary, iteratees); + result = _.orderBy<{a: number}, SampleObject>(dictionary, iteratees, orders); + result = _.orderBy(dictionary, iteratees); + result = _.orderBy(dictionary, iteratees, orders); } { let iteratees: (value: SampleObject) => any|string|{a: number}|((value: SampleObject) => any|string|{a: number})[]; let result: _.LoDashImplicitArrayWrapper; - result = _(array).sortByOrder<{a: number}>(iteratees); - result = _(array).sortByOrder<{a: number}>(iteratees, orders); + result = _(array).orderBy<{a: number}>(iteratees); + result = _(array).orderBy<{a: number}>(iteratees, orders); - result = _(list).sortByOrder<{a: number}, SampleObject>(iteratees); - result = _(list).sortByOrder<{a: number}, SampleObject>(iteratees, orders); - result = _(list).sortByOrder(iteratees); - result = _(list).sortByOrder(iteratees, orders); + result = _(list).orderBy<{a: number}, SampleObject>(iteratees); + result = _(list).orderBy<{a: number}, SampleObject>(iteratees, orders); + result = _(list).orderBy(iteratees); + result = _(list).orderBy(iteratees, orders); - result = _(numericDictionary).sortByOrder<{a: number}, SampleObject>(iteratees); - result = _(numericDictionary).sortByOrder<{a: number}, SampleObject>(iteratees, orders); - result = _(numericDictionary).sortByOrder(iteratees); - result = _(numericDictionary).sortByOrder(iteratees, orders); + result = _(numericDictionary).orderBy<{a: number}, SampleObject>(iteratees); + result = _(numericDictionary).orderBy<{a: number}, SampleObject>(iteratees, orders); + result = _(numericDictionary).orderBy(iteratees); + result = _(numericDictionary).orderBy(iteratees, orders); - result = _(dictionary).sortByOrder<{a: number}, SampleObject>(iteratees); - result = _(dictionary).sortByOrder<{a: number}, SampleObject>(iteratees, orders); - result = _(dictionary).sortByOrder(iteratees); - result = _(dictionary).sortByOrder(iteratees, orders); + result = _(dictionary).orderBy<{a: number}, SampleObject>(iteratees); + result = _(dictionary).orderBy<{a: number}, SampleObject>(iteratees, orders); + result = _(dictionary).orderBy(iteratees); + result = _(dictionary).orderBy(iteratees, orders); } { let iteratees: (value: SampleObject) => any|string|{a: number}|((value: SampleObject) => any|string|{a: number})[]; let result: _.LoDashExplicitArrayWrapper; - result = _(array).chain().sortByOrder<{a: number}>(iteratees); - result = _(array).chain().sortByOrder<{a: number}>(iteratees, orders); + result = _(array).chain().orderBy<{a: number}>(iteratees); + result = _(array).chain().orderBy<{a: number}>(iteratees, orders); - result = _(list).chain().sortByOrder<{a: number}, SampleObject>(iteratees); - result = _(list).chain().sortByOrder<{a: number}, SampleObject>(iteratees, orders); - result = _(list).chain().sortByOrder(iteratees); - result = _(list).chain().sortByOrder(iteratees, orders); + result = _(list).chain().orderBy<{a: number}, SampleObject>(iteratees); + result = _(list).chain().orderBy<{a: number}, SampleObject>(iteratees, orders); + result = _(list).chain().orderBy(iteratees); + result = _(list).chain().orderBy(iteratees, orders); - result = _(numericDictionary).chain().sortByOrder<{a: number}, SampleObject>(iteratees); - result = _(numericDictionary).chain().sortByOrder<{a: number}, SampleObject>(iteratees, orders); - result = _(numericDictionary).chain().sortByOrder(iteratees); - result = _(numericDictionary).chain().sortByOrder(iteratees, orders); + result = _(numericDictionary).chain().orderBy<{a: number}, SampleObject>(iteratees); + result = _(numericDictionary).chain().orderBy<{a: number}, SampleObject>(iteratees, orders); + result = _(numericDictionary).chain().orderBy(iteratees); + result = _(numericDictionary).chain().orderBy(iteratees, orders); - result = _(dictionary).chain().sortByOrder<{a: number}, SampleObject>(iteratees); - result = _(dictionary).chain().sortByOrder<{a: number}, SampleObject>(iteratees, orders); - result = _(dictionary).chain().sortByOrder(iteratees); - result = _(dictionary).chain().sortByOrder(iteratees, orders); + result = _(dictionary).chain().orderBy<{a: number}, SampleObject>(iteratees); + result = _(dictionary).chain().orderBy<{a: number}, SampleObject>(iteratees, orders); + result = _(dictionary).chain().orderBy(iteratees); + result = _(dictionary).chain().orderBy(iteratees, orders); } } diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts index 05f51816e..75bf6baac 100644 --- a/lodash/lodash.d.ts +++ b/lodash/lodash.d.ts @@ -24,7 +24,7 @@ TODO: - [x] Renamed _.pairs to _.toPairs - [x] Renamed _.rest to _.tail - [x] Renamed _.restParam to _.rest -- [ ] Renamed _.sortByOrder to _.orderBy +- [x] Renamed _.sortByOrder to _.orderBy - [ ] Renamed _.trimLeft & _.trimRight to _.trimStart & _.trimEnd - [ ] Renamed _.trunc to _.truncate @@ -8671,7 +8671,7 @@ declare module _ { ): LoDashExplicitArrayWrapper; } - //_.sortByOrder + //_.orderBy interface LoDashStatic { /** * This method is like _.sortByAll except that it allows specifying the sort orders of the iteratees to sort @@ -8689,52 +8689,52 @@ declare module _ { * @param orders The sort orders of iteratees. * @return Returns the new sorted array. */ - sortByOrder( + orderBy( collection: List, iteratees: ListIterator|string|W|(ListIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): T[]; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( collection: List, iteratees: ListIterator|string|Object|(ListIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): T[]; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( collection: NumericDictionary, iteratees: NumericDictionaryIterator|string|W|(NumericDictionaryIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): T[]; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( collection: NumericDictionary, iteratees: NumericDictionaryIterator|string|Object|(NumericDictionaryIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): T[]; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( collection: Dictionary, iteratees: DictionaryIterator|string|W|(DictionaryIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): T[]; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( collection: Dictionary, iteratees: DictionaryIterator|string|Object|(DictionaryIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] @@ -8743,9 +8743,9 @@ declare module _ { interface LoDashImplicitWrapper { /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|(ListIterator|string)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; @@ -8753,9 +8753,9 @@ declare module _ { interface LoDashImplicitArrayWrapper { /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|W|(ListIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; @@ -8763,49 +8763,49 @@ declare module _ { interface LoDashImplicitObjectWrapper { /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|W|(ListIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|Object|(ListIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: NumericDictionaryIterator|string|W|(NumericDictionaryIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: NumericDictionaryIterator|string|Object|(NumericDictionaryIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: DictionaryIterator|string|W|(DictionaryIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: DictionaryIterator|string|Object|(DictionaryIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): LoDashImplicitArrayWrapper; @@ -8813,9 +8813,9 @@ declare module _ { interface LoDashExplicitWrapper { /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|(ListIterator|string)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper; @@ -8823,9 +8823,9 @@ declare module _ { interface LoDashExplicitArrayWrapper { /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|W|(ListIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper; @@ -8833,49 +8833,49 @@ declare module _ { interface LoDashExplicitObjectWrapper { /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|W|(ListIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: ListIterator|string|Object|(ListIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: NumericDictionaryIterator|string|W|(NumericDictionaryIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: NumericDictionaryIterator|string|Object|(NumericDictionaryIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: DictionaryIterator|string|W|(DictionaryIterator|string|W)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper; /** - * @see _.sortByOrder + * @see _.orderBy */ - sortByOrder( + orderBy( iteratees: DictionaryIterator|string|Object|(DictionaryIterator|string|Object)[], orders?: boolean|string|(boolean|string)[] ): LoDashExplicitArrayWrapper;