Merge pull request #109 from icapps/feature/DetectDartVersion

Detect dart version and use new features where possible

Author: NicolaVerbeeck

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## [5.8.1] - 2021-12-09
+- Detect the current min dart version and use newer features when available. (Fixes #108)
+
 ## [5.8.0] - 2021-11-25
 - Added `retrofit_compute` option to generate top-level functions compatible with retrofit's compute mode. (Fixes #106)
 - 

lib/config/pubspec_config.dart

@@ -1,5 +1,8 @@
 import 'dart:io';
 
+import 'package:meta/meta.dart';
+import 'package:model_generator/util/language_version.dart';
+import 'package:pub_semver/pub_semver.dart';
 import 'package:yaml/yaml.dart';
 
 class PubspecConfig {
@@ -18,6 +21,7 @@ class PubspecConfig {
   late bool staticCreate;
   late bool uppercaseEnums;
   late bool retrofitMappers;
+  LanguageVersion? languageVersion;
   final extraImports = <String>[];
   final extraAnnotations = <String>[];
 
@@ -27,6 +31,7 @@ class PubspecConfig {
       throw Exception('Could not parse the pubspec.yaml');
     }
     final projectName = doc['name'];
+    languageVersion = parseLanguageVersion(doc);
 
     if (projectName == null || projectName.isEmpty) {
       throw Exception(
@@ -71,4 +76,23 @@ class PubspecConfig {
           .forEach((element) => this.extraAnnotations.add(element.toString()));
     }
   }
+
+  @visibleForTesting
+  static LanguageVersion? parseLanguageVersion(YamlMap doc) {
+    final environmentRoot = doc['environment'];
+    if (environmentRoot is! YamlMap) return null;
+    final sdk = environmentRoot['sdk'];
+    if (sdk is! String) return null;
+
+    final range = VersionConstraint.parse(sdk);
+    if (range is Version) {
+      return LanguageVersion(range.major, range.minor, range.patch);
+    } else if (range is VersionRange) {
+      final min = range.min;
+      if (min == null) return null;
+      return LanguageVersion(min.major, min.minor, min.patch);
+    }
+
+    return null;
+  }
 }

lib/util/language_version.dart

@@ -0,0 +1,18 @@
+class LanguageVersion {
+  final int major;
+  final int minor;
+  final int patch;
+
+  LanguageVersion(this.major, this.minor, this.patch);
+
+  bool isAtLeast(int major, [int? minor, int? patch]) {
+    return (this.major >= major &&
+        (minor == null || this.minor >= minor) &&
+        (patch == null || this.patch >= patch));
+  }
+
+  @override
+  String toString() {
+    return '$major.$minor.$patch';
+  }
+}

lib/writer/object_model_writer.dart

@@ -319,18 +319,22 @@ class ObjectModelWriter {
   }
 
   void createRetrofitMappers(StringBuffer sb) {
+    final hasConstructorTearOffs =
+        pubspecConfig.languageVersion?.isAtLeast(2, 15) ?? false;
     sb
       ..writeln()
-      ..writeln(
-          '${jsonModel.name} deserialize${jsonModel.name}(Map<String, dynamic> json) => ${jsonModel.name}.fromJson(json);')
+      ..writeln(hasConstructorTearOffs
+          ? 'const deserialize${jsonModel.name} = ${jsonModel.name}.fromJson;'
+          : '${jsonModel.name} deserialize${jsonModel.name}(Map<String, dynamic> json) => ${jsonModel.name}.fromJson(json);')
       ..writeln()
       ..writeln(
           'Map<String, dynamic> serialize${jsonModel.name}(${jsonModel.name} object) => object.toJson();')
       ..writeln()
       ..writeln(
           'List<${jsonModel.name}> deserialize${jsonModel.name}List(List<Map<String, dynamic>> jsonList)')
-      ..writeln(
-          '    => jsonList.map((json) => ${jsonModel.name}.fromJson(json)).toList();')
+      ..writeln(hasConstructorTearOffs
+          ? '    => jsonList.map(${jsonModel.name}.fromJson).toList();'
+          : '    => jsonList.map((json) => ${jsonModel.name}.fromJson(json)).toList();')
       ..writeln()
       ..writeln(
           'List<Map<String, dynamic>> serialize${jsonModel.name}List(List<${jsonModel.name}> objects)')

pubspec.yaml

@@ -1,6 +1,6 @@
 name: model_generator
 description: Dart tool to automaticly generate models from a yml file to speed up your development flow.
-version: 5.8.0
+version: 5.8.1
 homepage: https://github.com/icapps/flutter-model-generator
 
 environment:
@@ -10,9 +10,9 @@ dependencies:
   args: ^2.3.0
   meta: ^1.3.0
   path: ^1.8.0
+  pub_semver: ^2.1.0
   yaml: ^3.1.0
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
+  test: 1.19.5
   lints: ^1.0.1

test/config/pubspec_config_test.dart

@@ -1,7 +1,8 @@
 import 'dart:io';
 
-import 'package:flutter_test/flutter_test.dart';
 import 'package:model_generator/config/pubspec_config.dart';
+import 'package:test/test.dart';
+import 'package:yaml/yaml.dart';
 
 import 'config_test_helper.dart';
 
@@ -101,5 +102,35 @@ void main() {
       expect(errorMessage,
           'Exception: Could not parse the pubspec.yaml, project name not found');
     });
+    test('Test parse any version', () {
+      expect(
+          PubspecConfig.parseLanguageVersion(YamlMap.wrap({
+            'environment': {'sdk': 'any'}
+          })),
+          null);
+    });
+    test('Test parse fixed version', () {
+      expect(
+          PubspecConfig.parseLanguageVersion(YamlMap.wrap({
+            'environment': {'sdk': '2.14.0'}
+          }))!
+              .toString(),
+          '2.14.0');
+    });
+    test('Test parse max version', () {
+      expect(
+          PubspecConfig.parseLanguageVersion(YamlMap.wrap({
+            'environment': {'sdk': '<2.14.0'}
+          })),
+          null);
+    });
+    test('Test parse min and max version', () {
+      expect(
+          PubspecConfig.parseLanguageVersion(YamlMap.wrap({
+            'environment': {'sdk': '>=2.14.0 <3.0.0'}
+          }))!
+              .toString(),
+          '2.14.0');
+    });
   });
 }

test/config/yml_generator_config_test.dart

@@ -1,10 +1,10 @@
-import 'package:flutter_test/flutter_test.dart';
 import 'package:model_generator/config/pubspec_config.dart';
 import 'package:model_generator/config/yml_generator_config.dart';
 import 'package:model_generator/model/item_type/object_type.dart';
 import 'package:model_generator/model/model/custom_model.dart';
 import 'package:model_generator/model/model/enum_model.dart';
 import 'package:model_generator/model/model/object_model.dart';
+import 'package:test/test.dart';
 
 import 'config_test_helper.dart';
 

test/model/field_test.dart

@@ -1,4 +1,4 @@
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:model_generator/model/field.dart';
 import 'package:model_generator/model/item_type/string_type.dart';
 

test/model/item_type/array_type_test.dart

@@ -1,5 +1,5 @@
 import 'package:model_generator/model/item_type/array_type.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('Array Type', () {

test/model/item_type/bool_type_test.dart

@@ -1,5 +1,5 @@
 import 'package:model_generator/model/item_type/boolean_type.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('BooleanType', () {