Merge pull request #43 from brightcove/union-list-map

Allow Lists, Maps, and Records to coexist in a Union

.gitignore

@@ -3,3 +3,5 @@ node_modules
 
 # build artifacts
 **/lib/*
+
+.idea

src/test/index.js

@@ -1,5 +1,7 @@
 import test from "./test"
 import * as Immutable from "immutable"
+import {List} from "../list"
+import {Map} from "../map"
 import {Record} from "../record"
 import {Typed, typeOf, Union, Range, Maybe} from "../typed"
 
@@ -567,3 +569,24 @@ test("Union of similar records", assert => {
  assert.equal(Action({action: remove}).action, remove, "recognizes Remove")
  assert.ok(Action({action: ambigius}).action instanceof Add, "matches Add")
 })
+
+test("Union of lists, maps, and records", assert => {
+ const MyList = List(Number(0))
+ const MyMap = Map(String, String)
+ const MyRecord = Record({id: Number(0)})
+ const Action = Record({action: Union(MyList, MyMap, MyRecord)})
+
+ const myList = MyList()
+ const myMap = MyMap()
+ const myRecord = MyRecord()
+ const ambiguousList = [5]
+ const ambiguousMap = {id: 'foo'}
+ const ambiguousRecord = {id: 1}
+
+ assert.equal(Action({action: myList}).action, myList, "recognizes MyList")
+ assert.equal(Action({action: myMap}).action, myMap, "recognizes MyMap")
+ assert.equal(Action({action: myRecord}).action, myRecord, "recognizes MyRecord")
+ assert.ok(Action({action: ambiguousList}).action instanceof MyList, "matches MyList")
+ assert.ok(Action({action: ambiguousList}).action instanceof MyList, "matches MyMap")
+ assert.ok(Action({action: ambiguousRecord}).action instanceof MyRecord, "matches MyRecord")
+})

src/typed.js

@@ -220,9 +220,16 @@ class UnionType extends Type {
 
  index = 0
  while (index < count) {
- const result = variants[index][$read](value)
- if (!(result instanceof TypeError)) {
- return result
+ let result
+ try {
+ result = variants[index][$read](value)
+ if (!(result instanceof TypeError)) {
+ return result
+ }
+ } catch (ex) {
+ if (!(ex instanceof TypeError)) {
+ throw ex
+ }
  }
  index = index + 1
  }