Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/web_socket.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/web_socket.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/web_socket.mojom.dart
index 19e8337d7e16c6679ff91975bf241a7b2a6ebe94..eebd286c15fbdb01c138c065c22293cf3c1a0f31 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/web_socket.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/web_socket.mojom.dart
@@ -5,9 +5,12 @@
 library web_socket_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;
 import 'package:mojo/mojo/network_error.mojom.dart' as network_error_mojom;
 
 
@@ -124,6 +127,45 @@ class _WebSocketConnectParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocket_Connect_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketConnectParams'
+      ..fullIdentifier = 'mojo._WebSocketConnectParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Url')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Protocols')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..elementType = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)))),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Origin')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SendStream')
+        ..type = (new mojom_types.Type()
+..handleType = (new mojom_types.HandleType()
+..kind = mojom_types.HandleTypeKind.dataPipeConsumer
+..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Client')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_web_socket_WebSocketClient__'
+    ..typeKey = '_web_socket_WebSocketClient__'
+  )),
+      ];
+}
 
 
 class _WebSocketSendParams extends bindings.Struct {
@@ -213,6 +255,30 @@ class _WebSocketSendParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocket_Send_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketSendParams'
+      ..fullIdentifier = 'mojo._WebSocketSendParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Fin')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Type')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_web_socket_MessageType__'
+    ..typeKey = '_web_socket_MessageType__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'NumBytes')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class _WebSocketFlowControlParams extends bindings.Struct {
@@ -280,6 +346,17 @@ class _WebSocketFlowControlParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocket_FlowControl_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketFlowControlParams'
+      ..fullIdentifier = 'mojo._WebSocketFlowControlParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Quota')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.int64),
+      ];
+}
 
 
 class _WebSocketCloseParams extends bindings.Struct {
@@ -356,6 +433,22 @@ class _WebSocketCloseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocket_Close_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketCloseParams'
+      ..fullIdentifier = 'mojo._WebSocketCloseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Code')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Reason')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      ];
+}
 
 
 class _WebSocketClientDidConnectParams extends bindings.Struct {
@@ -438,6 +531,30 @@ class _WebSocketClientDidConnectParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocketClient_DidConnect_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketClientDidConnectParams'
+      ..fullIdentifier = 'mojo._WebSocketClientDidConnectParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SelectedSubprotocol')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Extensions')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ReceiveStream')
+        ..type = (new mojom_types.Type()
+..handleType = (new mojom_types.HandleType()
+..kind = mojom_types.HandleTypeKind.dataPipeConsumer
+..nullable = false)),
+      ];
+}
 
 
 class _WebSocketClientDidReceiveDataParams extends bindings.Struct {
@@ -527,6 +644,30 @@ class _WebSocketClientDidReceiveDataParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocketClient_DidReceiveData_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketClientDidReceiveDataParams'
+      ..fullIdentifier = 'mojo._WebSocketClientDidReceiveDataParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Fin')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Type')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_web_socket_MessageType__'
+    ..typeKey = '_web_socket_MessageType__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'NumBytes')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class _WebSocketClientDidReceiveFlowControlParams extends bindings.Struct {
@@ -594,6 +735,17 @@ class _WebSocketClientDidReceiveFlowControlParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocketClient_DidReceiveFlowControl_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketClientDidReceiveFlowControlParams'
+      ..fullIdentifier = 'mojo._WebSocketClientDidReceiveFlowControlParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Quota')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.int64),
+      ];
+}
 
 
 class _WebSocketClientDidFailParams extends bindings.Struct {
@@ -661,6 +813,18 @@ class _WebSocketClientDidFailParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocketClient_DidFail_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketClientDidFailParams'
+      ..fullIdentifier = 'mojo._WebSocketClientDidFailParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Message')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      ];
+}
 
 
 class _WebSocketClientDidCloseParams extends bindings.Struct {
@@ -746,13 +910,33 @@ class _WebSocketClientDidCloseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _web_socket_WebSocketClient_DidClose_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_WebSocketClientDidCloseParams'
+      ..fullIdentifier = 'mojo._WebSocketClientDidCloseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'WasClean')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Code')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Reason')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      ];
+}
+
 
 const int _WebSocket_connectName = 0;
 const int _WebSocket_sendName = 1;
 const int _WebSocket_flowControlName = 2;
 const int _WebSocket_closeName = 3;
