This repository was archived by the owner on Mar 12, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 198
Added static Immutable.sortBy(array[, sorter]) function #211
Open
LukeusMaximus
wants to merge
4
commits into
rtfeldman:master
Choose a base branch
from
LukeusMaximus:static-sort-by
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -577,6 +577,42 @@ function immutableInit(config) { | |
| return result; | ||
| } | ||
|
|
||
| function sortBy(array, sorter) { | ||
| var result = [], i, length, rearranged; | ||
|
|
||
| if (!(array instanceof Array)) { | ||
| throw new TypeError("The first argument to Immutable#sortBy must be an array."); | ||
| } | ||
|
|
||
| for (i = 0, length = array.length; i < length; i++) { | ||
| result.push(array[i]); | ||
| } | ||
| result.sort(sorter); | ||
|
|
||
| // Test if elements of the array have been rearranged | ||
| rearranged = false; | ||
| for (i = 0, length = array.length; i < length; i++) { | ||
| if(result[i] !== array[i]) { | ||
| // Check if both are NaN. Type checks catch cases where isNaN returns true for strings. | ||
| if(!(typeof result[i] === "number" && isNaN(result[i]) && typeof array[i] === "number" && isNaN(array[i]))) { | ||
| rearranged = true; | ||
| } | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should |
||
| } | ||
| } | ||
|
|
||
| // If the elements haven't been rearranged, return the original immutable | ||
| if(rearranged) { | ||
| return makeImmutableArray(result); | ||
| } else { | ||
| // Ensure that the returned array is immutable | ||
| if(isImmutable(array)) { | ||
| return array; | ||
| } else { | ||
| return makeImmutableArray(array); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Creates plain object to be used for cloning | ||
| function instantiatePlainObject() { | ||
| return {}; | ||
|
|
@@ -719,6 +755,7 @@ function immutableInit(config) { | |
| Immutable.getIn = toStatic(getIn); | ||
| Immutable.flatMap = toStatic(flatMap); | ||
| Immutable.asObject = toStatic(asObject); | ||
| Immutable.sortBy = sortBy; | ||
| if (!globalConfig.use_static) { | ||
| Immutable.static = immutableInit({ | ||
| use_static: true | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| var JSC = require("jscheck"); | ||
| var getTestUtils = require("../TestUtils.js"); | ||
| var assert = require("chai").assert; | ||
|
|
||
| module.exports = function(config) { | ||
| var Immutable = config.implementation; | ||
| var TestUtils = getTestUtils(Immutable); | ||
| var check = TestUtils.check; | ||
|
|
||
| function dummySorter(a, b) { | ||
| if(b > a) { | ||
| return 1; | ||
| } else if(b < a) { | ||
| return -1; | ||
| } else { | ||
| return 0; | ||
| } | ||
| } | ||
|
|
||
| describe("#sortBy", function() { | ||
| it("produces a sorted immutable array", function() { | ||
| check(100, [JSC.array(JSC.integer(4), JSC.any())], function(array) { | ||
| var immutable = Immutable(array); | ||
| var mutable = array.slice(); | ||
|
|
||
| var resultImmutable = Immutable.sortBy(immutable); | ||
| var resultMutable = mutable.slice(); | ||
| resultMutable.sort(); | ||
|
|
||
| TestUtils.assertJsonEqual(resultImmutable, resultMutable); | ||
| }); | ||
| }); | ||
|
|
||
| it("produces a sorted immutable array when provided with a sorter function", function() { | ||
| check(100, [JSC.array(JSC.integer(4), JSC.any())], function(array) { | ||
| var immutable = Immutable(array); | ||
| var mutable = array.slice(); | ||
|
|
||
| var resultImmutable = Immutable.sortBy(immutable, dummySorter); | ||
| var resultMutable = mutable.slice(); | ||
| resultMutable.sort(dummySorter); | ||
|
|
||
| TestUtils.assertJsonEqual(resultImmutable, resultMutable); | ||
| }); | ||
| }); | ||
|
|
||
| it("returns the same array if it is already sorted", function() { | ||
| check(100, [JSC.array(JSC.integer(4), JSC.any())], function(array) { | ||
| var mutable = array.slice().sort(); | ||
| var immutable = Immutable(mutable); | ||
|
|
||
| var resultImmutable = Immutable.sortBy(immutable); | ||
|
|
||
| assert.strictEqual(resultImmutable, immutable); | ||
| }); | ||
| }); | ||
| }); | ||
| }; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not use
asMutable()instead of making a mutable copy manually?