Update codegens

This commit is contained in:
Ankit Mahato
2024-04-19 19:26:19 +05:30
parent 61f78985ce
commit a5e5fc400d
57 changed files with 488 additions and 399 deletions

View File

@ -1,8 +1,7 @@
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart' show getValidRequestUri;
show getValidRequestUri, requestModelToHARJsonRequest; import 'package:apidash/models/models.dart';
import 'package:apidash/models/models.dart' show RequestModel;
class CCurlCodeGen { class CCurlCodeGen {
final String kTemplateStart = """#include <stdio.h> final String kTemplateStart = """#include <stdio.h>
@ -93,14 +92,22 @@ int main() {
}"""; }""";
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ""; String result = "";
var hasBody = false; var hasBody = false;
var requestBody = requestModel.requestBody;
String url = requestModel.url; var rec = getValidRequestUri(
requestModel.url,
requestModel.enabledParams,
);
Uri? uri = rec.$1;
if (uri == null) {
return result;
}
var templateStart = jj.Template(kTemplateStart); var templateStart = jj.Template(kTemplateStart);
result += templateStart.render({ result += templateStart.render({
@ -115,18 +122,10 @@ int main() {
"hasBody": hasBody, "hasBody": hasBody,
}); });
var harJson =
requestModelToHARJsonRequest(requestModel, useEnabled: true);
var templateUrl = jj.Template(kTemplateUrl); var templateUrl = jj.Template(kTemplateUrl);
String correctUrl = harJson["url"]; result += templateUrl.render({"url": uri});
result += templateUrl.render({"url": correctUrl});
var rec = getValidRequestUri( var headersList = requestModel.enabledHeaders;
url,
requestModel.enabledRequestParams,
);
var headersList = requestModel.enabledRequestHeaders;
if (headersList != null || if (headersList != null ||
requestModel.hasBody || requestModel.hasBody ||
requestModel.hasTextData || requestModel.hasTextData ||
@ -136,8 +135,8 @@ int main() {
// headers.putIfAbsent("Content-Type", () => "multipart/form-data"); // headers.putIfAbsent("Content-Type", () => "multipart/form-data");
// } // }
if (requestModel.hasTextData || requestModel.hasJsonData) { if (requestModel.hasTextData || requestModel.hasJsonData) {
headers.putIfAbsent(kHeaderContentType, headers.putIfAbsent(
() => requestModel.requestBodyContentType.header); kHeaderContentType, () => requestModel.bodyContentType.header);
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
var templateHeader = jj.Template(kTemplateHeader); var templateHeader = jj.Template(kTemplateHeader);
@ -147,43 +146,40 @@ int main() {
} }
} }
Uri? uri = rec.$1; if (requestModel.hasTextData || requestModel.hasJsonData) {
hasBody = true;
if (uri != null) { var templateRawBody = jj.Template(kTemplateBody);
if (requestModel.hasTextData || requestModel.hasJsonData) { String body = "";
hasBody = true; if (requestModel.body != null) {
var templateRawBody = jj.Template(kTemplateBody); body =
String body = ""; requestModel.body!.replaceAll('"', '\\"').replaceAll('\n', '\\n');
if (requestBody != null) {
body = requestBody.replaceAll('"', '\\"').replaceAll('\n', '\\n');
}
result += templateRawBody.render({"body": body});
} else if (requestModel.hasFormData) {
hasBody = true;
var templateFormData = jj.Template(kTemplateFormData);
result += templateFormData.render({
"hasFileInFormData": requestModel.hasFileInFormData,
"fields": requestModel.formDataMapList,
});
} }
if (requestModel.hasTextData) {} result += templateRawBody.render({"body": body});
if (uri.hasQuery) { } else if (requestModel.hasFormData) {
var params = uri.queryParameters; hasBody = true;
if (params.isNotEmpty) { var templateFormData = jj.Template(kTemplateFormData);
var templateQueryParam = jj.Template(kTemplateQueryParam); result += templateFormData.render({
result += templateQueryParam.render({"params": params}); "hasFileInFormData": requestModel.hasFileInFormData,
} "fields": requestModel.formDataMapList,
}
var headers = requestModel.enabledHeadersMap;
bool allow = headers.isNotEmpty ||
requestModel.hasTextData ||
requestModel.hasJsonData;
var templateEnd = jj.Template(kTemplateEnd);
result += templateEnd.render({
"formdata": requestModel.hasFormData,
"headers": allow,
}); });
} }
if (requestModel.hasTextData) {}
if (uri.hasQuery) {
var params = uri.queryParameters;
if (params.isNotEmpty) {
var templateQueryParam = jj.Template(kTemplateQueryParam);
result += templateQueryParam.render({"params": params});
}
}
var headers = requestModel.enabledHeadersMap;
bool allow = headers.isNotEmpty ||
requestModel.hasTextData ||
requestModel.hasJsonData;
var templateEnd = jj.Template(kTemplateEnd);
result += templateEnd.render({
"formdata": requestModel.hasFormData,
"headers": allow,
});
return result; return result;
} catch (e) { } catch (e) {

View File

@ -1,4 +1,4 @@
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' show getNewUuid; import 'package:apidash/utils/utils.dart' show getNewUuid;
import 'c/curl.dart'; import 'c/curl.dart';
@ -36,7 +36,11 @@ class Codegen {
String defaultUriScheme, { String defaultUriScheme, {
String? boundary, String? boundary,
}) { }) {
String url = requestModel.url; var httpRequestModel = requestModel.httpRequestModel;
if (httpRequestModel == null) {
return "";
}
String url = httpRequestModel.url;
if (url.isEmpty) { if (url.isEmpty) {
url = kDefaultUri; url = kDefaultUri;
@ -44,7 +48,7 @@ class Codegen {
if (!url.contains("://") && url.isNotEmpty) { if (!url.contains("://") && url.isNotEmpty) {
url = "$defaultUriScheme://$url"; url = "$defaultUriScheme://$url";
} }
var rM = requestModel.copyWith(url: url); var rM = httpRequestModel.copyWith(url: url);
switch (codegenLanguage) { switch (codegenLanguage) {
case CodegenLanguage.curl: case CodegenLanguage.curl:

View File

@ -1,6 +1,6 @@
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/utils/http_utils.dart'; import 'package:apidash/utils/http_utils.dart';
class CSharpHttpClientCodeGen { class CSharpHttpClientCodeGen {
@ -78,7 +78,7 @@ using (var request = new HttpRequestMessage(HttpMethod.{{ method | capitalize }}
} }
'''; ''';
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
StringBuffer result = StringBuffer(); StringBuffer result = StringBuffer();
@ -86,10 +86,12 @@ using (var request = new HttpRequestMessage(HttpMethod.{{ method | capitalize }}
String formdataImport = requestModel.hasFormData String formdataImport = requestModel.hasFormData
? "multipart" //(requestModel.hasFileInFormData ? "multipart" : "urlencoded") ? "multipart" //(requestModel.hasFileInFormData ? "multipart" : "urlencoded")
: "nodata"; : "nodata";
result.writeln(jj.Template(kTemplateNamespaces).render({"formdata": formdataImport})); result.writeln(jj.Template(kTemplateNamespaces)
.render({"formdata": formdataImport}));
// Set request URL // Set request URL
var (uri, _) = getValidRequestUri(requestModel.url, requestModel.enabledRequestParams); var (uri, _) =
getValidRequestUri(requestModel.url, requestModel.enabledParams);
if (uri != null) { if (uri != null) {
result.writeln(jj.Template(kTemplateUri).render({"uri": uri})); result.writeln(jj.Template(kTemplateUri).render({"uri": uri}));
} }
@ -102,18 +104,22 @@ using (var request = new HttpRequestMessage(HttpMethod.{{ method | capitalize }}
// Set request headers // Set request headers
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
result.writeln(jj.Template(kTemplateHeaders).render({"headers": headers})); result.writeln(
jj.Template(kTemplateHeaders).render({"headers": headers}));
} }
// Set request body if exists // Set request body if exists
if (kMethodsWithBody.contains(requestModel.method) && requestModel.hasBody) { if (kMethodsWithBody.contains(requestModel.method) &&
var requestBody = requestModel.requestBody; requestModel.hasBody) {
var requestBody = requestModel.body;
if (!requestModel.hasFormData && requestBody != null && requestBody.isNotEmpty) { if (!requestModel.hasFormData &&
requestBody != null &&
requestBody.isNotEmpty) {
// if the request body is not formdata then render raw text body // if the request body is not formdata then render raw text body
result.writeln(jj.Template(kTemplateRawBody).render({ result.writeln(jj.Template(kTemplateRawBody).render({
"body": requestBody, "body": requestBody,
"mediaType": requestModel.requestBodyContentType.header, "mediaType": requestModel.bodyContentType.header,
})); }));
} else if (requestModel.hasFormData) { } else if (requestModel.hasFormData) {
// final String renderingTemplate = requestModel.hasFileInFormData // final String renderingTemplate = requestModel.hasFileInFormData

View File

@ -1,10 +1,9 @@
import 'dart:convert'; import 'dart:convert';
import 'package:apidash/consts.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import '../../models/request_model.dart'; import 'package:apidash/consts.dart';
import '../../extensions/extensions.dart'; import 'package:apidash/models/models.dart';
import '../../utils/http_utils.dart'; import 'package:apidash/extensions/extensions.dart';
import 'package:apidash/utils/http_utils.dart';
class CSharpRestSharp { class CSharpRestSharp {
String kStringImports = """ String kStringImports = """
@ -90,12 +89,12 @@ class Program
} }
"""; """;
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
String result = ""; String result = "";
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
if (uri != null) { if (uri != null) {
@ -130,14 +129,13 @@ class Program
} }
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || if (headersList != null ||
requestModel.hasJsonData || requestModel.hasJsonData ||
requestModel.hasTextData) { requestModel.hasTextData) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers[kHeaderContentType] = headers[kHeaderContentType] = requestModel.bodyContentType.header;
requestModel.requestBodyContentType.header;
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
jj.Template templateHeaders = jj.Template(kTemplateHeaders); jj.Template templateHeaders = jj.Template(kTemplateHeaders);
@ -169,8 +167,7 @@ class Program
if (requestModel.hasJsonData) { if (requestModel.hasJsonData) {
var templateJsonData = jj.Template(kTemplateJsonData); var templateJsonData = jj.Template(kTemplateJsonData);
Map<String, dynamic> bodyData = Map<String, dynamic> bodyData = json.decode(requestModel.body!);
json.decode(requestModel.requestBody!);
List<String> jsonArr = []; List<String> jsonArr = [];
bodyData.forEach((key, value) { bodyData.forEach((key, value) {
@ -184,7 +181,7 @@ class Program
if (requestModel.hasTextData) { if (requestModel.hasTextData) {
jj.Template templateTextData = jj.Template(kTemplateTextData); jj.Template templateTextData = jj.Template(kTemplateTextData);
result += templateTextData result += templateTextData
.render({"textData": jsonEncode(requestModel.requestBody)}); .render({"textData": jsonEncode(requestModel.body)});
} }
result += kStringEnd; result += kStringEnd;

View File

@ -1,13 +1,13 @@
import 'dart:convert'; import 'dart:convert';
import 'package:code_builder/code_builder.dart'; import 'package:code_builder/code_builder.dart';
import 'package:dart_style/dart_style.dart'; import 'package:dart_style/dart_style.dart';
import 'package:apidash/models/request_model.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'shared.dart'; import 'shared.dart';
class DartDioCodeGen { class DartDioCodeGen {
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
final next = generatedDartCode( final next = generatedDartCode(
@ -15,8 +15,8 @@ class DartDioCodeGen {
method: requestModel.method, method: requestModel.method,
queryParams: requestModel.enabledParamsMap, queryParams: requestModel.enabledParamsMap,
headers: requestModel.enabledHeadersMap, headers: requestModel.enabledHeadersMap,
body: requestModel.requestBody, body: requestModel.body,
contentType: requestModel.requestBodyContentType, contentType: requestModel.bodyContentType,
formData: requestModel.formDataMapList, formData: requestModel.formDataMapList,
); );
return next; return next;

View File

@ -2,13 +2,13 @@ import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:code_builder/code_builder.dart'; import 'package:code_builder/code_builder.dart';
import 'package:dart_style/dart_style.dart'; import 'package:dart_style/dart_style.dart';
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'shared.dart'; import 'shared.dart';
class DartHttpCodeGen { class DartHttpCodeGen {
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
final next = generatedDartCode( final next = generatedDartCode(
@ -16,9 +16,9 @@ class DartHttpCodeGen {
method: requestModel.method, method: requestModel.method,
queryParams: requestModel.enabledParamsMap, queryParams: requestModel.enabledParamsMap,
headers: {...requestModel.enabledHeadersMap}, headers: {...requestModel.enabledHeadersMap},
contentType: requestModel.requestBodyContentType, contentType: requestModel.bodyContentType,
hasContentTypeHeader: requestModel.hasContentTypeHeader, hasContentTypeHeader: requestModel.hasContentTypeHeader,
body: requestModel.requestBody, body: requestModel.body,
formData: requestModel.formDataMapList, formData: requestModel.formDataMapList,
); );
return next; return next;

View File

@ -1,7 +1,7 @@
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' show getValidRequestUri; import 'package:apidash/utils/utils.dart' show getValidRequestUri;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
class GoHttpCodeGen { class GoHttpCodeGen {
final String kTemplateStart = """package main final String kTemplateStart = """package main
@ -88,12 +88,11 @@ func main() {
}"""; }""";
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ""; String result = "";
var hasBody = false; var hasBody = false;
var requestBody = requestModel.requestBody;
String url = requestModel.url; String url = requestModel.url;
@ -109,7 +108,7 @@ func main() {
var rec = getValidRequestUri( var rec = getValidRequestUri(
url, url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -118,7 +117,7 @@ func main() {
if (requestModel.hasTextData || requestModel.hasJsonData) { if (requestModel.hasTextData || requestModel.hasJsonData) {
hasBody = true; hasBody = true;
var templateRawBody = jj.Template(kTemplateBody); var templateRawBody = jj.Template(kTemplateBody);
result += templateRawBody.render({"body": requestBody}); result += templateRawBody.render({"body": requestModel.body});
} else if (requestModel.hasFormData) { } else if (requestModel.hasFormData) {
hasBody = true; hasBody = true;
var templateFormData = jj.Template(kTemplateFormData); var templateFormData = jj.Template(kTemplateFormData);
@ -143,12 +142,12 @@ func main() {
"hasBody": hasBody, "hasBody": hasBody,
}); });
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || requestModel.hasBody) { if (headersList != null || requestModel.hasBody) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers.putIfAbsent(kHeaderContentType, headers.putIfAbsent(
() => requestModel.requestBodyContentType.header); kHeaderContentType, () => requestModel.bodyContentType.header);
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
var templateHeader = jj.Template(kTemplateHeader); var templateHeader = jj.Template(kTemplateHeader);

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class JavaAsyncHttpClientGen { class JavaAsyncHttpClientGen {
@ -114,7 +114,7 @@ public class Main {
'''; ''';
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ''; String result = '';
@ -122,7 +122,7 @@ public class Main {
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -153,8 +153,7 @@ public class Main {
// we need to parse the body as it is, and write it to the body // we need to parse the body as it is, and write it to the body
if (requestModel.hasTextData || requestModel.hasJsonData) { if (requestModel.hasTextData || requestModel.hasJsonData) {
var templateBodyContent = jj.Template(kTemplateRequestBodyContent); var templateBodyContent = jj.Template(kTemplateRequestBodyContent);
result += result += templateBodyContent.render({"body": requestModel.body});
templateBodyContent.render({"body": requestModel.requestBody});
hasBody = true; hasBody = true;
} }
@ -170,8 +169,7 @@ public class Main {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (hasBody && !requestModel.hasContentTypeHeader) { if (hasBody && !requestModel.hasContentTypeHeader) {
headers[kHeaderContentType] = headers[kHeaderContentType] = requestModel.bodyContentType.header;
requestModel.requestBodyContentType.header;
} }
// setting up rest of the request headers // setting up rest of the request headers

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, requestModelToHARJsonRequest; show getValidRequestUri, requestModelToHARJsonRequest;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class JavaHttpClientCodeGen { class JavaHttpClientCodeGen {
@ -110,12 +110,12 @@ multipart/form-data; boundary={{boundary}}''';
"""; """;
String? getCode( String? getCode(
RequestModel requestModel, { HttpRequestModel requestModel, {
String? boundary, String? boundary,
}) { }) {
try { try {
String result = ""; String result = "";
var requestBody = requestModel.requestBody; var requestBody = requestModel.body;
String url = requestModel.url; String url = requestModel.url;
result += jj.Template(kTemplateStart).render({ result += jj.Template(kTemplateStart).render({
@ -124,7 +124,7 @@ multipart/form-data; boundary={{boundary}}''';
var rec = getValidRequestUri( var rec = getValidRequestUri(
url, url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -159,12 +159,12 @@ multipart/form-data; boundary={{boundary}}''';
"hasBody": requestModel.hasBody, "hasBody": requestModel.hasBody,
}); });
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || requestModel.hasBody) { if (headersList != null || requestModel.hasBody) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers.putIfAbsent(kHeaderContentType, headers.putIfAbsent(
() => requestModel.requestBodyContentType.header); kHeaderContentType, () => requestModel.bodyContentType.header);
} }
if (requestModel.hasFormData) { if (requestModel.hasFormData) {
var formDataHeader = jj.Template(kTemplateFormHeaderContentType); var formDataHeader = jj.Template(kTemplateFormHeaderContentType);

View File

@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import '../../models/request_model.dart'; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class JavaOkHttpCodeGen { class JavaOkHttpCodeGen {
@ -92,7 +92,7 @@ import okhttp3.MultipartBody;""";
'''; ''';
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ""; String result = "";
@ -102,7 +102,7 @@ import okhttp3.MultipartBody;""";
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -124,7 +124,7 @@ import okhttp3.MultipartBody;""";
} }
var method = requestModel.method; var method = requestModel.method;
var requestBody = requestModel.requestBody; var requestBody = requestModel.body;
if (requestModel.hasFormData) { if (requestModel.hasFormData) {
hasFormData = true; hasFormData = true;
var formDataTemplate = jj.Template(kFormDataBody); var formDataTemplate = jj.Template(kFormDataBody);
@ -136,7 +136,7 @@ import okhttp3.MultipartBody;""";
var contentLength = utf8.encode(requestBody).length; var contentLength = utf8.encode(requestBody).length;
if (contentLength > 0) { if (contentLength > 0) {
hasBody = true; hasBody = true;
String contentType = requestModel.requestBodyContentType.header; String contentType = requestModel.bodyContentType.header;
var templateBody = jj.Template(kTemplateRequestBody); var templateBody = jj.Template(kTemplateRequestBody);
result += templateBody.render({ result += templateBody.render({
"contentType": contentType, "contentType": contentType,
@ -155,7 +155,7 @@ import okhttp3.MultipartBody;""";
result = stringStart + result; result = stringStart + result;
result += kStringRequestStart; result += kStringRequestStart;
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null) { if (headersList != null) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
@ -176,7 +176,9 @@ import okhttp3.MultipartBody;""";
} }
String getQueryParams(Map<String, String> params) { String getQueryParams(Map<String, String> params) {
final paramStrings = params.entries.map((entry) => '.addQueryParameter("${entry.key}", "${entry.value}")').toList(); final paramStrings = params.entries
.map((entry) => '.addQueryParameter("${entry.key}", "${entry.value}")')
.toList();
return paramStrings.join('\n '); return paramStrings.join('\n ');
} }

View File

@ -1,5 +1,5 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/utils/http_utils.dart'; import 'package:apidash/utils/http_utils.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
@ -61,14 +61,14 @@ public class Main {
} }
"""; """;
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
String result = ''; String result = '';
bool hasBody = false; bool hasBody = false;
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
// uri is already generated based on url and enabled request params // uri is already generated based on url and enabled request params
@ -101,7 +101,7 @@ public class Main {
if (requestModel.hasTextData || requestModel.hasJsonData) { if (requestModel.hasTextData || requestModel.hasJsonData) {
var templateBodyContent = jj.Template(kTemplateRequestBodyContent); var templateBodyContent = jj.Template(kTemplateRequestBodyContent);
result += templateBodyContent.render({ result += templateBodyContent.render({
"body": requestModel.requestBody, "body": requestModel.body,
}); });
hasBody = true; hasBody = true;
} }
@ -114,8 +114,7 @@ public class Main {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (hasBody && !requestModel.hasContentTypeHeader) { if (hasBody && !requestModel.hasContentTypeHeader) {
headers[kHeaderContentType] = headers[kHeaderContentType] = requestModel.bodyContentType.header;
requestModel.requestBodyContentType.header;
} }
var templateRequestHeader = jj.Template(kTemplateRequestHeader); var templateRequestHeader = jj.Template(kTemplateRequestHeader);

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show padMultilineString, requestModelToHARJsonRequest, stripUrlParams; show padMultilineString, requestModelToHARJsonRequest, stripUrlParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class AxiosCodeGen { class AxiosCodeGen {
@ -47,7 +47,7 @@ axios(config)
}); });
"""; """;
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode); jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show padMultilineString, requestModelToHARJsonRequest; show padMultilineString, requestModelToHARJsonRequest;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class FetchCodeGen { class FetchCodeGen {
@ -52,7 +52,7 @@ fetch(url, options)
}); });
"""; """;
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode); jj.Template kNodejsImportTemplate = jj.Template(kStringImportNode);
String importsData = kNodejsImportTemplate.render({ String importsData = kNodejsImportTemplate.render({

View File

@ -2,7 +2,7 @@ import 'dart:io';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
class JuliaHttpClientCodeGen { class JuliaHttpClientCodeGen {
final String kTemplateStart = """ final String kTemplateStart = """
@ -70,7 +70,7 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response.
println("Response Body: \n$(String(response.body))") println("Response Body: \n$(String(response.body))")
"""; """;
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
String result = ""; String result = "";
bool hasQuery = false; bool hasQuery = false;
@ -79,7 +79,7 @@ println("Response Body: \n$(String(response.body))")
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
if (uri != null) { if (uri != null) {
@ -105,7 +105,7 @@ println("Response Body: \n$(String(response.body))")
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
addHeaderForBody = true; addHeaderForBody = true;
final templateBody = jj.Template(kTemplateBody); final templateBody = jj.Template(kTemplateBody);
var bodyStr = requestModel.requestBody; var bodyStr = requestModel.body;
result += templateBody.render({"body": bodyStr}); result += templateBody.render({"body": bodyStr});
} }
@ -119,14 +119,14 @@ println("Response Body: \n$(String(response.body))")
); );
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || addHeaderForBody) { if (headersList != null || addHeaderForBody) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (!requestModel.hasContentTypeHeader) { if (!requestModel.hasContentTypeHeader) {
if (addHeaderForBody) { if (addHeaderForBody) {
headers[HttpHeaders.contentTypeHeader] = headers[HttpHeaders.contentTypeHeader] =
requestModel.requestBodyContentType.header; requestModel.bodyContentType.header;
} }
} }

View File

@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import '../../models/request_model.dart'; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class KotlinOkHttpCodeGen { class KotlinOkHttpCodeGen {
@ -80,7 +80,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
'''; ''';
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ""; String result = "";
@ -91,7 +91,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -113,34 +113,28 @@ import okhttp3.MediaType.Companion.toMediaType""";
} }
var method = requestModel.method; var method = requestModel.method;
var requestBody = requestModel.requestBody; var requestBody = requestModel.body;
if (requestModel.hasFormData) { if (requestModel.hasFormData) {
hasFormData = true; hasFormData = true;
var formDataTemplate = jj.Template(kFormDataBody); var formDataTemplate = jj.Template(kFormDataBody);
List<Map<String,String>> modifiedFormDataList = []; List<Map<String, String>> modifiedFormDataList = [];
for (var item in requestModel.formDataList) { for (var item in requestModel.formDataList) {
if (item.type == FormDataType.file ) { if (item.type == FormDataType.file) {
if (item.value[0] == "/") { if (item.value[0] == "/") {
modifiedFormDataList.add({
"name": item.name,
"value": item.value.substring(1),
"type": "file"
});
}else{
modifiedFormDataList.add({ modifiedFormDataList.add({
"name": item.name, "name": item.name,
"value": item.value, "value": item.value.substring(1),
"type": "file" "type": "file"
}); });
} else {
modifiedFormDataList.add(
{"name": item.name, "value": item.value, "type": "file"});
} }
hasFile = true; hasFile = true;
}else{ } else {
modifiedFormDataList.add({ modifiedFormDataList.add(
"name": item.name, {"name": item.name, "value": item.value, "type": "text"});
"value": item.value,
"type": "text"
});
} }
} }
@ -151,7 +145,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
var contentLength = utf8.encode(requestBody).length; var contentLength = utf8.encode(requestBody).length;
if (contentLength > 0) { if (contentLength > 0) {
hasBody = true; hasBody = true;
String contentType = requestModel.requestBodyContentType.header; String contentType = requestModel.bodyContentType.header;
var templateBody = jj.Template(kTemplateRequestBody); var templateBody = jj.Template(kTemplateRequestBody);
result += templateBody result += templateBody
.render({"contentType": contentType, "body": requestBody}); .render({"contentType": contentType, "body": requestBody});
@ -169,7 +163,7 @@ import okhttp3.MediaType.Companion.toMediaType""";
result = stringStart + result; result = stringStart + result;
result += kStringRequestStart; result += kStringRequestStart;
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null) { if (headersList != null) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (headers.isNotEmpty) { if (headers.isNotEmpty) {

View File

@ -1,6 +1,6 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest; import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
// ignore: camel_case_types // ignore: camel_case_types
@ -20,7 +20,7 @@ class cURLCodeGen {
"""; """;
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ""; String result = "";
@ -54,7 +54,7 @@ class cURLCodeGen {
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
var templateBody = jj.Template(kTemplateBody); var templateBody = jj.Template(kTemplateBody);
result += templateBody.render({"body": requestModel.requestBody}); result += templateBody.render({"body": requestModel.body});
} else if (requestModel.hasFormData) { } else if (requestModel.hasFormData) {
for (var formData in requestModel.formDataList) { for (var formData in requestModel.formDataList) {
var templateFormData = jj.Template(kTemplateFormData); var templateFormData = jj.Template(kTemplateFormData);

View File

@ -1,10 +1,10 @@
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest; import 'package:apidash/utils/utils.dart' show requestModelToHARJsonRequest;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
class HARCodeGen { class HARCodeGen {
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
String defaultUriScheme, { String defaultUriScheme, {
String? boundary, String? boundary,
}) { }) {

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class PHPcURLCodeGen { class PHPcURLCodeGen {
@ -92,14 +92,14 @@ echo "Status Code: " . $httpCode . "\n";
echo $response . "\n"; echo $response . "\n";
'''; ''';
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
String result = ""; String result = "";
bool hasBody = false; bool hasBody = false;
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -120,7 +120,7 @@ echo $response . "\n";
result += templateBody.render({ result += templateBody.render({
'body': requestModel.hasFormData 'body': requestModel.hasFormData
? requestModel.formDataMapList ? requestModel.formDataMapList
: requestModel.requestBody, : requestModel.body,
}); });
} }
@ -136,8 +136,7 @@ echo $response . "\n";
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasBody && !requestModel.hasContentTypeHeader) { if (requestModel.hasBody && !requestModel.hasContentTypeHeader) {
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers[kHeaderContentType] = headers[kHeaderContentType] = requestModel.bodyContentType.header;
requestModel.requestBodyContentType.header;
} }
} }

View File

@ -1,7 +1,6 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart' show stripUrlParams;
show stripUrlParams; import 'package:apidash/models/models.dart';
import 'package:apidash/models/models.dart' show RequestModel;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class PhpGuzzleCodeGen { class PhpGuzzleCodeGen {
@ -59,7 +58,7 @@ echo $res->getBody();
"""; """;
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
var templateImport = jj.Template(kTemplateImport); var templateImport = jj.Template(kTemplateImport);
String importsData = templateImport.render({ String importsData = templateImport.render({
@ -75,7 +74,7 @@ echo $res->getBody();
var row = ''' var row = '''
[ [
'name' => '${field.name}', 'name' => '${field.name}',
'contents' => ${field.type == FormDataType.file? "fopen('${field.value}', 'r')":"'${field.value}'"} 'contents' => ${field.type == FormDataType.file ? "fopen('${field.value}', 'r')" : "'${field.value}'"}
]'''; ]''';
return row; return row;
}).join(",\n"), }).join(",\n"),
@ -103,12 +102,14 @@ echo $res->getBody();
headerList.add("'$key' => '$value'"); headerList.add("'$key' => '$value'");
}); });
if(!requestModel.hasContentTypeHeader && requestModel.hasBody){ if (!requestModel.hasContentTypeHeader && requestModel.hasBody) {
if(requestModel.hasJsonData || requestModel.hasTextData){ if (requestModel.hasJsonData || requestModel.hasTextData) {
headerList.add("'$kHeaderContentType' => '${requestModel.requestBodyContentType.header}'"); headerList.add(
"'$kHeaderContentType' => '${requestModel.bodyContentType.header}'");
} }
if(requestModel.hasFormData){ if (requestModel.hasFormData) {
headerList.add("'$kHeaderContentType' => '${requestModel.requestBodyContentType.header}; boundary=' . \$body->getBoundary()"); headerList.add(
"'$kHeaderContentType' => '${requestModel.bodyContentType.header}; boundary=' . \$body->getBoundary()");
} }
} }
result += templateHeader.render({ result += templateHeader.render({
@ -119,18 +120,16 @@ echo $res->getBody();
var templateBody = jj.Template(kTemplateBody); var templateBody = jj.Template(kTemplateBody);
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
result += templateBody result += templateBody.render({"body": requestModel.body});
.render({"body": requestModel.requestBody});
} }
var templateRequest = jj.Template(kTemplateRequest); var templateRequest = jj.Template(kTemplateRequest);
result += templateRequest.render({ result += templateRequest.render({
"url": stripUrlParams(requestModel.url), "url": stripUrlParams(requestModel.url),
"method": requestModel.method.name.toLowerCase(), "method": requestModel.method.name.toLowerCase(),
"queryParams": "queryParams": params.isNotEmpty ? ". \$queryParamsStr" : "",
params.isNotEmpty ? ". \$queryParamsStr" : "",
"headers": headerList.isNotEmpty ? ", \$headers" : "", "headers": headerList.isNotEmpty ? ", \$headers" : "",
"body": requestModel.hasBody? ", \$body" : "", "body": requestModel.hasBody ? ", \$body" : "",
}); });
return result; return result;

View File

@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class PhpHttpPlugCodeGen { class PhpHttpPlugCodeGen {
@ -73,13 +73,13 @@ echo \$response->getBody();
"""; """;
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
String result = ""; String result = "";
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -110,7 +110,7 @@ echo \$response->getBody();
result += templateRequestInit result += templateRequestInit
.render({"method": requestModel.method.name.toUpperCase()}); .render({"method": requestModel.method.name.toUpperCase()});
var requestBody = requestModel.requestBody; var requestBody = requestModel.body;
if ((requestModel.hasTextData || requestModel.hasJsonData) && if ((requestModel.hasTextData || requestModel.hasJsonData) &&
requestBody != null) { requestBody != null) {
@ -153,7 +153,7 @@ echo \$response->getBody();
if (requestModel.hasBody && !requestModel.hasContentTypeHeader) { if (requestModel.hasBody && !requestModel.hasContentTypeHeader) {
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers[kHeaderContentType] = headers[kHeaderContentType] =
"'${requestModel.requestBodyContentType.header}'"; "'${requestModel.bodyContentType.header}'";
} }
if (requestModel.hasFormData) { if (requestModel.hasFormData) {
headers[kHeaderContentType] = headers[kHeaderContentType] =

View File

@ -2,7 +2,7 @@ import 'dart:io';
import 'dart:convert'; import 'dart:convert';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' show getValidRequestUri; import 'package:apidash/utils/utils.dart' show getValidRequestUri;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class PythonHttpClientCodeGen { class PythonHttpClientCodeGen {
@ -83,7 +83,7 @@ dataList = build_data_list({{fields_list}})
body = b'\r\n'.join(dataList) body = b'\r\n'.join(dataList)
'''; ''';
String? getCode( String? getCode(
RequestModel requestModel, { HttpRequestModel requestModel, {
String? boundary, String? boundary,
}) { }) {
try { try {
@ -100,7 +100,7 @@ body = b'\r\n'.join(dataList)
); );
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -120,11 +120,11 @@ body = b'\r\n'.join(dataList)
hasBody = true; hasBody = true;
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
var templateBody = jj.Template(kTemplateBody); var templateBody = jj.Template(kTemplateBody);
result += templateBody.render({"body": requestModel.requestBody}); result += templateBody.render({"body": requestModel.body});
} }
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || hasBody) { if (headersList != null || hasBody) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
@ -133,7 +133,7 @@ body = b'\r\n'.join(dataList)
if (hasBody && !requestModel.hasContentTypeHeader) { if (hasBody && !requestModel.hasContentTypeHeader) {
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers[HttpHeaders.contentTypeHeader] = headers[HttpHeaders.contentTypeHeader] =
requestModel.requestBodyContentType.header; requestModel.bodyContentType.header;
} else if (requestModel.hasFormData) { } else if (requestModel.hasFormData) {
var formHeaderTemplate = var formHeaderTemplate =
jj.Template(kTemplateFormHeaderContentType); jj.Template(kTemplateFormHeaderContentType);

View File

@ -3,7 +3,7 @@ import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams, getFilenameFromPath; show getValidRequestUri, stripUriParams, getFilenameFromPath;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import '../codegen_utils.dart'; import '../codegen_utils.dart';
class PythonRequestsCodeGen { class PythonRequestsCodeGen {
@ -80,7 +80,7 @@ print('Response Body:', response.text)
} }
String? getCode( String? getCode(
RequestModel requestModel, { HttpRequestModel requestModel, {
String? boundary, String? boundary,
}) { }) {
try { try {
@ -92,7 +92,7 @@ print('Response Body:', response.text)
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
if (uri != null) { if (uri != null) {
@ -140,15 +140,15 @@ print('Response Body:', response.text)
} else if (requestModel.hasJsonData) { } else if (requestModel.hasJsonData) {
hasJsonBody = true; hasJsonBody = true;
var templateBody = jj.Template(kTemplateJson); var templateBody = jj.Template(kTemplateJson);
var pyDict = jsonToPyDict(requestModel.requestBody ?? ""); var pyDict = jsonToPyDict(requestModel.body ?? "");
result += templateBody.render({"body": pyDict}); result += templateBody.render({"body": pyDict});
} else if (requestModel.hasTextData) { } else if (requestModel.hasTextData) {
hasBody = true; hasBody = true;
var templateBody = jj.Template(kTemplateBody); var templateBody = jj.Template(kTemplateBody);
result += templateBody.render({"body": requestModel.requestBody}); result += templateBody.render({"body": requestModel.body});
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || hasBody) { if (headersList != null || hasBody) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (hasBody) { if (hasBody) {
@ -157,7 +157,7 @@ print('Response Body:', response.text)
kStringFormDataContentType; kStringFormDataContentType;
} else { } else {
headers[HttpHeaders.contentTypeHeader] = headers[HttpHeaders.contentTypeHeader] =
requestModel.requestBodyContentType.header; requestModel.bodyContentType.header;
} }
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {

View File

@ -2,8 +2,7 @@ import 'package:apidash/consts.dart';
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' show getValidRequestUri; import 'package:apidash/utils/utils.dart' show getValidRequestUri;
import 'package:apidash/utils/http_utils.dart' show stripUriParams; import 'package:apidash/utils/http_utils.dart' show stripUriParams;
import 'package:apidash/models/models.dart';
import 'package:apidash/models/models.dart' show RequestModel;
// Note that delete is a special case in Faraday as API Dash supports request // Note that delete is a special case in Faraday as API Dash supports request
// body inside delete reqest, but Faraday does not. Hence we need to manually // body inside delete reqest, but Faraday does not. Hence we need to manually
@ -88,14 +87,14 @@ puts "Response Body: #{response.body}"
"""; """;
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ""; String result = "";
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -126,7 +125,7 @@ puts "Response Body: #{response.body}"
} else if (requestModel.hasJsonData || requestModel.hasTextData) { } else if (requestModel.hasJsonData || requestModel.hasTextData) {
var templateBody = jj.Template(kTemplateBody); var templateBody = jj.Template(kTemplateBody);
result += templateBody.render({ result += templateBody.render({
"body": requestModel.requestBody, "body": requestModel.body,
}); });
} }
@ -150,8 +149,7 @@ puts "Response Body: #{response.body}"
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasBody && !requestModel.hasContentTypeHeader) { if (requestModel.hasBody && !requestModel.hasContentTypeHeader) {
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers[kHeaderContentType] = headers[kHeaderContentType] = requestModel.bodyContentType.header;
requestModel.requestBodyContentType.header;
} }
} }

View File

@ -1,8 +1,8 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import '../../extensions/extensions.dart'; import 'package:apidash/extensions/extensions.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class RubyNetHttpCodeGen { class RubyNetHttpCodeGen {
@ -39,13 +39,13 @@ puts "Response Code: #{response.code}"
"""; """;
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
String result = ""; String result = "";
var rec = getValidRequestUri( var rec = getValidRequestUri(
requestModel.url, requestModel.url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -64,8 +64,7 @@ puts "Response Code: #{response.code}"
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (!requestModel.hasContentTypeHeader && if (!requestModel.hasContentTypeHeader &&
(requestModel.hasJsonData || requestModel.hasTextData)) { (requestModel.hasJsonData || requestModel.hasTextData)) {
headers[kHeaderContentType] = headers[kHeaderContentType] = requestModel.bodyContentType.header;
requestModel.requestBodyContentType.header;
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
@ -78,7 +77,7 @@ puts "Response Code: #{response.code}"
if (requestModel.hasTextData || requestModel.hasJsonData) { if (requestModel.hasTextData || requestModel.hasJsonData) {
var templateBody = jj.Template(kTemplateBody); var templateBody = jj.Template(kTemplateBody);
result += templateBody.render({ result += templateBody.render({
"body": requestModel.requestBody, "body": requestModel.body,
}); });
} }

View File

@ -4,7 +4,7 @@ import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getNewUuid, getValidRequestUri, stripUriParams; show getNewUuid, getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
class RustActixCodeGen { class RustActixCodeGen {
final String kTemplateStart = """ final String kTemplateStart = """
@ -112,7 +112,7 @@ multipart/form-data; boundary={{boundary}}''';
"""; """;
String? getCode( String? getCode(
RequestModel requestModel, { HttpRequestModel requestModel, {
String? boundary, String? boundary,
}) { }) {
try { try {
@ -125,7 +125,7 @@ multipart/form-data; boundary={{boundary}}''';
var rec = getValidRequestUri( var rec = getValidRequestUri(
url, url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
if (uri != null) { if (uri != null) {
@ -137,11 +137,11 @@ multipart/form-data; boundary={{boundary}}''';
}); });
var method = requestModel.method; var method = requestModel.method;
var requestBody = requestModel.requestBody; var requestBody = requestModel.body;
if (kMethodsWithBody.contains(method) && requestBody != null) { if (kMethodsWithBody.contains(method) && requestBody != null) {
var contentLength = utf8.encode(requestBody).length; var contentLength = utf8.encode(requestBody).length;
if (contentLength > 0) { if (contentLength > 0) {
if (requestModel.requestBodyContentType == ContentType.json) { if (requestModel.bodyContentType == ContentType.json) {
hasJsonBody = true; hasJsonBody = true;
var templateBody = jj.Template(kTemplateJson); var templateBody = jj.Template(kTemplateJson);
result += templateBody.render({"body": requestBody}); result += templateBody.render({"body": requestBody});
@ -179,7 +179,7 @@ multipart/form-data; boundary={{boundary}}''';
} }
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || hasBody || requestModel.hasFormData) { if (headersList != null || hasBody || requestModel.hasFormData) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasFormData) { if (requestModel.hasFormData) {
@ -190,7 +190,7 @@ multipart/form-data; boundary={{boundary}}''';
}); });
} else if (hasBody) { } else if (hasBody) {
headers[HttpHeaders.contentTypeHeader] = headers[HttpHeaders.contentTypeHeader] =
requestModel.requestBodyContentType.header; requestModel.bodyContentType.header;
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {

View File

@ -1,7 +1,7 @@
import 'package:jinja/jinja.dart' as jj; import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, requestModelToHARJsonRequest; show getValidRequestUri, requestModelToHARJsonRequest;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
class RustCurlCodeGen { class RustCurlCodeGen {
@ -78,23 +78,22 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
String? getCode(RequestModel requestModel) { String? getCode(HttpRequestModel requestModel) {
try { try {
String result = ""; String result = "";
var requestBody = requestModel.requestBody;
String url = requestModel.url; String url = requestModel.url;
result += jj.Template(kTemplateStart).render({ result += jj.Template(kTemplateStart).render({
"hasJsonBody": requestModel.hasJsonData, "hasJsonBody": requestModel.hasJsonData,
"hasHeaders": (requestModel.enabledRequestHeaders != null && "hasHeaders": (requestModel.enabledHeaders != null &&
requestModel.enabledRequestHeaders!.isNotEmpty) || requestModel.enabledHeaders!.isNotEmpty) ||
(requestModel.hasJsonData || requestModel.hasTextData) (requestModel.hasJsonData || requestModel.hasTextData)
}); });
var rec = getValidRequestUri( var rec = getValidRequestUri(
url, url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
@ -110,10 +109,10 @@ fn main() {
if (uri != null) { if (uri != null) {
if (requestModel.hasTextData) { if (requestModel.hasTextData) {
var templateBody = jj.Template(kTemplateRawBody); var templateBody = jj.Template(kTemplateRawBody);
result += templateBody.render({"body": requestBody}); result += templateBody.render({"body": requestModel.body});
} else if (requestModel.hasJsonData) { } else if (requestModel.hasJsonData) {
var templateBody = jj.Template(kTemplateJsonBody); var templateBody = jj.Template(kTemplateJsonBody);
result += templateBody.render({"body": requestBody}); result += templateBody.render({"body": requestModel.body});
} else if (requestModel.hasFormData) { } else if (requestModel.hasFormData) {
var templateFormData = jj.Template(kTemplateFormData); var templateFormData = jj.Template(kTemplateFormData);
result += templateFormData.render({ result += templateFormData.render({
@ -121,12 +120,12 @@ fn main() {
}); });
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || requestModel.hasBody) { if (headersList != null || requestModel.hasBody) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasJsonData || requestModel.hasTextData) { if (requestModel.hasJsonData || requestModel.hasTextData) {
headers.putIfAbsent(kHeaderContentType, headers.putIfAbsent(
() => requestModel.requestBodyContentType.header); kHeaderContentType, () => requestModel.bodyContentType.header);
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
var templateHeader = jj.Template(kTemplateHeader); var templateHeader = jj.Template(kTemplateHeader);

View File

@ -4,7 +4,7 @@ import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getValidRequestUri, stripUriParams; show getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
class RustReqwestCodeGen { class RustReqwestCodeGen {
final String kTemplateStart = final String kTemplateStart =
@ -81,7 +81,7 @@ class RustReqwestCodeGen {
"""; """;
String? getCode( String? getCode(
RequestModel requestModel, HttpRequestModel requestModel,
) { ) {
try { try {
String result = ""; String result = "";
@ -92,7 +92,7 @@ class RustReqwestCodeGen {
var rec = getValidRequestUri( var rec = getValidRequestUri(
url, url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
if (uri != null) { if (uri != null) {
@ -100,15 +100,15 @@ class RustReqwestCodeGen {
result += templateStartUrl.render({ result += templateStartUrl.render({
"url": stripUriParams(uri), "url": stripUriParams(uri),
'isFormDataRequest': requestModel.hasFormData, 'isFormDataRequest': requestModel.hasFormData,
'isJson': requestModel.requestBodyContentType == ContentType.json 'isJson': requestModel.bodyContentType == ContentType.json
}); });
var method = requestModel.method; var method = requestModel.method;
var requestBody = requestModel.requestBody; var requestBody = requestModel.body;
if (kMethodsWithBody.contains(method) && requestBody != null) { if (kMethodsWithBody.contains(method) && requestBody != null) {
var contentLength = utf8.encode(requestBody).length; var contentLength = utf8.encode(requestBody).length;
if (contentLength > 0) { if (contentLength > 0) {
if (requestModel.requestBodyContentType == ContentType.json) { if (requestModel.bodyContentType == ContentType.json) {
hasJsonBody = true; hasJsonBody = true;
var templateBody = jj.Template(kTemplateJson); var templateBody = jj.Template(kTemplateJson);
result += templateBody.render({"body": requestBody}); result += templateBody.render({"body": requestBody});
@ -145,12 +145,12 @@ class RustReqwestCodeGen {
} }
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || hasBody) { if (headersList != null || hasBody) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (hasBody) { if (hasBody) {
headers[HttpHeaders.contentTypeHeader] = headers[HttpHeaders.contentTypeHeader] =
requestModel.requestBodyContentType.header; requestModel.bodyContentType.header;
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
var templateHeaders = jj.Template(kTemplateHeaders); var templateHeaders = jj.Template(kTemplateHeaders);

View File

@ -4,7 +4,7 @@ import 'package:jinja/jinja.dart' as jj;
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/utils/utils.dart' import 'package:apidash/utils/utils.dart'
show getNewUuid, getValidRequestUri, stripUriParams; show getNewUuid, getValidRequestUri, stripUriParams;
import 'package:apidash/models/models.dart' show RequestModel; import 'package:apidash/models/models.dart';
class RustUreqCodeGen { class RustUreqCodeGen {
final String kTemplateStart = """ final String kTemplateStart = """
@ -109,7 +109,7 @@ multipart/form-data; boundary={{boundary}}''';
"""; """;
String? getCode( String? getCode(
RequestModel requestModel, { HttpRequestModel requestModel, {
String? boundary, String? boundary,
}) { }) {
try { try {
@ -122,7 +122,7 @@ multipart/form-data; boundary={{boundary}}''';
var rec = getValidRequestUri( var rec = getValidRequestUri(
url, url,
requestModel.enabledRequestParams, requestModel.enabledParams,
); );
Uri? uri = rec.$1; Uri? uri = rec.$1;
if (uri != null) { if (uri != null) {
@ -134,11 +134,11 @@ multipart/form-data; boundary={{boundary}}''';
}); });
var method = requestModel.method; var method = requestModel.method;
var requestBody = requestModel.requestBody; var requestBody = requestModel.body;
if (kMethodsWithBody.contains(method) && requestBody != null) { if (kMethodsWithBody.contains(method) && requestBody != null) {
var contentLength = utf8.encode(requestBody).length; var contentLength = utf8.encode(requestBody).length;
if (contentLength > 0) { if (contentLength > 0) {
if (requestModel.requestBodyContentType == ContentType.json) { if (requestModel.bodyContentType == ContentType.json) {
hasJsonBody = true; hasJsonBody = true;
var templateBody = jj.Template(kTemplateJson); var templateBody = jj.Template(kTemplateJson);
result += templateBody.render({"body": requestBody}); result += templateBody.render({"body": requestBody});
@ -172,7 +172,7 @@ multipart/form-data; boundary={{boundary}}''';
} }
} }
var headersList = requestModel.enabledRequestHeaders; var headersList = requestModel.enabledHeaders;
if (headersList != null || hasBody || requestModel.hasFormData) { if (headersList != null || hasBody || requestModel.hasFormData) {
var headers = requestModel.enabledHeadersMap; var headers = requestModel.enabledHeadersMap;
if (requestModel.hasFormData) { if (requestModel.hasFormData) {
@ -183,7 +183,7 @@ multipart/form-data; boundary={{boundary}}''';
}); });
} else if (hasBody) { } else if (hasBody) {
headers[HttpHeaders.contentTypeHeader] = headers[HttpHeaders.contentTypeHeader] =
requestModel.requestBodyContentType.header; requestModel.bodyContentType.header;
} }
if (headers.isNotEmpty) { if (headers.isNotEmpty) {

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();
@ -22,7 +22,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet1, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet1, "https"),
expectedCode);
}); });
test('GET 2', () { test('GET 2', () {
@ -40,7 +43,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet2, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet2, "https"),
expectedCode);
}); });
test('GET 3', () { test('GET 3', () {
@ -58,7 +64,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet3, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet3, "https"),
expectedCode);
}); });
test('GET 4', () { test('GET 4', () {
@ -76,7 +85,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet4, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet4, "https"),
expectedCode);
}); });
test('GET 5', () { test('GET 5', () {
@ -96,7 +108,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet5, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet5, "https"),
expectedCode);
}); });
test('GET 6', () { test('GET 6', () {
@ -116,7 +131,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet6, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet6, "https"),
expectedCode);
}); });
test('GET 7', () { test('GET 7', () {
@ -134,7 +152,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet7, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet7, "https"),
expectedCode);
}); });
test('GET 8', () { test('GET 8', () {
@ -154,7 +175,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet8, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet8, "https"),
expectedCode);
}); });
test('GET 9', () { test('GET 9', () {
@ -172,7 +196,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet9, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet9, "https"),
expectedCode);
}); });
test('GET 10', () { test('GET 10', () {
@ -192,7 +219,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet10, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet10, "https"),
expectedCode);
}); });
test('GET 11', () { test('GET 11', () {
@ -212,7 +242,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet11, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet11, "https"),
expectedCode);
}); });
test('GET 12', () { test('GET 12', () {
@ -230,7 +263,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelGet12, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelGet12, "https"),
expectedCode);
}); });
}); });
@ -250,7 +286,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Head, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelHead1, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelHead1, "https"),
expectedCode);
}); });
test('HEAD 2', () { test('HEAD 2', () {
@ -268,7 +307,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Head, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelHead2, "http"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelHead2, "http"),
expectedCode);
}); });
}); });
@ -296,7 +338,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost1, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost1, "https"),
expectedCode);
}); });
test('POST 2', () { test('POST 2', () {
@ -327,7 +372,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost2, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost2, "https"),
expectedCode);
}); });
test('POST 3', () { test('POST 3', () {
@ -355,7 +403,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost3, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost3, "https"),
expectedCode);
}); });
test('POST 4', () { test('POST 4', () {
@ -382,7 +433,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost4, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost4, "https"),
expectedCode);
}); });
test('POST 5', () { test('POST 5', () {
@ -411,7 +465,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost5, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost5, "https"),
expectedCode);
}); });
test('POST 6', () { test('POST 6', () {
@ -441,7 +498,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost6, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost6, "https"),
expectedCode);
}); });
test('POST 7', () { test('POST 7', () {
@ -471,7 +531,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost7, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost7, "https"),
expectedCode);
}); });
test('POST 8', () { test('POST 8', () {
@ -498,7 +561,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost8, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost8, "https"),
expectedCode);
}); });
test('POST 9', () { test('POST 9', () {
@ -531,7 +597,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPost9, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPost9, "https"),
expectedCode);
}); });
}); });
@ -560,7 +629,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Put, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPut1, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPut1, "https"),
expectedCode);
}); });
}); });
@ -589,7 +661,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Patch, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelPatch1, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelPatch1, "https"),
expectedCode);
}); });
}); });
@ -609,7 +684,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Delete, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelDelete1, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelDelete1, "https"),
expectedCode);
}); });
test('DELETE 2', () { test('DELETE 2', () {
@ -636,7 +714,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Delete, uri))
Console.WriteLine(await response.Content.ReadAsStringAsync()); Console.WriteLine(await response.Content.ReadAsStringAsync());
} }
'''; ''';
expect(codeGen.getCode(CodegenLanguage.cSharpHttpClient, requestModelDelete2, "https"), expectedCode); expect(
codeGen.getCode(
CodegenLanguage.cSharpHttpClient, requestModelDelete2, "https"),
expectedCode);
}); });
}); });
} }

View File

@ -1,8 +1,7 @@
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/screens/home_page/editor_pane/details_card/code_pane.dart'; import 'package:apidash/screens/home_page/editor_pane/details_card/code_pane.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import '../models/request_models.dart';
import '../request_models.dart';
void main() { void main() {
group("Get Request Test", () { group("Get Request Test", () {

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();
@ -558,8 +558,7 @@ void main() async {
} }
"""; """;
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost4, "https"),
CodegenLanguage.dartHttp, requestModelPost4, "https"),
expectedCode); expectedCode);
}); });
test('POST 5', () { test('POST 5', () {
@ -619,8 +618,7 @@ void main() async {
} }
"""; """;
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost5, "https"),
CodegenLanguage.dartHttp, requestModelPost5, "https"),
expectedCode); expectedCode);
}); });
test('POST 6', () { test('POST 6', () {
@ -676,8 +674,7 @@ void main() async {
} }
"""; """;
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost6, "https"),
CodegenLanguage.dartHttp, requestModelPost6, "https"),
expectedCode); expectedCode);
}); });
test('POST 7', () { test('POST 7', () {
@ -733,8 +730,7 @@ void main() async {
} }
"""; """;
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost7, "https"),
CodegenLanguage.dartHttp, requestModelPost7, "https"),
expectedCode); expectedCode);
}); });
test('POST 8', () { test('POST 8', () {
@ -797,8 +793,7 @@ void main() async {
} }
"""; """;
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost8, "https"),
CodegenLanguage.dartHttp, requestModelPost8, "https"),
expectedCode); expectedCode);
}); });
test('POST 9', () { test('POST 9', () {
@ -866,11 +861,9 @@ void main() async {
} }
"""; """;
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost9, "https"),
CodegenLanguage.dartHttp, requestModelPost9, "https"),
expectedCode); expectedCode);
}); });
}); });
group('PUT Request', () { group('PUT Request', () {

View File

@ -2,7 +2,7 @@ import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:apidash/screens/home_page/editor_pane/details_card/code_pane.dart'; import 'package:apidash/screens/home_page/editor_pane/details_card/code_pane.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,9 +1,10 @@
import 'package:apidash/codegen/java/okhttp.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final javaOkHttpCodeGen = JavaOkHttpCodeGen(); final codeGen = Codegen();
group('GET Request', () { group('GET Request', () {
test('GET 1', () { test('GET 1', () {
@ -36,7 +37,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet1), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet1, "https"),
expectedCode);
}); });
test('GET 2', () { test('GET 2', () {
@ -72,7 +75,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet2), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet2, "https"),
expectedCode);
}); });
test('GET 3', () { test('GET 3', () {
@ -108,7 +113,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet3), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet3, "https"),
expectedCode);
}); });
test('GET 4', () { test('GET 4', () {
@ -148,7 +155,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet4), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet4, "https"),
expectedCode);
}); });
test('GET 5', () { test('GET 5', () {
@ -182,7 +191,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet5), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet5, "https"),
expectedCode);
}); });
test('GET 6', () { test('GET 6', () {
@ -219,7 +230,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet6), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet6, "https"),
expectedCode);
}); });
test('GET 7', () { test('GET 7', () {
@ -252,7 +265,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet7), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet7, "https"),
expectedCode);
}); });
test('GET 8', () { test('GET 8', () {
@ -289,7 +304,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet8), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet8, "https"),
expectedCode);
}); });
test('GET 9', () { test('GET 9', () {
@ -326,7 +343,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet9), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet9, "https"),
expectedCode);
}); });
test('GET 10', () { test('GET 10', () {
@ -360,9 +379,8 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode( codeGen.getCode(
requestModelGet10, CodegenLanguage.javaOkHttp, requestModelGet10, "https"),
),
expectedCode); expectedCode);
}); });
@ -401,7 +419,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet11), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet11, "https"),
expectedCode);
}); });
test('GET 12', () { test('GET 12', () {
@ -434,7 +454,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelGet12), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelGet12, "https"),
expectedCode);
}); });
}); });
@ -469,7 +491,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelHead1), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelHead1, "https"),
expectedCode);
}); });
test('HEAD 2', () { test('HEAD 2', () {
@ -483,7 +507,7 @@ public class Main {
public static void main(String[] args) { public static void main(String[] args) {
OkHttpClient client = new OkHttpClient().newBuilder().build(); OkHttpClient client = new OkHttpClient().newBuilder().build();
String url = "https://api.apidash.dev"; String url = "http://api.apidash.dev";
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
@ -502,7 +526,9 @@ public class Main {
} }
"""; """;
expect( expect(
javaOkHttpCodeGen.getCode(requestModelHead2), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelHead2, "http"),
expectedCode);
}); });
}); });
@ -543,7 +569,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost1), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost1, "https"),
expectedCode);
}); });
test('POST 2', () { test('POST 2', () {
@ -582,7 +610,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost2), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost2, "https"),
expectedCode);
}); });
test('POST 3', () { test('POST 3', () {
@ -622,7 +652,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost3), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost3, "https"),
expectedCode);
}); });
test('POST 4', () { test('POST 4', () {
@ -662,7 +694,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost4), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost4, "https"),
expectedCode);
}); });
test('POST 5', () { test('POST 5', () {
@ -703,7 +737,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost5), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost5, "https"),
expectedCode);
}); });
test('POST 6', () { test('POST 6', () {
@ -742,7 +778,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost6), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost6, "https"),
expectedCode);
}); });
test('POST 7', () { test('POST 7', () {
@ -781,7 +819,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost7), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost7, "https"),
expectedCode);
}); });
test('POST 8', () { test('POST 8', () {
@ -825,7 +865,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost8), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost8, "https"),
expectedCode);
}); });
test('POST 9', () { test('POST 9', () {
@ -870,7 +912,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPost9), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPost9, "https"),
expectedCode);
}); });
}); });
@ -911,7 +955,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPut1), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPut1, "https"),
expectedCode);
}); });
}); });
@ -952,7 +998,9 @@ public class Main {
} }
'''; ''';
expect( expect(
javaOkHttpCodeGen.getCode(requestModelPatch1), expectedCode); codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelPatch1, "https"),
expectedCode);
}); });
}); });
@ -986,7 +1034,9 @@ public class Main {
} }
} }
"""; """;
expect(javaOkHttpCodeGen.getCode(requestModelDelete1), expect(
codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelDelete1, "https"),
expectedCode); expectedCode);
}); });
@ -1025,7 +1075,9 @@ public class Main {
} }
} }
'''; ''';
expect(javaOkHttpCodeGen.getCode(requestModelDelete2), expect(
codeGen.getCode(
CodegenLanguage.javaOkHttp, requestModelDelete2, "https"),
expectedCode); expectedCode);
}); });
}); });

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();
@ -32,8 +32,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet1, "https"),
CodegenLanguage.rustCurl, requestModelGet1, "https"),
expectedCode); expectedCode);
}); });
test('GET2', () { test('GET2', () {
@ -61,8 +60,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet2, "https"),
CodegenLanguage.rustCurl, requestModelGet2, "https"),
expectedCode); expectedCode);
}); });
test('GET3', () { test('GET3', () {
@ -90,8 +88,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet3, "https"),
CodegenLanguage.rustCurl, requestModelGet3, "https"),
expectedCode); expectedCode);
}); });
test('GET4', () { test('GET4', () {
@ -119,8 +116,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet4, "https"),
CodegenLanguage.rustCurl, requestModelGet4, "https"),
expectedCode); expectedCode);
}); });
test('GET5', () { test('GET5', () {
@ -153,8 +149,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet5, "https"),
CodegenLanguage.rustCurl, requestModelGet5, "https"),
expectedCode); expectedCode);
}); });
test('GET6', () { test('GET6', () {
@ -187,8 +182,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet6, "https"),
CodegenLanguage.rustCurl, requestModelGet6, "https"),
expectedCode); expectedCode);
}); });
test('GET7', () { test('GET7', () {
@ -216,8 +210,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet7, "https"),
CodegenLanguage.rustCurl, requestModelGet7, "https"),
expectedCode); expectedCode);
}); });
test('GET8', () { test('GET8', () {
@ -250,8 +243,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet8, "https"),
CodegenLanguage.rustCurl, requestModelGet8, "https"),
expectedCode); expectedCode);
}); });
test('GET9', () { test('GET9', () {
@ -279,8 +271,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet9, "https"),
CodegenLanguage.rustCurl, requestModelGet9, "https"),
expectedCode); expectedCode);
}); });
test('GET10', () { test('GET10', () {
@ -313,8 +304,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet10, "https"),
CodegenLanguage.rustCurl, requestModelGet10, "https"),
expectedCode); expectedCode);
}); });
test('GET11', () { test('GET11', () {
@ -347,8 +337,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet11, "https"),
CodegenLanguage.rustCurl, requestModelGet11, "https"),
expectedCode); expectedCode);
}); });
test('GET12', () { test('GET12', () {
@ -376,8 +365,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet12, "https"),
CodegenLanguage.rustCurl, requestModelGet12, "https"),
expectedCode); expectedCode);
}); });
}); });
@ -408,8 +396,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelHead1, "https"),
CodegenLanguage.rustCurl, requestModelHead1, "https"),
expectedCode); expectedCode);
}); });
test('HEAD2', () { test('HEAD2', () {
@ -437,8 +424,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelHead2, "https"),
CodegenLanguage.rustCurl, requestModelHead2, "https"),
expectedCode); expectedCode);
}); });
}); });
@ -478,8 +464,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost1, "https"),
CodegenLanguage.rustCurl, requestModelPost1, "https"),
expectedCode); expectedCode);
}); });
test('POST2', () { test('POST2', () {
@ -522,8 +507,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost2, "https"),
CodegenLanguage.rustCurl, requestModelPost2, "https"),
expectedCode); expectedCode);
}); });
test('POST3', () { test('POST3', () {
@ -562,8 +546,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost3, "https"),
CodegenLanguage.rustCurl, requestModelPost3, "https"),
expectedCode); expectedCode);
}); });
test('POST4', () { test('POST4', () {
@ -606,8 +589,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost4, "https"),
CodegenLanguage.rustCurl, requestModelPost4, "https"),
expectedCode); expectedCode);
}); });
test('POST5', () { test('POST5', () {
@ -655,8 +637,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost5, "https"),
CodegenLanguage.rustCurl, requestModelPost5, "https"),
expectedCode); expectedCode);
}); });
test('POST6', () { test('POST6', () {
@ -695,8 +676,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost6, "https"),
CodegenLanguage.rustCurl, requestModelPost6, "https"),
expectedCode); expectedCode);
}); });
test('POST7', () { test('POST7', () {
@ -735,8 +715,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost7, "https"),
CodegenLanguage.rustCurl, requestModelPost7, "https"),
expectedCode); expectedCode);
}); });
test('POST8', () { test('POST8', () {
@ -779,8 +758,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost8, "https"),
CodegenLanguage.rustCurl, requestModelPost8, "https"),
expectedCode); expectedCode);
}); });
test('POST9', () { test('POST9', () {
@ -825,8 +803,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost9, "https"),
CodegenLanguage.rustCurl, requestModelPost9, "https"),
expectedCode); expectedCode);
}); });
}); });
@ -868,8 +845,7 @@ fn main() {
println!("Response code: {}", easy.response_code().unwrap()); println!("Response code: {}", easy.response_code().unwrap());
}"""; }""";
expect( expect(
codeGen.getCode( codeGen.getCode(CodegenLanguage.rustCurl, requestModelPut1, "https"),
CodegenLanguage.rustCurl, requestModelPut1, "https"),
expectedCode); expectedCode);
}); });
}); });
@ -988,5 +964,4 @@ fn main() {
expectedCode); expectedCode);
}); });
}); });
} }

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();

View File

@ -1,7 +1,7 @@
import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/codegen/codegen.dart';
import 'package:apidash/consts.dart'; import 'package:apidash/consts.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import '../request_models.dart'; import '../models/request_models.dart';
void main() { void main() {
final codeGen = Codegen(); final codeGen = Codegen();