diff --git a/lib/consts.dart b/lib/consts.dart index c267a471..ec042f85 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -142,7 +142,7 @@ enum CodegenLanguage { enum ImportFormat { curl("cURL"), postman("Postman Collection v2.1"), - insomia("Insomnia v4"); + insomnia("Insomnia v4"); const ImportFormat(this.label); final String label; diff --git a/lib/importer/importer.dart b/lib/importer/importer.dart index 3f5125a6..4d93d9be 100644 --- a/lib/importer/importer.dart +++ b/lib/importer/importer.dart @@ -12,7 +12,7 @@ class Importer { ?.map((t) => (null, t)) .toList(), ImportFormat.postman => PostmanIO().getHttpRequestModelList(content), - ImportFormat.insomia => InsomiaIO().getHttpRequestModelList(content), + ImportFormat.insomnia => InsomniaIO().getHttpRequestModelList(content), }; } } diff --git a/packages/apidash_core/lib/import_export/import_export.dart b/packages/apidash_core/lib/import_export/import_export.dart index bfa4964f..33762e50 100644 --- a/packages/apidash_core/lib/import_export/import_export.dart +++ b/packages/apidash_core/lib/import_export/import_export.dart @@ -1,3 +1,3 @@ export 'curl_io.dart'; export 'postman_io.dart'; -export 'insomia_io.dart'; +export 'insomnia_io.dart'; diff --git a/packages/apidash_core/lib/import_export/insomia_io.dart b/packages/apidash_core/lib/import_export/insomnia_io.dart similarity index 96% rename from packages/apidash_core/lib/import_export/insomia_io.dart rename to packages/apidash_core/lib/import_export/insomnia_io.dart index 571ba468..b87eeec9 100644 --- a/packages/apidash_core/lib/import_export/insomia_io.dart +++ b/packages/apidash_core/lib/import_export/insomnia_io.dart @@ -1,10 +1,13 @@ -import 'package:insomnia/insomnia.dart' as ins; import 'package:seed/seed.dart'; import '../consts.dart'; import '../models/models.dart'; import '../utils/utils.dart'; +import 'package:insomnia_collection/insomnia_collection.dart' as ins; -class InsomiaIO { + + + +class InsomniaIO { List<(String?, HttpRequestModel)>? getHttpRequestModelList(String content) { content = content.trim(); try { diff --git a/packages/apidash_core/pubspec.yaml b/packages/apidash_core/pubspec.yaml index 4b4dc38d..78c5bfb2 100644 --- a/packages/apidash_core/pubspec.yaml +++ b/packages/apidash_core/pubspec.yaml @@ -19,8 +19,8 @@ dependencies: http_parser: ^4.0.2 postman: path: ../postman - insomnia: - path: ../insomnia + insomnia_collection: + path: ../insomnia_collection seed: ^0.0.2 xml: ^6.3.0 diff --git a/packages/insomnia/.gitignore b/packages/insomnia_collection/.gitignore similarity index 100% rename from packages/insomnia/.gitignore rename to packages/insomnia_collection/.gitignore diff --git a/packages/insomnia/CHANGELOG.md b/packages/insomnia_collection/CHANGELOG.md similarity index 100% rename from packages/insomnia/CHANGELOG.md rename to packages/insomnia_collection/CHANGELOG.md diff --git a/packages/insomnia/LICENSE b/packages/insomnia_collection/LICENSE similarity index 100% rename from packages/insomnia/LICENSE rename to packages/insomnia_collection/LICENSE diff --git a/packages/insomnia/README.md b/packages/insomnia_collection/README.md similarity index 99% rename from packages/insomnia/README.md rename to packages/insomnia_collection/README.md index 7681aa56..255d890a 100644 --- a/packages/insomnia/README.md +++ b/packages/insomnia_collection/README.md @@ -11,7 +11,7 @@ Currently, this package is being used by [API Dash](https://github.com/foss42/ap ### Example 1: Insomnia collection JSON string to Insomnia model ```dart -import 'package:insomnia/insomnia.dart'; +import 'package:insomnia_collection/insomnia_collection.dart'; void main() { // Example 1: Insomnia collection JSON string to Insomnia model @@ -188,7 +188,7 @@ void main() { ### Example 2: Insomnia collection from JSON ```dart -import 'package:insomnia/insomnia.dart'; +import 'package:insomnia_collection/insomnia_collection.dart'; void main() { // Example 2: Insomnia collection from JSON diff --git a/packages/insomnia/analysis_options.yaml b/packages/insomnia_collection/analysis_options.yaml similarity index 100% rename from packages/insomnia/analysis_options.yaml rename to packages/insomnia_collection/analysis_options.yaml diff --git a/packages/insomnia/example/insomnia_example.dart b/packages/insomnia_collection/example/insomnia_example.dart similarity index 99% rename from packages/insomnia/example/insomnia_example.dart rename to packages/insomnia_collection/example/insomnia_example.dart index 2947bc4c..f9301346 100644 --- a/packages/insomnia/example/insomnia_example.dart +++ b/packages/insomnia_collection/example/insomnia_example.dart @@ -1,4 +1,5 @@ -import 'package:insomnia/insomnia.dart'; + +import 'package:insomnia_collection/insomnia_collection.dart'; void main() { // Example 1: Insomnia collection JSON string to Insomnia model diff --git a/packages/insomnia/lib/insomnia.dart b/packages/insomnia_collection/lib/insomnia_collection.dart similarity index 69% rename from packages/insomnia/lib/insomnia.dart rename to packages/insomnia_collection/lib/insomnia_collection.dart index f51712ff..66c1cef9 100644 --- a/packages/insomnia/lib/insomnia.dart +++ b/packages/insomnia_collection/lib/insomnia_collection.dart @@ -1,4 +1,4 @@ -library insomnia; +library insomnia_collection; export 'models/models.dart'; export 'utils/insomnia_utils.dart'; diff --git a/packages/insomnia/lib/models/insomnia_collection.dart b/packages/insomnia_collection/lib/models/insomnia_collection.dart similarity index 100% rename from packages/insomnia/lib/models/insomnia_collection.dart rename to packages/insomnia_collection/lib/models/insomnia_collection.dart diff --git a/packages/insomnia/lib/models/insomnia_collection.freezed.dart b/packages/insomnia_collection/lib/models/insomnia_collection.freezed.dart similarity index 100% rename from packages/insomnia/lib/models/insomnia_collection.freezed.dart rename to packages/insomnia_collection/lib/models/insomnia_collection.freezed.dart diff --git a/packages/insomnia/lib/models/insomnia_collection.g.dart b/packages/insomnia_collection/lib/models/insomnia_collection.g.dart similarity index 100% rename from packages/insomnia/lib/models/insomnia_collection.g.dart rename to packages/insomnia_collection/lib/models/insomnia_collection.g.dart diff --git a/packages/insomnia/lib/models/models.dart b/packages/insomnia_collection/lib/models/models.dart similarity index 100% rename from packages/insomnia/lib/models/models.dart rename to packages/insomnia_collection/lib/models/models.dart diff --git a/packages/insomnia/lib/utils/insomnia_utils.dart b/packages/insomnia_collection/lib/utils/insomnia_utils.dart similarity index 90% rename from packages/insomnia/lib/utils/insomnia_utils.dart rename to packages/insomnia_collection/lib/utils/insomnia_utils.dart index 295a13ec..ca3d9810 100644 --- a/packages/insomnia/lib/utils/insomnia_utils.dart +++ b/packages/insomnia_collection/lib/utils/insomnia_utils.dart @@ -1,6 +1,7 @@ -import 'package:insomnia/insomnia.dart'; + +import 'package:insomnia_collection/models/insomnia_collection.dart'; List<(String?, Resource)> getRequestsFromInsomniaCollection( InsomniaCollection? ic) { diff --git a/packages/insomnia/pubspec.yaml b/packages/insomnia_collection/pubspec.yaml similarity index 92% rename from packages/insomnia/pubspec.yaml rename to packages/insomnia_collection/pubspec.yaml index e6bdceef..5504badd 100644 --- a/packages/insomnia/pubspec.yaml +++ b/packages/insomnia_collection/pubspec.yaml @@ -1,5 +1,5 @@ -name: insomnia -description: Seamlessly convert Insomnia Collection Format v4 to Dart and vice versa. +name: insomnia_collection +description: Seamlessly convert Insomnia Collection Format v4 to Dart. version: 0.0.1 homepage: https://github.com/foss42/apidash diff --git a/packages/insomnia/test/collection_examples.dart/collection_apidash.dart b/packages/insomnia_collection/test/collection_examples/collection_apidash.dart similarity index 100% rename from packages/insomnia/test/collection_examples.dart/collection_apidash.dart rename to packages/insomnia_collection/test/collection_examples/collection_apidash.dart diff --git a/packages/insomnia/test/insomnia_test.dart b/packages/insomnia_collection/test/insomnia_test.dart similarity index 79% rename from packages/insomnia/test/insomnia_test.dart rename to packages/insomnia_collection/test/insomnia_test.dart index 18617656..808fe906 100644 --- a/packages/insomnia/test/insomnia_test.dart +++ b/packages/insomnia_collection/test/insomnia_test.dart @@ -1,5 +1,5 @@ -import 'package:insomnia/insomnia.dart'; -import 'collection_examples.dart/collection_apidash.dart'; +import 'package:insomnia_collection/insomnia_collection.dart'; +import 'collection_examples/collection_apidash.dart'; import 'models/collection_apidash_model.dart'; import 'package:test/test.dart'; diff --git a/packages/insomnia/test/models/collection_apidash_model.dart b/packages/insomnia_collection/test/models/collection_apidash_model.dart similarity index 98% rename from packages/insomnia/test/models/collection_apidash_model.dart rename to packages/insomnia_collection/test/models/collection_apidash_model.dart index ba792f08..f9816028 100644 --- a/packages/insomnia/test/models/collection_apidash_model.dart +++ b/packages/insomnia_collection/test/models/collection_apidash_model.dart @@ -1,4 +1,4 @@ -import 'package:insomnia/models/models.dart'; +import 'package:insomnia_collection/models/models.dart'; var collectionApiDashModel = InsomniaCollection( type: "export", diff --git a/pubspec.lock b/pubspec.lock index 9685fca8..5d3b2a79 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -772,10 +772,10 @@ packages: url: "https://pub.dev" source: hosted version: "4.3.0" - insomnia: + insomnia_collection: dependency: transitive description: - path: "packages/insomnia" + path: "packages/insomnia_collection" relative: true source: path version: "0.0.1"