Merge branch 'main' into ds/core13.19_sync_errors_changes

* main: add 'ignore_for_file: type=lint' to *.g.dart files (#1413) kn/fix skip then iterate bug (#1410) # Conflicts: # CHANGELOG.md # test/asymmetric_test.g.dart
realm · Oct 30, 2023 · 266ceb2 · 266ceb2
2 parents ea21a6a + d5aaf25
commit 266ceb2
Show file tree

Hide file tree

Showing 30 changed files with 113 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## vNext (TBD)
 
 ### Enhancements
+* Suppressing rules for a  *.g.dart files ([#1413](https://github.com/realm/realm-dart/pull/1413))
 * Full text search supports searching for prefix only. Eg. "description TEXT 'alex*'" (Core upgrade)
 * Unknown protocol errors received from the baas server will no longer cause the application to crash if a valid error action is also received. Unknown error actions will be treated as an ApplicationBug error action and will cause sync to fail with an error via the sync error handler. (Core upgrade)
 * Added support for server log messages that are enabled by sync protocol version 10. AppServices request id will be provided in a server log message in a future server release. (Core upgrade)
@@ -11,6 +12,7 @@
 * Throw an exception if `File::unlock` has failed, in order to inform the SDK that we are likely hitting some limitation on the OS filesystem, instead of crashing  the application and use the same file locking logic for all the platforms. (Core upgrade)
 
 ### Fixed
+* Fixed iteration after `skip` bug ([#1409](https://github.com/realm/realm-dart/issues/1409))
 * Crash when querying the size of a Object property through a link chain (Core upgrade, since v13.17.2)
 * Deprecated `App.localAppName` and `App.localAppVersion`. They were not used by the server and were not needed to set them. ([#1387](https://github.com/realm/realm-dart/pull/1387))
 * Fixed crash in slab allocator (Assertion failed: ref + size <= next->first) Many issues like (Core upgrade, since 13.0.0)

diff --git a/example/bin/myapp.g.dart b/example/bin/myapp.g.dart
diff --git a/flutter/realm_flutter/example/lib/main.g.dart b/flutter/realm_flutter/example/lib/main.g.dart
diff --git a/generator/lib/src/realm_model_info.dart b/generator/lib/src/realm_model_info.dart
@@ -32,6 +32,7 @@ class RealmModelInfo {
   const RealmModelInfo(this.name, this.modelName, this.realmName, this.fields, this.baseType);
 
   Iterable<String> toCode() sync* {
+    yield '// ignore_for_file: type=lint';
     yield 'class $name extends $modelName with RealmEntity, RealmObjectBase, ${baseType.className} {';
     {
       final allSettable = fields.where((f) => !f.type.isRealmCollection && !f.isRealmBacklink).toList();

diff --git a/generator/test/good_test.dart b/generator/test/good_test.dart
@@ -36,6 +36,7 @@ class _MappedToo {
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class MappedToo extends _MappedToo
     with RealmEntity, RealmObjectBase, RealmObject {
   MappedToo({

diff --git a/generator/test/good_test_data/all_types.expected b/generator/test/good_test_data/all_types.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Foo extends _Foo with RealmEntity, RealmObjectBase, RealmObject {
   static var _defaultsSet = false;
 
@@ -49,6 +50,7 @@ class Foo extends _Foo with RealmEntity, RealmObjectBase, RealmObject {
   }
 }
 
+// ignore_for_file: type=lint
 class Bar extends _Bar with RealmEntity, RealmObjectBase, RealmObject {
   static var _defaultsSet = false;
 
@@ -225,6 +227,7 @@ class Bar extends _Bar with RealmEntity, RealmObjectBase, RealmObject {
   }
 }
 
+// ignore_for_file: type=lint
 class PrimitiveTypes extends _PrimitiveTypes
     with RealmEntity, RealmObjectBase, RealmObject {
   PrimitiveTypes(

diff --git a/generator/test/good_test_data/asymmetric_object.expected b/generator/test/good_test_data/asymmetric_object.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Asymmetric extends _Asymmetric
     with RealmEntity, RealmObjectBase, RealmObject {
   Asymmetric(
@@ -70,6 +71,7 @@ class Asymmetric extends _Asymmetric
   }
 }
 
+// ignore_for_file: type=lint
 class Embedded extends _Embedded
     with RealmEntity, RealmObjectBase, EmbeddedObject {
   Embedded(

diff --git a/generator/test/good_test_data/binary_type.expected b/generator/test/good_test_data/binary_type.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Foo extends _Foo with RealmEntity, RealmObjectBase, RealmObject {
   Foo(
     Uint8List requiredBinaryProp, {

diff --git a/generator/test/good_test_data/embedded_annotations.expected b/generator/test/good_test_data/embedded_annotations.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Parent extends _Parent with RealmEntity, RealmObjectBase, RealmObject {
   Parent({
     Child1? child,
@@ -50,6 +51,7 @@ class Parent extends _Parent with RealmEntity, RealmObjectBase, RealmObject {
   }
 }
 
+// ignore_for_file: type=lint
 class Child1 extends _Child1 with RealmEntity, RealmObjectBase, EmbeddedObject {
   Child1(
     String value,

diff --git a/generator/test/good_test_data/embedded_objects.expected b/generator/test/good_test_data/embedded_objects.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Parent extends _Parent with RealmEntity, RealmObjectBase, RealmObject {
   Parent({
     Child1? child,
@@ -47,6 +48,7 @@ class Parent extends _Parent with RealmEntity, RealmObjectBase, RealmObject {
   }
 }
 
+// ignore_for_file: type=lint
 class Child1 extends _Child1 with RealmEntity, RealmObjectBase, EmbeddedObject {
   Child1(
     String value, {
@@ -111,6 +113,7 @@ class Child1 extends _Child1 with RealmEntity, RealmObjectBase, EmbeddedObject {
   }
 }
 
+// ignore_for_file: type=lint
 class Child2 extends _Child2 with RealmEntity, RealmObjectBase, EmbeddedObject {
   Child2(
     bool boolProp,

diff --git a/generator/test/good_test_data/indexable_types.expected b/generator/test/good_test_data/indexable_types.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Indexable extends _Indexable
     with RealmEntity, RealmObjectBase, RealmObject {
   Indexable(

diff --git a/generator/test/good_test_data/list_initialization.expected b/generator/test/good_test_data/list_initialization.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Person extends _Person with RealmEntity, RealmObjectBase, RealmObject {
   Person({
     Iterable<Person> children = const [],

diff --git a/generator/test/good_test_data/mapto.expected b/generator/test/good_test_data/mapto.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Original extends $Original
     with RealmEntity, RealmObjectBase, RealmObject {
   static var _defaultsSet = false;

diff --git a/generator/test/good_test_data/optional_argument.expected b/generator/test/good_test_data/optional_argument.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Person extends _Person with RealmEntity, RealmObjectBase, RealmObject {
   Person({
     Person? spouse,

diff --git a/generator/test/good_test_data/pinhole.expected b/generator/test/good_test_data/pinhole.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Foo extends _Foo with RealmEntity, RealmObjectBase, RealmObject {
   static var _defaultsSet = false;
 

diff --git a/generator/test/good_test_data/primary_key.expected b/generator/test/good_test_data/primary_key.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class IntPK extends _IntPK with RealmEntity, RealmObjectBase, RealmObject {
   IntPK(
     int id,
@@ -33,6 +34,7 @@ class IntPK extends _IntPK with RealmEntity, RealmObjectBase, RealmObject {
   }
 }
 
+// ignore_for_file: type=lint
 class NullableIntPK extends _NullableIntPK
     with RealmEntity, RealmObjectBase, RealmObject {
   NullableIntPK(
@@ -67,6 +69,7 @@ class NullableIntPK extends _NullableIntPK
   }
 }
 
+// ignore_for_file: type=lint
 class StringPK extends _StringPK
     with RealmEntity, RealmObjectBase, RealmObject {
   StringPK(
@@ -99,6 +102,7 @@ class StringPK extends _StringPK
   }
 }
 
+// ignore_for_file: type=lint
 class NullableStringPK extends _NullableStringPK
     with RealmEntity, RealmObjectBase, RealmObject {
   NullableStringPK(
@@ -134,6 +138,7 @@ class NullableStringPK extends _NullableStringPK
   }
 }
 
+// ignore_for_file: type=lint
 class ObjectIdPK extends _ObjectIdPK
     with RealmEntity, RealmObjectBase, RealmObject {
   ObjectIdPK(
@@ -166,6 +171,7 @@ class ObjectIdPK extends _ObjectIdPK
   }
 }
 
+// ignore_for_file: type=lint
 class NullableObjectIdPK extends _NullableObjectIdPK
     with RealmEntity, RealmObjectBase, RealmObject {
   NullableObjectIdPK(
@@ -201,6 +207,7 @@ class NullableObjectIdPK extends _NullableObjectIdPK
   }
 }
 
+// ignore_for_file: type=lint
 class UuidPK extends _UuidPK with RealmEntity, RealmObjectBase, RealmObject {
   UuidPK(
     Uuid id,
@@ -232,6 +239,7 @@ class UuidPK extends _UuidPK with RealmEntity, RealmObjectBase, RealmObject {
   }
 }
 
+// ignore_for_file: type=lint
 class NullableUuidPK extends _NullableUuidPK
     with RealmEntity, RealmObjectBase, RealmObject {
   NullableUuidPK(

diff --git a/generator/test/good_test_data/realm_set.expected b/generator/test/good_test_data/realm_set.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Car extends _Car with RealmEntity, RealmObjectBase, RealmObject {
   Car(
     String make,
@@ -33,6 +34,7 @@ class Car extends _Car with RealmEntity, RealmObjectBase, RealmObject {
   }
 }
 
+// ignore_for_file: type=lint
 class RealmSets extends _RealmSets
     with RealmEntity, RealmObjectBase, RealmObject {
   RealmSets(

diff --git a/generator/test/good_test_data/required_argument.expected b/generator/test/good_test_data/required_argument.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Person extends _Person with RealmEntity, RealmObjectBase, RealmObject {
   Person(
     String name,

diff --git a/generator/test/good_test_data/required_argument_with_default_value.expected b/generator/test/good_test_data/required_argument_with_default_value.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Person extends _Person with RealmEntity, RealmObjectBase, RealmObject {
   static var _defaultsSet = false;
 

diff --git a/generator/test/good_test_data/user_defined_getter.expected b/generator/test/good_test_data/user_defined_getter.expected
@@ -2,6 +2,7 @@
 // RealmObjectGenerator
 // **************************************************************************
 
+// ignore_for_file: type=lint
 class Person extends _Person with RealmEntity, RealmObjectBase, RealmObject {
   Person(
     String name,

diff --git a/lib/src/results.dart b/lib/src/results.dart
@@ -86,7 +86,7 @@ class RealmResults<T extends Object?> extends Iterable<T> with RealmEntity imple
     var results = this;
     if (_supportsSnapshot) {
       final handle = realmCore.resultsSnapshot(this);
-      results = RealmResultsInternal.create<T>(handle, realm, _metadata);
+      results = RealmResultsInternal.create<T>(handle, realm, _metadata, _skipOffset);
     }
     return _RealmResultsIterator(results);
   }
@@ -184,8 +184,9 @@ extension RealmResultsInternal on RealmResults {
     RealmResultsHandle handle,
     Realm realm,
     RealmObjectMetadata? metadata,
+    [int skip = 0]
   ) =>
-      RealmResults<T>._(handle, realm, metadata);
+      RealmResults<T>._(handle, realm, metadata, skip);
 }
 
 /// Describes the changes in a Realm results collection since the last time the notification callback was invoked.

diff --git a/test/backlinks_test.g.dart b/test/backlinks_test.g.dart
diff --git a/test/indexed_test.g.dart b/test/indexed_test.g.dart
diff --git a/test/migration_test.g.dart b/test/migration_test.g.dart