Fix issue with multiple complex structures in union

Fixes #11 Fixes #10
gkz · Apr 3, 2020 · 6a2c33c · 6a2c33c
1 parent b518bbc
commit 6a2c33c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/lib/parse-type.js b/lib/parse-type.js
diff --git a/src/parse-type.ls b/src/parse-type.ls
@@ -95,9 +95,9 @@ function consume-types tokens
  * type: 'Null'
  types-so-far = {+Undefined, +Null}
  for ever
- {type}:type-obj = consume-type tokens
+ {type, structure}:type-obj = consume-type tokens
  types.push type-obj unless types-so-far[type]
- types-so-far[type] = true
+ types-so-far[type] = true unless structure?
  break unless maybe-consume-op tokens, '|'
  types
 

diff --git a/test/check.ls b/test/check.ls
@@ -70,6 +70,7 @@ suite 'check' ->
  test 'multiple' ->
  assert c 'Number | String', 'hi'
  assert not c 'Date | Number', 'hi'
+ assert c 'String | [String] | [Object]', [{}]
 
  suite 'Array' ->
  test 'bare' ->
@@ -236,6 +237,9 @@ suite 'check' ->
  assert c type, {a: ['hi', [1, 2, 3], {x: {a: 42}, y: [1, 'bye']}], b: new Error 'message'}
  assert c type, {a: ['moo', [3], {x: {}, y: [], z: 999}], b: new Error '23'}
 
+ test 'nexted with union' ->
+ assert c '[[Number] | [String]]', [[1, 2], ['foo', 'bar'], [3]]
+
  suite 'errors' ->
  test 'no type defined' ->
  throws (-> parsed-type-check [{}], true), /No type defined\. Input: true/

diff --git a/test/parse-type.ls b/test/parse-type.ls
@@ -108,6 +108,17 @@ suite 'parse type' ->
  ]
  ]
 
+ test 'nested with multiple' ->
+ deep-equal (p '[[Number] | [String]]'), [
+ structure: 'array'
+ of: [
+ * structure: 'array'
+ of: [type: 'Number']
+ * structure: 'array'
+ of: [type: 'String']
+ ]
+ ]
+
  suite 'array structure with type' ->
  test 'simple' ->
  deep-equal (p 'Int16Array[Int]'), [