Refactor: ci and code quality (#222)

* chore(release): publish packages - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] * refactor(ci): Reintroduce publishing pipeline and some code changes * postgres setup * No longer supporting nullable map elements
conduit-dart · May 3, 2024 · d6e6063 · d6e6063
1 parent 5423ae9
commit d6e6063
Show file tree

Hide file tree

Showing 36 changed files with 114 additions and 96 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -43,13 +43,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner_args: [melos test-unit, dart tool/generated_test_runner.dart]
+        runner_args: [melos test-unit --no-select, dart tool/generated_test_runner.dart]
         sdk: [stable, main]
     env:
       TEST_DIR: packages/core
     services:
       postgres:
-        image: postgres:14.5
+        image: postgres:16.2
         env:
           POSTGRES_USER: conduit_test_user
           POSTGRES_PASSWORD: conduit!

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner_args: [melos test-unit, dart tool/generated_test_runner.dart]
+        runner_args: [melos test-unit --no-select, dart tool/generated_test_runner.dart]
         sdk: [stable, main]
     env:
       TEST_DIR: packages/core
@@ -56,19 +56,13 @@ jobs:
       TEST_VALUE: 1
       TEST_BOOL: true
     steps:
-    - name: Start PostgreSQL
-      run: |
-        mkdir -p $HOME/datadir
-        initdb -U postgres -D $HOME/datadir
-        pg_ctl -o "-p ${{ env.POSTGRES_PORT }}" -D $HOME/datadir start
-    - name: Create database
-      env:
-        PGUSER: postgres
-        PGPORT: 15432
-      run: |
-        createuser -s -e -g postgres ${{ env.POSTGRES_USER }}
-        psql --command="ALTER USER ${{ env.POSTGRES_USER }} WITH PASSWORD '${{ env.POSTGRES_PASSWORD }}'"
-        createdb --owner=${{ env.POSTGRES_USER }} ${{ env.POSTGRES_DB }}
+    - name: Setup PostgreSQL for Linux/macOS/Windows
+      uses: ikalnytskyi/action-setup-postgres@v6
+      with:
+        username: conduit_test_user
+        password: conduit!
+        database: conduit_test_db
+        port: 15432
     - uses: actions/checkout@v4
     - uses: dart-lang/setup-dart@v1
       with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -44,6 +44,20 @@ jobs:
       run: melos cache-source
     - name: Publish package
       run: melos publish --no-dry-run --git-tag-version --yes
+    - name: Push tags
+      uses: CasperWA/push-protected@v2
+      with:
+        token: ${{ secrets.CONDUIT_PAT }}
+        tags: true
+        branch: master
+    - name: Compute the release tag
+      run: |
+        echo "release_tag=v`cat packages/cli/pubspec.yaml | sed -nre 's/^version: [^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p'`" >> $GITHUB_ENV
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: ${{ env.release_tag }}
+        body_path: CHANGES.txt
   docker:
     if: |
       startsWith(github.event.head_commit.message, 'feat')

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runner_args: [melos test-unit, dart tool/generated_test_runner.dart]
+        runner_args: [melos test-unit --no-select, dart tool/generated_test_runner.dart]
     env:
       TEST_DIR: packages/core
       POSTGRES_HOST: localhost

diff --git a/packages/cli/lib/src/command.dart b/packages/cli/lib/src/command.dart
@@ -172,7 +172,7 @@ abstract class CLICommand {
         throw CLIException('Invalid integer value "$val" for argument "$key".');
       }
       return RuntimeContext.current.coerce<T>(val);
