Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/sensors/sensors.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/sensors/sensors.mojom.dart b/mojo/dart/packages/mojo_services/lib/sensors/sensors.mojom.dart
index c0f172ee88f37db5faf6c0a46d24d8a10b0170a9..6b55ff2af6f8bd4ade70b6520e41e7d940ed5a69 100644
--- a/mojo/dart/packages/mojo_services/lib/sensors/sensors.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/sensors/sensors.mojom.dart
@@ -5,10 +5,12 @@
 library sensors_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 SensorType extends bindings.MojoEnum {
   static const SensorType accelerometer = const SensorType._(0);
   static const SensorType ambientTemperature = const SensorType._(1);
@@ -172,12 +174,79 @@ class SensorType extends bindings.MojoEnum {
         return 'SensorType.stepCounter';
       case stepDetector:
         return 'SensorType.stepDetector';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+mojom_types.MojomEnum _sensors_SensorType__() {
+  return new mojom_types.MojomEnum()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'SensorType'
+      ..fullIdentifier = 'sensors.SensorType')
+    ..values = <mojom_types.EnumValue>[new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Accelerometer')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 0,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'AmbientTemperature')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 1,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GameRotationVector')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 2,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GeomagneticRotationVector')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 3,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Gravity')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 4,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Gyroscope')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 5,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GyroscopeUncalibrated')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 6,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'HeartRate')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 7,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Light')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 8,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'LinearAcceleration')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 9,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'MagneticField')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 10,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'MagneticFieldUncalibrated')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 11,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Pressure')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 12,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Proximity')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 13,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RelativeHumidity')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 14,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RotationVector')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 15,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SignificantMotion')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 16,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'StepCounter')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 17,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'StepDetector')
+        ..enumTypeKey = '_sensors_SensorType__'
+        ..intValue = 18,];
+}
+
 
 
 class SensorData extends bindings.Struct {
@@ -263,6 +332,26 @@ class SensorData extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _sensors_SensorData__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'SensorData'
+      ..fullIdentifier = 'sensors.SensorData')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Accuracy')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.int32),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'TimeStamp')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.int64),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Values')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..elementType = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.float))),
+      ];
+}
 
 
 class _SensorListenerOnAccuracyChangedParams extends bindings.Struct {
@@ -330,6 +419,17 @@ class _SensorListenerOnAccuracyChangedParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _sensors_SensorListener_OnAccuracyChanged_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_SensorListenerOnAccuracyChangedParams'
+      ..fullIdentifier = 'sensors._SensorListenerOnAccuracyChangedParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Accuracy')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.int32),
+      ];
+}
 
 
 class _SensorListenerOnSensorChangedParams extends bindings.Struct {
@@ -398,6 +498,22 @@ class _SensorListenerOnSensorChangedParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _sensors_SensorListener_OnSensorChanged_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_SensorListenerOnSensorChangedParams'
+      ..fullIdentifier = 'sensors._SensorListenerOnSensorChangedParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Data')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_sensors_SensorData__'
+    ..typeKey = '_sensors_SensorData__'
+  )),
+      ];
+}
 
 
 class _SensorServiceAddListenerParams extends bindings.Struct {
@@ -476,10 +592,63 @@ class _SensorServiceAddListenerParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _sensors_SensorService_AddListener_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_SensorServiceAddListenerParams'
+      ..fullIdentifier = 'sensors._SensorServiceAddListenerParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Type')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_sensors_SensorType__'
+    ..typeKey = '_sensors_SensorType__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Listener')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_sensors_SensorListener__'
+    ..typeKey = '_sensors_SensorListener__'
+  )),
+      ];
+}
+
 
 const int _SensorListener_onAccuracyChangedName = 0;
 const int _SensorListener_onSensorChangedName = 1;
 
+mojom_types.MojomInterface _sensors_SensorListener__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'SensorListener'
+      ..fullIdentifier = 'sensors.SensorListener')
+    ..interfaceName = 'SensorListener'
+    ..methods = <int, mojom_types.MojomMethod>{
+_SensorListener_onAccuracyChangedName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'OnAccuracyChanged')
+        ..ordinal = _SensorListener_onAccuracyChangedName..parameters = _sensors_SensorListener_OnAccuracyChanged_Params__(),_SensorListener_onSensorChangedName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'OnSensorChanged')
+        ..ordinal = _SensorListener_onSensorChangedName..parameters = _sensors_SensorListener_OnSensorChanged_Params__(),
+    };
+}
+
+class _SensorListenerServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _sensors_SensorListener__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class SensorListener {
   static const String serviceName = null;
   void onAccuracyChanged(int accuracy);
@@ -502,6 +671,9 @@ class _SensorListenerProxyImpl extends bindings.Proxy {
     return new _SensorListenerProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _SensorListenerServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -659,10 +831,39 @@ class SensorListenerStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _SensorListenerServiceDescription();
 }
 
 const int _SensorService_addListenerName = 0;
 
+mojom_types.MojomInterface _sensors_SensorService__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'SensorService'
+      ..fullIdentifier = 'sensors.SensorService')
+    ..interfaceName = 'SensorService'
+    ..methods = <int, mojom_types.MojomMethod>{
+_SensorService_addListenerName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'AddListener')
+        ..ordinal = _SensorService_addListenerName..parameters = _sensors_SensorService_AddListener_Params__(),
+    };
+}
+
+class _SensorServiceServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _sensors_SensorService__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class SensorService {
   static const String serviceName = "sensors::SensorService";
   void addListener(SensorType type, Object listener);
@@ -684,6 +885,9 @@ class _SensorServiceProxyImpl extends bindings.Proxy {
     return new _SensorServiceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _SensorServiceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -828,6 +1032,50 @@ class SensorServiceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _SensorServiceServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_sensors_SensorType__"] =
+    new mojom_types.UserDefinedType()
+      ..enumType = _sensors_SensorType__();
+map["_sensors_SensorData__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _sensors_SensorData__();
+map["_sensors_SensorListener_OnAccuracyChanged_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _sensors_SensorListener_OnAccuracyChanged_Params__();
+map["_sensors_SensorListener_OnSensorChanged_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _sensors_SensorListener_OnSensorChanged_Params__();
+map["_sensors_SensorService_AddListener_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _sensors_SensorService_AddListener_Params__();
+map["_sensors_SensorListener__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _sensors_SensorListener__();
+map["_sensors_SensorService__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _sensors_SensorService__();
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+