Merge branch 'supabase-integration' into stable-release

.github/workflows/reusable-dart-analyze-format-test.yaml

@@ -34,7 +34,10 @@ jobs:
 
       - run: dart pub get && dart run melos bootstrap --scope="${{ inputs.package }}"
 
-      - run: dart analyze --fatal-infos lib
+      # TODO: Restore --fatal-infos when analyzer 6.5 is significantly available
+      # in major versions of Flutter. Likely in Q1 2025 https://github.com/GetDutchie/brick/pull/435
+      # - run: dart analyze --fatal-infos lib
+      - run: dart analyze lib
         working-directory: packages/${{ inputs.package }}
 
       - run: dart format --output=none --line-length 100 --set-exit-if-changed lib test

packages/brick_build/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 3.2.1
+
+- Revert `.getDisplayString()` change due to Flutter 3.22 being restricted to analyzer <6.4.1. `meta` is pinned to `1.12` in this version of Flutter, and `analyzer >=6.5.0`, where the change was made, requires `meta >= 1.15`. This change will eventually be re-reverted.
+
 ## 3.2.0
 
 - Add convenience mixin `AnnotationFinderWithFieldRename` for field renames in generators

packages/brick_build/lib/src/utils/shared_checker.dart

@@ -181,7 +181,7 @@ class SharedChecker<_SiblingModel extends Model> {
     if (classElement.supertype?.typeArguments == null ||
         classElement.supertype!.typeArguments.isEmpty) {
       throw InvalidGenerationSourceError(
-        'Type argument for ${targetType.getDisplayString()} is undefined.',
+        'Type argument for ${targetType.getDisplayString(withNullability: true)} is undefined.',
         todo:
             'Define the type on class ${targetType.element}, e.g. `extends ${withoutNullability(classElement.supertype!)}<int>`',
         element: targetType.element,
@@ -243,7 +243,8 @@ class SharedChecker<_SiblingModel extends Model> {
   }
 
   /// Print the `DartType` without nullability
-  static String withoutNullability(DartType type) => type.getDisplayString().replaceAll('?', '');
+  static String withoutNullability(DartType type) =>
+      type.getDisplayString(withNullability: true).replaceAll('?', '');
 
   /// Destructs a type to determine the bottom type after going through Futures and Iterables.
   ///

packages/brick_build/pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/GetDutchie/brick/tree/main/packages/brick_build
 issue_tracker: https://github.com/GetDutchie/brick/issues
 repository: https://github.com/GetDutchie/brick
 
-version: 3.2.0
+version: 3.2.1
 
 environment:
   sdk: ">=2.18.0 <4.0.0"

packages/brick_json_generators/CHANGELOG.md

@@ -1,8 +1,9 @@
 ## Unreleased
 
 - (test) remove analysis options override for non-standard library prefixes
+- Revert `.getDisplayString()` change due to Flutter 3.22 being restricted to analyzer <6.4.1. `meta` is pinned to `1.12` in this version of Flutter, and `analyzer >=6.5.0`, where the change was made, requires `meta >= 1.15`. This change will eventually be re-reverted.
 
-## 3.1.0
+## 3.1.1
 
 - Apply standardized lints
 - Update `analyzer` constraints to `>=6.0.0 <7.0.0`

packages/brick_json_generators/lib/json_deserialize.dart

@@ -94,7 +94,7 @@ mixin JsonDeserialize<TModel extends Model, Annotation extends FieldSerializable
         final nullableSuffix = checker.isNullable ? '?' : '';
 
         return '''$fieldValue$nullableSuffix.map(
-          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString()})
+          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString(withNullability: true)})
         )$castIterable$defaultValue''';
       }
 
@@ -138,7 +138,7 @@ mixin JsonDeserialize<TModel extends Model, Annotation extends FieldSerializable
       final parameterType = checker.fromJsonConstructor!.parameters.first.type;
 
       final output =
-          '${klass.displayName}.fromJson($fieldValue as ${parameterType.getDisplayString()})';
+          '${klass.displayName}.fromJson($fieldValue as ${parameterType.getDisplayString(withNullability: true)})';
       if (checker.isNullable) return '$fieldValue != null ? $output : null';
       return output;
     }

packages/brick_json_generators/pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/GetDutchie/brick/tree/main/packages/brick_json_gene
 issue_tracker: https://github.com/GetDutchie/brick/issues
 repository: https://github.com/GetDutchie/brick
 
-version: 3.1.0
+version: 3.1.1
 
 environment:
   sdk: ">=2.18.0 <4.0.0"

packages/brick_offline_first_build/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## Unreleased
 
+## 3.2.1
+
 - (test) remove analysis options override for non-standard library prefixes
+- Revert `.getDisplayString()` change due to Flutter 3.22 being restricted to analyzer <6.4.1. `meta` is pinned to `1.12` in this version of Flutter, and `analyzer >=6.5.0`, where the change was made, requires `meta >= 1.15`. This change will eventually be re-reverted.
 
 ## 3.2.0
 

packages/brick_offline_first_build/lib/src/offline_first_json_generators.dart

@@ -198,7 +198,8 @@ mixin OfflineFirstJsonDeserialize<TModel extends Model, Annotation extends Field
       if (argTypeChecker.hasSerdes) {
         final doesHaveConstructor = hasConstructor(checker.argType);
         if (doesHaveConstructor) {
-          final serializableType = argTypeChecker.superClassTypeArgs.first.getDisplayString();
+          final serializableType =
+              argTypeChecker.superClassTypeArgs.first.getDisplayString(withNullability: true);
           final nullabilityOperator = checker.isNullable ? '?' : '';
           return '$fieldValue$nullabilityOperator.map((c) => ${SharedChecker.withoutNullability(checker.argType)}.$constructorName(c as $serializableType))$castIterable$defaultValue';
         }

packages/brick_offline_first_build/lib/src/offline_first_sqlite_generators.dart

@@ -91,7 +91,8 @@ class OfflineFirstSqliteDeserialize extends SqliteDeserialize {
       if (argTypeChecker.hasSerdes) {
         final doesHaveConstructor = hasConstructor(checker.argType);
         if (doesHaveConstructor) {
-          final serializableType = argTypeChecker.superClassTypeArgs.last.getDisplayString();
+          final serializableType =
+              argTypeChecker.superClassTypeArgs.last.getDisplayString(withNullability: true);
           return '''
             jsonDecode($fieldValue).map(
               (c) => $argType.$constructorName(c as $serializableType)
@@ -105,7 +106,8 @@ class OfflineFirstSqliteDeserialize extends SqliteDeserialize {
     if ((checker as OfflineFirstChecker).hasSerdes) {
       final doesHaveConstructor = hasConstructor(field.type);
       if (doesHaveConstructor) {
-        final serializableType = checker.superClassTypeArgs.last.getDisplayString();
+        final serializableType =
+            checker.superClassTypeArgs.last.getDisplayString(withNullability: true);
         return '${SharedChecker.withoutNullability(field.type)}.$constructorName($fieldValue as $serializableType)';
       }
     }

packages/brick_offline_first_build/pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/GetDutchie/brick/tree/main/packages/brick_offline_f
 issue_tracker: https://github.com/GetDutchie/brick/issues
 repository: https://github.com/GetDutchie/brick
 
-version: 3.2.0
+version: 3.2.1
 
 environment:
   sdk: ">=2.18.0 <4.0.0"

packages/brick_offline_first_with_supabase/lib/src/offline_first_with_supabase_repository.dart

@@ -86,7 +86,21 @@ abstract class OfflineFirstWithSupabaseRepository
     required DatabaseFactory databaseFactory,
     http.Client? innerClient,
     Duration? processingInterval,
-    List<int>? reattemptForStatusCodes,
+    List<int> reattemptForStatusCodes = const [
+      400,
+      401,
+      403,
+      404,
+      405,
+      408,
+      409,
+      429,
+      500,
+      501,
+      502,
+      503,
+      504,
+    ],
     bool? serialProcessing,
   }) {
     final client = RestOfflineQueueClient(

packages/brick_offline_first_with_supabase/pubspec.yaml

@@ -13,8 +13,8 @@ environment:
 dependencies:
   brick_core: ^1.1.1
   brick_offline_first: ">=3.0.0 <4.0.0"
-  brick_supabase: ">=0.0.1 <2.0.0"
   brick_sqlite: ">=3.0.0 <4.0.0"
+  brick_supabase: ">=0.0.1 <2.0.0"
   brick_offline_first_with_rest: ">=3.0.2 <4.0.0"
   http: ">=1.0.0 <2.0.0"
   logging: ">=1.0.0 <2.0.0"
@@ -24,5 +24,6 @@ dependencies:
 dev_dependencies:
   lints: ^2.0.1
   mockito: ^5.0.0
-  test: ^1.16.5
   sqflite_common_ffi: ^2.0.0
+  supabase: ">=2.3.0 <3.0.0"
+  test: ^1.16.5

packages/brick_sqlite_generators/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 3.2.2
+
+- Revert `.getDisplayString()` change due to Flutter 3.22 being restricted to analyzer <6.4.1. `meta` is pinned to `1.12` in this version of Flutter, and `analyzer >=6.5.0`, where the change was made, requires `meta >= 1.15`. This change will eventually be re-reverted.
+
 ## 3.2.1
 
 - Use `SharedChecker.withoutNullability` instead of stripping null suffixes manually

packages/brick_sqlite_generators/lib/src/sqlite_deserialize.dart

@@ -137,7 +137,7 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
         final discoveredByIndex =
             'jsonDecode($fieldValue).map((d) => d as int > -1 ? ${SharedChecker.withoutNullability(argType)}.values[d] : null)';
         final nullableSuffix = checker.isNullable ? '?' : '';
-        return '$discoveredByIndex$nullableSuffix.whereType<${argType.getDisplayString()}>()$castIterable';
+        return '$discoveredByIndex$nullableSuffix.whereType<${argType.getDisplayString(withNullability: true)}>()$castIterable';
       }
 
       // Iterable<bool>
@@ -152,7 +152,7 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
         final nullableSuffix = checker.isNullable ? " ?? '[]'" : '';
 
         return '''jsonDecode($fieldValue$nullableSuffix).map(
-          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString()})
+          (d) => ${klass.displayName}.fromJson(d as ${parameterType.getDisplayString(withNullability: true)})
         )$castIterable$defaultValue''';
       }
 
@@ -210,7 +210,7 @@ class SqliteDeserialize<_Model extends SqliteModel> extends SqliteSerdesGenerato
     } else if (checker.fromJsonConstructor != null) {
       final klass = checker.targetType.element as ClassElement;
       final parameterType = checker.fromJsonConstructor!.parameters.first.type;
-      return '${klass.displayName}.fromJson(jsonDecode($fieldValue as String) as ${parameterType.getDisplayString()})';
+      return '${klass.displayName}.fromJson(jsonDecode($fieldValue as String) as ${parameterType.getDisplayString(withNullability: true)})';
     }
 
     return null;

packages/brick_sqlite_generators/pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/GetDutchie/brick/tree/main/packages/brick_sqlite_ge
 issue_tracker: https://github.com/GetDutchie/brick/issues
 repository: https://github.com/GetDutchie/brick
 
-version: 3.2.1
+version: 3.2.2
 
 environment:
   sdk: ">=2.18.0 <4.0.0"