From 73f415c667e60d7da1de70de0bc19d975857aeb9 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Wed, 20 Dec 2023 17:31:42 +0800 Subject: [PATCH 1/4] feat:add dio code gen --- lib/codegen/codegen.dart | 3 + lib/codegen/dart/dio.dart | 125 +++++++++++++++++++++++++ lib/codegen/dart/shared.dart | 26 ++++++ lib/consts.dart | 1 + pubspec.lock | 172 +++++++++++++++++------------------ pubspec.yaml | 2 + 6 files changed, 243 insertions(+), 86 deletions(-) create mode 100644 lib/codegen/dart/dio.dart create mode 100644 lib/codegen/dart/shared.dart diff --git a/lib/codegen/codegen.dart b/lib/codegen/codegen.dart index 356854f6..45b72014 100644 --- a/lib/codegen/codegen.dart +++ b/lib/codegen/codegen.dart @@ -1,6 +1,7 @@ import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/consts.dart'; import 'dart/http.dart'; +import 'dart/dio.dart'; import 'kotlin/okhttp.dart'; import 'python/http_client.dart'; import 'python/requests.dart'; @@ -22,6 +23,8 @@ class Codegen { return HARCodeGen().getCode(requestModel, defaultUriScheme); case CodegenLanguage.dartHttp: return DartHttpCodeGen().getCode(requestModel, defaultUriScheme); + case CodegenLanguage.dartDio: + return DartDioCodeGen().getCode(requestModel, defaultUriScheme); case CodegenLanguage.jsAxios: return AxiosCodeGen().getCode(requestModel, defaultUriScheme); case CodegenLanguage.jsFetch: diff --git a/lib/codegen/dart/dio.dart b/lib/codegen/dart/dio.dart new file mode 100644 index 00000000..7c603716 --- /dev/null +++ b/lib/codegen/dart/dio.dart @@ -0,0 +1,125 @@ +import 'package:apidash/consts.dart'; +import 'package:apidash/models/request_model.dart' show RequestModel; +import 'package:code_builder/code_builder.dart'; +import 'package:dart_style/dart_style.dart'; + +import 'shared.dart'; + +class DartDioCodeGen { + String? getCode( + RequestModel requestModel, + String defaultUriScheme, + ) { + try { + String url = requestModel.url; + if (!url.contains("://") && url.isNotEmpty) { + url = "$defaultUriScheme://$url"; + } + final next = generatedDartCode( + url: url, + method: requestModel.method.name, + queryParams: requestModel.paramsMap, + headers: requestModel.headersMap, + body: requestModel.requestBody, + contentType: requestModel.requestBodyContentType, + ); + return next; + } catch (e) { + return null; + } + } + + String generatedDartCode({ + required String url, + required String method, + required Map queryParams, + required Map headers, + required String? body, + required ContentType contentType, + }) { + final sbf = StringBuffer(); + final emitter = DartEmitter(); + final dioImport = Directive.import('package:dio/dio.dart', as: 'dio'); + sbf.writeln(dioImport.accept(emitter)); + + Expression? queryParamExp; + if (queryParams.isNotEmpty) { + queryParamExp = declareFinal('queryParams').assign( + literalMap(queryParams.map((key, value) => MapEntry(key, value))), + ); + } + Expression? headerExp; + if (headers.isNotEmpty) { + headerExp = declareFinal('headers').assign( + literalMap(headers.map((key, value) => MapEntry(key, value))), + ); + } + + Expression? dataExp; + if (body != null) { + final strContent = CodeExpression(Code('r\'\'\'$body\'\'\'')); + switch (contentType) { + case ContentType.json: + final convertImport = Directive.import('dart:convert', as: 'convert'); + sbf.writeln(convertImport.accept(emitter)); + dataExp = declareFinal('data') + .assign(refer('convert.json.decode').call([strContent])); + case ContentType.text: + dataExp = declareFinal('data').assign(strContent); + } + } + final responseExp = declareFinal('response').assign(InvokeExpression.newOf( + refer('dio.Dio'), + [literalString(url)], + { + if (queryParamExp != null) 'queryParameters': refer('queryParams'), + if (headerExp != null) + 'options': refer('Options').newInstance( + [], + {'headers': refer('headers')}, + ), + if (dataExp != null) 'data': refer('data'), + }, + [], + method, + ).awaited); + + final mainFunction = Method((m) { + final content = declareTryCatch( + showStackStrace: true, + body: [ + if (queryParamExp != null) queryParamExp, + if (headerExp != null) headerExp, + if (dataExp != null) dataExp, + responseExp, + refer('print').call([refer('response').property('statusCode')]), + refer('print').call([refer('response').property('data')]), + ], + onError: { + 'DioException': [ + refer('print').call([ + refer('e').property('response').nullSafeProperty('statusCode'), + ]), + refer('print').call([ + refer('e').property('response').nullSafeProperty('data'), + ]), + refer('print').call([refer('s')]), + ], + null: [ + refer('print').call([refer('e')]), + refer('print').call([refer('s')]), + ], + }, + ); + m + ..name = 'main' + ..returns = refer('void') + ..modifier = MethodModifier.async + ..body = content; + }); + + sbf.writeln(mainFunction.accept(emitter)); + + return DartFormatter(pageWidth: 160).format(sbf.toString()); + } +} diff --git a/lib/codegen/dart/shared.dart b/lib/codegen/dart/shared.dart new file mode 100644 index 00000000..9938750c --- /dev/null +++ b/lib/codegen/dart/shared.dart @@ -0,0 +1,26 @@ +import 'package:code_builder/code_builder.dart'; + +Block declareTryCatch({ + required List body, + required Map> onError, + bool showStackStrace = false, +}) { + return Block((b) { + b.statements.add(const Code('try')); + b.statements.add(const Code('{')); + b.statements.addAll(body.map((e) => e.statement).toList()); + final entries = onError.entries; + + for (var error in entries) { + b.statements.add(const Code('}')); + if (error.key != null) { + b.statements.add(Code('on ${error.key}')); + } + b.statements.add(Code(showStackStrace ? 'catch(e,s)' : 'catch(e)')); + + b.statements.add(const Code('{')); + b.statements.addAll(error.value.map((e) => e.statement).toList()); + if (entries.last.key == error.key) b.statements.add(const Code('}')); + } + }); +} diff --git a/lib/consts.dart b/lib/consts.dart index 895c0460..ff44e9f5 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -242,6 +242,7 @@ enum CodegenLanguage { curl("cURL", "bash", "curl"), har("HAR", "json", "har"), dartHttp("Dart (http)", "dart", "dart"), + dartDio("Dart (dio)", "dart", "dart"), jsAxios("JavaScript (axios)", "javascript", "js"), jsFetch("JavaScript (fetch)", "javascript", "js"), nodejsAxios("node.js (axios)", "javascript", "js"), diff --git a/pubspec.lock b/pubspec.lock index 190d8316..1845e975 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,26 +5,26 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "64.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.2.0" archive: dependency: transitive description: name: archive - sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03" + sha256: "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b" url: "https://pub.dev" source: hosted - version: "3.4.6" + version: "3.4.9" args: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: transitive description: name: audio_session - sha256: "8a2bc5e30520e18f3fb0e366793d78057fb64cd5287862c76af0c8771f2a52ad" + sha256: "6fdf255ed3af86535c96452c33ecff1245990bb25a605bfb1958661ccc3d467f" url: "https://pub.dev" source: hosted - version: "0.1.16" + version: "0.1.18" axis_layout: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: barcode - sha256: "789f898eef0bd88312470bdb2cc996f895ad7dd5f89e9adde84b204546a90b45" + sha256: "2a8b2ee065f419c2aeda141436cc556d91ae772d220fd80679f4d431d6c2ab43" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.2.5" bidi: dependency: transitive description: @@ -101,26 +101,26 @@ packages: dependency: transitive description: name: build_daemon - sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.1" build_resolvers: dependency: transitive description: name: build_resolvers - sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8" + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" + sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b" url: "https://pub.dev" source: hosted - version: "2.4.6" + version: "2.4.7" build_runner_core: dependency: transitive description: @@ -141,10 +141,10 @@ packages: dependency: transitive description: name: built_value - sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74 + sha256: c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309 url: "https://pub.dev" source: hosted - version: "8.6.3" + version: "8.8.1" characters: dependency: transitive description: @@ -165,10 +165,10 @@ packages: dependency: transitive description: name: cli_util - sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.1" clock: dependency: transitive description: @@ -178,13 +178,13 @@ packages: source: hosted version: "1.1.1" code_builder: - dependency: transitive + dependency: "direct main" description: name: code_builder - sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677" + sha256: feee43a5c05e7b3199bb375a86430b8ada1b04104f2923d0e03cc01ca87b6d84 url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.9.0" collection: dependency: "direct main" description: @@ -205,10 +205,10 @@ packages: dependency: transitive description: name: coverage - sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb" + sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76" url: "https://pub.dev" source: hosted - version: "1.6.4" + version: "1.7.2" crypto: dependency: transitive description: @@ -218,13 +218,13 @@ packages: source: hosted version: "3.0.3" dart_style: - dependency: transitive + dependency: "direct main" description: name: dart_style - sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.3.4" davi: dependency: "direct main" description: @@ -338,26 +338,26 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 + sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" flutter_markdown: dependency: "direct main" description: name: flutter_markdown - sha256: "8afc9a6aa6d8e8063523192ba837149dbf3d377a37c0b0fc579149a1fbd4a619" + sha256: "35108526a233cc0755664d445f8a6b4b61e6f8fe993b3658b80b4a26827fc196" url: "https://pub.dev" source: hosted - version: "0.6.18" + version: "0.6.18+2" flutter_riverpod: dependency: "direct main" description: name: flutter_riverpod - sha256: bdba94be666ecb1beeb0f5a748d96cdd6a37215f27e6b48c7673b95cecb800c8 + sha256: da9591d1f8d5881628ccd5c25c40e74fc3eef50ba45e40c3905a06e1712412d5 url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.9" flutter_svg: dependency: "direct main" description: @@ -388,10 +388,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "21bf2825311de65501d22e563e3d7605dff57fb5e6da982db785ae5372ff018a" + sha256: "6c5031daae12c7072b3a87eff98983076434b4889ef2a44384d0cae3f82372ba" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.6" freezed_annotation: dependency: "direct main" description: @@ -468,10 +468,10 @@ packages: dependency: "direct main" description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" http_multi_server: dependency: transitive description: @@ -549,10 +549,10 @@ packages: dependency: "direct main" description: name: just_audio - sha256: "5ed0cd723e17dfd8cd4b0253726221e67f6546841ea4553635cf895061fc335b" + sha256: b607cd1a43bac03d85c3aaee00448ff4a589ef2a77104e3d409889ff079bf823 url: "https://pub.dev" source: hosted - version: "0.9.35" + version: "0.9.36" just_audio_mpv: dependency: "direct main" description: @@ -565,18 +565,18 @@ packages: dependency: transitive description: name: just_audio_platform_interface - sha256: d8409da198bbc59426cd45d4c92fca522a2ec269b576ce29459d6d6fcaeb44df + sha256: c3dee0014248c97c91fe6299edb73dc4d6c6930a2f4f713579cd692d9e47f4a1 url: "https://pub.dev" source: hosted - version: "4.2.1" + version: "4.2.2" just_audio_web: dependency: transitive description: name: just_audio_web - sha256: ff62f733f437b25a0ff590f0e295fa5441dcb465f1edbdb33b3dea264705bc13 + sha256: "134356b0fe3d898293102b33b5fd618831ffdc72bb7a1b726140abdf22772b70" url: "https://pub.dev" source: hosted - version: "0.4.8" + version: "0.4.9" just_audio_windows: dependency: "direct main" description: @@ -741,10 +741,10 @@ packages: dependency: transitive description: name: path_provider_android - sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" + sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.2.1" path_provider_foundation: dependency: transitive description: @@ -781,18 +781,18 @@ packages: dependency: transitive description: name: pdf - sha256: "9f75fc7f5580ea5e635b5724de58fb27f684c9ad03ed46fdc1aac768e4557315" + sha256: "93cbb2c06de9bab91844550f19896b2373e7a5ce25173995e7e5ec5e1741429d" url: "https://pub.dev" source: hosted - version: "3.10.4" + version: "3.10.7" petitparser: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.2" platform: dependency: transitive description: @@ -805,18 +805,18 @@ packages: dependency: transitive description: name: plugin_platform_interface - sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8 url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.7" pointer_interceptor: dependency: transitive description: name: pointer_interceptor - sha256: "7626e034489820fd599380d2bb4d3f4a0a5e3529370b62bfce53ab736b91adb2" + sha256: adf7a637f97c077041d36801b43be08559fd4322d2127b3f20bb7be1b9eebc22 url: "https://pub.dev" source: hosted - version: "0.9.3+6" + version: "0.9.3+7" pointycastle: dependency: transitive description: @@ -845,10 +845,10 @@ packages: dependency: "direct main" description: name: provider - sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.1" pub_semver: dependency: transitive description: @@ -877,10 +877,10 @@ packages: dependency: transitive description: name: riverpod - sha256: "2af3d127a6e4e34b89b8f1f018086f5ded04b8e538174f0510bba3e4c0d878b1" + sha256: "942999ee48b899f8a46a860f1e13cee36f2f77609eb54c5b7a669bb20d550b11" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.4.9" rxdart: dependency: transitive description: @@ -946,10 +946,10 @@ packages: dependency: transitive description: name: source_gen - sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.5.0" source_helper: dependency: transitive description: @@ -1090,74 +1090,74 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27" + sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 url: "https://pub.dev" source: hosted - version: "6.1.14" + version: "6.2.2" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330 + sha256: "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def" url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f" + sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3 url: "https://pub.dev" source: hosted - version: "6.1.5" + version: "6.2.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.1.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88 + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.1.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618" + sha256: "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.2.0" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5" + sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" url: "https://pub.dev" source: hosted - version: "2.0.20" + version: "2.2.2" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.1.1" uuid: dependency: "direct main" description: name: uuid - sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7 + sha256: "22c94e5ad1e75f9934b766b53c742572ee2677c56bc871d850a57dad0f82127f" url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.2.2" vector_graphics: dependency: transitive description: @@ -1194,10 +1194,10 @@ packages: dependency: transitive description: name: vm_service - sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "11.10.0" + version: "13.0.0" watcher: dependency: transitive description: @@ -1234,10 +1234,10 @@ packages: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574 url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.1.1" window_manager: dependency: "direct main" description: @@ -1267,10 +1267,10 @@ packages: dependency: "direct main" description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.5.0" yaml: dependency: transitive description: @@ -1280,5 +1280,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index b02083ae..a32322ee 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -50,6 +50,8 @@ dependencies: scrollable_positioned_list: ^0.2.3 flutter_svg: ^2.0.9 vector_graphics_compiler: ^1.1.9+1 + code_builder: ^4.9.0 + dart_style: ^2.3.4 dev_dependencies: flutter_test: From a792e0fb357172a77c660c18cb0723ba14c8c740 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Thu, 21 Dec 2023 13:20:41 +0800 Subject: [PATCH 2/4] feat: rewrite dart http code gen with dart code builder & format --- lib/codegen/dart/dio.dart | 10 +- lib/codegen/dart/http.dart | 273 ++++++++++++----------- lib/codegen/dart/shared.dart | 34 ++- test/codegen/dart_http_codegen_test.dart | 223 ++++++++++-------- 4 files changed, 317 insertions(+), 223 deletions(-) diff --git a/lib/codegen/dart/dio.dart b/lib/codegen/dart/dio.dart index 7c603716..fcaa8314 100644 --- a/lib/codegen/dart/dio.dart +++ b/lib/codegen/dart/dio.dart @@ -17,7 +17,7 @@ class DartDioCodeGen { } final next = generatedDartCode( url: url, - method: requestModel.method.name, + method: requestModel.method, queryParams: requestModel.paramsMap, headers: requestModel.headersMap, body: requestModel.requestBody, @@ -31,7 +31,7 @@ class DartDioCodeGen { String generatedDartCode({ required String url, - required String method, + required HTTPVerb method, required Map queryParams, required Map headers, required String? body, @@ -56,9 +56,10 @@ class DartDioCodeGen { } Expression? dataExp; - if (body != null) { + if (kMethodsWithBody.contains(method) && (body?.isNotEmpty ?? false)) { final strContent = CodeExpression(Code('r\'\'\'$body\'\'\'')); switch (contentType) { + // dio dosen't need pass `content-type` header when body is json or plain text case ContentType.json: final convertImport = Directive.import('dart:convert', as: 'convert'); sbf.writeln(convertImport.accept(emitter)); @@ -66,6 +67,7 @@ class DartDioCodeGen { .assign(refer('convert.json.decode').call([strContent])); case ContentType.text: dataExp = declareFinal('data').assign(strContent); + // when add new type of [ContentType], need update [dataExp]. } } final responseExp = declareFinal('response').assign(InvokeExpression.newOf( @@ -81,7 +83,7 @@ class DartDioCodeGen { if (dataExp != null) 'data': refer('data'), }, [], - method, + method.name, ).awaited); final mainFunction = Method((m) { diff --git a/lib/codegen/dart/http.dart b/lib/codegen/dart/http.dart index 2c0e016c..6beccac8 100644 --- a/lib/codegen/dart/http.dart +++ b/lib/codegen/dart/http.dart @@ -1,147 +1,164 @@ import 'dart:io'; -import 'dart:convert'; -import 'package:jinja/jinja.dart' as jj; + import 'package:apidash/consts.dart'; -import 'package:apidash/utils/utils.dart' show padMultilineString; import 'package:apidash/models/models.dart' show RequestModel; +import 'package:code_builder/code_builder.dart'; +import 'package:dart_style/dart_style.dart'; + +import 'shared.dart'; class DartHttpCodeGen { - String kTemplateStart = """import 'package:http/http.dart' as http; - -void main() async { - var uri = Uri.parse('{{url}}'); - -"""; - - String kTemplateParams = """ - - var queryParams = {{params}}; -"""; - int kParamsPadding = 20; - - String kStringUrlParams = """ - - var urlQueryParams = Map.from(uri.queryParameters); - urlQueryParams.addAll(queryParams); - uri = uri.replace(queryParameters: urlQueryParams); -"""; - - String kStringNoUrlParams = """ - - uri = uri.replace(queryParameters: queryParams); -"""; - - String kTemplateBody = """ - - String body = r'''{{body}}'''; - -"""; - - String kTemplateHeaders = """ - - var headers = {{headers}}; - -"""; - int kHeadersPadding = 16; - - String kTemplateRequest = """ - - final response = await http.{{method}}(uri"""; - - String kStringRequestHeaders = """, - headers: headers"""; - - String kStringRequestBody = """, - body: body"""; - String kStringRequestEnd = r"""); - - int statusCode = response.statusCode; - if (statusCode >= 200 && statusCode < 300) { - print('Status Code: $statusCode'); - print('Response Body: ${response.body}'); - } - else{ - print('Error Status Code: $statusCode'); - print('Error Response Body: ${response.body}'); - } -} -"""; - String? getCode( RequestModel requestModel, String defaultUriScheme, ) { try { - String result = ""; - bool hasHeaders = false; - bool hasBody = false; - String url = requestModel.url; if (!url.contains("://") && url.isNotEmpty) { url = "$defaultUriScheme://$url"; } - var templateStartUrl = jj.Template(kTemplateStart); - result += templateStartUrl.render({"url": url}); - - var paramsList = requestModel.requestParams; - if (paramsList != null) { - var params = requestModel.paramsMap; - if (params.isNotEmpty) { - var templateParams = jj.Template(kTemplateParams); - var paramsString = kEncoder.convert(params); - paramsString = padMultilineString(paramsString, kParamsPadding); - result += templateParams.render({"params": paramsString}); - Uri uri = Uri.parse(url); - if (uri.hasQuery) { - result += kStringUrlParams; - } else { - result += kStringNoUrlParams; - } - } - } - - var method = requestModel.method; - var requestBody = requestModel.requestBody; - if (kMethodsWithBody.contains(method) && requestBody != null) { - var contentLength = utf8.encode(requestBody).length; - if (contentLength > 0) { - hasBody = true; - var templateBody = jj.Template(kTemplateBody); - result += templateBody.render({"body": requestBody}); - } - } - - var headersList = requestModel.requestHeaders; - if (headersList != null || hasBody) { - var headers = requestModel.headersMap; - if (headers.isNotEmpty || hasBody) { - hasHeaders = true; - if (hasBody) { - headers[HttpHeaders.contentTypeHeader] = - kContentTypeMap[requestModel.requestBodyContentType] ?? ""; - } - var headersString = kEncoder.convert(headers); - headersString = padMultilineString(headersString, kHeadersPadding); - var templateHeaders = jj.Template(kTemplateHeaders); - result += templateHeaders.render({"headers": headersString}); - } - } - - var templateRequest = jj.Template(kTemplateRequest); - result += templateRequest.render({"method": method.name}); - - if (hasHeaders) { - result += kStringRequestHeaders; - } - - if (hasBody) { - result += kStringRequestBody; - } - - result += kStringRequestEnd; - return result; + final next = generatedDartCode( + url: url, + method: requestModel.method, + queryParams: requestModel.paramsMap, + headers: requestModel.headersMap, + body: requestModel.requestBody, + contentType: requestModel.requestBodyContentType, + ); + return next; } catch (e) { + print(e); return null; } } + + String generatedDartCode({ + required String url, + required HTTPVerb method, + required Map queryParams, + required Map headers, + required String? body, + required ContentType contentType, + }) { + final uri = Uri.parse(url); + + final sbf = StringBuffer(); + final emitter = DartEmitter(); + final dioImport = Directive.import('package:http/http.dart', as: 'http'); + sbf.writeln(dioImport.accept(emitter)); + + final uriExp = + declareVar('uri').assign(refer('Uri.parse').call([literalString(url)])); + + final composeHeaders = headers; + Expression? dataExp; + if (kMethodsWithBody.contains(method) && (body?.isNotEmpty ?? false)) { + final strContent = CodeExpression(Code('r\'\'\'$body\'\'\'')); + dataExp = declareVar('body', type: refer('String')).assign(strContent); + + composeHeaders.putIfAbsent(HttpHeaders.contentTypeHeader, + () => kContentTypeMap[contentType] ?? ''); + } + + Expression? queryParamExp; + List? uriReassignExps; + // var urlQueryParams = Map.from(uri.queryParameters); + // urlQueryParams.addAll(queryParams); + // uri = uri.replace(queryParameters: urlQueryParams); + + if (queryParams.isNotEmpty) { + queryParamExp = declareVar('queryParams').assign( + literalMap(queryParams.map((key, value) => MapEntry(key, value))), + ); + + uriReassignExps = [ + if (uri.hasQuery) + declareVar('urlQueryParams').assign( + InvokeExpression.newOf( + refer('Map'), + [refer('uri.queryParameters')], + {}, + [], + 'from', + ), + ), + if (uri.hasQuery) + refer('urlQueryParams') + .property('addAll') + .call([refer('queryParams')], {}), + refer('uri').assign(refer('uri').property('replace').call([], { + 'queryParameters': + uri.hasQuery ? refer('urlQueryParams') : refer('queryParams'), + })) + ]; + } + + Expression? headerExp; + if (headers.isNotEmpty) { + headerExp = declareVar('headers').assign( + literalMap(headers.map((key, value) => MapEntry(key, value))), + ); + } + final responseExp = declareFinal('response').assign(InvokeExpression.newOf( + refer('http.${method.name}'), + [refer('uri')], + { + if (headerExp != null) 'headers': refer('headers'), + if (dataExp != null) 'body': refer('body'), + }, + [], + ).awaited); + + final mainFunction = Method((m) { + final statusRef = refer('statusCode'); + m + ..name = 'main' + ..returns = refer('void') + ..modifier = MethodModifier.async + ..body = Block((b) { + b.statements.add(uriExp.statement); + if (queryParamExp != null) { + b.statements.add(const Code('\n')); + b.statements.add(queryParamExp.statement); + } + if (uriReassignExps != null) { + b.statements.addAll(uriReassignExps.map((e) => e.statement)); + } + if (dataExp != null) { + b.statements.add(const Code('\n')); + b.statements.add(dataExp.statement); + } + if (headerExp != null) { + b.statements.add(const Code('\n')); + b.statements.add(headerExp.statement); + } + b.statements.add(const Code('\n')); + b.statements.add(responseExp.statement); + b.statements.add(const Code('\n')); + b.statements.add(declareVar('statusCode', type: refer('int')) + .assign(refer('response').property('statusCode')) + .statement); + b.statements.add(declareIfElse( + condition: statusRef + .greaterOrEqualTo(literalNum(200)) + .and(statusRef.lessThan(literalNum(300))), + body: [ + refer('print').call([literalString(r'Status Code: $statusCode')]), + refer('print') + .call([literalString(r'Response Body: ${response.body}')]), + ], + elseBody: [ + refer('print') + .call([literalString(r'Error Status Code: $statusCode')]), + refer('print').call( + [literalString(r'Error Response Body: ${response.body}')]), + ], + )); + }); + }); + + sbf.writeln(mainFunction.accept(emitter)); + + return DartFormatter(pageWidth: 160).format(sbf.toString()); + } } diff --git a/lib/codegen/dart/shared.dart b/lib/codegen/dart/shared.dart index 9938750c..073112dd 100644 --- a/lib/codegen/dart/shared.dart +++ b/lib/codegen/dart/shared.dart @@ -1,14 +1,24 @@ import 'package:code_builder/code_builder.dart'; +Code _toStatement(Spec spec) { + if (spec is Expression) { + return spec.statement; + } else if (spec is Code) { + return spec; + } else { + throw UnimplementedError(); + } +} + Block declareTryCatch({ - required List body, - required Map> onError, + required List body, + required Map> onError, bool showStackStrace = false, }) { return Block((b) { b.statements.add(const Code('try')); b.statements.add(const Code('{')); - b.statements.addAll(body.map((e) => e.statement).toList()); + b.statements.addAll(body.map(_toStatement).toList()); final entries = onError.entries; for (var error in entries) { @@ -19,8 +29,24 @@ Block declareTryCatch({ b.statements.add(Code(showStackStrace ? 'catch(e,s)' : 'catch(e)')); b.statements.add(const Code('{')); - b.statements.addAll(error.value.map((e) => e.statement).toList()); + b.statements.addAll(error.value.map(_toStatement).toList()); if (entries.last.key == error.key) b.statements.add(const Code('}')); } }); } + +Block declareIfElse({ + required Expression condition, + required List body, + required List elseBody, +}) { + return Block.of([ + const Code('if('), + condition.code, + const Code('){'), + ...body.map(_toStatement), + const Code('} else {'), + ...elseBody.map(_toStatement), + const Code('}'), + ]); +} diff --git a/test/codegen/dart_http_codegen_test.dart b/test/codegen/dart_http_codegen_test.dart index e384b628..0bdc5f60 100644 --- a/test/codegen/dart_http_codegen_test.dart +++ b/test/codegen/dart_http_codegen_test.dart @@ -1,7 +1,17 @@ import 'package:apidash/codegen/dart/http.dart'; +import 'package:dart_style/dart_style.dart'; import 'package:test/test.dart'; import '../request_models.dart'; +final _formatter = DartFormatter(fixes: [ + StyleFix.singleCascadeStatements +]); + +extension on String { + // format code before compare + String get format => _formatter.format(this); +} + void main() { final dartHttpCodeGen = DartHttpCodeGen(); @@ -25,7 +35,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet1, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet1, "https"), + expectedCode.format, + ); }); test('GET 2', () { @@ -34,9 +47,7 @@ void main() async { void main() async { var uri = Uri.parse('https://api.foss42.com/country/data'); - var queryParams = { - "code": "US" - }; + var queryParams = {'code': 'US'}; uri = uri.replace(queryParameters: queryParams); final response = await http.get(uri); @@ -52,18 +63,18 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet2, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet2, "https"), + expectedCode.format, + ); }); test('GET 3', () { const expectedCode = r"""import 'package:http/http.dart' as http; - void main() async { var uri = Uri.parse('https://api.foss42.com/country/data?code=US'); - var queryParams = { - "code": "IND" - }; + var queryParams = {'code': 'IND'}; var urlQueryParams = Map.from(uri.queryParameters); urlQueryParams.addAll(queryParams); uri = uri.replace(queryParameters: urlQueryParams); @@ -81,7 +92,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet3, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet3, "https"), + expectedCode.format, + ); }); test('GET 4', () { @@ -91,12 +105,12 @@ void main() async { var uri = Uri.parse('https://api.foss42.com/humanize/social'); var queryParams = { - "num": "8700000", - "digits": "3", - "system": "SS", - "add_space": "true", - "trailing_zeros": "true" - }; + 'num': '8700000', + 'digits': '3', + 'system': 'SS', + 'add_space': 'true', + 'trailing_zeros': 'true', + }; uri = uri.replace(queryParameters: queryParams); final response = await http.get(uri); @@ -112,7 +126,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet4, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet4, "https"), + expectedCode.format, + ); }); test('GET 5', () { @@ -121,12 +138,12 @@ void main() async { void main() async { var uri = Uri.parse('https://api.github.com/repos/foss42/apidash'); - var headers = { - "User-Agent": "Test Agent" - }; + var headers = {'User-Agent': 'Test Agent'}; - final response = await http.get(uri, - headers: headers); + final response = await http.get( + uri, + headers: headers, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -139,7 +156,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet5, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet5, "https"), + expectedCode.format, + ); }); test('GET 6', () { @@ -148,17 +168,15 @@ void main() async { void main() async { var uri = Uri.parse('https://api.github.com/repos/foss42/apidash'); - var queryParams = { - "raw": "true" - }; + var queryParams = {'raw': 'true'}; uri = uri.replace(queryParameters: queryParams); - var headers = { - "User-Agent": "Test Agent" - }; + var headers = {'User-Agent': 'Test Agent'}; - final response = await http.get(uri, - headers: headers); + final response = await http.get( + uri, + headers: headers, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -171,7 +189,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet6, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet6, "https"), + expectedCode.format, + ); }); test('GET 7', () { @@ -193,7 +214,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet7, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet7, "https"), + expectedCode.format, + ); }); test('GET 8', () { @@ -202,17 +226,15 @@ void main() async { void main() async { var uri = Uri.parse('https://api.github.com/repos/foss42/apidash'); - var queryParams = { - "raw": "true" - }; + var queryParams = {'raw': 'true'}; uri = uri.replace(queryParameters: queryParams); - var headers = { - "User-Agent": "Test Agent" - }; + var headers = {'User-Agent': 'Test Agent'}; - final response = await http.get(uri, - headers: headers); + final response = await http.get( + uri, + headers: headers, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -225,7 +247,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelGet8, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelGet8, "https"), + expectedCode.format, + ); }); }); @@ -249,7 +274,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelHead1, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelHead1, "https"), + expectedCode.format, + ); }); test('HEAD 2', () { @@ -271,7 +299,8 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelHead2, "http"), expectedCode); + expect(dartHttpCodeGen.getCode(requestModelHead2, "http"), + expectedCode.format); }); }); @@ -286,13 +315,13 @@ void main() async { "text": "I LOVE Flutter" }'''; - var headers = { - "content-type": "text/plain" - }; + var headers = {'content-type': 'text/plain'}; - final response = await http.post(uri, - headers: headers, - body: body); + final response = await http.post( + uri, + headers: headers, + body: body, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -305,7 +334,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelPost1, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelPost1, "https"), + expectedCode.format, + ); }); test('POST 2', () { @@ -318,13 +350,13 @@ void main() async { "text": "I LOVE Flutter" }'''; - var headers = { - "content-type": "application/json" - }; + var headers = {'content-type': 'application/json'}; - final response = await http.post(uri, - headers: headers, - body: body); + final response = await http.post( + uri, + headers: headers, + body: body, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -337,7 +369,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelPost2, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelPost2, "https"), + expectedCode.format, + ); }); test('POST 3', () { @@ -351,13 +386,15 @@ void main() async { }'''; var headers = { - "User-Agent": "Test Agent", - "content-type": "application/json" - }; + 'User-Agent': 'Test Agent', + 'content-type': 'application/json', + }; - final response = await http.post(uri, - headers: headers, - body: body); + final response = await http.post( + uri, + headers: headers, + body: body, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -370,7 +407,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelPost3, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelPost3, "https"), + expectedCode.format, + ); }); }); group('PUT Request', () { @@ -385,13 +425,13 @@ void main() async { "job": "zion resident" }'''; - var headers = { - "content-type": "application/json" - }; + var headers = {'content-type': 'application/json'}; - final response = await http.put(uri, - headers: headers, - body: body); + final response = await http.put( + uri, + headers: headers, + body: body, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -404,7 +444,10 @@ void main() async { } } """; - expect(dartHttpCodeGen.getCode(requestModelPut1, "https"), expectedCode); + expect( + dartHttpCodeGen.getCode(requestModelPut1, "https"), + expectedCode.format, + ); }); }); @@ -420,13 +463,13 @@ void main() async { "job": "accountant" }'''; - var headers = { - "content-type": "application/json" - }; + var headers = {'content-type': 'application/json'}; - final response = await http.patch(uri, - headers: headers, - body: body); + final response = await http.patch( + uri, + headers: headers, + body: body, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -440,7 +483,9 @@ void main() async { } """; expect( - dartHttpCodeGen.getCode(requestModelPatch1, "https"), expectedCode); + dartHttpCodeGen.getCode(requestModelPatch1, "https"), + expectedCode.format, + ); }); }); @@ -465,7 +510,9 @@ void main() async { } """; expect( - dartHttpCodeGen.getCode(requestModelDelete1, "https"), expectedCode); + dartHttpCodeGen.getCode(requestModelDelete1, "https"), + expectedCode.format, + ); }); test('DELETE 2', () { @@ -479,13 +526,13 @@ void main() async { "job": "accountant" }'''; - var headers = { - "content-type": "application/json" - }; + var headers = {'content-type': 'application/json'}; - final response = await http.delete(uri, - headers: headers, - body: body); + final response = await http.delete( + uri, + headers: headers, + body: body, + ); int statusCode = response.statusCode; if (statusCode >= 200 && statusCode < 300) { @@ -499,7 +546,9 @@ void main() async { } """; expect( - dartHttpCodeGen.getCode(requestModelDelete2, "https"), expectedCode); + dartHttpCodeGen.getCode(requestModelDelete2, "https"), + expectedCode.format, + ); }); }); } From 67f80563aab6e80042f448083a1dade3d4d338f5 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Thu, 21 Dec 2023 16:16:39 +0800 Subject: [PATCH 3/4] test:add dart dio code gen tests --- lib/codegen/dart/http.dart | 1 - test/codegen/dart_dio_codegen_test.dart | 514 ++++++++++++++++++++++++ 2 files changed, 514 insertions(+), 1 deletion(-) create mode 100644 test/codegen/dart_dio_codegen_test.dart diff --git a/lib/codegen/dart/http.dart b/lib/codegen/dart/http.dart index 6beccac8..67184c25 100644 --- a/lib/codegen/dart/http.dart +++ b/lib/codegen/dart/http.dart @@ -27,7 +27,6 @@ class DartHttpCodeGen { ); return next; } catch (e) { - print(e); return null; } } diff --git a/test/codegen/dart_dio_codegen_test.dart b/test/codegen/dart_dio_codegen_test.dart new file mode 100644 index 00000000..274511b4 --- /dev/null +++ b/test/codegen/dart_dio_codegen_test.dart @@ -0,0 +1,514 @@ +import 'package:apidash/codegen/dart/dio.dart'; +import 'package:dart_style/dart_style.dart'; +import 'package:test/test.dart'; +import '../request_models.dart'; + +final _formatter = DartFormatter(fixes: [ + StyleFix.singleCascadeStatements +]); + +extension on String { + // format code before compare + String get format => _formatter.format(this); +} + +void main() { + final dartDioCodeGen = DartDioCodeGen(); + + group('GET Request', () { + test('GET 1', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final response = await dio.Dio.get('https://api.foss42.com'); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet1, "https"), + expectedCode.format, + ); + }); + + test('GET 2', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final queryParams = {'code': 'US'}; + final response = await dio.Dio.get( + 'https://api.foss42.com/country/data', + queryParameters: queryParams, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet2, "https"), + expectedCode.format, + ); + }); + + test('GET 3', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final queryParams = {'code': 'IND'}; + final response = await dio.Dio.get( + 'https://api.foss42.com/country/data?code=US', + queryParameters: queryParams, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet3, "https"), + expectedCode.format, + ); + }); + + test('GET 4', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final queryParams = { + 'num': '8700000', + 'digits': '3', + 'system': 'SS', + 'add_space': 'true', + 'trailing_zeros': 'true', + }; + final response = await dio.Dio.get( + 'https://api.foss42.com/humanize/social', + queryParameters: queryParams, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet4, "https"), + expectedCode.format, + ); + }); + + test('GET 5', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final headers = {'User-Agent': 'Test Agent'}; + final response = await dio.Dio.get( + 'https://api.github.com/repos/foss42/apidash', + options: Options(headers: headers), + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet5, "https"), + expectedCode.format, + ); + }); + + test('GET 6', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final queryParams = {'raw': 'true'}; + final headers = {'User-Agent': 'Test Agent'}; + final response = await dio.Dio.get( + 'https://api.github.com/repos/foss42/apidash', + queryParameters: queryParams, + options: Options(headers: headers), + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet6, "https"), + expectedCode.format, + ); + }); + + test('GET 7', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final response = await dio.Dio.get('https://api.foss42.com'); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet7, "https"), + expectedCode.format, + ); + }); + + test('GET 8', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final queryParams = {'raw': 'true'}; + final headers = {'User-Agent': 'Test Agent'}; + final response = await dio.Dio.get( + 'https://api.github.com/repos/foss42/apidash', + queryParameters: queryParams, + options: Options(headers: headers), + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelGet8, "https"), + expectedCode.format, + ); + }); + }); + + group('HEAD Request', () { + test('HEAD 1', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final response = await dio.Dio.head('https://api.foss42.com'); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelHead1, "https"), + expectedCode.format, + ); + }); + + test('HEAD 2', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final response = await dio.Dio.head('http://api.foss42.com'); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect(dartDioCodeGen.getCode(requestModelHead2, "http"), + expectedCode.format); + }); + }); + + group('POST Request', () { + test('POST 1', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final data = r'''{ +"text": "I LOVE Flutter" +}'''; + final response = await dio.Dio.post( + 'https://api.foss42.com/case/lower', + data: data, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelPost1, "https"), + expectedCode.format, + ); + }); + + test('POST 2', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; +import 'dart:convert' as convert; + +void main() async { + try { + final data = convert.json.decode(r'''{ +"text": "I LOVE Flutter" +}'''); + final response = await dio.Dio.post( + 'https://api.foss42.com/case/lower', + data: data, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelPost2, "https"), + expectedCode.format, + ); + }); + + test('POST 3', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; +import 'dart:convert' as convert; + +void main() async { + try { + final headers = {'User-Agent': 'Test Agent'}; + final data = convert.json.decode(r'''{ +"text": "I LOVE Flutter" +}'''); + final response = await dio.Dio.post( + 'https://api.foss42.com/case/lower', + options: Options(headers: headers), + data: data, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelPost3, "https"), + expectedCode.format, + ); + }); + }); + group('PUT Request', () { + test('PUT 1', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; +import 'dart:convert' as convert; + +void main() async { + try { + final data = convert.json.decode(r'''{ +"name": "morpheus", +"job": "zion resident" +}'''); + final response = await dio.Dio.put( + 'https://reqres.in/api/users/2', + data: data, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelPut1, "https"), + expectedCode.format, + ); + }); + }); + + group('PATCH Request', () { + test('PATCH 1', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; +import 'dart:convert' as convert; + +void main() async { + try { + final data = convert.json.decode(r'''{ +"name": "marfeus", +"job": "accountant" +}'''); + final response = await dio.Dio.patch( + 'https://reqres.in/api/users/2', + data: data, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelPatch1, "https"), + expectedCode.format, + ); + }); + }); + + group('DELETE Request', () { + test('DELETE 1', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; + +void main() async { + try { + final response = await dio.Dio.delete('https://reqres.in/api/users/2'); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelDelete1, "https"), + expectedCode.format, + ); + }); + + test('DELETE 2', () { + const expectedCode = r"""import 'package:dio/dio.dart' as dio; +import 'dart:convert' as convert; + +void main() async { + try { + final data = convert.json.decode(r'''{ +"name": "marfeus", +"job": "accountant" +}'''); + final response = await dio.Dio.delete( + 'https://reqres.in/api/users/2', + data: data, + ); + print(response.statusCode); + print(response.data); + } on DioException catch (e, s) { + print(e.response?.statusCode); + print(e.response?.data); + print(s); + } catch (e, s) { + print(e); + print(s); + } +} +"""; + expect( + dartDioCodeGen.getCode(requestModelDelete2, "https"), + expectedCode.format, + ); + }); + }); +} From 20be6b1ba103d00fd389e9a4bac9fe62a33c0fec Mon Sep 17 00:00:00 2001 From: laiiihz Date: Sat, 23 Dec 2023 16:57:49 +0800 Subject: [PATCH 4/4] fix: fix dart code gen tests' matcher --- test/codegen/dart_dio_codegen_test.dart | 104 ++++------------ test/codegen/dart_http_codegen_test.dart | 146 ++++++----------------- 2 files changed, 62 insertions(+), 188 deletions(-) diff --git a/test/codegen/dart_dio_codegen_test.dart b/test/codegen/dart_dio_codegen_test.dart index 274511b4..6f1e3149 100644 --- a/test/codegen/dart_dio_codegen_test.dart +++ b/test/codegen/dart_dio_codegen_test.dart @@ -1,17 +1,8 @@ import 'package:apidash/codegen/dart/dio.dart'; -import 'package:dart_style/dart_style.dart'; import 'package:test/test.dart'; + import '../request_models.dart'; -final _formatter = DartFormatter(fixes: [ - StyleFix.singleCascadeStatements -]); - -extension on String { - // format code before compare - String get format => _formatter.format(this); -} - void main() { final dartDioCodeGen = DartDioCodeGen(); @@ -34,10 +25,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet1, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet1, "https"), expectedCode); }); test('GET 2', () { @@ -62,10 +50,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet2, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet2, "https"), expectedCode); }); test('GET 3', () { @@ -90,10 +75,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet3, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet3, "https"), expectedCode); }); test('GET 4', () { @@ -102,11 +84,11 @@ void main() async { void main() async { try { final queryParams = { - 'num': '8700000', - 'digits': '3', - 'system': 'SS', - 'add_space': 'true', - 'trailing_zeros': 'true', + 'num': '8700000', + 'digits': '3', + 'system': 'SS', + 'add_space': 'true', + 'trailing_zeros': 'true', }; final response = await dio.Dio.get( 'https://api.foss42.com/humanize/social', @@ -124,10 +106,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet4, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet4, "https"), expectedCode); }); test('GET 5', () { @@ -152,10 +131,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet5, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet5, "https"), expectedCode); }); test('GET 6', () { @@ -182,10 +158,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet6, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet6, "https"), expectedCode); }); test('GET 7', () { @@ -206,10 +179,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet7, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet7, "https"), expectedCode); }); test('GET 8', () { @@ -236,10 +206,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelGet8, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelGet8, "https"), expectedCode); }); }); @@ -262,10 +229,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelHead1, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelHead1, "https"), expectedCode); }); test('HEAD 2', () { @@ -286,8 +250,7 @@ void main() async { } } """; - expect(dartDioCodeGen.getCode(requestModelHead2, "http"), - expectedCode.format); + expect(dartDioCodeGen.getCode(requestModelHead2, "http"), expectedCode); }); }); @@ -297,7 +260,7 @@ void main() async { void main() async { try { - final data = r'''{ + final data = r'''{ "text": "I LOVE Flutter" }'''; final response = await dio.Dio.post( @@ -316,10 +279,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelPost1, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelPost1, "https"), expectedCode); }); test('POST 2', () { @@ -347,10 +307,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelPost2, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelPost2, "https"), expectedCode); }); test('POST 3', () { @@ -380,10 +337,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelPost3, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelPost3, "https"), expectedCode); }); }); group('PUT Request', () { @@ -413,10 +367,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelPut1, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelPut1, "https"), expectedCode); }); }); @@ -447,10 +398,7 @@ void main() async { } } """; - expect( - dartDioCodeGen.getCode(requestModelPatch1, "https"), - expectedCode.format, - ); + expect(dartDioCodeGen.getCode(requestModelPatch1, "https"), expectedCode); }); }); @@ -474,9 +422,7 @@ void main() async { } """; expect( - dartDioCodeGen.getCode(requestModelDelete1, "https"), - expectedCode.format, - ); + dartDioCodeGen.getCode(requestModelDelete1, "https"), expectedCode); }); test('DELETE 2', () { @@ -506,9 +452,7 @@ void main() async { } """; expect( - dartDioCodeGen.getCode(requestModelDelete2, "https"), - expectedCode.format, - ); + dartDioCodeGen.getCode(requestModelDelete2, "https"), expectedCode); }); }); } diff --git a/test/codegen/dart_http_codegen_test.dart b/test/codegen/dart_http_codegen_test.dart index 0bdc5f60..b28018c5 100644 --- a/test/codegen/dart_http_codegen_test.dart +++ b/test/codegen/dart_http_codegen_test.dart @@ -1,17 +1,8 @@ import 'package:apidash/codegen/dart/http.dart'; -import 'package:dart_style/dart_style.dart'; import 'package:test/test.dart'; + import '../request_models.dart'; -final _formatter = DartFormatter(fixes: [ - StyleFix.singleCascadeStatements -]); - -extension on String { - // format code before compare - String get format => _formatter.format(this); -} - void main() { final dartHttpCodeGen = DartHttpCodeGen(); @@ -28,17 +19,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet1, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelGet1, "https"), expectedCode); }); test('GET 2', () { @@ -56,26 +43,24 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet2, "https"), - expectedCode.format, - ); + + expect(dartHttpCodeGen.getCode(requestModelGet2, "https"), expectedCode); }); test('GET 3', () { const expectedCode = r"""import 'package:http/http.dart' as http; + void main() async { var uri = Uri.parse('https://api.foss42.com/country/data?code=US'); var queryParams = {'code': 'IND'}; - var urlQueryParams = Map.from(uri.queryParameters); + var urlQueryParams = Map.from(uri.queryParameters); urlQueryParams.addAll(queryParams); uri = uri.replace(queryParameters: urlQueryParams); @@ -85,17 +70,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet3, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelGet3, "https"), expectedCode); }); test('GET 4', () { @@ -119,17 +100,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet4, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelGet4, "https"), expectedCode); }); test('GET 5', () { @@ -149,17 +126,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet5, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelGet5, "https"), expectedCode); }); test('GET 6', () { @@ -182,17 +155,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet6, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelGet6, "https"), expectedCode); }); test('GET 7', () { @@ -207,17 +176,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet7, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelGet7, "https"), expectedCode); }); test('GET 8', () { @@ -240,17 +205,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelGet8, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelGet8, "https"), expectedCode); }); }); @@ -267,17 +228,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelHead1, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelHead1, "https"), expectedCode); }); test('HEAD 2', () { @@ -292,15 +249,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect(dartHttpCodeGen.getCode(requestModelHead2, "http"), - expectedCode.format); + expect(dartHttpCodeGen.getCode(requestModelHead2, "http"), expectedCode); }); }); @@ -327,17 +282,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelPost1, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelPost1, "https"), expectedCode); }); test('POST 2', () { @@ -362,17 +313,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelPost2, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelPost2, "https"), expectedCode); }); test('POST 3', () { @@ -400,17 +347,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelPost3, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelPost3, "https"), expectedCode); }); }); group('PUT Request', () { @@ -437,17 +380,13 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; - expect( - dartHttpCodeGen.getCode(requestModelPut1, "https"), - expectedCode.format, - ); + expect(dartHttpCodeGen.getCode(requestModelPut1, "https"), expectedCode); }); }); @@ -475,17 +414,14 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; expect( - dartHttpCodeGen.getCode(requestModelPatch1, "https"), - expectedCode.format, - ); + dartHttpCodeGen.getCode(requestModelPatch1, "https"), expectedCode); }); }); @@ -502,17 +438,14 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; expect( - dartHttpCodeGen.getCode(requestModelDelete1, "https"), - expectedCode.format, - ); + dartHttpCodeGen.getCode(requestModelDelete1, "https"), expectedCode); }); test('DELETE 2', () { @@ -538,17 +471,14 @@ void main() async { if (statusCode >= 200 && statusCode < 300) { print('Status Code: $statusCode'); print('Response Body: ${response.body}'); - } - else{ + } else { print('Error Status Code: $statusCode'); print('Error Response Body: ${response.body}'); } } """; expect( - dartHttpCodeGen.getCode(requestModelDelete2, "https"), - expectedCode.format, - ); + dartHttpCodeGen.getCode(requestModelDelete2, "https"), expectedCode); }); }); }