Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo_services/lib/mojo/net_address.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/net_address.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/net_address.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/net_address.mojom.dart
index d97489862f00466bd36c3e6e48ce694d8dc47f1d..7d3044c3e87b24e804d42f103348151a3c1125fa 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/net_address.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/net_address.mojom.dart
@@ -5,9 +5,11 @@
 library net_address_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;
 
 class NetAddressFamily extends bindings.MojoEnum {
   static const NetAddressFamily unspecified = const NetAddressFamily._(0);
@@ -60,12 +62,31 @@ class NetAddressFamily extends bindings.MojoEnum {
         return 'NetAddressFamily.ipv4';
       case ipv6:
         return 'NetAddressFamily.ipv6';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+mojom_types.MojomEnum _net_address_NetAddressFamily__() {
+  return new mojom_types.MojomEnum()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'NetAddressFamily'
+      ..fullIdentifier = 'mojo.NetAddressFamily')
+    ..values = <mojom_types.EnumValue>[new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Unspecified')
+        ..enumTypeKey = '_net_address_NetAddressFamily__'
+        ..intValue = 0,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ipv4')
+        ..enumTypeKey = '_net_address_NetAddressFamily__'
+        ..intValue = 1,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ipv6')
+        ..enumTypeKey = '_net_address_NetAddressFamily__'
+        ..intValue = 2,];
+}
+
 
 
 class NetAddressIPv4 extends bindings.Struct {
@@ -142,6 +163,22 @@ class NetAddressIPv4 extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _net_address_NetAddressIPv4__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'NetAddressIPv4'
+      ..fullIdentifier = 'mojo.NetAddressIPv4')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Port')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Addr')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()..fixedLength = 4
+    ..elementType = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint8))),
+      ];
+}
 
 
 class NetAddressIPv6 extends bindings.Struct {
@@ -218,6 +255,22 @@ class NetAddressIPv6 extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _net_address_NetAddressIPv6__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'NetAddressIPv6'
+      ..fullIdentifier = 'mojo.NetAddressIPv6')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Port')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Addr')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()..fixedLength = 16
+    ..elementType = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint8))),
+      ];
+}
 
 
 class NetAddress extends bindings.Struct {
@@ -309,5 +362,75 @@ class NetAddress extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _net_address_NetAddress__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'NetAddress'
+      ..fullIdentifier = 'mojo.NetAddress')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Family')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_net_address_NetAddressFamily__'
+    ..typeKey = '_net_address_NetAddressFamily__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ipv4')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_net_address_NetAddressIPv4__'
+    ..typeKey = '_net_address_NetAddressIPv4__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ipv6')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_net_address_NetAddressIPv6__'
+    ..typeKey = '_net_address_NetAddressIPv6__'
+  )),
+      ];
+}
+
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_net_address_NetAddressFamily__"] =
+    new mojom_types.UserDefinedType()
+      ..enumType = _net_address_NetAddressFamily__();
+map["_net_address_NetAddressIPv4__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _net_address_NetAddressIPv4__();
+map["_net_address_NetAddressIPv6__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _net_address_NetAddressIPv6__();
+map["_net_address_NetAddress__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _net_address_NetAddress__();
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+