better_networking & apidash_core: fixed package exports

integration_test/test_helper.dart

@@ -1,7 +1,7 @@
 import 'package:apidash/models/settings_model.dart';
 import 'package:apidash/providers/providers.dart';
 import 'package:apidash/services/services.dart';
-import 'package:better_networking/better_networking.dart';
+import 'package:apidash_core/apidash_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';

lib/models/history_meta_model.dart

@@ -1,7 +1,6 @@
 import 'package:better_networking/better_networking.dart';
-
+import 'package:apidash_core/apidash_core.dart';
 part 'history_meta_model.freezed.dart';
-
 part 'history_meta_model.g.dart';
 
 @freezed

lib/models/history_request_model.dart

@@ -1,8 +1,7 @@
 import 'package:better_networking/better_networking.dart';
 import 'models.dart';
-
+import 'package:apidash_core/apidash_core.dart';
 part 'history_request_model.freezed.dart';
-
 part 'history_request_model.g.dart';
 
 @freezed

lib/models/request_model.dart

@@ -1,7 +1,6 @@
+import 'package:apidash_core/apidash_core.dart';
 import 'package:better_networking/better_networking.dart';
-
 part 'request_model.freezed.dart';
-
 part 'request_model.g.dart';
 
 @freezed

lib/utils/envvar_utils.dart

@@ -132,7 +132,7 @@ EnvironmentVariableSuggestion getVariableStatus(
     String? activeEnvironmentId) {
   if (activeEnvironmentId != null) {
     final variable =
-        envMap[activeEnvironmentId]!.firstWhereOrNull((v) => v.key == key);
+        envMap[activeEnvironmentId]!.where((v) => v.key == key).firstOrNull;
     if (variable != null) {
       return EnvironmentVariableSuggestion(
         environmentId: activeEnvironmentId,
@@ -143,7 +143,7 @@ EnvironmentVariableSuggestion getVariableStatus(
   }
 
   final globalVariable =
-      envMap[kGlobalEnvironmentId]?.firstWhereOrNull((v) => v.key == key);
+      envMap[kGlobalEnvironmentId]?.where((v) => v.key == key).firstOrNull;
   if (globalVariable != null) {
     return EnvironmentVariableSuggestion(
       environmentId: kGlobalEnvironmentId,

packages/apidash_core/lib/apidash_core.dart

@@ -9,6 +9,3 @@ export 'utils/utils.dart';
 // Export 3rd party packages
 export 'package:collection/collection.dart';
 export 'package:freezed_annotation/freezed_annotation.dart';
-export 'package:http/http.dart';
-export 'package:http_parser/http_parser.dart';
-export 'package:seed/seed.dart';

packages/apidash_core/pubspec.yaml

@@ -15,15 +15,10 @@ dependencies:
   curl_parser:
     path: ../curl_parser
   freezed_annotation: ^2.4.1
-  http: ^1.3.0
-  http_parser: ^4.1.2
   insomnia_collection:
     path: ../insomnia_collection
-  json5: ^0.8.2
   postman:
     path: ../postman
-  seed: ^0.0.3
-  xml: ^6.3.0
   better_networking:
     path: ../better_networking
 

packages/better_networking/lib/better_networking.dart

@@ -7,8 +7,6 @@ export 'utils/utils.dart';
 export 'services/services.dart';
 
 // Export 3rd party packages
-export 'package:collection/collection.dart';
-export 'package:freezed_annotation/freezed_annotation.dart';
 export 'package:http/http.dart';
 export 'package:http_parser/http_parser.dart';
 export 'package:seed/seed.dart';

packages/better_networking/lib/models/http_response_model.dart

@@ -2,12 +2,12 @@ import 'dart:io';
 import 'dart:convert';
 import 'dart:typed_data';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:collection/collection.dart' show mergeMaps;
 import 'package:http/http.dart';
 import 'package:http_parser/http_parser.dart';
 import '../extensions/extensions.dart';
 import '../utils/utils.dart';
 import '../consts.dart';
+import 'package:collection/collection.dart' show mergeMaps;
 
 part 'http_response_model.freezed.dart';
 part 'http_response_model.g.dart';
@@ -44,10 +44,7 @@ class DurationConverter implements JsonConverter<Duration?, int?> {
 class HttpResponseModel with _$HttpResponseModel {
   const HttpResponseModel._();
 
-  @JsonSerializable(
+  @JsonSerializable(explicitToJson: true, anyMap: true)
-    explicitToJson: true,
-    anyMap: true,
-  )
   const factory HttpResponseModel({
     int? statusCode,
     Map<String, String>? headers,
@@ -64,13 +61,10 @@ class HttpResponseModel with _$HttpResponseModel {
   String? get contentType => headers?.getValueContentType();
   MediaType? get mediaType => getMediaTypeFromHeaders(headers);
 
-  HttpResponseModel fromResponse({
+  HttpResponseModel fromResponse({required Response response, Duration? time}) {
-    required Response response,
+    final responseHeaders = mergeMaps({
-    Duration? time,
+      HttpHeaders.contentLengthHeader: response.contentLength.toString(),
-  }) {
+    }, response.headers);
-    final responseHeaders = mergeMaps(
-        {HttpHeaders.contentLengthHeader: response.contentLength.toString()},
-        response.headers);
     MediaType? mediaType = getMediaTypeFromHeaders(responseHeaders);
     final body = (mediaType?.subtype == kSubTypeJson)
         ? utf8.decode(response.bodyBytes)

packages/better_networking/lib/utils/uri_utils.dart

@@ -23,8 +23,10 @@ String stripUrlParams(String url) {
 }
 
 (Uri?, String?) getValidRequestUri(
-    String? url, List<NameValueModel>? requestParams,
+  String? url,
-    {SupportedUriSchemes defaultUriScheme = kDefaultUriScheme}) {
+  List<NameValueModel>? requestParams, {
+  SupportedUriSchemes defaultUriScheme = kDefaultUriScheme,
+}) {
   url = url?.trim();
   if (url == null || url == "") {
     return (null, "URL is missing!");

test/utils/http_utils_test.dart

@@ -1,4 +1,4 @@
-import 'package:apidash_core/apidash_core.dart' show MediaType;
+import 'package:better_networking/better_networking.dart';
 import 'package:test/test.dart';
 import 'package:apidash/utils/http_utils.dart';
 import 'package:apidash/consts.dart';