Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart
index 03e393f3f6d0233749c5eae750afccd997d16657..9433136b98984f8fdaf1ea59459083e4413909a8 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart
@@ -5,10 +5,12 @@
 library versioning_test_client_mojom;
 
 import 'dart:async';
+import 'dart:collection';
 
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
-
+import 'package:mojo/mojo/bindings/types/mojom_types.mojom.dart' as mojom_types;
+import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 class Department extends bindings.MojoEnum {
   static const Department sales = const Department._(0);
   static const Department dev = const Department._(1);
@@ -53,12 +55,28 @@ class Department extends bindings.MojoEnum {
         return 'Department.sales';
       case dev:
         return 'Department.dev';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+mojom_types.MojomEnum _versioning_test_client_Department__() {
+  return new mojom_types.MojomEnum()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Department'
+      ..fullIdentifier = 'mojo.test.versioning.Department')
+    ..values = <mojom_types.EnumValue>[new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Sales')
+        ..enumTypeKey = '_versioning_test_client_Department__'
+        ..intValue = 0,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Dev')
+        ..enumTypeKey = '_versioning_test_client_Department__'
+        ..intValue = 1,];
+}
+
 
 
 class Employee extends bindings.Struct {
@@ -148,6 +166,31 @@ class Employee extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_Employee__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Employee'
+      ..fullIdentifier = 'mojo.test.versioning.Employee')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'EmployeeId')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint64),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Name')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Department')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_versioning_test_client_Department__'
+    ..typeKey = '_versioning_test_client_Department__'
+  )),
+      ];
+}
 
 
 class _HumanResourceDatabaseAddEmployeeParams extends bindings.Struct {
@@ -216,6 +259,22 @@ class _HumanResourceDatabaseAddEmployeeParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_AddEmployee_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HumanResourceDatabaseAddEmployeeParams'
+      ..fullIdentifier = 'mojo.test.versioning._HumanResourceDatabaseAddEmployeeParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Employee')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_versioning_test_client_Employee__'
+    ..typeKey = '_versioning_test_client_Employee__'
+  )),
+      ];
+}
 
 
 class HumanResourceDatabaseAddEmployeeResponseParams extends bindings.Struct {
@@ -283,6 +342,17 @@ class HumanResourceDatabaseAddEmployeeResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_AddEmployee_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HumanResourceDatabaseAddEmployeeResponseParams'
+      ..fullIdentifier = 'mojo.test.versioning.HumanResourceDatabaseAddEmployeeResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Success')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class _HumanResourceDatabaseQueryEmployeeParams extends bindings.Struct {
@@ -360,6 +430,21 @@ class _HumanResourceDatabaseQueryEmployeeParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_QueryEmployee_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HumanResourceDatabaseQueryEmployeeParams'
+      ..fullIdentifier = 'mojo.test.versioning._HumanResourceDatabaseQueryEmployeeParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Id')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint64),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RetrieveFingerPrint')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class HumanResourceDatabaseQueryEmployeeResponseParams extends bindings.Struct {
@@ -438,6 +523,31 @@ class HumanResourceDatabaseQueryEmployeeResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_QueryEmployee_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HumanResourceDatabaseQueryEmployeeResponseParams'
+      ..fullIdentifier = 'mojo.test.versioning.HumanResourceDatabaseQueryEmployeeResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Employee')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_versioning_test_client_Employee__'
+    ..typeKey = '_versioning_test_client_Employee__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'FingerPrint')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..nullable = true
+    
+    ..elementType = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint8))),
+      ];
+}
 
 
 class _HumanResourceDatabaseAttachFingerPrintParams extends bindings.Struct {
@@ -514,6 +624,22 @@ class _HumanResourceDatabaseAttachFingerPrintParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_AttachFingerPrint_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HumanResourceDatabaseAttachFingerPrintParams'
+      ..fullIdentifier = 'mojo.test.versioning._HumanResourceDatabaseAttachFingerPrintParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Id')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint64),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'FingerPrint')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..elementType = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint8))),
+      ];
+}
 
 
 class HumanResourceDatabaseAttachFingerPrintResponseParams extends bindings.Struct {
@@ -581,6 +707,17 @@ class HumanResourceDatabaseAttachFingerPrintResponseParams extends bindings.Stru
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_AttachFingerPrint_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HumanResourceDatabaseAttachFingerPrintResponseParams'
+      ..fullIdentifier = 'mojo.test.versioning.HumanResourceDatabaseAttachFingerPrintResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Success')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class _HumanResourceDatabaseListEmployeeIdsParams extends bindings.Struct {
@@ -639,6 +776,13 @@ class _HumanResourceDatabaseListEmployeeIdsParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_ListEmployeeIds_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HumanResourceDatabaseListEmployeeIdsParams'
+      ..fullIdentifier = 'mojo.test.versioning._HumanResourceDatabaseListEmployeeIdsParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class HumanResourceDatabaseListEmployeeIdsResponseParams extends bindings.Struct {
@@ -706,12 +850,62 @@ class HumanResourceDatabaseListEmployeeIdsResponseParams extends bindings.Struct
     return map;
   }
 }