-  
-class WebSocketMessageType extends bindings.MojoEnum {
+  class WebSocketMessageType extends bindings.MojoEnum {
   static const WebSocketMessageType continuation = const WebSocketMessageType._(0);
   static const WebSocketMessageType text = const WebSocketMessageType._(1);
   static const WebSocketMessageType binary = const WebSocketMessageType._(2);
@@ -803,12 +987,62 @@ class WebSocketMessageType extends bindings.MojoEnum {
         return 'WebSocketMessageType.text';
       case binary:
         return 'WebSocketMessageType.binary';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+mojom_types.MojomEnum _web_socket_MessageType__() {
+  return new mojom_types.MojomEnum()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'WebSocketMessageType'
+      ..fullIdentifier = 'mojo.WebSocketMessageType')
+    ..values = <mojom_types.EnumValue>[new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Continuation')
+        ..enumTypeKey = '_web_socket_MessageType__'
+        ..intValue = 0,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Text')
+        ..enumTypeKey = '_web_socket_MessageType__'
+        ..intValue = 1,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Binary')
+        ..enumTypeKey = '_web_socket_MessageType__'
+        ..intValue = 2,];
+}
+
+mojom_types.MojomInterface _web_socket_WebSocket__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'WebSocket'
+      ..fullIdentifier = 'mojo.WebSocket')
+    ..interfaceName = 'WebSocket'
+    ..methods = <int, mojom_types.MojomMethod>{
+_WebSocket_connectName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Connect')
+        ..ordinal = _WebSocket_connectName..parameters = _web_socket_WebSocket_Connect_Params__(),_WebSocket_sendName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Send')
+        ..ordinal = _WebSocket_sendName..parameters = _web_socket_WebSocket_Send_Params__(),_WebSocket_flowControlName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'FlowControl')
+        ..ordinal = _WebSocket_flowControlName..parameters = _web_socket_WebSocket_FlowControl_Params__(),_WebSocket_closeName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Close')
+        ..ordinal = _WebSocket_closeName..parameters = _web_socket_WebSocket_Close_Params__(),
+    };
+}
+
+class _WebSocketServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _web_socket_WebSocket__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class WebSocket {
   static const String serviceName = null;
   void connect(String url, List<String> protocols, String origin, core.MojoDataPipeConsumer sendStream, Object client);
@@ -834,6 +1068,9 @@ class _WebSocketProxyImpl extends bindings.Proxy {
     return new _WebSocketProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _WebSocketServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -1026,6 +1263,10 @@ class WebSocketStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _WebSocketServiceDescription();
 }
 
 const int _WebSocketClient_didConnectName = 0;
@@ -1034,6 +1275,39 @@ const int _WebSocketClient_didReceiveFlowControlName = 2;
 const int _WebSocketClient_didFailName = 3;
 const int _WebSocketClient_didCloseName = 4;
 
+mojom_types.MojomInterface _web_socket_WebSocketClient__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'WebSocketClient'
+      ..fullIdentifier = 'mojo.WebSocketClient')
+    ..interfaceName = 'WebSocketClient'
+    ..methods = <int, mojom_types.MojomMethod>{
+_WebSocketClient_didConnectName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DidConnect')
+        ..ordinal = _WebSocketClient_didConnectName..parameters = _web_socket_WebSocketClient_DidConnect_Params__(),_WebSocketClient_didReceiveDataName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DidReceiveData')
+        ..ordinal = _WebSocketClient_didReceiveDataName..parameters = _web_socket_WebSocketClient_DidReceiveData_Params__(),_WebSocketClient_didReceiveFlowControlName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DidReceiveFlowControl')
+        ..ordinal = _WebSocketClient_didReceiveFlowControlName..parameters = _web_socket_WebSocketClient_DidReceiveFlowControl_Params__(),_WebSocketClient_didFailName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DidFail')
+        ..ordinal = _WebSocketClient_didFailName..parameters = _web_socket_WebSocketClient_DidFail_Params__(),_WebSocketClient_didCloseName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DidClose')
+        ..ordinal = _WebSocketClient_didCloseName..parameters = _web_socket_WebSocketClient_DidClose_Params__(),
+    };
+}
+
+class _WebSocketClientServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _web_socket_WebSocketClient__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class WebSocketClient {
   static const String serviceName = null;
   void didConnect(String selectedSubprotocol, String extensions, core.MojoDataPipeConsumer receiveStream);
@@ -1059,6 +1333,9 @@ class _WebSocketClientProxyImpl extends bindings.Proxy {
     return new _WebSocketClientProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _WebSocketClientServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -1264,6 +1541,68 @@ class WebSocketClientStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _WebSocketClientServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_web_socket_WebSocket_Connect_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocket_Connect_Params__();
+map["_web_socket_WebSocket_Send_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocket_Send_Params__();
+map["_web_socket_WebSocket_FlowControl_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocket_FlowControl_Params__();
+map["_web_socket_WebSocket_Close_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocket_Close_Params__();
+map["_web_socket_WebSocketClient_DidConnect_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocketClient_DidConnect_Params__();
+map["_web_socket_WebSocketClient_DidReceiveData_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocketClient_DidReceiveData_Params__();
+map["_web_socket_WebSocketClient_DidReceiveFlowControl_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocketClient_DidReceiveFlowControl_Params__();
+map["_web_socket_WebSocketClient_DidFail_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocketClient_DidFail_Params__();
+map["_web_socket_WebSocketClient_DidClose_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _web_socket_WebSocketClient_DidClose_Params__();
+map["_web_socket_WebSocket__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _web_socket_WebSocket__();
+    map["_web_socket_MessageType__"] =
+    new mojom_types.UserDefinedType()
+      ..enumType = _web_socket_MessageType__();
+map["_web_socket_WebSocketClient__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _web_socket_WebSocketClient__();
+network_error_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+