Updated compiler

Author: delvedor

specification/compiler/model/metamodel.ts

@@ -152,7 +152,7 @@ export abstract class BaseType {
   variantName?: string
 }
 
-export type Variants = ExternalTag | InternalTag
+export type Variants = ExternalTag | InternalTag | Container
 
 export class ExternalTag {
   kind: 'external_tag'
@@ -163,6 +163,10 @@ export class InternalTag {
   tag: string // Name of the property that holds the variant tag
 }
 
+export class Container {
+  kind: 'container'
+}
+
 /**
  * Inherits clause (aka extends or implements) for an interface or request
  */
@@ -275,7 +279,7 @@ export class TypeAlias extends BaseType {
   /** generic parameters: either concrete types or open parameters from the enclosing type */
   generics?: ValueOf[]
   /** Identify typed_key unions (external) and variant inventories (internal) */
-  variants?: Variants
+  variants?: InternalTag | ExternalTag
 }
 
 // ------------------------------------------------------------------------------------------------

specification/compiler/model/utils.ts

@@ -381,6 +381,10 @@ export function modelTypeAlias (declaration: TypeAliasDeclaration): model.TypeAl
   if (alias.kind === 'union_of') {
     const variants = parseVariantsTag(declaration.getJsDocs())
     if (variants != null) {
+      assert(
+        variants.kind === 'internal_tag' || variants.kind === 'external_tag',
+        'Type Aliases can only have internal or external variants'
+      )
       typeAlias.variants = variants
     }
   }
@@ -668,6 +672,10 @@ export function parseVariantsTag (jsDoc: JSDoc[]): model.Variants | undefined {
     return { kind: 'external_tag' }
   }
 
+  if (type === 'container') {
+    return { kind: 'container' }
+  }
+
   assert(type === 'internal', `Bad variant type: ${type}`)
   assert(typeof value === 'string', 'Internal variant requires a tag definition')
   const [tag, property] = value.split('=')