Dart2 template linting

modules/openapi-generator/src/main/resources/dart2/analysis_options.mustache

@@ -1,3 +0,0 @@
-analyzer:
-  strong-mode:
-    implicit-casts: true

modules/openapi-generator/src/main/resources/dart2/api.mustache

@@ -49,7 +49,7 @@ class {{{classname}}} {
   ///
     {{/-last}}
   {{/allParams}}
-  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}{{^-last}}, {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{{paramName}}}{{^-last}}, {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
+  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
   {{#hasParams}}
     // Verify required params are set.
     {{#allParams}}
@@ -61,9 +61,11 @@ class {{{classname}}} {
     {{/allParams}}
 
   {{/hasParams}}
+    // ignore: prefer_const_declarations
     final path = r'{{{path}}}'{{#pathParams}}
-      .replaceAll('{' + '{{{baseName}}}' + '}', {{{paramName}}}.toString()){{/pathParams}};
+      .replaceAll({{=<% %>=}}'{<% baseName %>}'<%={{ }}=%>, {{{paramName}}}{{^isString}}.toString(){{/isString}}){{/pathParams}};
 
+    // ignore: prefer_final_locals
     Object postBody{{#bodyParam}} = {{{paramName}}}{{/bodyParam}};
 
     final queryParams = <QueryParam>[];
@@ -131,7 +133,7 @@ class {{{classname}}} {
     {{/formParams}}
     {{/isMultipart}}
 
-    return await apiClient.invokeAPI(
+    return apiClient.invokeAPI(
       path,
       '{{{httpMethod}}}',
       queryParams,
@@ -174,7 +176,7 @@ class {{{classname}}} {
     {{/-last}}
   {{/allParams}}
   Future<{{{returnType}}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}{{^-last}}, {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}} {{{paramName}}}{{^-last}}, {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
-    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}}{{^-last}}, {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}} {{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}}{{^-last}}, {{/-last}}{{/required}}{{/allParams}} {{/hasOptionalParams}});
+    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}} {{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} {{/hasOptionalParams}});
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -223,7 +225,7 @@ class {{{classname}}} {
     {{/isArray}}
     {{/json_serializable}}
     }
-    return Future<{{{returnType}}}>.value(null);
+    return Future<{{{returnType}}}>.value();
     {{/returnType}}
   }
   {{/operation}}

modules/openapi-generator/src/main/resources/dart2/api_client.mustache

@@ -84,7 +84,7 @@ class ApiClient {
       ? '?${urlEncodedQueryParams.join('&')}'
       : '';
 
-    final Uri uri = Uri.parse('$basePath$path$queryString');
+    final uri = Uri.parse('$basePath$path$queryString');
 
     if (nullableContentType != null) {
       headerParams['Content-Type'] = nullableContentType;
@@ -102,7 +102,8 @@ class ApiClient {
         body.finalize().listen(
           request.sink.add,
           onDone: request.sink.close,
-          onError: (error, trace) => request.sink.close(),
+          // ignore: avoid_types_on_closure_parameters
+          onError: (Object error, StackTrace trace) => request.sink.close(),
           cancelOnError: true,
         );
         final response = await _client.send(request);
@@ -191,18 +192,17 @@ class ApiClient {
     try {
       switch (targetType) {
         case 'String':
-          return '$value';
+          return value is String ? value : value.toString();
         case 'int':
           return value is int ? value : int.parse('$value');
+        case 'double':
+          return value is double ? value : double.parse('$value');
         case 'bool':
           if (value is bool) {
             return value;
           }
           final valueString = '$value'.toLowerCase();
           return valueString == 'true' || valueString == '1';
-          break;
-        case 'double':
-          return value is double ? value : double.parse('$value');
         {{#models}}
           {{#model}}
         case '{{{classname}}}':
@@ -220,25 +220,24 @@ class ApiClient {
           if (value is List && (match = _regList.firstMatch(targetType)) != null) {
             targetType = match[1]; // ignore: parameter_assignments
             return value
-              .map((v) => _deserialize(v, targetType, growable: growable))
+              .map<dynamic>((dynamic value) => _deserialize(value, targetType, growable: growable))
               .toList(growable: growable);
           }
           if (value is Set && (match = _regSet.firstMatch(targetType)) != null) {
             targetType = match[1]; // ignore: parameter_assignments
             return value
-              .map((v) => _deserialize(v, targetType, growable: growable))
+              .map<dynamic>((dynamic value) => _deserialize(value, targetType, growable: growable))
               .toSet();
           }
           if (value is Map && (match = _regMap.firstMatch(targetType)) != null) {
             targetType = match[1]; // ignore: parameter_assignments
-            return Map.fromIterables(
-              value.keys,
-              value.values.map((v) => _deserialize(v, targetType, growable: growable)),
+            return Map<String, dynamic>.fromIterables(
+              value.keys.cast<String>(),
+              value.values.map<dynamic>((dynamic value) => _deserialize(value, targetType, growable: growable)),
             );
           }
-          break;
       }
-    } catch (error, trace) {
+    } on Exception catch (error, trace) {
       throw ApiException.withInner(HttpStatus.internalServerError, 'Exception during deserialization.', error, trace,);
     }
     throw ApiException(HttpStatus.internalServerError, 'Could not find a suitable class for deserialization',);

modules/openapi-generator/src/main/resources/dart2/api_helper.mustache

@@ -21,20 +21,21 @@ Iterable<QueryParam> _convertParametersForCollectionFormat(
   // preconditions
   if (name != null && name.isNotEmpty && value != null) {
     if (value is List) {
-      // get the collection format, default: csv
-      collectionFormat = (collectionFormat == null || collectionFormat.isEmpty)
-        ? 'csv'
-        : collectionFormat;
-
       if (collectionFormat == 'multi') {
-        return value.map((v) => QueryParam(name, parameterToString(v)));
+        return value.map((dynamic value) => QueryParam(name, parameterToString(value)),);
+      }
+
+      // Default collection format is 'csv'.
+      if (collectionFormat == null || collectionFormat.isEmpty) {
+        // ignore: parameter_assignments
+        collectionFormat = 'csv';
       }
 
       final delimiter = _delimiters[collectionFormat] ?? ',';
 
-      params.add(QueryParam(name, value.map((v) => parameterToString(v)).join(delimiter)));
+      params.add(QueryParam(name, value.map<dynamic>(parameterToString).join(delimiter)),);
     } else {
-      params.add(QueryParam(name, parameterToString(value)));
+      params.add(QueryParam(name, parameterToString(value),));
     }
   }
 
@@ -69,3 +70,36 @@ Future<String> _decodeBodyBytes(Response response) async {
     ? response.bodyBytes == null ? null : utf8.decode(response.bodyBytes)
     : response.body;
 }
+
+/// Returns a valid [T] value found at the specified Map [key], null otherwise.
+T mapValueOfType<T>(dynamic map, String key) {
+  final dynamic value = map is Map ? map[key] : null;
+  return value is T ? value : null;
+}
+
+/// Returns a valid Map<K, V> found at the specified Map [key], null otherwise.
+Map<K, V> mapCastOfType<K, V>(dynamic map, String key) {
+  final dynamic value = map is Map ? map[key] : null;
+  return value is Map ? value.cast<K, V>() : null;
+}
+
+/// Returns a valid [DateTime] found at the specified Map [key], null otherwise.
+DateTime mapDateTime(dynamic map, String key, [String pattern]) {
+  final dynamic value = map is Map ? map[key] : null;
+  if (value != null) {
+    int millis;
+    if (value is int) {
+      millis = value;
+    } else if (value is String) {
+      if (pattern == _dateEpochMarker) {
+        millis = int.tryParse(value);
+      } else {
+        return DateTime.tryParse(value);
+      }
+    }
+    if (millis != null) {
+      return DateTime.fromMillisecondsSinceEpoch(millis, isUtc: true);
+    }
+  }
+  return null;
+}

modules/openapi-generator/src/main/resources/dart2/auth/api_key_auth.mustache

@@ -18,9 +18,11 @@ class ApiKeyAuth implements Authentication {
     } else if (location == 'header' && value != null) {
       headerParams[paramName] = value;
     } else if (location == 'cookie' && value != null) {
-      headerParams.update('Cookie', (String existingCookie) {
-        return '$existingCookie; $paramName=$value';
-      }, ifAbsent: () => '$paramName=$value');
+      headerParams.update(
+        'Cookie',
+        (existingCookie) => '$existingCookie; $paramName=$value',
+        ifAbsent: () => '$paramName=$value',
+      );
     }
   }
 }

modules/openapi-generator/src/main/resources/dart2/auth/authentication.mustache

@@ -1,5 +1,6 @@
 {{>header}}
 {{>part_of}}
+// ignore: one_member_abstracts
 abstract class Authentication {
   /// Apply authentication settings to header and query params.
   void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams);

modules/openapi-generator/src/main/resources/dart2/auth/http_basic_auth.mustache

@@ -6,7 +6,7 @@ class HttpBasicAuth implements Authentication {
 
   @override
   void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
-    final credentials = (username ?? '') + ':' + (password ?? '');
+    final credentials = '${username ?? ''}:${password ?? ''}';
     headerParams['Authorization'] = 'Basic ${base64.encode(utf8.encode(credentials))}';
   }
 }

modules/openapi-generator/src/main/resources/dart2/auth/http_bearer_auth.mustache

@@ -13,7 +13,7 @@ class HttpBearerAuth implements Authentication {
     if (accessToken is! String && accessToken is! HttpBearerAuthProvider) {
       throw ArgumentError('Type of Bearer accessToken should be a String or a String Function().');
     }
-    this._accessToken = accessToken;
+    _accessToken = accessToken;
   }
 
   @override

modules/openapi-generator/src/main/resources/dart2/serialization/json_serializable/json_serializable_class.mustache

@@ -49,10 +49,7 @@ class {{{classname}}} {
   Map<String, dynamic> toJson() => _${{{classname}}}ToJson(this);
 
   @override
-  String toString() {
-    return toJson().toString();
-  }
-
+  String toString() => toJson().toString();
 }
 {{#vars}}
     {{#isEnum}}