From a1eac15f0623035c2df1c1f352c8693bdf891e34 Mon Sep 17 00:00:00 2001 From: Ashita Prasad Date: Mon, 23 Jun 2025 04:37:56 +0530 Subject: [PATCH] Update har package name --- .../lib/import_export/har_io.dart | 14 +++--- packages/apidash_core/pubspec.yaml | 4 +- packages/apidash_core/pubspec_overrides.yaml | 7 ++- packages/{har_parser => har}/.gitignore | 0 packages/{har_parser => har}/CHANGELOG.md | 0 packages/{har_parser => har}/LICENSE | 2 +- packages/{har_parser => har}/README.md | 8 ++-- .../{har_parser => har}/analysis_options.yaml | 0 .../example/har_example.dart | 2 +- packages/har/lib/har.dart | 4 ++ .../lib/models/har_log.dart | 0 .../lib/models/har_log.freezed.dart | 0 .../lib/models/har_log.g.dart | 0 .../lib/models/models.dart | 0 .../lib/utils/har_utils.dart} | 0 packages/{har_parser => har}/pubspec.yaml | 2 +- .../collection_apidash.dart | 0 .../test/har_test.dart} | 2 +- .../test/models/collection_apidash_model.dart | 44 +++++++++++++++---- packages/har_parser/lib/har_parser.dart | 4 -- 20 files changed, 60 insertions(+), 33 deletions(-) rename packages/{har_parser => har}/.gitignore (100%) rename packages/{har_parser => har}/CHANGELOG.md (100%) rename packages/{har_parser => har}/LICENSE (99%) rename packages/{har_parser => har}/README.md (98%) rename packages/{har_parser => har}/analysis_options.yaml (100%) rename packages/{har_parser => har}/example/har_example.dart (99%) create mode 100644 packages/har/lib/har.dart rename packages/{har_parser => har}/lib/models/har_log.dart (100%) rename packages/{har_parser => har}/lib/models/har_log.freezed.dart (100%) rename packages/{har_parser => har}/lib/models/har_log.g.dart (100%) rename packages/{har_parser => har}/lib/models/models.dart (100%) rename packages/{har_parser/lib/utils/har_parser_utils.dart => har/lib/utils/har_utils.dart} (100%) rename packages/{har_parser => har}/pubspec.yaml (96%) rename packages/{har_parser => har}/test/collection_examples/collection_apidash.dart (100%) rename packages/{har_parser/test/har_parser_test.dart => har/test/har_test.dart} (94%) rename packages/{har_parser => har}/test/models/collection_apidash_model.dart (78%) delete mode 100644 packages/har_parser/lib/har_parser.dart diff --git a/packages/apidash_core/lib/import_export/har_io.dart b/packages/apidash_core/lib/import_export/har_io.dart index 93e04835..ea5b6772 100644 --- a/packages/apidash_core/lib/import_export/har_io.dart +++ b/packages/apidash_core/lib/import_export/har_io.dart @@ -1,4 +1,4 @@ -import 'package:har_parser/har_parser.dart' as hp; +import 'package:har/har.dart' as har; import 'package:seed/seed.dart'; import '../consts.dart'; import '../models/models.dart'; @@ -8,8 +8,8 @@ class HarParserIO { List<(String?, HttpRequestModel)>? getHttpRequestModelList(String content) { content = content.trim(); try { - final hl = hp.harLogFromJsonStr(content); - final requests = hp.getRequestsFromHarLog(hl); + final hl = har.harLogFromJsonStr(content); + final requests = har.getRequestsFromHarLog(hl); return requests .map((req) => (req.$2.url, harRequestToHttpRequestModel(req.$2))) .toList(); @@ -18,7 +18,7 @@ class HarParserIO { } } - HttpRequestModel harRequestToHttpRequestModel(hp.Request request) { + HttpRequestModel harRequestToHttpRequestModel(har.Request request) { HTTPVerb method; try { @@ -33,7 +33,7 @@ class HarParserIO { List params = []; List isParamEnabledList = []; - for (var header in request.headers ?? []) { + for (var header in request.headers ?? []) { var name = header.name ?? ""; var value = header.value; var activeHeader = header.disabled ?? false; @@ -41,7 +41,7 @@ class HarParserIO { isHeaderEnabledList.add(!activeHeader); } - for (var query in request.queryString ?? []) { + for (var query in request.queryString ?? []) { var name = query.name ?? ""; var value = query.value; var activeQuery = query.disabled ?? false; @@ -77,7 +77,7 @@ class HarParserIO { if (request.postData?.mimeType == "multipart/form-data") { bodyContentType = ContentType.formdata; var name, val; - for (var fd in request.postData?.params ?? []) { + for (var fd in request.postData?.params ?? []) { name = fd.name; if (fd.contentType == "text/plain") { formDataType = FormDataType.text; diff --git a/packages/apidash_core/pubspec.yaml b/packages/apidash_core/pubspec.yaml index 935052ae..bf0625ab 100644 --- a/packages/apidash_core/pubspec.yaml +++ b/packages/apidash_core/pubspec.yaml @@ -21,8 +21,8 @@ dependencies: path: ../insomnia_collection postman: path: ../postman - har_parser: - path: ../har_parser + har: + path: ../har seed: ^0.0.3 xml: ^6.3.0 diff --git a/packages/apidash_core/pubspec_overrides.yaml b/packages/apidash_core/pubspec_overrides.yaml index f3858f35..c3860574 100644 --- a/packages/apidash_core/pubspec_overrides.yaml +++ b/packages/apidash_core/pubspec_overrides.yaml @@ -1,10 +1,9 @@ -# melos_managed_dependency_overrides: har_parser -# melos_managed_dependency_overrides: curl_parser,insomnia_collection,postman,seed +# melos_managed_dependency_overrides: curl_parser,insomnia_collection,postman,seed,har dependency_overrides: curl_parser: path: ../curl_parser - har_parser: - path: ..\\har_parser + har: + path: ../har insomnia_collection: path: ../insomnia_collection postman: diff --git a/packages/har_parser/.gitignore b/packages/har/.gitignore similarity index 100% rename from packages/har_parser/.gitignore rename to packages/har/.gitignore diff --git a/packages/har_parser/CHANGELOG.md b/packages/har/CHANGELOG.md similarity index 100% rename from packages/har_parser/CHANGELOG.md rename to packages/har/CHANGELOG.md diff --git a/packages/har_parser/LICENSE b/packages/har/LICENSE similarity index 99% rename from packages/har_parser/LICENSE rename to packages/har/LICENSE index e1622b53..65d4cee9 100644 --- a/packages/har_parser/LICENSE +++ b/packages/har/LICENSE @@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work. same "printed page" as the copyright notice for easier identification within third-party archives. -Copyright 2023 Ashita Prasad, Ankit Mahato +Copyright 2025 Ashita Prasad, Ankit Mahato Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/packages/har_parser/README.md b/packages/har/README.md similarity index 98% rename from packages/har_parser/README.md rename to packages/har/README.md index a9dfc45f..d2249c28 100644 --- a/packages/har_parser/README.md +++ b/packages/har/README.md @@ -1,4 +1,4 @@ -# insomnia +# har Seamlessly convert Har Collection Format v1.2 to Dart. @@ -11,7 +11,7 @@ Currently, this package is being used by [API Dash](https://github.com/foss42/ap ### Example 1: Har collection JSON string to Har model ```dart -import 'package:har_parser/har_parser.dart'; +import 'package:har/har.dart'; void main() { // Example 1: Har collection JSON string to Har model @@ -173,7 +173,7 @@ void main() { ### Example 2: Har collection from JSON ```dart -import 'package:har_parser/har_parser.dart'; +import 'package:har/har.dart'; void main() { // Example 2: Har collection from JSON @@ -337,4 +337,4 @@ var collectionJson = { ## License -This project is licensed under the [Apache License 2.0](https://github.com/foss42/apidash/blob/main/packages/har_parser/LICENSE). +This project is licensed under the [Apache License 2.0](https://github.com/foss42/apidash/blob/main/packages/har/LICENSE). diff --git a/packages/har_parser/analysis_options.yaml b/packages/har/analysis_options.yaml similarity index 100% rename from packages/har_parser/analysis_options.yaml rename to packages/har/analysis_options.yaml diff --git a/packages/har_parser/example/har_example.dart b/packages/har/example/har_example.dart similarity index 99% rename from packages/har_parser/example/har_example.dart rename to packages/har/example/har_example.dart index 5d231702..c0c2a9c6 100644 --- a/packages/har_parser/example/har_example.dart +++ b/packages/har/example/har_example.dart @@ -1,4 +1,4 @@ -import 'package:har_parser/har_parser.dart'; +import 'package:har/har.dart'; void main() { //Example 1 diff --git a/packages/har/lib/har.dart b/packages/har/lib/har.dart new file mode 100644 index 00000000..09b48e3c --- /dev/null +++ b/packages/har/lib/har.dart @@ -0,0 +1,4 @@ +library har; + +export 'models/models.dart'; +export 'utils/har_utils.dart'; diff --git a/packages/har_parser/lib/models/har_log.dart b/packages/har/lib/models/har_log.dart similarity index 100% rename from packages/har_parser/lib/models/har_log.dart rename to packages/har/lib/models/har_log.dart diff --git a/packages/har_parser/lib/models/har_log.freezed.dart b/packages/har/lib/models/har_log.freezed.dart similarity index 100% rename from packages/har_parser/lib/models/har_log.freezed.dart rename to packages/har/lib/models/har_log.freezed.dart diff --git a/packages/har_parser/lib/models/har_log.g.dart b/packages/har/lib/models/har_log.g.dart similarity index 100% rename from packages/har_parser/lib/models/har_log.g.dart rename to packages/har/lib/models/har_log.g.dart diff --git a/packages/har_parser/lib/models/models.dart b/packages/har/lib/models/models.dart similarity index 100% rename from packages/har_parser/lib/models/models.dart rename to packages/har/lib/models/models.dart diff --git a/packages/har_parser/lib/utils/har_parser_utils.dart b/packages/har/lib/utils/har_utils.dart similarity index 100% rename from packages/har_parser/lib/utils/har_parser_utils.dart rename to packages/har/lib/utils/har_utils.dart diff --git a/packages/har_parser/pubspec.yaml b/packages/har/pubspec.yaml similarity index 96% rename from packages/har_parser/pubspec.yaml rename to packages/har/pubspec.yaml index 14b9c10a..354da92b 100644 --- a/packages/har_parser/pubspec.yaml +++ b/packages/har/pubspec.yaml @@ -1,4 +1,4 @@ -name: har_parser +name: har description: "Seamlessly convert har Format to Dart and vice versa." version: 0.0.1 homepage: https://github.com/foss42/apidash diff --git a/packages/har_parser/test/collection_examples/collection_apidash.dart b/packages/har/test/collection_examples/collection_apidash.dart similarity index 100% rename from packages/har_parser/test/collection_examples/collection_apidash.dart rename to packages/har/test/collection_examples/collection_apidash.dart diff --git a/packages/har_parser/test/har_parser_test.dart b/packages/har/test/har_test.dart similarity index 94% rename from packages/har_parser/test/har_parser_test.dart rename to packages/har/test/har_test.dart index 52d29bd0..386bd924 100644 --- a/packages/har_parser/test/har_parser_test.dart +++ b/packages/har/test/har_test.dart @@ -1,4 +1,4 @@ -import 'package:har_parser/har_parser.dart'; +import 'package:har/har.dart'; import 'package:test/test.dart'; import 'collection_examples/collection_apidash.dart'; diff --git a/packages/har_parser/test/models/collection_apidash_model.dart b/packages/har/test/models/collection_apidash_model.dart similarity index 78% rename from packages/har_parser/test/models/collection_apidash_model.dart rename to packages/har/test/models/collection_apidash_model.dart index 2705fcc5..25c1ac3c 100644 --- a/packages/har_parser/test/models/collection_apidash_model.dart +++ b/packages/har/test/models/collection_apidash_model.dart @@ -1,4 +1,4 @@ -import 'package:har_parser/models/models.dart'; +import 'package:har/models/models.dart'; var collectionApiDashModel = HarLog( log: Log( @@ -62,7 +62,8 @@ var collectionApiDashModel = HarLog( time: 200, request: Request( method: "GET", - url: "https://api.apidash.dev/humanize/social?num=8700000&digits=3&system=SS&add_space=true&trailing_zeros=true", + url: + "https://api.apidash.dev/humanize/social?num=8700000&digits=3&system=SS&add_space=true&trailing_zeros=true", httpVersion: null, cookies: null, headers: [], @@ -122,15 +123,32 @@ var collectionApiDashModel = HarLog( request: Request( method: "POST", url: "https://api.apidash.dev/io/form", - headers: [Header(name: "User-Agent", value: "Test Agent", disabled: null)], + headers: [ + Header(name: "User-Agent", value: "Test Agent", disabled: null) + ], queryString: [], bodySize: 100, postData: PostData( mimeType: "multipart/form-data", params: [ - Param(name: "text", value: "API", fileName: null, contentType: "text/plain", disabled: null), - Param(name: "sep", value: "|", fileName: null, contentType: "text/plain", disabled: null), - Param(name: "times", value: "3", fileName: null, contentType: "text/plain", disabled: null) + Param( + name: "text", + value: "API", + fileName: null, + contentType: "text/plain", + disabled: null), + Param( + name: "sep", + value: "|", + fileName: null, + contentType: "text/plain", + disabled: null), + Param( + name: "times", + value: "3", + fileName: null, + contentType: "text/plain", + disabled: null) ], ), ), @@ -160,8 +178,18 @@ var collectionApiDashModel = HarLog( mimeType: "multipart/form-data", text: null, params: [ - Param(name: "token", value: "xyz", fileName: null, contentType: "text/plain", disabled: null), - Param(name: "imfile", value: null, fileName: "hire AI.jpeg", contentType: "image/jpeg", disabled: null) + Param( + name: "token", + value: "xyz", + fileName: null, + contentType: "text/plain", + disabled: null), + Param( + name: "imfile", + value: null, + fileName: "hire AI.jpeg", + contentType: "image/jpeg", + disabled: null) ], ), headersSize: null, diff --git a/packages/har_parser/lib/har_parser.dart b/packages/har_parser/lib/har_parser.dart deleted file mode 100644 index cd7cfb95..00000000 --- a/packages/har_parser/lib/har_parser.dart +++ /dev/null @@ -1,4 +0,0 @@ -library har_parser; - -export 'models/models.dart'; -export 'utils/har_parser_utils.dart';