fix: Versioning issues and upkeep (#191)

* fix: Versioning issues and upkeep

* move tests

* remove linter exceptions and move things around

packages/cli/lib/src/command.dart

@@ -1,4 +1,4 @@
-// ignore_for_file: avoid_print, implementation_imports
+// ignore_for_file: avoid_print
 
 import 'dart:async';
 import 'dart:io';

packages/cli/lib/src/commands/auth_scope.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 
 import 'package:conduit/src/command.dart';
@@ -8,10 +6,7 @@ import 'package:conduit/src/mixins/database_connecting.dart';
 import 'package:conduit/src/mixins/database_managing.dart';
 import 'package:conduit/src/mixins/project.dart';
 import 'package:conduit_core/managed_auth.dart';
-import 'package:conduit_core/src/auth/objects.dart';
-import 'package:conduit_core/src/db/managed/context.dart';
-import 'package:conduit_core/src/db/managed/data_model.dart';
-import 'package:conduit_core/src/db/query/query.dart';
+import 'package:conduit_core/conduit_core.dart';
 
 class CLIAuthScopeClient extends CLICommand
     with CLIDatabaseConnectingCommand, CLIDatabaseManagingCommand, CLIProject {

packages/cli/lib/src/commands/build.dart

@@ -1,4 +1,4 @@
-// ignore_for_file: avoid_print, implementation_imports
+// ignore_for_file: avoid_print
 
 import 'dart:async';
 import 'dart:io';
@@ -8,8 +8,7 @@ import 'package:args/args.dart' as arg_package;
 import 'package:conduit/src/command.dart';
 import 'package:conduit/src/metadata.dart';
 import 'package:conduit/src/mixins/project.dart';
-import 'package:conduit_core/src/application/application.dart';
-import 'package:conduit_core/src/application/channel.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_runtime/runtime.dart';
 import 'package:io/io.dart';
 

packages/cli/lib/src/commands/create.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_dynamic_calls
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';

packages/cli/lib/src/commands/db_generate.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 import 'dart:io';
 

packages/cli/lib/src/commands/db_upgrade.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 
 import 'package:conduit/src/command.dart';
@@ -8,8 +6,7 @@ import 'package:conduit/src/mixins/database_connecting.dart';
 import 'package:conduit/src/mixins/database_managing.dart';
 import 'package:conduit/src/mixins/project.dart';
 import 'package:conduit/src/scripts/run_upgrade.dart';
-import 'package:conduit_core/src/db/query/query.dart';
-import 'package:conduit_core/src/db/schema/schema.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_isolate_exec/conduit_isolate_exec.dart';
 import 'package:conduit_postgresql/conduit_postgresql.dart';
 

packages/cli/lib/src/commands/db_validate.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 
 import 'package:conduit/src/command.dart';

packages/cli/lib/src/commands/document_serve.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
@@ -10,7 +8,7 @@ import 'package:conduit/src/mixins/openapi_options.dart';
 import 'package:conduit/src/mixins/project.dart';
 import 'package:conduit/src/running_process.dart';
 import 'package:conduit/src/scripts/openapi_builder.dart';
-import 'package:conduit_core/src/http/http.dart';
+import 'package:conduit_core/conduit_core.dart';
 
 /// Used internally.
 class CLIDocumentServe extends CLICommand with CLIProject, CLIDocumentOptions {

packages/cli/lib/src/commands/oai_client.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_dynamic_calls
-
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';

packages/cli/lib/src/mixins/database_connecting.dart

@@ -1,13 +1,10 @@
-// ignore_for_file: no_adjacent_strings_in_list, implementation_imports
-
 import 'dart:async';
 import 'dart:io';
 
 import 'package:conduit/src/command.dart';
 import 'package:conduit/src/metadata.dart';
 import 'package:conduit/src/mixins/project.dart';
-import 'package:conduit_config/conduit_config.dart';
-import 'package:conduit_core/src/db/persistent_store/persistent_store.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_postgresql/conduit_postgresql.dart';
 
 abstract class CLIDatabaseConnectingCommand implements CLICommand, CLIProject {

packages/cli/lib/src/mixins/database_managing.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_catching_errors, implementation_imports
-
 import 'dart:async';
 import 'dart:io';
 
@@ -8,7 +6,7 @@ import 'package:conduit/src/metadata.dart';
 import 'package:conduit/src/migration_source.dart';
 import 'package:conduit/src/mixins/project.dart';
 import 'package:conduit/src/scripts/schema_builder.dart';
-import 'package:conduit_core/src/db/schema/schema.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_isolate_exec/conduit_isolate_exec.dart';
 
 abstract class CLIDatabaseManagingCommand implements CLICommand, CLIProject {

packages/cli/lib/src/mixins/project.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_catching_errors
-
 import 'dart:async';
 import 'dart:io';
 
@@ -65,7 +63,6 @@ abstract class CLIProject implements CLICommand {
 
       final lockFileContents = loadYaml(lockFile.readAsStringSync()) as Map;
       final projectVersion =
-          // ignore: avoid_dynamic_calls
           lockFileContents["packages"]["conduit_core"]["version"] as String;
       _projectVersion = Version.parse(projectVersion);
     }

packages/cli/lib/src/scripts/get_channel_type.dart

@@ -1,9 +1,7 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 import 'dart:mirrors';
 
-import 'package:conduit_core/src/application/channel.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_isolate_exec/conduit_isolate_exec.dart';
 import 'package:conduit_runtime/runtime.dart';
 

packages/cli/lib/src/scripts/get_schema.dart

@@ -1,11 +1,8 @@
-// ignore_for_file: avoid_catching_errors, implementation_imports
-
 import 'dart:async';
 
 import 'package:conduit/src/command.dart';
 import 'package:conduit/src/mixins/project.dart';
-import 'package:conduit_core/src/db/managed/data_model.dart';
-import 'package:conduit_core/src/db/schema/schema.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_isolate_exec/conduit_isolate_exec.dart';
 
 class GetSchemaExecutable extends Executable<Map<String, dynamic>> {

packages/cli/lib/src/scripts/migration_builder.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_catching_errors, directives_ordering
-
 import 'dart:async';
 
 import 'package:conduit_core/conduit_core.dart';

packages/cli/lib/src/scripts/openapi_builder.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_catching_errors, directives_ordering
-
 import 'dart:async';
 
 import 'package:conduit_core/conduit_core.dart';

packages/cli/lib/src/scripts/run_upgrade.dart

@@ -1,15 +1,10 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 import 'dart:mirrors';
 
 import 'package:conduit/src/migration_source.dart';
-import 'package:conduit_core/src/db/persistent_store/persistent_store.dart';
-import 'package:conduit_core/src/db/query/error.dart';
-import 'package:conduit_core/src/db/schema/schema.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_isolate_exec/conduit_isolate_exec.dart';
 import 'package:conduit_postgresql/conduit_postgresql.dart';
-import 'package:logging/logging.dart';
 import 'package:postgres/postgres.dart';
 
 class RunUpgradeExecutable extends Executable<Map<String, dynamic>> {

packages/cli/lib/src/scripts/schema_builder.dart

@@ -1,12 +1,9 @@
-// ignore_for_file: implementation_imports
-
 import 'dart:async';
 
 import 'package:conduit/src/migration_source.dart';
-import 'package:conduit_core/src/db/schema/schema.dart';
+import 'package:conduit_core/conduit_core.dart';
 import 'package:conduit_isolate_exec/conduit_isolate_exec.dart';
 import 'package:conduit_postgresql/conduit_postgresql.dart';
-import 'package:logging/logging.dart';
 
 class SchemaBuilderExecutable extends Executable<Map<String, dynamic>> {
   SchemaBuilderExecutable(super.message)

packages/cli/pubspec.yaml

@@ -1,5 +1,5 @@
 name: conduit
-version: 4.2.2
+version: 4.3.0
 homepage: https://github.com/conduit-dart/conduit
 description: A modern HTTP server application framework, ORM and OAuth2 provider with OpenAPI 3.0 integration. Foundation for REST, RPC or GraphQL services.
 environment:
@@ -8,14 +8,14 @@ dependencies:
   analyzer: ^5.1.0
   args: ^2.1.1
   collection: ^1.15.0
-  conduit_common: ^4.2.2
-  conduit_config: ^4.2.2
-  conduit_core: ^4.2.2
-  conduit_isolate_exec: ^4.2.2
-  conduit_open_api: ^4.2.2
-  conduit_password_hash: ^4.2.2
-  conduit_postgresql: ^4.2.2
-  conduit_runtime: ^4.2.2
+  conduit_common: ^4.3.0
+  conduit_config: ^4.3.0
+  conduit_core: ^4.3.0
+  conduit_isolate_exec: ^4.3.0
+  conduit_open_api: ^4.3.0
+  conduit_password_hash: ^4.3.0
+  conduit_postgresql: ^4.3.0
+  conduit_runtime: ^4.3.0
   crypto: ^3.0.2
   io: ^1.0.3
   logging: ^1.0.0

packages/cli/templates/db/pubspec.yaml

@@ -7,10 +7,10 @@ environment:
   sdk: ">=2.19.0 <4.0.0"
 
 dependencies:
-  conduit: ^4.2.2
-  conduit_core: ^4.2.2
-  conduit_postgresql: ^4.2.2
+  conduit: ^4.3.0
+  conduit_core: ^4.3.0
+  conduit_postgresql: ^4.3.0
 
 dev_dependencies:
   test: ^1.21.6
-  conduit_test: ^4.2.2
+  conduit_test: ^4.3.0

packages/cli/templates/db_and_auth/pubspec.yaml

@@ -7,10 +7,10 @@ environment:
   sdk: ">=2.19.0 <4.0.0"
 
 dependencies:
-  conduit: ^4.2.2
-  conduit_core: ^4.2.2
-  conduit_postgresql: ^4.2.2
+  conduit: ^4.3.0
+  conduit_core: ^4.3.0
+  conduit_postgresql: ^4.3.0
 
 dev_dependencies:
   test: ^1.21.6
-  conduit_test: ^4.2.2
+  conduit_test: ^4.3.0

packages/cli/templates/default/pubspec.yaml

@@ -7,9 +7,9 @@ environment:
   sdk: ">=2.19.0 <4.0.0"
 
 dependencies:
-  conduit: ^4.2.2
-  conduit_core: ^4.2.2
+  conduit: ^4.3.0
+  conduit_core: ^4.3.0
 
 dev_dependencies:
   test: ^1.21.6
-  conduit_test: ^4.2.2
+  conduit_test: ^4.3.0

packages/cli/test/command/auth_test.dart → packages/cli/test/auth_test.dart

@@ -6,7 +6,7 @@ import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:path/path.dart';
 import 'package:test/test.dart';
 
-import '../not_tests/cli_helpers.dart';
+import 'not_tests/cli_helpers.dart';
 
 void main() {
   final dataModel = ManagedDataModel.fromCurrentMirrorSystem();

packages/cli/test/command/create_test.dart → packages/cli/test/create_test.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: avoid_dynamic_calls
-
 import 'dart:convert';
 import 'dart:io';
 
@@ -11,7 +9,7 @@ import 'package:pub_semver/pub_semver.dart';
 import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';
 
-import '../not_tests/cli_helpers.dart';
+import 'not_tests/cli_helpers.dart';
 
 void main() {
   late CLIClient cli;
@@ -115,7 +113,7 @@ void main() {
     test("Template gets generated from local path, project points to it",
         () async {
       final res = await cli.run("create", ["test_project", "--offline"]);
-      expect(res, 0);
+      expect(res, isZero);
 
       final List packages = jsonDecode(
         File(

packages/cli/test/command/db_validate_test.dart → packages/cli/test/db_validate_test.dart

@@ -1,12 +1,10 @@
-// ignore: unnecessary_const
-
 import 'dart:io';
 
 import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:test/test.dart';
 
-import '../not_tests/cli_helpers.dart';
+import 'not_tests/cli_helpers.dart';
 
 void main() {
   late CLIClient templateCli;

packages/cli/test/command/document_server_test.dart → packages/cli/test/document_server_test.dart

@@ -1,13 +1,11 @@
-// ignore: unnecessary_const
-
 import 'dart:io';
 
 import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
-import '../not_tests/cli_helpers.dart';
+import 'not_tests/cli_helpers.dart';
 
 void main() {
   late CLIClient templateCli;
@@ -49,7 +47,6 @@ void main() {
     final response = await http.get(Uri.parse("http://localhost:8111"));
     expect(response.body, contains("redoc spec-url='openapi.json'"));
 
-    // ignore: unawaited_futures
     task.process!.stop(0);
     expect(await task.exitCode, 0);
     expect(

packages/cli/test/command/document_test.dart → packages/cli/test/document_test.dart

@@ -1,13 +1,10 @@
-// ignore: unnecessary_const
-// ignore_for_file: avoid_dynamic_calls
-
 import 'dart:convert';
 
 import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:test/test.dart';
 
-import '../not_tests/cli_helpers.dart';
+import 'not_tests/cli_helpers.dart';
 
 void main() {
   late CLIClient terminal;

packages/cli/test/command/generate_test.dart → packages/cli/test/generate_test.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:test/test.dart';
-import '../not_tests/cli_helpers.dart';
+import 'not_tests/cli_helpers.dart';
 
 void main() {
   late CLIClient templateCli;

packages/cli/test/command/migration_execution_test.dart → packages/cli/test/migration_execution_test.dart

@@ -1,5 +1,3 @@
-// ignore: unnecessary_const
-
 import 'dart:async';
 import 'dart:io';
 
@@ -13,7 +11,7 @@ import 'package:fs_test_agent/dart_project_agent.dart';
 import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:test/test.dart';
 
-import '../not_tests/cli_helpers.dart';
+import 'not_tests/cli_helpers.dart';
 
 late CLIClient cli;
 DatabaseConfiguration connectInfo =
@@ -263,7 +261,6 @@ List<MigrationSource> getOrderedTestMigrations(
 }) {
   final uri = Directory.current.uri
       .resolve("test/")
-      .resolve("command/")
       .resolve("migration_execution_test.dart");
 
   final analyzer = CodeAnalyzer(uri);