Fixes and support for unions.

Author: sedwards2009

TypeScriptDefinitionToolkit.ts

@@ -27,7 +27,8 @@ export module Defs {
     CLASS_DECLARATION = 16,
     AMBIENT_VARIABLE = 17,
     ENUM = 18,
-    ENUM_MEMBER = 19
+    ENUM_MEMBER = 19,
+    UNION_TYPE = 20
   }
 
   export interface Base {
@@ -97,6 +98,10 @@ export module Defs {
     members: PrimaryType[];
   }
 
+  export interface UnionType extends PrimaryType {
+    members: PrimaryType[];
+  }
+  
   // FIXME add an array type??
   // -- end types.
 
@@ -282,6 +287,11 @@ export function toString(obj: Defs.Base, level: number=0, indent: string = "
         return "[" + tuple.members.map( (t) => toString(t, level+1, indent) ).join(", ") + "]";
         break;
 
+      case Defs.Type.UNION_TYPE:
+        let union = <Defs.UnionType> obj;
+        return union.members.map( (m) => toString(m) ).join("|");
+        break;
+          
       case Defs.Type.EXPORT_ASSIGNMENT:
         let exportAssign = <Defs.ExportAssignment> obj;
         return dent + "export = " + exportAssign.name + ";\n";

test.ts

@@ -298,6 +298,10 @@ export function testTypeAlias(test: nodeunit.Test): void {
   roundTrip(test, `type foo = bar;`);
 }
 
+export function testTypeAlias2(test: nodeunit.Test): void {
+  roundTrip(test, `type strings = string|string[];`);
+}
+
 export function testImportDeclaration(test: nodeunit.Test): void {
   roundTrip(test, `import foo = bar;`);
 }

typescript_definition.pegjs

@@ -21,6 +21,7 @@ var CLASS_DECLARATION = 16;
 var AMBIENT_VARIABLE = 17;
 var ENUM = 18;
 var ENUM_MEMBER = 19;
+var UNION_TYPE = 20;
 
 }
 
@@ -320,8 +321,8 @@ type
     / constructor_type
 
 primary_or_union_type
-    = primary_type
-    / union_type
+    = union_type
+    / primary_type
 
 primary_type
     = name:parenthesized_type _ array:array_square !(_ ARROW) /* A parenthesized looks very similar to the start of function signature */
@@ -466,7 +467,17 @@ tuple_element_types
     }
 
 union_type
-    = primary_type PIPE primary_or_union_type
+    = head:primary_type PIPE rest:primary_or_union_type
+    {
+      var members = [];
+      members.push(head);
+      if (rest.type === UNION_TYPE) {
+        members = members.concat(rest.members);
+      } else {
+        members.push(rest);
+      }
+      return {type: UNION_TYPE, members: members };
+    }
 
 function_type
     = typeParameters:type_parameters? _ LBRACKET _ parameterList:parameter_list? _ RBRACKET _ ARROW _ type:type