Ensure when OrderedSet becomes empty, that it remains OrderedSet (immutable-js#1335)

leebyron · web-flow · commit ff8094feda04 · 2017-10-04T14:19:35.000-07:00
Fixes immutable-js#1188
diff --git a/__tests__/issues.ts b/__tests__/issues.ts
@@ -8,7 +8,7 @@
 ///<reference path='../resources/jest.d.ts'/>
 
 declare var Symbol: any;
-import { List, OrderedMap, Record, Seq, Set } from '../';
+import { List, OrderedMap, OrderedSet, Record, Seq, Set } from '../';
 
 describe('Issue #1175', () => {
   it('invalid hashCode() response should not infinitly recurse', () => {
@@ -26,6 +26,14 @@ describe('Issue #1175', () => {
   });
 });
 
+describe('Issue #1188', () => {
+  it('Removing items from OrderedSet should return OrderedSet', () => {
+    const orderedSet = OrderedSet(['one', 'two', 'three']);
+    const emptyOrderedSet = orderedSet.subtract(['two', 'three', 'one']);
+    expect(OrderedSet.isOrderedSet(emptyOrderedSet)).toBe(true);
+  });
+});
+
 describe('Issue #1220 : Seq.rest() throws an exception when invoked on a single item sequence ', () => {
   it('should be iterable', () => {
     // Helper for this test
diff --git a/src/Set.js b/src/Set.js
@@ -164,7 +164,7 @@ export class Set extends SetCollection {
     const newMap = this._map.__ensureOwner(ownerID);
     if (!ownerID) {
       if (this.size === 0) {
-        return emptySet();
+        return this.__empty();
       }
       this.__ownerID = ownerID;
       this._map = newMap;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ export class Set extends SetCollection {`
`164`	`164`	`const newMap = this._map.__ensureOwner(ownerID);`
`165`	`165`	`if (!ownerID) {`
`166`	`166`	`if (this.size === 0) {`
`167`		`- return emptySet();`
	`167`	`+ return this.__empty();`
`168`	`168`	`}`
`169`	`169`	`this.__ownerID = ownerID;`
`170`	`170`	`this._map = newMap;`