-    } on TypeCoercionException catch (_) {
+    } on TypeCoercionException {
       throw CLIException(
         'The value "$val" for argument "$key" could not be coerced to a $T.',
       );

diff --git a/packages/cli/lib/src/mixins/openapi_options.dart b/packages/cli/lib/src/mixins/openapi_options.dart
@@ -64,7 +64,7 @@ mixin CLIDocumentOptions implements CLICommand {
     try {
       final uri = Uri.parse(str);
       return uri;
-    } on FormatException catch (_) {
+    } on FormatException {
       throw CLIException(
         "Invalid Host Option",
         instructions: [

diff --git a/packages/config/analysis_options.yaml b/packages/config/analysis_options.yaml
@@ -1 +1,4 @@
+analyzer:
+  errors:
+    empty_catches: ignore
 include: package:lints/recommended.yaml
diff --git a/packages/config/lib/src/compiler.dart b/packages/config/lib/src/compiler.dart
@@ -7,7 +7,7 @@ import 'package:conduit_runtime/runtime.dart';
 
 class ConfigurationCompiler extends Compiler {
   @override
-  Map<String, dynamic> compile(MirrorContext context) {
+  Map<String, Object> compile(MirrorContext context) {
     return Map.fromEntries(
       context.getSubclassesOf(Configuration).map((c) {
         return MapEntry(

diff --git a/packages/config/test/config_test.dart b/packages/config/test/config_test.dart
@@ -726,7 +726,7 @@ void main() {
     try {
       final _ = OptionalEmbeddedContainer.fromString(yamlString);
       fail('unreachable');
-    } on ConfigurationException catch (_) {}
+    } on ConfigurationException {}
   });
 
   test("Database configuration can come from string", () {

diff --git a/packages/core/analysis_options.yaml b/packages/core/analysis_options.yaml
@@ -1,6 +1,8 @@
 include: package:lints/recommended.yaml
 
 analyzer:
+  errors:
+    empty_catches: ignore
   exclude:
     - tmp/**
     - templates/**
diff --git a/packages/core/lib/src/application/channel.dart b/packages/core/lib/src/application/channel.dart
@@ -287,5 +287,5 @@ abstract class ChannelRuntime {
 
   ApplicationChannel instantiateChannel();
 
-  Future? runGlobalInitialization(ApplicationOptions config);
+  Future runGlobalInitialization(ApplicationOptions config);
 }
diff --git a/packages/core/lib/src/auth/auth_controller.dart b/packages/core/lib/src/auth/auth_controller.dart
@@ -71,7 +71,7 @@ class AuthController extends ResourceController {
     AuthBasicCredentials basicRecord;
     try {
       basicRecord = _parser.parse(authHeader);
-    } on AuthorizationParserException catch (_) {
+    } on AuthorizationParserException {
       return _responseForError(AuthRequestError.invalidClient);
     }
 

diff --git a/packages/core/lib/src/db/managed/validation/metadata.dart b/packages/core/lib/src/db/managed/validation/metadata.dart
@@ -9,7 +9,7 @@ enum Validating { update, insert }
 /// Information about a validation being performed.
 class ValidationContext {
   /// Whether this validation is occurring during update or insert.
-  Validating? event;
+  late Validating event;
 
   /// The property being validated.
   ManagedPropertyDescription? property;

diff --git a/packages/core/lib/src/runtime/compiler.dart b/packages/core/lib/src/runtime/compiler.dart
@@ -14,8 +14,8 @@ import 'package:yaml/yaml.dart';
 
 class ConduitCompiler extends Compiler {
   @override
-  Map<String, dynamic> compile(MirrorContext context) {
-    final m = <String, dynamic>{};
+  Map<String, Object> compile(MirrorContext context) {
+    final m = <String, Object>{};
 
     m.addEntries(
       context

diff --git a/packages/core/lib/src/runtime/impl.dart b/packages/core/lib/src/runtime/impl.dart
@@ -43,16 +43,14 @@ class ChannelRuntimeImpl extends ChannelRuntime implements SourceCompiler {
   }
 
   @override
-  Future? runGlobalInitialization(ApplicationOptions config) {
+  Future runGlobalInitialization(ApplicationOptions config) async {
     if (hasGlobalInitializationMethod) {
-      return type.invoke(_globalStartSymbol, [config]).reflectee as Future?;
+      return type.invoke(_globalStartSymbol, [config]).reflectee as Future;
     }
-
-    return null;
   }
 
   @override
-  Iterable<APIComponentDocumenter?> getDocumentableChannelComponents(
+  Iterable<APIComponentDocumenter> getDocumentableChannelComponents(
     ApplicationChannel channel,
   ) {
     final documenter = reflectType(APIComponentDocumenter);
@@ -65,7 +63,7 @@ class ChannelRuntimeImpl extends ChannelRuntime implements SourceCompiler {
         .map((dm) {
       return reflect(channel).getField(dm.simpleName).reflectee
           as APIComponentDocumenter?;
-    }).where((o) => o != null);
+    }).whereType<APIComponentDocumenter>();
   }
 
   @override

diff --git a/packages/core/lib/src/runtime/orm/data_model_compiler.dart b/packages/core/lib/src/runtime/orm/data_model_compiler.dart
@@ -5,8 +5,8 @@ import 'package:conduit_core/src/runtime/orm/entity_builder.dart';
 import 'package:conduit_runtime/runtime.dart';
 
 class DataModelCompiler {
-  Map<String, dynamic> compile(MirrorContext context) {
-    final m = <String, dynamic>{};
+  Map<String, Object> compile(MirrorContext context) {
+    final m = <String, Object>{};
 
     final instanceTypes = context.types
         .where(_isTypeManagedObjectSubclass)

diff --git a/packages/core/lib/src/runtime/orm/entity_builder.dart b/packages/core/lib/src/runtime/orm/entity_builder.dart
@@ -44,15 +44,15 @@ class EntityBuilder {
   final Table? metadata;
   final ResponseModel? responseModel;
 
-  ManagedEntityRuntime? runtime;
+  late final ManagedEntityRuntime runtime;
 
   late final String name = _getName();
-  late ManagedEntity entity;
+  late final ManagedEntity entity;
   List<String>? uniquePropertySet;
-  late PropertyBuilder primaryKeyProperty;
-  List<PropertyBuilder> properties = [];
-  Map<String?, ManagedAttributeDescription?> attributes = {};
-  Map<String?, ManagedRelationshipDescription?> relationships = {};
+  late final PropertyBuilder primaryKeyProperty;
+  late final List<PropertyBuilder> properties;
+  final Map<String, ManagedAttributeDescription?> attributes = {};
+  final Map<String, ManagedRelationshipDescription?> relationships = {};
 
   String get instanceTypeName => MirrorSystem.getName(instanceType.simpleName);
 

diff --git a/packages/core/lib/src/runtime/orm_impl.dart b/packages/core/lib/src/runtime/orm_impl.dart
@@ -20,16 +20,17 @@ class ManagedEntityRuntimeImpl extends ManagedEntityRuntime
 
   @override
   ManagedObject instanceOfImplementation({ManagedBacking? backing}) {
-    final object =
-        instanceType.newInstance(Symbol.empty, []).reflectee as ManagedObject?;
+    try {
+      final object =
+          instanceType.newInstance(Symbol.empty, []).reflectee as ManagedObject;
 
-    if (object == null) {
+      if (backing != null) {
+        object.backing = backing;
+      }
+      return object;
+    } on TypeError {
       throw StateError('No implementation found for $instanceType');
     }
-    if (backing != null) {
-      object.backing = backing;
-    }
-    return object;
   }
 
   @override

diff --git a/packages/core/lib/src/runtime/resource_controller/documenter.dart b/packages/core/lib/src/runtime/resource_controller/documenter.dart
@@ -245,7 +245,7 @@ void _registerType(APIDocumentContext context, TypeMirror typeMirror) {
 
   final classMirror = typeMirror;
   if (!context.schema.hasRegisteredType(classMirror.reflectedType) &&
-      _shouldDocumentSerializable(classMirror.reflectedType)!) {
+      _shouldDocumentSerializable(classMirror.reflectedType)) {
     final instance =
         classMirror.newInstance(Symbol.empty, []).reflectee as Serializable;
     context.schema.register(
@@ -256,13 +256,13 @@ void _registerType(APIDocumentContext context, TypeMirror typeMirror) {
   }
 }
 
-bool? _shouldDocumentSerializable(Type type) {
+bool _shouldDocumentSerializable(Type type) {
   final hierarchy = classHierarchyForClass(reflectClass(type));
   final definingType = hierarchy.firstWhereOrNull(
     (cm) => cm.staticMembers.containsKey(#shouldAutomaticallyDocument),
   );
   if (definingType == null) {
     return Serializable.shouldAutomaticallyDocument;
   }
-  return definingType.getField(#shouldAutomaticallyDocument).reflectee as bool?;
+  return definingType.getField(#shouldAutomaticallyDocument).reflectee as bool;
 }
diff --git a/packages/core/lib/src/runtime/resource_controller_impl.dart b/packages/core/lib/src/runtime/resource_controller_impl.dart
@@ -322,7 +322,7 @@ class ResourceControllerRuntimeImpl extends ResourceControllerRuntime {
               args.positionalArguments,
               args.namedArguments.map((k, v) => MapEntry(Symbol(k), v)),
             )
-            .reflectee as Future<Response?>;
+            .reflectee as Future<Response>;
       },
     );
   }

diff --git a/packages/core/test/http/body_encoder_streaming_test.dart b/packages/core/test/http/body_encoder_streaming_test.dart
@@ -95,7 +95,7 @@ void main() {
         final result = await resultFuture;
         expect(result.statusCode, 500);
         expect(result.bodyBytes, []);
-      } on http.ClientException catch (_) {}
+      } on http.ClientException {}
     });
   });
 
@@ -373,7 +373,7 @@ void main() {
       try {
         final response = await req.close();
         expect(response.statusCode, 413);
-      } on SocketException catch (_) {
+      } on SocketException {
         if (!Platform.isMacOS) {
           rethrow;
         }

diff --git a/packages/fs_test_agent/lib/dart_project_agent.dart b/packages/fs_test_agent/lib/dart_project_agent.dart
@@ -5,7 +5,7 @@ import 'dart:io';
 
 import 'package:fs_test_agent/working_directory_agent.dart';
 import 'package:path/path.dart';
-import 'package:pubspec/pubspec.dart';
+import 'package:pubspec_parse/pubspec_parse.dart';
 
 /// A [WorkingDirectoryAgent] with additional behavior for managing a 'Dart package' directory.
 class DartProjectAgent extends WorkingDirectoryAgent {
@@ -51,8 +51,8 @@ class DartProjectAgent extends WorkingDirectoryAgent {
       );
     }
 
-    final pubspec = PubSpec.fromYamlString(pubspecFile.readAsStringSync());
-    name = pubspec.name!;
+    final pubspec = Pubspec.parse(pubspecFile.readAsStringSync());
+    name = pubspec.name;
   }
 
   /// Temporary directory where projects are stored ('/tmp/conduit')

diff --git a/packages/fs_test_agent/pubspec.yaml b/packages/fs_test_agent/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 
 dependencies:
   path: ^1.9.0
-  pubspec: ^2.3.0
+  pubspec_parse: ^1.2.3
 
 dev_dependencies:
   lints: ^3.0.0

diff --git a/packages/runtime/lib/runtime.dart b/packages/runtime/lib/runtime.dart
@@ -22,7 +22,7 @@ import 'package:conduit_runtime/src/mirror_context.dart';
 /// a generated runtime to the replica's pubspec.
 class RuntimePackageCompiler extends Compiler {
   @override
-  Map<String, dynamic> compile(MirrorContext context) => {};
+  Map<String, Object> compile(MirrorContext context) => {};
 
   @override
   void deflectPackage(Directory destinationDirectory) {

diff --git a/packages/runtime/lib/slow_coerce.dart b/packages/runtime/lib/slow_coerce.dart
@@ -40,8 +40,6 @@ T cast<T>(dynamic input) {
         return List<bool?>.from(input) as T;
       } else if (typeString.startsWith("List<Map<String, dynamic>>")) {
         return List<Map<String, dynamic>>.from(input) as T;
-      } else if (typeString.startsWith("List<Map<String, dynamic>?>")) {
-        return List<Map<String, dynamic>?>.from(input) as T;
       }
     } else if (typeString.startsWith(_mapPrefix)) {
       if (input is! Map) {
@@ -73,7 +71,7 @@ T cast<T>(dynamic input) {
     }
 
     return input as T;
-  } on TypeError catch (_) {
+  } on TypeError {
     throw TypeCoercionException(T, input.runtimeType);
   }
 }
diff --git a/packages/runtime/lib/src/build.dart b/packages/runtime/lib/src/build.dart
@@ -48,7 +48,7 @@ class Build {
     print("Generated runtime at '${context.buildRuntimeDirectory.uri}'.");
 
     final nameOfPackageBeingCompiled = context.sourceApplicationPubspec.name;
-    final pubspecMap = <String, dynamic>{
+    final pubspecMap = <String, Object>{
       'name': 'runtime_target',
       'version': '1.0.0',
       'environment': {'sdk': '>=3.3.0 <4.0.0'},