v5.18.7

nylo-core · Jan 11, 2024 · 0e305bc · 0e305bc
1 parent dea685f
commit 0e305bc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/lib/metro/metro.dart b/lib/metro/metro.dart
@@ -556,7 +556,10 @@ _makePostmanApiService(
       String method = postmanItem["request"]["method"];
 
       // params
-      Map<String, dynamic> queryParams = {}, pathParams = {}, dataParams = {}, headerParams = {};
+      Map<String, dynamic> queryParams = {},
+          pathParams = {},
+          dataParams = {},
+          headerParams = {};
 
       // find header params
       if (postmanItem["request"] != null &&
@@ -575,7 +578,8 @@ _makePostmanApiService(
               continue;
             }
             if (header.containsKey('value')) {
-              value = _replacePostmanStringVars(postmanGlobalVars, header['value']);
+              value =
+                  _replacePostmanStringVars(postmanGlobalVars, header['value']);
             }
             headerParams[key] = value ?? "";
           }
@@ -723,8 +727,7 @@ _makePostmanApiService(
           queryParams: queryParams,
           dataParams: dataParams,
           headerParams: headerParams,
-          pathParams: pathParams
-      );
+          pathParams: pathParams);
       stubNetworkValue.add(createdNetworkMethodStub);
     }
   }
@@ -809,8 +812,8 @@ _makePostmanApiService(
 
 /// Replace String variables from Postman
 _replacePostmanStringVars(Map<String, dynamic> postmanGlobal, String string) =>
-    string.replaceAllMapped(RegExp(r'{{[\w_$&+,:;=?@#!]+}}', caseSensitive: false),
-        (Match match) {
+    string.replaceAllMapped(
+        RegExp(r'{{[\w_$&+,:;=?@#!]+}}', caseSensitive: false), (Match match) {
       if (match.group(0) == null) {
         return "";
       }

diff --git a/lib/metro/stubs/network_method_stub.dart b/lib/metro/stubs/network_method_stub.dart
@@ -49,13 +49,12 @@ String _getType(String? model,
 String _mapDataParams(Map<String, dynamic> dataParams,
         {bool isOptional = false}) =>
     dataParams.entries
-        .map((e) =>
-            '"${e.key}${isOptional ? '?' : ''}": ${e.key.camelCase}')
+        .map((e) => '"${e.key}${isOptional ? '?' : ''}": ${e.key.camelCase}')
         .toList()
         .join(", ");
 
-String _mapParams(
-    Map<String, dynamic> queryParams, Map<String, dynamic> dataParams, Map<String, dynamic> pathParams) {
+String _mapParams(Map<String, dynamic> queryParams,
+    Map<String, dynamic> dataParams, Map<String, dynamic> pathParams) {
   Map<String, dynamic> params = {};
   if (queryParams.isNotEmpty) {
     params.addAll(queryParams);
@@ -86,14 +85,14 @@ String _mapParams(
       "}";
 }
 
-String _callBackType(
-    {required Map<String, dynamic> headers,
-    required String method,
-    required String path,
-    required Map<String, dynamic> queryParams,
-    required Map<String, dynamic> dataParams,
-    required Map<String, dynamic> pathParams,
-    }) {
+String _callBackType({
+  required Map<String, dynamic> headers,
+  required String method,
+  required String path,
+  required Map<String, dynamic> queryParams,
+  required Map<String, dynamic> dataParams,
+  required Map<String, dynamic> pathParams,
+}) {
   if (headers.isEmpty) {
     return "request: (request) => ${_requestType(method, path, queryParams, dataParams, pathParams)}";
   }
@@ -105,9 +104,12 @@ String _callBackType(
   },''';
 }
 
-String _requestType(String method, String path,
-    Map<String, dynamic> queryParams, Map<String, dynamic> dataParams, Map<String, dynamic> pathParams) {
-
+String _requestType(
+    String method,
+    String path,
+    Map<String, dynamic> queryParams,
+    Map<String, dynamic> dataParams,
+    Map<String, dynamic> pathParams) {
   RegExp regExp = RegExp(r':([\w_$&+,:;=?@#!]+)');
   path = path.replaceAllMapped(regExp, (match) {
     String key = match.group(1) ?? "";