[dart][dart-dio] Enable strong-mode and strict types (OpenAPITools#8231)

* [dart-dio] Enable strong-mode and strict types

This will make it easier to eventually transition to NNBD. Also fix some formatting things.

* [dart-dio] Add implicit-casts: false to analysis options

* [dart-dio] Add dartanalyzer to integration tests

* raise minimum Dart version to 2.6 (to support spread collection)
* add header to all files for language version
* fix some missing imports that can be fixed (some remain due to missing inheritance support)

Author: kuhnroyal

modules/openapi-generator/src/main/resources/dart-dio/analysis_options.mustache

@@ -1 +1,9 @@
-analyzer:
+analyzer:
+  language:
+    strict-inference: true
+    strict-raw-types: true
+  strong-mode:
+    implicit-dynamic: false
+    implicit-casts: false
+  exclude:
+    - test/*.dart

modules/openapi-generator/src/main/resources/dart-dio/api.mustache

@@ -1,3 +1,4 @@
+{{>header}}
 import 'dart:async';
 import 'dart:convert';
 import 'package:dio/dio.dart';
@@ -31,8 +32,8 @@ class {{classname}} {
     }) async {
         final String _path = '{{{path}}}'{{#pathParams}}.replaceAll('{' r'{{baseName}}' '}', {{{paramName}}}.toString()){{/pathParams}};
 
-        final Map<String, dynamic> queryParams = {};
-        final Map<String, dynamic> headerParams = {
+        final queryParams = <String, dynamic>{};
+        final headerParams = <String, dynamic>{
             if (headers != null) ...headers,
         };
         dynamic bodyData;
@@ -43,15 +44,15 @@ class {{classname}} {
         {{#queryParams}}
         queryParams[r'{{baseName}}'] = {{paramName}};
         {{/queryParams}}
-        queryParams.removeWhere((key, value) => value == null);
-        headerParams.removeWhere((key, value) => value == null);
+        queryParams.removeWhere((key, dynamic value) => value == null);
+        headerParams.removeWhere((key, dynamic value) => value == null);
 
-        final List<String> contentTypes = [{{^hasConsumes}}];{{/hasConsumes}}{{#hasConsumes}}{{#consumes}}
+        final contentTypes = <String>[{{^hasConsumes}}];{{/hasConsumes}}{{#hasConsumes}}{{#consumes}}
             '{{{mediaType}}}',{{/consumes}}
         ];{{/hasConsumes}}
         {{#hasFormParams}}
 
-        final Map<String, dynamic> formData = {};
+        final formData = <String, dynamic>{};
         {{#isMultipart}}
         {{#formParams}}
         {{^isFile}}
@@ -93,7 +94,7 @@ class {{classname}} {
         bodyData = json{{paramName}};
         {{/bodyParam}}
 
-        return _dio.request(
+        return _dio.request<dynamic>(
             _path,
             queryParameters: queryParams,
             data: bodyData,
@@ -103,8 +104,8 @@ class {{classname}} {
                 responseType: ResponseType.bytes,
                 {{/isResponseFile}}
                 headers: headerParams,
-                extra: {
-                    'secure': [{{^hasAuthMethods}}],{{/hasAuthMethods}}{{#hasAuthMethods}}
+                extra: <String, dynamic>{
+                    'secure': <Map<String, String>>[{{^hasAuthMethods}}],{{/hasAuthMethods}}{{#hasAuthMethods}}
                         {{#authMethods}}{
                             'type': '{{type}}',
                             'name': '{{name}}',{{#isApiKey}}
@@ -130,14 +131,22 @@ class {{classname}} {
             final data = response.data as {{{returnType}}};
         {{/returnTypeIsPrimitive}}
         {{^returnTypeIsPrimitive}}
-            final serializer = _serializers.serializerForType({{{returnType}}});
-            final data = _serializers.deserializeWith<{{{returnType}}}>(serializer, response.data is String ? jsonDecode(response.data) : response.data);
+            final serializer = _serializers.serializerForType({{{returnType}}}) as Serializer<{{{returnType}}}>;
+            final data = _serializers.deserializeWith<{{{returnType}}}>(
+                serializer,
+                response.data is String ? jsonDecode(response.data as String) : response.data,
+            );
         {{/returnTypeIsPrimitive}}
         {{/returnSimpleType}}
         {{^returnSimpleType}}
             const collectionType = {{#isMap}}BuiltMap{{/isMap}}{{^isMap}}BuiltList{{/isMap}};
             const type = FullType(collectionType, [{{#isMap}}FullType(String), {{/isMap}}FullType({{{returnBaseType}}})]);
-            final {{{returnType}}} data = _serializers.deserialize(response.data is String ? jsonDecode(response.data) : response.data, specifiedType: type);
+            final data = _serializers.deserialize(
+                response.data is String
+                ? jsonDecode(response.data as String)
+                : response.data,
+                specifiedType: type,
+            ) as {{{returnType}}};
         {{/returnSimpleType}}
         {{/isResponseFile}}
 

modules/openapi-generator/src/main/resources/dart-dio/api_util.mustache

@@ -1,3 +1,4 @@
+{{>header}}
 import 'dart:convert';
 
 import 'package:built_value/serializer.dart';

modules/openapi-generator/src/main/resources/dart-dio/apilib.mustache

@@ -1,3 +1,4 @@
+{{>header}}
 library {{pubName}}.api;
 
 import 'package:dio/dio.dart';

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

@@ -1,3 +1,4 @@
+{{>header}}
 import 'dart:async';
 import 'package:{{pubName}}/auth/auth.dart';
 import 'package:dio/dio.dart';
@@ -6,12 +7,12 @@ class ApiKeyAuthInterceptor extends AuthInterceptor {
     Map<String, String> apiKeys = {};
 
     @override
-    Future onRequest(RequestOptions options) {
-        final authInfo = getAuthInfo(options, "apiKey");
-        for (var info in authInfo) {
-            final authName = info["name"];
-            final authKeyName = info["keyName"];
-            final authWhere = info["where"];
+    Future<dynamic> onRequest(RequestOptions options) {
+        final authInfo = getAuthInfo(options, 'apiKey');
+        for (final info in authInfo) {
+            final authName = info['name'] as String;
+            final authKeyName = info['keyName'] as String;
+            final authWhere = info['where'] as String;
             final apiKey = apiKeys[authName];
             if (apiKey != null) {
                 if (authWhere == 'query') {

modules/openapi-generator/src/main/resources/dart-dio/auth/auth.mustache

@@ -1,5 +1,4 @@
-import 'dart:async';
-
+{{>header}}
 import 'package:dio/dio.dart';
 
 abstract class AuthInterceptor extends Interceptor {
@@ -8,11 +7,11 @@ abstract class AuthInterceptor extends Interceptor {
      * Can return null if type is not present on auth data or if route doesn't need authentication
      */
     List<Map<String, dynamic>> getAuthInfo(RequestOptions route, String type) {
-        if (route.extra.containsKey("secure")) {
-            final auth = route.extra["secure"];
-            List<Map<String, dynamic>> results = [];
-            for (var info in auth) {
-                if(info["type"] == type) {
+        if (route.extra.containsKey('secure')) {
+            final auth = route.extra['secure'] as List<Map<String, String>>;
+            final results = <Map<String, dynamic>>[];
+            for (final info in auth) {
+                if (info['type'] == type) {
                     results.add(info);
                 }
             }

modules/openapi-generator/src/main/resources/dart-dio/auth/basic_auth.mustache

@@ -1,3 +1,4 @@
+{{>header}}
 import 'dart:async';
 import 'dart:convert';
 import 'package:{{pubName}}/auth/auth.dart';
@@ -14,13 +15,13 @@ class BasicAuthInterceptor extends AuthInterceptor {
     Map<String, BasicAuthInfo> authInfo = {};
 
     @override
-    Future onRequest(RequestOptions options) {
+    Future<dynamic> onRequest(RequestOptions options) {
         final metadataAuthInfo = getAuthInfo(options, 'basic');
-        for (var info in metadataAuthInfo) {
-            final authName = info['name'];
+        for (final info in metadataAuthInfo) {
+            final authName = info['name'] as String;
             final basicAuthInfo = authInfo[authName];
-            if(basicAuthInfo != null) {
-                String basicAuth = 'Basic ' + base64Encode(utf8.encode('${basicAuthInfo.username}:${basicAuthInfo.password}'));
+            if (basicAuthInfo != null) {
+                final basicAuth = 'Basic ' + base64Encode(utf8.encode('${basicAuthInfo.username}:${basicAuthInfo.password}'));
                 options.headers['Authorization'] = basicAuth;
                 break;
             }

modules/openapi-generator/src/main/resources/dart-dio/auth/oauth.mustache

@@ -1,3 +1,4 @@
+{{>header}}
 import 'dart:async';
 import 'package:{{pubName}}/auth/auth.dart';
 import 'package:dio/dio.dart';
@@ -6,12 +7,12 @@ class OAuthInterceptor extends AuthInterceptor {
     Map<String, String> tokens = {};
 
     @override
-    Future onRequest(RequestOptions options) {
-        final authInfo = getAuthInfo(options, "oauth");
-        for (var info in authInfo) {
-            final token = tokens[info["name"]];
-            if(token != null) {
-                options.headers["Authorization"] = "Bearer ${token}";
+    Future<dynamic> onRequest(RequestOptions options) {
+        final authInfo = getAuthInfo(options, 'oauth');
+        for (final info in authInfo) {
+            final token = tokens[info['name']];
+            if (token != null) {
+                options.headers['Authorization'] = 'Bearer ${token}';
                 break;
             }
         }

modules/openapi-generator/src/main/resources/dart-dio/class.mustache

@@ -25,7 +25,7 @@ abstract class {{classname}} implements Built<{{classname}}, {{classname}}Builde
     static void _initializeBuilder({{{classname}}}Builder b) => b{{#vars}}{{#defaultValue}}
         ..{{{name}}} = {{#isEnum}}{{^isContainer}}const {{{classname}}}{{{enumName}}}._({{/isContainer}}{{/isEnum}}{{{defaultValue}}}{{#isEnum}}{{^isContainer}}){{/isContainer}}{{/isEnum}}{{/defaultValue}}{{/vars}};
 
-    factory {{classname}}([updates({{classname}}Builder b)]) = _${{classname}};
+    factory {{classname}}([void updates({{classname}}Builder b)]) = _${{classname}};
     static Serializer<{{classname}}> get serializer => _${{#lambda.camelcase}}{{{classname}}}{{/lambda.camelcase}}Serializer;
 }
 {{!

modules/openapi-generator/src/main/resources/dart-dio/header.mustache

@@ -0,0 +1,6 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.6
+
+// ignore_for_file: unused_import