created conversion dictionary

KernelPanic92 · KernelPanic92 · commit 1b7480e11a6c · 2020-05-03T19:51:05.000+02:00
diff --git a/generator/lib/src/dartstruct_generator.dart b/generator/lib/src/dartstruct_generator.dart
@@ -1,22 +1,32 @@
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type_system.dart';
+import 'package:build/build.dart';
 import 'package:build/src/builder/build_step.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:dart_style/dart_style.dart';
 import 'package:dartstruct_generator/src/name_provider.dart';
 import 'package:logging/logging.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:dartstruct/dartstruct.dart';
-import './extensions/extensions.dart';
+import 'extensions/extensions.dart';
+import 'mappers/conversions/conversions.dart';
 import 'models/input_source.dart';
 import 'models/output_source.dart';
+import 'mappers/mappers.dart';
+import 'dart:core';
 
 class DartStructGenerator extends GeneratorForAnnotation<Mapper> {
   final _emitter = DartEmitter();
   final _formatter = DartFormatter();
   final _logger = Logger('dartstruct');
+  Conversions _conversions;
 
   @override
-  String generateForAnnotatedElement(Element element, ConstantReader annotation, BuildStep buildStep) {
+  Future<String> generateForAnnotatedElement(Element element, ConstantReader annotation, BuildStep buildStep) async {
+
+    final dartCoreLibrary = await buildStep.resolver.findLibraryByName('dart.core');
+
+    _conversions = Conversions(dartCoreLibrary);
 
     if (element is! ClassElement) {
       throw InvalidGenerationSourceError('${element.displayName} cannot be annotated with @Mapper',
@@ -174,18 +184,19 @@ class DartStructGenerator extends GeneratorForAnnotation<Mapper> {
 
   Expression _getMapperExpression(FieldElement outputField, InputSource inputSource) {
 
-    final classElement = inputSource.type.element as ClassElement;
-    final fieldName = outputField.displayName;
+    MapperAdapter mapper = FieldMapperAdapter.create(inputSource, outputField.displayName);
 
-    final inputFieldElement = classElement.fields.firstWhere((field) => field.displayName == fieldName && field.getter != null, orElse: () => null);
+    if (mapper == null) {
+      return null;
+    }
 
 
-    if (inputFieldElement?.type == outputField.type) {
-       return refer(inputSource.name).nullSafeProperty(fieldName);
+    if (mapper.returnType != outputField.type && _conversions.canConvert(mapper.returnType, outputField.type)) {
+      mapper = _conversions.convert(mapper.returnType, outputField.type, mapper);
+      return mapper.expression;
     }
 
-    return null;
-
+    return mapper.expression;
 
   }
 
diff --git a/generator/lib/src/mappers/conversions/conversions.dart b/generator/lib/src/mappers/conversions/conversions.dart
@@ -0,0 +1,71 @@
+import 'dart:collection';
+
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/dart/element/type_provider.dart';
+import 'package:dartstruct_generator/src/mappers/conversions/primitive_to_string_mapper.dart';
+import 'package:dartstruct_generator/src/mappers/conversions/string_to_num_mapper.dart';
+import 'package:dartstruct_generator/src/mappers/mappers.dart';
+import 'package:equatable/equatable.dart';
+import 'num_to_num_mapper.dart';
+
+
+class Conversions {
+
+  final Map<_ConvertionKey, _MapperFactory> _convertions = HashMap<_ConvertionKey, _MapperFactory>();
+
+  Conversions(LibraryElement dartCoreLibrary) {
+
+    DartType intType = dartCoreLibrary.getType('int').thisType;
+    DartType doubleType = dartCoreLibrary.getType('double').thisType;
+    DartType boolType = dartCoreLibrary.getType('bool').thisType;
+    DartType numType = dartCoreLibrary.getType('num').thisType;
+    DartType stringType = dartCoreLibrary.getType('String').thisType;
+
+
+    // to string
+    _addConvertion(intType, stringType, (parent) => PrimitiveToStringMapper(parent, stringType));
+    _addConvertion(doubleType, stringType, (parent) => PrimitiveToStringMapper(parent, stringType));
+    _addConvertion(boolType, stringType, (parent) => PrimitiveToStringMapper(parent, stringType));
+
+    // to int
+    _addConvertion(numType, intType, (parent) => NumToNumMapper(parent, intType));
+    _addConvertion(doubleType, intType, (parent) => NumToNumMapper(parent, intType));
+    _addConvertion(stringType, intType, (parent) => StringToNumMapper(parent, intType));
+
+    // to double
+    _addConvertion(numType, doubleType, (parent) => NumToNumMapper(parent, doubleType));
+    _addConvertion(intType, doubleType, (parent) => NumToNumMapper(parent, doubleType));
+    _addConvertion(stringType, doubleType, (parent) => StringToNumMapper(parent, doubleType));
+
+    // to num
+    _addConvertion(intType, numType, (parent) => NumToNumMapper(parent, numType));
+    _addConvertion(doubleType, numType, (parent) => NumToNumMapper(parent, numType));
+    _addConvertion(stringType, numType, (parent) => StringToNumMapper(parent, numType));
+
+  }
+
+  bool canConvert(DartType from, DartType to) => _convertions.containsKey(_ConvertionKey(from, to));
+
+  MapperAdapter convert(DartType from, DartType to, MapperAdapter parent) => _convertions[_ConvertionKey(from, to)](parent);
+
+  void _addConvertion(DartType from, DartType to, _MapperFactory mapperFactory) {
+    final key = _ConvertionKey(from, to);
+    _convertions.putIfAbsent(key, () => mapperFactory);
+  }
+
+}
+
+class _ConvertionKey extends Equatable {
+
+  final DartType from;
+  final DartType to;
+
+  _ConvertionKey(this.from, this.to);
+
+  @override
+  List<Object> get props => [from, to];
+
+}
+
+typedef _MapperFactory = MapperAdapter Function(MapperAdapter parent);
diff --git a/generator/lib/src/mappers/conversions/num_to_num_mapper.dart b/generator/lib/src/mappers/conversions/num_to_num_mapper.dart
@@ -0,0 +1,32 @@
+import 'package:analyzer/dart/element/type.dart';
+import 'package:code_builder/src/specs/expression.dart';
+import 'package:dartstruct_generator/src/mappers/mappers.dart';
+
+class NumToNumMapper implements MapperAdapter {
+
+  final MapperAdapter _mapper;
+  final DartType _numType;
+
+  NumToNumMapper(this._mapper, this._numType);
+
+  @override
+  Expression get expression {
+
+    final mapperExpression = _mapper.expression;
+
+    if (_numType.isDartCoreInt) {
+      return mapperExpression.nullSafeProperty('toInt').call([]);
+    }
+
+    if (_numType.isDartCoreDouble) {
+      return mapperExpression.nullSafeProperty('toDouble').call([]);
+    }
+
+    return mapperExpression;
+
+  }
+
+  @override
+  DartType get returnType => _numType;
+
+}
diff --git a/generator/lib/src/mappers/conversions/primitive_to_string_mapper.dart b/generator/lib/src/mappers/conversions/primitive_to_string_mapper.dart
@@ -0,0 +1,18 @@
+import 'package:analyzer/dart/element/type.dart';
+import 'package:code_builder/src/specs/expression.dart';
+import 'package:dartstruct_generator/src/mappers/mappers.dart';
+
+class PrimitiveToStringMapper implements MapperAdapter {
+
+  final MapperAdapter _mapper;
+  final DartType _stringType;
+
+  PrimitiveToStringMapper(this._mapper, this._stringType);
+
+  @override
+  Expression get expression => _mapper.expression.nullSafeProperty('toString').call([]);
+
+  @override
+  DartType get returnType => _stringType;
+
+}
diff --git a/generator/lib/src/mappers/conversions/string_to_num_mapper.dart b/generator/lib/src/mappers/conversions/string_to_num_mapper.dart
@@ -0,0 +1,42 @@
+import 'package:analyzer/dart/element/type.dart';
+import 'package:code_builder/code_builder.dart';
+import 'package:code_builder/src/specs/expression.dart';
+import 'package:dartstruct_generator/src/mappers/mappers.dart';
+
+class StringToNumMapper implements MapperAdapter {
+
+  final MapperAdapter _mapper;
+  final DartType _numType;
+
+  StringToNumMapper(this._mapper, this._numType);
+
+  @override
+  Expression get expression {
+
+    final mapperExpression = _mapper.expression;
+
+    if (_numType.isDartCoreInt) {
+      return _parseExpression(mapperExpression, 'int');
+    }
+
+    if (_numType.isDartCoreDouble) {
+      return _parseExpression(mapperExpression, 'double');
+    }
+
+    if (_numType.isDartCoreNum) {
+      return _parseExpression(mapperExpression, 'num');
+    }
+
+    return _mapper.expression;
+
+  }
+
+  Expression _parseExpression(Expression variable, String parseTo) {
+    final nullValue = refer('null');
+    return variable.equalTo(nullValue).conditional(nullValue, refer(parseTo).property('parse').call([variable]));
+  }
+
+  @override
+  DartType get returnType => _numType;
+
+}
diff --git a/generator/lib/src/mappers/field_mapper_adapter.dart b/generator/lib/src/mappers/field_mapper_adapter.dart
@@ -0,0 +1,34 @@
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:code_builder/src/specs/expression.dart';
+import 'package:dartstruct_generator/src/models/input_source.dart';
+
+import 'mappers.dart';
+
+class FieldMapperAdapter implements MapperAdapter {
+  final FieldElement _fieldElement;
+  final MapperAdapter _mapper;
+
+  FieldMapperAdapter(this._mapper, this._fieldElement);
+
+  @override
+  Expression get expression => _mapper.expression.nullSafeProperty(_fieldElement.displayName);
+
+  @override
+  DartType get returnType => _fieldElement.type;
+
+  static FieldMapperAdapter create(InputSource input, String fieldName) {
+
+    MapperAdapter mapper = InputSourceMapperAdapter(input);
+
+    final classElement = input.type.element as ClassElement;
+
+    final inputFieldElement = classElement.fields.firstWhere((field) => field.displayName == fieldName && field.getter != null, orElse: () => null);
+
+    if (inputFieldElement == null) {
+      return null;
+    }
+
+    return FieldMapperAdapter(mapper, inputFieldElement);
+  }
+}
diff --git a/generator/lib/src/mappers/input_source_mapper_adapter.dart b/generator/lib/src/mappers/input_source_mapper_adapter.dart
@@ -0,0 +1,20 @@
+import 'package:analyzer/dart/element/type.dart';
+import 'package:code_builder/code_builder.dart';
+import 'package:code_builder/src/specs/expression.dart';
+import 'package:dartstruct_generator/src/models/input_source.dart';
+
+import 'mapper_adapter.dart';
+
+class InputSourceMapperAdapter implements MapperAdapter {
+
+  final InputSource _source;
+
+  InputSourceMapperAdapter(this._source);
+
+  @override
+  Expression get expression => refer(_source.name);
+
+  @override
+  DartType get returnType => _source.type;
+
+}
diff --git a/generator/lib/src/mappers/mapper_adapter.dart b/generator/lib/src/mappers/mapper_adapter.dart
@@ -0,0 +1,7 @@
+import 'package:analyzer/dart/element/type.dart';
+import 'package:code_builder/code_builder.dart';
+
+abstract class MapperAdapter {
+  Expression get expression;
+  DartType get returnType;
+}
diff --git a/generator/lib/src/mappers/mappers.dart b/generator/lib/src/mappers/mappers.dart
@@ -0,0 +1,3 @@
+export 'mapper_adapter.dart';
+export 'input_source_mapper_adapter.dart';
+export 'field_mapper_adapter.dart';
diff --git a/generator/pubspec.yaml b/generator/pubspec.yaml
@@ -13,6 +13,7 @@ dependencies:
   analyzer: ^0.39.5
   recase: ^3.0.0
   logging: ^0.11.4
+  equatable: ^1.1.1
   dartstruct:
     path: ../core
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export 'mapper_adapter.dart';`
	`2`	`+export 'input_source_mapper_adapter.dart';`
	`3`	`+export 'field_mapper_adapter.dart';`