+mojom_types.MojomStruct _versioning_test_client_HumanResourceDatabase_ListEmployeeIds_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HumanResourceDatabaseListEmployeeIdsResponseParams'
+      ..fullIdentifier = 'mojo.test.versioning.HumanResourceDatabaseListEmployeeIdsResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ids')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..nullable = true
+    
+    ..elementType = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint64))),
+      ];
+}
+
 
 const int _HumanResourceDatabase_addEmployeeName = 0;
 const int _HumanResourceDatabase_queryEmployeeName = 1;
 const int _HumanResourceDatabase_attachFingerPrintName = 2;
 const int _HumanResourceDatabase_listEmployeeIdsName = 3;
 
+mojom_types.MojomInterface _versioning_test_client_HumanResourceDatabase__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HumanResourceDatabase'
+      ..fullIdentifier = 'mojo.test.versioning.HumanResourceDatabase')
+    ..interfaceName = 'HumanResourceDatabase'
+    ..methods = <int, mojom_types.MojomMethod>{
+_HumanResourceDatabase_addEmployeeName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'AddEmployee')
+        ..ordinal = _HumanResourceDatabase_addEmployeeName
+        ..responseParams = _versioning_test_client_HumanResourceDatabase_AddEmployee_ResponseParams__()..parameters = _versioning_test_client_HumanResourceDatabase_AddEmployee_Params__(),_HumanResourceDatabase_queryEmployeeName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'QueryEmployee')
+        ..ordinal = _HumanResourceDatabase_queryEmployeeName
+        ..responseParams = _versioning_test_client_HumanResourceDatabase_QueryEmployee_ResponseParams__()..parameters = _versioning_test_client_HumanResourceDatabase_QueryEmployee_Params__(),_HumanResourceDatabase_attachFingerPrintName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'AttachFingerPrint')
+        ..ordinal = _HumanResourceDatabase_attachFingerPrintName
+        ..responseParams = _versioning_test_client_HumanResourceDatabase_AttachFingerPrint_ResponseParams__()..parameters = _versioning_test_client_HumanResourceDatabase_AttachFingerPrint_Params__(),_HumanResourceDatabase_listEmployeeIdsName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ListEmployeeIds')
+        ..ordinal = _HumanResourceDatabase_listEmployeeIdsName
+        ..responseParams = _versioning_test_client_HumanResourceDatabase_ListEmployeeIds_ResponseParams__()..parameters = _versioning_test_client_HumanResourceDatabase_ListEmployeeIds_Params__(),
+    };
+}
+
+class _HumanResourceDatabaseServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _versioning_test_client_HumanResourceDatabase__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class HumanResourceDatabase {
   static const String serviceName = "mojo::test::versioning::HumanResourceDatabase";
   dynamic addEmployee(Employee employee,[Function responseFactory = null]);
@@ -736,6 +930,9 @@ class _HumanResourceDatabaseProxyImpl extends bindings.Proxy {
     return new _HumanResourceDatabaseProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HumanResourceDatabaseServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _HumanResourceDatabase_addEmployeeName:
@@ -1091,6 +1288,62 @@ class HumanResourceDatabaseStub extends bindings.Stub {
   }
 
   int get version => 1;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HumanResourceDatabaseServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_versioning_test_client_Department__"] =
+    new mojom_types.UserDefinedType()
+      ..enumType = _versioning_test_client_Department__();
+map["_versioning_test_client_Employee__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_Employee__();
+map["_versioning_test_client_HumanResourceDatabase_AddEmployee_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_AddEmployee_Params__();
+map["_versioning_test_client_HumanResourceDatabase_AddEmployee_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_AddEmployee_ResponseParams__();
+map["_versioning_test_client_HumanResourceDatabase_QueryEmployee_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_QueryEmployee_Params__();
+map["_versioning_test_client_HumanResourceDatabase_QueryEmployee_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_QueryEmployee_ResponseParams__();
+map["_versioning_test_client_HumanResourceDatabase_AttachFingerPrint_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_AttachFingerPrint_Params__();
+map["_versioning_test_client_HumanResourceDatabase_AttachFingerPrint_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_AttachFingerPrint_ResponseParams__();
+map["_versioning_test_client_HumanResourceDatabase_ListEmployeeIds_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_ListEmployeeIds_Params__();
+map["_versioning_test_client_HumanResourceDatabase_ListEmployeeIds_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _versioning_test_client_HumanResourceDatabase_ListEmployeeIds_ResponseParams__();
+map["_versioning_test_client_HumanResourceDatabase__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _versioning_test_client_HumanResourceDatabase__();
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+